geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [45/50] [abbrv] geode git commit: GEODE-2316: Renamed namespace GemStone.GemFire.Cache -> Apache.Geode.Client
Date Mon, 23 Jan 2017 19:17:37 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableHashSet.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashSet.hpp b/src/clicache/src/CacheableHashSet.hpp
index df9caeb..f848f15 100644
--- a/src/clicache/src/CacheableHashSet.hpp
+++ b/src/clicache/src/CacheableHashSet.hpp
@@ -29,11 +29,13 @@ using namespace System;
 using namespace System::Collections::Generic;
 #pragma managed
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       namespace Internal
       {
@@ -525,7 +527,7 @@ namespace GemStone
       }
 
 #define _GFCLI_CACHEABLEHASHSET_DEF_GENERIC(m, HSTYPE)                               \
-	public ref class m : public Internal::CacheableHashSetType<GemStone::GemFire::Cache::Generic::GemFireClassIds::m, HSTYPE>      \
+	public ref class m : public Internal::CacheableHashSetType<Apache::Geode::Client::Generic::GemFireClassIds::m, HSTYPE>      \
       {                                                                       \
       public:                                                                 \
         /** <summary>
@@ -533,7 +535,7 @@ namespace GemStone
          *  </summary>
          */                                                                   \
         inline m()                                                            \
-        : Internal::CacheableHashSetType<GemStone::GemFire::Cache::Generic::GemFireClassIds::m, HSTYPE>() {}                      \
+        : Internal::CacheableHashSetType<Apache::Geode::Client::Generic::GemFireClassIds::m, HSTYPE>() {}                      \
                                                                               \
         /** <summary>
          *  Allocates a new instance with the given size.
@@ -541,7 +543,7 @@ namespace GemStone
          *  <param name="size">the intial size of the new instance</param>
          */                                                                   \
         inline m(int32_t size)                                                 \
-        : Internal::CacheableHashSetType<GemStone::GemFire::Cache::Generic::GemFireClassIds::m, HSTYPE>(size) {}                  \
+        : Internal::CacheableHashSetType<Apache::Geode::Client::Generic::GemFireClassIds::m, HSTYPE>(size) {}                  \
                                                                               \
         /** <summary>
          *  Static function to create a new empty instance.
@@ -578,7 +580,7 @@ namespace GemStone
                                                                               \
       private:                                                                \
         inline m(apache::geode::client::Serializable* nativeptr)                            \
-        : Internal::CacheableHashSetType<GemStone::GemFire::Cache::Generic::GemFireClassIds::m, HSTYPE>(nativeptr) { }             \
+        : Internal::CacheableHashSetType<Apache::Geode::Client::Generic::GemFireClassIds::m, HSTYPE>(nativeptr) { }             \
       };
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableHashTable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashTable.hpp b/src/clicache/src/CacheableHashTable.hpp
index 9689811..20d753f 100644
--- a/src/clicache/src/CacheableHashTable.hpp
+++ b/src/clicache/src/CacheableHashTable.hpp
@@ -25,11 +25,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// A mutable <c>ICacheableKey</c> to <c>IGFSerializable</c> hash table

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableIdentityHashMap.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableIdentityHashMap.hpp b/src/clicache/src/CacheableIdentityHashMap.hpp
index 923a7c6..4ac1b50 100644
--- a/src/clicache/src/CacheableIdentityHashMap.hpp
+++ b/src/clicache/src/CacheableIdentityHashMap.hpp
@@ -24,11 +24,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// A mutable <c>ICacheableKey</c> to <c>IGFSerializable</c> hash map

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableKey.cpp b/src/clicache/src/CacheableKey.cpp
index 4fb147d..fdc2196 100644
--- a/src/clicache/src/CacheableKey.cpp
+++ b/src/clicache/src/CacheableKey.cpp
@@ -22,11 +22,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
      // generic<class TKey>
       int32_t CacheableKey::GetHashCode()

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableKey.hpp b/src/clicache/src/CacheableKey.hpp
index 84936f0..05d979b 100644
--- a/src/clicache/src/CacheableKey.hpp
+++ b/src/clicache/src/CacheableKey.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>
       /// This class wraps the native C++ <c>apache::geode::client::Serializable</c> objects

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableLinkedList.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableLinkedList.hpp b/src/clicache/src/CacheableLinkedList.hpp
index 797ab1e..aa55fc5 100644
--- a/src/clicache/src/CacheableLinkedList.hpp
+++ b/src/clicache/src/CacheableLinkedList.hpp
@@ -24,11 +24,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableObject.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObject.cpp b/src/clicache/src/CacheableObject.cpp
index a2ad7d0..593b9ea 100644
--- a/src/clicache/src/CacheableObject.cpp
+++ b/src/clicache/src/CacheableObject.cpp
@@ -28,11 +28,13 @@ using namespace System;
 using namespace System::IO;
 using namespace System::Runtime::Serialization::Formatters::Binary;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       void CacheableObject::ToData(DataOutput^ output)
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableObject.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObject.hpp b/src/clicache/src/CacheableObject.hpp
index b829cba..1c97aa2 100644
--- a/src/clicache/src/CacheableObject.hpp
+++ b/src/clicache/src/CacheableObject.hpp
@@ -23,11 +23,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// An mutable generic <see cref="System.Object" /> wrapper that can

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableObjectArray.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectArray.cpp b/src/clicache/src/CacheableObjectArray.cpp
index d56895e..9dcac25 100644
--- a/src/clicache/src/CacheableObjectArray.cpp
+++ b/src/clicache/src/CacheableObjectArray.cpp
@@ -30,11 +30,13 @@ using namespace System;
 using namespace System::Collections::Generic;
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       // Region: IGFSerializable Members
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableObjectArray.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectArray.hpp b/src/clicache/src/CacheableObjectArray.hpp
index 132842d..83c2a90 100644
--- a/src/clicache/src/CacheableObjectArray.hpp
+++ b/src/clicache/src/CacheableObjectArray.hpp
@@ -25,11 +25,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableObjectXml.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectXml.cpp b/src/clicache/src/CacheableObjectXml.cpp
index e4c137f..fa3a6cb 100644
--- a/src/clicache/src/CacheableObjectXml.cpp
+++ b/src/clicache/src/CacheableObjectXml.cpp
@@ -30,11 +30,13 @@ using namespace System;
 using namespace System::IO;
 using namespace System::Xml::Serialization;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       void CacheableObjectXml::ToData(DataOutput^ output)
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableObjectXml.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectXml.hpp b/src/clicache/src/CacheableObjectXml.hpp
index 526c549..b440a95 100644
--- a/src/clicache/src/CacheableObjectXml.hpp
+++ b/src/clicache/src/CacheableObjectXml.hpp
@@ -23,11 +23,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// A mutable generic <see cref="System.Object" /> wrapper that can

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableStack.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStack.cpp b/src/clicache/src/CacheableStack.cpp
index c869c07..2138586 100644
--- a/src/clicache/src/CacheableStack.cpp
+++ b/src/clicache/src/CacheableStack.cpp
@@ -28,11 +28,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       // Region: IGFSerializable Members
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableStack.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStack.hpp b/src/clicache/src/CacheableStack.hpp
index 7a7cbf2..8263958 100644
--- a/src/clicache/src/CacheableStack.hpp
+++ b/src/clicache/src/CacheableStack.hpp
@@ -24,11 +24,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableString.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableString.cpp b/src/clicache/src/CacheableString.cpp
index dddaa65..97585c5 100644
--- a/src/clicache/src/CacheableString.cpp
+++ b/src/clicache/src/CacheableString.cpp
@@ -26,11 +26,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       void CacheableString::ToData(DataOutput^ output)
@@ -142,7 +144,7 @@ namespace GemStone
         return (m_value->Length * sizeof(char));
       }
 
-      bool CacheableString::Equals(GemStone::GemFire::Cache::Generic::ICacheableKey^ other)
+      bool CacheableString::Equals(Apache::Geode::Client::Generic::ICacheableKey^ other)
       {
         if (other == nullptr || other->ClassId != ClassId) {
           return false;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableString.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableString.hpp b/src/clicache/src/CacheableString.hpp
index 047ef23..6b29c45 100644
--- a/src/clicache/src/CacheableString.hpp
+++ b/src/clicache/src/CacheableString.hpp
@@ -27,11 +27,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// An immutable string wrapper that can serve as a distributable
@@ -148,7 +150,7 @@ namespace GemStone
         /// It invokes the '==' operator of the underlying
         /// <c>apache::geode::client::CacheableString</c> object.
         /// </summary>
-        virtual bool Equals(GemStone::GemFire::Cache::Generic::ICacheableKey^ other) override;
+        virtual bool Equals(Apache::Geode::Client::Generic::ICacheableKey^ other) override;
 
         /// <summary>
         /// Return true if this key matches other object.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableStringArray.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStringArray.cpp b/src/clicache/src/CacheableStringArray.cpp
index 214f2c5..2958ec5 100644
--- a/src/clicache/src/CacheableStringArray.cpp
+++ b/src/clicache/src/CacheableStringArray.cpp
@@ -24,11 +24,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       CacheableStringArray::CacheableStringArray(array<String^>^ strings)

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableStringArray.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStringArray.hpp b/src/clicache/src/CacheableStringArray.hpp
index 909971e..0a41cbe 100644
--- a/src/clicache/src/CacheableStringArray.hpp
+++ b/src/clicache/src/CacheableStringArray.hpp
@@ -27,11 +27,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       ref class CacheableString;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableUndefined.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableUndefined.cpp b/src/clicache/src/CacheableUndefined.cpp
index 437d831..21f8892 100644
--- a/src/clicache/src/CacheableUndefined.cpp
+++ b/src/clicache/src/CacheableUndefined.cpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       // Region: IGFSerializable Members
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableUndefined.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableUndefined.hpp b/src/clicache/src/CacheableUndefined.hpp
index a57a790..131a5e0 100644
--- a/src/clicache/src/CacheableUndefined.hpp
+++ b/src/clicache/src/CacheableUndefined.hpp
@@ -24,11 +24,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// Encapsulate an undefined result.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableVector.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableVector.cpp b/src/clicache/src/CacheableVector.cpp
index f2503ba..73de92d 100644
--- a/src/clicache/src/CacheableVector.cpp
+++ b/src/clicache/src/CacheableVector.cpp
@@ -27,11 +27,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       // Region: IGFSerializable Members
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableVector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableVector.hpp b/src/clicache/src/CacheableVector.hpp
index 7a0ea34..9782535 100644
--- a/src/clicache/src/CacheableVector.hpp
+++ b/src/clicache/src/CacheableVector.hpp
@@ -25,11 +25,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributes.cpp b/src/clicache/src/CqAttributes.cpp
index 6991b4c..a386fcd 100644
--- a/src/clicache/src/CqAttributes.cpp
+++ b/src/clicache/src/CqAttributes.cpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       generic<class TKey, class TResult>
       array<ICqListener<TKey, TResult>^>^ CqAttributes<TKey, TResult>::getCqListeners( )

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributes.hpp b/src/clicache/src/CqAttributes.hpp
index 4b82f79..3c11fb0 100644
--- a/src/clicache/src/CqAttributes.hpp
+++ b/src/clicache/src/CqAttributes.hpp
@@ -24,11 +24,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       generic<class TKey, class TResult>
       interface class ICqListener;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqAttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesFactory.cpp b/src/clicache/src/CqAttributesFactory.cpp
index bdf2ebc..0f384ea 100644
--- a/src/clicache/src/CqAttributesFactory.cpp
+++ b/src/clicache/src/CqAttributesFactory.cpp
@@ -26,11 +26,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       generic<class TKey, class TResult>
       void CqAttributesFactory<TKey, TResult>::AddCqListener(Generic::ICqListener<TKey, TResult>^ cqListener )

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqAttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesFactory.hpp b/src/clicache/src/CqAttributesFactory.hpp
index 4ffba8b..c85422c 100644
--- a/src/clicache/src/CqAttributesFactory.hpp
+++ b/src/clicache/src/CqAttributesFactory.hpp
@@ -27,11 +27,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /*

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqAttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesMutator.cpp b/src/clicache/src/CqAttributesMutator.cpp
index bc11d36..96532ba 100644
--- a/src/clicache/src/CqAttributesMutator.cpp
+++ b/src/clicache/src/CqAttributesMutator.cpp
@@ -24,11 +24,13 @@
 using namespace System;
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       generic<class TKey, class TResult>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqAttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesMutator.hpp b/src/clicache/src/CqAttributesMutator.hpp
index 21d8bca..8824aa3 100644
--- a/src/clicache/src/CqAttributesMutator.hpp
+++ b/src/clicache/src/CqAttributesMutator.hpp
@@ -26,11 +26,13 @@ using namespace System;
 using namespace System::Collections::Generic;
 using namespace System::Threading;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       generic<class TKey, class TResult>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqEvent.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqEvent.cpp b/src/clicache/src/CqEvent.cpp
index 1beb96e..4e0ecd3 100644
--- a/src/clicache/src/CqEvent.cpp
+++ b/src/clicache/src/CqEvent.cpp
@@ -22,11 +22,13 @@
 #include "CacheableBuiltins.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       generic<class TKey, class TResult>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqEvent.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqEvent.hpp b/src/clicache/src/CqEvent.hpp
index 09f58c4..a394ce0 100644
--- a/src/clicache/src/CqEvent.hpp
+++ b/src/clicache/src/CqEvent.hpp
@@ -28,12 +28,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache {      
-    namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 			interface class IGFSerializable;
       //interface class ICqEvent;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqListener.hpp b/src/clicache/src/CqListener.hpp
index a74f640..839a1b4 100644
--- a/src/clicache/src/CqListener.hpp
+++ b/src/clicache/src/CqListener.hpp
@@ -25,11 +25,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
   generic<class TKey, class TResult>
 	ref class CqEvent;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqOperation.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqOperation.hpp b/src/clicache/src/CqOperation.hpp
index a1cb017..e8d2755 100644
--- a/src/clicache/src/CqOperation.hpp
+++ b/src/clicache/src/CqOperation.hpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqQuery.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqQuery.cpp b/src/clicache/src/CqQuery.cpp
index 3fdee08..f28f367 100644
--- a/src/clicache/src/CqQuery.cpp
+++ b/src/clicache/src/CqQuery.cpp
@@ -28,11 +28,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       generic<class TKey, class TResult>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqQuery.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqQuery.hpp b/src/clicache/src/CqQuery.hpp
index 3f51aef..f91d415 100644
--- a/src/clicache/src/CqQuery.hpp
+++ b/src/clicache/src/CqQuery.hpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       generic<class TResult>
       interface class ICqResults;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqServiceStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqServiceStatistics.cpp b/src/clicache/src/CqServiceStatistics.cpp
index 0b1e30c..f2dd044 100644
--- a/src/clicache/src/CqServiceStatistics.cpp
+++ b/src/clicache/src/CqServiceStatistics.cpp
@@ -19,11 +19,13 @@
 #include "CqServiceStatistics.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 	uint32_t CqServiceStatistics::numCqsActive( )
 	{

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqServiceStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqServiceStatistics.hpp b/src/clicache/src/CqServiceStatistics.hpp
index a324810..286a0d1 100644
--- a/src/clicache/src/CqServiceStatistics.hpp
+++ b/src/clicache/src/CqServiceStatistics.hpp
@@ -22,11 +22,13 @@
 #include "impl/NativeWrapper.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqState.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqState.cpp b/src/clicache/src/CqState.cpp
index 10fc2a6..8d7bdbf 100644
--- a/src/clicache/src/CqState.cpp
+++ b/src/clicache/src/CqState.cpp
@@ -23,11 +23,13 @@
 using namespace System;
 using namespace System::Runtime::InteropServices;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       String^ CqState::ToString()

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqState.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqState.hpp b/src/clicache/src/CqState.hpp
index 3973a7e..fd3d065 100644
--- a/src/clicache/src/CqState.hpp
+++ b/src/clicache/src/CqState.hpp
@@ -23,11 +23,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqStatistics.cpp b/src/clicache/src/CqStatistics.cpp
index 9714d22..696ae5f 100644
--- a/src/clicache/src/CqStatistics.cpp
+++ b/src/clicache/src/CqStatistics.cpp
@@ -19,11 +19,13 @@
 #include "CqStatistics.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 		uint32_t CqStatistics::numInserts( )
 	{

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CqStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqStatistics.hpp b/src/clicache/src/CqStatistics.hpp
index c67b240..5b5355d 100644
--- a/src/clicache/src/CqStatistics.hpp
+++ b/src/clicache/src/CqStatistics.hpp
@@ -22,11 +22,13 @@
 #include "impl/NativeWrapper.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/DataInput.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataInput.cpp b/src/clicache/src/DataInput.cpp
index c5f9116..7de8f6c 100644
--- a/src/clicache/src/DataInput.cpp
+++ b/src/clicache/src/DataInput.cpp
@@ -39,13 +39,13 @@ using namespace System;
 using namespace System::IO;
 using namespace apache::geode::client;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
         DataInput::DataInput( uint8_t* buffer, int size )
         {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/DataInput.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataInput.hpp b/src/clicache/src/DataInput.hpp
index 1e9dae3..ccce9fa 100644
--- a/src/clicache/src/DataInput.hpp
+++ b/src/clicache/src/DataInput.hpp
@@ -28,13 +28,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
       {
 
       interface class IGFSerializable;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/DataOutput.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataOutput.cpp b/src/clicache/src/DataOutput.cpp
index d2ff620..0d901b0 100644
--- a/src/clicache/src/DataOutput.cpp
+++ b/src/clicache/src/DataOutput.cpp
@@ -28,13 +28,13 @@ using namespace System;
 using namespace System::Runtime::InteropServices;
 using namespace apache::geode::client;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
 
 				void DataOutput::WriteByte( Byte value )
@@ -457,9 +457,9 @@ namespace GemStone
            return;
          }
 
-					//GemStone::GemFire::Cache::Generic::Log::Debug("DataOutput::WriteObject " + obj);
+					//Apache::Geode::Client::Generic::Log::Debug("DataOutput::WriteObject " + obj);
 
-					Byte typeId = GemStone::GemFire::Cache::Generic::Serializable::GetManagedTypeMappingGeneric(obj->GetType());
+					Byte typeId = Apache::Geode::Client::Generic::Serializable::GetManagedTypeMappingGeneric(obj->GetType());
 
 					switch(typeId)
 					{

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/DataOutput.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataOutput.hpp b/src/clicache/src/DataOutput.hpp
index 0e53378..ed4ab35 100644
--- a/src/clicache/src/DataOutput.hpp
+++ b/src/clicache/src/DataOutput.hpp
@@ -33,13 +33,13 @@
 using namespace System;
 using namespace System::Runtime::CompilerServices;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
 
       interface class IGFSerializable;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/DiskPolicyType.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DiskPolicyType.hpp b/src/clicache/src/DiskPolicyType.hpp
index 15691bd..f131066 100644
--- a/src/clicache/src/DiskPolicyType.hpp
+++ b/src/clicache/src/DiskPolicyType.hpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/DistributedSystem.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DistributedSystem.cpp b/src/clicache/src/DistributedSystem.cpp
index e048dc2..8191d63 100644
--- a/src/clicache/src/DistributedSystem.cpp
+++ b/src/clicache/src/DistributedSystem.cpp
@@ -64,7 +64,7 @@
 
 using namespace System;
 
-using namespace GemStone::GemFire::Cache;
+using namespace Apache::Geode::Client;
 
 namespace apache
 {
@@ -121,13 +121,13 @@ namespace apache
 }  // namespace apache
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       DistributedSystem^ DistributedSystem::Connect(String^ name)
       {
@@ -267,19 +267,19 @@ namespace GemStone
            
           /*
             Serializable::RegisterWrapperGeneric(
-              gcnew WrapperDelegateGeneric(GemStone::GemFire::Cache::CacheableHashSet::Create),
+              gcnew WrapperDelegateGeneric(Apache::Geode::Client::CacheableHashSet::Create),
               apache::geode::client::GemfireTypeIds::CacheableHashSet);
             
              Serializable::RegisterWrapperGeneric(
-              gcnew WrapperDelegateGeneric(GemStone::GemFire::Cache::CacheableLinkedHashSet::Create),
+              gcnew WrapperDelegateGeneric(Apache::Geode::Client::CacheableLinkedHashSet::Create),
               apache::geode::client::GemfireTypeIds::CacheableLinkedHashSet);
 
              Serializable::RegisterWrapperGeneric(
-              gcnew WrapperDelegateGeneric(GemStone::GemFire::Cache::Struct::Create),
+              gcnew WrapperDelegateGeneric(Apache::Geode::Client::Struct::Create),
               apache::geode::client::GemfireTypeIds::Struct);
             
              Serializable::RegisterWrapperGeneric(
-              gcnew WrapperDelegateGeneric(GemStone::GemFire::Cache::Properties::CreateDeserializable),
+              gcnew WrapperDelegateGeneric(Apache::Geode::Client::Properties::CreateDeserializable),
               apache::geode::client::GemfireTypeIds::Properties);
 
           // End register wrapper types for built-in types
@@ -287,110 +287,110 @@ namespace GemStone
   // Register with cpp using unmanaged Cacheablekey wrapper
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableByte,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableByte::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableByte::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableBoolean,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableBoolean::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableBoolean::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableBytes,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableBytes::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableBytes::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::BooleanArray, 
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::BooleanArray::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::BooleanArray::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableWideChar,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableCharacter::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableCharacter::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CharArray,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CharArray::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CharArray::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableDouble,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableDouble::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableDouble::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableDoubleArray,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableDoubleArray::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableDoubleArray::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableFloat,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableFloat::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableFloat::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableFloatArray,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableFloatArray::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableFloatArray::CreateDeserializable));
 
            
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableHashSet,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableHashSet::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableHashSet::CreateDeserializable));
 
            Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableLinkedHashSet,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableLinkedHashSet::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableLinkedHashSet::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableInt16,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableInt16::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt16::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableInt16Array,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableInt16Array::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt16Array::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableInt32,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableInt32::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt32::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableInt32Array,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableInt32Array::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt32Array::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableInt64,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableInt64::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt64::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableInt64Array,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableInt64Array::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt64Array::CreateDeserializable));
               */
 
             /*Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableASCIIString,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableString::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableString::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableASCIIStringHuge,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableString::createDeserializableHuge));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableString::createDeserializableHuge));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableString,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableString::createUTFDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableString::createUTFDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableStringHuge,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableString::createUTFDeserializableHuge));*/
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableString::createUTFDeserializableHuge));*/
 
             /*
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableNullString,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableString::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableString::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableStringArray,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableStringArray::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableStringArray::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::Struct,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::Struct::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Struct::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::Properties,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::Properties::CreateDeserializable));
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Properties::CreateDeserializable));
             */
             
             // End register other built-in types
@@ -552,7 +552,7 @@ namespace GemStone
 
             //Serializable::RegisterTypeGeneric(
             //  apache::geode::client::GemfireTypeIds::CacheableNullString,
-            //  gcnew TypeFactoryMethodNew(GemStone::GemFire::Cache::CacheableString::CreateDeserializable));
+            //  gcnew TypeFactoryMethodNew(Apache::Geode::Client::CacheableString::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::CacheableStringArray,
@@ -573,12 +573,12 @@ namespace GemStone
               
           /*  Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::PdxType,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::Generic::Internal::PdxType::CreateDeserializable),
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Generic::Internal::PdxType::CreateDeserializable),
               nullptr);*/
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::EnumInfo,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::Generic::Internal::EnumInfo::CreateDeserializable),
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Generic::Internal::EnumInfo::CreateDeserializable),
               nullptr);
           
           // End register generic wrapper types for built-in types
@@ -618,42 +618,42 @@ namespace GemStone
         /*
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GemfireTypeIds::CacheableDate,
-          gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableDate::CreateDeserializable));
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableDate::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GemfireTypeIds::CacheableFileName,
-          gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableFileName::CreateDeserializable));
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableFileName::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GemfireTypeIds::CacheableHashMap,
-          gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableHashMap::CreateDeserializable));
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableHashMap::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GemfireTypeIds::CacheableHashTable,
-          gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableHashTable::CreateDeserializable));
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableHashTable::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GemfireTypeIds::CacheableIdentityHashMap,
           gcnew TypeFactoryMethodGeneric(
-          GemStone::GemFire::Cache::CacheableIdentityHashMap::CreateDeserializable));
+          Apache::Geode::Client::CacheableIdentityHashMap::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GemfireTypeIds::CacheableUndefined,
-          gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableUndefined::CreateDeserializable));
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableUndefined::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GemfireTypeIds::CacheableVector,
-          gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableVector::CreateDeserializable));
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableVector::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GemfireTypeIds::CacheableObjectArray,
           gcnew TypeFactoryMethodGeneric(
-          GemStone::GemFire::Cache::CacheableObjectArray::CreateDeserializable));
+          Apache::Geode::Client::CacheableObjectArray::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GemfireTypeIds::CacheableArrayList,
-          gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableArrayList::CreateDeserializable));
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableArrayList::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GemfireTypeIds::CacheableStack,
-          gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableStack::CreateDeserializable));
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableStack::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           GemFireClassIds::CacheableManagedObject - 0x80000000,
-          gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableObject::CreateDeserializable));
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableObject::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
           GemFireClassIds::CacheableManagedObjectXml - 0x80000000,
-          gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::CacheableObjectXml::CreateDeserializable));
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableObjectXml::CreateDeserializable));
           */
         // End register other built-in types
 
@@ -755,7 +755,7 @@ namespace GemStone
         Create(apache::geode::client::DistributedSystem::getInstance().ptr());
 
         // Register managed AppDomain context with unmanaged.
-        apache::geode::client::createAppDomainContext = &GemStone::GemFire::Cache::Generic::createAppDomainContext;
+        apache::geode::client::createAppDomainContext = &Apache::Geode::Client::Generic::createAppDomainContext;
       }
 
       void DistributedSystem::UnregisterBuiltinManagedTypes()
@@ -804,12 +804,12 @@ namespace GemStone
         }
       }
 
-      GemStone::GemFire::Cache::Generic::SystemProperties^ DistributedSystem::SystemProperties::get()
+      Apache::Geode::Client::Generic::SystemProperties^ DistributedSystem::SystemProperties::get()
       {
         _GF_MG_EXCEPTION_TRY2
 
           //  TODO
-					return GemStone::GemFire::Cache::Generic::SystemProperties::Create(
+					return Apache::Geode::Client::Generic::SystemProperties::Create(
             apache::geode::client::DistributedSystem::getSystemProperties());
             
          //return nullptr;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/DistributedSystem.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DistributedSystem.hpp b/src/clicache/src/DistributedSystem.hpp
index fb3df06..f69f112 100644
--- a/src/clicache/src/DistributedSystem.hpp
+++ b/src/clicache/src/DistributedSystem.hpp
@@ -26,13 +26,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       /// <summary>
       /// DistributedSystem encapsulates this applications "connection" into the
@@ -91,9 +91,9 @@ namespace GemStone
         /// <c>DistributedSystem</c>.
         /// </summary>
         /// <returns>the SystemProperties</returns>
-        static property GemStone::GemFire::Cache::Generic::SystemProperties^ SystemProperties
+        static property Apache::Geode::Client::Generic::SystemProperties^ SystemProperties
         {
-          static GemStone::GemFire::Cache::Generic::SystemProperties^ get( );
+          static Apache::Geode::Client::Generic::SystemProperties^ get( );
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/EntryEvent.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/EntryEvent.cpp b/src/clicache/src/EntryEvent.cpp
index 5c868c2..baca33d 100644
--- a/src/clicache/src/EntryEvent.cpp
+++ b/src/clicache/src/EntryEvent.cpp
@@ -22,11 +22,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       generic<class TKey, class TValue>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/EntryEvent.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/EntryEvent.hpp b/src/clicache/src/EntryEvent.hpp
index 8f6fad8..3be6e4d 100644
--- a/src/clicache/src/EntryEvent.hpp
+++ b/src/clicache/src/EntryEvent.hpp
@@ -25,12 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache {
-      namespace Generic
+    namespace Client
+    {
+namespace Generic
       {
         interface class IGFSerializable;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ExceptionTypes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.cpp b/src/clicache/src/ExceptionTypes.cpp
index de3a7c6..9c739fc 100644
--- a/src/clicache/src/ExceptionTypes.cpp
+++ b/src/clicache/src/ExceptionTypes.cpp
@@ -21,13 +21,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
 
 #define _GF_MG_EXCEPTION_ADD3(x) { "apache::geode::client::" #x, gcnew CreateException2( x::Create ) }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ExceptionTypes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.hpp b/src/clicache/src/ExceptionTypes.hpp
index dfc52c2..090a93c 100644
--- a/src/clicache/src/ExceptionTypes.hpp
+++ b/src/clicache/src/ExceptionTypes.hpp
@@ -26,13 +26,13 @@ using namespace System;
 using namespace System::Collections::Generic;
 using namespace System::Runtime::Serialization;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
 
       ref class GemFireException;
@@ -273,7 +273,7 @@ namespace GemStone
 #define _GF_MG_EXCEPTION_CATCH_ALL2  \
       } \
       catch (const apache::geode::client::Exception& ex) { \
-      throw GemStone::GemFire::Cache::Generic::GemFireException::Get(ex); \
+      throw Apache::Geode::Client::Generic::GemFireException::Get(ex); \
       } \
       catch (System::AccessViolationException^ ex) { \
         throw ex; \

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Execution.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Execution.cpp b/src/clicache/src/Execution.cpp
index 5f1d6ae..53feacb 100644
--- a/src/clicache/src/Execution.cpp
+++ b/src/clicache/src/Execution.cpp
@@ -28,11 +28,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       generic<class TResult>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Execution.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Execution.hpp b/src/clicache/src/Execution.hpp
index 04bc33a..173a56f 100644
--- a/src/clicache/src/Execution.hpp
+++ b/src/clicache/src/Execution.hpp
@@ -24,12 +24,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache {
-      //interface class IGFSerializable;
+    namespace Client
+    {
+//interface class IGFSerializable;
       namespace Generic
     {
       generic<class TResult>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ExpirationAction.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExpirationAction.hpp b/src/clicache/src/ExpirationAction.hpp
index ecd65fa..d0ae932 100644
--- a/src/clicache/src/ExpirationAction.hpp
+++ b/src/clicache/src/ExpirationAction.hpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/FunctionService.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/FunctionService.cpp b/src/clicache/src/FunctionService.cpp
index b3d8000..62bd9b4 100644
--- a/src/clicache/src/FunctionService.cpp
+++ b/src/clicache/src/FunctionService.cpp
@@ -25,11 +25,13 @@
 #include "impl/SafeConvert.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       generic <class TResult>
       generic <class TKey, class TValue>
@@ -80,8 +82,8 @@ namespace GemStone
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
-          GemStone::GemFire::Cache::Generic::Cache^ realCache =
-            dynamic_cast<GemStone::GemFire::Cache::Generic::Cache^>(cache);
+          Apache::Geode::Client::Generic::Cache^ realCache =
+            dynamic_cast<Apache::Geode::Client::Generic::Cache^>(cache);
 
         if(realCache != nullptr)
         {
@@ -93,8 +95,8 @@ namespace GemStone
         }
         else
         {
-          GemStone::GemFire::Cache::Generic::AuthenticatedCache^ authCache =
-            dynamic_cast<GemStone::GemFire::Cache::Generic::AuthenticatedCache^>(cache);
+          Apache::Geode::Client::Generic::AuthenticatedCache^ authCache =
+            dynamic_cast<Apache::Geode::Client::Generic::AuthenticatedCache^>(cache);
           apache::geode::client::RegionServicePtr cacheptr(GetNativePtr<apache::geode::client::RegionService>( authCache ) );
 
             apache::geode::client::ExecutionPtr& nativeptr( apache::geode::client::FunctionService::onServer(
@@ -111,8 +113,8 @@ namespace GemStone
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
-          GemStone::GemFire::Cache::Generic::Cache^ realCache =
-          dynamic_cast<GemStone::GemFire::Cache::Generic::Cache^>(cache);
+          Apache::Geode::Client::Generic::Cache^ realCache =
+          dynamic_cast<Apache::Geode::Client::Generic::Cache^>(cache);
 
           if(realCache != nullptr)
           {
@@ -124,8 +126,8 @@ namespace GemStone
           }
           else
           {
-            GemStone::GemFire::Cache::Generic::AuthenticatedCache^ authCache =
-              dynamic_cast<GemStone::GemFire::Cache::Generic::AuthenticatedCache^>(cache);
+            Apache::Geode::Client::Generic::AuthenticatedCache^ authCache =
+              dynamic_cast<Apache::Geode::Client::Generic::AuthenticatedCache^>(cache);
             apache::geode::client::RegionServicePtr cacheptr(GetNativePtr<apache::geode::client::RegionService>( authCache ) );
 
             apache::geode::client::ExecutionPtr& nativeptr( apache::geode::client::FunctionService::onServers(

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/FunctionService.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/FunctionService.hpp b/src/clicache/src/FunctionService.hpp
index 7bb66df..430afaa 100644
--- a/src/clicache/src/FunctionService.hpp
+++ b/src/clicache/src/FunctionService.hpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
     //  generic<class TKey, class TValue>
       ref class Pool;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/GemFireClassIds.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/GemFireClassIds.hpp b/src/clicache/src/GemFireClassIds.hpp
index c8b6bc8..b76fa8b 100644
--- a/src/clicache/src/GemFireClassIds.hpp
+++ b/src/clicache/src/GemFireClassIds.hpp
@@ -23,11 +23,13 @@
 #include <gfcpp/GemfireTypeIds.hpp>
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
 			struct PdxTypes

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IAuthInitialize.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IAuthInitialize.hpp b/src/clicache/src/IAuthInitialize.hpp
index 3185596..de926af 100644
--- a/src/clicache/src/IAuthInitialize.hpp
+++ b/src/clicache/src/IAuthInitialize.hpp
@@ -23,13 +23,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache {
-    
-    namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// Specifies the mechanism to obtain credentials for a client.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ICacheListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheListener.hpp b/src/clicache/src/ICacheListener.hpp
index 9482959..3c6e3b8 100644
--- a/src/clicache/src/ICacheListener.hpp
+++ b/src/clicache/src/ICacheListener.hpp
@@ -24,11 +24,13 @@
 #include "EntryEvent.hpp"
 #include "RegionEvent.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// An application plug-in that can be installed on a region.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ICacheLoader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheLoader.hpp b/src/clicache/src/ICacheLoader.hpp
index 55031d8..6a54b9d 100644
--- a/src/clicache/src/ICacheLoader.hpp
+++ b/src/clicache/src/ICacheLoader.hpp
@@ -23,12 +23,13 @@
 //#include "Region.hpp"
 //#include "ICacheableKey.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache {
-      namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       //interface class ICacheableKey;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ICacheWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheWriter.hpp b/src/clicache/src/ICacheWriter.hpp
index 262001f..d3e78c1 100644
--- a/src/clicache/src/ICacheWriter.hpp
+++ b/src/clicache/src/ICacheWriter.hpp
@@ -24,11 +24,13 @@
 #include "EntryEvent.hpp"
 #include "RegionEvent.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// An application plug-in that can be installed on a region.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ICacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheableKey.hpp b/src/clicache/src/ICacheableKey.hpp
index 81ee880..eb04a68 100644
--- a/src/clicache/src/ICacheableKey.hpp
+++ b/src/clicache/src/ICacheableKey.hpp
@@ -23,11 +23,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ICqAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqAttributes.hpp b/src/clicache/src/ICqAttributes.hpp
index bcc2671..5e15ded 100644
--- a/src/clicache/src/ICqAttributes.hpp
+++ b/src/clicache/src/ICqAttributes.hpp
@@ -20,11 +20,13 @@
 #include "gf_defs.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       interface class CqListener;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ICqEvent.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqEvent.hpp b/src/clicache/src/ICqEvent.hpp
index 5eb3aee..89f4d25 100644
--- a/src/clicache/src/ICqEvent.hpp
+++ b/src/clicache/src/ICqEvent.hpp
@@ -21,12 +21,13 @@
 
 #include "ICacheableKey.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache {
-            //ref class CqOperationType;
+    namespace Client
+    {
+//ref class CqOperationType;
       namespace Generic
     {
 			 interface class IGFSerializable;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ICqListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqListener.hpp b/src/clicache/src/ICqListener.hpp
index 6712f4d..e0350dd 100644
--- a/src/clicache/src/ICqListener.hpp
+++ b/src/clicache/src/ICqListener.hpp
@@ -20,11 +20,13 @@
 #include "gf_defs.hpp"
 #include "CqEvent.hpp"
 using namespace System;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       generic<class TKey, class TResult>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ICqResults.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqResults.hpp b/src/clicache/src/ICqResults.hpp
index 06f7067..31cad15 100644
--- a/src/clicache/src/ICqResults.hpp
+++ b/src/clicache/src/ICqResults.hpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       generic<class TResult>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ICqStatusListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqStatusListener.hpp b/src/clicache/src/ICqStatusListener.hpp
index 9ec77a4..8f6e189 100644
--- a/src/clicache/src/ICqStatusListener.hpp
+++ b/src/clicache/src/ICqStatusListener.hpp
@@ -22,13 +22,13 @@
 #include "ICqListener.hpp"
 
 using namespace System;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache 
-    { 
-      namespace Generic
+    namespace Client
+    {
+namespace Generic
       {
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IFixedPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IFixedPartitionResolver.hpp b/src/clicache/src/IFixedPartitionResolver.hpp
index 73c36c4..fc24007 100644
--- a/src/clicache/src/IFixedPartitionResolver.hpp
+++ b/src/clicache/src/IFixedPartitionResolver.hpp
@@ -22,14 +22,13 @@
 
 //using System::Collections::Generics;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-
-      ref class EntryEvent;
+ref class EntryEvent;
       interface class IGFSerializable;
       namespace Generic
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IGFDelta.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGFDelta.hpp b/src/clicache/src/IGFDelta.hpp
index 9174255..6098a9f 100644
--- a/src/clicache/src/IGFDelta.hpp
+++ b/src/clicache/src/IGFDelta.hpp
@@ -19,11 +19,13 @@
 #include "gf_defs.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       ref class DataOutput;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IGFSerializable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGFSerializable.hpp b/src/clicache/src/IGFSerializable.hpp
index d497fef..2143b93 100644
--- a/src/clicache/src/IGFSerializable.hpp
+++ b/src/clicache/src/IGFSerializable.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;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IGemFireCache.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGemFireCache.hpp b/src/clicache/src/IGemFireCache.hpp
index b655504..795bc68 100644
--- a/src/clicache/src/IGemFireCache.hpp
+++ b/src/clicache/src/IGemFireCache.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
       {
       /// <summary>
       /// GemFireCache represents the singleton cache that must be created
@@ -83,16 +83,16 @@ namespace GemStone
         /// </remarks>
         property DistributedSystem^ DistributedSystem
         {
-          GemStone::GemFire::Cache::Generic::DistributedSystem^ get( );
+          Apache::Geode::Client::Generic::DistributedSystem^ get( );
         } 
 
         /// <summary>
         /// Returns the cache transaction manager of
         /// <see cref="CacheFactory.Create" /> this cache.
         /// </summary>
-        property GemStone::GemFire::Cache::Generic::CacheTransactionManager^ CacheTransactionManager
+        property Apache::Geode::Client::Generic::CacheTransactionManager^ CacheTransactionManager
         {
-          GemStone::GemFire::Cache::Generic::CacheTransactionManager^ get( );
+          Apache::Geode::Client::Generic::CacheTransactionManager^ get( );
         }
 
 				///<summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPartitionResolver.hpp b/src/clicache/src/IPartitionResolver.hpp
index 48d88c8..4fdcb40 100644
--- a/src/clicache/src/IPartitionResolver.hpp
+++ b/src/clicache/src/IPartitionResolver.hpp
@@ -22,12 +22,13 @@
 
 #include "EntryEvent.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache {
-      namespace Generic
+    namespace Client
+    {
+namespace Generic
       {
         interface class IGFSerializable;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IPdxInstance.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxInstance.hpp b/src/clicache/src/IPdxInstance.hpp
index 32a9fb5..0e8f198 100755
--- a/src/clicache/src/IPdxInstance.hpp
+++ b/src/clicache/src/IPdxInstance.hpp
@@ -19,13 +19,13 @@
 #include "IWritablePdxInstance.hpp"
 using namespace System;
 using namespace System::Collections::Generic;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{         
 			
          /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IPdxInstanceFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxInstanceFactory.hpp b/src/clicache/src/IPdxInstanceFactory.hpp
index 666fe36..0bcebd9 100644
--- a/src/clicache/src/IPdxInstanceFactory.hpp
+++ b/src/clicache/src/IPdxInstanceFactory.hpp
@@ -19,13 +19,13 @@
 #include "IPdxInstance.hpp"
 using namespace System;
 using namespace System::Collections::Generic;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-		  namespace Generic
+namespace Generic
 			{         
 			
         /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IPdxReader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxReader.hpp b/src/clicache/src/IPdxReader.hpp
index dd963ee..96df19e 100644
--- a/src/clicache/src/IPdxReader.hpp
+++ b/src/clicache/src/IPdxReader.hpp
@@ -20,13 +20,13 @@
 #include "gf_defs.hpp"
 #include "IRegion.hpp"
 #include "IPdxUnreadFields.hpp"
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{
 				/// <summary>
 				/// A IPdxReader will be passed to IPdxSerializable.fromData or 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IPdxSerializable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxSerializable.hpp b/src/clicache/src/IPdxSerializable.hpp
index 0f31a25..3f1a8e2 100644
--- a/src/clicache/src/IPdxSerializable.hpp
+++ b/src/clicache/src/IPdxSerializable.hpp
@@ -21,13 +21,13 @@
 #include "IPdxWriter.hpp"
 #include "IPdxReader.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{      
 				/// <summary>
 				/// When a domain class implements PdxSerializable it marks 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IPdxSerializer.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxSerializer.hpp b/src/clicache/src/IPdxSerializer.hpp
index 78bf237..6676b48 100755
--- a/src/clicache/src/IPdxSerializer.hpp
+++ b/src/clicache/src/IPdxSerializer.hpp
@@ -21,13 +21,13 @@
 #include "IPdxWriter.hpp"
 #include "IPdxReader.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{      
 				/// <summary>
 				/// The IPdxSerializer interface allows domain classes to be 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IPdxTypeMapper.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxTypeMapper.hpp b/src/clicache/src/IPdxTypeMapper.hpp
index 2fe920d..6530946 100755
--- a/src/clicache/src/IPdxTypeMapper.hpp
+++ b/src/clicache/src/IPdxTypeMapper.hpp
@@ -18,13 +18,13 @@
 #pragma once
 using namespace System;
 using namespace System::Collections::Generic;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{         
 			
          /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IPdxUnreadFields.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxUnreadFields.hpp b/src/clicache/src/IPdxUnreadFields.hpp
index 793489f..5986437 100644
--- a/src/clicache/src/IPdxUnreadFields.hpp
+++ b/src/clicache/src/IPdxUnreadFields.hpp
@@ -18,13 +18,13 @@
 #pragma once
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{     
 				/// <summary>
 				/// Serialize the data in gemfire Portable Data eXchange(Pdx) Format.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IPdxWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxWriter.hpp b/src/clicache/src/IPdxWriter.hpp
index a743258..16a1fa6 100644
--- a/src/clicache/src/IPdxWriter.hpp
+++ b/src/clicache/src/IPdxWriter.hpp
@@ -22,13 +22,13 @@
 #include "IPdxUnreadFields.hpp"
 using namespace System;
 using namespace System::Collections::Generic;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{     
 				/// <summary>
 				/// A IPdxWriter will be passed to IPdxSerializable.toData

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IPersistenceManager.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPersistenceManager.hpp b/src/clicache/src/IPersistenceManager.hpp
index 208066e..e175dc7 100644
--- a/src/clicache/src/IPersistenceManager.hpp
+++ b/src/clicache/src/IPersistenceManager.hpp
@@ -22,13 +22,13 @@
 #include "IRegion.hpp"
 #include "Properties.hpp"
 using namespace System;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache 
-    { 
-      namespace Generic
+    namespace Client
+    {
+namespace Generic
       {
 
          /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IRegion.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IRegion.hpp b/src/clicache/src/IRegion.hpp
index b20dcce..a3ed6a1 100644
--- a/src/clicache/src/IRegion.hpp
+++ b/src/clicache/src/IRegion.hpp
@@ -26,18 +26,17 @@ using namespace System;
 using namespace System::Collections::Generic;
 
 /*
-using namespace GemStone::GemFire::Cache;
-using namespace GemStone::GemFire::Cache::Generic;
+using namespace Apache::Geode::Client;
+using namespace Apache::Geode::Client::Generic;
 */
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache 
-		{
-    
-    namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       ref class Cache;
       ref class CacheStatistics;
@@ -1656,7 +1655,7 @@ namespace GemStone
           /// </exception>
           property AttributesMutator<TKey, TValue>^ AttributesMutator
           {
-            GemStone::GemFire::Cache::Generic::AttributesMutator<TKey, TValue>^ get();
+            Apache::Geode::Client::Generic::AttributesMutator<TKey, TValue>^ get();
           }
 
           /// <summary>
@@ -1726,9 +1725,9 @@ namespace GemStone
           /// Gets the RegionService for this region.
           /// </summary>
           /// <returns>RegionService</returns>
-          property GemStone::GemFire::Cache::Generic::IRegionService^ RegionService
+          property Apache::Geode::Client::Generic::IRegionService^ RegionService
           {
-            GemStone::GemFire::Cache::Generic::IRegionService^ get( );
+            Apache::Geode::Client::Generic::IRegionService^ get( );
           }
 
           /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IRegionService.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IRegionService.hpp b/src/clicache/src/IRegionService.hpp
index 303cf63..708a284 100644
--- a/src/clicache/src/IRegionService.hpp
+++ b/src/clicache/src/IRegionService.hpp
@@ -27,13 +27,13 @@ using namespace System::Collections::Generic;
 
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       interface class IPdxInstanceFactory;
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IResultCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IResultCollector.hpp b/src/clicache/src/IResultCollector.hpp
index 1f02f10..1da4846 100644
--- a/src/clicache/src/IResultCollector.hpp
+++ b/src/clicache/src/IResultCollector.hpp
@@ -21,13 +21,13 @@
 #include "gf_defs.hpp"
 
 using namespace System;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache {
-     
-      namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 			 interface class IGFSerializable;
       /*

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ISelectResults.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ISelectResults.hpp b/src/clicache/src/ISelectResults.hpp
index 9d7f448..378ff82 100644
--- a/src/clicache/src/ISelectResults.hpp
+++ b/src/clicache/src/ISelectResults.hpp
@@ -24,11 +24,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       generic<class TResult>
@@ -62,15 +64,15 @@ namespace GemStone
         /// <summary>
         /// Get an object at the given index.
         /// </summary>
-        property /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult GFINDEXER( size_t )
+        property /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult GFINDEXER( size_t )
         {
-          /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult get( size_t index );
+          /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult get( size_t index );
         }
 
         /// <summary>
         /// Get an iterator for the result set.
         /// </summary>
-        GemStone::GemFire::Cache::Generic::SelectResultsIterator<TResult>^ GetIterator( );
+        Apache::Geode::Client::Generic::SelectResultsIterator<TResult>^ GetIterator( );
       };
 
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ISubscriptionService.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ISubscriptionService.hpp b/src/clicache/src/ISubscriptionService.hpp
index 54287a2..da1e635 100644
--- a/src/clicache/src/ISubscriptionService.hpp
+++ b/src/clicache/src/ISubscriptionService.hpp
@@ -20,11 +20,13 @@
 #include "gf_defs.hpp"
 //#include "ExceptionTypes.hpp"
 using namespace System;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       generic<class TKey>
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ITransactionListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ITransactionListener.hpp b/src/clicache/src/ITransactionListener.hpp
index e620981..1b04fe0 100644
--- a/src/clicache/src/ITransactionListener.hpp
+++ b/src/clicache/src/ITransactionListener.hpp
@@ -21,11 +21,13 @@
 #include "TransactionEvent.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// An application plug-in that can be installed for getting events for 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ITransactionWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ITransactionWriter.hpp b/src/clicache/src/ITransactionWriter.hpp
index 6d19a10..7889445 100644
--- a/src/clicache/src/ITransactionWriter.hpp
+++ b/src/clicache/src/ITransactionWriter.hpp
@@ -21,13 +21,13 @@
 #include "TransactionEvent.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache 
-		{ 
-			namespace Generic
+    namespace Client
+    {
+namespace Generic
 			{
 				/// <summary>
 				/// A callback that is allowed to veto a transaction. Only one TransactionWriter can exist

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/IWritablePdxInstance.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IWritablePdxInstance.hpp b/src/clicache/src/IWritablePdxInstance.hpp
index 55e819e..51b2058 100755
--- a/src/clicache/src/IWritablePdxInstance.hpp
+++ b/src/clicache/src/IWritablePdxInstance.hpp
@@ -18,13 +18,13 @@
 #pragma once
 
 using namespace System;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{     
 				/// <summary>
 	      /// WritablePdxInstance is a <see cref="IPdxInstance" /> that also supports field modification 


Mime
View raw message