diff --git a/src/remote/codec.cpp b/src/remote/codec.cpp
index 83fdfdb..27e0835 100644
--- a/src/remote/codec.cpp
+++ b/src/remote/codec.cpp
@@ -1040,11 +1040,11 @@ namespace epics {
             std::tr1::shared_ptr<epics::pvData::ByteBuffer> const & sendBuffer,
             int32_t socketSendBufferSize)
         :AbstractCodec(serverFlag, receiveBuffer, sendBuffer, socketSendBufferSize, true)
-        ,_readThread(Thread::Config(this, &BlockingAbstractCodec::receiveThread)
+        ,_readThread(epics::pvData::Thread::Config(this, &BlockingAbstractCodec::receiveThread)
                      .prio(epicsThreadPriorityCAServerLow)
                      .name("TCP-rx")
                      .autostart(false))
-        ,_sendThread(Thread::Config(this, &BlockingAbstractCodec::sendThread)
+        ,_sendThread(epics::pvData::Thread::Config(this, &BlockingAbstractCodec::sendThread)
                      .prio(epicsThreadPriorityCAServerLow)
                      .name("TCP-tx")
                      .autostart(false))
diff --git a/testApp/remote/testCodec.cpp b/testApp/remote/testCodec.cpp
index 77115de..079c3b9 100644
--- a/testApp/remote/testCodec.cpp
+++ b/testApp/remote/testCodec.cpp
@@ -3186,7 +3186,7 @@ namespace epics {
         ValueHolder valueHolder(codec);
         Event done;
 
-        Thread thr(Thread::Config(&valueHolder)
+        epics::pvData::Thread thr(epics::pvData::Thread::Config(&valueHolder)
                    .name("testBlockingProcessQueueTest-processThread"));
 
         valueHolder.waiter.wait();
diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp
index 24287a5..03615af 100644
--- a/testApp/remote/testServer.cpp
+++ b/testApp/remote/testServer.cpp
@@ -2738,12 +2738,12 @@ struct TestServer : public Runnable
     epics::pvAccess::Configuration::shared_pointer conf;
     ServerContextImpl::shared_pointer context;
     Event startup;
-    Thread runner;
+    epics::pvData::Thread runner;
     MockChannelProviderFactory::shared_pointer factory;
 
     TestServer(const epics::pvAccess::Configuration::shared_pointer& conf)
         :conf(conf)
-        ,runner(Thread::Config(this).name("TestServer").autostart(false))
+        ,runner(epics::pvData::Thread::Config(this).name("TestServer").autostart(false))
         ,factory(new MockChannelProviderFactory())
     {
         registerChannelProviderFactory(factory);