diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index 7a999ed61..b3c4ccb61 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -10,9 +10,10 @@
  *  Author: Jeff Hill
  */
 
+#include "epicsMemory.h"
+
 #include "osiProcess.h"
 #include "osiSigPipeIgnore.h"
-#include "epics_auto_ptr.h"
 
 #include "iocinf.h"
 #include "cac_IL.h"
diff --git a/src/libCom/Makefile b/src/libCom/Makefile
index 0cdb34fe6..77188a123 100644
--- a/src/libCom/Makefile
+++ b/src/libCom/Makefile
@@ -41,7 +41,7 @@ INC += epicsAlgorithm.h
 INC += epicsExcept.h
 INC += epicsList.h
 INC += epicsListBase.h
-INC += epics_auto_ptr.h
+INC += epicsMemory.h
 SRCS += epicsListBase.cpp
 
 # From cxxTemplates
diff --git a/src/libCom/cppStd/epics_auto_ptr.h b/src/libCom/cppStd/epicsMemory.h
similarity index 93%
rename from src/libCom/cppStd/epics_auto_ptr.h
rename to src/libCom/cppStd/epicsMemory.h
index 1a7099aa8..606ef2547 100644
--- a/src/libCom/cppStd/epics_auto_ptr.h
+++ b/src/libCom/cppStd/epicsMemory.h
@@ -1,9 +1,9 @@
-//  epics_auto_ptr.h
+//  epicsMemoryH.h
 //	Author:	Jeff Hill
 //	Date:	March 2001
 
-#ifndef epics_auto_ptrh
-#define epics_auto_ptrh
+#ifndef epicsMemoryH
+#define epicsMemoryH
 
 template < class T >
 class epics_auto_ptr {
@@ -71,4 +71,4 @@ inline T * epics_auto_ptr<T>::release ()
     return pTmp; 
 }
 
-#endif // ifndef epics_auto_ptrh
+#endif // ifndef epicsMemoryH