You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/01/30 18:04:58 UTC

[3/3] geode git commit: GEODE-2351: Replace gemfire with geode in cpp quickstarts.

GEODE-2351: Replace gemfire with geode in cpp quickstarts.

This closes #370


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/63d531ee
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/63d531ee
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/63d531ee

Branch: refs/heads/next-gen-native-client-software-grant
Commit: 63d531eed05477eea024810d6e9c2032e108b25e
Parents: 85182df
Author: Mike Martell <mm...@pivotal.io>
Authored: Sat Jan 28 08:52:27 2017 -0800
Committer: Jacob Barrett <jb...@pivotal.io>
Committed: Mon Jan 30 10:04:24 2017 -0800

----------------------------------------------------------------------
 .../include/gfcpp/CacheableBuiltins.hpp         | 76 ++++++++++----------
 src/cppcache/integration-test/fw_spawn.hpp      |  4 +-
 .../testThinClientPoolExecuteFunction.cpp       | 10 +--
 .../testThinClientPoolExecuteFunctionPrSHOP.cpp | 10 +--
 .../testThinClientPoolExecuteHAFunction.cpp     | 23 +++---
 ...estThinClientPoolExecuteHAFunctionPrSHOP.cpp | 23 +++---
 src/cppcache/src/CqService.cpp                  |  7 +-
 src/cppcache/src/TcrConnection.hpp              |  9 +--
 src/cppcache/src/TcrEndpoint.cpp                |  5 +-
 .../src/statistics/AtomicStatisticsImpl.cpp     |  6 +-
 .../impl/CPPParser/CPPInputParser.cpp           | 12 ++--
 src/quickstart/NativeClientConfig.cmake         | 10 +--
 src/quickstart/cleanup.bat                      |  2 +-
 src/quickstart/cleanup.sh                       |  2 +-
 src/quickstart/cpp/BasicOperations.cpp          | 18 ++---
 src/quickstart/cpp/CqQuery.cpp                  | 22 +++---
 src/quickstart/cpp/DataExpiration.cpp           | 18 ++---
 src/quickstart/cpp/Delta.cpp                    | 16 ++---
 src/quickstart/cpp/DistributedSystem.cpp        | 21 +++---
 src/quickstart/cpp/DurableClient.cpp            | 26 +++----
 src/quickstart/cpp/Exceptions.cpp               | 32 ++++-----
 src/quickstart/cpp/ExecuteFunctions.cpp         | 19 +++--
 src/quickstart/cpp/HACache.cpp                  | 20 +++---
 src/quickstart/cpp/LoaderListenerWriter.cpp     | 20 +++---
 src/quickstart/cpp/MultiuserSecurity.cpp        | 22 +++---
 src/quickstart/cpp/PdxAutoSerializer.cpp        | 19 +++--
 src/quickstart/cpp/PdxInstance.cpp              | 18 ++---
 src/quickstart/cpp/PdxRemoteQuery.cpp           | 18 ++---
 src/quickstart/cpp/PdxSerializer.cpp            | 20 +++---
 src/quickstart/cpp/PoolCqQuery.cpp              | 22 +++---
 src/quickstart/cpp/PoolRemoteQuery.cpp          | 18 ++---
 src/quickstart/cpp/PoolWithEndpoints.cpp        | 19 +++--
 src/quickstart/cpp/PutAllGetAllOperations.cpp   | 20 +++---
 src/quickstart/cpp/RefIDExample.cpp             | 18 ++---
 src/quickstart/cpp/RegisterInterest.cpp         | 19 +++--
 src/quickstart/cpp/RemoteQuery.cpp              | 18 ++---
 src/quickstart/cpp/Security.cpp                 | 24 +++----
 src/quickstart/cpp/Transactions.cpp             | 18 ++---
 src/quickstart/cpp/TransactionsXA.cpp           | 18 ++---
 .../cpp/plugins/DurableCacheListener.hpp        |  6 +-
 .../cpp/plugins/SimpleCacheListener.hpp         |  6 +-
 .../cpp/plugins/SimpleCacheLoader.hpp           |  6 +-
 .../cpp/plugins/SimpleCacheWriter.hpp           |  6 +-
 src/quickstart/runcpp.bat.in                    | 20 +++---
 src/quickstart/runcpp.sh.in                     | 14 ++--
 45 files changed, 381 insertions(+), 379 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableBuiltins.hpp b/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
index 793c562..4071761 100644
--- a/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
+++ b/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
@@ -418,44 +418,44 @@ class CacheableContainerType : public Cacheable, public TBase {
   typedef SharedArrayPtr<p, GemfireTypeIds::c> c##Ptr;
 
 // use a class instead of typedef for bug #283
-#define _GF_CACHEABLE_ARRAY_TYPE_(p, c)                                      \
-  class CPPCACHE_EXPORT c : public _##c {                                    \
-   protected:                                                                \
-    inline c() : _##c() {}                                                   \
-    inline c(int32_t length) : _##c(length) {}                               \
-    inline c(p* value, int32_t length) : _##c(value, length) {}              \
-    inline c(const p* value, int32_t length, bool copy)                      \
-        : _##c(value, length, true) {}                                       \
-                                                                             \
-   private:                                                                  \
-    /* Private to disable copy constructor and assignment operator. */       \
-    c(const c& other);                                                       \
-    c& operator=(const c& other);                                            \
-                                                                             \
-   public:                                                                   \
-    /** Factory function registered with serialization registry. */          \
-    static Serializable* createDeserializable() { return new c(); }          \
-    /** Factory function to create a new default instance. */                \
-    inline static c##Ptr create() { return c##Ptr(new c()); }                \
-    /** Factory function to create a cacheable array of given size. */       \
-    inline static c##Ptr create(int32_t length) {                            \
-      return c##Ptr(new c(length));                                          \
-    }                                                                        \
-    /** Create a cacheable array copying from the given array. */            \
-    inline static c##Ptr create(const p* value, int32_t length) {            \
-      return (value != NULL ? c##Ptr(new c(value, length, true)) : NULLPTR); \
-    }                                                                        \
-    /**                                                                      \
-     * Create a cacheable array taking ownership of the given array          \
-     * without creating a copy.                                              \
-     *                                                                       \
-     * Note that the application has to ensure that the given array is       \
-     * not deleted (apart from this class) and is allocated on the heap      \
-     * using the "new" operator.                                             \
-     */                                                                      \
-    inline static c##Ptr createNoCopy(p* value, int32_t length) {            \
-      return (value != NULL ? c##Ptr(new c(value, length)) : NULLPTR);       \
-    }                                                                        \
+#define _GF_CACHEABLE_ARRAY_TYPE_(p, c)                                        \
+  class CPPCACHE_EXPORT c : public _##c {                                      \
+   protected:                                                                  \
+    inline c() : _##c() {}                                                     \
+    inline c(int32_t length) : _##c(length) {}                                 \
+    inline c(p* value, int32_t length) : _##c(value, length) {}                \
+    inline c(const p* value, int32_t length, bool copy)                        \
+        : _##c(value, length, true) {}                                         \
+                                                                               \
+   private:                                                                    \
+    /* Private to disable copy constructor and assignment operator. */         \
+    c(const c& other);                                                         \
+    c& operator=(const c& other);                                              \
+                                                                               \
+   public:                                                                     \
+    /** Factory function registered with serialization registry. */            \
+    static Serializable* createDeserializable() { return new c(); }            \
+    /** Factory function to create a new default instance. */                  \
+    inline static c##Ptr create() { return c##Ptr(new c()); }                  \
+    /** Factory function to create a cacheable array of given size. */         \
+    inline static c##Ptr create(int32_t length) {                              \
+      return c##Ptr(new c(length));                                            \
+    }                                                                          \
+    /** Create a cacheable array copying from the given array. */              \
+    inline static c##Ptr create(const p* value, int32_t length) {              \
+      return (value != NULL ? c##Ptr(new c(value, length, true)) : NULLPTR);   \
+    }                                                                          \
+    /**                                                                      \ \
+     * Create a cacheable array taking ownership of the given array          \ \
+     * without creating a copy.                                              \ \
+     *                                                                       \ \
+     * Note that the application has to ensure that the given array is       \ \
+     * not deleted (apart from this class) and is allocated on the heap      \ \
+     * using the "new" operator.                                             \ \
+     */                                                                        \
+    inline static c##Ptr createNoCopy(p* value, int32_t length) {              \
+      return (value != NULL ? c##Ptr(new c(value, length)) : NULLPTR);         \
+    }                                                                          \
   };
 
 #define _GF_CACHEABLE_CONTAINER_TYPE_DEF_(p, c)                 \

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/cppcache/integration-test/fw_spawn.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/fw_spawn.hpp b/src/cppcache/integration-test/fw_spawn.hpp
index 8306448..99e4187 100644
--- a/src/cppcache/integration-test/fw_spawn.hpp
+++ b/src/cppcache/integration-test/fw_spawn.hpp
@@ -29,14 +29,14 @@
 
 #if defined(_WIN32)
 #if (FD_SETSIZE != 1024)
-++ + bad fdsetsize...
++++bad fdsetsize...
 #endif
 #endif
 
 #include "ace/Process.h"
 #include "ace/Log_Msg.h"
 
-    namespace dunit {
+  namespace dunit {
 
   // Listing 1 code/ch10
   class Manager : virtual public ACE_Process {

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/cppcache/integration-test/testThinClientPoolExecuteFunction.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteFunction.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteFunction.cpp
index 27aacc4..cd217b4 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteFunction.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteFunction.cpp
@@ -58,8 +58,9 @@ char* FETimeOut = (char*)"FunctionExecutionTimeOut";
   for (int j = 0; j < 34; j++) {                                              \
     if (j % 2 == 0) continue;                                                 \
     sprintf(buf, "VALUE--%d", j);                                             \
-    if (strcmp(buf, dynCast<CacheableStringPtr>(resultList->operator[](i))    \
-                        ->asChar()) == 0) {                                   \
+    if (strcmp(buf,                                                           \
+               dynCast<CacheableStringPtr>(resultList->operator[](i))         \
+                   ->asChar()) == 0) {                                        \
       LOGINFO(                                                                \
           "buf = %s "                                                         \
           "dynCast<CacheableStringPtr>(resultList->operator[](i))->asChar() " \
@@ -77,8 +78,9 @@ char* FETimeOut = (char*)"FunctionExecutionTimeOut";
   for (int j = 0; j < 34; j++) {                                              \
     if (j % 2 == 0) continue;                                                 \
     sprintf(buf, "KEY--%d", j);                                               \
-    if (strcmp(buf, dynCast<CacheableStringPtr>(resultList->operator[](i))    \
-                        ->asChar()) == 0) {                                   \
+    if (strcmp(buf,                                                           \
+               dynCast<CacheableStringPtr>(resultList->operator[](i))         \
+                   ->asChar()) == 0) {                                        \
       LOGINFO(                                                                \
           "buf = %s "                                                         \
           "dynCast<CacheableStringPtr>(resultList->operator[](i))->asChar() " \

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
index 9e9c48b..c45d5ca 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
@@ -58,8 +58,9 @@ char* FETimeOut = (char*)"FunctionExecutionTimeOut";
   for (int j = 0; j < 34; j++) {                                              \
     if (j % 2 == 0) continue;                                                 \
     sprintf(buf, "VALUE--%d", j);                                             \
-    if (strcmp(buf, dynCast<CacheableStringPtr>(resultList->operator[](i))    \
-                        ->asChar()) == 0) {                                   \
+    if (strcmp(buf,                                                           \
+               dynCast<CacheableStringPtr>(resultList->operator[](i))         \
+                   ->asChar()) == 0) {                                        \
       LOGINFO(                                                                \
           "buf = %s "                                                         \
           "dynCast<CacheableStringPtr>(resultList->operator[](i))->asChar() " \
@@ -77,8 +78,9 @@ char* FETimeOut = (char*)"FunctionExecutionTimeOut";
   for (int j = 0; j < 34; j++) {                                              \
     if (j % 2 == 0) continue;                                                 \
     sprintf(buf, "KEY--%d", j);                                               \
-    if (strcmp(buf, dynCast<CacheableStringPtr>(resultList->operator[](i))    \
-                        ->asChar()) == 0) {                                   \
+    if (strcmp(buf,                                                           \
+               dynCast<CacheableStringPtr>(resultList->operator[](i))         \
+                   ->asChar()) == 0) {                                        \
       LOGINFO(                                                                \
           "buf = %s "                                                         \
           "dynCast<CacheableStringPtr>(resultList->operator[](i))->asChar() " \

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
index 9331b5d..d77d9d7 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
@@ -40,17 +40,18 @@ char* OnServerHAExceptionFunction = (char*)"OnServerHAExceptionFunction";
 char* OnServerHAShutdownFunction = (char*)"OnServerHAShutdownFunction";
 
 char* RegionOperationsHAFunction = (char*)"RegionOperationsHAFunction";
-#define verifyGetResults()                                                 \
-  bool found = false;                                                      \
-  for (int j = 0; j < 34; j++) {                                           \
-    if (j % 2 == 0) continue;                                              \
-    sprintf(buf, "VALUE--%d", j);                                          \
-    if (strcmp(buf, dynCast<CacheableStringPtr>(resultList->operator[](i)) \
-                        ->asChar()) == 0) {                                \
-      found = true;                                                        \
-      break;                                                               \
-    }                                                                      \
-  }                                                                        \
+#define verifyGetResults()                                            \
+  bool found = false;                                                 \
+  for (int j = 0; j < 34; j++) {                                      \
+    if (j % 2 == 0) continue;                                         \
+    sprintf(buf, "VALUE--%d", j);                                     \
+    if (strcmp(buf,                                                   \
+               dynCast<CacheableStringPtr>(resultList->operator[](i)) \
+                   ->asChar()) == 0) {                                \
+      found = true;                                                   \
+      break;                                                          \
+    }                                                                 \
+  }                                                                   \
   ASSERT(found, "this returned value is invalid");
 
 #define verifyPutResults()                   \

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
index ed02e64..8c2c186 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
@@ -40,17 +40,18 @@ char* OnServerHAShutdownFunction = (char*)"OnServerHAShutdownFunction";
 char* RegionOperationsHAFunction = (char*)"RegionOperationsHAFunction";
 char* RegionOperationsHAFunctionPrSHOP =
     (char*)"RegionOperationsHAFunctionPrSHOP";
-#define verifyGetResults()                                                 \
-  bool found = false;                                                      \
-  for (int j = 0; j < 34; j++) {                                           \
-    if (j % 2 == 0) continue;                                              \
-    sprintf(buf, "VALUE--%d", j);                                          \
-    if (strcmp(buf, dynCast<CacheableStringPtr>(resultList->operator[](i)) \
-                        ->asChar()) == 0) {                                \
-      found = true;                                                        \
-      break;                                                               \
-    }                                                                      \
-  }                                                                        \
+#define verifyGetResults()                                            \
+  bool found = false;                                                 \
+  for (int j = 0; j < 34; j++) {                                      \
+    if (j % 2 == 0) continue;                                         \
+    sprintf(buf, "VALUE--%d", j);                                     \
+    if (strcmp(buf,                                                   \
+               dynCast<CacheableStringPtr>(resultList->operator[](i)) \
+                   ->asChar()) == 0) {                                \
+      found = true;                                                   \
+      break;                                                          \
+    }                                                                 \
+  }                                                                   \
   ASSERT(found, "this returned value is invalid");
 
 #define verifyPutResults()                   \

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/cppcache/src/CqService.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqService.cpp b/src/cppcache/src/CqService.cpp
index 57e190c..0fa3bbf 100644
--- a/src/cppcache/src/CqService.cpp
+++ b/src/cppcache/src/CqService.cpp
@@ -263,9 +263,10 @@ void CqService::executeCqs(VectorOfCqQuery& cqs, bool afterFailover) {
           cq->execute();
         }
       } catch (QueryException& qe) {
-        LOGFINE("%s", ("Failed to execute the CQ, CqName : " + cqName +
-                       " Error : " + qe.getMessage())
-                          .c_str());
+        LOGFINE("%s",
+                ("Failed to execute the CQ, CqName : " + cqName + " Error : " +
+                 qe.getMessage())
+                    .c_str());
       } catch (CqClosedException& cce) {
         LOGFINE(("Failed to execute the CQ, CqName : " + cqName + " Error : " +
                  cce.getMessage())

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/cppcache/src/TcrConnection.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrConnection.hpp b/src/cppcache/src/TcrConnection.hpp
index 79941fc..0f1dcb6 100644
--- a/src/cppcache/src/TcrConnection.hpp
+++ b/src/cppcache/src/TcrConnection.hpp
@@ -191,10 +191,11 @@ class CPPCACHE_EXPORT TcrConnection {
             uint32_t sendTimeoutSec = DEFAULT_WRITE_TIMEOUT,
             bool checkConnected = true);
 
-  void send(uint32_t& timeSpent, const char* buffer, int len,
-            uint32_t sendTimeoutSec = DEFAULT_WRITE_TIMEOUT,
-            bool checkConnected = true, int32_t notPublicApiWithTimeout =
-                                            -2 /*NOT_PUBLIC_API_WITH_TIMEOUT*/);
+  void send(
+      uint32_t& timeSpent, const char* buffer, int len,
+      uint32_t sendTimeoutSec = DEFAULT_WRITE_TIMEOUT,
+      bool checkConnected = true,
+      int32_t notPublicApiWithTimeout = -2 /*NOT_PUBLIC_API_WITH_TIMEOUT*/);
 
   /**
   * This method is for receiving client notification. It will read 2 times as

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/cppcache/src/TcrEndpoint.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrEndpoint.cpp b/src/cppcache/src/TcrEndpoint.cpp
index b250ca4..46099c1 100644
--- a/src/cppcache/src/TcrEndpoint.cpp
+++ b/src/cppcache/src/TcrEndpoint.cpp
@@ -916,8 +916,9 @@ GfErrType TcrEndpoint::sendRequestWithRetry(
           LOGFINE(
               "Creating a new connection when connection-pool-size system "
               "property set to 0");
-          if ((error = createNewConnection(
-                   conn, false, false, DistributedSystem::getSystemProperties()
+          if ((error =
+                   createNewConnection(conn, false, false,
+                                       DistributedSystem::getSystemProperties()
                                            ->connectTimeout())) != GF_NOERR) {
             epFailure = true;
             continue;

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp b/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
index c43f274..c237891 100644
--- a/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
+++ b/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
@@ -95,7 +95,7 @@ AtomicStatisticsImpl::AtomicStatisticsImpl(StatisticsType* typeArg,
 
     if (intCount > 0) {
       intStorage =
-          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, int32>[ intCount ];
+          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, int32>[intCount];
       for (int32 i = 0; i < intCount; i++) {
         intStorage[i] = 0;  // Un-initialized state
       }
@@ -105,7 +105,7 @@ AtomicStatisticsImpl::AtomicStatisticsImpl(StatisticsType* typeArg,
     }
     if (longCount > 0) {
       longStorage =
-          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, int64>[ longCount ];
+          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, int64>[longCount];
       for (int32 i = 0; i < longCount; i++) {
         longStorage[i] = 0;  // Un-initialized state
       }
@@ -115,7 +115,7 @@ AtomicStatisticsImpl::AtomicStatisticsImpl(StatisticsType* typeArg,
     }
     if (doubleCount > 0) {
       doubleStorage =
-          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, double>[ doubleCount ];
+          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, double>[doubleCount];
       for (int32 i = 0; i < doubleCount; i++) {
         doubleStorage[i] = 0;  // Un-initialized state
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/pdxautoserializer/impl/CPPParser/CPPInputParser.cpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/impl/CPPParser/CPPInputParser.cpp b/src/pdxautoserializer/impl/CPPParser/CPPInputParser.cpp
index b3507fe..3bba77a 100644
--- a/src/pdxautoserializer/impl/CPPParser/CPPInputParser.cpp
+++ b/src/pdxautoserializer/impl/CPPParser/CPPInputParser.cpp
@@ -145,9 +145,9 @@ void CPPHeaderParser::endClassDefinition() {
       if (findMember != m_arraySizeRefMap.end()) {
         memberIterator->m_type.m_kind |= TypeKind::ARRAY;
         memberIterator->m_type.m_nameOrSize = findMember->second;
-        Log::info(ModuleName, "Using \"" + findMember->second +
-                                  "\" as size of array \"" +
-                                  memberIterator->m_name + '"');
+        Log::info(ModuleName,
+                  "Using \"" + findMember->second + "\" as size of array \"" +
+                      memberIterator->m_name + '"');
       }
 
       StringMap::const_iterator findMemberElem =
@@ -155,9 +155,9 @@ void CPPHeaderParser::endClassDefinition() {
       if (findMemberElem != m_arrayElemSizeRefMap.end()) {
         memberIterator->m_type.m_kind |= TypeKind::ARRAY;
         memberIterator->m_type.m_nameOfArrayElemSize = findMemberElem->second;
-        Log::info(ModuleName, "Using \"" + findMemberElem->second +
-                                  "\" as size of array \"" +
-                                  memberIterator->m_name + '"');
+        Log::info(ModuleName,
+                  "Using \"" + findMemberElem->second +
+                      "\" as size of array \"" + memberIterator->m_name + '"');
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/NativeClientConfig.cmake
----------------------------------------------------------------------
diff --git a/src/quickstart/NativeClientConfig.cmake b/src/quickstart/NativeClientConfig.cmake
index 9e31601..cad19f8 100755
--- a/src/quickstart/NativeClientConfig.cmake
+++ b/src/quickstart/NativeClientConfig.cmake
@@ -3,16 +3,16 @@ if (DEFINED ENV{GFCPP})
     set( NCProductDir $ENV{GFCPP} )
 else()
     if (WIN32)
-        file( GLOB NCCandidates /pivotal-gemfire-nativeclient* )
+        file( GLOB NCCandidates /apache-geode-nativeclient* )
         #peek registry https://cmake.org/Wiki/CMake_FAQ#How%5Fcan%5FI%5Fget%5Fa%5Fwindows%5Fregistry%5Fkey%5F.3F
     else()
-        file( GLOB NCCandidates /pivotal-gemfire-nativeclient* )
+        file( GLOB NCCandidates /apache-geode-nativeclient* )
         if (NOT NCCandidates)
-            file( GLOB NCCandidates /gemfire-nativeclient* )
+            file( GLOB NCCandidates /geode-nativeclient* )
             if (NOT NCCandidates)
-                file( GLOB NCCandidates /usr/local/gemfire-nativeclient* )
+                file( GLOB NCCandidates /usr/local/geode-nativeclient* )
                 if (NOT NCCandidates)
-                    file( GLOB NCCandidates /Applications/Pivotal_GemFire_NativeClient* )
+                    file( GLOB NCCandidates /Applications/Apache_Geode_NativeClient* )
                 endif()
             endif()
         endif()

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cleanup.bat
----------------------------------------------------------------------
diff --git a/src/quickstart/cleanup.bat b/src/quickstart/cleanup.bat
index aa4dd1c..d55cf5d 100644
--- a/src/quickstart/cleanup.bat
+++ b/src/quickstart/cleanup.bat
@@ -1,6 +1,6 @@
 @echo off
 
-echo Deleting GemFire Statistics and Log files...
+echo Deleting Geode Statistics and Log files...
 
 del /q *.gfs
 del /q gfecs\*.*

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cleanup.sh
----------------------------------------------------------------------
diff --git a/src/quickstart/cleanup.sh b/src/quickstart/cleanup.sh
index ac5f665..7320762 100755
--- a/src/quickstart/cleanup.sh
+++ b/src/quickstart/cleanup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo Deleting GemFire Statistics and Log files...
+echo Deleting Geode Statistics and Log files...
 
 rm -f *.gfs
 rm -f gfecs/*

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/BasicOperations.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/BasicOperations.cpp b/src/quickstart/cpp/BasicOperations.cpp
index e6d950d..41743d7 100644
--- a/src/quickstart/cpp/BasicOperations.cpp
+++ b/src/quickstart/cpp/BasicOperations.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
  * 2. Create the example Region Programmatically.
  * 3.a. Put Entries (Key and Value pairs) into the Region.
  * 3.b. If in 64 bit mode put over 4 GB data to demonstrate capacity.
@@ -31,21 +31,21 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The BasicOperations QuickStart example.
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache.
+    // Create a Geode Cache.
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
     CachePtr cachePtr = cacheFactory->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     RegionFactoryPtr regionFactory =
         cachePtr->createRegionFactory(CACHING_PROXY);
@@ -101,16 +101,16 @@ int main(int argc, char** argv) {
 
     LOGINFO("Destroyed the second Entry in the Region");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("BasicOperations GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("BasicOperations Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/CqQuery.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/CqQuery.cpp b/src/quickstart/cpp/CqQuery.cpp
index d1ad902..55043f3 100644
--- a/src/quickstart/cpp/CqQuery.cpp
+++ b/src/quickstart/cpp/CqQuery.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache Programmatically.
+ * 1. Create a Geode Cache Programmatically.
  * 2. Create the example Region Programmatically.
  * 3. Populate some query objects on the Region.
  * 4. Register a cqQuery listener
@@ -29,14 +29,14 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
 // Include our Query objects, viz. Portfolio and Position.
 #include "queryobjects/Portfolio.hpp"
 #include "queryobjects/Position.hpp"
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // Use the "testobject" namespace for the query objects.
@@ -77,14 +77,14 @@ class MyCqListener : public CqListener {
 // The CqQuery QuickStart example.
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache Programmatically.
+    // Create a Geode Cache Programmatically.
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
     CachePtr cachePtr = cacheFactory->addServer("localhost", 50505)
                             ->setSubscriptionEnabled(true)
                             ->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     RegionFactoryPtr regionFactory = cachePtr->createRegionFactory(PROXY);
 
@@ -158,21 +158,21 @@ int main(int argc, char** argv) {
         printf("query pulled bad object\n");
       }
     }
-    // Stop the GemFire Continuous query.
+    // Stop the Geode Continuous query.
     qry->stop();
-    // Close the GemFire Continuous query.
+    // Close the Geode Continuous query.
     qry->close();
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("CqQuery GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("CqQuery Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/DataExpiration.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/DataExpiration.cpp b/src/quickstart/cpp/DataExpiration.cpp
index 5c0773f..b93eb1a 100644
--- a/src/quickstart/cpp/DataExpiration.cpp
+++ b/src/quickstart/cpp/DataExpiration.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- *  1. Create a GemFire Cache programmatically.
+ *  1. Create a Geode Cache programmatically.
  *  2. Create the example Region programmatically.
  *  3. Set the SimpleCacheListener plugin on the Region.
  *  4. Put 3 Entries into the Region.
@@ -34,24 +34,24 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
 // Include the SimpleCacheListener plugin.
 #include "plugins/SimpleCacheListener.hpp"
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The DataExpiration QuickStart example.
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache Programmatically.
+    // Create a Geode Cache Programmatically.
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
     CachePtr cachePtr = cacheFactory->setSubscriptionEnabled(true)->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     RegionFactoryPtr regionFactory =
         cachePtr->createRegionFactory(CACHING_PROXY);
@@ -111,16 +111,16 @@ int main(int argc, char** argv) {
     LOGINFO("Got %d keys after the Entry Idle Timeout duration elapsed",
             keys.size());
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("DataExpiration GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("DataExpiration Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/Delta.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/Delta.cpp b/src/quickstart/cpp/Delta.cpp
index c18e84b..0cfe72e 100644
--- a/src/quickstart/cpp/Delta.cpp
+++ b/src/quickstart/cpp/Delta.cpp
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 
 /*
  * The Delta QuickStart Example.
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
  * 2. Get the example Region from the Cache.
  * 3. Put an Entry into the Region.
  * 4. Set delta for a value.
@@ -38,14 +38,14 @@
 
 #include "deltaobjects/DeltaExample.hpp"
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The Delta QuickStart example.
 typedef SharedPtr<DeltaExample> DeltaExamplePtr;
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache.
+    // Create a Geode Cache.
     PropertiesPtr prptr = Properties::create();
     prptr->insert("cache-xml-file", "XMLs/clientDelta.xml");
 
@@ -53,7 +53,7 @@ int main(int argc, char** argv) {
 
     CachePtr cachePtr = cacheFactory->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // get the example Region.
     RegionPtr regPtr = cachePtr->getRegion("exampleRegion");
@@ -95,14 +95,14 @@ int main(int argc, char** argv) {
 
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
 
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("Delta GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("Delta Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/DistributedSystem.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/DistributedSystem.cpp b/src/quickstart/cpp/DistributedSystem.cpp
index 4ad1e73..fc01bf8 100644
--- a/src/quickstart/cpp/DistributedSystem.cpp
+++ b/src/quickstart/cpp/DistributedSystem.cpp
@@ -20,7 +20,7 @@
  * This example creates two pools programatically.
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
  * 2. Now it creates Pool with poolName1.
  * 3. Adds server(localhost:40404) to pool factory.
  * 4. Creates region "root1" with pool.
@@ -35,10 +35,10 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 void distributedsystem(CachePtr cachePtr, char *hostname, int port,
@@ -105,29 +105,28 @@ int main(int argc, char **argv) {
   try {
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
-    LOGINFO("Connected to the GemFire Distributed System");
+    LOGINFO("Connected to the Geode Distributed System");
 
-    // Create a GemFire Cache.
+    // Create a Geode Cache.
     CachePtr cachePtr = cacheFactory->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     distributedsystem(cachePtr, (char *)"localhost", 40404, (char *)"poolName1",
                       (char *)"exampleRegion1");
     distributedsystem(cachePtr, (char *)"localhost", 40405, (char *)"poolName2",
                       (char *)"exampleRegion2");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception &gemfireExcp) {
-    LOGERROR("DistributedSystem GemFire Exception: %s",
-             gemfireExcp.getMessage());
+  catch (const Exception &geodeExcp) {
+    LOGERROR("DistributedSystem Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/DurableClient.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/DurableClient.cpp b/src/quickstart/cpp/DurableClient.cpp
index e5513bc..c83cd48 100644
--- a/src/quickstart/cpp/DurableClient.cpp
+++ b/src/quickstart/cpp/DurableClient.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache with durable client properties Programmatically.
+ * 1. Create a Geode Cache with durable client properties Programmatically.
  * 2. Create the example Region Programmatically.
  * 3. Set Cacelistener with "afterRegionLive implementation to region.
  * 4. Register Interest to region with durable option
@@ -29,13 +29,13 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
 // Include cachelistener
 #include "plugins/DurableCacheListener.hpp"
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 void RunDurableClient() {
@@ -44,11 +44,11 @@ void RunDurableClient() {
   pp->insert("durable-client-id", "DurableClientId");
   pp->insert("durable-timeout", 300);
 
-  // Create a GemFire Cache Programmatically.
+  // Create a Geode Cache Programmatically.
   CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory(pp);
   CachePtr cachePtr = cacheFactory->setSubscriptionEnabled(true)->create();
 
-  LOGINFO("Created the GemFire Cache Programmatically");
+  LOGINFO("Created the Geode Cache Programmatically");
 
   RegionFactoryPtr regionFactory = cachePtr->createRegionFactory(CACHING_PROXY);
 
@@ -85,22 +85,22 @@ void RunDurableClient() {
   // wait for some time to recieve events
   apache::geode::client::millisleep(1000);
 
-  // Close the GemFire Cache with keepalive = true.  Server will queue events
+  // Close the Geode Cache with keepalive = true.  Server will queue events
   // for
   // durable registered keys and will deliver all events when client will
   // reconnect
   // within timeout period and send "readyForEvents()"
   cachePtr->close(true);
 
-  LOGINFO("Closed the GemFire Cache with keepalive as true");
+  LOGINFO("Closed the Geode Cache with keepalive as true");
 }
 void RunFeeder() {
   CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
-  LOGINFO("Feeder connected to the GemFire Distributed System");
+  LOGINFO("Feeder connected to the Geode Distributed System");
 
   CachePtr cachePtr = cacheFactory->create();
 
-  LOGINFO("Created the GemFire Cache");
+  LOGINFO("Created the Geode Cache");
 
   RegionFactoryPtr regionFactory = cachePtr->createRegionFactory(PROXY);
 
@@ -125,10 +125,10 @@ void RunFeeder() {
       "Created Key-1 and Key-2 in region. Durable interest was registered only "
       "for Key-1.");
 
-  // Close the GemFire Cache
+  // Close the Geode Cache
   cachePtr->close();
 
-  LOGINFO("Closed the GemFire Cache");
+  LOGINFO("Closed the Geode Cache");
 }
 
 // The DurableClient QuickStart example.
@@ -146,8 +146,8 @@ int main(int argc, char** argv) {
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("DurableClient GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("DurableClient Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/Exceptions.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/Exceptions.cpp b/src/quickstart/cpp/Exceptions.cpp
index 671e03e..c4d5114 100644
--- a/src/quickstart/cpp/Exceptions.cpp
+++ b/src/quickstart/cpp/Exceptions.cpp
@@ -22,7 +22,7 @@
  *
  * 1. Create CacheFactory using the user specified settings or from the
  * gfcpp.properties file by default.
- * 2. Create a GemFire Cache.
+ * 2. Create a Geode Cache.
  * 3. Get the example Regions from the Cache.
  * 4. Perform some operations which should cause exceptions.
  * 5. Close the Cache.
@@ -30,10 +30,10 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The Exceptions QuickStart example.
@@ -48,10 +48,10 @@ int main(int argc, char** argv) {
 
     LOGINFO("Created CacheFactory");
 
-    // Create a GemFire Cache with the "clientExceptions.xml" Cache XML file.
+    // Create a Geode Cache with the "clientExceptions.xml" Cache XML file.
     CachePtr cachePtr = cacheFactory->setSubscriptionEnabled(true)->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Regions from the Cache which are declared in the Cache
     // XML file.
@@ -93,9 +93,8 @@ int main(int argc, char** argv) {
       LOGINFO("UNEXPECTED: Put should not have succeeded");
 
       return 1;
-    } catch (const RegionDestroyedException& gemfireExcp) {
-      LOGINFO("Expected RegionDestroyedException: %s",
-              gemfireExcp.getMessage());
+    } catch (const RegionDestroyedException& geodeExcp) {
+      LOGINFO("Expected RegionDestroyedException: %s", geodeExcp.getMessage());
     }
 
     try {
@@ -108,14 +107,14 @@ int main(int argc, char** argv) {
       LOGINFO("UNEXPECTED: Cache create should not have succeeded");
 
       return 1;
-    } catch (const IllegalStateException& gemfireExcp) {
-      LOGINFO("Expected IllegalStateException: %s", gemfireExcp.getMessage());
+    } catch (const IllegalStateException& geodeExcp) {
+      LOGINFO("Expected IllegalStateException: %s", geodeExcp.getMessage());
     }
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     try {
       // Put an Entry into the Region when Cache is already closed.
@@ -124,15 +123,14 @@ int main(int argc, char** argv) {
       LOGINFO("UNEXPECTED: Put should not have succeeded");
 
       return 1;
-    } catch (const RegionDestroyedException& gemfireExcp) {
-      LOGINFO("Expected RegionDestroyedException: %s",
-              gemfireExcp.getMessage());
+    } catch (const RegionDestroyedException& geodeExcp) {
+      LOGINFO("Expected RegionDestroyedException: %s", geodeExcp.getMessage());
     }
 
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("Exceptions GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("Exceptions Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/ExecuteFunctions.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/ExecuteFunctions.cpp b/src/quickstart/cpp/ExecuteFunctions.cpp
index 4fbf97f..7f351bf 100644
--- a/src/quickstart/cpp/ExecuteFunctions.cpp
+++ b/src/quickstart/cpp/ExecuteFunctions.cpp
@@ -3,7 +3,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
  * 2. Create the example Region Programmatically.
  * 3. Populate some objects on the Region.
  * 4. Create Execute Objects
@@ -12,10 +12,10 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 char* getFuncIName = (char*)"MultiGetFunctionI";
@@ -31,12 +31,12 @@ int main(int argc, char** argv) {
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
     LOGINFO("Created CacheFactory");
 
-    // Create a GemFire Cache.
+    // Create a Geode Cache.
     CachePtr cachePtr = cacheFactory->setSubscriptionEnabled(true)
                             ->addServer("localhost", 50505)
                             ->addServer("localhost", 40404)
                             ->create();
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Create the example Region Programmatically
     RegionPtr regPtr0 = cachePtr->createRegionFactory(CACHING_PROXY)
@@ -159,16 +159,15 @@ int main(int argc, char** argv) {
     getResult = false;
     exc->withFilter(routingObj)->withArgs(args)->execute(putFuncName, 15);
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("Function Execution GemFire Exception: %s",
-             gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("Function Execution Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/HACache.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/HACache.cpp b/src/quickstart/cpp/HACache.cpp
index 75ec35f..db313b0 100644
--- a/src/quickstart/cpp/HACache.cpp
+++ b/src/quickstart/cpp/HACache.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache with redundancy level = 1.
+ * 1. Create a Geode Cache with redundancy level = 1.
  * 2. Get the example Region from the Cache.
  * 3. Call registerKeys() on the Region.
  * 4. Call registerRegex() on the Region.
@@ -30,10 +30,10 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The HA QuickStart example.
@@ -41,9 +41,9 @@ int main(int argc, char** argv) {
   try {
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
-    LOGINFO("Connected to the GemFire Distributed System");
+    LOGINFO("Connected to the Geode Distributed System");
 
-    // Create a GemFire Cache with the "clientHACache.xml" Cache XML file.
+    // Create a Geode Cache with the "clientHACache.xml" Cache XML file.
     CachePtr cachePtr =
         cacheFactory->set("cache-xml-file", "XMLs/clientHACache.xml")
             ->addServer("localhost", 40404)
@@ -52,7 +52,7 @@ int main(int argc, char** argv) {
             ->setSubscriptionEnabled(true)
             ->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the Cache XML
     // file.
@@ -102,16 +102,16 @@ int main(int argc, char** argv) {
 
     LOGINFO("Unregistered keys");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("HACache GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("HACache Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/LoaderListenerWriter.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/LoaderListenerWriter.cpp b/src/quickstart/cpp/LoaderListenerWriter.cpp
index 127aafa..a566ba7 100644
--- a/src/quickstart/cpp/LoaderListenerWriter.cpp
+++ b/src/quickstart/cpp/LoaderListenerWriter.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- *  1. Create a GemFire Cache.
+ *  1. Create a Geode Cache.
  *  2. Get the example Region from the Cache.
  *  3. Set the SimpleCacheLoader, SimpleCacheListener and SimpleCacheWriter
  * plugins on the Region.
@@ -34,7 +34,7 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
 // Include the SimpleCacheLoader, SimpleCacheListener and SimpleCacheWriter
@@ -43,7 +43,7 @@
 #include "plugins/SimpleCacheListener.hpp"
 #include "plugins/SimpleCacheWriter.hpp"
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The LoaderListenerWriter QuickStart example.
@@ -51,14 +51,14 @@ int main(int argc, char** argv) {
   try {
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
-    // Create a GemFire Cache with the "clientLoaderListenerWriter.xml" Cache
+    // Create a Geode Cache with the "clientLoaderListenerWriter.xml" Cache
     // XML file.
     CachePtr cachePtr =
         cacheFactory
             ->set("cache-xml-file", "XMLs/clientLoaderListenerWriter.xml")
             ->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the Cache XML
     // file.
@@ -98,17 +98,17 @@ int main(int argc, char** argv) {
     // Get a destroyed Key.
     regionPtr->get("Key3");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("LoaderListenerWriter GemFire Exception: %s",
-             gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("LoaderListenerWriter Geode Exception: %s",
+             geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/MultiuserSecurity.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/MultiuserSecurity.cpp b/src/quickstart/cpp/MultiuserSecurity.cpp
index ec41ff7..003843d 100644
--- a/src/quickstart/cpp/MultiuserSecurity.cpp
+++ b/src/quickstart/cpp/MultiuserSecurity.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache with multiuser enabled.
+ * 1. Create a Geode Cache with multiuser enabled.
  * 2. Creates userCache using user "root". Who is authorized to do get and put
  * operations.
  * 3. Creates userCache using user "writer2". Who is authorized to do only put
@@ -29,10 +29,10 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 char* getFuncIName = (char*)"MultiGetFunctionI";
@@ -146,17 +146,17 @@ int main(int argc, char** argv) {
     // to do this one need to setup OpenSSL.
     // secProp->insert("security-client-dhalgo", "Blowfish:128");
 
-    // Connect to the GemFire Distributed System using the settings from the
+    // Connect to the Geode Distributed System using the settings from the
     // gfcpp.properties file by default, programatically
     // overriding secProp properties.
 
-    // Create a GemFire Cache.
+    // Create a Geode Cache.
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory(secProp);
 
     CachePtr cachePtr =
         cacheFactory->setMultiuserAuthentication(true)->create();
 
-    LOGINFO("Created the Gemfire Cache with multiuser enable.");
+    LOGINFO("Created the Geode Cache with multiuser enable.");
 
     RegionFactoryPtr regionFactory = cachePtr->createRegionFactory(PROXY);
 
@@ -183,17 +183,17 @@ int main(int argc, char** argv) {
           "get operation.");
     }
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("FAILED:MultiuserSecurityExample GemFire Exception: %s",
-             gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("FAILED:MultiuserSecurityExample Geode Exception: %s",
+             geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/PdxAutoSerializer.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/PdxAutoSerializer.cpp b/src/quickstart/cpp/PdxAutoSerializer.cpp
index bb8370b..08de51c 100644
--- a/src/quickstart/cpp/PdxAutoSerializer.cpp
+++ b/src/quickstart/cpp/PdxAutoSerializer.cpp
@@ -20,7 +20,7 @@
  * This examples creates pool using locator.
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
  * 2. Get the example Region from the Pool.
  * 3. Populate some Pdx Type query objects on the Region.
  * 4. Get the pool, get the Query Service from Cache. Pool is define in
@@ -33,14 +33,14 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
 // Include our Query objects, viz. PortfolioPdx and PositionPdx.
 #include "queryobjects/PortfolioPdxAuto.hpp"
 #include "queryobjects/PositionPdxAuto.hpp"
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // Use the "testobject" namespace for the query objects.
@@ -51,7 +51,7 @@ int main(int argc, char** argv) {
   try {
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
-    // Create a GemFire Cache with the "clientPdxRemoteQuery.xml" Cache XML
+    // Create a Geode Cache with the "clientPdxRemoteQuery.xml" Cache XML
     // file.
     // CachePtr cachePtr = cacheFactory->set("cache-xml-file",
     // "XMLs/clientPdxAutoSerializer.xml")->create();
@@ -59,7 +59,7 @@ int main(int argc, char** argv) {
         cacheFactory->set("cache-xml-file", "XMLs/clientPdxAutoSerializer.xml")
             ->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the Cache XML
     // file.
@@ -133,17 +133,16 @@ int main(int argc, char** argv) {
 
     LOGINFO("Region existsValue() returned %s", existsValue ? "true" : "false");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("PdxAutoSerializer GemFire Exception: %s",
-             gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("PdxAutoSerializer Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/PdxInstance.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/PdxInstance.cpp b/src/quickstart/cpp/PdxInstance.cpp
index f238d30..5babcad 100644
--- a/src/quickstart/cpp/PdxInstance.cpp
+++ b/src/quickstart/cpp/PdxInstance.cpp
@@ -21,7 +21,7 @@
 *
 * This example shows PdxInstanceFactory and PdxInstance usage.
 *
-* 1. Create a GemFire Cache.
+* 1. Create a Geode Cache.
 * 2. Creates the PdxInstanceFactory for Person class.
 * 3. Then creates instance of PdxInstance
 * 4. It does put.
@@ -30,10 +30,10 @@
 *
 */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 class Person {
@@ -59,14 +59,14 @@ class Person {
 // The PdxInstance QuickStart example.
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache.
+    // Create a Geode Cache.
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
     CachePtr cachePtr =
         cacheFactory->set("cache-xml-file", "XMLs/clientPdxInstance.xml")
             ->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the Cache XML
     // file.
@@ -116,16 +116,16 @@ int main(int argc, char** argv) {
 
     delete p;
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("PdxInstance GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("PdxInstance Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/PdxRemoteQuery.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/PdxRemoteQuery.cpp b/src/quickstart/cpp/PdxRemoteQuery.cpp
index a69acc9..4fb4e44 100644
--- a/src/quickstart/cpp/PdxRemoteQuery.cpp
+++ b/src/quickstart/cpp/PdxRemoteQuery.cpp
@@ -20,7 +20,7 @@
  * This examples creates pool using locator.
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
  * 2. Get the example Region from the Pool.
  * 3. Populate some Pdx Type query objects on the Region.
  * 4. Get the pool, get the Query Service from Cache. Pool is define in
@@ -33,14 +33,14 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
 // Include our Query objects, viz. PortfolioPdx and PositionPdx.
 #include "queryobjects/PortfolioPdx.hpp"
 #include "queryobjects/PositionPdx.hpp"
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // Use the "testobject" namespace for the query objects.
@@ -51,13 +51,13 @@ int main(int argc, char** argv) {
   try {
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
-    // Create a GemFire Cache with the "clientPdxRemoteQuery.xml" Cache XML
+    // Create a Geode Cache with the "clientPdxRemoteQuery.xml" Cache XML
     // file.
     CachePtr cachePtr =
         cacheFactory->set("cache-xml-file", "XMLs/clientPdxRemoteQuery.xml")
             ->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the Cache XML
     // file.
@@ -129,16 +129,16 @@ int main(int argc, char** argv) {
 
     LOGINFO("Region existsValue() returned %s", existsValue ? "true" : "false");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("PdxRemoteQuery GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("PdxRemoteQuery Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/PdxSerializer.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/PdxSerializer.cpp b/src/quickstart/cpp/PdxSerializer.cpp
index ed7b7de..48db93a 100644
--- a/src/quickstart/cpp/PdxSerializer.cpp
+++ b/src/quickstart/cpp/PdxSerializer.cpp
@@ -21,7 +21,7 @@
 *
 * This example shows PdxSerializer usage.
 *
-* 1. Create a GemFire Cache.
+* 1. Create a Geode Cache.
 * 2. Get the Person from the Cache.
 * 3. Populate some query Person objects on the Region.
 * 4. Get the pool, get the Query Service from Pool. Pool is define in
@@ -33,10 +33,10 @@
 *
 */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 static const char* CLASSNAME = "com.example.Person";
@@ -142,15 +142,15 @@ class PersonPdxSerializer : public PdxSerializer {
 // without having corresponding java classes at server.
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache.
+    // Create a Geode Cache.
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
-    // Create a GemFire Cache with the "clientPdxSerializer.xml" Cache XML file.
+    // Create a Geode Cache with the "clientPdxSerializer.xml" Cache XML file.
     CachePtr cachePtr =
         cacheFactory->set("cache-xml-file", "XMLs/clientPdxSerializer.xml")
             ->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the Cache XML
     // file.
@@ -231,16 +231,16 @@ int main(int argc, char** argv) {
 
     LOGINFO("Region existsValue() returned %s", existsValue ? "true" : "false");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("PdxSerializer GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("PdxSerializer Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/PoolCqQuery.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/PoolCqQuery.cpp b/src/quickstart/cpp/PoolCqQuery.cpp
index 8dabd8f..4a0c133 100644
--- a/src/quickstart/cpp/PoolCqQuery.cpp
+++ b/src/quickstart/cpp/PoolCqQuery.cpp
@@ -22,7 +22,7 @@
  *
  * 1. Create CacheFactory using the user specified properties or from the
  * gfcpp.properties file by default.
- * 2. Create a GemFire Cache.
+ * 2. Create a Geode Cache.
  * 3. Get the Portfolios Region from the Pool.
  * 4. Populate some query objects on the Region.
  * 5. Get the Query Service from cache.
@@ -32,14 +32,14 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
 // Include our Query objects, viz. Portfolio and Position.
 #include "queryobjects/Portfolio.hpp"
 #include "queryobjects/Position.hpp"
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // Use the "testobject" namespace for the query objects.
@@ -89,10 +89,10 @@ int main(int argc, char** argv) {
 
     LOGINFO("Created CacheFactory");
 
-    // Create a GemFire Cache with the "clientPoolCqQuery.xml" Cache XML file.
+    // Create a Geode Cache with the "clientPoolCqQuery.xml" Cache XML file.
     CachePtr cachePtr = cacheFactory->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the Portfolios Region from the Cache which is declared in the Cache
     // XML file.
@@ -168,23 +168,23 @@ int main(int argc, char** argv) {
       }
     }
 
-    // Stop the GemFire Continuous query.
+    // Stop the Geode Continuous query.
     qry->stop();
 
-    // Close the GemFire Continuous query.
+    // Close the Geode Continuous query.
     qry->close();
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
 
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("PoolCqQuery GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("PoolCqQuery Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/PoolRemoteQuery.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/PoolRemoteQuery.cpp b/src/quickstart/cpp/PoolRemoteQuery.cpp
index a42d863..57c06da 100644
--- a/src/quickstart/cpp/PoolRemoteQuery.cpp
+++ b/src/quickstart/cpp/PoolRemoteQuery.cpp
@@ -20,7 +20,7 @@
  * This examples creates pool using locator.
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
  * 2. Get the example Region from the Pool.
  * 3. Populate some query objects on the Region.
  * 4. Get the pool, get the Query Service from Cache. Pool is define in
@@ -33,14 +33,14 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
 // Include our Query objects, viz. Portfolio and Position.
 #include "queryobjects/Portfolio.hpp"
 #include "queryobjects/Position.hpp"
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // Use the "testobject" namespace for the query objects.
@@ -51,13 +51,13 @@ int main(int argc, char** argv) {
   try {
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
-    // Create a GemFire Cache with the "clientRemoteQueryWithPool.xml" Cache XML
+    // Create a Geode Cache with the "clientRemoteQueryWithPool.xml" Cache XML
     // file.
     CachePtr cachePtr =
         cacheFactory->set("cache-xml-file", "XMLs/clientPoolRemoteQuery.xml")
             ->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the Cache XML
     // file.
@@ -129,17 +129,17 @@ int main(int argc, char** argv) {
 
     LOGINFO("Region existsValue() returned %s", existsValue ? "true" : "false");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
 
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("PoolRemoteQuery GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("PoolRemoteQuery Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/PoolWithEndpoints.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/PoolWithEndpoints.cpp b/src/quickstart/cpp/PoolWithEndpoints.cpp
index cc8ed76..27d8cc1 100644
--- a/src/quickstart/cpp/PoolWithEndpoints.cpp
+++ b/src/quickstart/cpp/PoolWithEndpoints.cpp
@@ -22,7 +22,7 @@
  *
  * 1. Create CacheFactory using the settings from the gfcpp.properties file by
  * default.
- * 2. Create a GemFire Cache.
+ * 2. Create a Geode Cache.
  * 3. Create Poolfactory with endpoint and then create pool using poolfactory.
  * 4. Create a Example Region programmatically.
  * 5. Put Entries (Key and Value pairs) into the Region.
@@ -33,10 +33,10 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The PoolWithEndpoints QuickStart example.
@@ -48,10 +48,10 @@ int main(int argc, char** argv) {
 
     LOGINFO("Created CacheFactory");
 
-    // Create a GemFire Cache.
+    // Create a Geode Cache.
     CachePtr cachePtr = cacheFactory->setSubscriptionEnabled(true)->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Create Poolfactory with endpoint and then create pool using poolfactory.
     PoolFactoryPtr pfact = PoolManager::createFactory();
@@ -101,18 +101,17 @@ int main(int argc, char** argv) {
 
     LOGINFO("Destroyed the second Entry in the Region");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
 
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("PoolWithEndpoints GemFire Exception: %s",
-             gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("PoolWithEndpoints Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/PutAllGetAllOperations.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/PutAllGetAllOperations.cpp b/src/quickstart/cpp/PutAllGetAllOperations.cpp
index 18e4ec2..807662b 100644
--- a/src/quickstart/cpp/PutAllGetAllOperations.cpp
+++ b/src/quickstart/cpp/PutAllGetAllOperations.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache using CacheFactory. By default it will connect to
+ * 1. Create a Geode Cache using CacheFactory. By default it will connect to
  * "localhost" at port 40404".
  * 2. Create a Example Region.
  * 3. PutAll Entries (Key and Value pairs) into the Region.
@@ -29,20 +29,20 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The PutAllGetAllOperations QuickStart example.
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache using CacheFactory. By default it will connect to
+    // Create a Geode Cache using CacheFactory. By default it will connect to
     // "localhost" at port 40404".
     CachePtr cachePtr = CacheFactory::createCacheFactory()->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Set Attributes for the region.
     RegionFactoryPtr regionFactory =
@@ -79,18 +79,18 @@ int main(int argc, char** argv) {
 
     LOGINFO("Obtained 100 entries from the Region");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
 
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("PutAllGetAllOperations GemFire Exception: %s",
-             gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("PutAllGetAllOperations Geode Exception: %s",
+             geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/RefIDExample.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/RefIDExample.cpp b/src/quickstart/cpp/RefIDExample.cpp
index bc41d2e..396168f 100644
--- a/src/quickstart/cpp/RefIDExample.cpp
+++ b/src/quickstart/cpp/RefIDExample.cpp
@@ -21,7 +21,7 @@
  * refid.
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
  * 2. Now it creates 2 Pools with the names poolName1, poolName2 respectively.
  * 3. Sets the region attribute using refid.
  * 4. Gets the region "root1" with poolName1, and region "root2" with poolName2.
@@ -34,16 +34,16 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The RefIDExample QuickStart example.
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache using XMLs/clientRefIDExample.xml.
+    // Create a Geode Cache using XMLs/clientRefIDExample.xml.
     PropertiesPtr prptr = Properties::create();
     prptr->insert("cache-xml-file", "XMLs/clientRefIDExample.xml");
 
@@ -51,7 +51,7 @@ int main(int argc, char** argv) {
 
     CachePtr cachePtr = cacheFactory->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // get the root1 Region.
     RegionPtr regionPtr1 = cachePtr->getRegion("root1");
@@ -110,16 +110,16 @@ int main(int argc, char** argv) {
 
     LOGINFO("Destroyed the second Entry in both the Regions");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("RefIDExample GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("RefIDExample Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/RegisterInterest.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/RegisterInterest.cpp b/src/quickstart/cpp/RegisterInterest.cpp
index 26b5d1b..57f77aa 100644
--- a/src/quickstart/cpp/RegisterInterest.cpp
+++ b/src/quickstart/cpp/RegisterInterest.cpp
@@ -22,7 +22,7 @@
  *
  * 1. Create CacheFactory using the user specified properties or from the
  * gfcpp.properties file by default.
- * 2. Create a GemFire Cache.
+ * 2. Create a Geode Cache.
  * 3. Get the example Region from the Cache.
  * 4. Call registerAllKeys() and unregisterAllKeys() on the Region.
  * 5. Call registerKeys() and unregisterKeys() on the Region.
@@ -31,10 +31,10 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The RegisterInterest QuickStart example.
@@ -49,11 +49,11 @@ int main(int argc, char** argv) {
 
     LOGINFO("Created CacheFactory");
 
-    // Create a GemFire Cache with the "clientRegisterInterest.xml" Cache XML
+    // Create a Geode Cache with the "clientRegisterInterest.xml" Cache XML
     // file.
     CachePtr cachePtr = cacheFactory->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the Cache XML
     // file.
@@ -115,17 +115,16 @@ int main(int argc, char** argv) {
         "Called registerRegex() and unregisterRegex() with getInitialValues "
         "argument");
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("RegisterInterest GemFire Exception: %s",
-             gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("RegisterInterest Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/RemoteQuery.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/RemoteQuery.cpp b/src/quickstart/cpp/RemoteQuery.cpp
index 6ee2642..471f1d2 100644
--- a/src/quickstart/cpp/RemoteQuery.cpp
+++ b/src/quickstart/cpp/RemoteQuery.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache Programmatically.
+ * 1. Create a Geode Cache Programmatically.
  * 2. Create the example Region Programmatically.
  * 3. Populate some query objects on the Region.
  * 4. Execute a query that returns a Result Set.
@@ -30,14 +30,14 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
 // Include our Query objects, viz. Portfolio and Position.
 #include "queryobjects/Portfolio.hpp"
 #include "queryobjects/Position.hpp"
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // Use the "testobject" namespace for the query objects.
@@ -46,11 +46,11 @@ using namespace testobject;
 // The RemoteQuery QuickStart example.
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache Programmatically.
+    // Create a Geode Cache Programmatically.
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
     CachePtr cachePtr = cacheFactory->setSubscriptionEnabled(true)->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     RegionFactoryPtr regionFactory =
         cachePtr->createRegionFactory(CACHING_PROXY);
@@ -152,17 +152,17 @@ int main(int argc, char** argv) {
               pst->getFieldName(1), (*pst)[1]->toString()->asChar());
     }
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
 
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("RemoteQuery GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("RemoteQuery Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/Security.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/Security.cpp b/src/quickstart/cpp/Security.cpp
index 74fc286..752e50b 100644
--- a/src/quickstart/cpp/Security.cpp
+++ b/src/quickstart/cpp/Security.cpp
@@ -27,10 +27,10 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The Security QuickStart example.
@@ -42,20 +42,20 @@ int main(int argc, char** argv) {
     properties->insert("security-client-auth-factory",
                        "createPKCSAuthInitInstance");
     properties->insert("security-client-auth-library", "securityImpl");
-    properties->insert("security-keystorepath", "keystore/gemfire6.keystore");
-    properties->insert("security-alias", "gemfire6");
-    properties->insert("security-keystorepass", "gemfire");
+    properties->insert("security-keystorepath", "keystore/geode6.keystore");
+    properties->insert("security-alias", "geode6");
+    properties->insert("security-keystorepass", "geode");
     properties->insert("cache-xml-file", "XMLs/clientSecurity.xml");
 
     // overriding secProp properties.
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory(properties);
 
-    LOGINFO("Connected to the GemFire Distributed System");
+    LOGINFO("Connected to the Geode Distributed System");
 
-    // Create a GemFire Cache with the "clientSecurity.xml" Cache XML file.
+    // Create a Geode Cache with the "clientSecurity.xml" Cache XML file.
     CachePtr cachePtr = cacheFactory->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the Cache XML
     // file.
@@ -80,16 +80,16 @@ int main(int argc, char** argv) {
           expected.getMessage());
     }
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("Security GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("Security Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/Transactions.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/Transactions.cpp b/src/quickstart/cpp/Transactions.cpp
index 5b414d0..f5b009f 100644
--- a/src/quickstart/cpp/Transactions.cpp
+++ b/src/quickstart/cpp/Transactions.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
  * 2. Create the example Region Programmatically.
  * 3 Begin Transaction
  * 4. Put Entries (Key and Value pairs) into the Region.
@@ -35,21 +35,21 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The Transaction QuickStart example.
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache.
+    // Create a Geode Cache.
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
     CachePtr cachePtr = cacheFactory->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     RegionFactoryPtr regionFactory =
         cachePtr->createRegionFactory(CACHING_PROXY);
@@ -113,16 +113,16 @@ int main(int argc, char** argv) {
       LOGINFO("ERROR: Obtained the third entry from the Region.");
     }
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("Transaction GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("Transaction Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/TransactionsXA.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/TransactionsXA.cpp b/src/quickstart/cpp/TransactionsXA.cpp
index 99b16a2..7ce3597 100644
--- a/src/quickstart/cpp/TransactionsXA.cpp
+++ b/src/quickstart/cpp/TransactionsXA.cpp
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
  * 2. Create the example Region Programmatically.
  * 3. Begin Transaction
  * 4. Put Entries (Key and Value pairs) into the Region.
@@ -37,21 +37,21 @@
  *
  */
 
-// Include the GemFire library.
+// Include the Geode library.
 #include <gfcpp/GeodeCppCache.hpp>
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The Transaction QuickStart example.
 int main(int argc, char** argv) {
   try {
-    // Create a GemFire Cache.
+    // Create a Geode Cache.
     CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
 
     CachePtr cachePtr = cacheFactory->create();
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     RegionFactoryPtr regionFactory =
         cachePtr->createRegionFactory(CACHING_PROXY);
@@ -125,16 +125,16 @@ int main(int argc, char** argv) {
       LOGINFO("ERROR: Obtained the third entry from the Region.");
     }
 
-    // Close the GemFire Cache.
+    // Close the Geode Cache.
     cachePtr->close();
 
-    LOGINFO("Closed the GemFire Cache");
+    LOGINFO("Closed the Geode Cache");
 
     return 0;
   }
   // An exception should not occur
-  catch (const Exception& gemfireExcp) {
-    LOGERROR("Transaction GemFire Exception: %s", gemfireExcp.getMessage());
+  catch (const Exception& geodeExcp) {
+    LOGERROR("Transaction Geode Exception: %s", geodeExcp.getMessage());
 
     return 1;
   }