diff --git a/Machines/MSX/Cartridges/ASCII16kb.hpp b/Machines/MSX/Cartridges/ASCII16kb.hpp
index 500782ba8..5cbe2822a 100644
--- a/Machines/MSX/Cartridges/ASCII16kb.hpp
+++ b/Machines/MSX/Cartridges/ASCII16kb.hpp
@@ -14,7 +14,7 @@
 namespace MSX {
 namespace Cartridge {
 
-class ASCII16kbROMSlotHandler: public ROMSlotHandler {
+class ASCII16kbROMSlotHandler: public MemorySlotHandler {
 	public:
 		ASCII16kbROMSlotHandler(MSX::MemorySlot &slot) : slot_(slot) {}
 
diff --git a/Machines/MSX/Cartridges/ASCII8kb.hpp b/Machines/MSX/Cartridges/ASCII8kb.hpp
index 9ae4a72f0..e1aac0b17 100644
--- a/Machines/MSX/Cartridges/ASCII8kb.hpp
+++ b/Machines/MSX/Cartridges/ASCII8kb.hpp
@@ -14,7 +14,7 @@
 namespace MSX {
 namespace Cartridge {
 
-class ASCII8kbROMSlotHandler: public ROMSlotHandler {
+class ASCII8kbROMSlotHandler: public MemorySlotHandler {
 	public:
 		ASCII8kbROMSlotHandler(MSX::MemorySlot &slot) : slot_(slot) {}
 
diff --git a/Machines/MSX/Cartridges/Konami.hpp b/Machines/MSX/Cartridges/Konami.hpp
index 16e28394d..7422ad1da 100644
--- a/Machines/MSX/Cartridges/Konami.hpp
+++ b/Machines/MSX/Cartridges/Konami.hpp
@@ -14,7 +14,7 @@
 namespace MSX {
 namespace Cartridge {
 
-class KonamiROMSlotHandler: public ROMSlotHandler {
+class KonamiROMSlotHandler: public MemorySlotHandler {
 	public:
 		KonamiROMSlotHandler(MSX::MemorySlot &slot) : slot_(slot) {}
 
diff --git a/Machines/MSX/Cartridges/KonamiWithSCC.hpp b/Machines/MSX/Cartridges/KonamiWithSCC.hpp
index 9d7acc97d..15da86b6f 100644
--- a/Machines/MSX/Cartridges/KonamiWithSCC.hpp
+++ b/Machines/MSX/Cartridges/KonamiWithSCC.hpp
@@ -15,7 +15,7 @@
 namespace MSX {
 namespace Cartridge {
 
-class KonamiWithSCCROMSlotHandler: public ROMSlotHandler {
+class KonamiWithSCCROMSlotHandler: public MemorySlotHandler {
 	public:
 		KonamiWithSCCROMSlotHandler(MSX::MemorySlot &slot, Konami::SCC &scc) :
 			slot_(slot), scc_(scc) {}
diff --git a/Machines/MSX/DiskROM.hpp b/Machines/MSX/DiskROM.hpp
index 24cba9d91..931668eb4 100644
--- a/Machines/MSX/DiskROM.hpp
+++ b/Machines/MSX/DiskROM.hpp
@@ -21,7 +21,7 @@
 
 namespace MSX {
 
-class DiskROM: public ROMSlotHandler, public WD::WD1770 {
+class DiskROM: public MemorySlotHandler, public WD::WD1770 {
 	public:
 		DiskROM(const MSX::MemorySlot &slot);
 
diff --git a/Machines/MSX/MSX.cpp b/Machines/MSX/MSX.cpp
index cdc575252..a9a49d2fd 100644
--- a/Machines/MSX/MSX.cpp
+++ b/Machines/MSX/MSX.cpp
@@ -790,7 +790,7 @@ class ConcreteMachine:
 		/// via the primary slot register.
 		struct MemorySlot: public MSX::MemorySlot {
 			HalfCycles cycles_since_update;
-			std::unique_ptr<ROMSlotHandler> handler;
+			std::unique_ptr<MemorySlotHandler> handler;
 		};
 		MemorySlot memory_slots_[4];
 		MemorySlot *final_slot_ = nullptr;
diff --git a/Machines/MSX/MemorySlotHandler.hpp b/Machines/MSX/MemorySlotHandler.hpp
index 3f0e54000..e87fa1c16 100644
--- a/Machines/MSX/MemorySlotHandler.hpp
+++ b/Machines/MSX/MemorySlotHandler.hpp
@@ -70,7 +70,7 @@ class MemorySlot {
 			std::size_t length);
 
 		/// Marks the region indicated by @c destination_address and @c length
-		/// as unmapped. In practical terms that means that a @c ROMSlotHandler
+		/// as unmapped. In practical terms that means that a @c MemorySlotHandler
 		/// will be used to field accesses to that area, allowing for areas that are not
 		/// backed by memory to be modelled.
 		void unmap(
@@ -89,9 +89,9 @@ class MemorySlot {
 		inline static MemoryChunk scratch;
 };
 
-class ROMSlotHandler {
+class MemorySlotHandler {
 	public:
-		virtual ~ROMSlotHandler() {}
+		virtual ~MemorySlotHandler() {}
 
 		/*! Advances time by @c half_cycles. */
 		virtual void run_for([[maybe_unused]] HalfCycles half_cycles) {}