http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs 
b/src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs
index c6218b2..49b923d 100644
--- a/src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs
+++ b/src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs
@@ -1,167 +1,168 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-
-namespace GemStone.GemFire.Cache.FwkLib  
-{
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
-  
-
//[Serializable]
-//  public class TxInfo<Tkey,TVal>
-//  {
-//    TransactionId txId;
-//    int numExecutions;
-//    String regionName;
-//    Object key;
-//    //ModRoutingObject routingObject;
-
-//    public TxInfo()
-//    {
-//      this.numExecutions = 0;
-//    }
-
-//    public String getTxId()
-//    {
-//      return this.txId;
-//    }
-
-//    public int getNumExecutions()
-//    {
-//      return this.numExecutions;
-//    }
-
-//    public String getRegionName()
-//    {
-//      return this.regionName;
-//    }
-
-//    public Object getKey()
-//    {
-//      return this.key;
-//    }
-
-//    //public ModRoutingObject getRoutingObject()
-//    //{
-//    //  return this.routingObject;
-//    //}
-
-//    public void setTxId(String txId)
-//    {
-//      this.txId = txId;
-//    }
-
-//    public void setNumExecutions(int executions)
-//    {
-//      this.numExecutions = executions;
-//    }
-
-//    public void incrementNumExecutions()
-//    {
-//      //this.numExecutions = numExecutions++;
-//      setNumExecutions(this.numExecutions++);
-//      Util.Log("Inside TXInfo numExecutionis {0}", this.numExecutions++);
-
-//    }
-
-//    public void setRegionName(String regionName)
-//    {
-//      this.regionName = regionName;
-//    }
-
-//    public void setKey(Object aKey)
-//    {
-//      this.key = aKey;
-//    }
-
-//    //public void setRoutingObject(ModRoutingObject aRoutingObject)
-//    //{
-//    //  this.routingObject = aRoutingObject;
-//    //}
-
-//    public String toString()
-//    {
-//      string aStr = "";
-//      //StringBuffer aStr = new StringBuffer();
-//      //aStr.append("TxInfo {" + txId + ", numExecutions: " + numExecutions 
+ ", FilterInfo {" + regionName + ", " + key + ", " + routingObject + "}");
-//      return aStr;
-//    }
-//  }
-  [Serializable]
-  public class TxInfo //: IPdxSerializable
-  {
-    TransactionId txId;
-   // Object txId;
-    int numExecutions;
-    //String regionName;
-     
-    public TxInfo()
-     {
-       this.numExecutions = 0;
-     }
-
-    public TransactionId getTxId()
-    {
-      return this.txId;
-    }
-
-    //public Object getTxId()
-    //{
-    //  return this.txId;
-    //}
-     public int getNumExecutions()
-     {
-       return this.numExecutions;
-     }
-
-     //public String getRegionName()
-     //{
-     //  return this.regionName;
-     //}
-
-    public void setTxId(TransactionId txId)
-    {
-      this.txId = txId;
-    }
-
-    //public void setTxId(Object txId)
-    //{
-    //  this.txId = txId;
-    //}
-
-     public void setNumExecutions(int executions)
-     {
-       this.numExecutions = executions;
-     }
-
-     public void incrementNumExecutions()
-     {
-       //this.numExecutions = numExecutions++;
-       setNumExecutions(this.numExecutions++);
-       Util.Log("Inside TXInfo numExecutionis {0}", this.numExecutions++);
-
-     }
-  
-  }
-}
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+
+namespace Apache.Geode.Client.FwkLib  
+{
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
+  
+
+//[Serializable]
+//  public class TxInfo<Tkey,TVal>
+//  {
+//    TransactionId txId;
+//    int numExecutions;
+//    String regionName;
+//    Object key;
+//    //ModRoutingObject routingObject;
+
+//    public TxInfo()
+//    {
+//      this.numExecutions = 0;
+//    }
+
+//    public String getTxId()
+//    {
+//      return this.txId;
+//    }
+
+//    public int getNumExecutions()
+//    {
+//      return this.numExecutions;
+//    }
+
+//    public String getRegionName()
+//    {
+//      return this.regionName;
+//    }
+
+//    public Object getKey()
+//    {
+//      return this.key;
+//    }
+
+//    //public ModRoutingObject getRoutingObject()
+//    //{
+//    //  return this.routingObject;
+//    //}
+
+//    public void setTxId(String txId)
+//    {
+//      this.txId = txId;
+//    }
+
+//    public void setNumExecutions(int executions)
+//    {
+//      this.numExecutions = executions;
+//    }
+
+//    public void incrementNumExecutions()
+//    {
+//      //this.numExecutions = numExecutions++;
+//      setNumExecutions(this.numExecutions++);
+//      Util.Log("Inside TXInfo numExecutionis {0}", this.numExecutions++);
+
+//    }
+
+//    public void setRegionName(String regionName)
+//    {
+//      this.regionName = regionName;
+//    }
+
+//    public void setKey(Object aKey)
+//    {
+//      this.key = aKey;
+//    }
+
+//    //public void setRoutingObject(ModRoutingObject aRoutingObject)
+//    //{
+//    //  this.routingObject = aRoutingObject;
+//    //}
+
+//    public String toString()
+//    {
+//      string aStr = "";
+//      //StringBuffer aStr = new StringBuffer();
+//      //aStr.append("TxInfo {" + txId + ", numExecutions: " + numExecutions 
+ ", FilterInfo {" + regionName + ", " + key + ", " + routingObject + "}");
+//      return aStr;
+//    }
+//  }
+  [Serializable]
+  public class TxInfo //: IPdxSerializable
+  {
+    TransactionId txId;
+   // Object txId;
+    int numExecutions;
+    //String regionName;
+     
+    public TxInfo()
+     {
+       this.numExecutions = 0;
+     }
+
+    public TransactionId getTxId()
+    {
+      return this.txId;
+    }
+
+    //public Object getTxId()
+    //{
+    //  return this.txId;
+    //}
+     public int getNumExecutions()
+     {
+       return this.numExecutions;
+     }
+
+     //public String getRegionName()
+     //{
+     //  return this.regionName;
+     //}
+
+    public void setTxId(TransactionId txId)
+    {
+      this.txId = txId;
+    }
+
+    //public void setTxId(Object txId)
+    //{
+    //  this.txId = txId;
+    //}
+
+     public void setNumExecutions(int executions)
+     {
+       this.numExecutions = executions;
+     }
+
+     public void incrementNumExecutions()
+     {
+       //this.numExecutions = numExecutions++;
+       setNumExecutions(this.numExecutions++);
+       Util.Log("Inside TXInfo numExecutionis {0}", this.numExecutions++);
+
+     }
+  
+  }
+}
+

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/SecurityTest/Security.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/SecurityTest/Security.cs 
b/src/tests/cli/NewFwkLib/SecurityTest/Security.cs
index a5f30c5..4cc94e7 100644
--- a/src/tests/cli/NewFwkLib/SecurityTest/Security.cs
+++ b/src/tests/cli/NewFwkLib/SecurityTest/Security.cs
@@ -20,10 +20,10 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.FwkLib
+namespace Apache.Geode.Client.FwkLib
 {
-  using GemStone.GemFire.Cache.Tests;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.Client.Tests;
+  using Apache.Geode.DUnitFramework;
 
   public class Security : PerfTests
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/SmokePerf/ObjectHelper.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/SmokePerf/ObjectHelper.cs 
b/src/tests/cli/NewFwkLib/SmokePerf/ObjectHelper.cs
index 568b348..d037308 100644
--- a/src/tests/cli/NewFwkLib/SmokePerf/ObjectHelper.cs
+++ b/src/tests/cli/NewFwkLib/SmokePerf/ObjectHelper.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading;
-using GemStone.GemFire.Cache.Tests.NewAPI;
-namespace GemStone.GemFire.Cache.FwkLib
+using Apache.Geode.Client.Tests.NewAPI;
+namespace Apache.Geode.Client.FwkLib
 {
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
   public class ObjectHelper<TKey, TVal>
   {
     public static TVal CreateObject(string objectname, Int32 size, bool 
encodeKey, bool encodeTimestamp,

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/SmokePerf/PerfStat.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/SmokePerf/PerfStat.cs 
b/src/tests/cli/NewFwkLib/SmokePerf/PerfStat.cs
index f2b9cd6..3e7d725 100644
--- a/src/tests/cli/NewFwkLib/SmokePerf/PerfStat.cs
+++ b/src/tests/cli/NewFwkLib/SmokePerf/PerfStat.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading;
-using GemStone.GemFire.Cache.Tests;
-using GemStone.GemFire.DUnitFramework;
-namespace GemStone.GemFire.Cache.FwkLib
+using Apache.Geode.Client.Tests;
+using Apache.Geode.DUnitFramework;
+namespace Apache.Geode.Client.FwkLib
 {
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
   public static class PerfOps {
     public const string PERF_CREATES = "creates";
     public const string PERF_CREATE_TIME = "createTime";

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs 
b/src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs
index 2b29ded..0596321 100644
--- a/src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs
+++ b/src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs
@@ -21,12 +21,12 @@ using System.Text;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading;
-using GemStone.GemFire.Cache.Tests.NewAPI;
-namespace GemStone.GemFire.Cache.FwkLib
+using Apache.Geode.Client.Tests.NewAPI;
+namespace Apache.Geode.Client.FwkLib
 {
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
   public class PerfCacheListener<TKey, TVal> : CacheListenerAdapter<TKey, 
TVal>, IDisposable
   {
     public static Int64 LAT_MARK = 0x55667788;
@@ -148,11 +148,11 @@ namespace GemStone.GemFire.Cache.FwkLib
 
     // VJR: added dummy load/close placeholders.
     /*
-    public IGFSerializable Load( GemStone.GemFire.Cache.Region region, 
ICacheableKey key, IGFSerializable helper)
+    public IGFSerializable Load( Apache.Geode.Client.Region region, 
ICacheableKey key, IGFSerializable helper)
     {
       return new CacheableInt32(m_loads++);
     }
-    public virtual void Close( GemStone.GemFire.Cache.Region region) { }
+    public virtual void Close( Apache.Geode.Client.Region region) { }
     */
   }
 
@@ -189,7 +189,7 @@ namespace GemStone.GemFire.Cache.FwkLib
       {
         current = (int)Util.BBGet("DURABLEBB", bbkey);
       }
-      catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException)
+      catch (Apache.Geode.DUnitFramework.KeyNotFoundException)
       {
         currTest.FwkInfo("Key not found for DURABLEBB {0}", bbkey);
       }
@@ -525,7 +525,7 @@ namespace GemStone.GemFire.Cache.FwkLib
       {
         return Util.BBGet(bb, key);
       }
-      catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException)
+      catch (Apache.Geode.DUnitFramework.KeyNotFoundException)
       {
         return null;
       }
@@ -578,7 +578,7 @@ namespace GemStone.GemFire.Cache.FwkLib
       {
         trim_Time = (long)Util.BBGet("Trim_BB", TemptrTime);
       }
-      catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException)
+      catch (Apache.Geode.DUnitFramework.KeyNotFoundException)
       {
         FwkInfo("Key not found for Trim_BB {0}", TemptrTime);
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs 
b/src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs
index 18e2581..6c5cd5c 100644
--- a/src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs
+++ b/src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs
@@ -19,13 +19,13 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading;
-using GemStone.GemFire.Cache.Tests.NewAPI;
-using GemStone.GemFire.DUnitFramework;
+using Apache.Geode.Client.Tests.NewAPI;
+using Apache.Geode.DUnitFramework;
 
-namespace GemStone.GemFire.Cache.FwkLib
+namespace Apache.Geode.Client.FwkLib
 {
-  using GemStone.GemFire.Cache.Generic;
-  //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client.Generic;
+  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
   public class InitPerfStat : ClientTask
   {
     public Int32 m_cnt;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/Utils.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/Utils.cs b/src/tests/cli/NewFwkLib/Utils.cs
index 3a6084e..e2d095b 100644
--- a/src/tests/cli/NewFwkLib/Utils.cs
+++ b/src/tests/cli/NewFwkLib/Utils.cs
@@ -23,13 +23,13 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.FwkLib
+namespace Apache.Geode.Client.FwkLib
 {
 
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
-  using NEWAPI = GemStone.GemFire.Cache.Tests.NewAPI;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
+  using NEWAPI = Apache.Geode.Client.Tests.NewAPI;
   [Serializable]
   struct HostInfo
   {
@@ -639,7 +639,7 @@ namespace GemStone.GemFire.Cache.FwkLib
         globalEndPoints = Util.BBGet(string.Empty,
           FwkTest<TKey, TVal>.EndPointTag) as string;
       }
-      catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException)
+      catch (Apache.Geode.DUnitFramework.KeyNotFoundException)
       {
         globalEndPoints = null;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/ArrayOfByte.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/ArrayOfByte.cs 
b/src/tests/cli/NewTestObject/ArrayOfByte.cs
index e6a2005..4db17e2 100644
--- a/src/tests/cli/NewTestObject/ArrayOfByte.cs
+++ b/src/tests/cli/NewTestObject/ArrayOfByte.cs
@@ -17,9 +17,9 @@
 
 using System;
 using System.IO;
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
   public class ArrayOfByte
   {
     private static DataOutput dos = new DataOutput();

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/BatchObject.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/BatchObject.cs 
b/src/tests/cli/NewTestObject/BatchObject.cs
index 5c2b119..48b8f50 100644
--- a/src/tests/cli/NewTestObject/BatchObject.cs
+++ b/src/tests/cli/NewTestObject/BatchObject.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 BatchObject
     : TimeStampdObject
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/DeltaEx.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/DeltaEx.cs 
b/src/tests/cli/NewTestObject/DeltaEx.cs
index fa3dcc6..425bb80 100644
--- a/src/tests/cli/NewTestObject/DeltaEx.cs
+++ b/src/tests/cli/NewTestObject/DeltaEx.cs
@@ -17,10 +17,10 @@
 
 
 using System;
-using GemStone.GemFire.Cache;
-namespace GemStone.GemFire.Cache.Tests
+using Apache.Geode.Client;
+namespace Apache.Geode.Client.Tests
 {
-    public class DeltaEx : GemStone.GemFire.Cache.Generic.IGFDelta, 
GemStone.GemFire.Cache.Generic.IGFSerializable, ICloneable
+    public class DeltaEx : Apache.Geode.Client.Generic.IGFDelta, 
Apache.Geode.Client.Generic.IGFSerializable, ICloneable
     {
         private int counter;
         private bool IsDelta;
@@ -44,30 +44,30 @@ namespace GemStone.GemFire.Cache.Tests
         {
             return IsDelta;
         }
-        public void ToDelta(GemStone.GemFire.Cache.Generic.DataOutput DataOut)
+        public void ToDelta(Apache.Geode.Client.Generic.DataOutput DataOut)
         {
             DataOut.WriteInt32(counter);
             ToDeltaCount++;
         }
 
-        public void FromDelta(GemStone.GemFire.Cache.Generic.DataInput DataIn)
+        public void FromDelta(Apache.Geode.Client.Generic.DataInput DataIn)
         {
             int val = DataIn.ReadInt32();
             if( FromDeltaCount == 1 )
             {
                 FromDeltaCount++;
-                throw new 
GemStone.GemFire.Cache.Generic.InvalidDeltaException();
+                throw new Apache.Geode.Client.Generic.InvalidDeltaException();
             }
             counter+=val;
             FromDeltaCount++;
         }
 
-        public void ToData(GemStone.GemFire.Cache.Generic.DataOutput DataOut)
+        public void ToData(Apache.Geode.Client.Generic.DataOutput DataOut)
         {
             DataOut.WriteInt32( counter );
             ToDataCount++;
         }
-        public GemStone.GemFire.Cache.Generic.IGFSerializable 
FromData(GemStone.GemFire.Cache.Generic.DataInput DataIn)
+        public Apache.Geode.Client.Generic.IGFSerializable 
FromData(Apache.Geode.Client.Generic.DataInput DataIn)
         {
             counter = DataIn.ReadInt32();
             FromDataCount++;
@@ -96,7 +96,7 @@ namespace GemStone.GemFire.Cache.Tests
             IsDelta = isDelta;
         }
 
-        public static GemStone.GemFire.Cache.Generic.IGFSerializable create()
+        public static Apache.Geode.Client.Generic.IGFSerializable create()
         {
             return new DeltaEx();
         }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/DeltaFastAssetAccount.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/DeltaFastAssetAccount.cs 
b/src/tests/cli/NewTestObject/DeltaFastAssetAccount.cs
index 0f8c0e0..2403172 100644
--- a/src/tests/cli/NewTestObject/DeltaFastAssetAccount.cs
+++ b/src/tests/cli/NewTestObject/DeltaFastAssetAccount.cs
@@ -18,9 +18,9 @@
 using System;
 using System.Collections;
 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;
   public class DeltaFastAssetAccount
     : IGFSerializable, IGFDelta
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/DeltaPSTObject.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/DeltaPSTObject.cs 
b/src/tests/cli/NewTestObject/DeltaPSTObject.cs
index ab8eb1c..c4e6c4c 100644
--- a/src/tests/cli/NewTestObject/DeltaPSTObject.cs
+++ b/src/tests/cli/NewTestObject/DeltaPSTObject.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 DeltaPSTObject
     : IGFSerializable, IGFDelta
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/DeltaTestImpl.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/DeltaTestImpl.cs 
b/src/tests/cli/NewTestObject/DeltaTestImpl.cs
index 13dabd1..a30251c 100644
--- a/src/tests/cli/NewTestObject/DeltaTestImpl.cs
+++ b/src/tests/cli/NewTestObject/DeltaTestImpl.cs
@@ -17,9 +17,9 @@
 
 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;
   public class DeltaTestImpl
     : IGFSerializable, IGFDelta
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/EqStruct.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/EqStruct.cs 
b/src/tests/cli/NewTestObject/EqStruct.cs
index 010f9dd..92950ca 100644
--- a/src/tests/cli/NewTestObject/EqStruct.cs
+++ b/src/tests/cli/NewTestObject/EqStruct.cs
@@ -18,9 +18,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 EqStruct
       : TimeStampdObject
     {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/FastAsset.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/FastAsset.cs 
b/src/tests/cli/NewTestObject/FastAsset.cs
index 3a14234..f0c8bbe 100644
--- a/src/tests/cli/NewTestObject/FastAsset.cs
+++ b/src/tests/cli/NewTestObject/FastAsset.cs
@@ -16,10 +16,10 @@
  */
 
 using System;
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
  public class FastAsset
     : TimeStampdObject
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/FastAssetAccount.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/FastAssetAccount.cs 
b/src/tests/cli/NewTestObject/FastAssetAccount.cs
index 5f4f78b..4d5161c 100644
--- a/src/tests/cli/NewTestObject/FastAssetAccount.cs
+++ b/src/tests/cli/NewTestObject/FastAssetAccount.cs
@@ -18,9 +18,9 @@
 using System;
 using System.Collections;
 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;
   // need to implement
   public class FastAssetAccount
     : TimeStampdObject

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/NoopAuthInit.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/NoopAuthInit.cs 
b/src/tests/cli/NewTestObject/NoopAuthInit.cs
index e99a414..45f69c2 100644
--- a/src/tests/cli/NewTestObject/NoopAuthInit.cs
+++ b/src/tests/cli/NewTestObject/NoopAuthInit.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 NoopAuthInit
     : IAuthInitialize
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/PSTObject.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/PSTObject.cs 
b/src/tests/cli/NewTestObject/PSTObject.cs
index 7e1ebba..e62c3af 100644
--- a/src/tests/cli/NewTestObject/PSTObject.cs
+++ b/src/tests/cli/NewTestObject/PSTObject.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 PSTObject
     : TimeStampdObject
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/PdxAutoSerializerObj.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/PdxAutoSerializerObj.cs 
b/src/tests/cli/NewTestObject/PdxAutoSerializerObj.cs
index 4cc78f7..fffb03a 100644
--- a/src/tests/cli/NewTestObject/PdxAutoSerializerObj.cs
+++ b/src/tests/cli/NewTestObject/PdxAutoSerializerObj.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;
     using System.Collections;
     [Serializable]
    public class SerializePdx1

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/Portfolio.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/Portfolio.cs 
b/src/tests/cli/NewTestObject/Portfolio.cs
index 8621e9c..58ef0fd 100644
--- a/src/tests/cli/NewTestObject/Portfolio.cs
+++ b/src/tests/cli/NewTestObject/Portfolio.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/tests/cli/NewTestObject/PortfolioPdx.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/PortfolioPdx.cs 
b/src/tests/cli/NewTestObject/PortfolioPdx.cs
index 44ed947..eb3c974 100644
--- a/src/tests/cli/NewTestObject/PortfolioPdx.cs
+++ b/src/tests/cli/NewTestObject/PortfolioPdx.cs
@@ -17,10 +17,10 @@
 
 using System;
 using System.Collections;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
   /// <summary>
   /// User class for testing the put functionality for object.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/Position.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/Position.cs 
b/src/tests/cli/NewTestObject/Position.cs
index a33270c..12a334d 100644
--- a/src/tests/cli/NewTestObject/Position.cs
+++ b/src/tests/cli/NewTestObject/Position.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/tests/cli/NewTestObject/PositionPdx.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/PositionPdx.cs 
b/src/tests/cli/NewTestObject/PositionPdx.cs
index 1f87077..7e1cb74 100644
--- a/src/tests/cli/NewTestObject/PositionPdx.cs
+++ b/src/tests/cli/NewTestObject/PositionPdx.cs
@@ -16,9 +16,9 @@
  */
 
 using System;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
   public class PositionPdx
     : IPdxSerializable

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/SimpleCacheListener.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/SimpleCacheListener.cs 
b/src/tests/cli/NewTestObject/SimpleCacheListener.cs
index 54232b1..dafa641 100644
--- a/src/tests/cli/NewTestObject/SimpleCacheListener.cs
+++ b/src/tests/cli/NewTestObject/SimpleCacheListener.cs
@@ -16,11 +16,11 @@
  */
 
 using System;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
   /// <summary>
   /// Capture and display cache events.
   /// </summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/TestObject1.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/TestObject1.cs 
b/src/tests/cli/NewTestObject/TestObject1.cs
index 92bd2c7..71959b0 100644
--- a/src/tests/cli/NewTestObject/TestObject1.cs
+++ b/src/tests/cli/NewTestObject/TestObject1.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 TestObject1
     : IGFSerializable
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewTestObject/TimeStampdObject.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/TimeStampdObject.cs 
b/src/tests/cli/NewTestObject/TimeStampdObject.cs
index fc61bc4..df2da50 100644
--- a/src/tests/cli/NewTestObject/TimeStampdObject.cs
+++ b/src/tests/cli/NewTestObject/TimeStampdObject.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 TimeStampdObject
     : IGFSerializable
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/PdxClassLibrary/PdxType.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/PdxClassLibrary/PdxType.cs 
b/src/tests/cli/PdxClassLibrary/PdxType.cs
index bc89de7..4a441d5 100644
--- a/src/tests/cli/PdxClassLibrary/PdxType.cs
+++ b/src/tests/cli/PdxClassLibrary/PdxType.cs
@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using GemStone.GemFire.Cache.Generic;
-using GemStone.GemFire.Cache.Generic.Internal;
+using Apache.Geode.Client.Generic;
+using Apache.Geode.Client.Generic.Internal;
 
 namespace PdxTests
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/PdxClassLibrary/PdxTypesReflectionTest.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/PdxClassLibrary/PdxTypesReflectionTest.cs 
b/src/tests/cli/PdxClassLibrary/PdxTypesReflectionTest.cs
index a9dd420..23a6b28 100755
--- a/src/tests/cli/PdxClassLibrary/PdxTypesReflectionTest.cs
+++ b/src/tests/cli/PdxClassLibrary/PdxTypesReflectionTest.cs
@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using GemStone.GemFire.Cache.Generic;
-using GemStone.GemFire.Cache.Generic.Internal;
+using Apache.Geode.Client.Generic;
+using Apache.Geode.Client.Generic.Internal;
 
 namespace PdxTests
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/PdxClassLibrary/PortfolioPdx.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/PdxClassLibrary/PortfolioPdx.cs 
b/src/tests/cli/PdxClassLibrary/PortfolioPdx.cs
index d421a11..31c60c8 100644
--- a/src/tests/cli/PdxClassLibrary/PortfolioPdx.cs
+++ b/src/tests/cli/PdxClassLibrary/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/tests/cli/PdxClassLibrary/PositionPdx.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/PdxClassLibrary/PositionPdx.cs 
b/src/tests/cli/PdxClassLibrary/PositionPdx.cs
index fb9705d..85f0012 100644
--- a/src/tests/cli/PdxClassLibrary/PositionPdx.cs
+++ b/src/tests/cli/PdxClassLibrary/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/tests/cli/PdxClassLibrary/VariousPdxTypes.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/PdxClassLibrary/VariousPdxTypes.cs 
b/src/tests/cli/PdxClassLibrary/VariousPdxTypes.cs
index b8cb4c4..fd6fa91 100644
--- a/src/tests/cli/PdxClassLibrary/VariousPdxTypes.cs
+++ b/src/tests/cli/PdxClassLibrary/VariousPdxTypes.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 using System.Collections;
 namespace PdxTests
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/PdxVersion1Lib/Version1.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/PdxVersion1Lib/Version1.cs 
b/src/tests/cli/PdxVersion1Lib/Version1.cs
index 182d9d5..392b24e 100755
--- a/src/tests/cli/PdxVersion1Lib/Version1.cs
+++ b/src/tests/cli/PdxVersion1Lib/Version1.cs
@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using GemStone.GemFire.Cache.Generic;
-using GemStone.GemFire.Cache.Generic.Internal;
+using Apache.Geode.Client.Generic;
+using Apache.Geode.Client.Generic.Internal;
 
 namespace PdxVersionTests
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/PdxVersion2Lib/Version2.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/PdxVersion2Lib/Version2.cs 
b/src/tests/cli/PdxVersion2Lib/Version2.cs
index 281c28b..ffba981 100755
--- a/src/tests/cli/PdxVersion2Lib/Version2.cs
+++ b/src/tests/cli/PdxVersion2Lib/Version2.cs
@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using GemStone.GemFire.Cache.Generic;
-using GemStone.GemFire.Cache.Generic.Internal;
+using Apache.Geode.Client.Generic;
+using Apache.Geode.Client.Generic.Internal;
 
 namespace PdxVersionTests
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp 
b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
index db8ae12..7caaaac 100644
--- a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
+++ b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
@@ -20,8 +20,8 @@
 #include "impl/ManagedString.hpp"
 
 using namespace System;
-using namespace GemStone::GemFire::Cache::Tests::NewAPI;
-using namespace GemStone::GemFire::Cache::Generic;
+using namespace Apache::Geode::Client::Tests::NewAPI;
+using namespace Apache::Geode::Client::Generic;
 
 PkcsAuthInit::PkcsAuthInit() 
 {
@@ -38,17 +38,17 @@ void PkcsAuthInit::Close()
 }
 
 //generic <class TPropKey, class TPropValue>
-GemStone::GemFire::Cache::Generic::Properties<String^, Object^>^
+Apache::Geode::Client::Generic::Properties<String^, Object^>^
 PkcsAuthInit::GetCredentials(
-  GemStone::GemFire::Cache::Generic::Properties<String^, String^> ^props, 
System::String ^server)
+  Apache::Geode::Client::Generic::Properties<String^, String^> ^props, 
System::String ^server)
 {
-  GemStone::GemFire::Cache::Generic::ManagedString mg_server( server );
+  Apache::Geode::Client::Generic::ManagedString mg_server( server );
   apache::geode::client::PropertiesPtr propsPtr = NULLPTR;
   if (props != nullptr) {
     propsPtr = (apache::geode::client::Properties*)props->NativeIntPtr;
   }
   apache::geode::client::PKCSAuthInitInternal* nativeptr = new 
apache::geode::client::PKCSAuthInitInternal(true); 
   apache::geode::client::PropertiesPtr& newPropsPtr = 
nativeptr->getCredentials(propsPtr, mg_server.CharPtr);     
-  return GemStone::GemFire::Cache::Generic::Properties<String^, Object^>::
+  return Apache::Geode::Client::Generic::Properties<String^, Object^>::
     CreateFromVoidPtr<String^, Object^>(newPropsPtr.ptr());
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp 
b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
index 33fa5d1..f57c5fb 100644
--- a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
+++ b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
@@ -22,21 +22,21 @@
 
 using namespace System;
 
-using namespace GemStone::GemFire::Cache::Generic;
+using namespace Apache::Geode::Client::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-        namespace Tests
+namespace Tests
         {
           namespace NewAPI
           {
           public ref class PkcsAuthInit sealed
           : public 
Internal::SBWrap<apache::geode::client::PKCSAuthInitInternal>,
-            public 
GemStone::GemFire::Cache::Generic::IAuthInitialize/*<String^, Object^>*/
+            public Apache::Geode::Client::Generic::IAuthInitialize/*<String^, 
Object^>*/
         {
         public:
           
@@ -45,9 +45,9 @@ namespace GemStone
           ~PkcsAuthInit();          
 
           //generic <class TPropKey, class TPropValue>
-          virtual GemStone::GemFire::Cache::Generic::Properties<String^, 
Object^> ^
+          virtual Apache::Geode::Client::Generic::Properties<String^, Object^> 
^
             GetCredentials(
-            GemStone::GemFire::Cache::Generic::Properties<String^, String^>^ 
props, String^ server);
+            Apache::Geode::Client::Generic::Properties<String^, String^>^ 
props, String^ server);
 
           virtual void Close();
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/QueryHelper/QueryHelperN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/QueryHelper/QueryHelperN.cs 
b/src/tests/cli/QueryHelper/QueryHelperN.cs
index f142f41..f05a445 100644
--- a/src/tests/cli/QueryHelper/QueryHelperN.cs
+++ b/src/tests/cli/QueryHelper/QueryHelperN.cs
@@ -17,11 +17,11 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  //using Region = GemStone.GemFire.Cache.Generic.IRegion<TKey, TVal>;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  //using Region = Apache.Geode.Client.Generic.IRegion<TKey, TVal>;
 
   /// <summary>
   /// Helper class to populate regions and verify query results.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/QueryHelper/QueryStringsM.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cli/QueryHelper/QueryStringsM.cpp 
b/src/tests/cli/QueryHelper/QueryStringsM.cpp
index 2c4ae50..4f37a03 100644
--- a/src/tests/cli/QueryHelper/QueryStringsM.cpp
+++ b/src/tests/cli/QueryHelper/QueryStringsM.cpp
@@ -19,13 +19,13 @@
 #include "impl/ManagedString.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Tests
+namespace Tests
       {
 
         // Region: QueryStrings method definitions
@@ -33,7 +33,7 @@ namespace GemStone
         void QueryStrings::Init( QueryCategory pcategory, String^ pquery,
           Boolean pisLargeResultset )
         {
-          GemStone::GemFire::Cache::Generic::ManagedString mg_pquery( pquery );
+          Apache::Geode::Client::Generic::ManagedString mg_pquery( pquery );
 
           testData::QueryStrings* nativeptr = new testData::QueryStrings(
             static_cast<testData::queryCategory>( pcategory ),
@@ -78,7 +78,7 @@ namespace GemStone
 
         String^ QueryStrings::Query::get( )
         {
-          return GemStone::GemFire::Cache::Generic::ManagedString::Get( 
NativePtr->query( ) );
+          return Apache::Geode::Client::Generic::ManagedString::Get( 
NativePtr->query( ) );
         }
 
         bool QueryStrings::IsLargeResultset::get( )

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/QueryHelper/QueryStringsM.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cli/QueryHelper/QueryStringsM.hpp 
b/src/tests/cli/QueryHelper/QueryStringsM.hpp
index b1b5db7..8113e80 100644
--- a/src/tests/cli/QueryHelper/QueryStringsM.hpp
+++ b/src/tests/cli/QueryHelper/QueryStringsM.hpp
@@ -23,13 +23,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Tests
+namespace Tests
       {
 
         /// <summary>
@@ -60,7 +60,7 @@ namespace GemStone
         /// Encapsulates a query string.
         /// </summary>
         public ref class QueryStrings sealed
-          : public 
GemStone::GemFire::Cache::Generic::Internal::UMWrap<testData::QueryStrings>
+          : public 
Apache::Geode::Client::Generic::Internal::UMWrap<testData::QueryStrings>
         {
         public:
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/SecurityUtil/AuthzCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/AuthzCredentialGeneratorN.cs 
b/src/tests/cli/SecurityUtil/AuthzCredentialGeneratorN.cs
index 293916d..9990a5e 100644
--- a/src/tests/cli/SecurityUtil/AuthzCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/AuthzCredentialGeneratorN.cs
@@ -16,11 +16,11 @@
  */
 
 using System;
-using GemStone.GemFire.DUnitFramework;
+using Apache.Geode.DUnitFramework;
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
   /// <summary>
   /// Enumeration for the various client server operations.
   /// </summary>
@@ -454,7 +454,7 @@ namespace GemStone.GemFire.Cache.Tests.NewAPI
         }
         else
         {
-          library = "GemStone.GemFire.Templates.Cache.Security";
+          library = "Apache.Geode.Templates.Cache.Security";
           factory = authInit;
         }
         props.Insert("security-client-auth-library", library);

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs 
b/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
index 573744e..9442f88 100644
--- a/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
   /// <summary>
   /// Encapsulates obtaining valid and invalid credentials. Implementations 
will be
   /// for different kinds of authentication schemes.
@@ -36,7 +36,7 @@ namespace GemStone.GemFire.Cache.Tests.NewAPI
     /// To add a new authentication scheme the following needs to be done:
     /// <list type="number">
     /// <item><description>
-    /// Add implementation for <see 
cref="GemStone.GemFire.Cache.IAuthInitialize"/>
+    /// Add implementation for <see 
cref="Apache.Geode.Client.IAuthInitialize"/>
     /// or the C++ <c>gemfire::AuthInitialize</c> interface.
     /// </description></item>
     /// <item><description>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/SecurityUtil/DummyAuthorization3N.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/DummyAuthorization3N.cs 
b/src/tests/cli/SecurityUtil/DummyAuthorization3N.cs
index c6a2d97..0d5e990 100644
--- a/src/tests/cli/SecurityUtil/DummyAuthorization3N.cs
+++ b/src/tests/cli/SecurityUtil/DummyAuthorization3N.cs
@@ -19,9 +19,9 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
   public class DummyAuthorization3 : CredentialGenerator
   {
     public override CredentialGenerator.ClassCode GetClassCode()

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs 
b/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
index efc5ea1..13e3158 100644
--- a/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
@@ -17,10 +17,10 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.Templates.Cache.Security;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Templates.Cache.Security;
+  using Apache.Geode.Client.Generic;
 
   public class LDAPCredentialGenerator : CredentialGenerator
   {
@@ -63,7 +63,7 @@ namespace GemStone.GemFire.Cache.Tests.NewAPI
     {
       get
       {
-        return 
"GemStone.GemFire.Templates.Cache.Security.UserPasswordAuthInit.Create";
+        return 
"Apache.Geode.Templates.Cache.Security.UserPasswordAuthInit.Create";
       }
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs 
b/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
index 88ea342..b7491ac 100644
--- a/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
   public class PKCSCredentialGenerator : CredentialGenerator
   {
@@ -29,7 +29,7 @@ namespace GemStone.GemFire.Cache.Tests.NewAPI
     public const string KeyStorePasswordProp = "security-keystorepass";
     private const string UserPrefix = "gemfire";
     private bool IsMultiUserMode = false;
-    GemStone.GemFire.Cache.Tests.NewAPI.PkcsAuthInit Pkcs = null;
+    Apache.Geode.Client.Tests.NewAPI.PkcsAuthInit Pkcs = null;
 
     public PKCSCredentialGenerator(bool isMultiUser)
     {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/SecurityUtil/SecurityUtil.csproj.in
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/SecurityUtil.csproj.in 
b/src/tests/cli/SecurityUtil/SecurityUtil.csproj.in
index dbea262..055f549 100644
--- a/src/tests/cli/SecurityUtil/SecurityUtil.csproj.in
+++ b/src/tests/cli/SecurityUtil/SecurityUtil.csproj.in
@@ -12,7 +12,7 @@
     <ProjectGuid>{79DD6052-5570-30C0-8B0C-4974F50ACF12}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Cache.Tests</RootNamespace>
+    <RootNamespace>Apache.Geode.Client.Tests</RootNamespace>
     <AssemblyName>SecurityUtil</AssemblyName>
     <SignAssembly>${STRONG_NAME_KEY_ENABLED}</SignAssembly>
     <AssemblyOriginatorKeyFile>${STRONG_NAME_KEY}</AssemblyOriginatorKeyFile>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs 
b/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
index 196da24..4494fb3 100644
--- a/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
@@ -18,11 +18,11 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace GemStone.GemFire.Cache.Tests.NewAPI
+namespace Apache.Geode.Client.Tests.NewAPI
 {
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Templates.Cache.Security;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Templates.Cache.Security;
+  using Apache.Geode.Client.Generic;
 
   public class XmlAuthzCredentialGenerator : AuthzCredentialGenerator
   {

Reply via email to