diff --git a/src/dev/pci/copy_engine.cc b/src/dev/pci/copy_engine.cc
index 82a290979a..74a4dab2c2 100644
--- a/src/dev/pci/copy_engine.cc
+++ b/src/dev/pci/copy_engine.cc
@@ -56,7 +56,7 @@
 #include "sim/stats.hh"
 #include "sim/system.hh"
 
-using namespace CopyEngineReg;
+using namespace copy_engine_reg;
 
 CopyEngine::CopyEngine(const Params &p)
     : PciDevice(p),
diff --git a/src/dev/pci/copy_engine.hh b/src/dev/pci/copy_engine.hh
index 4a5aca6dff..59f6e3926e 100644
--- a/src/dev/pci/copy_engine.hh
+++ b/src/dev/pci/copy_engine.hh
@@ -62,9 +62,9 @@ class CopyEngine : public PciDevice
       private:
         DmaPort cePort;
         CopyEngine *ce;
-        CopyEngineReg::ChanRegs  cr;
+        copy_engine_reg::ChanRegs  cr;
         int channelId;
-        CopyEngineReg::DmaDesc *curDmaDesc;
+        copy_engine_reg::DmaDesc *curDmaDesc;
         uint8_t *copyBuffer;
 
         bool busy;
@@ -149,7 +149,7 @@ class CopyEngine : public PciDevice
     } copyEngineStats;
 
     // device registers
-    CopyEngineReg::Regs regs;
+    copy_engine_reg::Regs regs;
 
     // Array of channels each one with regs/dma port/etc
     std::vector<CopyEngineChannel*> chan;
diff --git a/src/dev/pci/copy_engine_defs.hh b/src/dev/pci/copy_engine_defs.hh
index 6ac8b48433..6fdcd6d28e 100644
--- a/src/dev/pci/copy_engine_defs.hh
+++ b/src/dev/pci/copy_engine_defs.hh
@@ -30,10 +30,12 @@
  * Register and structure descriptions for Intel's I/O AT DMA Engine
  */
 #include "base/bitfield.hh"
+#include "base/compiler.hh"
 #include "sim/serialize.hh"
 
-namespace CopyEngineReg {
-
+GEM5_DEPRECATED_NAMESPACE(CopyEngineReg, copy_engine_reg);
+namespace copy_engine_reg
+{
 
 // General Channel independant registers, 128 bytes starting at 0x00
 const uint32_t GEN_CHANCOUNT    = 0x00;
@@ -232,6 +234,6 @@ struct ChanRegs : public Serializable
 
 };
 
-} // namespace CopyEngineReg
+} // namespace copy_engine_reg