You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/01/23 19:17:31 UTC
[39/50] [abbrv] geode git commit: GEODE-2316: Renamed namespace GemStone.GemFire.Cache -> Apache.Geode.Client

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxRemoteReader.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxRemoteReader.cpp b/src/clicache/src/impl/PdxRemoteReader.cpp
index 9baef34..0df184f 100644
--- a/src/clicache/src/impl/PdxRemoteReader.cpp
+++ b/src/clicache/src/impl/PdxRemoteReader.cpp
@@ -19,13 +19,13 @@
 #include "../Log.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxRemoteReader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxRemoteReader.hpp b/src/clicache/src/impl/PdxRemoteReader.hpp
index 46a879f..305dd50 100644
--- a/src/clicache/src/impl/PdxRemoteReader.hpp
+++ b/src/clicache/src/impl/PdxRemoteReader.hpp
@@ -22,13 +22,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxRemoteWriter.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxRemoteWriter.cpp b/src/clicache/src/impl/PdxRemoteWriter.cpp
index 4f99fee..4696d03 100644
--- a/src/clicache/src/impl/PdxRemoteWriter.cpp
+++ b/src/clicache/src/impl/PdxRemoteWriter.cpp
@@ -19,13 +19,13 @@
 #include "PdxTypeRegistry.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxRemoteWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxRemoteWriter.hpp b/src/clicache/src/impl/PdxRemoteWriter.hpp
index f8b2950..fa1c0d0 100644
--- a/src/clicache/src/impl/PdxRemoteWriter.hpp
+++ b/src/clicache/src/impl/PdxRemoteWriter.hpp
@@ -22,13 +22,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       ref class DataOutput;
       namespace Internal

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxType.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxType.cpp b/src/clicache/src/impl/PdxType.cpp
index c125cd7..d0de6a7 100644
--- a/src/clicache/src/impl/PdxType.cpp
+++ b/src/clicache/src/impl/PdxType.cpp
@@ -25,13 +25,13 @@
 #include "PdxWrapper.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxType.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxType.hpp b/src/clicache/src/impl/PdxType.hpp
index ddca33b..d53d32c 100644
--- a/src/clicache/src/impl/PdxType.hpp
+++ b/src/clicache/src/impl/PdxType.hpp
@@ -24,13 +24,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
 				ref class DataOutput;
 				ref class DataInput;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxTypeRegistry.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxTypeRegistry.cpp b/src/clicache/src/impl/PdxTypeRegistry.cpp
index 7b471d2..b63b230 100644
--- a/src/clicache/src/impl/PdxTypeRegistry.cpp
+++ b/src/clicache/src/impl/PdxTypeRegistry.cpp
@@ -21,13 +21,13 @@
 #include "PdxWrapper.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxTypeRegistry.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxTypeRegistry.hpp b/src/clicache/src/impl/PdxTypeRegistry.hpp
index 80a8cde..c001d74 100644
--- a/src/clicache/src/impl/PdxTypeRegistry.hpp
+++ b/src/clicache/src/impl/PdxTypeRegistry.hpp
@@ -25,13 +25,13 @@ using namespace System;
 using namespace System::Threading;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxWrapper.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxWrapper.hpp b/src/clicache/src/impl/PdxWrapper.hpp
index 9b7c900..4f6f220 100755
--- a/src/clicache/src/impl/PdxWrapper.hpp
+++ b/src/clicache/src/impl/PdxWrapper.hpp
@@ -21,13 +21,13 @@
 #include "../IPdxReader.hpp"
 #include "../IPdxSerializer.hpp"
 #include "../Serializable.hpp"
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{  
         ref class PdxWrapper : IPdxSerializable
         {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp b/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp
index d89a31d..974a215 100644
--- a/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp
+++ b/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp
@@ -24,13 +24,13 @@
 using namespace System;
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxWriterWithTypeCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxWriterWithTypeCollector.hpp b/src/clicache/src/impl/PdxWriterWithTypeCollector.hpp
index 1715fc3..2589d1d 100644
--- a/src/clicache/src/impl/PdxWriterWithTypeCollector.hpp
+++ b/src/clicache/src/impl/PdxWriterWithTypeCollector.hpp
@@ -24,13 +24,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       ref class DataOutput;
       namespace Internal

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PersistenceManagerProxy.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PersistenceManagerProxy.hpp b/src/clicache/src/impl/PersistenceManagerProxy.hpp
index 0e86a06..1d4d3a0 100644
--- a/src/clicache/src/impl/PersistenceManagerProxy.hpp
+++ b/src/clicache/src/impl/PersistenceManagerProxy.hpp
@@ -21,13 +21,13 @@
 #include "../Region.hpp"
 #include "../Properties.hpp"
 using namespace System;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
-    { 
-      namespace Generic
+    namespace Client
+    {
+namespace Generic
       {
         public interface class IPersistenceManagerProxy
         {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ResultCollectorProxy.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ResultCollectorProxy.hpp b/src/clicache/src/impl/ResultCollectorProxy.hpp
index 6f2d5c3..22b8d9d 100644
--- a/src/clicache/src/impl/ResultCollectorProxy.hpp
+++ b/src/clicache/src/impl/ResultCollectorProxy.hpp
@@ -21,13 +21,15 @@
 
 using namespace System;
 //using namespace System::Collections::Generic;
-//using namespace GemStone::GemFire::Cache;
+//using namespace Apache::Geode::Client;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       public interface class ResultCollectorG
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/SafeConvert.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/SafeConvert.hpp b/src/clicache/src/impl/SafeConvert.hpp
index ed0bfdd..591e5ca 100644
--- a/src/clicache/src/impl/SafeConvert.hpp
+++ b/src/clicache/src/impl/SafeConvert.hpp
@@ -33,13 +33,13 @@
 //TODO::split
 #include "../CqEvent.hpp"
 #include "../UserFunctionExecutionException.hpp"
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
 				interface class IPdxSerializable;
       public ref class SafeConvertClassGeneric
@@ -49,7 +49,7 @@ namespace GemStone
   
         static void SetAppDomainEnabled(bool isAppDomainEnable)
         {
-          GemStone::GemFire::Cache::Generic::Log::Fine("AppDomain support enabled: " + isAppDomainEnable);
+          Apache::Geode::Client::Generic::Log::Fine("AppDomain support enabled: " + isAppDomainEnable);
           isAppDomainEnabled = isAppDomainEnable;
         }
       };
@@ -58,7 +58,7 @@ namespace GemStone
       /// Helper function to convert native <c>apache::geode::client::Serializable</c> object
       /// to managed <see cref="IGFSerializable" /> object.
       /// </summary>
-      inline static GemStone::GemFire::Cache::Generic::IGFSerializable^
+      inline static Apache::Geode::Client::Generic::IGFSerializable^
         SafeUMSerializableConvertGeneric( apache::geode::client::Serializable* obj )
       {
 
@@ -92,11 +92,11 @@ namespace GemStone
           
           if( mg_obj_delta != nullptr )
           {
-            return dynamic_cast<GemStone::GemFire::Cache::Generic::IGFSerializable^>(mg_obj_delta->ptr( ));
+            return dynamic_cast<Apache::Geode::Client::Generic::IGFSerializable^>(mg_obj_delta->ptr( ));
           }
           else if(mg_bytesObj_delta != nullptr)
           {
-            return dynamic_cast<GemStone::GemFire::Cache::Generic::IGFSerializable^>(mg_bytesObj_delta->ptr( ));
+            return dynamic_cast<Apache::Geode::Client::Generic::IGFSerializable^>(mg_bytesObj_delta->ptr( ));
           }
           else
           {
@@ -111,13 +111,13 @@ namespace GemStone
             }
 
             WrapperDelegateGeneric^ wrapperMethod =
-              GemStone::GemFire::Cache::Generic::Serializable::GetWrapperGeneric( obj->typeId( ) );
+              Apache::Geode::Client::Generic::Serializable::GetWrapperGeneric( obj->typeId( ) );
             if (wrapperMethod != nullptr)
             {
               return wrapperMethod( obj );
             }            
 
-            return gcnew GemStone::GemFire::Cache::Generic::Serializable( obj );
+            return gcnew Apache::Geode::Client::Generic::Serializable( obj );
           }
         }
       }
@@ -165,8 +165,8 @@ namespace GemStone
         //}
         //else 
         {
-          GemStone::GemFire::Cache::Generic::IGFDelta^ sDelta =
-            dynamic_cast<GemStone::GemFire::Cache::Generic::IGFDelta^> (mg_obj);
+          Apache::Geode::Client::Generic::IGFDelta^ sDelta =
+            dynamic_cast<Apache::Geode::Client::Generic::IGFDelta^> (mg_obj);
           if(sDelta != nullptr){
             if(!SafeConvertClassGeneric::isAppDomainEnabled)
               return new apache::geode::client::ManagedCacheableDeltaGeneric( sDelta);
@@ -242,12 +242,12 @@ namespace GemStone
             }
 
             WrapperDelegateGeneric^ wrapperMethod =
-              GemStone::GemFire::Cache::Generic::Serializable::GetWrapperGeneric( obj->typeId( ) );             
+              Apache::Geode::Client::Generic::Serializable::GetWrapperGeneric( obj->typeId( ) );             
             if (wrapperMethod != nullptr)
             {
               return safe_cast<TValue>(wrapperMethod( obj ));
             }
-            return safe_cast<TValue>(gcnew GemStone::GemFire::Cache::Generic::Serializable( obj ));
+            return safe_cast<TValue>(gcnew Apache::Geode::Client::Generic::Serializable( obj ));
           }
         }
       }
@@ -258,12 +258,12 @@ namespace GemStone
       /// <c>SafeM2UMConvert</c>.
       /// </summary>
       inline static apache::geode::client::Serializable* SafeMSerializableConvertGeneric(
-        GemStone::GemFire::Cache::Generic::IGFSerializable^ mg_obj )
+        Apache::Geode::Client::Generic::IGFSerializable^ mg_obj )
       {
         //it is called for cacheables types  only
-        return SafeM2UMConvertGeneric<GemStone::GemFire::Cache::Generic::IGFSerializable,
+        return SafeM2UMConvertGeneric<Apache::Geode::Client::Generic::IGFSerializable,
           apache::geode::client::ManagedCacheableKeyGeneric, apache::geode::client::Serializable,
-          GemStone::GemFire::Cache::Generic::Serializable>( mg_obj );
+          Apache::Geode::Client::Generic::Serializable>( mg_obj );
       }
 
       generic<class TValue>
@@ -294,8 +294,8 @@ namespace GemStone
 						return new apache::geode::client::PdxManagedCacheableKeyBytes(pdxType, true);
         }
       
-				GemStone::GemFire::Cache::Generic::IGFDelta^ sDelta =
-            dynamic_cast<GemStone::GemFire::Cache::Generic::IGFDelta^> (mg_obj);
+				Apache::Geode::Client::Generic::IGFDelta^ sDelta =
+            dynamic_cast<Apache::Geode::Client::Generic::IGFDelta^> (mg_obj);
           if(sDelta != nullptr)
 					{
             if(!SafeConvertClassGeneric::isAppDomainEnabled)
@@ -305,8 +305,8 @@ namespace GemStone
           }
           else
 					{
-						GemStone::GemFire::Cache::Generic::IGFSerializable^ tmpIGFS = 
-							dynamic_cast<GemStone::GemFire::Cache::Generic::IGFSerializable^>(mg_obj);
+						Apache::Geode::Client::Generic::IGFSerializable^ tmpIGFS = 
+							dynamic_cast<Apache::Geode::Client::Generic::IGFSerializable^>(mg_obj);
 						if(tmpIGFS != nullptr)
 						{
 							if(!SafeConvertClassGeneric::isAppDomainEnabled)
@@ -327,7 +327,7 @@ namespace GemStone
 					    else
 						    return new apache::geode::client::PdxManagedCacheableKeyBytes(gcnew PdxWrapper(mg_obj), true);
             }
-            throw gcnew GemStone::GemFire::Cache::Generic::IllegalStateException(String::Format("Unable to map object type {0}. Possible Object type may not be registered or PdxSerializer is not registered. ", mg_obj->GetType()));
+            throw gcnew Apache::Geode::Client::Generic::IllegalStateException(String::Format("Unable to map object type {0}. Possible Object type may not be registered or PdxSerializer is not registered. ", mg_obj->GetType()));
           }	
       }
 
@@ -382,7 +382,7 @@ namespace GemStone
         else
         {
           WrapperDelegateGeneric^ wrapperMethod =
-            GemStone::GemFire::Cache::Generic::Serializable::GetWrapperGeneric( obj->typeId( ) );
+            Apache::Geode::Client::Generic::Serializable::GetWrapperGeneric( obj->typeId( ) );
           if (wrapperMethod != nullptr)
           {
             return (Generic::ICacheableKey^)wrapperMethod( obj );
@@ -395,7 +395,7 @@ namespace GemStone
       inline static apache::geode::client::CacheableKey* SafeGenericMKeyConvert( TKey mg_obj )
       {
         if (mg_obj == nullptr) return NULL;
-        apache::geode::client::CacheableKey* obj = GemStone::GemFire::Cache::Generic::Serializable::GetUnmanagedValueGeneric<TKey>( mg_obj ).ptr();
+        apache::geode::client::CacheableKey* obj = Apache::Geode::Client::Generic::Serializable::GetUnmanagedValueGeneric<TKey>( mg_obj ).ptr();
         if (obj != nullptr)
         {
           return obj;
@@ -425,26 +425,26 @@ namespace GemStone
 
       template<typename NativeType> //where NativeType : apache::geode::client::SharedPtr<NativeType>
       //generic<typename ManagedType> where ManagedType : Internal::SBWrap<apache::geode::client::RegionAttributes>
-      inline static NativeType* GetNativePtrFromSBWrap( GemStone::GemFire::Cache::Generic::Internal::SBWrap<NativeType>^ mg_obj )
+      inline static NativeType* GetNativePtrFromSBWrap( Apache::Geode::Client::Generic::Internal::SBWrap<NativeType>^ mg_obj )
       {
         return (mg_obj != nullptr ? mg_obj->_NativePtr : NULL);
       }
 
 			 template<typename NativeType> //where NativeType : apache::geode::client::SharedPtr<NativeType>
       //generic<typename ManagedType> where ManagedType : Internal::SBWrap<apache::geode::client::RegionAttributes>
-			 inline static NativeType* GetNativePtrFromSBWrapGeneric( GemStone::GemFire::Cache::Generic::Internal::SBWrap<NativeType>^ mg_obj )
+			 inline static NativeType* GetNativePtrFromSBWrapGeneric( Apache::Geode::Client::Generic::Internal::SBWrap<NativeType>^ mg_obj )
       {
         return (mg_obj != nullptr ? mg_obj->_NativePtr : NULL);
       }
 
       template<typename NativeType>
-      inline static NativeType* GetNativePtrFromUMWrap( GemStone::GemFire::Cache::Generic::Internal::UMWrap<NativeType>^ mg_obj )
+      inline static NativeType* GetNativePtrFromUMWrap( Apache::Geode::Client::Generic::Internal::UMWrap<NativeType>^ mg_obj )
       {
         return (mg_obj != nullptr ? mg_obj->_NativePtr : NULL);
       }
 
 			template<typename NativeType>
-			inline static NativeType* GetNativePtrFromUMWrapGeneric( GemStone::GemFire::Cache::Generic::Internal::UMWrap<NativeType>^ mg_obj )
+			inline static NativeType* GetNativePtrFromUMWrapGeneric( Apache::Geode::Client::Generic::Internal::UMWrap<NativeType>^ mg_obj )
       {
         return (mg_obj != nullptr ? mg_obj->_NativePtr : NULL);
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/TransactionListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/TransactionListener.hpp b/src/clicache/src/impl/TransactionListener.hpp
index ace2e61..113255c 100644
--- a/src/clicache/src/impl/TransactionListener.hpp
+++ b/src/clicache/src/impl/TransactionListener.hpp
@@ -26,11 +26,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>
@@ -39,35 +41,35 @@ namespace GemStone
       /// forward the calls to the generic objects
       /// </summary>
       generic<class TKey, class TValue>
-			public ref class TransactionListenerGeneric : GemStone::GemFire::Cache::TransactionListenerAdapter
+			public ref class TransactionListenerGeneric : Apache::Geode::Client::TransactionListenerAdapter
       {
         private:
 
-					GemStone::GemFire::Cache::Generic::ITransactionListener<TKey, TValue>^ m_listener;
+					Apache::Geode::Client::Generic::ITransactionListener<TKey, TValue>^ m_listener;
 
         public:
 
-          void SetTransactionListener(GemStone::GemFire::Cache::Generic::ITransactionListener<TKey, TValue>^ listener)
+          void SetTransactionListener(Apache::Geode::Client::Generic::ITransactionListener<TKey, TValue>^ listener)
           {
             m_listener = listener;
           }
 
-					virtual void AfterCommit(GemStone::GemFire::Cache::TransactionEvent^ event) override 
+					virtual void AfterCommit(Apache::Geode::Client::TransactionEvent^ event) override 
           {
-            GemStone::GemFire::Cache::Generic::TransactionEvent<TKey, TValue> gevent(GetNativePtr<apache::geode::client::TransactionEvent>(event));
+            Apache::Geode::Client::Generic::TransactionEvent<TKey, TValue> gevent(GetNativePtr<apache::geode::client::TransactionEvent>(event));
             m_listener->AfterCommit(%gevent);
             
           }
 
-          virtual void AfterFailedCommit(GemStone::GemFire::Cache::TransactionEvent^ event) override 
+          virtual void AfterFailedCommit(Apache::Geode::Client::TransactionEvent^ event) override 
           {
-            GemStone::GemFire::Cache::Generic::TransactionEvent<TKey, TValue> gevent(GetNativePtr<apache::geode::client::TransactionEvent>(event));
+            Apache::Geode::Client::Generic::TransactionEvent<TKey, TValue> gevent(GetNativePtr<apache::geode::client::TransactionEvent>(event));
             m_listener->AfterFailedCommit(%gevent);
           }
 
-          virtual void AfterRollback(GemStone::GemFire::Cache::TransactionEvent^ event) override 
+          virtual void AfterRollback(Apache::Geode::Client::TransactionEvent^ event) override 
           {
-            GemStone::GemFire::Cache::Generic::TransactionEvent<TKey, TValue> gevent(GetNativePtr<apache::geode::client::TransactionEvent>(event));
+            Apache::Geode::Client::Generic::TransactionEvent<TKey, TValue> gevent(GetNativePtr<apache::geode::client::TransactionEvent>(event));
             m_listener->AfterRollback(%gevent);
           }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/TransactionWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/TransactionWriter.hpp b/src/clicache/src/impl/TransactionWriter.hpp
index 74eb1a2..87f6c81 100644
--- a/src/clicache/src/impl/TransactionWriter.hpp
+++ b/src/clicache/src/impl/TransactionWriter.hpp
@@ -24,13 +24,15 @@
 #include "SafeConvert.hpp"
 
 using namespace System;
-using namespace GemStone::GemFire::Cache;
+using namespace Apache::Geode::Client;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>
@@ -39,22 +41,22 @@ namespace GemStone
       /// forward the calls to the generic objects
       /// </summary>
       generic<class TKey, class TValue>
-			public ref class TransactionWriterGeneric : GemStone::GemFire::Cache::TransactionWriterAdapter
+			public ref class TransactionWriterGeneric : Apache::Geode::Client::TransactionWriterAdapter
       {
         private:
 
-          GemStone::GemFire::Cache::Generic::ITransactionWriter<TKey, TValue>^ m_writer;
+          Apache::Geode::Client::Generic::ITransactionWriter<TKey, TValue>^ m_writer;
 
         public:
 
-          void SetTransactionWriter(GemStone::GemFire::Cache::Generic::ITransactionWriter<TKey, TValue>^ writer)
+          void SetTransactionWriter(Apache::Geode::Client::Generic::ITransactionWriter<TKey, TValue>^ writer)
           {
             m_writer = writer;
           }
 
-          virtual void BeforeCommit(GemStone::GemFire::Cache::TransactionEvent^ te) override
+          virtual void BeforeCommit(Apache::Geode::Client::TransactionEvent^ te) override
           {
-            GemStone::GemFire::Cache::Generic::TransactionEvent<TKey, TValue> gevent(GetNativePtr<apache::geode::client::TransactionEvent>(te));
+            Apache::Geode::Client::Generic::TransactionEvent<TKey, TValue> gevent(GetNativePtr<apache::geode::client::TransactionEvent>(te));
             m_writer->BeforeCommit(%gevent);
           }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/WeakhashMap.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/WeakhashMap.hpp b/src/clicache/src/impl/WeakhashMap.hpp
index 5374dfe..6d8999a 100644
--- a/src/clicache/src/impl/WeakhashMap.hpp
+++ b/src/clicache/src/impl/WeakhashMap.hpp
@@ -26,13 +26,13 @@ using namespace System::Collections::Generic;
 using namespace System::Threading;
 //using namespace System::WeakReference;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 faaf4d4..fd24d57 100644
--- a/src/clicache/src/templates/Templates.csproj.in
+++ b/src/clicache/src/templates/Templates.csproj.in
@@ -12,8 +12,8 @@
     <ProjectGuid>{1B99F0C4-B241-45C7-BFAF-2009D0664901}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Templates.Cache.Security</RootNamespace>
-    <AssemblyName>GemStone.GemFire.Templates.Cache.Security</AssemblyName>
+    <RootNamespace>Apache.Geode.Templates.Cache.Security</RootNamespace>
+    <AssemblyName>Apache.Geode.Templates.Cache.Security</AssemblyName>
     <SignAssembly>${STRONG_NAME_KEY_ENABLED}</SignAssembly>
     <AssemblyOriginatorKeyFile>${STRONG_NAME_KEY}</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/com/gemstone/gemfire/plugins/sqlite/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/com/gemstone/gemfire/plugins/sqlite/AssemblyInfo.cs b/src/com/gemstone/gemfire/plugins/sqlite/AssemblyInfo.cs
index 193e3297..957c32e 100644
--- a/src/com/gemstone/gemfire/plugins/sqlite/AssemblyInfo.cs
+++ b/src/com/gemstone/gemfire/plugins/sqlite/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Gemstone.Gemfire.Plugins.SqLite")]
+[assembly: AssemblyTitle("Apache.Geode.Plugins.SqLite")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Gemstone.Gemfire.Plugins.SqLite")]
+[assembly: AssemblyProduct("Apache.Geode.Plugins.SqLite")]
 [assembly: AssemblyCopyright("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.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs
----------------------------------------------------------------------
diff --git a/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs b/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs
index a5a8924..50b00ba 100644
--- a/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs
+++ b/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs
@@ -18,10 +18,10 @@
 \ufeffusing System;
 using System.Data;
 using System.Data.SQLite;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
-namespace GemStone.GemFire.Plugins.SQLite
+namespace Apache.Geode.Plugins.SQLite
 {
 
   public class SqLiteImpl<TKey, TValue> : IPersistenceManager<TKey, TValue>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/cppcache/src/CppCacheLibrary.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CppCacheLibrary.cpp b/src/cppcache/src/CppCacheLibrary.cpp
index 157fdb8..67262f3 100644
--- a/src/cppcache/src/CppCacheLibrary.cpp
+++ b/src/cppcache/src/CppCacheLibrary.cpp
@@ -131,7 +131,7 @@ std::string CppCacheLibrary::getProductLibDir() {
   if (dllNamePtr == NULL) {
     dllNamePtr = strstr(path, "gfcppcache_g.dll");
     if (dllNamePtr == NULL) {
-      dllNamePtr = strstr(path, "gemstone.gemfire.cache.dll");
+      dllNamePtr = strstr(path, "Apache.Geode.Client.dll");
     }
   }
 #else

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/cppcache/src/dllmain.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/dllmain.cpp b/src/cppcache/src/dllmain.cpp
index 1dfdfba..001b2ab 100644
--- a/src/cppcache/src/dllmain.cpp
+++ b/src/cppcache/src/dllmain.cpp
@@ -68,7 +68,7 @@ LIBEXP void DllMainGetPath(char *result, int maxLen) {
   if (libgfcppcache_module == 0) {
     libgfcppcache_module = GetModuleHandle("gfcppcache_g.dll");
     if (libgfcppcache_module == 0) {
-      libgfcppcache_module = GetModuleHandle("Gemstone.Gemfire.Cache.dll");
+      libgfcppcache_module = GetModuleHandle("Apache.Geode.Client.dll");
     }
   }
   if (libgfcppcache_module != 0) {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/executables/GacInstall/Program.cs
----------------------------------------------------------------------
diff --git a/src/executables/GacInstall/Program.cs b/src/executables/GacInstall/Program.cs
index 1f97217..8825c87 100644
--- a/src/executables/GacInstall/Program.cs
+++ b/src/executables/GacInstall/Program.cs
@@ -22,7 +22,7 @@ using System.IO;
 
 using Microsoft.Win32;
 
-namespace GemStone.GemFire
+namespace Apache.Geode
 {
   class GacInstall
   {
@@ -30,7 +30,7 @@ namespace GemStone.GemFire
 
     private const string DOTNETAssemblyFoldersKey =
       @"SOFTWARE\Microsoft\.NETFramework\AssemblyFolders";
-    private const string GemFireProductKey = "GemStone.GemFire";
+    private const string GemFireProductKey = "Apache.Geode";
 
     #endregion
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/pdxautoserializer/ASCLIBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/ASCLIBuiltins.hpp b/src/pdxautoserializer/ASCLIBuiltins.hpp
index c1c3191..ec6221e 100644
--- a/src/pdxautoserializer/ASCLIBuiltins.hpp
+++ b/src/pdxautoserializer/ASCLIBuiltins.hpp
@@ -26,9 +26,12 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone {
-namespace GemFire {
-namespace Cache {
+namespace Apache
+{
+  namespace Geode
+  {
+    namespace Client
+    {
 namespace Serializer {
 
 /**

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
----------------------------------------------------------------------
diff --git a/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in b/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
index ff5407e..45949fb 100644
--- a/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
+++ b/src/plugins/SQLiteCLI/SQLiteCLI.csproj.in
@@ -12,8 +12,8 @@
     <ProjectGuid>{FF9597E3-A4DD-4FDE-871D-B0C66088762F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Gemstone.Gemfire.Plugins.SQLite</RootNamespace>
-    <AssemblyName>Gemstone.Gemfire.Plugins.SQLite</AssemblyName>
+    <RootNamespace>Apache.Geode.Plugins.SQLite</RootNamespace>
+    <AssemblyName>Apache.Geode.Plugins.SQLite</AssemblyName>
     <SignAssembly>${STRONG_NAME_KEY_ENABLED}</SignAssembly>
     <AssemblyOriginatorKeyFile>${STRONG_NAME_KEY}</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/BasicOperations.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/BasicOperations.cs b/src/quickstart/csharp/BasicOperations.cs
index 53c0c7c..9ea0915 100644
--- a/src/quickstart/csharp/BasicOperations.cs
+++ b/src/quickstart/csharp/BasicOperations.cs
@@ -35,12 +35,12 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 // To check for available memory.
 using System.Diagnostics;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
 
   // The BasicOperations QuickStart example.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/CqQuery.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/CqQuery.cs b/src/quickstart/csharp/CqQuery.cs
index 2f19332..d30b97b 100644
--- a/src/quickstart/csharp/CqQuery.cs
+++ b/src/quickstart/csharp/CqQuery.cs
@@ -33,12 +33,12 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 // Use the "Tests" namespace for the query objects.
-using GemStone.GemFire.Cache.Tests.NewAPI;
+using Apache.Geode.Client.Tests.NewAPI;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The CqQuery QuickStart example.
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/DataExpiration.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/DataExpiration.cs b/src/quickstart/csharp/DataExpiration.cs
index b8fe725..3b5fffd 100644
--- a/src/quickstart/csharp/DataExpiration.cs
+++ b/src/quickstart/csharp/DataExpiration.cs
@@ -37,12 +37,12 @@ using System;
 using System.Threading;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 // Use the .NET generics namespace
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The DataExpiration QuickStart example.
   class DataExpiration

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/Delta.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/Delta.cs b/src/quickstart/csharp/Delta.cs
index 4afe940..94fdb3b 100644
--- a/src/quickstart/csharp/Delta.cs
+++ b/src/quickstart/csharp/Delta.cs
@@ -36,9 +36,9 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The Delta QuickStart example.
   class Delta

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/DeltaExample.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/DeltaExample.cs b/src/quickstart/csharp/DeltaExample.cs
index b08c238..a697bc1 100644
--- a/src/quickstart/csharp/DeltaExample.cs
+++ b/src/quickstart/csharp/DeltaExample.cs
@@ -17,9 +17,9 @@
 
 
 using System;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   public class DeltaExample : IGFDelta,IGFSerializable, ICloneable
     {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/DistributedSystem.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/DistributedSystem.cs b/src/quickstart/csharp/DistributedSystem.cs
index 4c7b9ee..b92e930 100755
--- a/src/quickstart/csharp/DistributedSystem.cs
+++ b/src/quickstart/csharp/DistributedSystem.cs
@@ -39,10 +39,10 @@
 using System;
 
 // Use the GemFire namespaces
-//using GemStone.GemFire.Cache;
-using GemStone.GemFire.Cache.Generic;
+//using Apache.Geode.Client;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The DistributedSystem QuickStart example.
   class DistributedSystem

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/DurableClient.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/DurableClient.cs b/src/quickstart/csharp/DurableClient.cs
index 3621902..d8a882b 100644
--- a/src/quickstart/csharp/DurableClient.cs
+++ b/src/quickstart/csharp/DurableClient.cs
@@ -33,9 +33,9 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The DurableClient QuickStart example.
   class DurableClientExample

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/Exceptions.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/Exceptions.cs b/src/quickstart/csharp/Exceptions.cs
index 82b3323..d87fc56 100644
--- a/src/quickstart/csharp/Exceptions.cs
+++ b/src/quickstart/csharp/Exceptions.cs
@@ -33,9 +33,9 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The Exceptions QuickStart example.
   class Exceptions

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/ExecuteFunctions.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/ExecuteFunctions.cs b/src/quickstart/csharp/ExecuteFunctions.cs
index 78daee4..7307eac 100644
--- a/src/quickstart/csharp/ExecuteFunctions.cs
+++ b/src/quickstart/csharp/ExecuteFunctions.cs
@@ -33,11 +33,11 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 using System.Collections.Generic;
 using System.Collections;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The Function Execution QuickStart example.
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/HACache.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/HACache.cs b/src/quickstart/csharp/HACache.cs
index 949b920..22cd4f6 100644
--- a/src/quickstart/csharp/HACache.cs
+++ b/src/quickstart/csharp/HACache.cs
@@ -36,9 +36,9 @@ using System;
 using System.Threading;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The HA QuickStart example.
   class HA
@@ -48,7 +48,7 @@ namespace GemStone.GemFire.Cache.Generic.QuickStart
       try
       {
         // Create a GemFire Cache.
-        GemStone.GemFire.Cache.Generic.CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
+        Apache.Geode.Client.Generic.CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
 
         Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientHACache.xml")
                   .AddServer("localhost", 40404)

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/LoaderListenerWriter.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/LoaderListenerWriter.cs b/src/quickstart/csharp/LoaderListenerWriter.cs
index 23e4cce..17fcd24 100644
--- a/src/quickstart/csharp/LoaderListenerWriter.cs
+++ b/src/quickstart/csharp/LoaderListenerWriter.cs
@@ -39,9 +39,9 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The LoaderListenerWriter QuickStart example.
   class LoaderListenerWriter

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/MultiuserSecurity.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/MultiuserSecurity.cs b/src/quickstart/csharp/MultiuserSecurity.cs
index 8e698bd..855c76a 100755
--- a/src/quickstart/csharp/MultiuserSecurity.cs
+++ b/src/quickstart/csharp/MultiuserSecurity.cs
@@ -31,10 +31,10 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 using System.Collections.Generic;
 using System.Collections;
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The MultiuserSecurityExample QuickStart example.
   class MultiuserSecurityExample

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PdxInstance.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PdxInstance.cs b/src/quickstart/csharp/PdxInstance.cs
index 24b21ab..558ebd6 100755
--- a/src/quickstart/csharp/PdxInstance.cs
+++ b/src/quickstart/csharp/PdxInstance.cs
@@ -33,10 +33,10 @@
 using System;
 using System.Reflection;
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   public class Person
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PdxRemoteQuery.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PdxRemoteQuery.cs b/src/quickstart/csharp/PdxRemoteQuery.cs
index 04277d0..54f16e2 100644
--- a/src/quickstart/csharp/PdxRemoteQuery.cs
+++ b/src/quickstart/csharp/PdxRemoteQuery.cs
@@ -36,12 +36,12 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 // Use the "Tests" namespace for the query objects.
 using PdxTests;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The PdxRemoteQuery QuickStart example.
   class PdxRemoteQuery

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PdxSerializer.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PdxSerializer.cs b/src/quickstart/csharp/PdxSerializer.cs
index c59ab17..ce0b1bf 100755
--- a/src/quickstart/csharp/PdxSerializer.cs
+++ b/src/quickstart/csharp/PdxSerializer.cs
@@ -48,10 +48,10 @@
 using System;
 using System.Reflection;
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   public class Person
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PoolCqQuery.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PoolCqQuery.cs b/src/quickstart/csharp/PoolCqQuery.cs
index 494bc44..725bf93 100755
--- a/src/quickstart/csharp/PoolCqQuery.cs
+++ b/src/quickstart/csharp/PoolCqQuery.cs
@@ -35,12 +35,12 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 // Use the "Tests" namespace for the query objects.
-using GemStone.GemFire.Cache.Tests.NewAPI;
+using Apache.Geode.Client.Tests.NewAPI;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The PoolCqQuery QuickStart example.
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PoolRemoteQuery.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PoolRemoteQuery.cs b/src/quickstart/csharp/PoolRemoteQuery.cs
index 83857ec..a7007bb 100755
--- a/src/quickstart/csharp/PoolRemoteQuery.cs
+++ b/src/quickstart/csharp/PoolRemoteQuery.cs
@@ -34,12 +34,12 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 // Use the "Tests" namespace for the query objects.
-using GemStone.GemFire.Cache.Tests.NewAPI;
+using Apache.Geode.Client.Tests.NewAPI;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The PoolRemoteQuery QuickStart example.
   class PoolRemoteQuery

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PoolWithEndpoints.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PoolWithEndpoints.cs b/src/quickstart/csharp/PoolWithEndpoints.cs
index 205ec2a..f70ebdc 100755
--- a/src/quickstart/csharp/PoolWithEndpoints.cs
+++ b/src/quickstart/csharp/PoolWithEndpoints.cs
@@ -36,9 +36,9 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The PoolWithEndpoints QuickStart example.
   class PoolWithEndpoints

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PortfolioN.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PortfolioN.cs b/src/quickstart/csharp/PortfolioN.cs
index 1993ba4..9e70bcc 100644
--- a/src/quickstart/csharp/PortfolioN.cs
+++ b/src/quickstart/csharp/PortfolioN.cs
@@ -17,10 +17,10 @@
 
 using System;
 using System.Collections.Generic;
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
 
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
   /// <summary>
   /// User class for testing the put functionality for object.
   /// </summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PortfolioPdx.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PortfolioPdx.cs b/src/quickstart/csharp/PortfolioPdx.cs
index d421a11..31c60c8 100644
--- a/src/quickstart/csharp/PortfolioPdx.cs
+++ b/src/quickstart/csharp/PortfolioPdx.cs
@@ -17,7 +17,7 @@
 
 using System;
 using System.Collections;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 
 namespace PdxTests

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PositionN.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PositionN.cs b/src/quickstart/csharp/PositionN.cs
index a33270c..12a334d 100644
--- a/src/quickstart/csharp/PositionN.cs
+++ b/src/quickstart/csharp/PositionN.cs
@@ -17,9 +17,9 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
   public class Position
     : IGFSerializable
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PositionPdx.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PositionPdx.cs b/src/quickstart/csharp/PositionPdx.cs
index fb9705d..85f0012 100644
--- a/src/quickstart/csharp/PositionPdx.cs
+++ b/src/quickstart/csharp/PositionPdx.cs
@@ -16,7 +16,7 @@
  */
 
 using System;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 namespace PdxTests
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/PutAllGetAllOperations.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PutAllGetAllOperations.cs b/src/quickstart/csharp/PutAllGetAllOperations.cs
index aa56827..74c600c 100644
--- a/src/quickstart/csharp/PutAllGetAllOperations.cs
+++ b/src/quickstart/csharp/PutAllGetAllOperations.cs
@@ -33,9 +33,9 @@ using System;
 using System.Collections.Generic;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The PutAllGetAllOperations QuickStart example.
   class PutAllGetAllOperations

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/RefIDExample.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/RefIDExample.cs b/src/quickstart/csharp/RefIDExample.cs
index cebc7d7..a4649bf 100644
--- a/src/quickstart/csharp/RefIDExample.cs
+++ b/src/quickstart/csharp/RefIDExample.cs
@@ -37,9 +37,9 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The RefIDExample QuickStart example.
   class RefIDExample

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/RegisterInterest.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/RegisterInterest.cs b/src/quickstart/csharp/RegisterInterest.cs
index 22b6822..4d5b6a7 100644
--- a/src/quickstart/csharp/RegisterInterest.cs
+++ b/src/quickstart/csharp/RegisterInterest.cs
@@ -34,9 +34,9 @@ using System;
 using System.Collections.Generic;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The RegisterInterest QuickStart example.
   class RegisterInterest

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/RemoteQuery.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/RemoteQuery.cs b/src/quickstart/csharp/RemoteQuery.cs
index 8bca666..b6c18b3 100644
--- a/src/quickstart/csharp/RemoteQuery.cs
+++ b/src/quickstart/csharp/RemoteQuery.cs
@@ -34,12 +34,12 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 // Use the "Tests" namespace for the query objects.
-using GemStone.GemFire.Cache.Tests.NewAPI;
+using Apache.Geode.Client.Tests.NewAPI;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The RemoteQuery QuickStart example.
   class RemoteQuery

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/Security.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/Security.cs b/src/quickstart/csharp/Security.cs
index 3796f9a..43c83b7 100644
--- a/src/quickstart/csharp/Security.cs
+++ b/src/quickstart/csharp/Security.cs
@@ -34,9 +34,9 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   // The Security QuickStart example.
   class SecurityExample

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/Transactions.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/Transactions.cs b/src/quickstart/csharp/Transactions.cs
index fbf71c8..3629d42 100644
--- a/src/quickstart/csharp/Transactions.cs
+++ b/src/quickstart/csharp/Transactions.cs
@@ -39,12 +39,12 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 // Use the .NET generics namespace
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
 
   // Cache Transactions QuickStart example.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/TransactionsXA.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/TransactionsXA.cs b/src/quickstart/csharp/TransactionsXA.cs
index 5a28bca..add2b65 100644
--- a/src/quickstart/csharp/TransactionsXA.cs
+++ b/src/quickstart/csharp/TransactionsXA.cs
@@ -39,12 +39,12 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 // Use the .NET generics namespace
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
 
   // Cache Transactions QuickStart example.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/plugins/DurableCacheListener.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/plugins/DurableCacheListener.cs b/src/quickstart/csharp/plugins/DurableCacheListener.cs
index 79f2495..1cadb8b 100644
--- a/src/quickstart/csharp/plugins/DurableCacheListener.cs
+++ b/src/quickstart/csharp/plugins/DurableCacheListener.cs
@@ -16,10 +16,10 @@
  */
 
 using System;
-//using GemStone.GemFire.Cache;
-using GemStone.GemFire.Cache.Generic;
+//using Apache.Geode.Client;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   /// <summary>
   /// Capture and display cache events.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/plugins/SimpleCacheListener.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/plugins/SimpleCacheListener.cs b/src/quickstart/csharp/plugins/SimpleCacheListener.cs
index e898684..08c02d5 100644
--- a/src/quickstart/csharp/plugins/SimpleCacheListener.cs
+++ b/src/quickstart/csharp/plugins/SimpleCacheListener.cs
@@ -16,10 +16,10 @@
  */
 
 using System;
-//using GemStone.GemFire.Cache;
-using GemStone.GemFire.Cache.Generic;
+//using Apache.Geode.Client;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   /// <summary>
   /// Capture and display cache events.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/plugins/SimpleCacheLoader.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/plugins/SimpleCacheLoader.cs b/src/quickstart/csharp/plugins/SimpleCacheLoader.cs
index 5037f87..4bbe286 100644
--- a/src/quickstart/csharp/plugins/SimpleCacheLoader.cs
+++ b/src/quickstart/csharp/plugins/SimpleCacheLoader.cs
@@ -16,9 +16,9 @@
  */
 
 using System;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   /// <summary>
   /// Capture and display cache events.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/quickstart/csharp/plugins/SimpleCacheWriter.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/plugins/SimpleCacheWriter.cs b/src/quickstart/csharp/plugins/SimpleCacheWriter.cs
index 8f9e5ce..ca2aa1f 100644
--- a/src/quickstart/csharp/plugins/SimpleCacheWriter.cs
+++ b/src/quickstart/csharp/plugins/SimpleCacheWriter.cs
@@ -16,9 +16,9 @@
  */
 
 using System;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Generic.QuickStart
+namespace Apache.Geode.Client.Generic.QuickStart
 {
   /// <summary>
   /// Capture and display cache events.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 7222765..45a5c06 100644
--- a/src/quickstart/csharp/vsprojects/BasicOperations/BasicOperations.csproj.in
+++ b/src/quickstart/csharp/vsprojects/BasicOperations/BasicOperations.csproj.in
@@ -75,9 +75,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>     
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>     
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 9f6416a..2a96bd6 100644
--- a/src/quickstart/csharp/vsprojects/CqQuery/CqQuery.csproj.in
+++ b/src/quickstart/csharp/vsprojects/CqQuery/CqQuery.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 e7fc45b..53684fa 100644
--- a/src/quickstart/csharp/vsprojects/DataExpiration/DataExpiration.csproj.in
+++ b/src/quickstart/csharp/vsprojects/DataExpiration/DataExpiration.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=8.1.0.1, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=8.1.0.1, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 d6bab82..23437a0 100644
--- a/src/quickstart/csharp/vsprojects/Delta/Delta.csproj.in
+++ b/src/quickstart/csharp/vsprojects/Delta/Delta.csproj.in
@@ -72,9 +72,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 5fa8afb..d076714 100755
--- a/src/quickstart/csharp/vsprojects/DistributedSystem/DistributedSystem.csproj.in
+++ b/src/quickstart/csharp/vsprojects/DistributedSystem/DistributedSystem.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 a6e87e6..f1afe86 100644
--- a/src/quickstart/csharp/vsprojects/DurableClient/DurableClient.csproj.in
+++ b/src/quickstart/csharp/vsprojects/DurableClient/DurableClient.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 fb3b800..4a25f0f 100644
--- a/src/quickstart/csharp/vsprojects/Exceptions/Exceptions.csproj.in
+++ b/src/quickstart/csharp/vsprojects/Exceptions/Exceptions.csproj.in
@@ -76,9 +76,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 2407987..17a9211 100644
--- a/src/quickstart/csharp/vsprojects/ExecuteFunctions/ExecuteFunctions.csproj.in
+++ b/src/quickstart/csharp/vsprojects/ExecuteFunctions/ExecuteFunctions.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 0656ce5..482ae5e 100644
--- a/src/quickstart/csharp/vsprojects/HACache/HACache.csproj.in
+++ b/src/quickstart/csharp/vsprojects/HACache/HACache.csproj.in
@@ -76,9 +76,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 a84ba10..788bba3 100644
--- a/src/quickstart/csharp/vsprojects/LoaderListenerWriter/LoaderListenerWriter.csproj.in
+++ b/src/quickstart/csharp/vsprojects/LoaderListenerWriter/LoaderListenerWriter.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 d4dd86b..047de56 100755
--- a/src/quickstart/csharp/vsprojects/MultiuserSecurity/MultiuserSecurity.csproj.in
+++ b/src/quickstart/csharp/vsprojects/MultiuserSecurity/MultiuserSecurity.csproj.in
@@ -75,9 +75,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 0c4cb71..b0d3c5a 100755
--- a/src/quickstart/csharp/vsprojects/PdxInstance/PdxInstance.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PdxInstance/PdxInstance.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 4f83b25..486efa8 100644
--- a/src/quickstart/csharp/vsprojects/PdxRemoteQuery/PdxRemoteQuery.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PdxRemoteQuery/PdxRemoteQuery.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 00d8e46..1aeb38a 100755
--- a/src/quickstart/csharp/vsprojects/PdxSerializer/PdxSerializer.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PdxSerializer/PdxSerializer.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 7a7d6d4..d01e55b 100755
--- a/src/quickstart/csharp/vsprojects/PoolCqQuery/PoolCqQuery.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PoolCqQuery/PoolCqQuery.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 a3944d3..ac05682 100755
--- a/src/quickstart/csharp/vsprojects/PoolRemoteQuery/PoolRemoteQuery.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PoolRemoteQuery/PoolRemoteQuery.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 f006461..06e3d4f 100755
--- a/src/quickstart/csharp/vsprojects/PoolWithEndpoints/PoolWithEndpoints.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PoolWithEndpoints/PoolWithEndpoints.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 4cf9159..1399510 100644
--- a/src/quickstart/csharp/vsprojects/PutAllGetAllOperations/PutAllGetAllOperations.csproj.in
+++ b/src/quickstart/csharp/vsprojects/PutAllGetAllOperations/PutAllGetAllOperations.csproj.in
@@ -75,9 +75,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 9f7d965..7d92558 100644
--- a/src/quickstart/csharp/vsprojects/RefIDExample/RefIDExample.csproj.in
+++ b/src/quickstart/csharp/vsprojects/RefIDExample/RefIDExample.csproj.in
@@ -72,9 +72,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 a459bff..a26a657 100644
--- a/src/quickstart/csharp/vsprojects/RegisterInterest/RegisterInterest.csproj.in
+++ b/src/quickstart/csharp/vsprojects/RegisterInterest/RegisterInterest.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 b174ab9..eae36aa 100644
--- a/src/quickstart/csharp/vsprojects/RemoteQuery/RemoteQuery.csproj.in
+++ b/src/quickstart/csharp/vsprojects/RemoteQuery/RemoteQuery.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 b69e30d..2f494dc 100644
--- a/src/quickstart/csharp/vsprojects/Security/Security.csproj.in
+++ b/src/quickstart/csharp/vsprojects/Security/Security.csproj.in
@@ -75,9 +75,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 3f3d8d3..822eb6f 100644
--- a/src/quickstart/csharp/vsprojects/SimplePlugins/SimplePlugins.csproj.in
+++ b/src/quickstart/csharp/vsprojects/SimplePlugins/SimplePlugins.csproj.in
@@ -84,9 +84,9 @@
   </Target>
   -->
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral&#xD;&#xA; PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <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}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 721a450..fe231c1 100644
--- a/src/quickstart/csharp/vsprojects/Transactions/Transactions.csproj.in
+++ b/src/quickstart/csharp/vsprojects/Transactions/Transactions.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/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 52c51a3..10eed8f 100644
--- a/src/quickstart/csharp/vsprojects/TransactionsXA/TransactionsXA.csproj.in
+++ b/src/quickstart/csharp/vsprojects/TransactionsXA/TransactionsXA.csproj.in
@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GemStone.GemFire.Cache, Version=8.2.0.3, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
+    <Reference Include="Apache.Geode.Client, Version=8.2.0.3, Culture=neutral, PublicKeyToken=126e6338d9f55e0c, processorArchitecture=x64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll</HintPath>
+      <HintPath>${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/templates/security/csharp/UserPasswordAuthInit.cs
----------------------------------------------------------------------
diff --git a/src/templates/security/csharp/UserPasswordAuthInit.cs b/src/templates/security/csharp/UserPasswordAuthInit.cs
index 8c513eb..bf9597b 100644
--- a/src/templates/security/csharp/UserPasswordAuthInit.cs
+++ b/src/templates/security/csharp/UserPasswordAuthInit.cs
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-namespace GemStone.GemFire.Templates.Cache.Security
+namespace Apache.Geode.Templates.Cache.Security
 {
 
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
 
   ///<summary>
-  /// An <see cref="GemStone.GemFire.Cache.Generic.IAuthInitialize"/> implementation
+  /// An <see cref="Apache.Geode.Client.Generic.IAuthInitialize"/> implementation
   /// that obtains the user name and password as the credentials from the
   /// given set of properties.
   /// </summary>
   /// <remarks>
   /// To use this class the <c>security-client-auth-library</c> property should
-  /// be set to the name of the dll (<c>GemStone.GemFire.Templates.Cache.Security</c>)
+  /// be set to the name of the dll (<c>Apache.Geode.Templates.Cache.Security</c>)
   /// and the <c>security-client-auth-factory</c> property should be set to
   /// the fully qualified name of the static <c>Create</c> function viz.
-  /// <c>GemStone.GemFire.Templates.Cache.Security.UserPasswordAuthInit.Create</c>
+  /// <c>Apache.Geode.Templates.Cache.Security.UserPasswordAuthInit.Create</c>
   /// </remarks>
   public class UserPasswordAuthInit : IAuthInitialize
   {