geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject geode git commit: GEODE-2308: Rebrand shared library names.
Date Mon, 30 Jan 2017 18:49:30 GMT
Repository: geode
Updated Branches:
  refs/heads/next-gen-native-client-software-grant 739034dbe -> 01c028679


GEODE-2308: Rebrand shared library names.

* GemStone.GemFire.Cache.dll -> Apache.Geode.dll
* gfcppcache.dll -> apache-geode.dll

This closes #371


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

Branch: refs/heads/next-gen-native-client-software-grant
Commit: 01c0286795d0a7ed0755fd81c8935160d5c7a8f4
Parents: 739034d
Author: Jacob Barrett <jbarrett@pivotal.io>
Authored: Thu Jan 26 13:45:23 2017 -0800
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Mon Jan 30 10:43:33 2017 -0800

----------------------------------------------------------------------
 examples/dist/cacheRunner/buildit.bat           |  2 +-
 examples/dist/cacheRunner/buildit.sh            |  4 +-
 examples/dist/cqQuery/buildit.bat               |  4 +-
 examples/dist/cqQuery/buildit.sh                |  4 +-
 examples/dist/executeFunction/buildit.bat       |  2 +-
 examples/dist/executeFunction/buildit.sh        |  4 +-
 examples/dist/userobjects/buildit.bat           |  2 +-
 examples/dist/userobjects/buildit.sh            |  4 +-
 src/clicache/integration-test/CMakeLists.txt    |  2 +-
 .../integration-test/UnitTests.csproj.in        |  2 +-
 src/clicache/integration-test/test.bat.in       |  2 +-
 src/clicache/src/Apache.Geode.rc                | 48 ++++++++++++++++++++
 src/clicache/src/CMakeLists.txt                 | 16 +++----
 src/clicache/src/gfclicache.rc                  | 48 --------------------
 src/clicache/src/templates/CMakeLists.txt       |  2 +-
 src/clicache/src/templates/Templates.csproj.in  |  2 +-
 src/cppcache/integration-test/CMakeLists.txt    |  6 +--
 src/cppcache/integration-test/test.bat.in       |  2 +-
 src/cppcache/integration-test/test.sh.in        |  2 +-
 src/cppcache/src/CMakeLists.txt                 | 40 ++++++++--------
 src/cppcache/src/CppCacheLibrary.cpp            |  8 ++--
 src/cppcache/src/apache-geode.rc                | 48 ++++++++++++++++++++
 src/cppcache/src/dllmain.cpp                    | 14 +++---
 src/cppcache/src/gfcppcache.rc                  | 48 --------------------
 src/cppcache/test/CMakeLists.txt                |  6 +--
 src/cppcache/test/apache-geode_unittests.bat.in | 12 +++++
 src/cppcache/test/apache-geode_unittests.sh.in  | 14 ++++++
 src/cppcache/test/gfcppcache_unittests.bat.in   | 12 -----
 src/cppcache/test/gfcppcache_unittests.sh.in    | 14 ------
 src/cryptoimpl/CMakeLists.txt                   |  2 +-
 src/dhimpl/CMakeLists.txt                       |  2 +-
 src/gfcpp/CMakeLists.txt                        |  2 +-
 src/pdxautoserializer/CMakeLists.txt            |  2 +-
 src/plugins/SQLiteCLI/CMakeLists.txt            |  2 +-
 src/plugins/SQLiteCLI/SQLiteCLI.csproj.in       |  2 +-
 src/quickstart/cpp/CMakeLists.txt               |  6 +--
 src/quickstart/csharp/CMakeLists.txt            |  2 +-
 src/quickstart/csharp/app.config.in             |  2 +-
 .../BasicOperations/BasicOperations.csproj.in   |  2 +-
 .../csharp/vsprojects/CqQuery/CqQuery.csproj.in |  2 +-
 .../DataExpiration/DataExpiration.csproj.in     |  2 +-
 .../csharp/vsprojects/Delta/Delta.csproj.in     |  2 +-
 .../DistributedSystem.csproj.in                 |  2 +-
 .../DurableClient/DurableClient.csproj.in       |  2 +-
 .../vsprojects/Exceptions/Exceptions.csproj.in  |  2 +-
 .../ExecuteFunctions/ExecuteFunctions.csproj.in |  2 +-
 .../csharp/vsprojects/HACache/HACache.csproj.in |  2 +-
 .../LoaderListenerWriter.csproj.in              |  2 +-
 .../MultiuserSecurity.csproj.in                 |  2 +-
 .../PdxInstance/PdxInstance.csproj.in           |  2 +-
 .../PdxRemoteQuery/PdxRemoteQuery.csproj.in     |  2 +-
 .../PdxSerializer/PdxSerializer.csproj.in       |  2 +-
 .../PoolCqQuery/PoolCqQuery.csproj.in           |  2 +-
 .../PoolRemoteQuery/PoolRemoteQuery.csproj.in   |  2 +-
 .../PoolWithEndpoints.csproj.in                 |  2 +-
 .../PutAllGetAllOperations.csproj.in            |  2 +-
 .../RefIDExample/RefIDExample.csproj.in         |  2 +-
 .../RegisterInterest/RegisterInterest.csproj.in |  2 +-
 .../RemoteQuery/RemoteQuery.csproj.in           |  2 +-
 .../vsprojects/Security/Security.csproj.in      |  2 +-
 .../SimplePlugins/SimplePlugins.csproj.in       |  2 +-
 .../Transactions/Transactions.csproj.in         |  2 +-
 .../TransactionsXA/TransactionsXA.csproj.in     |  2 +-
 src/quickstart/runcs.bat.in                     |  2 +-
 src/sqliteimpl/CMakeLists.txt                   |  2 +-
 src/templates/security/CMakeLists.txt           |  2 +-
 .../security/CMakeLists.txt.forInstall          |  4 +-
 .../security/csharp/securityImpl.csproj.in      |  2 +-
 src/tests/cli/CMakeLists.txt                    |  2 +-
 src/tests/cli/FwkUtil/FwkUtil.csproj.in         |  2 +-
 src/tests/cli/NativeWrapper/CMakeLists.txt      |  4 +-
 src/tests/cli/NewFwkLib/NewFwkLib.csproj.in     |  2 +-
 .../PdxClassLibrary/PdxClassLibrary.csproj.in   |  2 +-
 .../cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in |  2 +-
 .../cli/PdxVersion2Lib/PdxVersion2Lib.csproj.in |  2 +-
 src/tests/cli/PkcsWrapper/CMakeLists.txt        |  2 +-
 src/tests/cli/QueryHelper/CMakeLists.txt        |  2 +-
 .../cli/SecurityUtil/SecurityUtil.csproj.in     |  2 +-
 src/tests/cpp/fwklib/CMakeLists.txt             |  2 +-
 .../cpp/pdxautoserializerclass/CMakeLists.txt   |  6 +--
 src/tests/cpp/testobject/CMakeLists.txt         |  6 +--
 81 files changed, 247 insertions(+), 247 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/examples/dist/cacheRunner/buildit.bat
----------------------------------------------------------------------
diff --git a/examples/dist/cacheRunner/buildit.bat b/examples/dist/cacheRunner/buildit.bat
index 80a2008..8e5cd42 100755
--- a/examples/dist/cacheRunner/buildit.bat
+++ b/examples/dist/cacheRunner/buildit.bat
@@ -2,6 +2,6 @@
 
 rem GFCPP must be set
 
-cl /MD /Zc:wchar_t /EHsc /GR /wd4996 /D_EXAMPLE /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NON_CONFORMING_SWPRINTFS /DWINVER=0x0500 /DBUILD_TESTOBJECT /I%GFCPP%/include /Fecacherunner.exe *.cpp %GFCPP%/lib/gfcppcache.lib
+cl /MD /Zc:wchar_t /EHsc /GR /wd4996 /D_EXAMPLE /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NON_CONFORMING_SWPRINTFS /DWINVER=0x0500 /DBUILD_TESTOBJECT /I%GFCPP%/include /Fecacherunner.exe *.cpp %GFCPP%/lib/apache-geode.lib
 
 del *.obj

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/examples/dist/cacheRunner/buildit.sh
----------------------------------------------------------------------
diff --git a/examples/dist/cacheRunner/buildit.sh b/examples/dist/cacheRunner/buildit.sh
index 190b3ea..fb7e0d7 100755
--- a/examples/dist/cacheRunner/buildit.sh
+++ b/examples/dist/cacheRunner/buildit.sh
@@ -22,7 +22,7 @@ if [ "$platform" == "SunOS" ]; then
       -I$GFCPP/include \
       -L$GFCPP/$LIBDIR \
       -R$GFCPP/$LIBDIR \
-      -lgfcppcache -lrt -lpthread -lkstat \
+      -lapache-geode -lrt -lpthread -lkstat \
       CacheRunner.cpp CommandReader.cpp Test*.cpp Po*.cpp -o cacheRunner 
 elif [ "$platform" == "Linux" ]; then
   if [ $is64bit -eq 1 ]; then
@@ -33,7 +33,7 @@ elif [ "$platform" == "Linux" ]; then
   g++ \
       -D_REENTRANT -D_EXAMPLE $OPT -Wall $ARCH \
       -I$GFCPP/include \
-      -Wl,-rpath,$GFCPP/$LIBDIR -L$GFCPP/$LIBDIR -lgfcppcache \
+      -Wl,-rpath,$GFCPP/$LIBDIR -L$GFCPP/$LIBDIR -lapache-geode \
       CacheRunner.cpp CommandReader.cpp Test*.cpp Po*.cpp -o cacheRunner 
 else
   echo "This script is not supported on this platform."

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/examples/dist/cqQuery/buildit.bat
----------------------------------------------------------------------
diff --git a/examples/dist/cqQuery/buildit.bat b/examples/dist/cqQuery/buildit.bat
index a2b5b77..c10d2e4 100644
--- a/examples/dist/cqQuery/buildit.bat
+++ b/examples/dist/cqQuery/buildit.bat
@@ -2,7 +2,7 @@
 
 rem GFCPP must be set
 
-cl /MD /Zc:wchar_t /EHsc /GR /wd4996 /D_EXAMPLE /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NON_CONFORMING_SWPRINTFS /DWINVER=0x0500 /DBUILD_TESTOBJECT /I%GFCPP%/include /FeCqQuery.exe CqQuery.cpp Portfolio.cpp Position.cpp %GFCPP%/lib/gfcppcache.lib
+cl /MD /Zc:wchar_t /EHsc /GR /wd4996 /D_EXAMPLE /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NON_CONFORMING_SWPRINTFS /DWINVER=0x0500 /DBUILD_TESTOBJECT /I%GFCPP%/include /FeCqQuery.exe CqQuery.cpp Portfolio.cpp Position.cpp %GFCPP%/lib/apache-geode.lib
 
-cl /MD /Zc:wchar_t /EHsc /GR /wd4996 /D_EXAMPLE /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NON_CONFORMING_SWPRINTFS /DWINVER=0x0500 /DBUILD_TESTOBJECT /I%GFCPP%/include /FeUpdater.exe Updater.cpp Portfolio.cpp Position.cpp %GFCPP%/lib/gfcppcache.lib
+cl /MD /Zc:wchar_t /EHsc /GR /wd4996 /D_EXAMPLE /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NON_CONFORMING_SWPRINTFS /DWINVER=0x0500 /DBUILD_TESTOBJECT /I%GFCPP%/include /FeUpdater.exe Updater.cpp Portfolio.cpp Position.cpp %GFCPP%/lib/apache-geode.lib
 del *.obj

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/examples/dist/cqQuery/buildit.sh
----------------------------------------------------------------------
diff --git a/examples/dist/cqQuery/buildit.sh b/examples/dist/cqQuery/buildit.sh
index 3e3e67c..f6a9970 100755
--- a/examples/dist/cqQuery/buildit.sh
+++ b/examples/dist/cqQuery/buildit.sh
@@ -25,7 +25,7 @@ if [ "$platform" == "SunOS" ]; then
       -I$GFCPP/include \
       -L$GFCPP/$LIBDIR \
       -R$GFCPP/$LIBDIR \
-      -lgfcppcache -lrt -lpthread -lkstat"
+      -lapache-geode -lrt -lpthread -lkstat"
 elif [ "$platform" == "Linux" ]; then
   if [ $is64bit -eq 1 ]; then
     ARCH="-m64"
@@ -36,7 +36,7 @@ elif [ "$platform" == "Linux" ]; then
   CXX_FLAGS="-D_REENTRANT $OPT -Wall $ARCH \
       -I$GFCPP/include \
       -Xlinker -rpath -Xlinker $GFCPP/$LIBDIR -L$GFCPP/$LIBDIR \
-      -lgfcppcache"
+      -lapache-geode"
 else
   echo "This script is not supported on this platform."
   exit 1

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/examples/dist/executeFunction/buildit.bat
----------------------------------------------------------------------
diff --git a/examples/dist/executeFunction/buildit.bat b/examples/dist/executeFunction/buildit.bat
index 144629d..ed5a230 100644
--- a/examples/dist/executeFunction/buildit.bat
+++ b/examples/dist/executeFunction/buildit.bat
@@ -2,6 +2,6 @@
 
 rem GFCPP must be set
 
-cl /MD /Zc:wchar_t /EHsc /GR /wd4996 /D_EXAMPLE /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NON_CONFORMING_SWPRINTFS /DWINVER=0x0500 /I%GFCPP%/include /FeExecuteFunctions.exe ExecuteFunctions.cpp %GFCPP%/lib/gfcppcache.lib
+cl /MD /Zc:wchar_t /EHsc /GR /wd4996 /D_EXAMPLE /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NON_CONFORMING_SWPRINTFS /DWINVER=0x0500 /I%GFCPP%/include /FeExecuteFunctions.exe ExecuteFunctions.cpp %GFCPP%/lib/apache-geode.lib
 
 del *.obj

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/examples/dist/executeFunction/buildit.sh
----------------------------------------------------------------------
diff --git a/examples/dist/executeFunction/buildit.sh b/examples/dist/executeFunction/buildit.sh
index 4747a62..e75b07e 100755
--- a/examples/dist/executeFunction/buildit.sh
+++ b/examples/dist/executeFunction/buildit.sh
@@ -25,7 +25,7 @@ if [ "$platform" == "SunOS" ]; then
       -I$GFCPP/include \
       -L$GFCPP/$LIBDIR \
       -R$GFCPP/$LIBDIR \
-      -lgfcppcache -lrt -lpthread -lkstat"
+      -lapache-geode -lrt -lpthread -lkstat"
 elif [ "$platform" == "Linux" ]; then
   if [ $is64bit -eq 1 ]; then
     ARCH="-m64"
@@ -36,7 +36,7 @@ elif [ "$platform" == "Linux" ]; then
   CXX_FLAGS="-D_REENTRANT $OPT -Wall $ARCH \
       -I$GFCPP/include \
       -Xlinker -rpath -Xlinker $GFCPP/$LIBDIR -L$GFCPP/$LIBDIR \
-      -lgfcppcache"
+      -lapache-geode"
 else
   echo "This script is not supported on this platform."
   exit 1

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/examples/dist/userobjects/buildit.bat
----------------------------------------------------------------------
diff --git a/examples/dist/userobjects/buildit.bat b/examples/dist/userobjects/buildit.bat
index 898ae55..f6a15f1 100755
--- a/examples/dist/userobjects/buildit.bat
+++ b/examples/dist/userobjects/buildit.bat
@@ -2,6 +2,6 @@
 
 echo "GFCPP=%GFCPP%"
 
-cl /MD /Zc:wchar_t /GR /EHsc /wd4996 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NON_CONFORMING_SWPRINTFS /DWINVER=0x0500 /I%GFCPP%\include /Feuserobjects.exe *.cpp %GFCPP%\lib\gfcppcache.lib
+cl /MD /Zc:wchar_t /GR /EHsc /wd4996 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NON_CONFORMING_SWPRINTFS /DWINVER=0x0500 /I%GFCPP%\include /Feuserobjects.exe *.cpp %GFCPP%\lib\apache-geode.lib
 
 del *.obj

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/examples/dist/userobjects/buildit.sh
----------------------------------------------------------------------
diff --git a/examples/dist/userobjects/buildit.sh b/examples/dist/userobjects/buildit.sh
index 1e317d4..d85f285 100755
--- a/examples/dist/userobjects/buildit.sh
+++ b/examples/dist/userobjects/buildit.sh
@@ -22,7 +22,7 @@ if [ "$platform" == "SunOS" ]; then
       -I$GFCPP/include \
       -L$GFCPP/$LIBDIR \
       -R$GFCPP/$LIBDIR \
-      *.cpp -o userobjects -lgfcppcache -lrt -lcollector -lkstat
+      *.cpp -o userobjects -lapache-geode -lrt -lcollector -lkstat
 elif [ "$platform" == "Linux" ]; then
   if [ $is64bit -eq 1 ]; then
     ARCH="-m64"
@@ -33,7 +33,7 @@ elif [ "$platform" == "Linux" ]; then
       -D_REENTRANT $OPT -Wall -Werror $ARCH \
       -I$GFCPP/include \
       -Xlinker -rpath -Xlinker $GFCPP/$LIBDIR -L$GFCPP/$LIBDIR \
-      *.cpp -o userobjects -lgfcppcache
+      *.cpp -o userobjects -lapache-geode
 else
   echo "This script is not supported on this platform."
   exit 1

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/clicache/integration-test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CMakeLists.txt b/src/clicache/integration-test/CMakeLists.txt
index 5baf047..3dd2e65 100755
--- a/src/clicache/integration-test/CMakeLists.txt
+++ b/src/clicache/integration-test/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   set (NUNIT_CONSOLE "nunit-console-x86")
 endif()
 
-# Set the .NET Target Framework (Note: This should match the build for gfclicache.)
+# Set the .NET Target Framework (Note: This should match the build for Apache.Geode.)
 set (DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2")
 
 foreach(var CMAKE_CURRENT_SOURCE_DIR CMAKE_SOURCE_DIR CMAKE_BINARY_DIR CMAKE_CURRENT_BINARY_DIR)

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/clicache/integration-test/UnitTests.csproj.in
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/UnitTests.csproj.in b/src/clicache/integration-test/UnitTests.csproj.in
index bf4e66f..4a13fd0 100644
--- a/src/clicache/integration-test/UnitTests.csproj.in
+++ b/src/clicache/integration-test/UnitTests.csproj.in
@@ -564,7 +564,7 @@
       <Project>{FF9597E3-A4DD-4FDE-871D-B0C66088762F}</Project>
       <Name>SQLiteCLI</Name>
     </ProjectReference>
-    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\gfclicache.vcxproj">
+    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>       

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/clicache/integration-test/test.bat.in
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/test.bat.in b/src/clicache/integration-test/test.bat.in
index 89bb93e..7255a25 100644
--- a/src/clicache/integration-test/test.bat.in
+++ b/src/clicache/integration-test/test.bat.in
@@ -1,6 +1,6 @@
 @echo off
 setlocal
-rem set PATH=%PATH%;$<TARGET_LINKER_FILE_DIR:gfcppcache>
+rem set PATH=%PATH%;$<TARGET_LINKER_FILE_DIR:apache-geode>
 rem set PATH=%PATH%;$<TARGET_LINKER_FILE_DIR:framework>
 rem set PATH=%PATH%;$<TARGET_LINKER_FILE_DIR:testobject>
 rem set PATH=%PATH%;$<TARGET_LINKER_FILE_DIR:SqLiteImpl>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/clicache/src/Apache.Geode.rc
----------------------------------------------------------------------
diff --git a/src/clicache/src/Apache.Geode.rc b/src/clicache/src/Apache.Geode.rc
new file mode 100644
index 0000000..48f1af2
--- /dev/null
+++ b/src/clicache/src/Apache.Geode.rc
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <verrsrc.h>
+
+#include "config.h"
+#include "version.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION    	PRODUCT_VERSION_RC
+PRODUCTVERSION 	PRODUCT_VERSION_RC
+FILEOS         	VOS_NT_WINDOWS32
+FILETYPE       	VFT_DLL
+FILESUBTYPE    	VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",      PRODUCT_VENDOR_NAME
+            VALUE "FileDescription",  PRODUCT_NAME " .NET Library"
+            VALUE "FileVersion",      PRODUCT_VERSION
+            VALUE "InternalName",     "Apache.Geode"
+            VALUE "LegalCopyright",   "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership."
+            VALUE "OriginalFilename", "Apache.Geode.dll"
+            VALUE "ProductName",      PRODUCT_NAME
+            VALUE "ProductVersion",   PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/clicache/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/clicache/src/CMakeLists.txt b/src/clicache/src/CMakeLists.txt
index 81827b8..d1887ab 100644
--- a/src/clicache/src/CMakeLists.txt
+++ b/src/clicache/src/CMakeLists.txt
@@ -6,7 +6,7 @@ file(GLOB_RECURSE SOURCES "*.cpp")
 file(GLOB_RECURSE PRIVATE_HEADERS "*.hpp")
 set_source_files_properties(${PRIVATE_HEADERS} PROPERTIES HEADER_FILE_ONLY TRUE)
 
-set(RESOURCES gfclicache.rc)
+set(RESOURCES Apache.Geode.rc)
 
 if(NOT "${STRONG_NAME_PUBLIC_KEY}" STREQUAL "")
   set(STRONG_NAME_PUBLIC_KEY_ATTRIBUTE ", PublicKey=${STRONG_NAME_PUBLIC_KEY}")
@@ -18,15 +18,15 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/impl/AssemblyInfo.cpp.in ${CMAKE_CURR
 #set_source_files_properties(${CONFIGURE_IN_FILES} PROPERTIES LANGUAGE NONE)
 set_source_files_properties(${CONFIGURE_OUT_FILES} PROPERTIES GENERATED TRUE)
 
-add_library(gfclicache SHARED
+add_library(Apache.Geode SHARED
   ${SOURCES}
   ${PRIVATE_HEADERS} ${CONFIGURE_IN_FILES} ${CONFIGURE_OUT_FILES} ${RESOURCES})
-add_dependencies(client-libraries gfclicache)
+add_dependencies(client-libraries Apache.Geode)
 
 #TODO get external project library names
-target_link_libraries(gfclicache
+target_link_libraries(Apache.Geode
   PRIVATE
-    gfcppcache-static
+    apache-geode-static
     psapi
   PUBLIC
     c++11
@@ -41,14 +41,14 @@ include_directories(${CMAKE_SOURCE_DIR}/clicache/include)
 include_directories(${CMAKE_SOURCE_DIR}/clicache/src)
 include_directories(${CMAKE_SOURCE_DIR}/cppcache/src)
 
-set_target_properties(gfclicache PROPERTIES
-  OUTPUT_NAME Apache.Geode.Client
+set_target_properties(Apache.Geode PROPERTIES
+  OUTPUT_NAME Apache.Geode
   VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
   VS_DOTNET_REFERENCES "System;System.Xml")
 
 add_subdirectory(templates)
 
-install(TARGETS gfclicache
+install(TARGETS Apache.Geode
   RUNTIME DESTINATION bin
   ARCHIVE DESTINATION lib
 )

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/clicache/src/gfclicache.rc
----------------------------------------------------------------------
diff --git a/src/clicache/src/gfclicache.rc b/src/clicache/src/gfclicache.rc
deleted file mode 100644
index f8d4d4b..0000000
--- a/src/clicache/src/gfclicache.rc
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <verrsrc.h>
-
-#include "config.h"
-#include "version.h"
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION    	PRODUCT_VERSION_RC
-PRODUCTVERSION 	PRODUCT_VERSION_RC
-FILEOS         	VOS_NT_WINDOWS32
-FILETYPE       	VFT_DLL
-FILESUBTYPE    	VFT2_UNKNOWN
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName",      PRODUCT_VENDOR_NAME
-            VALUE "FileDescription",  PRODUCT_NAME " .NET Library"
-            VALUE "FileVersion",      PRODUCT_VERSION
-            VALUE "InternalName",     "Apache.Geode.Client"
-            VALUE "LegalCopyright",   "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership."
-            VALUE "OriginalFilename", "Apache.Geode.Client.dll"
-            VALUE "ProductName",      PRODUCT_NAME
-            VALUE "ProductVersion",   PRODUCT_VERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/clicache/src/templates/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/clicache/src/templates/CMakeLists.txt b/src/clicache/src/templates/CMakeLists.txt
index a751bc1..9e59e30 100755
--- a/src/clicache/src/templates/CMakeLists.txt
+++ b/src/clicache/src/templates/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.4)
 project(nativeclient.clicache.templates)
 
-# Set the .NET Target Framework (Note: This should match the build for gfclicache.)
+# Set the .NET Target Framework (Note: This should match the build for Apache.Geode.)
 set (DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2")
 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/clicache/src/templates/Templates.csproj.in
----------------------------------------------------------------------
diff --git a/src/clicache/src/templates/Templates.csproj.in b/src/clicache/src/templates/Templates.csproj.in
index fd24d57..50a4bf6 100644
--- a/src/clicache/src/templates/Templates.csproj.in
+++ b/src/clicache/src/templates/Templates.csproj.in
@@ -83,7 +83,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\gfclicache.vcxproj">
+    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/integration-test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CMakeLists.txt b/src/cppcache/integration-test/CMakeLists.txt
index 7fda90f..138bee3 100644
--- a/src/cppcache/integration-test/CMakeLists.txt
+++ b/src/cppcache/integration-test/CMakeLists.txt
@@ -7,7 +7,7 @@ target_link_libraries(${TEST_UTILS_LIB}
   PRIVATE
     ACE
   PUBLIC
-    gfcppcache
+    apache-geode
     fwk
 )
 target_compile_definitions(${TEST_UTILS_LIB}
@@ -20,7 +20,7 @@ target_link_libraries(unit_test_callbacks
   PRIVATE
     ACE
   PUBLIC
-    gfcppcache
+    apache-geode
     c++11
 )
 
@@ -58,7 +58,7 @@ foreach(FILE ${SOURCES})
       ACE
       ${TEST_UTILS_LIB}
     PUBLIC
-      gfcppcache
+      apache-geode
       testobject
       fwk
       c++11

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/integration-test/test.bat.in
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/test.bat.in b/src/cppcache/integration-test/test.bat.in
index 5e96850..08f06de 100644
--- a/src/cppcache/integration-test/test.bat.in
+++ b/src/cppcache/integration-test/test.bat.in
@@ -1,7 +1,7 @@
 @echo off
 setlocal
 
-set PATH=%PATH%;$<SHELL_PATH:$<TARGET_LINKER_FILE_DIR:gfcppcache>>
+set PATH=%PATH%;$<SHELL_PATH:$<TARGET_LINKER_FILE_DIR:apache-geode>>
 set PATH=%PATH%;$<SHELL_PATH:$<TARGET_LINKER_FILE_DIR:framework>>
 set PATH=%PATH%;$<SHELL_PATH:$<TARGET_LINKER_FILE_DIR:testobject>>
 set PATH=%PATH%;$<SHELL_PATH:$<TARGET_LINKER_FILE_DIR:SqLiteImpl>>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/integration-test/test.sh.in
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/test.sh.in b/src/cppcache/integration-test/test.sh.in
index 642aa37..dd795b5 100644
--- a/src/cppcache/integration-test/test.sh.in
+++ b/src/cppcache/integration-test/test.sh.in
@@ -2,7 +2,7 @@
 set -e
 set -o pipefail
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$<TARGET_LINKER_FILE_DIR:gfcppcache>
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$<TARGET_LINKER_FILE_DIR:apache-geode>
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$<TARGET_LINKER_FILE_DIR:fwk>
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$<TARGET_LINKER_FILE_DIR:pdxobject>
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$<TARGET_LINKER_FILE_DIR:testobject>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CMakeLists.txt b/src/cppcache/src/CMakeLists.txt
index 8fa7a7d..3e2f532 100644
--- a/src/cppcache/src/CMakeLists.txt
+++ b/src/cppcache/src/CMakeLists.txt
@@ -9,7 +9,7 @@ set_source_files_properties(${PRIVATE_HEADERS} PROPERTIES HEADER_FILE_ONLY TRUE)
 file(GLOB_RECURSE PUBLIC_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../include/*")
 set_source_files_properties(${PUBLIC_HEADERS} PROPERTIES HEADER_FILE_ONLY TRUE)
 
-set(RESOURCES gfcppcache.rc)
+set(RESOURCES apache-geode.rc)
 
 find_package(Git 1.7 REQUIRED)
 
@@ -62,10 +62,10 @@ set_source_files_properties(${CONFIGURE_OUT_FILES} PROPERTIES GENERATED TRUE)
 set(SOURCES_ALL ${SOURCES} ${PRIVATE_HEADERS} ${PUBLIC_HEADERS} ${CONFIGURE_IN_FILES} ${CONFIGURE_OUT_FILES})
 
 
-add_library(_gfcppcache INTERFACE)
+add_library(_apache-geode INTERFACE)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-  target_link_libraries(_gfcppcache INTERFACE
+  target_link_libraries(_apache-geode INTERFACE
     demangle
     kstat
   )
@@ -79,48 +79,48 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
   endif()
 endif()
 if (${WIN32})
-  target_link_libraries(_gfcppcache INTERFACE
+  target_link_libraries(_apache-geode INTERFACE
       Dbghelp
   )
 endif()
 
-target_link_libraries(_gfcppcache INTERFACE
+target_link_libraries(_apache-geode INTERFACE
   ACE
   libxml2
 )
-target_compile_definitions(_gfcppcache INTERFACE
+target_compile_definitions(_apache-geode INTERFACE
     # TODO replace BUILD_CPPCACHE with built-in _DLL
     $<BUILD_INTERFACE:BUILD_CPPCACHE>
 )
-target_include_directories(_gfcppcache INTERFACE
+target_include_directories(_apache-geode INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
-add_dependencies(_gfcppcache version-header)
+add_dependencies(_apache-geode version-header)
 
-add_library(gfcppcache SHARED ${SOURCES_ALL} ${RESOURCES})
-target_link_libraries(gfcppcache
+add_library(apache-geode SHARED ${SOURCES_ALL} ${RESOURCES})
+target_link_libraries(apache-geode
   PRIVATE
-    _gfcppcache
+    _apache-geode
   PUBLIC
     c++11
 )
-target_include_directories(gfcppcache
+target_include_directories(apache-geode
   PUBLIC
-    $<TARGET_PROPERTY:_gfcppcache,INTERFACE_INCLUDE_DIRECTORIES>
+    $<TARGET_PROPERTY:_apache-geode,INTERFACE_INCLUDE_DIRECTORIES>
 )
-add_dependencies(client-libraries gfcppcache)
-set_target_properties(gfcppcache PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
+add_dependencies(client-libraries apache-geode)
+set_target_properties(apache-geode PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
 
-add_library(gfcppcache-static STATIC ${SOURCES_ALL})
-target_link_libraries(gfcppcache-static
+add_library(apache-geode-static STATIC ${SOURCES_ALL})
+target_link_libraries(apache-geode-static
   PUBLIC
-    _gfcppcache
+    _apache-geode
 )
-add_dependencies(client-libraries gfcppcache-static)
+add_dependencies(client-libraries apache-geode-static)
 
-install(TARGETS gfcppcache
+install(TARGETS apache-geode
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/src/CppCacheLibrary.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CppCacheLibrary.cpp b/src/cppcache/src/CppCacheLibrary.cpp
index 67262f3..0c5dd5b 100644
--- a/src/cppcache/src/CppCacheLibrary.cpp
+++ b/src/cppcache/src/CppCacheLibrary.cpp
@@ -127,15 +127,15 @@ std::string CppCacheLibrary::getProductLibDir() {
   for (int i = 0; i < PATH_MAX && path[i] != 0; i++) {
     path[i] = ::tolower(path[i]);
   }
-  dllNamePtr = strstr(path, "gfcppcache.dll");
+  dllNamePtr = strstr(path, "apache-geode.dll");
   if (dllNamePtr == NULL) {
-    dllNamePtr = strstr(path, "gfcppcache_g.dll");
+    dllNamePtr = strstr(path, "apache-geode_g.dll");
     if (dllNamePtr == NULL) {
-      dllNamePtr = strstr(path, "Apache.Geode.Client.dll");
+      dllNamePtr = strstr(path, "Apache.Geode.dll");
     }
   }
 #else
-  dllNamePtr = strstr(path, "libgfcppcache");
+  dllNamePtr = strstr(path, "libapache-geode");
 #endif
   std::string libDir;
   if (dllNamePtr != NULL) {

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/src/apache-geode.rc
----------------------------------------------------------------------
diff --git a/src/cppcache/src/apache-geode.rc b/src/cppcache/src/apache-geode.rc
new file mode 100644
index 0000000..cc5130e
--- /dev/null
+++ b/src/cppcache/src/apache-geode.rc
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <verrsrc.h>
+
+#include "config.h"
+#include "version.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION    	PRODUCT_VERSION_RC
+PRODUCTVERSION 	PRODUCT_VERSION_RC
+FILEOS         	VOS_NT_WINDOWS32
+FILETYPE       	VFT_DLL
+FILESUBTYPE    	VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",      PRODUCT_VENDOR_NAME
+            VALUE "FileDescription",  PRODUCT_NAME " C++ Library"
+            VALUE "FileVersion",      PRODUCT_VERSION
+            VALUE "InternalName",     "apache-geode"
+            VALUE "LegalCopyright",   "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership."
+            VALUE "OriginalFilename", "apache-geode.dll"
+            VALUE "ProductName",      PRODUCT_NAME
+            VALUE "ProductVersion",   PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/src/dllmain.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/dllmain.cpp b/src/cppcache/src/dllmain.cpp
index 001b2ab..ca446b0 100644
--- a/src/cppcache/src/dllmain.cpp
+++ b/src/cppcache/src/dllmain.cpp
@@ -64,15 +64,15 @@ LIBEXP void DllMainGetPath(char *result, int maxLen) {
     result[0] = '\0';
     return;
   }
-  HMODULE libgfcppcache_module = GetModuleHandle("gfcppcache.dll");
-  if (libgfcppcache_module == 0) {
-    libgfcppcache_module = GetModuleHandle("gfcppcache_g.dll");
-    if (libgfcppcache_module == 0) {
-      libgfcppcache_module = GetModuleHandle("Apache.Geode.Client.dll");
+  HMODULE module = GetModuleHandle("apache-geode.dll");
+  if (module == 0) {
+    module = GetModuleHandle("apache-geode_g.dll");
+    if (module == 0) {
+      module = GetModuleHandle("Apache.Geode.dll");
     }
   }
-  if (libgfcppcache_module != 0) {
-    GetModuleFileName(libgfcppcache_module, result, maxLen);
+  if (module != 0) {
+    GetModuleFileName(module, result, maxLen);
   } else {
     result[0] = '\0';
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/src/gfcppcache.rc
----------------------------------------------------------------------
diff --git a/src/cppcache/src/gfcppcache.rc b/src/cppcache/src/gfcppcache.rc
deleted file mode 100644
index 26d17ae..0000000
--- a/src/cppcache/src/gfcppcache.rc
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <verrsrc.h>
-
-#include "config.h"
-#include "version.h"
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION    	PRODUCT_VERSION_RC
-PRODUCTVERSION 	PRODUCT_VERSION_RC
-FILEOS         	VOS_NT_WINDOWS32
-FILETYPE       	VFT_DLL
-FILESUBTYPE    	VFT2_UNKNOWN
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName",      PRODUCT_VENDOR_NAME
-            VALUE "FileDescription",  PRODUCT_NAME " C++ Library"
-            VALUE "FileVersion",      PRODUCT_VERSION
-            VALUE "InternalName",     "gfcppcache"
-            VALUE "LegalCopyright",   "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership."
-            VALUE "OriginalFilename", "gfcppcache.dll"
-            VALUE "ProductName",      PRODUCT_NAME
-            VALUE "ProductVersion",   PRODUCT_VERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/cppcache/test/CMakeLists.txt b/src/cppcache/test/CMakeLists.txt
index 9a5c055..c8e56b8 100644
--- a/src/cppcache/test/CMakeLists.txt
+++ b/src/cppcache/test/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required( VERSION 3.3 )
-project(gfcppcache_unittests)
+project(apache-geode_unittests)
 
 file(GLOB_RECURSE SOURCES "*.cpp")
 
-set(UNITTEST gfcppcache_unittests)
+set(UNITTEST apache-geode_unittests)
 add_executable(${UNITTEST} ${SOURCES})
 add_dependencies(unit-tests ${UNITTEST})
 
 target_link_libraries(${UNITTEST}
-  gfcppcache-static
+  apache-geode-static
   gtest
   gtest_main
   c++11

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/test/apache-geode_unittests.bat.in
----------------------------------------------------------------------
diff --git a/src/cppcache/test/apache-geode_unittests.bat.in b/src/cppcache/test/apache-geode_unittests.bat.in
new file mode 100644
index 0000000..9c2256a
--- /dev/null
+++ b/src/cppcache/test/apache-geode_unittests.bat.in
@@ -0,0 +1,12 @@
+@echo off
+setlocal
+set PATH=%PATH%;$<TARGET_LINKER_FILE_DIR:apache-geode>
+set LOG=${UNITTEST}.log
+
+rem In Windows, pipes to tee return tee's exit code instead of executable's
+rem exit code. As a workaround we write exit codes to files.
+($<TARGET_FILE:${UNITTEST}> && echo 0 >${UNITTEST}.errorlevel || echo 1 >${UNITTEST}.errorlevel) | tee %LOG%
+set /p errorlevel= <${UNITTEST}.errorlevel
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+exit /b

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/test/apache-geode_unittests.sh.in
----------------------------------------------------------------------
diff --git a/src/cppcache/test/apache-geode_unittests.sh.in b/src/cppcache/test/apache-geode_unittests.sh.in
new file mode 100644
index 0000000..ba1957d
--- /dev/null
+++ b/src/cppcache/test/apache-geode_unittests.sh.in
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+set -o pipefail
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$<TARGET_LINKER_FILE_DIR:apache-geode>
+export LOG=${UNITTEST}.log
+
+if [ `uname` = "Darwin" ]
+then
+  # export DYLD_LIBRARY_PATH to work around OS X SIP
+  export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
+fi
+
+$DEBUG $<TARGET_FILE:${UNITTEST}> | tee $LOG

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/test/gfcppcache_unittests.bat.in
----------------------------------------------------------------------
diff --git a/src/cppcache/test/gfcppcache_unittests.bat.in b/src/cppcache/test/gfcppcache_unittests.bat.in
deleted file mode 100644
index edee5e0..0000000
--- a/src/cppcache/test/gfcppcache_unittests.bat.in
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-setlocal
-set PATH=%PATH%;$<TARGET_LINKER_FILE_DIR:gfcppcache>
-set LOG=${UNITTEST}.log
-
-rem In Windows, pipes to tee return tee's exit code instead of executable's
-rem exit code. As a workaround we write exit codes to files.
-($<TARGET_FILE:${UNITTEST}> && echo 0 >${UNITTEST}.errorlevel || echo 1 >${UNITTEST}.errorlevel) | tee %LOG%
-set /p errorlevel= <${UNITTEST}.errorlevel
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-exit /b

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cppcache/test/gfcppcache_unittests.sh.in
----------------------------------------------------------------------
diff --git a/src/cppcache/test/gfcppcache_unittests.sh.in b/src/cppcache/test/gfcppcache_unittests.sh.in
deleted file mode 100644
index 32a7392..0000000
--- a/src/cppcache/test/gfcppcache_unittests.sh.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$<TARGET_LINKER_FILE_DIR:gfcppcache>
-export LOG=${UNITTEST}.log
-
-if [ `uname` = "Darwin" ]
-then
-  # export DYLD_LIBRARY_PATH to work around OS X SIP
-  export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
-fi
-
-$DEBUG $<TARGET_FILE:${UNITTEST}> | tee $LOG

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/cryptoimpl/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/cryptoimpl/CMakeLists.txt b/src/cryptoimpl/CMakeLists.txt
index 82d6d40..4570fe4 100644
--- a/src/cryptoimpl/CMakeLists.txt
+++ b/src/cryptoimpl/CMakeLists.txt
@@ -9,7 +9,7 @@ target_link_libraries(cryptoImpl
   PRIVATE
     ACE_SSL
   PUBLIC
-   gfcppcache
+   apache-geode
    crypto
    ssl
    c++11

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/dhimpl/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/dhimpl/CMakeLists.txt b/src/dhimpl/CMakeLists.txt
index 86e142d..d20224f 100644
--- a/src/dhimpl/CMakeLists.txt
+++ b/src/dhimpl/CMakeLists.txt
@@ -6,7 +6,7 @@ file(GLOB_RECURSE SOURCES "*.cpp")
 add_library(DHImpl SHARED ${SOURCES})
 target_link_libraries(DHImpl
   PUBLIC 
-    gfcppcache
+    apache-geode
     crypto
     c++11
 )

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/gfcpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/gfcpp/CMakeLists.txt b/src/gfcpp/CMakeLists.txt
index 502a465..05770cd 100644
--- a/src/gfcpp/CMakeLists.txt
+++ b/src/gfcpp/CMakeLists.txt
@@ -5,6 +5,6 @@ file(GLOB_RECURSE SOURCES "*.cpp")
 
 add_executable(gfcpp ${SOURCES})
 
-target_link_libraries(gfcpp gfcppcache c++11)
+target_link_libraries(gfcpp apache-geode c++11)
 
 install(TARGETS gfcpp DESTINATION bin)

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/pdxautoserializer/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/CMakeLists.txt b/src/pdxautoserializer/CMakeLists.txt
index 420b74b..8c2e542 100644
--- a/src/pdxautoserializer/CMakeLists.txt
+++ b/src/pdxautoserializer/CMakeLists.txt
@@ -8,7 +8,7 @@ target_link_libraries(pdxautoserializer
   PRIVATE
     antlr
   PUBLIC
-    gfcppcache
+    apache-geode
     c++11
 )
 

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/plugins/SQLiteCLI/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/plugins/SQLiteCLI/CMakeLists.txt b/src/plugins/SQLiteCLI/CMakeLists.txt
index 0aea895..a5eaa48 100755
--- a/src/plugins/SQLiteCLI/CMakeLists.txt
+++ b/src/plugins/SQLiteCLI/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.4)
 project(nativeclient.plugins.SQLiteCLI)
 
-# Set the .NET Target Framework (Note: This should match the build for gfclicache.)
+# Set the .NET Target Framework (Note: This should match the build for Apache.Geode.)
 set (DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2")
 
 foreach(var CMAKE_CURRENT_SOURCE_DIR CMAKE_SOURCE_DIR CMAKE_BINARY_DIR CMAKE_CURRENT_BINARY_DIR)

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
----------------------------------------------------------------------
diff --git a/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in b/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
index 45949fb..3be7f46 100644
--- a/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
+++ b/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
@@ -90,7 +90,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\gfclicache.vcxproj">
+    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/CMakeLists.txt b/src/quickstart/cpp/CMakeLists.txt
index 2999c6d..6841f9c 100755
--- a/src/quickstart/cpp/CMakeLists.txt
+++ b/src/quickstart/cpp/CMakeLists.txt
@@ -55,12 +55,12 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}")
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}")
 
 if (${WIN32})
-  set(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/gfcppcache${CMAKE_IMPORT_LIBRARY_SUFFIX}")
+  set(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/apache-geode${CMAKE_IMPORT_LIBRARY_SUFFIX}")
 
-  file(COPY ${NATIVECLIENT_BINARIES_DIR}/gfcppcache.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+  file(COPY ${NATIVECLIENT_BINARIES_DIR}/apache-geode.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
   set(RUNCPP "runcpp.bat")
 else ()
-  get_filename_component(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}gfcppcache${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE)
+  get_filename_component(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}apache-geode${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE)
 
   set(RUNCPP "runcpp.sh")
 endif()

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/CMakeLists.txt b/src/quickstart/csharp/CMakeLists.txt
index 6fa2838..5792b35 100755
--- a/src/quickstart/csharp/CMakeLists.txt
+++ b/src/quickstart/csharp/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(NativeClient REQUIRED PATHS ..)
 # Cache the path to the NativeClient product
 set (GFCPP CACHE ${NATIVECLIENT_DIR} PATH REQUIRED)
 
-# Set the .NET Target Framework (Note: This should match the build for gfclicache.)
+# Set the .NET Target Framework (Note: This should match the build for Apache.Geode.)
 set (DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2")
 
 file(GLOB_RECURSE CSPROJECTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.csproj.in")

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/app.config.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/app.config.in b/src/quickstart/csharp/app.config.in
index 4b43cd8..d38dacb 100755
--- a/src/quickstart/csharp/app.config.in
+++ b/src/quickstart/csharp/app.config.in
@@ -10,7 +10,7 @@
           publicKeyToken="126e6338d9f55e0c"
           culture="neutral" />
        <codeBase version="9.0.0.0"
-          href="${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll"/>
+          href="${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll"/>
      </dependentAssembly> 
    </assemblyBinding>  
  </runtime>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/BasicOperations/BasicOperations.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/BasicOperations/BasicOperations.csproj.in b/src/quickstart/csharp/vsprojects/BasicOperations/BasicOperations.csproj.in
index 45a5c06..c93c573 100644
--- a/src/quickstart/csharp/vsprojects/BasicOperations/BasicOperations.csproj.in
+++ b/src/quickstart/csharp/vsprojects/BasicOperations/BasicOperations.csproj.in
@@ -77,7 +77,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>     
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>     
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/CqQuery/CqQuery.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/CqQuery/CqQuery.csproj.in b/src/quickstart/csharp/vsprojects/CqQuery/CqQuery.csproj.in
index 2a96bd6..4a33e74 100644
--- a/src/quickstart/csharp/vsprojects/CqQuery/CqQuery.csproj.in
+++ b/src/quickstart/csharp/vsprojects/CqQuery/CqQuery.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/DataExpiration/DataExpiration.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/DataExpiration/DataExpiration.csproj.in b/src/quickstart/csharp/vsprojects/DataExpiration/DataExpiration.csproj.in
index 53684fa..38de366 100644
--- a/src/quickstart/csharp/vsprojects/DataExpiration/DataExpiration.csproj.in
+++ b/src/quickstart/csharp/vsprojects/DataExpiration/DataExpiration.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=8.1.0.1, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/Delta/Delta.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/Delta/Delta.csproj.in b/src/quickstart/csharp/vsprojects/Delta/Delta.csproj.in
index 23437a0..893e866 100644
--- a/src/quickstart/csharp/vsprojects/Delta/Delta.csproj.in
+++ b/src/quickstart/csharp/vsprojects/Delta/Delta.csproj.in
@@ -74,7 +74,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/DistributedSystem/DistributedSystem.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/DistributedSystem/DistributedSystem.csproj.in b/src/quickstart/csharp/vsprojects/DistributedSystem/DistributedSystem.csproj.in
index d076714..f1d2456 100755
--- a/src/quickstart/csharp/vsprojects/DistributedSystem/DistributedSystem.csproj.in
+++ b/src/quickstart/csharp/vsprojects/DistributedSystem/DistributedSystem.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/DurableClient/DurableClient.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/DurableClient/DurableClient.csproj.in b/src/quickstart/csharp/vsprojects/DurableClient/DurableClient.csproj.in
index f1afe86..2d351ef 100644
--- a/src/quickstart/csharp/vsprojects/DurableClient/DurableClient.csproj.in
+++ b/src/quickstart/csharp/vsprojects/DurableClient/DurableClient.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/Exceptions/Exceptions.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/Exceptions/Exceptions.csproj.in b/src/quickstart/csharp/vsprojects/Exceptions/Exceptions.csproj.in
index 4a25f0f..5b8a53b 100644
--- a/src/quickstart/csharp/vsprojects/Exceptions/Exceptions.csproj.in
+++ b/src/quickstart/csharp/vsprojects/Exceptions/Exceptions.csproj.in
@@ -78,7 +78,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/ExecuteFunctions/ExecuteFunctions.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/ExecuteFunctions/ExecuteFunctions.csproj.in b/src/quickstart/csharp/vsprojects/ExecuteFunctions/ExecuteFunctions.csproj.in
index 17a9211..e366f2c 100644
--- a/src/quickstart/csharp/vsprojects/ExecuteFunctions/ExecuteFunctions.csproj.in
+++ b/src/quickstart/csharp/vsprojects/ExecuteFunctions/ExecuteFunctions.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/HACache/HACache.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/HACache/HACache.csproj.in b/src/quickstart/csharp/vsprojects/HACache/HACache.csproj.in
index 482ae5e..8663516 100644
--- a/src/quickstart/csharp/vsprojects/HACache/HACache.csproj.in
+++ b/src/quickstart/csharp/vsprojects/HACache/HACache.csproj.in
@@ -78,7 +78,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/LoaderListenerWriter/LoaderListenerWriter.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/LoaderListenerWriter/LoaderListenerWriter.csproj.in b/src/quickstart/csharp/vsprojects/LoaderListenerWriter/LoaderListenerWriter.csproj.in
index 788bba3..0243756 100644
--- a/src/quickstart/csharp/vsprojects/LoaderListenerWriter/LoaderListenerWriter.csproj.in
+++ b/src/quickstart/csharp/vsprojects/LoaderListenerWriter/LoaderListenerWriter.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/MultiuserSecurity/MultiuserSecurity.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/MultiuserSecurity/MultiuserSecurity.csproj.in b/src/quickstart/csharp/vsprojects/MultiuserSecurity/MultiuserSecurity.csproj.in
index 047de56..5238155 100755
--- a/src/quickstart/csharp/vsprojects/MultiuserSecurity/MultiuserSecurity.csproj.in
+++ b/src/quickstart/csharp/vsprojects/MultiuserSecurity/MultiuserSecurity.csproj.in
@@ -77,7 +77,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/PdxInstance/PdxInstance.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/PdxInstance/PdxInstance.csproj.in b/src/quickstart/csharp/vsprojects/PdxInstance/PdxInstance.csproj.in
index b0d3c5a..8257a51 100755
--- a/src/quickstart/csharp/vsprojects/PdxInstance/PdxInstance.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PdxInstance/PdxInstance.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/PdxRemoteQuery/PdxRemoteQuery.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/PdxRemoteQuery/PdxRemoteQuery.csproj.in b/src/quickstart/csharp/vsprojects/PdxRemoteQuery/PdxRemoteQuery.csproj.in
index 486efa8..5ea9001 100644
--- a/src/quickstart/csharp/vsprojects/PdxRemoteQuery/PdxRemoteQuery.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PdxRemoteQuery/PdxRemoteQuery.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/PdxSerializer/PdxSerializer.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/PdxSerializer/PdxSerializer.csproj.in b/src/quickstart/csharp/vsprojects/PdxSerializer/PdxSerializer.csproj.in
index 1aeb38a..9cdd817 100755
--- a/src/quickstart/csharp/vsprojects/PdxSerializer/PdxSerializer.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PdxSerializer/PdxSerializer.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/PoolCqQuery/PoolCqQuery.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/PoolCqQuery/PoolCqQuery.csproj.in b/src/quickstart/csharp/vsprojects/PoolCqQuery/PoolCqQuery.csproj.in
index d01e55b..29aee7c 100755
--- a/src/quickstart/csharp/vsprojects/PoolCqQuery/PoolCqQuery.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PoolCqQuery/PoolCqQuery.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/PoolRemoteQuery/PoolRemoteQuery.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/PoolRemoteQuery/PoolRemoteQuery.csproj.in b/src/quickstart/csharp/vsprojects/PoolRemoteQuery/PoolRemoteQuery.csproj.in
index ac05682..190e154 100755
--- a/src/quickstart/csharp/vsprojects/PoolRemoteQuery/PoolRemoteQuery.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PoolRemoteQuery/PoolRemoteQuery.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/PoolWithEndpoints/PoolWithEndpoints.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/PoolWithEndpoints/PoolWithEndpoints.csproj.in b/src/quickstart/csharp/vsprojects/PoolWithEndpoints/PoolWithEndpoints.csproj.in
index 06e3d4f..39f789c 100755
--- a/src/quickstart/csharp/vsprojects/PoolWithEndpoints/PoolWithEndpoints.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PoolWithEndpoints/PoolWithEndpoints.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/PutAllGetAllOperations/PutAllGetAllOperations.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/PutAllGetAllOperations/PutAllGetAllOperations.csproj.in b/src/quickstart/csharp/vsprojects/PutAllGetAllOperations/PutAllGetAllOperations.csproj.in
index 1399510..a881e8c 100644
--- a/src/quickstart/csharp/vsprojects/PutAllGetAllOperations/PutAllGetAllOperations.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PutAllGetAllOperations/PutAllGetAllOperations.csproj.in
@@ -77,7 +77,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/RefIDExample/RefIDExample.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/RefIDExample/RefIDExample.csproj.in b/src/quickstart/csharp/vsprojects/RefIDExample/RefIDExample.csproj.in
index 7d92558..20c5bc0 100644
--- a/src/quickstart/csharp/vsprojects/RefIDExample/RefIDExample.csproj.in
+++ b/src/quickstart/csharp/vsprojects/RefIDExample/RefIDExample.csproj.in
@@ -74,7 +74,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/RegisterInterest/RegisterInterest.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/RegisterInterest/RegisterInterest.csproj.in b/src/quickstart/csharp/vsprojects/RegisterInterest/RegisterInterest.csproj.in
index a26a657..b9a1b36 100644
--- a/src/quickstart/csharp/vsprojects/RegisterInterest/RegisterInterest.csproj.in
+++ b/src/quickstart/csharp/vsprojects/RegisterInterest/RegisterInterest.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/RemoteQuery/RemoteQuery.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/RemoteQuery/RemoteQuery.csproj.in b/src/quickstart/csharp/vsprojects/RemoteQuery/RemoteQuery.csproj.in
index eae36aa..73a06f2 100644
--- a/src/quickstart/csharp/vsprojects/RemoteQuery/RemoteQuery.csproj.in
+++ b/src/quickstart/csharp/vsprojects/RemoteQuery/RemoteQuery.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/Security/Security.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/Security/Security.csproj.in b/src/quickstart/csharp/vsprojects/Security/Security.csproj.in
index 2f494dc..27346f4 100644
--- a/src/quickstart/csharp/vsprojects/Security/Security.csproj.in
+++ b/src/quickstart/csharp/vsprojects/Security/Security.csproj.in
@@ -77,7 +77,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/SimplePlugins/SimplePlugins.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/SimplePlugins/SimplePlugins.csproj.in b/src/quickstart/csharp/vsprojects/SimplePlugins/SimplePlugins.csproj.in
index 822eb6f..6eb5cf1 100644
--- a/src/quickstart/csharp/vsprojects/SimplePlugins/SimplePlugins.csproj.in
+++ b/src/quickstart/csharp/vsprojects/SimplePlugins/SimplePlugins.csproj.in
@@ -86,7 +86,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral&#xD;&#xA; PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/Transactions/Transactions.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/Transactions/Transactions.csproj.in b/src/quickstart/csharp/vsprojects/Transactions/Transactions.csproj.in
index fe231c1..77953d9 100644
--- a/src/quickstart/csharp/vsprojects/Transactions/Transactions.csproj.in
+++ b/src/quickstart/csharp/vsprojects/Transactions/Transactions.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/csharp/vsprojects/TransactionsXA/TransactionsXA.csproj.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/vsprojects/TransactionsXA/TransactionsXA.csproj.in b/src/quickstart/csharp/vsprojects/TransactionsXA/TransactionsXA.csproj.in
index 10eed8f..d35e47b 100644
--- a/src/quickstart/csharp/vsprojects/TransactionsXA/TransactionsXA.csproj.in
+++ b/src/quickstart/csharp/vsprojects/TransactionsXA/TransactionsXA.csproj.in
@@ -76,7 +76,7 @@
   <ItemGroup>
     <Reference Include="Apache.Geode.Client, Version=8.2.0.3, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/quickstart/runcs.bat.in
----------------------------------------------------------------------
diff --git a/src/quickstart/runcs.bat.in b/src/quickstart/runcs.bat.in
index ae63c43..9d50fb5 100644
--- a/src/quickstart/runcs.bat.in
+++ b/src/quickstart/runcs.bat.in
@@ -27,7 +27,7 @@ echo If OpenSSL libraries are not found in PATH then Security example will fail.
 
 :startexamples
 
-copy /V %GFCPP%\bin\Apache.Geode.Client.dll .
+copy /V %GFCPP%\bin\Apache.Geode.dll .
 
 set LANG=C#
 set LANGDIR=.

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/sqliteimpl/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/sqliteimpl/CMakeLists.txt b/src/sqliteimpl/CMakeLists.txt
index 2a2befd..2065794 100644
--- a/src/sqliteimpl/CMakeLists.txt
+++ b/src/sqliteimpl/CMakeLists.txt
@@ -6,7 +6,7 @@ file(GLOB_RECURSE SOURCES "*.cpp")
 add_library(SqLiteImpl SHARED ${SOURCES})
 target_link_libraries(SqLiteImpl
   PUBLIC
-    gfcppcache
+    apache-geode
     sqlite
     c++11
 )

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/templates/security/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/templates/security/CMakeLists.txt b/src/templates/security/CMakeLists.txt
index 295ce57..9709d86 100644
--- a/src/templates/security/CMakeLists.txt
+++ b/src/templates/security/CMakeLists.txt
@@ -7,6 +7,6 @@ add_library(securityImpl SHARED ${SOURCES} CMakeLists.txt.forInstall)
 
 target_link_libraries(securityImpl
   PUBLIC
-    gfcppcache
+    apache-geode
     crypto
 )

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/templates/security/CMakeLists.txt.forInstall
----------------------------------------------------------------------
diff --git a/src/templates/security/CMakeLists.txt.forInstall b/src/templates/security/CMakeLists.txt.forInstall
index 0bfe74d..3c3d099 100644
--- a/src/templates/security/CMakeLists.txt.forInstall
+++ b/src/templates/security/CMakeLists.txt.forInstall
@@ -12,9 +12,9 @@ add_library(securityImpl SHARED ${SOURCES})
 include_directories(${NATIVECLIENT_INCLUDE_DIR})
 
 if (${WIN32})
-  set(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/gfcppcache${CMAKE_IMPORT_LIBRARY_SUFFIX}")
+  set(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/apache-geode${CMAKE_IMPORT_LIBRARY_SUFFIX}")
 else ()
-  get_filename_component(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}gfcppcache${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE)
+  get_filename_component(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}apache-geode${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE)
 endif()
 
 target_link_libraries(securityImpl

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/templates/security/csharp/securityImpl.csproj.in
----------------------------------------------------------------------
diff --git a/src/templates/security/csharp/securityImpl.csproj.in b/src/templates/security/csharp/securityImpl.csproj.in
index ee90de5..767c086 100644
--- a/src/templates/security/csharp/securityImpl.csproj.in
+++ b/src/templates/security/csharp/securityImpl.csproj.in
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Apache.Gedoe.Client">
-      <HintPath>${GFCPP}\bin\Apache.Geode.Client.dll</HintPath>
+      <HintPath>${GFCPP}\bin\Apache.Geode.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cli/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/cli/CMakeLists.txt b/src/tests/cli/CMakeLists.txt
index 68ae1a0..ed8b6bd 100644
--- a/src/tests/cli/CMakeLists.txt
+++ b/src/tests/cli/CMakeLists.txt
@@ -13,7 +13,7 @@ else()
   set (NUNIT_CONSOLE "nunit-console-x86")
 endif()
 
-# Set the .NET Target Framework (Note: This should match the build for gfclicache.)
+# Set the .NET Target Framework (Note: This should match the build for Apache.Geode.)
 set (DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2")
 
 foreach(var CMAKE_CURRENT_SOURCE_DIR CMAKE_SOURCE_DIR CMAKE_BINARY_DIR CMAKE_CURRENT_BINARY_DIR)

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cli/FwkUtil/FwkUtil.csproj.in
----------------------------------------------------------------------
diff --git a/src/tests/cli/FwkUtil/FwkUtil.csproj.in b/src/tests/cli/FwkUtil/FwkUtil.csproj.in
index 600d98b..0317abf 100644
--- a/src/tests/cli/FwkUtil/FwkUtil.csproj.in
+++ b/src/tests/cli/FwkUtil/FwkUtil.csproj.in
@@ -91,7 +91,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>  <ItemGroup>
-    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\gfclicache.vcxproj">
+    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cli/NativeWrapper/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/cli/NativeWrapper/CMakeLists.txt b/src/tests/cli/NativeWrapper/CMakeLists.txt
index 9c36f5e..e40e747 100755
--- a/src/tests/cli/NativeWrapper/CMakeLists.txt
+++ b/src/tests/cli/NativeWrapper/CMakeLists.txt
@@ -7,11 +7,11 @@ add_library(NativeWrapper SHARED ${SOURCES})
 
 target_link_libraries(NativeWrapper
   PUBLIC 
-    gfclicache
+    Apache.Geode
     c++11
 )
 
-add_dependencies(NativeWrapper gfclicache)
+add_dependencies(NativeWrapper Apache.Geode)
 
 include_directories(${CMAKE_SOURCE_DIR}/clicache/src)
 set_target_properties(NativeWrapper PROPERTIES FOLDER test/cliTests)

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cli/NewFwkLib/NewFwkLib.csproj.in
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/NewFwkLib.csproj.in b/src/tests/cli/NewFwkLib/NewFwkLib.csproj.in
index 85c671e..9934659 100644
--- a/src/tests/cli/NewFwkLib/NewFwkLib.csproj.in
+++ b/src/tests/cli/NewFwkLib/NewFwkLib.csproj.in
@@ -85,7 +85,7 @@
       <HintPath>${NUNIT}\bin\framework\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\gfclicache.vcxproj">
+    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>    

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cli/PdxClassLibrary/PdxClassLibrary.csproj.in
----------------------------------------------------------------------
diff --git a/src/tests/cli/PdxClassLibrary/PdxClassLibrary.csproj.in b/src/tests/cli/PdxClassLibrary/PdxClassLibrary.csproj.in
index 3d7faa0..001ecc1 100644
--- a/src/tests/cli/PdxClassLibrary/PdxClassLibrary.csproj.in
+++ b/src/tests/cli/PdxClassLibrary/PdxClassLibrary.csproj.in
@@ -86,7 +86,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\gfclicache.vcxproj">
+    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in
----------------------------------------------------------------------
diff --git a/src/tests/cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in b/src/tests/cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in
index 16999d3..7e4a377 100644
--- a/src/tests/cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in
+++ b/src/tests/cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in
@@ -90,7 +90,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\gfclicache.vcxproj">
+    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cli/PdxVersion2Lib/PdxVersion2Lib.csproj.in
----------------------------------------------------------------------
diff --git a/src/tests/cli/PdxVersion2Lib/PdxVersion2Lib.csproj.in b/src/tests/cli/PdxVersion2Lib/PdxVersion2Lib.csproj.in
index b20bcab..838738a 100644
--- a/src/tests/cli/PdxVersion2Lib/PdxVersion2Lib.csproj.in
+++ b/src/tests/cli/PdxVersion2Lib/PdxVersion2Lib.csproj.in
@@ -87,7 +87,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\gfclicache.vcxproj">
+    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cli/PkcsWrapper/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/cli/PkcsWrapper/CMakeLists.txt b/src/tests/cli/PkcsWrapper/CMakeLists.txt
index fd26abf..8f41dc4 100755
--- a/src/tests/cli/PkcsWrapper/CMakeLists.txt
+++ b/src/tests/cli/PkcsWrapper/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(PkcsWrapper SHARED ${SOURCES})
 
 target_link_libraries(PkcsWrapper
   PUBLIC 
-    gfclicache
+    Apache.Geode
     c++11
   PRIVATE
     security

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cli/QueryHelper/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/cli/QueryHelper/CMakeLists.txt b/src/tests/cli/QueryHelper/CMakeLists.txt
index 6b6062f..b01ae00 100755
--- a/src/tests/cli/QueryHelper/CMakeLists.txt
+++ b/src/tests/cli/QueryHelper/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(QueryWrapper SHARED ${SOURCES})
 #TODO get external project library names
 target_link_libraries(QueryWrapper
   PUBLIC 
-    gfclicache
+    Apache.Geode
     c++11
 )
 

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cli/SecurityUtil/SecurityUtil.csproj.in
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/SecurityUtil.csproj.in b/src/tests/cli/SecurityUtil/SecurityUtil.csproj.in
index 055f549..75cf043 100644
--- a/src/tests/cli/SecurityUtil/SecurityUtil.csproj.in
+++ b/src/tests/cli/SecurityUtil/SecurityUtil.csproj.in
@@ -90,7 +90,7 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\gfclicache.vcxproj">
+    <ProjectReference Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cpp/fwklib/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/CMakeLists.txt b/src/tests/cpp/fwklib/CMakeLists.txt
index 45f6f1f..8b7242d 100644
--- a/src/tests/cpp/fwklib/CMakeLists.txt
+++ b/src/tests/cpp/fwklib/CMakeLists.txt
@@ -10,7 +10,7 @@ target_link_libraries(framework
   PRIVATE
     ACE
   PUBLIC 
-    gfcppcache
+    apache-geode
     xerces-c
 )
 

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cpp/pdxautoserializerclass/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/CMakeLists.txt b/src/tests/cpp/pdxautoserializerclass/CMakeLists.txt
index c480597..7f7bae8 100644
--- a/src/tests/cpp/pdxautoserializerclass/CMakeLists.txt
+++ b/src/tests/cpp/pdxautoserializerclass/CMakeLists.txt
@@ -4,9 +4,9 @@ project(nativeclient.tests.pdxautoserializerclass)
 file(GLOB_RECURSE SOURCES "*.cpp")
 
 if (APPLE)
-    set(DYNAMIC_LIBRARY_PATH DYLD_LIBRARY_PATH=$<TARGET_LINKER_FILE_DIR:gfcppcache>)
+    set(DYNAMIC_LIBRARY_PATH DYLD_LIBRARY_PATH=$<TARGET_LINKER_FILE_DIR:apache-geode>)
 elseif(UNIX)
-    set(DYNAMIC_LIBRARY_PATH LD_LIBRARY_PATH=$<TARGET_LINKER_FILE_DIR:gfcppcache>)
+    set(DYNAMIC_LIBRARY_PATH LD_LIBRARY_PATH=$<TARGET_LINKER_FILE_DIR:apache-geode>)
 endif()
 
 macro(add_pdxautoserializer SOURCES_VAR NAMESPACE CLASS HEADER FLAGS)
@@ -34,7 +34,7 @@ add_definitions(-DBUILD_TESTOBJECT)
 
 target_link_libraries(pdxobject
   PUBLIC 
-    gfcppcache
+    apache-geode
     c++11
 )
 

http://git-wip-us.apache.org/repos/asf/geode/blob/01c02867/src/tests/cpp/testobject/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/CMakeLists.txt b/src/tests/cpp/testobject/CMakeLists.txt
index d60548f..daa40ff 100644
--- a/src/tests/cpp/testobject/CMakeLists.txt
+++ b/src/tests/cpp/testobject/CMakeLists.txt
@@ -6,9 +6,9 @@ file(GLOB_RECURSE SOURCES "*.cpp")
 add_definitions(-DBUILD_TESTOBJECT)
 
 if (APPLE)
-    set(DYNAMIC_LIBRARY_PATH DYLD_LIBRARY_PATH=$<TARGET_LINKER_FILE_DIR:gfcppcache>)
+    set(DYNAMIC_LIBRARY_PATH DYLD_LIBRARY_PATH=$<TARGET_LINKER_FILE_DIR:apache-geode>)
 elseif(UNIX)
-    set(DYNAMIC_LIBRARY_PATH LD_LIBRARY_PATH=$<TARGET_LINKER_FILE_DIR:gfcppcache>)
+    set(DYNAMIC_LIBRARY_PATH LD_LIBRARY_PATH=$<TARGET_LINKER_FILE_DIR:apache-geode>)
 endif()
 
 macro(add_pdxautoserializer SOURCES_VAR NAMESPACE CLASS HEADER SUFFIX CLASSNAMESTR)
@@ -63,7 +63,7 @@ set_target_properties(testobject PROPERTIES FOLDER test)
 
 target_link_libraries(testobject
   PUBLIC 
-    gfcppcache
+    apache-geode
     fwk
     pdxobject
     c++11


Mime
View raw message