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/02/21 17:40:20 UTC

[07/31] geode-native git commit: GEODE-2476: Replace gfcpp with geode.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/TimeBomb.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TimeBomb.hpp b/src/cppcache/integration-test/TimeBomb.hpp
index 8ccf811..61f7eb0 100644
--- a/src/cppcache/integration-test/TimeBomb.hpp
+++ b/src/cppcache/integration-test/TimeBomb.hpp
@@ -111,5 +111,4 @@ class TimeBomb : public ACE_Task_Base {
   ~TimeBomb() {}
 };
 
-
-#endif // GEODE_INTEGRATION_TEST_TIMEBOMB_H_
+#endif  // GEODE_INTEGRATION_TEST_TIMEBOMB_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/fw_dunit.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/fw_dunit.cpp b/src/cppcache/integration-test/fw_dunit.cpp
index f99b128..57673a0 100644
--- a/src/cppcache/integration-test/fw_dunit.cpp
+++ b/src/cppcache/integration-test/fw_dunit.cpp
@@ -33,7 +33,7 @@
 
 #include <ace/ACE.h>
 
-// #include <gfcpp/GeodeCppCache.hpp>
+// #include <geode/GeodeCppCache.hpp>
 
 #include <typeinfo>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/fw_dunit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/fw_dunit.hpp b/src/cppcache/integration-test/fw_dunit.hpp
index 5187fdf..096e124 100644
--- a/src/cppcache/integration-test/fw_dunit.hpp
+++ b/src/cppcache/integration-test/fw_dunit.hpp
@@ -365,5 +365,4 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { return dunit::dmain(argc, argv); }
 
 #include "no_cout.hpp"
 
-
-#endif // GEODE_INTEGRATION_TEST_FW_DUNIT_H_
+#endif  // GEODE_INTEGRATION_TEST_FW_DUNIT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/fw_helper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/fw_helper.hpp b/src/cppcache/integration-test/fw_helper.hpp
index 9af05f7..dfe8f4e 100644
--- a/src/cppcache/integration-test/fw_helper.hpp
+++ b/src/cppcache/integration-test/fw_helper.hpp
@@ -87,8 +87,8 @@ BEGIN_TEST.
 #include <typeinfo>
 
 #include <CppCacheLibrary.hpp>
-#include <gfcpp/Exception.hpp>
-#include <gfcpp/Log.hpp>
+#include <geode/Exception.hpp>
+#include <geode/Log.hpp>
 
 #include <list>
 #include <string>
@@ -231,5 +231,4 @@ int main(int argc, char* argv[])
   }                 \
   a_##x;
 
-
-#endif // GEODE_INTEGRATION_TEST_FW_HELPER_H_
+#endif  // GEODE_INTEGRATION_TEST_FW_HELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/fw_perf.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/fw_perf.hpp b/src/cppcache/integration-test/fw_perf.hpp
index 9fd7765..a000e57 100644
--- a/src/cppcache/integration-test/fw_perf.hpp
+++ b/src/cppcache/integration-test/fw_perf.hpp
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 /**
 
 fw_perf.hpp provides framework macros for measuring performance,
@@ -54,8 +53,8 @@ established limits, a TestException will be thrown.
 #include <string>
 #include <map>
 
-#include <gfcpp/DataOutput.hpp>
-#include <gfcpp/DataInput.hpp>
+#include <geode/DataOutput.hpp>
+#include <geode/DataInput.hpp>
 
 #include <ace/Task.h>
 #include <ace/Condition_T.h>
@@ -246,5 +245,4 @@ class Thread : public ACE_Task_Base {
 //};
 }  // namespace perf
 
-
-#endif // GEODE_INTEGRATION_TEST_FW_PERF_H_
+#endif  // GEODE_INTEGRATION_TEST_FW_PERF_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/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 1b5d396..82708b5 100644
--- a/src/cppcache/integration-test/fw_spawn.hpp
+++ b/src/cppcache/integration-test/fw_spawn.hpp
@@ -32,14 +32,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 {
@@ -126,5 +126,4 @@
 
 };  // namespace dunit.
 
-
-#endif // GEODE_INTEGRATION_TEST_FW_SPAWN_H_
+#endif  // GEODE_INTEGRATION_TEST_FW_SPAWN_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/locator_globals.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/locator_globals.hpp b/src/cppcache/integration-test/locator_globals.hpp
index f7187bd..381371d 100644
--- a/src/cppcache/integration-test/locator_globals.hpp
+++ b/src/cppcache/integration-test/locator_globals.hpp
@@ -20,12 +20,10 @@
  * limitations under the License.
  */
 
-
 static int numberOfLocators = 1;
 bool isLocalServer = false;
 bool isLocator = false;
 const char* locatorsG =
     CacheHelper::getLocatorHostPort(isLocator, isLocalServer, numberOfLocators);
 
-
-#endif // GEODE_INTEGRATION_TEST_LOCATOR_GLOBALS_H_
+#endif  // GEODE_INTEGRATION_TEST_LOCATOR_GLOBALS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/no_cout.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/no_cout.hpp b/src/cppcache/integration-test/no_cout.hpp
index 24924fb..fe191fe 100644
--- a/src/cppcache/integration-test/no_cout.hpp
+++ b/src/cppcache/integration-test/no_cout.hpp
@@ -80,4 +80,4 @@ extern NOCout::FLAGS hex;
 extern NOCout::FLAGS dec;
 }  // namespace test
 
-#endif // GEODE_INTEGRATION_TEST_NO_COUT_H_
+#endif  // GEODE_INTEGRATION_TEST_NO_COUT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testAttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testAttributesFactory.cpp b/src/cppcache/integration-test/testAttributesFactory.cpp
index 0c4d9c5..9489f6f 100644
--- a/src/cppcache/integration-test/testAttributesFactory.cpp
+++ b/src/cppcache/integration-test/testAttributesFactory.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testAttributesFactory"
 
 #include "fw_helper.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <CacheRegionHelper.hpp>
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testAttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testAttributesMutator.cpp b/src/cppcache/integration-test/testAttributesMutator.cpp
index e007b3b..662bb33 100644
--- a/src/cppcache/integration-test/testAttributesMutator.cpp
+++ b/src/cppcache/integration-test/testAttributesMutator.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testAttributesMutator"
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <CacheRegionHelper.hpp>
 
 // this is a test.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testCache.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testCache.cpp b/src/cppcache/integration-test/testCache.cpp
index 12e754f..2937c93 100644
--- a/src/cppcache/integration-test/testCache.cpp
+++ b/src/cppcache/integration-test/testCache.cpp
@@ -17,7 +17,7 @@
 
 #define ROOT_NAME "testCache"
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <CacheRegionHelper.hpp>
 #include "fw_helper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testCacheless.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testCacheless.cpp b/src/cppcache/integration-test/testCacheless.cpp
index 3cd9f6d..491d05b 100644
--- a/src/cppcache/integration-test/testCacheless.cpp
+++ b/src/cppcache/integration-test/testCacheless.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #define ROOT_SCOPE DISTRIBUTED_ACK
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testConnect.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testConnect.cpp b/src/cppcache/integration-test/testConnect.cpp
index da5463c..850a215 100644
--- a/src/cppcache/integration-test/testConnect.cpp
+++ b/src/cppcache/integration-test/testConnect.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testConnect"
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testCreateAndDestroyPool.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testCreateAndDestroyPool.cpp b/src/cppcache/integration-test/testCreateAndDestroyPool.cpp
index 55025f5..6970f0c 100644
--- a/src/cppcache/integration-test/testCreateAndDestroyPool.cpp
+++ b/src/cppcache/integration-test/testCreateAndDestroyPool.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testDataOutput.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testDataOutput.cpp b/src/cppcache/integration-test/testDataOutput.cpp
index 80f7ac3..648e271 100644
--- a/src/cppcache/integration-test/testDataOutput.cpp
+++ b/src/cppcache/integration-test/testDataOutput.cpp
@@ -18,8 +18,8 @@
 #define ROOT_NAME "testDataOutput"
 
 #include "fw_helper.hpp"
-#include <gfcpp/DataOutput.hpp>
-#include <gfcpp/DataInput.hpp>
+#include <geode/DataOutput.hpp>
+#include <geode/DataInput.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testDunit.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testDunit.cpp b/src/cppcache/integration-test/testDunit.cpp
index 2df54b3..0650816 100644
--- a/src/cppcache/integration-test/testDunit.cpp
+++ b/src/cppcache/integration-test/testDunit.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testDunit"
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 int getSlaveTest() {
   return dunit::globals()->getIntValue("test_alive_slaves");

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testEntriesMap.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testEntriesMap.cpp b/src/cppcache/integration-test/testEntriesMap.cpp
index 7e31f49..41f2842 100644
--- a/src/cppcache/integration-test/testEntriesMap.cpp
+++ b/src/cppcache/integration-test/testEntriesMap.cpp
@@ -28,7 +28,7 @@ END_TEST(NotOnWindows)
 #else
 
 //#define BUILD_CPPCACHE 1
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <LRUEntriesMap.hpp>
 #include <LRUMapEntry.hpp>
 #include <VersionTag.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testEntriesMapForVersioning.cpp b/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
index f044520..02560bf 100644
--- a/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
+++ b/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gf_base.hpp>
+#include <geode/gf_base.hpp>
 
 #include "fw_dunit.hpp"
 
@@ -33,7 +33,7 @@ END_MAIN
 #else
 
 //#define BUILD_CPPCACHE 1
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <LRUEntriesMap.hpp>
 #include <LRUMapEntry.hpp>
 #include <LRUExpMapEntry.hpp>
@@ -44,7 +44,7 @@ END_MAIN
 #include <string>
 #include <vector>
 #include <LocalRegion.hpp>
-#include <gfcpp/DataInput.hpp>
+#include <geode/DataInput.hpp>
 #include "DeltaEx.hpp"
 #include "CacheableToken.hpp"
 #include "DiskStoreId.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testExpiration.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testExpiration.cpp b/src/cppcache/integration-test/testExpiration.cpp
index c0d7cc7..5aa2f3f 100644
--- a/src/cppcache/integration-test/testExpiration.cpp
+++ b/src/cppcache/integration-test/testExpiration.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testExpiration"
 
 #include "fw_helper.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <CacheRegionHelper.hpp>
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testFwPerf.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testFwPerf.cpp b/src/cppcache/integration-test/testFwPerf.cpp
index db466d7..a8e73c1 100644
--- a/src/cppcache/integration-test/testFwPerf.cpp
+++ b/src/cppcache/integration-test/testFwPerf.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #define ROOT_NAME "testFwPerf"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testHeaders.sh
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testHeaders.sh b/src/cppcache/integration-test/testHeaders.sh
index 21bba51..0137094 100755
--- a/src/cppcache/integration-test/testHeaders.sh
+++ b/src/cppcache/integration-test/testHeaders.sh
@@ -22,7 +22,7 @@
 GFCPP=`echo $1 | perl -p -e 's/\\\/\//g'`
 #echo $GFCPP
 INCDIR=$GFCPP/include
-if [ ! -f "${INCDIR}/gfcpp/Region.hpp" ]; then
+if [ ! -f "${INCDIR}/geode/Region.hpp" ]; then
   echo "ERROR: Header files are not packed in product."
   exit 1
 fi

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testLRUList.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testLRUList.cpp b/src/cppcache/integration-test/testLRUList.cpp
index 5961071..8e24bd2 100644
--- a/src/cppcache/integration-test/testLRUList.cpp
+++ b/src/cppcache/integration-test/testLRUList.cpp
@@ -30,7 +30,7 @@ END_TEST(NotOnWindows)
 //#define BUILD_CPPCACHE
 
 #include <LRUList.cpp>
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testLinkage.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testLinkage.cpp b/src/cppcache/integration-test/testLinkage.cpp
index b2fc869..9db8f98 100644
--- a/src/cppcache/integration-test/testLinkage.cpp
+++ b/src/cppcache/integration-test/testLinkage.cpp
@@ -17,7 +17,7 @@
 
 #define ROOT_NAME "testLinkage"
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "fw_helper.hpp"
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testLogger.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testLogger.cpp b/src/cppcache/integration-test/testLogger.cpp
index 64acd34..a3daf0f 100644
--- a/src/cppcache/integration-test/testLogger.cpp
+++ b/src/cppcache/integration-test/testLogger.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testLogger"
 
 #include "fw_helper.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #ifndef WIN32
 #include <unistd.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp b/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp
index 15f890c..8655796 100644
--- a/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp
+++ b/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp
@@ -17,7 +17,7 @@
 
 #define ROOT_NAME "testOverflowPutGetSqLite"
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #include "fw_helper.hpp"
 #include <CacheableToken.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp b/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp
index 9418235..35fdc8f 100644
--- a/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp
+++ b/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp
@@ -16,7 +16,7 @@
  */
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/Task.h>
 #include <ace/Recursive_Thread_Mutex.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testRegionMap.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testRegionMap.cpp b/src/cppcache/integration-test/testRegionMap.cpp
index 903aeec..c3c4255 100644
--- a/src/cppcache/integration-test/testRegionMap.cpp
+++ b/src/cppcache/integration-test/testRegionMap.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #include "fw_helper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testRegionTemplateArgs.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testRegionTemplateArgs.cpp b/src/cppcache/integration-test/testRegionTemplateArgs.cpp
index b802ddf..523f80e 100644
--- a/src/cppcache/integration-test/testRegionTemplateArgs.cpp
+++ b/src/cppcache/integration-test/testRegionTemplateArgs.cpp
@@ -17,7 +17,7 @@
 
 #define ROOT_NAME "testRegionTemplateArgs"
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <CacheRegionHelper.hpp>
 #include "fw_helper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testSerialization.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testSerialization.cpp b/src/cppcache/integration-test/testSerialization.cpp
index be277f5..22039af 100644
--- a/src/cppcache/integration-test/testSerialization.cpp
+++ b/src/cppcache/integration-test/testSerialization.cpp
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gf_base.hpp>
+#include <geode/gf_base.hpp>
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
 
 #define ROOT_SCOPE DISTRIBUTED_ACK
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <SerializationRegistry.hpp>
-#include <gfcpp/CacheableString.hpp>
-#include <gfcpp/GeodeTypeIds.hpp>
+#include <geode/CacheableString.hpp>
+#include <geode/GeodeTypeIds.hpp>
 #include <GeodeTypeIdsImpl.hpp>
 
 // Use to init lib when testing components.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testSharedPtr.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testSharedPtr.cpp b/src/cppcache/integration-test/testSharedPtr.cpp
index e89fca2..a8753ad 100644
--- a/src/cppcache/integration-test/testSharedPtr.cpp
+++ b/src/cppcache/integration-test/testSharedPtr.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testSharedPtr"
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #include <HostAsm.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testSpinLock.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testSpinLock.cpp b/src/cppcache/integration-test/testSpinLock.cpp
index f460fa5..cfaa810 100644
--- a/src/cppcache/integration-test/testSpinLock.cpp
+++ b/src/cppcache/integration-test/testSpinLock.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testSpinLock"
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #include <Condition.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testSystemProperties.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testSystemProperties.cpp b/src/cppcache/integration-test/testSystemProperties.cpp
index dbbbffb..4ed4582 100644
--- a/src/cppcache/integration-test/testSystemProperties.cpp
+++ b/src/cppcache/integration-test/testSystemProperties.cpp
@@ -18,9 +18,9 @@
 #define ROOT_NAME "testSystemProperties"
 
 #include "fw_helper.hpp"
-#include "gfcpp/GeodeCppCache.hpp"
-#include "gfcpp/SystemProperties.hpp"
-#include "gfcpp/Properties.hpp"
+#include "geode/GeodeCppCache.hpp"
+#include "geode/SystemProperties.hpp"
+#include "geode/Properties.hpp"
 
 #ifndef WIN32
 #include <unistd.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientAfterRegionLive.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientAfterRegionLive.cpp b/src/cppcache/integration-test/testThinClientAfterRegionLive.cpp
index 3a2c6e4..5a9fdc5 100644
--- a/src/cppcache/integration-test/testThinClientAfterRegionLive.cpp
+++ b/src/cppcache/integration-test/testThinClientAfterRegionLive.cpp
@@ -23,7 +23,7 @@
 #define CLIENT1 s1p1
 #define CLIENT2 s1p2
 #define SERVER1 s2p1
-#include <gfcpp/CacheListener.hpp>
+#include <geode/CacheListener.hpp>
 // CacheHelper* cacheHelper = NULL;
 static bool isLocator = false;
 static bool isLocalServer = true;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientBigValue.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientBigValue.cpp b/src/cppcache/integration-test/testThinClientBigValue.cpp
index 983a664..0578579 100644
--- a/src/cppcache/integration-test/testThinClientBigValue.cpp
+++ b/src/cppcache/integration-test/testThinClientBigValue.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gf_base.hpp>
+#include <geode/gf_base.hpp>
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp b/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp
index 3114c7a..f0b3ab7 100644
--- a/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp
+++ b/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>
@@ -30,8 +30,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientCacheables.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCacheables.cpp b/src/cppcache/integration-test/testThinClientCacheables.cpp
index 1748fce..0ca8d06 100644
--- a/src/cppcache/integration-test/testThinClientCacheables.cpp
+++ b/src/cppcache/integration-test/testThinClientCacheables.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp b/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp
index ae19054..3931fe0 100644
--- a/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp
+++ b/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientCq.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCq.cpp b/src/cppcache/integration-test/testThinClientCq.cpp
index 26097ec..4ac6da0 100644
--- a/src/cppcache/integration-test/testThinClientCq.cpp
+++ b/src/cppcache/integration-test/testThinClientCq.cpp
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
-#include <gfcpp/CqAttributesFactory.hpp>
-#include <gfcpp/CqAttributes.hpp>
-#include <gfcpp/CqListener.hpp>
-#include <gfcpp/CqStatusListener.hpp>
-#include <gfcpp/CqQuery.hpp>
-#include <gfcpp/CqServiceStatistics.hpp>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/CqAttributesFactory.hpp>
+#include <geode/CqAttributes.hpp>
+#include <geode/CqListener.hpp>
+#include <geode/CqStatusListener.hpp>
+#include <geode/CqQuery.hpp>
+#include <geode/CqServiceStatistics.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -34,8 +34,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 #include "ThinClientCQ.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientCqDelta.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCqDelta.cpp b/src/cppcache/integration-test/testThinClientCqDelta.cpp
index e268714..2d91fc7 100644
--- a/src/cppcache/integration-test/testThinClientCqDelta.cpp
+++ b/src/cppcache/integration-test/testThinClientCqDelta.cpp
@@ -25,11 +25,11 @@
 #include "fw_dunit.hpp"
 #include <string>
 #include "CacheHelper.hpp"
-#include <gfcpp/CqAttributesFactory.hpp>
-#include <gfcpp/CqAttributes.hpp>
-#include <gfcpp/CqListener.hpp>
-#include <gfcpp/CqQuery.hpp>
-#include <gfcpp/CqServiceStatistics.hpp>
+#include <geode/CqAttributesFactory.hpp>
+#include <geode/CqAttributes.hpp>
+#include <geode/CqListener.hpp>
+#include <geode/CqQuery.hpp>
+#include <geode/CqServiceStatistics.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientCqDurable.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCqDurable.cpp b/src/cppcache/integration-test/testThinClientCqDurable.cpp
index 2cda0cd..862795a 100644
--- a/src/cppcache/integration-test/testThinClientCqDurable.cpp
+++ b/src/cppcache/integration-test/testThinClientCqDurable.cpp
@@ -16,11 +16,11 @@
  */
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
-#include <gfcpp/CqAttributesFactory.hpp>
-#include <gfcpp/CqAttributes.hpp>
-#include <gfcpp/CqListener.hpp>
-#include <gfcpp/CqQuery.hpp>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/CqAttributesFactory.hpp>
+#include <geode/CqAttributes.hpp>
+#include <geode/CqListener.hpp>
+#include <geode/CqQuery.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -30,8 +30,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 #include "ThinClientCQ.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientCqFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCqFailover.cpp b/src/cppcache/integration-test/testThinClientCqFailover.cpp
index 3394234..eb6b252 100644
--- a/src/cppcache/integration-test/testThinClientCqFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientCqFailover.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
-#include <gfcpp/CqAttributesFactory.hpp>
-#include <gfcpp/CqAttributes.hpp>
-#include <gfcpp/CqListener.hpp>
-#include <gfcpp/CqQuery.hpp>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/CqAttributesFactory.hpp>
+#include <geode/CqAttributes.hpp>
+#include <geode/CqListener.hpp>
+#include <geode/CqQuery.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>
@@ -33,8 +33,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 #include "ThinClientCQ.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientCqHAFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCqHAFailover.cpp b/src/cppcache/integration-test/testThinClientCqHAFailover.cpp
index 279c148..1b9fbda 100644
--- a/src/cppcache/integration-test/testThinClientCqHAFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientCqHAFailover.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
-#include <gfcpp/CqAttributesFactory.hpp>
-#include <gfcpp/CqAttributes.hpp>
-#include <gfcpp/CqListener.hpp>
-#include <gfcpp/CqQuery.hpp>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/CqAttributesFactory.hpp>
+#include <geode/CqAttributes.hpp>
+#include <geode/CqListener.hpp>
+#include <geode/CqQuery.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>
@@ -33,8 +33,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 #include "ThinClientCQ.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientCqIR.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCqIR.cpp b/src/cppcache/integration-test/testThinClientCqIR.cpp
index 1d1d57c..fbfc91b 100644
--- a/src/cppcache/integration-test/testThinClientCqIR.cpp
+++ b/src/cppcache/integration-test/testThinClientCqIR.cpp
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
-#include <gfcpp/CqAttributesFactory.hpp>
-#include <gfcpp/CqAttributes.hpp>
-#include <gfcpp/CqListener.hpp>
-#include <gfcpp/CqQuery.hpp>
-#include <gfcpp/Struct.hpp>
-#include <gfcpp/CqResults.hpp>
+#include <geode/CqAttributesFactory.hpp>
+#include <geode/CqAttributes.hpp>
+#include <geode/CqListener.hpp>
+#include <geode/CqQuery.hpp>
+#include <geode/Struct.hpp>
+#include <geode/CqResults.hpp>
 #define ROOT_NAME "TestThinClientCqWithIR"
 #define ROOT_SCOPE DISTRIBUTED_ACK
 
@@ -33,8 +33,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 #include "ThinClientCQ.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientDisconnectionListioner.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientDisconnectionListioner.cpp b/src/cppcache/integration-test/testThinClientDisconnectionListioner.cpp
index 8253159..3a9154a 100644
--- a/src/cppcache/integration-test/testThinClientDisconnectionListioner.cpp
+++ b/src/cppcache/integration-test/testThinClientDisconnectionListioner.cpp
@@ -23,7 +23,7 @@
 #define CLIENT1 s1p1
 #define CLIENT2 s1p2
 #define SERVER1 s2p1
-#include <gfcpp/CacheListener.hpp>
+#include <geode/CacheListener.hpp>
 // CacheHelper* cacheHelper = NULL;
 static bool isLocator = false;
 static bool isLocalServer = true;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp b/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
index 26cc8ed..6f939f4 100644
--- a/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
+++ b/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
-#include <gfcpp/FixedPartitionResolver.hpp>
+#include <geode/FixedPartitionResolver.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientHADistOps.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHADistOps.cpp b/src/cppcache/integration-test/testThinClientHADistOps.cpp
index 9d2ed06..e592c7d 100644
--- a/src/cppcache/integration-test/testThinClientHADistOps.cpp
+++ b/src/cppcache/integration-test/testThinClientHADistOps.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp b/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp
index bcef1cb..449a95a 100644
--- a/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp
+++ b/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientHAFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAFailover.cpp b/src/cppcache/integration-test/testThinClientHAFailover.cpp
index db019b9..265ed5b 100644
--- a/src/cppcache/integration-test/testThinClientHAFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientHAFailover.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp b/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
index b7df72a..8a23711 100644
--- a/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
+++ b/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp b/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
index fe52a77..e3da2a8 100644
--- a/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
+++ b/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp b/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
index b527f36..6b4a82a 100644
--- a/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
+++ b/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientHAQueryFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAQueryFailover.cpp b/src/cppcache/integration-test/testThinClientHAQueryFailover.cpp
index da2bc85..39fbdd4 100644
--- a/src/cppcache/integration-test/testThinClientHAQueryFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientHAQueryFailover.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>
@@ -28,11 +28,11 @@
 
 //#include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
-#include <gfcpp/ResultSet.hpp>
-#include <gfcpp/StructSet.hpp>
-#include <gfcpp/SelectResultsIterator.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
+#include <geode/ResultSet.hpp>
+#include <geode/StructSet.hpp>
+#include <geode/SelectResultsIterator.hpp>
 
 #include "testobject/Portfolio.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientHeapLRU.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHeapLRU.cpp b/src/cppcache/integration-test/testThinClientHeapLRU.cpp
index 3224322..0a36c0d 100644
--- a/src/cppcache/integration-test/testThinClientHeapLRU.cpp
+++ b/src/cppcache/integration-test/testThinClientHeapLRU.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "BuiltinCacheableWrappers.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp b/src/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
index 5f1d933..52666e1 100644
--- a/src/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
+++ b/src/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientInterest1Cacheless.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientInterest1Cacheless.cpp b/src/cppcache/integration-test/testThinClientInterest1Cacheless.cpp
index 0edbeae..41e4dc8 100644
--- a/src/cppcache/integration-test/testThinClientInterest1Cacheless.cpp
+++ b/src/cppcache/integration-test/testThinClientInterest1Cacheless.cpp
@@ -17,7 +17,7 @@
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #define CLIENT1 s1p1
 #define CLIENT2 s1p2

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientLRUExpiration.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientLRUExpiration.cpp b/src/cppcache/integration-test/testThinClientLRUExpiration.cpp
index e6cfada..4d7afd9 100644
--- a/src/cppcache/integration-test/testThinClientLRUExpiration.cpp
+++ b/src/cppcache/integration-test/testThinClientLRUExpiration.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientMultiDS.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientMultiDS.cpp b/src/cppcache/integration-test/testThinClientMultiDS.cpp
index e5f2bdf..d97d4e1 100644
--- a/src/cppcache/integration-test/testThinClientMultiDS.cpp
+++ b/src/cppcache/integration-test/testThinClientMultiDS.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRPutAllFailover.cpp b/src/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
index d4e8900..6b9f9a6 100644
--- a/src/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRSingleHop.cpp b/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
index 8bbf05b..9682f0a 100644
--- a/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
+++ b/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp b/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
index dc8c4d8..6b22a0a 100644
--- a/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
+++ b/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPartitionResolver.cpp b/src/cppcache/integration-test/testThinClientPartitionResolver.cpp
index cdce1b0..7864ddb 100644
--- a/src/cppcache/integration-test/testThinClientPartitionResolver.cpp
+++ b/src/cppcache/integration-test/testThinClientPartitionResolver.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
-#include <gfcpp/PartitionResolver.hpp>
+#include <geode/PartitionResolver.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPdxEnum.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxEnum.cpp b/src/cppcache/integration-test/testThinClientPdxEnum.cpp
index 2a45b03..48ebe87 100644
--- a/src/cppcache/integration-test/testThinClientPdxEnum.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxEnum.cpp
@@ -16,13 +16,13 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "testobject/NestedPdxObject.hpp"
 #include "ThinClientHelper.hpp"
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPdxInstance.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxInstance.cpp b/src/cppcache/integration-test/testThinClientPdxInstance.cpp
index c05b856..4183614 100644
--- a/src/cppcache/integration-test/testThinClientPdxInstance.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxInstance.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"
 #include "testobject/NestedPdxObject.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPdxTests.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxTests.cpp b/src/cppcache/integration-test/testThinClientPdxTests.cpp
index 3d68597..5132e5f 100644
--- a/src/cppcache/integration-test/testThinClientPdxTests.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTests.cpp
@@ -30,7 +30,7 @@
 END_MAIN*/
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -46,8 +46,8 @@ END_MAIN*/
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 #include <Utils.hpp>
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 #include "CachePerfStats.hpp"
 #include <LocalRegion.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp b/src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp
index 05af0c7..843358e 100644
--- a/src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp b/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
index c66b384..c8c4617 100644
--- a/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPoolAttrTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolAttrTest.cpp b/src/cppcache/integration-test/testThinClientPoolAttrTest.cpp
index 61f473f..283223e 100644
--- a/src/cppcache/integration-test/testThinClientPoolAttrTest.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolAttrTest.cpp
@@ -18,7 +18,7 @@
 #include "ThinClientHelper.hpp"
 #include "testUtils.hpp"
 
-#include "gfcpp/GeodeCppCache.hpp"
+#include "geode/GeodeCppCache.hpp"
 
 /* This is to test
 1) If Connections are left idle ,they timed out to min connections.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPoolExecuteFunction.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteFunction.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteFunction.cpp
index cd217b4..27aacc4 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteFunction.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteFunction.cpp
@@ -58,9 +58,8 @@ 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() " \
@@ -78,9 +77,8 @@ 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-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
index c45d5ca..9e9c48b 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
@@ -58,9 +58,8 @@ 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() " \
@@ -78,9 +77,8 @@ 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-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
index d77d9d7..82fad1d 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
@@ -16,9 +16,9 @@
  */
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/FunctionService.hpp>
-#include <gfcpp/Execution.hpp>
-#include <gfcpp/ResultCollector.hpp>
+#include <geode/FunctionService.hpp>
+#include <geode/Execution.hpp>
+#include <geode/ResultCollector.hpp>
 
 #define CLIENT1 s1p1
 #define LOCATOR1 s2p1
@@ -40,18 +40,17 @@ 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-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
index 8c2c186..bb6aa4d 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
@@ -16,9 +16,9 @@
  */
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/FunctionService.hpp>
-#include <gfcpp/Execution.hpp>
-#include <gfcpp/ResultCollector.hpp>
+#include <geode/FunctionService.hpp>
+#include <geode/Execution.hpp>
+#include <geode/ResultCollector.hpp>
 
 #define CLIENT1 s1p1
 #define LOCATOR1 s2p1
@@ -40,18 +40,17 @@ 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-native/blob/fd58b100/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp b/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
index a1096f8..f5035ba 100644
--- a/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
+++ b/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp b/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
index 0d1a8b4..84228aa 100644
--- a/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
+++ b/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <string>
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp b/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
index b6bce77..7f05959 100644
--- a/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
+++ b/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>
@@ -28,11 +28,11 @@
 
 #include "testobject/Portfolio.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
-#include <gfcpp/ResultSet.hpp>
-#include <gfcpp/StructSet.hpp>
-#include <gfcpp/SelectResultsIterator.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
+#include <geode/ResultSet.hpp>
+#include <geode/StructSet.hpp>
+#include <geode/SelectResultsIterator.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
index 57a79a6..2befb52 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>
@@ -26,11 +26,11 @@
 
 #include "ThinClientHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
-#include <gfcpp/ResultSet.hpp>
-#include <gfcpp/StructSet.hpp>
-#include <gfcpp/SelectResultsIterator.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
+#include <geode/ResultSet.hpp>
+#include <geode/StructSet.hpp>
+#include <geode/SelectResultsIterator.hpp>
 
 #include "testobject/Portfolio.hpp"
 #include "testobject/PortfolioPdx.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
index 82dfa4a..a6221ee 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>
@@ -26,11 +26,11 @@
 
 #include "ThinClientHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
-#include <gfcpp/ResultSet.hpp>
-#include <gfcpp/StructSet.hpp>
-#include <gfcpp/SelectResultsIterator.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
+#include <geode/ResultSet.hpp>
+#include <geode/StructSet.hpp>
+#include <geode/SelectResultsIterator.hpp>
 
 #include "testobject/Portfolio.hpp"
 #include "testobject/PortfolioPdx.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
index 6a8d26f..f324036 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -28,8 +28,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp b/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
index 9f28618..773793c 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -28,8 +28,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
index 25b6927..ccd016b 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -28,8 +28,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp b/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
index 0baa5e1..422685e 100644
--- a/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -28,8 +28,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientRemoveOps.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoveOps.cpp b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
index 2c1dff2..a79162c 100644
--- a/src/cppcache/integration-test/testThinClientRemoveOps.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp b/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
index e4397b3..ac01544 100644
--- a/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
+++ b/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
-#include <gfcpp/FunctionService.hpp>
-#include <gfcpp/Execution.hpp>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/FunctionService.hpp>
+#include <geode/Execution.hpp>
 
 #define ROOT_NAME "testThinClientSSLWithSecurityAuthz"
 #define ROOT_SCOPE DISTRIBUTED_ACK

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityAuthentication.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityAuthentication.cpp b/src/cppcache/integration-test/testThinClientSecurityAuthentication.cpp
index 65b4d6f..a5b4285 100644
--- a/src/cppcache/integration-test/testThinClientSecurityAuthentication.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityAuthentication.cpp
@@ -16,7 +16,7 @@
  */
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityAuthenticationMU.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityAuthenticationMU.cpp b/src/cppcache/integration-test/testThinClientSecurityAuthenticationMU.cpp
index 7575aab..1604efc 100644
--- a/src/cppcache/integration-test/testThinClientSecurityAuthenticationMU.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityAuthenticationMU.cpp
@@ -19,7 +19,7 @@
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityAuthorization.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityAuthorization.cpp b/src/cppcache/integration-test/testThinClientSecurityAuthorization.cpp
index d31855f..bba4893 100644
--- a/src/cppcache/integration-test/testThinClientSecurityAuthorization.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityAuthorization.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #define ROOT_NAME "testThinClientSecurityAuthentication"
 #define ROOT_SCOPE DISTRIBUTED_ACK

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityAuthorizationMU.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityAuthorizationMU.cpp b/src/cppcache/integration-test/testThinClientSecurityAuthorizationMU.cpp
index 651e2ab..67fbf0b 100644
--- a/src/cppcache/integration-test/testThinClientSecurityAuthorizationMU.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityAuthorizationMU.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
-#include <gfcpp/FunctionService.hpp>
-#include <gfcpp/Execution.hpp>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/FunctionService.hpp>
+#include <geode/Execution.hpp>
 
 #define ROOT_NAME "testThinClientSecurityAuthenticationMU"
 #define ROOT_SCOPE DISTRIBUTED_ACK

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityCQAuthorization.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityCQAuthorization.cpp b/src/cppcache/integration-test/testThinClientSecurityCQAuthorization.cpp
index d87116b..3bf7b8b 100644
--- a/src/cppcache/integration-test/testThinClientSecurityCQAuthorization.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityCQAuthorization.cpp
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
-#include <gfcpp/CqAttributesFactory.hpp>
-#include <gfcpp/CqAttributes.hpp>
-#include <gfcpp/CqListener.hpp>
-#include <gfcpp/CqQuery.hpp>
-#include <gfcpp/CqServiceStatistics.hpp>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/CqAttributesFactory.hpp>
+#include <geode/CqAttributes.hpp>
+#include <geode/CqListener.hpp>
+#include <geode/CqQuery.hpp>
+#include <geode/CqServiceStatistics.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -33,8 +33,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 #include "ThinClientCQ.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityCQAuthorizationMU.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityCQAuthorizationMU.cpp b/src/cppcache/integration-test/testThinClientSecurityCQAuthorizationMU.cpp
index c718969..18f0d34 100644
--- a/src/cppcache/integration-test/testThinClientSecurityCQAuthorizationMU.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityCQAuthorizationMU.cpp
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
-#include <gfcpp/CqAttributesFactory.hpp>
-#include <gfcpp/CqAttributes.hpp>
-#include <gfcpp/CqListener.hpp>
-#include <gfcpp/CqQuery.hpp>
-#include <gfcpp/CqServiceStatistics.hpp>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/CqAttributesFactory.hpp>
+#include <geode/CqAttributes.hpp>
+#include <geode/CqListener.hpp>
+#include <geode/CqQuery.hpp>
+#include <geode/CqServiceStatistics.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -33,8 +33,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 #include "ThinClientCQ.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityDH.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityDH.cpp b/src/cppcache/integration-test/testThinClientSecurityDH.cpp
index 501eed9..2f0dbde 100644
--- a/src/cppcache/integration-test/testThinClientSecurityDH.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityDH.cpp
@@ -16,7 +16,7 @@
  */
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp b/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
index a9dd2e6..999b4e5 100644
--- a/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
@@ -19,7 +19,7 @@
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityDurableCQAuthorizationMU.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityDurableCQAuthorizationMU.cpp b/src/cppcache/integration-test/testThinClientSecurityDurableCQAuthorizationMU.cpp
index 1a57f65..d81c4ba 100644
--- a/src/cppcache/integration-test/testThinClientSecurityDurableCQAuthorizationMU.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityDurableCQAuthorizationMU.cpp
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
-#include <gfcpp/CqAttributesFactory.hpp>
-#include <gfcpp/CqAttributes.hpp>
-#include <gfcpp/CqListener.hpp>
-#include <gfcpp/CqQuery.hpp>
-#include <gfcpp/CqServiceStatistics.hpp>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/CqAttributesFactory.hpp>
+#include <geode/CqAttributes.hpp>
+#include <geode/CqListener.hpp>
+#include <geode/CqQuery.hpp>
+#include <geode/CqServiceStatistics.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -33,8 +33,8 @@
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"
 
-#include <gfcpp/Query.hpp>
-#include <gfcpp/QueryService.hpp>
+#include <geode/Query.hpp>
+#include <geode/QueryService.hpp>
 
 #include "ThinClientCQ.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp b/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
index 6fdd776..9812cb3 100644
--- a/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
@@ -17,9 +17,9 @@
 #include "fw_dunit.hpp"
 #include <string>
 #include <stdlib.h>
-#include <gfcpp/GeodeCppCache.hpp>
-#include <gfcpp/FunctionService.hpp>
-#include <gfcpp/Execution.hpp>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/FunctionService.hpp>
+#include <geode/Execution.hpp>
 
 #define ROOT_NAME "testThinClientSecurityMultiUserTest"
 #define ROOT_SCOPE DISTRIBUTED_ACK

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp b/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
index 2667585..1287614 100644
--- a/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "CacheHelper.hpp"
 #include "ThinClientHelper.hpp"
 #include <ace/Process.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientStatistics.cpp b/src/cppcache/integration-test/testThinClientStatistics.cpp
index 8a7f13b..1fc155d 100644
--- a/src/cppcache/integration-test/testThinClientStatistics.cpp
+++ b/src/cppcache/integration-test/testThinClientStatistics.cpp
@@ -16,7 +16,7 @@
  */
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 
 #include <ace/ACE.h>
 #include <ace/Guard_T.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testThinClientWriterException.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientWriterException.cpp b/src/cppcache/integration-test/testThinClientWriterException.cpp
index 6640176..4acb2f0 100644
--- a/src/cppcache/integration-test/testThinClientWriterException.cpp
+++ b/src/cppcache/integration-test/testThinClientWriterException.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "ThinClientHelper.hpp"
 #include "ace/Process.h"
 #include "TallyListener.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testUtils.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testUtils.hpp b/src/cppcache/integration-test/testUtils.hpp
index 2138720..5b85ebe 100644
--- a/src/cppcache/integration-test/testUtils.hpp
+++ b/src/cppcache/integration-test/testUtils.hpp
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 /* use CacheHelper to gain the impl pointer from cache or region object
  */
@@ -189,4 +189,4 @@ class TestUtils {
 };
 }  // namespace unitTests
 
-#endif // GEODE_INTEGRATION_TEST_TESTUTILS_H_
+#endif  // GEODE_INTEGRATION_TEST_TESTUTILS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testXmlCacheCreationWithOverFlow.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testXmlCacheCreationWithOverFlow.cpp b/src/cppcache/integration-test/testXmlCacheCreationWithOverFlow.cpp
index be77840..d60b30d 100644
--- a/src/cppcache/integration-test/testXmlCacheCreationWithOverFlow.cpp
+++ b/src/cppcache/integration-test/testXmlCacheCreationWithOverFlow.cpp
@@ -17,7 +17,7 @@
 
 #define ROOT_NAME "testXmlCacheCreationWithOverFlow"
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #include "fw_helper.hpp"
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testXmlCacheCreationWithPools.cpp b/src/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
index 1f45ed8..448c9b1 100644
--- a/src/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
+++ b/src/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
@@ -17,7 +17,7 @@
 
 #include "fw_dunit.hpp"
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #include <string>
 #include <vector>