diff --git a/src/pva/clientFactory.cpp b/src/pva/clientFactory.cpp
index 3157b91..dfdfb56 100644
--- a/src/pva/clientFactory.cpp
+++ b/src/pva/clientFactory.cpp
@@ -34,13 +34,13 @@ public:
         Lock guard(cfact_mutex);
         if (!cfact_shared_provider)
         {
-            Configuration::shared_pointer def;
+            epics::pvAccess::Configuration::shared_pointer def;
             cfact_shared_provider = createClientProvider(def);
         }
         return cfact_shared_provider;
     }
 
-    virtual ChannelProvider::shared_pointer newInstance(const std::tr1::shared_ptr<Configuration>& conf)
+    virtual ChannelProvider::shared_pointer newInstance(const std::tr1::shared_ptr<epics::pvAccess::Configuration>& conf)
     {
         Lock guard(cfact_mutex);
         return createClientProvider(conf);
diff --git a/testApp/remote/channelAccessIFTest.cpp b/testApp/remote/channelAccessIFTest.cpp
index 2fe5e42..c568cb4 100755
--- a/testApp/remote/channelAccessIFTest.cpp
+++ b/testApp/remote/channelAccessIFTest.cpp
@@ -61,7 +61,7 @@ int ChannelAccessIFTest::runAllTest() {
 
   testPlan(153+EXTRA_STRESS_TESTS);
 
-  Configuration::shared_pointer base_config(ConfigurationBuilder()
+  epics::pvAccess::Configuration::shared_pointer base_config(ConfigurationBuilder()
                                             //.add("EPICS_PVA_DEBUG", "3")
                                             .add("EPICS_PVAS_INTF_ADDR_LIST", "127.0.0.1")
                                             .add("EPICS_PVA_ADDR_LIST", "127.0.0.1")
diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp
index 70d4cce..24287a5 100644
--- a/testApp/remote/testServer.cpp
+++ b/testApp/remote/testServer.cpp
@@ -2735,13 +2735,13 @@ struct TestServer : public Runnable
 
     static TestServer::shared_pointer ctx;
 
-    Configuration::shared_pointer conf;
+    epics::pvAccess::Configuration::shared_pointer conf;
     ServerContextImpl::shared_pointer context;
     Event startup;
     Thread runner;
     MockChannelProviderFactory::shared_pointer factory;
 
-    TestServer(const Configuration::shared_pointer& conf)
+    TestServer(const epics::pvAccess::Configuration::shared_pointer& conf)
         :conf(conf)
         ,runner(Thread::Config(this).name("TestServer").autostart(false))
         ,factory(new MockChannelProviderFactory())