You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/01/23 19:17:41 UTC
[49/50] [abbrv] geode git commit: GEODE-2316: Rename .NET namespace in tests and examples.

GEODE-2316: Rename .NET namespace in tests and examples.


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

Branch: refs/heads/next-gen-native-client-software-grant
Commit: 06c8a2cc61da2b70da9ac16c730b4357bc9dc1b7
Parents: 649e4a8
Author: Jacob Barrett <jb...@pivotal.io>
Authored: Sat Jan 21 05:45:40 2017 +0000
Committer: Jacob Barrett <jb...@pivotal.io>
Committed: Mon Jan 23 11:15:39 2017 -0800

----------------------------------------------------------------------
 .../BenchmarkHierarchicalClient.cs              |   2 +-
 .../BenchmarkHierarchicalClient.csproj          |   2 +-
 examples/clicache/CacheRunner/CacheRunner.cs    |   6 +-
 .../clicache/CacheRunner/CacheRunner.csproj     |   2 +-
 examples/clicache/CacheRunner/Callbacks.cs      |   2 +-
 examples/clicache/CacheRunner/ExampleObject.cs  |   2 +-
 examples/clicache/CqQuery/CqQuery.cs            |   6 +-
 examples/clicache/CqQuery/CqQuery.csproj        |   2 +-
 .../ExecuteFunctions/ExecuteFunctions.cs        |   4 +-
 .../ExecuteFunctions/ExecuteFunctions.csproj    |   2 +-
 examples/clicache/HelloWorld/HelloWorld.cs      |   2 +-
 examples/clicache/HelloWorld/HelloWorld.csproj  |   2 +-
 .../HierarchicalClient/HierarchicalClient.cs    |   2 +-
 .../HierarchicalClient.csproj                   |   2 +-
 examples/clicache/ProductBrowser/Form1.cs       |  10 +-
 examples/clicache/ProductBrowser/Product.cs     |   2 +-
 .../ProductBrowser/ProductBrowser.csproj        |   2 +-
 .../Properties/Resources.Designer.cs            |   4 +-
 .../Properties/Settings.Designer.cs             |   2 +-
 examples/clicache/UserObjects/AccountHistory.cs |   2 +-
 examples/clicache/UserObjects/BankAccount.cs    |   2 +-
 examples/clicache/UserObjects/Program.cs        |   2 +-
 .../clicache/UserObjects/UserObjects.csproj     |   2 +-
 .../integration-test/AttributesFactoryTestsN.cs |   2 +-
 .../integration-test/AttributesMutatorTestsN.cs |   2 +-
 .../BuiltinCacheableWrappersN.cs                |   2 +-
 src/clicache/integration-test/CacheHelperN.cs   |   2 +-
 .../integration-test/CacheableWrapperN.cs       |   2 +-
 .../integration-test/CachelessTestsN.cs         |   2 +-
 .../integration-test/DataOutputTests.cs         |   2 +-
 .../integration-test/DefaultCacheable.cs        | 215 -------------------
 .../integration-test/DefaultCacheableN.cs       |   2 +-
 src/clicache/integration-test/DistOpsStepsN.cs  |  10 +-
 src/clicache/integration-test/DupListenerN.cs   |   2 +-
 .../integration-test/DurableListenerN.cs        |   2 +-
 .../integration-test/ExpirationTestsN.cs        |   2 +-
 src/clicache/integration-test/OverflowTestsN.cs |   2 +-
 src/clicache/integration-test/PutGetTestsN.cs   |   2 +-
 .../integration-test/RegionOperationN.cs        |   2 +-
 src/clicache/integration-test/RegionWrapperN.cs |   2 +-
 .../integration-test/SecurityTestUtilN.cs       |   4 +-
 .../integration-test/SerializationTestsN.cs     |   2 +-
 .../integration-test/SystemPropertiesTestsN.cs  |   2 +-
 src/clicache/integration-test/TallyListenerN.cs |   2 +-
 src/clicache/integration-test/TallyLoaderN.cs   |   2 +-
 src/clicache/integration-test/TallyResolverN.cs |   2 +-
 src/clicache/integration-test/TallyWriterN.cs   |   2 +-
 .../ThinClientAppDomainQueryTests.cs            |   8 +-
 .../integration-test/ThinClientCSTXN.cs         |   6 +-
 .../integration-test/ThinClientCallbackArgN.cs  |   4 +-
 .../ThinClientConflationTestsN.cs               |   4 +-
 .../integration-test/ThinClientCqIRTestsN.cs    |   4 +-
 .../integration-test/ThinClientCqTestsN.cs      |   4 +-
 .../integration-test/ThinClientDeltaTestN.cs    |   4 +-
 .../integration-test/ThinClientDocExamplesN.cs  |   4 +-
 .../ThinClientDurableCqTestsN.cs                |   4 +-
 .../integration-test/ThinClientDurableTestsN.cs |   2 +-
 .../ThinClientFunctionExecutionTestsN.cs        |   2 +-
 .../ThinClientHARegionTestsN.cs                 |   4 +-
 .../ThinClientListenerWriterN.cs                |   4 +-
 .../integration-test/ThinClientPdxTests.cs      |   2 +-
 .../integration-test/ThinClientPoolTestsN.cs    |   2 +-
 .../integration-test/ThinClientQueryTestsN.cs   |   8 +-
 .../ThinClientRegionInterestTestsN.cs           |   2 +-
 .../integration-test/ThinClientRegionStepsN.cs  |   2 +-
 .../integration-test/ThinClientRegionTestsN.cs  |   2 +-
 .../ThinClientSecurityAuthTestsMUN.cs           |   4 +-
 .../ThinClientSecurityAuthTestsN.cs             |   4 +-
 .../ThinClientSecurityAuthzTestBaseN.cs         |   4 +-
 .../ThinClientSecurityAuthzTestsMUN.cs          |   4 +-
 .../ThinClientSecurityAuthzTestsN.cs            |   4 +-
 .../ThinClientStatisticTestsN.cs                |   2 +-
 .../ThinClientStringArrayTestsN.cs              |   4 +-
 .../integration-test/UnitTests.csproj.in        |   3 -
 src/clicache/integration-test/UnitTestsN.cs     |   2 +-
 .../client_generics_plugins.xml                 |  16 +-
 .../client_generics_plugins.xml                 |  16 +-
 src/quickstart/csharp/CqQuery.cs                |   2 +-
 src/quickstart/csharp/PoolCqQuery.cs            |   2 +-
 src/quickstart/csharp/PoolRemoteQuery.cs        |   2 +-
 src/quickstart/csharp/PortfolioN.cs             |   2 +-
 src/quickstart/csharp/PositionN.cs              |   2 +-
 src/quickstart/csharp/RemoteQuery.cs            |   2 +-
 src/quickstart/csharp/app.config.in             |   4 +-
 src/quickstart/runcs.bat.in                     |   2 +-
 src/tests/cli/NewFwkLib/CacheServer.cs          |  10 +-
 .../DeltaTest/DeltaClientValidationListener.cs  |   2 +-
 src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs  |   2 +-
 src/tests/cli/NewFwkLib/FwkTask.cs              |   2 +-
 src/tests/cli/NewFwkLib/FwkTest.cs              |   4 +-
 src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs     |   2 +-
 src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs |  12 +-
 .../cli/NewFwkLib/ResumableTx/ResumableTx.cs    |   2 +-
 src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs   |   2 +-
 .../cli/NewFwkLib/SmokePerf/ObjectHelper.cs     |   2 +-
 src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs  |   2 +-
 src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs |   2 +-
 src/tests/cli/NewFwkLib/Utils.cs                |   4 +-
 src/tests/cli/NewTestObject/ArrayOfByte.cs      |   2 +-
 src/tests/cli/NewTestObject/BatchObject.cs      |   2 +-
 .../cli/NewTestObject/DeltaFastAssetAccount.cs  |   2 +-
 src/tests/cli/NewTestObject/DeltaPSTObject.cs   |   2 +-
 src/tests/cli/NewTestObject/DeltaTestImpl.cs    |   2 +-
 src/tests/cli/NewTestObject/EqStruct.cs         |   2 +-
 src/tests/cli/NewTestObject/FastAsset.cs        |   2 +-
 src/tests/cli/NewTestObject/FastAssetAccount.cs |   2 +-
 src/tests/cli/NewTestObject/NoopAuthInit.cs     |   2 +-
 src/tests/cli/NewTestObject/PSTObject.cs        |   2 +-
 .../cli/NewTestObject/PdxAutoSerializerObj.cs   |   2 +-
 src/tests/cli/NewTestObject/Portfolio.cs        |   2 +-
 src/tests/cli/NewTestObject/PortfolioPdx.cs     |   2 +-
 src/tests/cli/NewTestObject/Position.cs         |   2 +-
 src/tests/cli/NewTestObject/PositionPdx.cs      |   2 +-
 .../cli/NewTestObject/SimpleCacheListener.cs    |   2 +-
 src/tests/cli/NewTestObject/TestObject1.cs      |   2 +-
 src/tests/cli/NewTestObject/TimeStampdObject.cs |   2 +-
 src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp    |   2 +-
 src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp    |  23 +-
 src/tests/cli/QueryHelper/QueryHelperN.cs       |   2 +-
 .../SecurityUtil/AuthzCredentialGeneratorN.cs   |   2 +-
 .../cli/SecurityUtil/CredentialGeneratorN.cs    |   2 +-
 .../cli/SecurityUtil/DummyAuthorization3N.cs    |   2 +-
 .../SecurityUtil/LdapCredentialGeneratorN.cs    |   2 +-
 .../SecurityUtil/PKCSCredentialGeneratorN.cs    |   4 +-
 .../XmlAuthzCredentialGeneratorN.cs             |   2 +-
 125 files changed, 197 insertions(+), 418 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/BenchmarkHierarchicalClient/BenchmarkHierarchicalClient.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/BenchmarkHierarchicalClient/BenchmarkHierarchicalClient.cs b/examples/clicache/BenchmarkHierarchicalClient/BenchmarkHierarchicalClient.cs
index 0460922..4be4cdd 100755
--- a/examples/clicache/BenchmarkHierarchicalClient/BenchmarkHierarchicalClient.cs
+++ b/examples/clicache/BenchmarkHierarchicalClient/BenchmarkHierarchicalClient.cs
@@ -29,7 +29,7 @@ using System;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 
-using GemStone.GemFire.Cache;
+using Apache.Geode.Client;
 
 public class BenchmarkHierarchicalClient
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/BenchmarkHierarchicalClient/BenchmarkHierarchicalClient.csproj
----------------------------------------------------------------------
diff --git a/examples/clicache/BenchmarkHierarchicalClient/BenchmarkHierarchicalClient.csproj b/examples/clicache/BenchmarkHierarchicalClient/BenchmarkHierarchicalClient.csproj
index 8ad95cf..198c222 100755
--- a/examples/clicache/BenchmarkHierarchicalClient/BenchmarkHierarchicalClient.csproj
+++ b/examples/clicache/BenchmarkHierarchicalClient/BenchmarkHierarchicalClient.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{DAF42015-6FB4-4B35-A486-46BB68CB18CA}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Cache.Examples</RootNamespace>
+    <RootNamespace>Apache.Geode.Client.Examples</RootNamespace>
     <AssemblyName>BenchmarkHierarchicalClient</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/CacheRunner/CacheRunner.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/CacheRunner/CacheRunner.cs b/examples/clicache/CacheRunner/CacheRunner.cs
index 6820575..d49a92f 100644
--- a/examples/clicache/CacheRunner/CacheRunner.cs
+++ b/examples/clicache/CacheRunner/CacheRunner.cs
@@ -17,10 +17,10 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.Examples
+namespace Apache.Geode.Client.Examples
 {
-  using GemStone.GemFire.Cache.Tests;
-  using GemStone.GemFire.Cache;
+  using Apache.Geode.Client.Tests;
+  using Apache.Geode.Client;
 
   // Example class to perform puts/gets using one or more clients.
   class CacheRunner

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/CacheRunner/CacheRunner.csproj
----------------------------------------------------------------------
diff --git a/examples/clicache/CacheRunner/CacheRunner.csproj b/examples/clicache/CacheRunner/CacheRunner.csproj
index 0bc705f..6fd8235 100644
--- a/examples/clicache/CacheRunner/CacheRunner.csproj
+++ b/examples/clicache/CacheRunner/CacheRunner.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{D8F67104-CDDE-433F-A8EE-470A92180AB9}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Cache.Examples</RootNamespace>
+    <RootNamespace>Apache.Geode.Client.Examples</RootNamespace>
     <AssemblyName>CacheRunner</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/CacheRunner/Callbacks.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/CacheRunner/Callbacks.cs b/examples/clicache/CacheRunner/Callbacks.cs
index 5857b93..a4a074a 100644
--- a/examples/clicache/CacheRunner/Callbacks.cs
+++ b/examples/clicache/CacheRunner/Callbacks.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.Examples
+namespace Apache.Geode.Client.Examples
 {
   /// <summary>
   /// Capture and display cache events.

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/CacheRunner/ExampleObject.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/CacheRunner/ExampleObject.cs b/examples/clicache/CacheRunner/ExampleObject.cs
index 87e3f87..7daccd6 100755
--- a/examples/clicache/CacheRunner/ExampleObject.cs
+++ b/examples/clicache/CacheRunner/ExampleObject.cs
@@ -20,7 +20,7 @@
  */
 
 using System;
-namespace GemStone.GemFire.Cache.Examples
+namespace Apache.Geode.Client.Examples
 {
   public class ExampleObject
     : IGFSerializable

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/CqQuery/CqQuery.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/CqQuery/CqQuery.cs b/examples/clicache/CqQuery/CqQuery.cs
index 0427f8f..78b9183 100644
--- a/examples/clicache/CqQuery/CqQuery.cs
+++ b/examples/clicache/CqQuery/CqQuery.cs
@@ -26,12 +26,12 @@
 using System;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache;
+using Apache.Geode.Client;
 
 // Use the "Tests" namespace for the query objects.
-using GemStone.GemFire.Cache.Tests;
+using Apache.Geode.Client.Tests;
 
-namespace GemStone.GemFire.Cache.Examples
+namespace Apache.Geode.Client.Examples
 {
   // The CqQuery example.
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/CqQuery/CqQuery.csproj
----------------------------------------------------------------------
diff --git a/examples/clicache/CqQuery/CqQuery.csproj b/examples/clicache/CqQuery/CqQuery.csproj
index cd255fd..cc4fac0 100644
--- a/examples/clicache/CqQuery/CqQuery.csproj
+++ b/examples/clicache/CqQuery/CqQuery.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{D8F67104-CDDE-433F-A8EE-470A92180AA9}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Cache.Examples</RootNamespace>
+    <RootNamespace>Apache.Geode.Client.Examples</RootNamespace>
     <AssemblyName>CqQuery</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/ExecuteFunctions/ExecuteFunctions.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/ExecuteFunctions/ExecuteFunctions.cs b/examples/clicache/ExecuteFunctions/ExecuteFunctions.cs
index 7971c56..d0f5c61 100644
--- a/examples/clicache/ExecuteFunctions/ExecuteFunctions.cs
+++ b/examples/clicache/ExecuteFunctions/ExecuteFunctions.cs
@@ -24,10 +24,10 @@ using System;
 using System.Threading;
 
 // Use the GemFire namespace
-using GemStone.GemFire.Cache;
+using Apache.Geode.Client;
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.Examples
+namespace Apache.Geode.Client.Examples
 {
   // The Function Execution example.
   //customer result collector

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/ExecuteFunctions/ExecuteFunctions.csproj
----------------------------------------------------------------------
diff --git a/examples/clicache/ExecuteFunctions/ExecuteFunctions.csproj b/examples/clicache/ExecuteFunctions/ExecuteFunctions.csproj
index c3fa3e9..bd197d2 100644
--- a/examples/clicache/ExecuteFunctions/ExecuteFunctions.csproj
+++ b/examples/clicache/ExecuteFunctions/ExecuteFunctions.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{D8F67104-CDDE-433F-A8EE-470A92180BA9}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Cache.Examples</RootNamespace>
+    <RootNamespace>Apache.Geode.Client.Examples</RootNamespace>
     <AssemblyName>ExecuteFunctions</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/HelloWorld/HelloWorld.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/HelloWorld/HelloWorld.cs b/examples/clicache/HelloWorld/HelloWorld.cs
index ebc95b7..27458a3 100644
--- a/examples/clicache/HelloWorld/HelloWorld.cs
+++ b/examples/clicache/HelloWorld/HelloWorld.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.Examples
+namespace Apache.Geode.Client.Examples
 {
   class HelloWorld
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/HelloWorld/HelloWorld.csproj
----------------------------------------------------------------------
diff --git a/examples/clicache/HelloWorld/HelloWorld.csproj b/examples/clicache/HelloWorld/HelloWorld.csproj
index c0473c4..a6cd267 100644
--- a/examples/clicache/HelloWorld/HelloWorld.csproj
+++ b/examples/clicache/HelloWorld/HelloWorld.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{5DE79CEE-BEE8-404E-8365-2AE742001EEA}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Cache.Examples</RootNamespace>
+    <RootNamespace>Apache.Geode.Client.Examples</RootNamespace>
     <AssemblyName>HelloWorld</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/HierarchicalClient/HierarchicalClient.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/HierarchicalClient/HierarchicalClient.cs b/examples/clicache/HierarchicalClient/HierarchicalClient.cs
index 94c5b6b..03db0e0 100755
--- a/examples/clicache/HierarchicalClient/HierarchicalClient.cs
+++ b/examples/clicache/HierarchicalClient/HierarchicalClient.cs
@@ -31,7 +31,7 @@
 using System;
 
 // These namespaces provide access to classes needed to interact with GemFire.
-using GemStone.GemFire.Cache;
+using Apache.Geode.Client;
 
 public class HierarchicalClient
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/HierarchicalClient/HierarchicalClient.csproj
----------------------------------------------------------------------
diff --git a/examples/clicache/HierarchicalClient/HierarchicalClient.csproj b/examples/clicache/HierarchicalClient/HierarchicalClient.csproj
index ba70e16..1a6df58 100755
--- a/examples/clicache/HierarchicalClient/HierarchicalClient.csproj
+++ b/examples/clicache/HierarchicalClient/HierarchicalClient.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{6F9455A8-866A-4405-8354-449BC6CDFD46}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Cache.Examples</RootNamespace>
+    <RootNamespace>Apache.Geode.Client.Examples</RootNamespace>
     <AssemblyName>HierarchicalClient</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/ProductBrowser/Form1.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/ProductBrowser/Form1.cs b/examples/clicache/ProductBrowser/Form1.cs
index bc5ebe7..2205bc2 100755
--- a/examples/clicache/ProductBrowser/Form1.cs
+++ b/examples/clicache/ProductBrowser/Form1.cs
@@ -22,14 +22,14 @@ using System.Data;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using GemStone.GemFire.Cache;
+using Apache.Geode.Client;
 
 namespace ProductBrowser
 {
   public partial class ProductBrowser : Form, ICacheListener
   {
     //Cache cache = null;
-    GemStone.GemFire.Cache.Region prodRegion = null;
+    Apache.Geode.Client.Region prodRegion = null;
     private string logLevel = "debug";
     private string logFile = "productBrowserLog";
 
@@ -41,7 +41,7 @@ namespace ProductBrowser
       /*
        * Initialize Cache system properties
        */      
-      GemStone.GemFire.Cache.Properties prop = GemStone.GemFire.Cache.Properties.Create();
+      Apache.Geode.Client.Properties prop = Apache.Geode.Client.Properties.Create();
       prop.Insert("log-file", logFile);
       prop.Insert("log-level", logLevel);
       prop.Insert("name", "ProductCache");
@@ -288,11 +288,11 @@ namespace ProductBrowser
       txtEvent.Text = ev.Region.Name + " is live";
     }
 
-    public void Close(GemStone.GemFire.Cache.Region region)
+    public void Close(Apache.Geode.Client.Region region)
     {
       txtEvent.Text = region.Name + " has closed";
     }
-    public void AfterRegionDisconnected(GemStone.GemFire.Cache.Region region)
+    public void AfterRegionDisconnected(Apache.Geode.Client.Region region)
     {
       txtEvent.Text = region.Name + " has disconnected";
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/ProductBrowser/Product.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/ProductBrowser/Product.cs b/examples/clicache/ProductBrowser/Product.cs
index d494969..d23f095 100755
--- a/examples/clicache/ProductBrowser/Product.cs
+++ b/examples/clicache/ProductBrowser/Product.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using GemStone.GemFire.Cache;
+using Apache.Geode.Client;
 
 namespace ProductBrowser
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/ProductBrowser/ProductBrowser.csproj
----------------------------------------------------------------------
diff --git a/examples/clicache/ProductBrowser/ProductBrowser.csproj b/examples/clicache/ProductBrowser/ProductBrowser.csproj
index 9f580a4..5320296 100755
--- a/examples/clicache/ProductBrowser/ProductBrowser.csproj
+++ b/examples/clicache/ProductBrowser/ProductBrowser.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{7C77A471-0334-49DF-ABE5-B1799428B8AC}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Cache.Examples</RootNamespace>
+    <RootNamespace>Apache.Geode.Client.Examples</RootNamespace>
     <AssemblyName>ProductBrowser</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/ProductBrowser/Properties/Resources.Designer.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/ProductBrowser/Properties/Resources.Designer.cs b/examples/clicache/ProductBrowser/Properties/Resources.Designer.cs
index f27808e..1a27606 100755
--- a/examples/clicache/ProductBrowser/Properties/Resources.Designer.cs
+++ b/examples/clicache/ProductBrowser/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace GemStone.GemFire.Cache.Examples.Properties {
+namespace Apache.Geode.Client.Examples.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace GemStone.GemFire.Cache.Examples.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GemStone.GemFire.Cache.Examples.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Apache.Geode.Client.Examples.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/ProductBrowser/Properties/Settings.Designer.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/ProductBrowser/Properties/Settings.Designer.cs b/examples/clicache/ProductBrowser/Properties/Settings.Designer.cs
index 4ff0889..4bbbcb4 100755
--- a/examples/clicache/ProductBrowser/Properties/Settings.Designer.cs
+++ b/examples/clicache/ProductBrowser/Properties/Settings.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace GemStone.GemFire.Cache.Examples.Properties {
+namespace Apache.Geode.Client.Examples.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/UserObjects/AccountHistory.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/UserObjects/AccountHistory.cs b/examples/clicache/UserObjects/AccountHistory.cs
index e6e931d..19809b3 100644
--- a/examples/clicache/UserObjects/AccountHistory.cs
+++ b/examples/clicache/UserObjects/AccountHistory.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.Examples
+namespace Apache.Geode.Client.Examples
 {
   class AccountHistory : IGFSerializable
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/UserObjects/BankAccount.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/UserObjects/BankAccount.cs b/examples/clicache/UserObjects/BankAccount.cs
index 49895c3..bd0f1fa 100644
--- a/examples/clicache/UserObjects/BankAccount.cs
+++ b/examples/clicache/UserObjects/BankAccount.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.Examples
+namespace Apache.Geode.Client.Examples
 {
   class BankAccount : ICacheableKey
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/UserObjects/Program.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/UserObjects/Program.cs b/examples/clicache/UserObjects/Program.cs
index 5475fce..8b18e04 100644
--- a/examples/clicache/UserObjects/Program.cs
+++ b/examples/clicache/UserObjects/Program.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.Examples
+namespace Apache.Geode.Client.Examples
 {
   class UserObjects
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/examples/clicache/UserObjects/UserObjects.csproj
----------------------------------------------------------------------
diff --git a/examples/clicache/UserObjects/UserObjects.csproj b/examples/clicache/UserObjects/UserObjects.csproj
index b88d985..c464618 100644
--- a/examples/clicache/UserObjects/UserObjects.csproj
+++ b/examples/clicache/UserObjects/UserObjects.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{9FF38F43-864D-45EB-AD38-2AC2AD272C9E}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Cache.Examples</RootNamespace>
+    <RootNamespace>Apache.Geode.Client.Examples</RootNamespace>
     <AssemblyName>UserObjects</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/AttributesFactoryTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/AttributesFactoryTestsN.cs b/src/clicache/integration-test/AttributesFactoryTestsN.cs
index 749a56d..a570ac7 100644
--- a/src/clicache/integration-test/AttributesFactoryTestsN.cs
+++ b/src/clicache/integration-test/AttributesFactoryTestsN.cs
@@ -20,7 +20,7 @@
 
 //#pragma warning disable 618
 
-//namespace Apache.Geode.Client.UnitTests.NewAPI
+//namespace Apache.Geode.Client.UnitTests
 //{
 //  using NUnit.Framework;
 //  using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/AttributesMutatorTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/AttributesMutatorTestsN.cs b/src/clicache/integration-test/AttributesMutatorTestsN.cs
index ac6138e..dbd2327 100644
--- a/src/clicache/integration-test/AttributesMutatorTestsN.cs
+++ b/src/clicache/integration-test/AttributesMutatorTestsN.cs
@@ -20,7 +20,7 @@ using System.Threading;
 
 #pragma warning disable 618
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/BuiltinCacheableWrappersN.cs b/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
index e12fc40..647fbcc 100644
--- a/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
+++ b/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/CacheHelperN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CacheHelperN.cs b/src/clicache/integration-test/CacheHelperN.cs
index e773d75..83e17b5 100644
--- a/src/clicache/integration-test/CacheHelperN.cs
+++ b/src/clicache/integration-test/CacheHelperN.cs
@@ -25,7 +25,7 @@ using System.Xml;
 
 #pragma warning disable 618
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/CacheableWrapperN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CacheableWrapperN.cs b/src/clicache/integration-test/CacheableWrapperN.cs
index cc81469..38975c3 100644
--- a/src/clicache/integration-test/CacheableWrapperN.cs
+++ b/src/clicache/integration-test/CacheableWrapperN.cs
@@ -20,7 +20,7 @@ using System.Collections.Generic;
 using System.Collections;
 using System.Runtime.Serialization;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   
   using NUnit.Framework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/CachelessTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CachelessTestsN.cs b/src/clicache/integration-test/CachelessTestsN.cs
index 9ee8e48..15abf94 100644
--- a/src/clicache/integration-test/CachelessTestsN.cs
+++ b/src/clicache/integration-test/CachelessTestsN.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/DataOutputTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DataOutputTests.cs b/src/clicache/integration-test/DataOutputTests.cs
index 167e8eb..607a310 100755
--- a/src/clicache/integration-test/DataOutputTests.cs
+++ b/src/clicache/integration-test/DataOutputTests.cs
@@ -19,7 +19,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
     using NUnit.Framework;
     using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/DefaultCacheable.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DefaultCacheable.cs b/src/clicache/integration-test/DefaultCacheable.cs
deleted file mode 100755
index 8e852a6..0000000
--- a/src/clicache/integration-test/DefaultCacheable.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-using Apache.Geode.Client;
-
-namespace Apache.Geode.Client.UnitTests
-{
-  [Serializable]
-  class CustomSerializableObject
-  {
-    public String key;
-    public String value;
-
-    public CustomSerializableObject()
-    {
-      key = "key";
-      value = "value";
-    }
-  }
-  class DefaultCacheable : Apache.Geode.Client.IGFSerializable
-  {
-    Apache.Geode.Client.CacheableBoolean m_cacheableBoolean = null;
-    Apache.Geode.Client.CacheableInt32 m_cacheableInt32 = null;
-    Apache.Geode.Client.CacheableInt32Array m_cacheableInt32Array = null;
-    Apache.Geode.Client.CacheableFileName m_cacheableFileName = null;
-    Apache.Geode.Client.CacheableString m_CacheableStringASCII = null;
-    Apache.Geode.Client.CacheableStringArray m_cacheableStringArray = null;
-    Apache.Geode.Client.CacheableHashSet m_cacheableHashSet = null;
-    Apache.Geode.Client.CacheableHashMap m_cacheableHashMap = null;
-    Apache.Geode.Client.CacheableDate m_cacheableDate = null;
-    Apache.Geode.Client.CacheableVector m_cacheableVector = null;
-    Apache.Geode.Client.CacheableObject m_cacheableObject = null;
-
-    bool m_initialized = false;
-
-    public DefaultCacheable()
-    { 
-    
-    }
-
-    public DefaultCacheable(bool initialized)
-    {
-      if (initialized)
-      {
-        Apache.Geode.Client.Log.Fine(" in constructor");
-        m_initialized = true;
-
-        m_cacheableBoolean = Apache.Geode.Client.CacheableBoolean.Create(true);
-
-        m_cacheableInt32 = Apache.Geode.Client.CacheableInt32.Create(1000);
-
-        m_cacheableInt32Array = Apache.Geode.Client.CacheableInt32Array.Create(new Int32[] { 1, 2, 3 });
-
-        m_cacheableFileName = Apache.Geode.Client.CacheableFileName.Create("gemstone.txt");
-
-        m_CacheableStringASCII = Apache.Geode.Client.CacheableString.Create("asciistring");
-
-        m_cacheableStringArray = Apache.Geode.Client.CacheableStringArray.Create(new string[] { "one", "two" });
-
-        m_cacheableHashSet = Apache.Geode.Client.CacheableHashSet.Create(2);
-        m_cacheableHashSet.Add(Apache.Geode.Client.CacheableString.Create("first"));
-        m_cacheableHashSet.Add(Apache.Geode.Client.CacheableString.Create("second"));
-
-        m_cacheableHashMap = new Apache.Geode.Client.CacheableHashMap(new Dictionary<string, string>() {{ "key-hm", "value-hm" }});
-
-        m_cacheableDate = (CacheableDate)CacheableDate.Create(DateTime.Now);
-
-        m_cacheableVector = new Apache.Geode.Client.CacheableVector(new List<string>() { "one-vec", "two-vec" });
-
-        m_cacheableObject = Apache.Geode.Client.CacheableObject.Create(new CustomSerializableObject());
-      } 
-    }
-
-    public Apache.Geode.Client.CacheableBoolean CBool
-    {
-      get { return m_cacheableBoolean; }
-    }
-
-    public Apache.Geode.Client.CacheableInt32 CInt
-    {
-      get { return m_cacheableInt32; }
-    }
-
-    public Apache.Geode.Client.CacheableInt32Array CIntArray
-    {
-      get { return m_cacheableInt32Array; }
-    }
-
-    public Apache.Geode.Client.CacheableFileName CFileName
-    {
-      get { return m_cacheableFileName; }
-    }
-
-    public Apache.Geode.Client.CacheableString CString
-    {
-      get { return m_CacheableStringASCII; }
-    }
-
-    public Apache.Geode.Client.CacheableStringArray CStringArray
-    {
-      get { return m_cacheableStringArray; }
-    }
-
-    public Apache.Geode.Client.CacheableHashSet CHashSet
-    {
-      get { return m_cacheableHashSet; }
-    }
-
-    public Apache.Geode.Client.CacheableHashMap CHashMap
-    {
-      get { return m_cacheableHashMap; }
-    }
-
-    public Apache.Geode.Client.CacheableDate CDate
-    {
-      get { return m_cacheableDate; }
-    }
-
-    public Apache.Geode.Client.CacheableVector CVector
-    {
-      get { return m_cacheableVector; }
-    }
-
-    public Apache.Geode.Client.CacheableObject CObject
-    {
-      get { return m_cacheableObject; }
-    }
-
-    #region IGFSerializable Members
-
-    public uint ClassId
-    {
-      get { return 0x04; }
-    }
-
-    public Apache.Geode.Client.IGFSerializable FromData(Apache.Geode.Client.DataInput input)
-    {
-      if (!m_initialized)
-      {
-        m_cacheableBoolean = (Apache.Geode.Client.CacheableBoolean)CacheableBoolean.CreateDeserializable();
-        m_cacheableInt32 = (Apache.Geode.Client.CacheableInt32)CacheableInt32.CreateDeserializable();
-        m_cacheableInt32Array = (Apache.Geode.Client.CacheableInt32Array)CacheableInt32Array.CreateDeserializable();
-       // m_cacheableFileName = (CacheableFileName)CacheableFileName.CreateDeserializable();
-        //m_CacheableStringASCII = (CacheableString)CacheableString.CreateDeserializable();
-        m_cacheableStringArray = (Apache.Geode.Client.CacheableStringArray)CacheableStringArray.CreateDeserializable();
-        m_cacheableHashSet = (Apache.Geode.Client.CacheableHashSet)CacheableHashSet.CreateDeserializable();
-        m_cacheableHashMap = (Apache.Geode.Client.CacheableHashMap)CacheableHashMap.CreateDeserializable();
-        m_cacheableDate = (CacheableDate)CacheableDate.CreateDeserializable();
-        m_cacheableVector = (Apache.Geode.Client.CacheableVector)CacheableVector.CreateDeserializable();
-        m_cacheableObject = (Apache.Geode.Client.CacheableObject)CacheableObject.CreateDeserializable();
-      }
-
-      m_cacheableBoolean.FromData(input);
-      m_cacheableInt32.FromData(input); ;
-      m_cacheableInt32Array.FromData(input);
-      //m_cacheableFileName.FromData(input);
-      //m_CacheableStringASCII.FromData(input);
-      m_cacheableStringArray.FromData(input);
-      m_cacheableHashSet.FromData(input);
-      m_cacheableHashMap.FromData(input);
-      m_cacheableDate.FromData(input);
-      m_cacheableVector.FromData(input);
-      m_cacheableObject.FromData(input);
-      return this;
-    }
-
-    public uint ObjectSize
-    {
-      get { return 100; }//need to implement
-    }
-
-    public void ToData(Apache.Geode.Client.DataOutput output)
-    {
-      if (m_initialized)
-      {
-        m_cacheableBoolean.ToData(output);
-        m_cacheableInt32.ToData(output);
-        m_cacheableInt32Array.ToData(output);
-        //m_cacheableFileName.ToData(output);
-        //m_CacheableStringASCII.ToData(output);
-        m_cacheableStringArray.ToData(output);
-        m_cacheableHashSet.ToData(output);
-        m_cacheableHashMap.ToData(output);
-        m_cacheableDate.ToData(output);
-        m_cacheableVector.ToData(output);
-        m_cacheableObject.ToData(output);
-      }
-    }
-
-    #endregion
-
-    public static Apache.Geode.Client.IGFSerializable CreateDeserializable()
-    {
-      return new DefaultCacheable();
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/DefaultCacheableN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DefaultCacheableN.cs b/src/clicache/integration-test/DefaultCacheableN.cs
index c879ebf..183e9cf 100644
--- a/src/clicache/integration-test/DefaultCacheableN.cs
+++ b/src/clicache/integration-test/DefaultCacheableN.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using Apache.Geode.Client;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/DistOpsStepsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DistOpsStepsN.cs b/src/clicache/integration-test/DistOpsStepsN.cs
index fd3cc70..91868cd 100644
--- a/src/clicache/integration-test/DistOpsStepsN.cs
+++ b/src/clicache/integration-test/DistOpsStepsN.cs
@@ -21,7 +21,7 @@ using System.Threading;
 using System.Reflection;
 using System.Collections;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
@@ -485,11 +485,11 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       m_firstAppDomain = AppDomain.CreateDomain("FIRST_APPDOMAIN");
       m_secondAppDomain = AppDomain.CreateDomain("SECOND_APPDOMAIN");
 
-      m_chw_forFirstAppDomain = (CacheHelperWrapper)m_firstAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName, "Apache.Geode.Client.UnitTests.NewAPI.CacheHelperWrapper");
-      m_chw_forSecondAppDomain = (CacheHelperWrapper)m_secondAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName, "Apache.Geode.Client.UnitTests.NewAPI.CacheHelperWrapper");
+      m_chw_forFirstAppDomain = (CacheHelperWrapper)m_firstAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName, "Apache.Geode.Client.UnitTests.CacheHelperWrapper");
+      m_chw_forSecondAppDomain = (CacheHelperWrapper)m_secondAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName, "Apache.Geode.Client.UnitTests.CacheHelperWrapper");
 
-      m_putGetTests_forFirstAppDomain = (PutGetTestsAD)m_firstAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName, "Apache.Geode.Client.UnitTests.NewAPI.PutGetTestsAD");
-      m_putGetTests_forSecondAppDomain = (PutGetTestsAD)m_secondAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName, "Apache.Geode.Client.UnitTests.NewAPI.PutGetTestsAD");
+      m_putGetTests_forFirstAppDomain = (PutGetTestsAD)m_firstAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName, "Apache.Geode.Client.UnitTests.PutGetTestsAD");
+      m_putGetTests_forSecondAppDomain = (PutGetTestsAD)m_secondAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName, "Apache.Geode.Client.UnitTests.PutGetTestsAD");
     }
 
     public void CloseCacheAD()

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/DupListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DupListenerN.cs b/src/clicache/integration-test/DupListenerN.cs
index 30af812..faedeed 100644
--- a/src/clicache/integration-test/DupListenerN.cs
+++ b/src/clicache/integration-test/DupListenerN.cs
@@ -19,7 +19,7 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/DurableListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DurableListenerN.cs b/src/clicache/integration-test/DurableListenerN.cs
index 78c8280..c01211d 100644
--- a/src/clicache/integration-test/DurableListenerN.cs
+++ b/src/clicache/integration-test/DurableListenerN.cs
@@ -19,7 +19,7 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ExpirationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ExpirationTestsN.cs b/src/clicache/integration-test/ExpirationTestsN.cs
index a8e2e3e..7e24e1d 100644
--- a/src/clicache/integration-test/ExpirationTestsN.cs
+++ b/src/clicache/integration-test/ExpirationTestsN.cs
@@ -20,7 +20,7 @@ using System.Threading;
 using System.Collections.Generic;
 #pragma warning disable 618
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/OverflowTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/OverflowTestsN.cs b/src/clicache/integration-test/OverflowTestsN.cs
index 6669ebd..ba10e17 100644
--- a/src/clicache/integration-test/OverflowTestsN.cs
+++ b/src/clicache/integration-test/OverflowTestsN.cs
@@ -23,7 +23,7 @@ using System.Diagnostics;
 
 #pragma warning disable 618
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/PutGetTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/PutGetTestsN.cs b/src/clicache/integration-test/PutGetTestsN.cs
index 5b68534..ed7c5b7 100644
--- a/src/clicache/integration-test/PutGetTestsN.cs
+++ b/src/clicache/integration-test/PutGetTestsN.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/RegionOperationN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/RegionOperationN.cs b/src/clicache/integration-test/RegionOperationN.cs
index aadb087..2265c30 100644
--- a/src/clicache/integration-test/RegionOperationN.cs
+++ b/src/clicache/integration-test/RegionOperationN.cs
@@ -2,7 +2,7 @@ using System;
 using System.Diagnostics;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/RegionWrapperN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/RegionWrapperN.cs b/src/clicache/integration-test/RegionWrapperN.cs
index abbe3e3..224db45 100644
--- a/src/clicache/integration-test/RegionWrapperN.cs
+++ b/src/clicache/integration-test/RegionWrapperN.cs
@@ -20,7 +20,7 @@ using System.Diagnostics;
 using System.Threading;
 using System.Collections.Generic;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/SecurityTestUtilN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SecurityTestUtilN.cs b/src/clicache/integration-test/SecurityTestUtilN.cs
index 964447b..aced33d 100644
--- a/src/clicache/integration-test/SecurityTestUtilN.cs
+++ b/src/clicache/integration-test/SecurityTestUtilN.cs
@@ -20,10 +20,10 @@ using System.Collections.Generic;
 
 #pragma warning disable 618
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;
   using AssertionException = Apache.Geode.Client.AssertionException;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/SerializationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SerializationTestsN.cs b/src/clicache/integration-test/SerializationTestsN.cs
index cfa765b..fa894b4 100644
--- a/src/clicache/integration-test/SerializationTestsN.cs
+++ b/src/clicache/integration-test/SerializationTestsN.cs
@@ -20,7 +20,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/SystemPropertiesTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SystemPropertiesTestsN.cs b/src/clicache/integration-test/SystemPropertiesTestsN.cs
index 961fea8..c903be9 100644
--- a/src/clicache/integration-test/SystemPropertiesTestsN.cs
+++ b/src/clicache/integration-test/SystemPropertiesTestsN.cs
@@ -18,7 +18,7 @@
 using System;
 using System.IO;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/TallyListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyListenerN.cs b/src/clicache/integration-test/TallyListenerN.cs
index 4e15514..4110b76 100644
--- a/src/clicache/integration-test/TallyListenerN.cs
+++ b/src/clicache/integration-test/TallyListenerN.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/TallyLoaderN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyLoaderN.cs b/src/clicache/integration-test/TallyLoaderN.cs
index 0e88e8d..64db895 100644
--- a/src/clicache/integration-test/TallyLoaderN.cs
+++ b/src/clicache/integration-test/TallyLoaderN.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using Apache.Geode.DUnitFramework;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/TallyResolverN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyResolverN.cs b/src/clicache/integration-test/TallyResolverN.cs
index 8110b4e..a37c3a0 100755
--- a/src/clicache/integration-test/TallyResolverN.cs
+++ b/src/clicache/integration-test/TallyResolverN.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using Apache.Geode.DUnitFramework;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/TallyWriterN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyWriterN.cs b/src/clicache/integration-test/TallyWriterN.cs
index 7847a8b..90ade58 100644
--- a/src/clicache/integration-test/TallyWriterN.cs
+++ b/src/clicache/integration-test/TallyWriterN.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
index 6225579..22952fb 100644
--- a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
+++ b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
@@ -17,10 +17,10 @@
 
 \ufeffusing System;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
     using Apache.Geode.Client;
-    using Apache.Geode.Client.Tests.NewAPI;
+    using Apache.Geode.Client.Tests;
     using Apache.Geode.DUnitFramework;
     using NUnit.Framework;
     using QueryCategory = Apache.Geode.Client.Tests.QueryCategory;
@@ -74,8 +74,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         {
             Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
             Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
-            Serializable.RegisterPdxType(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx.CreateDeserializable);
-            Serializable.RegisterPdxType(Apache.Geode.Client.Tests.NewAPI.PositionPdx.CreateDeserializable);
+            Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PortfolioPdx.CreateDeserializable);
+            Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PositionPdx.CreateDeserializable);
         }
 
         public void CreateCache(string locators)

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientCSTXN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCSTXN.cs b/src/clicache/integration-test/ThinClientCSTXN.cs
index 5c8c772..201ea71 100644
--- a/src/clicache/integration-test/ThinClientCSTXN.cs
+++ b/src/clicache/integration-test/ThinClientCSTXN.cs
@@ -19,14 +19,14 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;
-  using Apache.Geode.Client.UnitTests.NewAPI;
+  using Apache.Geode.Client.UnitTests;
   using Region = Apache.Geode.Client.IRegion<Object, Object>;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   #region CSTX_COMMENTED - transaction listener and writer are disabled for now
   /* 
   class CSTXListener<TKey, TVal> : TransactionListenerAdapter<TKey, TVal>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientCallbackArgN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCallbackArgN.cs b/src/clicache/integration-test/ThinClientCallbackArgN.cs
index b50971e..85dbcc5 100644
--- a/src/clicache/integration-test/ThinClientCallbackArgN.cs
+++ b/src/clicache/integration-test/ThinClientCallbackArgN.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
 
   using Apache.Geode.Client;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientConflationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientConflationTestsN.cs b/src/clicache/integration-test/ThinClientConflationTestsN.cs
index 7bf6f53..0672520 100644
--- a/src/clicache/integration-test/ThinClientConflationTestsN.cs
+++ b/src/clicache/integration-test/ThinClientConflationTestsN.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
 
   #region Listener

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientCqIRTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCqIRTestsN.cs b/src/clicache/integration-test/ThinClientCqIRTestsN.cs
index 372bfab..6df4e7a 100644
--- a/src/clicache/integration-test/ThinClientCqIRTestsN.cs
+++ b/src/clicache/integration-test/ThinClientCqIRTestsN.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientCqTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCqTestsN.cs b/src/clicache/integration-test/ThinClientCqTestsN.cs
index 5d938af..3da1feb 100644
--- a/src/clicache/integration-test/ThinClientCqTestsN.cs
+++ b/src/clicache/integration-test/ThinClientCqTestsN.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
 
   public class MyCqListener<TKey, TResult> : ICqListener<TKey, TResult>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientDeltaTestN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDeltaTestN.cs b/src/clicache/integration-test/ThinClientDeltaTestN.cs
index 6685fd1..6bd4d74 100644
--- a/src/clicache/integration-test/ThinClientDeltaTestN.cs
+++ b/src/clicache/integration-test/ThinClientDeltaTestN.cs
@@ -22,11 +22,11 @@ using System.Threading;
 
 #pragma warning disable 618
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
   using DeltaEx = Apache.Geode.Client.Tests.DeltaEx;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientDocExamplesN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDocExamplesN.cs b/src/clicache/integration-test/ThinClientDocExamplesN.cs
index eddbcf8..b2b56ea 100644
--- a/src/clicache/integration-test/ThinClientDocExamplesN.cs
+++ b/src/clicache/integration-test/ThinClientDocExamplesN.cs
@@ -21,11 +21,11 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Diagnostics;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client.Examples;
   using Apache.Geode.Client;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDurableCqTestsN.cs b/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
index 9d24008..4864b23 100644
--- a/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
+++ b/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
@@ -17,11 +17,11 @@
 
 using NUnit.Framework;
 using Apache.Geode.DUnitFramework;
-using Apache.Geode.Client.Tests.NewAPI;
+using Apache.Geode.Client.Tests;
 using Apache.Geode.Client;
 using System;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
 
   [TestFixture]

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientDurableTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDurableTestsN.cs b/src/clicache/integration-test/ThinClientDurableTestsN.cs
index 9eb2c2d..7d55bec 100644
--- a/src/clicache/integration-test/ThinClientDurableTestsN.cs
+++ b/src/clicache/integration-test/ThinClientDurableTestsN.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs b/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
index b939cf9..69b882c 100644
--- a/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
@@ -20,7 +20,7 @@ using System.Collections.Generic;
 using System.Collections;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientHARegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientHARegionTestsN.cs b/src/clicache/integration-test/ThinClientHARegionTestsN.cs
index 62a0cce..66fcca7 100644
--- a/src/clicache/integration-test/ThinClientHARegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientHARegionTestsN.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
 
   using Region = Apache.Geode.Client.IRegion<Object, Object>;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientListenerWriterN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientListenerWriterN.cs b/src/clicache/integration-test/ThinClientListenerWriterN.cs
index 80d186a..2a7ccfc 100644
--- a/src/clicache/integration-test/ThinClientListenerWriterN.cs
+++ b/src/clicache/integration-test/ThinClientListenerWriterN.cs
@@ -18,12 +18,12 @@
 using System;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;
-  using Apache.Geode.Client.UnitTests.NewAPI;
+  using Apache.Geode.Client.UnitTests;
   using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
   [TestFixture]

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientPdxTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPdxTests.cs b/src/clicache/integration-test/ThinClientPdxTests.cs
index 24b4e4e..0638c40 100755
--- a/src/clicache/integration-test/ThinClientPdxTests.cs
+++ b/src/clicache/integration-test/ThinClientPdxTests.cs
@@ -24,7 +24,7 @@ using System.Threading;
 using PdxTests;
 using System.Reflection;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientPoolTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPoolTestsN.cs b/src/clicache/integration-test/ThinClientPoolTestsN.cs
index e510449..e8df8d6 100644
--- a/src/clicache/integration-test/ThinClientPoolTestsN.cs
+++ b/src/clicache/integration-test/ThinClientPoolTestsN.cs
@@ -20,7 +20,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientQueryTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientQueryTestsN.cs b/src/clicache/integration-test/ThinClientQueryTestsN.cs
index a3eb260..4539788 100644
--- a/src/clicache/integration-test/ThinClientQueryTestsN.cs
+++ b/src/clicache/integration-test/ThinClientQueryTestsN.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   
   using Apache.Geode.Client;
 
@@ -79,8 +79,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       {
         Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
         Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
-        Serializable.RegisterPdxType(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx.CreateDeserializable);
-        Serializable.RegisterPdxType(Apache.Geode.Client.Tests.NewAPI.PositionPdx.CreateDeserializable);
+        Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PortfolioPdx.CreateDeserializable);
+        Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PositionPdx.CreateDeserializable);
       }
       catch (IllegalStateException)
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs b/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
index fb1db13..9cf64f2 100644
--- a/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientRegionStepsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionStepsN.cs b/src/clicache/integration-test/ThinClientRegionStepsN.cs
index 22dbd47..7a27056 100644
--- a/src/clicache/integration-test/ThinClientRegionStepsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionStepsN.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientRegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionTestsN.cs b/src/clicache/integration-test/ThinClientRegionTestsN.cs
index c85624c..a9676df 100644
--- a/src/clicache/integration-test/ThinClientRegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionTestsN.cs
@@ -22,7 +22,7 @@ using System.Collections.ObjectModel;
 using System.IO;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs b/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
index d23fd5e..fe74b93 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
@@ -19,10 +19,10 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;
   [TestFixture]

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs b/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
index 730e6fb..adb659e 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
@@ -19,10 +19,10 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
index 164138e..19bd388 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
   //using Region = Apache.Geode.Client.IRegion<Object, Object>;
   using AssertionException = Apache.Geode.Client.AssertionException;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
index 52cb879..2ac9a12 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
 
   public class MyCqListener2<TKey, TResult> : ICqListener<TKey, TResult>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
index 2ae797e..31bcd41 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
 
   [TestFixture]

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientStatisticTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientStatisticTestsN.cs b/src/clicache/integration-test/ThinClientStatisticTestsN.cs
index 7b87525..730ea6c 100644
--- a/src/clicache/integration-test/ThinClientStatisticTestsN.cs
+++ b/src/clicache/integration-test/ThinClientStatisticTestsN.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientStringArrayTestsN.cs b/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
index b34664d..9b83dd4 100644
--- a/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
+++ b/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/UnitTests.csproj.in
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/UnitTests.csproj.in b/src/clicache/integration-test/UnitTests.csproj.in
index b156e77..bf4e66f 100644
--- a/src/clicache/integration-test/UnitTests.csproj.in
+++ b/src/clicache/integration-test/UnitTests.csproj.in
@@ -120,9 +120,6 @@
     <Compile Include="$(CMAKE_CURRENT_SOURCE_DIR)\AssemblyInfo.cs">
       <Link>AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CMAKE_CURRENT_SOURCE_DIR)\DefaultCacheable.cs">
-      <Link>DefaultCacheable.cs</Link>
-    </Compile>
     <Compile Include="$(CMAKE_CURRENT_SOURCE_DIR)\DataOutputTests.cs">
       <Link>DataOutputTests.cs</Link>
     </Compile>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/UnitTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/UnitTestsN.cs b/src/clicache/integration-test/UnitTestsN.cs
index 04ec00b..2650e2a 100644
--- a/src/clicache/integration-test/UnitTestsN.cs
+++ b/src/clicache/integration-test/UnitTestsN.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/clicache/integration-test/client_generics_plugins.xml
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/client_generics_plugins.xml b/src/clicache/integration-test/client_generics_plugins.xml
index d3381cf..b813a3c 100644
--- a/src/clicache/integration-test/client_generics_plugins.xml
+++ b/src/clicache/integration-test/client_generics_plugins.xml
@@ -10,19 +10,19 @@
 
 	<root-region name='DistRegionAck'>
 	   <region-attributes pool-name="__TESTPOOL1_">
-	     <cache-listener library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-loader library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-writer library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
-	     <partition-resolver library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-listener library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-loader library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-writer library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
+	     <partition-resolver library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
 	   </region-attributes>
 	</root-region>
   
   <root-region name='DistRegionNoAck'>
 	   <region-attributes pool-name="__TESTPOOL1_">
-	     <cache-listener library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-loader library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-writer library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
-	     <partition-resolver library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-listener library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-loader library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-writer library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
+	     <partition-resolver library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
 	   </region-attributes>
 	</root-region>
   

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/cppcache/integration-test/client_generics_plugins.xml
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/client_generics_plugins.xml b/src/cppcache/integration-test/client_generics_plugins.xml
index 303811a..b813a3c 100755
--- a/src/cppcache/integration-test/client_generics_plugins.xml
+++ b/src/cppcache/integration-test/client_generics_plugins.xml
@@ -10,19 +10,19 @@
 
 	<root-region name='DistRegionAck'>
 	   <region-attributes pool-name="__TESTPOOL1_">
-	     <cache-listener library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-loader library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-writer library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
-	     <partition-resolver library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-listener library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-loader library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-writer library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
+	     <partition-resolver library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
 	   </region-attributes>
 	</root-region>
   
   <root-region name='DistRegionNoAck'>
 	   <region-attributes pool-name="__TESTPOOL1_">
-	     <cache-listener library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-loader library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-writer library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
-	     <partition-resolver library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-listener library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-loader library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-writer library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
+	     <partition-resolver library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
 	   </region-attributes>
 	</root-region>
   

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/quickstart/csharp/CqQuery.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/CqQuery.cs b/src/quickstart/csharp/CqQuery.cs
index d30b97b..a3b1776 100644
--- a/src/quickstart/csharp/CqQuery.cs
+++ b/src/quickstart/csharp/CqQuery.cs
@@ -36,7 +36,7 @@ using System;
 using Apache.Geode.Client.Generic;
 
 // Use the "Tests" namespace for the query objects.
-using Apache.Geode.Client.Tests.NewAPI;
+using Apache.Geode.Client.Tests;
 
 namespace Apache.Geode.Client.Generic.QuickStart
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/quickstart/csharp/PoolCqQuery.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PoolCqQuery.cs b/src/quickstart/csharp/PoolCqQuery.cs
index 725bf93..10b16fa 100755
--- a/src/quickstart/csharp/PoolCqQuery.cs
+++ b/src/quickstart/csharp/PoolCqQuery.cs
@@ -38,7 +38,7 @@ using System;
 using Apache.Geode.Client.Generic;
 
 // Use the "Tests" namespace for the query objects.
-using Apache.Geode.Client.Tests.NewAPI;
+using Apache.Geode.Client.Tests;
 
 namespace Apache.Geode.Client.Generic.QuickStart
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/quickstart/csharp/PoolRemoteQuery.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PoolRemoteQuery.cs b/src/quickstart/csharp/PoolRemoteQuery.cs
index a7007bb..32fa207 100755
--- a/src/quickstart/csharp/PoolRemoteQuery.cs
+++ b/src/quickstart/csharp/PoolRemoteQuery.cs
@@ -37,7 +37,7 @@ using System;
 using Apache.Geode.Client.Generic;
 
 // Use the "Tests" namespace for the query objects.
-using Apache.Geode.Client.Tests.NewAPI;
+using Apache.Geode.Client.Tests;
 
 namespace Apache.Geode.Client.Generic.QuickStart
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/quickstart/csharp/PortfolioN.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/PortfolioN.cs b/src/quickstart/csharp/PortfolioN.cs
index 9e70bcc..5c1c29f 100644
--- a/src/quickstart/csharp/PortfolioN.cs
+++ b/src/quickstart/csharp/PortfolioN.cs
@@ -17,7 +17,7 @@
 
 using System;
 using System.Collections.Generic;
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
 
   using Apache.Geode.Client.Generic;

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

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/quickstart/csharp/RemoteQuery.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/RemoteQuery.cs b/src/quickstart/csharp/RemoteQuery.cs
index b6c18b3..44d270f 100644
--- a/src/quickstart/csharp/RemoteQuery.cs
+++ b/src/quickstart/csharp/RemoteQuery.cs
@@ -37,7 +37,7 @@ using System;
 using Apache.Geode.Client.Generic;
 
 // Use the "Tests" namespace for the query objects.
-using Apache.Geode.Client.Tests.NewAPI;
+using Apache.Geode.Client.Tests;
 
 namespace Apache.Geode.Client.Generic.QuickStart
 {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/quickstart/csharp/app.config.in
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/app.config.in b/src/quickstart/csharp/app.config.in
index e373726..4b43cd8 100755
--- a/src/quickstart/csharp/app.config.in
+++ b/src/quickstart/csharp/app.config.in
@@ -6,11 +6,11 @@
    <assemblyBinding
       xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-       <assemblyIdentity name="GemStone.GemFire.Cache"
+       <assemblyIdentity name="Apache.Geode.Client"
           publicKeyToken="126e6338d9f55e0c"
           culture="neutral" />
        <codeBase version="9.0.0.0"
-          href="${NATIVECLIENT_BINARIES_DIR}/GemStone.GemFire.Cache.dll"/>
+          href="${NATIVECLIENT_BINARIES_DIR}/Apache.Geode.Client.dll"/>
      </dependentAssembly> 
    </assemblyBinding>  
  </runtime>

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