diff --git a/pvAccessApp/remoteClient/clientContextImpl.cpp b/pvAccessApp/remoteClient/clientContextImpl.cpp
index eb406a3..65557ef 100644
--- a/pvAccessApp/remoteClient/clientContextImpl.cpp
+++ b/pvAccessApp/remoteClient/clientContextImpl.cpp
@@ -1854,11 +1854,11 @@ namespace epics {
     		}
     
     		Status start() {
-    			return Status::Ok;
+    			return Status::OK;
     		}
     
     		Status stop() {
-    			return Status::Ok;
+    			return Status::OK;
     		}
     
     		void destroy() {
@@ -1934,11 +1934,11 @@ namespace epics {
     		Status start() {
     		    Lock guard(m_mutex);
     			m_gotMonitor = false;
-    			return Status::Ok;
+    			return Status::OK;
     		}
     
     		Status stop() {
-    			return Status::Ok;
+    			return Status::OK;
     		}
     
     		void destroy() {
@@ -2053,11 +2053,11 @@ namespace epics {
     			m_gotMonitor = false;
  	    		m_monitorElement->changedBitSet->clear();
 	    		m_monitorElement->overrunBitSet->clear();
-   			    return Status::Ok;
+   			    return Status::OK;
     		}
     
     		Status stop() {
-    			return Status::Ok;
+    			return Status::OK;
     		}
     
     		void destroy() {
@@ -2255,7 +2255,7 @@ namespace epics {
                 }
                 else
                 {
-                    normalResponse(transport, version, payloadBuffer, qos, Status::Ok);
+                    normalResponse(transport, version, payloadBuffer, qos, Status::OK);
                 }
 
             }
@@ -2279,7 +2279,7 @@ namespace epics {
                 {
                     m_channel->checkAndGetTransport()->enqueueSendRequest(shared_from_this());
                     m_started = true;
-                    return Status::Ok;
+                    return Status::OK;
                 } catch (std::runtime_error &rte) {
                     stopRequest();
                     return BaseRequestImpl::channelNotConnected;
@@ -2305,7 +2305,7 @@ namespace epics {
                 {
                     m_channel->checkAndGetTransport()->enqueueSendRequest(shared_from_this());
                     m_started = false;
-                    return Status::Ok;
+                    return Status::OK;
                 } catch (std::runtime_error &rte) {
                     stopRequest();
                     return BaseRequestImpl::channelNotConnected;
@@ -2863,7 +2863,7 @@ namespace epics {
                     auto_ptr<InetAddrVector> addresses;
                     Channel::shared_pointer channel = context->createChannelInternal(channelName, channelRequester, priority, addresses);
                     if (channel.get())
-                        channelRequester->channelCreated(Status::Ok, channel);
+                        channelRequester->channelCreated(Status::OK, channel);
                     return channel;
 
                     // NOTE it's up to internal code to respond w/ error to requester and return 0 in case of errors
diff --git a/testApp/client/MockClientImpl.cpp b/testApp/client/MockClientImpl.cpp
index aeeb170..7e543ed 100644
--- a/testApp/client/MockClientImpl.cpp
+++ b/testApp/client/MockClientImpl.cpp
@@ -58,7 +58,7 @@ class MockChannelProcess : public ChannelProcess
         m_valueField = static_cast<PVScalar*>(field);
         	
         // TODO pvRequest 
-    	m_channelProcessRequester->channelProcessConnect(Status::Ok, this);
+    	m_channelProcessRequester->channelProcessConnect(Status::OK, this);
     }
     
     virtual void process(bool lastRequest)
@@ -134,7 +134,7 @@ class MockChannelProcess : public ChannelProcess
                 break;
             
         } 
-    	m_channelProcessRequester->processDone(Status::Ok);
+    	m_channelProcessRequester->processDone(Status::OK);
     	
     	if (lastRequest)
     	   destroy();
@@ -176,12 +176,12 @@ class MockChannelGet : public ChannelGet
         PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(mockChannelGet);
 
         // TODO pvRequest 
-    	m_channelGetRequester->channelGetConnect(Status::Ok, this, m_pvStructure, m_bitSet);
+    	m_channelGetRequester->channelGetConnect(Status::OK, this, m_pvStructure, m_bitSet);
     }
     
     virtual void get(bool lastRequest)
     {
-    	m_channelGetRequester->getDone(Status::Ok);
+    	m_channelGetRequester->getDone(Status::OK);
     	if (m_first)
     	{
     		m_first = false;
@@ -231,19 +231,19 @@ class MockChannelPut : public ChannelPut
         PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(mockChannelPut);
 
         // TODO pvRequest 
-    	m_channelPutRequester->channelPutConnect(Status::Ok, this, m_pvStructure, m_bitSet);
+    	m_channelPutRequester->channelPutConnect(Status::OK, this, m_pvStructure, m_bitSet);
     }
     
     virtual void put(bool lastRequest)
     {
-    	m_channelPutRequester->putDone(Status::Ok);
+    	m_channelPutRequester->putDone(Status::OK);
     	if (lastRequest)
     	   destroy();
     }
     
     virtual void get()
     {
-    	m_channelPutRequester->getDone(Status::Ok);
+    	m_channelPutRequester->getDone(Status::OK);
     }
 
     virtual void destroy()
@@ -293,7 +293,7 @@ class MockMonitor : public Monitor, public MonitorElement
         m_changedBitSet->set(0);
         
         // TODO pvRequest 
-        m_monitorRequester->monitorConnect(Status::Ok, this, m_pvStructure->getStructure());
+        m_monitorRequester->monitorConnect(Status::OK, this, m_pvStructure->getStructure());
     }
     
     virtual Status start()
@@ -301,12 +301,12 @@ class MockMonitor : public Monitor, public MonitorElement
         // fist monitor
         m_monitorRequester->monitorEvent(this);
         
-        return Status::Ok;
+        return Status::OK;
     }
 
     virtual Status stop()
     {
-        return Status::Ok;
+        return Status::OK;
     }
 
     virtual MonitorElement* poll()
@@ -462,7 +462,7 @@ class MockChannel : public Channel {
 
     virtual void getField(GetFieldRequester *requester,epics::pvData::String subField)
     {
-        requester->getDone(Status::Ok,m_pvStructure->getSubField(subField)->getField());
+        requester->getDone(Status::OK,m_pvStructure->getSubField(subField)->getField());
     }
 
     virtual ChannelProcess* createChannelProcess(
@@ -591,7 +591,7 @@ class MockChannelProvider : public ChannelProvider {
         epics::pvData::String channelName,
         ChannelFindRequester *channelFindRequester)
     {
-        channelFindRequester->channelFindResult(Status::Ok, m_mockChannelFind, true);
+        channelFindRequester->channelFindResult(Status::OK, m_mockChannelFind, true);
         return m_mockChannelFind;
     }
 
@@ -612,7 +612,7 @@ class MockChannelProvider : public ChannelProvider {
         if (address == "local")
         {
             Channel* channel = new MockChannel(this, channelRequester, channelName, address);
-            channelRequester->channelCreated(Status::Ok, channel);
+            channelRequester->channelCreated(Status::OK, channel);
             return channel;
         }
         else
diff --git a/testApp/remote/eget.cpp b/testApp/remote/eget.cpp
index 42d7457..b871653 100644
--- a/testApp/remote/eget.cpp
+++ b/testApp/remote/eget.cpp
@@ -539,7 +539,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << m_channelName << "] channel get create: " << status.toString() << std::endl;
             }
@@ -565,7 +565,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << m_channelName << "] channel get: " << status.toString() << std::endl;
             }
@@ -639,7 +639,7 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << m_channelName << "] channel RPC create: " << status.toString() << std::endl;
             }
@@ -663,7 +663,7 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << m_channelName << "] channel RPC: " << status.toString() << std::endl;
             }
@@ -742,7 +742,7 @@ public:
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << channel->getChannelName() << "] channel create: " << status.toString() << std::endl;
             }
diff --git a/testApp/remote/pvget.cpp b/testApp/remote/pvget.cpp
index a943067..4e8fa7c 100644
--- a/testApp/remote/pvget.cpp
+++ b/testApp/remote/pvget.cpp
@@ -398,7 +398,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << m_channelName << "] channel get create: " << status.toString() << std::endl;
             }
@@ -424,7 +424,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << m_channelName << "] channel get: " << status.toString() << std::endl;
             }
@@ -579,7 +579,7 @@ public:
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << channel->getChannelName() << "] channel create: " << status.toString() << std::endl;
             }
diff --git a/testApp/remote/pvput.cpp b/testApp/remote/pvput.cpp
index 70da954..48a610b 100644
--- a/testApp/remote/pvput.cpp
+++ b/testApp/remote/pvput.cpp
@@ -393,7 +393,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << m_channelName << "] channel put create: " << status.toString() << std::endl;
             }
@@ -417,7 +417,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << m_channelName << "] channel get: " << status.toString() << std::endl;
             }
@@ -446,7 +446,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << m_channelName << "] channel put: " << status.toString() << std::endl;
             }
@@ -498,7 +498,7 @@ public:
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << channel->getChannelName() << "] channel create: " << status.toString() << std::endl;
             }
diff --git a/testApp/remote/pvrpc.cpp b/testApp/remote/pvrpc.cpp
index 6677c31..09020ac 100644
--- a/testApp/remote/pvrpc.cpp
+++ b/testApp/remote/pvrpc.cpp
@@ -123,7 +123,7 @@ public:
         if (status.isSuccess())
         {
             // show warning
-            if (!status.isOk())
+            if (!status.isOK())
             {
                 std::cout << "[" << channel->getChannelName() << "] channel create: " << status.toString() << std::endl;
             }
diff --git a/testApp/remote/testGetPerformance.cpp b/testApp/remote/testGetPerformance.cpp
index 6c878a8..f2250a4 100644
--- a/testApp/remote/testGetPerformance.cpp
+++ b/testApp/remote/testGetPerformance.cpp
@@ -117,7 +117,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
        if (status.isSuccess())
        {
            // show warning
-           if (!status.isOk())
+           if (!status.isOK())
            {
                std::cout << "[" << m_channelName << "] channel get create: " << status.toString() << std::endl;
            }
@@ -145,7 +145,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
        if (status.isSuccess())
        {
            // show warning
-           if (!status.isOk())
+           if (!status.isOK())
            {
                std::cout << "[" << m_channelName << "] channel get: " << status.toString() << std::endl;
            }
@@ -230,7 +230,7 @@ public:
        if (status.isSuccess())
        {
            // show warning
-           if (!status.isOk())
+           if (!status.isOK())
            {
                std::cout << "[" << channel->getChannelName() << "] channel create: " << status.toString() << std::endl;
            }
diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp
index 4d6af76..1622160 100644
--- a/testApp/remote/testServer.cpp
+++ b/testApp/remote/testServer.cpp
@@ -64,7 +64,7 @@ class MockChannelProcess :
         ChannelProcess::shared_pointer thisPtr(new MockChannelProcess(channelProcessRequester, pvStructure, pvRequest));
 
         // TODO pvRequest
-    	channelProcessRequester->channelProcessConnect(Status::Ok, thisPtr);
+    	channelProcessRequester->channelProcessConnect(Status::OK, thisPtr);
     	
     	return thisPtr;
     }
@@ -148,7 +148,7 @@ class MockChannelProcess :
                 break;
 
         }
-    	m_channelProcessRequester->processDone(Status::Ok);
+    	m_channelProcessRequester->processDone(Status::OK);
 
     	if (lastRequest)
     	   destroy();
@@ -197,7 +197,7 @@ class MockChannelGet : public ChannelGet
     {
         ChannelGet::shared_pointer thisPtr(new MockChannelGet(channelGetRequester, pvStructure, pvRequest));
         // TODO pvRequest
-    	channelGetRequester->channelGetConnect(Status::Ok, thisPtr, pvStructure, static_cast<MockChannelGet*>(thisPtr.get())->m_bitSet);
+    	channelGetRequester->channelGetConnect(Status::OK, thisPtr, pvStructure, static_cast<MockChannelGet*>(thisPtr.get())->m_bitSet);
     	
     	return thisPtr;
     }
@@ -209,7 +209,7 @@ class MockChannelGet : public ChannelGet
 
     virtual void get(bool lastRequest)
     {
-    	m_channelGetRequester->getDone(Status::Ok);
+    	m_channelGetRequester->getDone(Status::OK);
     	if (m_first)
     	{
     		m_first = false;
@@ -260,7 +260,7 @@ class MockChannelPut : public ChannelPut
     {
         ChannelPut::shared_pointer thisPtr(new MockChannelPut(channelPutRequester, pvStructure, pvRequest));
         // TODO pvRequest
-    	channelPutRequester->channelPutConnect(Status::Ok, thisPtr, pvStructure, static_cast<MockChannelPut*>(thisPtr.get())->m_bitSet);
+    	channelPutRequester->channelPutConnect(Status::OK, thisPtr, pvStructure, static_cast<MockChannelPut*>(thisPtr.get())->m_bitSet);
     	
     	return thisPtr;
     }
@@ -273,14 +273,14 @@ class MockChannelPut : public ChannelPut
 
     virtual void put(bool lastRequest)
     {
-    	m_channelPutRequester->putDone(Status::Ok);
+    	m_channelPutRequester->putDone(Status::OK);
     	if (lastRequest)
     	   destroy();
     }
 
     virtual void get()
     {
-    	m_channelPutRequester->getDone(Status::Ok);
+    	m_channelPutRequester->getDone(Status::OK);
     }
 
     virtual void destroy()
@@ -321,7 +321,7 @@ class MockChannelPutGet : public ChannelPutGet
     {
         ChannelPutGet::shared_pointer thisPtr(new MockChannelPutGet(channelPutGetRequester, pvStructure, pvRequest));
         // TODO pvRequest
-    	channelPutGetRequester->channelPutGetConnect(Status::Ok, thisPtr, pvStructure, pvStructure);
+    	channelPutGetRequester->channelPutGetConnect(Status::OK, thisPtr, pvStructure, pvStructure);
     	
     	return thisPtr;
     }
@@ -333,19 +333,19 @@ class MockChannelPutGet : public ChannelPutGet
 
     virtual void putGet(bool lastRequest)
     {
-    	m_channelPutGetRequester->putGetDone(Status::Ok);
+    	m_channelPutGetRequester->putGetDone(Status::OK);
     	if (lastRequest)
     	   destroy();
     }
 
     virtual void getGet()
     {
-    	m_channelPutGetRequester->getGetDone(Status::Ok);
+    	m_channelPutGetRequester->getGetDone(Status::OK);
     }
 
     virtual void getPut()
     {
-    	m_channelPutGetRequester->getPutDone(Status::Ok);
+    	m_channelPutGetRequester->getPutDone(Status::OK);
     }
 
     virtual void destroy()
@@ -389,7 +389,7 @@ class MockChannelRPC : public ChannelRPC
     {
         ChannelRPC::shared_pointer thisPtr(new MockChannelRPC(channelRPCRequester, channelName, pvStructure, pvRequest));
         // TODO pvRequest
-    	channelRPCRequester->channelRPCConnect(Status::Ok, thisPtr);
+    	channelRPCRequester->channelRPCConnect(Status::OK, thisPtr);
     	return thisPtr;
     }
 
@@ -451,7 +451,7 @@ class MockChannelRPC : public ChannelRPC
 		        	FILL_VALUES;
 		        	static_pointer_cast<PVDoubleArray>(result->getScalarArrayField(*iter, pvDouble))->put(0, ROWS, values, 0);
 		        }
-				m_channelRPCRequester->requestDone(Status::Ok, result);
+				m_channelRPCRequester->requestDone(Status::OK, result);
 			}
     	}
     	else
@@ -460,7 +460,7 @@ class MockChannelRPC : public ChannelRPC
     		pvArgument->toString(&s);
     		std::cout << "RPC" << std::endl << s << std::endl;
 
-    		m_channelRPCRequester->requestDone(Status::Ok, m_pvStructure);
+    		m_channelRPCRequester->requestDone(Status::OK, m_pvStructure);
     	}
 
     	if (lastRequest)
@@ -513,7 +513,7 @@ class MockChannelArray : public ChannelArray
         ChannelArray::shared_pointer thisPtr(new MockChannelArray(channelArrayRequester, pvStructure, pvRequest));
 
         // TODO pvRequest
-    	channelArrayRequester->channelArrayConnect(Status::Ok, thisPtr, static_cast<MockChannelArray*>(thisPtr.get())->m_pvArray);
+    	channelArrayRequester->channelArrayConnect(Status::OK, thisPtr, static_cast<MockChannelArray*>(thisPtr.get())->m_pvArray);
     	
     	return thisPtr;
     }
@@ -526,7 +526,7 @@ class MockChannelArray : public ChannelArray
     virtual void putArray(bool lastRequest, int offset, int count)
     {
         // TODO offset, count
-    	m_channelArrayRequester->putArrayDone(Status::Ok);
+    	m_channelArrayRequester->putArrayDone(Status::OK);
     	if (lastRequest)
     	   destroy();
     }
@@ -534,7 +534,7 @@ class MockChannelArray : public ChannelArray
     virtual void getArray(bool lastRequest, int offset, int count)
     {
         // TODO offset, count
-    	m_channelArrayRequester->getArrayDone(Status::Ok);
+    	m_channelArrayRequester->getArrayDone(Status::OK);
     	if (lastRequest)
     	   destroy();
     }
@@ -542,7 +542,7 @@ class MockChannelArray : public ChannelArray
     virtual void setLength(bool lastRequest, int length, int capacity)
     {
         // TODO offset, capacity
-    	m_channelArrayRequester->setLengthDone(Status::Ok);
+    	m_channelArrayRequester->setLengthDone(Status::OK);
     	if (lastRequest)
     	   destroy();
     }
@@ -604,7 +604,7 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
 
         // TODO pvRequest
         StructureConstPtr structurePtr = static_cast<MockMonitor*>(thisPtr.get())->m_pvStructure->getStructure();
-        monitorRequester->monitorConnect(Status::Ok, thisPtr, structurePtr);
+        monitorRequester->monitorConnect(Status::OK, thisPtr, structurePtr);
         
         return thisPtr;
     }
@@ -620,12 +620,12 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
     	Monitor::shared_pointer thisPtr = shared_from_this();
         m_monitorRequester->monitorEvent(thisPtr);
 
-        return Status::Ok;
+        return Status::OK;
     }
 
     virtual Status stop()
     {
-        return Status::Ok;
+        return Status::OK;
     }
 
     virtual MonitorElement::shared_pointer poll()
@@ -898,7 +898,7 @@ class MockChannel : public Channel {
     		return;
     	}
     	FieldConstPtr fieldPtr = pvField->getField();
-    	requester->getDone(Status::Ok, fieldPtr);
+    	requester->getDone(Status::OK, fieldPtr);
     }
 
     virtual ChannelProcess::shared_pointer createChannelProcess(
@@ -1036,7 +1036,7 @@ class MockServerChannelProvider : 	public ChannelProvider,
         ChannelFindRequester::shared_pointer const & channelFindRequester)
     {
         // channel always exists
-        channelFindRequester->channelFindResult(Status::Ok, m_mockChannelFind, true);
+        channelFindRequester->channelFindResult(Status::OK, m_mockChannelFind, true);
         return m_mockChannelFind;
     }
 
@@ -1058,7 +1058,7 @@ class MockServerChannelProvider : 	public ChannelProvider,
         {
         	ChannelProvider::shared_pointer chProviderPtr = shared_from_this();
         	Channel::shared_pointer channel = MockChannel::create(chProviderPtr, channelRequester, channelName, address);
-            channelRequester->channelCreated(Status::Ok, channel);
+            channelRequester->channelCreated(Status::OK, channel);
             return channel;
         }
         else
diff --git a/testApp/remote/testServerContext.cpp b/testApp/remote/testServerContext.cpp
index 4f45f1d..5da6dfe 100644
--- a/testApp/remote/testServerContext.cpp
+++ b/testApp/remote/testServerContext.cpp
@@ -20,7 +20,7 @@ public:
                                             ChannelFindRequester::shared_pointer const & channelFindRequester)
     {
         ChannelFind::shared_pointer nullCF;
-        channelFindRequester->channelFindResult(Status::Ok, nullCF, false); 
+        channelFindRequester->channelFindResult(Status::OK, nullCF, false); 
         return nullCF;  
     }
 
@@ -38,7 +38,7 @@ public:
                 short priority, epics::pvData::String address)
     {
         Channel::shared_pointer nullC;
-        channelRequester->channelCreated(Status::Ok, nullC);
+        channelRequester->channelCreated(Status::OK, nullC);
         return nullC;    
     }