diff --git a/configs/example/gpufs/Disjoint_VIPER.py b/configs/example/gpufs/Disjoint_VIPER.py
index 0fd258e0fd..b11ea87773 100644
--- a/configs/example/gpufs/Disjoint_VIPER.py
+++ b/configs/example/gpufs/Disjoint_VIPER.py
@@ -119,7 +119,7 @@ class Disjoint_VIPER(RubySystem):
         dma_cntrls = []
         for i, dma_device in enumerate(dma_devices):
             dma_seq = DMASequencer(version=i, ruby_system=self)
-            dma_cntrl = DMA_Controller(
+            dma_cntrl = GPU_VIPER_DMA_Controller(
                 version=i, dma_sequencer=dma_seq, ruby_system=self
             )
 
diff --git a/configs/ruby/GPU_VIPER.py b/configs/ruby/GPU_VIPER.py
index 15108bb674..a459cb54d4 100644
--- a/configs/ruby/GPU_VIPER.py
+++ b/configs/ruby/GPU_VIPER.py
@@ -101,7 +101,7 @@ class L2Cache(RubyCache):
         self.replacement_policy = TreePLRURP()
 
 
-class CPCntrl(CorePair_Controller, CntrlBase):
+class CPCntrl(GPU_VIPER_CorePair_Controller, CntrlBase):
     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
 
@@ -153,7 +153,7 @@ class TCPCache(RubyCache):
             self.replacement_policy = ObjectList.rp_list.get(options.tcp_rp)()
 
 
-class TCPCntrl(TCP_Controller, CntrlBase):
+class TCPCntrl(GPU_VIPER_TCP_Controller, CntrlBase):
     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
 
@@ -246,7 +246,7 @@ class SQCCache(RubyCache):
             self.replacement_policy = ObjectList.rp_list.get(options.sqc_rp)()
 
 
-class SQCCntrl(SQC_Controller, CntrlBase):
+class SQCCntrl(GPU_VIPER_SQC_Controller, CntrlBase):
     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
 
@@ -309,7 +309,7 @@ class TCC(RubyCache):
             self.replacement_policy = ObjectList.rp_list.get(options.tcc_rp)()
 
 
-class TCCCntrl(TCC_Controller, CntrlBase):
+class TCCCntrl(GPU_VIPER_TCC_Controller, CntrlBase):
     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
         self.L2cache = TCC(
@@ -348,8 +348,7 @@ class L3Cache(RubyCache):
         self.replacement_policy = TreePLRURP()
 
 
-# unused in GPU_VIPER; see git blame for discussion
-class L3Cntrl(L3Cache_Controller, CntrlBase):
+class L3Cntrl(GPU_VIPER_L3Cache_Controller, CntrlBase):
     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
         self.L3cache = L3Cache()
@@ -380,7 +379,7 @@ class L3Cntrl(L3Cache_Controller, CntrlBase):
         self.respToL3 = resp_to_l3
 
 
-class DirCntrl(Directory_Controller, CntrlBase):
+class DirCntrl(GPU_VIPER_Directory_Controller, CntrlBase):
     def create(self, options, dir_ranges, ruby_system, system):
         self.version = self.versionCount()
 
@@ -1096,7 +1095,7 @@ def create_system(
 
     for i, dma_device in enumerate(dma_devices):
         dma_seq = DMASequencer(version=i, ruby_system=ruby_system)
-        dma_cntrl = DMA_Controller(
+        dma_cntrl = GPU_VIPER_DMA_Controller(
             version=i, dma_sequencer=dma_seq, ruby_system=ruby_system
         )
         exec("system.dma_cntrl%d = dma_cntrl" % i)
diff --git a/configs/ruby/MOESI_AMD_Base.py b/configs/ruby/MOESI_AMD_Base.py
index 1095defc57..8851e2b4ed 100644
--- a/configs/ruby/MOESI_AMD_Base.py
+++ b/configs/ruby/MOESI_AMD_Base.py
@@ -99,7 +99,7 @@ class L2Cache(RubyCache):
         self.replacement_policy = TreePLRURP()
 
 
-class CPCntrl(CorePair_Controller, CntrlBase):
+class CPCntrl(MOESI_AMD_Base_CorePair_Controller, CntrlBase):
     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
 
@@ -156,7 +156,7 @@ class L3Cache(RubyCache):
         self.replacement_policy = TreePLRURP()
 
 
-class L3Cntrl(L3Cache_Controller, CntrlBase):
+class L3Cntrl(MOESI_AMD_Base_L3Cache_Controller, CntrlBase):
     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
         self.L3cache = L3Cache()
@@ -187,7 +187,7 @@ class L3Cntrl(L3Cache_Controller, CntrlBase):
         self.respToL3 = resp_to_l3
 
 
-class DirCntrl(Directory_Controller, CntrlBase):
+class DirCntrl(MOESI_AMD_Base_Directory_Controller, CntrlBase):
     def create(self, options, dir_ranges, ruby_system, system):
         self.version = self.versionCount()