diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc
index 97d7b8843f..749e74337a 100644
--- a/src/arch/x86/faults.cc
+++ b/src/arch/x86/faults.cc
@@ -64,7 +64,7 @@ X86FaultBase::invoke(ThreadContext *tc, const StaticInstPtr &inst)
     PCState pcState = tc->pcState();
     Addr pc = pcState.pc();
     DPRINTF(Faults, "RIP %#x: vector %d: %s\n", pc, vector, describe());
-    using namespace X86ISAInst::RomLabels;
+    using namespace X86ISAInst::rom_labels;
     HandyM5Reg m5reg = tc->readMiscRegNoEffect(MISCREG_M5_REG);
     MicroPC entry;
     if (m5reg.mode == LongMode) {
@@ -292,7 +292,7 @@ InitInterrupt::invoke(ThreadContext *tc, const StaticInstPtr &inst)
 
     // Update the handy M5 Reg.
     tc->setMiscReg(MISCREG_M5_REG, 0);
-    MicroPC entry = X86ISAInst::RomLabels::extern_label_initIntHalt;
+    MicroPC entry = X86ISAInst::rom_labels::extern_label_initIntHalt;
     pc.upc(romMicroPC(entry));
     pc.nupc(romMicroPC(entry) + 1);
     tc->pcState(pc);
diff --git a/src/arch/x86/isa/microasm.isa b/src/arch/x86/isa/microasm.isa
index bac4902ce7..ff110f1b05 100644
--- a/src/arch/x86/isa/microasm.isa
+++ b/src/arch/x86/isa/microasm.isa
@@ -216,12 +216,12 @@ let {{
     assembler.symbols["label"] = labeler
 
     def rom_labeler(labelStr):
-        return "romMicroPC(RomLabels::extern_label_%s)" % labelStr
+        return "romMicroPC(rom_labels::extern_label_%s)" % labelStr
 
     assembler.symbols["rom_label"] = rom_labeler
 
     def rom_local_labeler(labelStr):
-        return "romMicroPC(RomLabels::label_%s)" % labelStr
+        return "romMicroPC(rom_labels::label_%s)" % labelStr
 
     assembler.symbols["rom_local_label"] = rom_local_labeler
 
diff --git a/src/arch/x86/isa/microops/base.isa b/src/arch/x86/isa/microops/base.isa
index b9e499c29e..2dea9a3bd9 100644
--- a/src/arch/x86/isa/microops/base.isa
+++ b/src/arch/x86/isa/microops/base.isa
@@ -215,7 +215,7 @@ let {{
                     macroop ? macroop->getExtMachInst() : dummyExtMachInst;
                 GEM5_VAR_USED const EmulEnv &env =
                     macroop ? macroop->getEmulEnv() : dummyEmulEnv;
-                using namespace RomLabels;
+                using namespace rom_labels;
                 return %s;
             }
         '''
diff --git a/src/arch/x86/isa/rom.isa b/src/arch/x86/isa/rom.isa
index 1f41ad1c7c..f0153efb1a 100644
--- a/src/arch/x86/isa/rom.isa
+++ b/src/arch/x86/isa/rom.isa
@@ -31,7 +31,7 @@ def template MicroRomConstructor {{
 
     X86ISA::MicrocodeRom::MicrocodeRom()
     {
-        using namespace RomLabels;
+        using namespace rom_labels;
         genFuncs = new GenFunc[numMicroops];
         %(alloc_generators)s;
     }
@@ -52,7 +52,9 @@ let {{
 
 
         def getDeclaration(self):
-            declareLabels = "namespace RomLabels {\n"
+            declareLabels = \
+                "GEM5_DEPRECATED_NAMESPACE(RomLabels, rom_labels);\n"
+            declareLabels += "namespace rom_labels\n{\n"
             for (label, microop) in self.labels.items():
                 declareLabels += "const static uint64_t label_%s = %d;\n" \
                                   % (label, microop.micropc)