diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
index 81bb0017c5..c842ebe3f3 100644
--- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
+++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
@@ -38,9 +38,9 @@ namespace BizHawk.Client.EmuHawk
 					.Select(d => d.ToString())
 					.ToArray());
 
-				if (Core.MemoryDomains.HasSystemBus)
+				if (Core.MemoryDomains.HasCheatDomain)
 				{
-					DomainDropDown.SelectedItem = Core.MemoryDomains.SystemBus.ToString();
+					DomainDropDown.SelectedItem = Core.MemoryDomains.CheatDomain.ToString();
 				}
 				else
 				{
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
index fb3bd42103..66cf47fb05 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
@@ -105,7 +105,7 @@ namespace BizHawk.Client.EmuHawk.tools.Debugger
 			var b = new AddBreakpointDialog
 			{
 				// TODO: don't use Global.Emulator! Pass in an IMemoryDomains implementation from the parent tool
-				MaxAddressSize = Global.Emulator.AsMemoryDomains().MemoryDomains.SystemBus.Size - 1
+				MaxAddressSize = Global.Emulator.AsMemoryDomains().MemoryDomains.CheatDomain.Size - 1
 			};
 
 			if (b.ShowDialog() == DialogResult.OK)
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
index 91858334d1..bbd725b946 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
@@ -29,7 +29,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			get
 			{
-				return MemoryDomains.SystemBus.Size;
+				return MemoryDomains.CheatDomain.Size;
 			}
 		}
 
@@ -56,7 +56,7 @@ namespace BizHawk.Client.EmuHawk
 			for (int i = 0; i < line_count; ++i)
 			{
 				int advance;
-				string line = Disassembler.Disassemble(MemoryDomains.SystemBus, (ushort)a, out advance);
+				string line = Disassembler.Disassemble(MemoryDomains.CheatDomain, (ushort)a, out advance);
 				DisassemblyLines.Add(new DisasmOp(a, advance, line));
 				a += (uint)advance;
 				if (a > BusMaxValue)
@@ -100,7 +100,7 @@ namespace BizHawk.Client.EmuHawk
 			while (true)
 			{
 				int bytestoadvance;
-				Disassembler.Disassemble(MemoryDomains.SystemBus, newaddress, out bytestoadvance);
+				Disassembler.Disassemble(MemoryDomains.CheatDomain, newaddress, out bytestoadvance);
 				if (newaddress + bytestoadvance == currentDisassemblerAddress)
 				{
 					break;
diff --git a/BizHawk.Emulation.Common/MemoryDomain.cs b/BizHawk.Emulation.Common/MemoryDomain.cs
index 387933306a..228e515c2d 100644
--- a/BizHawk.Emulation.Common/MemoryDomain.cs
+++ b/BizHawk.Emulation.Common/MemoryDomain.cs
@@ -215,7 +215,7 @@ namespace BizHawk.Emulation.Common
 			}
 		}
 
-		public bool HasSystemBus
+		public bool HasCheatDomain
 		{
 			get
 			{
@@ -223,7 +223,7 @@ namespace BizHawk.Emulation.Common
 			}
 		}
 
-		public MemoryDomain SystemBus
+		public MemoryDomain CheatDomain
 		{
 			get
 			{