diff --git a/src/ca/caChannel.cpp b/src/ca/caChannel.cpp
index 06ae75d..3078795 100644
--- a/src/ca/caChannel.cpp
+++ b/src/ca/caChannel.cpp
@@ -436,7 +436,7 @@ void CAChannel::printInfo(std::ostream& out)
 }
 
 
-/* --------------- epics::pvData::Destroyable --------------- */
+/* --------------- Destroyable --------------- */
 
 
 void CAChannel::destroy()
@@ -1012,7 +1012,7 @@ void CAChannelGet::lastRequest()
     lastRequestFlag = true;
 }
 
-/* --------------- epics::pvData::Destroyable --------------- */
+/* --------------- Destroyable --------------- */
 
 
 void CAChannelGet::destroy()
@@ -1343,7 +1343,7 @@ void CAChannelPut::lastRequest()
     lastRequestFlag = true;
 }
 
-/* --------------- epics::pvData::Destroyable --------------- */
+/* --------------- Destroyable --------------- */
 
 
 void CAChannelPut::destroy()
@@ -1521,7 +1521,7 @@ void CAChannelMonitor::cancel()
     // noop
 }
 
-/* --------------- epics::pvData::Destroyable --------------- */
+/* --------------- Destroyable --------------- */
 
 
 void CAChannelMonitor::destroy()
diff --git a/src/ca/pv/caChannel.h b/src/ca/pv/caChannel.h
index 900dcd1..59f8632 100644
--- a/src/ca/pv/caChannel.h
+++ b/src/ca/pv/caChannel.h
@@ -66,7 +66,7 @@ public:
 
     virtual void printInfo(std::ostream& out);
 
-    /* --------------- epics::pvData::Destroyable --------------- */
+    /* --------------- Destroyable --------------- */
 
     virtual void destroy();
 
@@ -132,7 +132,7 @@ public:
     virtual void cancel();
     virtual void lastRequest();
 
-    /* --------------- epics::pvData::Destroyable --------------- */
+    /* --------------- Destroyable --------------- */
 
     virtual void destroy();
 
@@ -187,7 +187,7 @@ public:
     virtual void cancel();
     virtual void lastRequest();
 
-    /* --------------- epics::pvData::Destroyable --------------- */
+    /* --------------- Destroyable --------------- */
 
     virtual void destroy();
 
@@ -237,7 +237,7 @@ public:
 
     virtual void cancel();
 
-    /* --------------- epics::pvData::Destroyable --------------- */
+    /* --------------- Destroyable --------------- */
 
     virtual void destroy();
 
diff --git a/src/client/pv/monitor.h b/src/client/pv/monitor.h
index 9474c42..5fb70a6 100644
--- a/src/client/pv/monitor.h
+++ b/src/client/pv/monitor.h
@@ -86,7 +86,7 @@ public:
  *
  * Downstream interface to access a monitor queue (via poll() and release() )
  */
-class epicsShareClass Monitor : public virtual epics::pvData::Destroyable{
+class epicsShareClass Monitor : public virtual Destroyable{
     public:
     POINTER_DEFINITIONS(Monitor);
     typedef MonitorRequester requester_type;
diff --git a/src/client/pv/pvAccess.h b/src/client/pv/pvAccess.h
index 734f341..54d10e4 100644
--- a/src/client/pv/pvAccess.h
+++ b/src/client/pv/pvAccess.h
@@ -172,7 +172,7 @@ struct epicsShareClass ChannelBaseRequester : virtual public epics::pvData::Requ
 /**
  * Base interface for all channel requests (aka. Operations).
  */
-class epicsShareClass ChannelRequest : public virtual epics::pvData::Destroyable, public Lockable, private epics::pvData::NoDefaultMethods {
+class epicsShareClass ChannelRequest : public virtual Destroyable, public Lockable, private epics::pvData::NoDefaultMethods {
 public:
     POINTER_DEFINITIONS(ChannelRequest);
 
@@ -362,7 +362,7 @@ public:
 /**
  *
  */
-class epicsShareClass ChannelFind : public epics::pvData::Destroyable, private epics::pvData::NoDefaultMethods {
+class epicsShareClass ChannelFind : public Destroyable, private epics::pvData::NoDefaultMethods {
 public:
     POINTER_DEFINITIONS(ChannelFind);
     typedef ChannelFindRequester requester_type;
@@ -815,7 +815,7 @@ class ChannelRequester;
  */
 class epicsShareClass Channel :
     public Requester,
-    public epics::pvData::Destroyable,
+    public Destroyable,
     private epics::pvData::NoDefaultMethods {
 public:
     POINTER_DEFINITIONS(Channel);
@@ -1112,7 +1112,7 @@ enum FlushStrategy {
  *
  * Uniquely configurable (via ChannelProviderFactory::newInstance(Configuration*)
  */
-class epicsShareClass ChannelProvider : public epics::pvData::Destroyable, private epics::pvData::NoDefaultMethods {
+class epicsShareClass ChannelProvider : public Destroyable, private epics::pvData::NoDefaultMethods {
 public:
     POINTER_DEFINITIONS(ChannelProvider);
 
diff --git a/src/server/pv/baseChannelRequester.h b/src/server/pv/baseChannelRequester.h
index 5a15d69..1287b7e 100644
--- a/src/server/pv/baseChannelRequester.h
+++ b/src/server/pv/baseChannelRequester.h
@@ -26,7 +26,7 @@
 namespace epics {
 namespace pvAccess {
 
-class BaseChannelRequester :  virtual public epics::pvData::Requester, public epics::pvData::Destroyable
+class BaseChannelRequester :  virtual public epics::pvData::Requester, public Destroyable
 {
 public:
     BaseChannelRequester(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
diff --git a/src/server/pv/serverChannelImpl.h b/src/server/pv/serverChannelImpl.h
index e83ee14..afe9a19 100644
--- a/src/server/pv/serverChannelImpl.h
+++ b/src/server/pv/serverChannelImpl.h
@@ -73,7 +73,7 @@ public:
      * @param id request ID.
      * @param request request to be registered.
      */
-    void registerRequest(pvAccessID id, epics::pvData::Destroyable::shared_pointer const & request);
+    void registerRequest(pvAccessID id, Destroyable::shared_pointer const & request);
 
     /**
      * Unregister request.
@@ -86,7 +86,7 @@ public:
      * @param id request ID.
      * @return request with given ID, <code>null</code> if there is no request with such ID.
      */
-    epics::pvData::Destroyable::shared_pointer getRequest(pvAccessID id);
+    Destroyable::shared_pointer getRequest(pvAccessID id);
 
     /**
      * Destroy server channel.
@@ -120,7 +120,7 @@ private:
      */
     pvAccessID _sid;
 
-    typedef std::map<pvAccessID, epics::pvData::Destroyable::shared_pointer> _requests_t;
+    typedef std::map<pvAccessID, Destroyable::shared_pointer> _requests_t;
     /**
      * Requests.
      */
diff --git a/src/utils/pv/destroyable.h b/src/utils/pv/destroyable.h
index 7f109c5..274a737 100644
--- a/src/utils/pv/destroyable.h
+++ b/src/utils/pv/destroyable.h
@@ -9,11 +9,13 @@
 #ifndef DESTROYABLE_H
 #define DESTROYABLE_H
 
+#include <compilerDependencies.h>
+
 #include <pv/sharedPtr.h>
 
 #include <shareLib.h>
 
-namespace epics { namespace pvData { 
+namespace epics { namespace pvAccess {
 
 
         /**
@@ -56,4 +58,7 @@ namespace epics { namespace pvData {
         };
 
 }}
+namespace epics { namespace pvData {
+    typedef ::epics::pvAccess::Destroyable Destroyable EPICS_DEPRECATED;
+}}
 #endif  /* DESTROYABLE_H */