diff --git a/Makeconf b/Makeconf
index 695f9ca..8f19b57 100644
--- a/Makeconf
+++ b/Makeconf
@@ -1,4 +1,4 @@
-modules := memory/mem_device \
+modules := memory/device \
            memory/bus \
            memory/ram \
            memory/bootrom_overlay \
diff --git a/cpu/cpu.h b/cpu/cpu.h
index a44017d..61603c9 100644
--- a/cpu/cpu.h
+++ b/cpu/cpu.h
@@ -2,7 +2,7 @@
 
 #include <misc/types.h>
 
-#include <memory/mem_device.h>
+#include <memory/device.h>
 
 typedef u8 opcode_t;
 
diff --git a/memory/bootrom_overlay.h b/memory/bootrom_overlay.h
index f1e5460..0dae3a5 100644
--- a/memory/bootrom_overlay.h
+++ b/memory/bootrom_overlay.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <memory/mem_device.h>
+#include <memory/device.h>
 
 class BootRom : public Mem_device
 {
diff --git a/memory/bus.h b/memory/bus.h
index b7709a3..eb14c7c 100644
--- a/memory/bus.h
+++ b/memory/bus.h
@@ -3,7 +3,7 @@
 #include <vector>
 #include <optional>
 
-#include <memory/mem_device.h>
+#include <memory/device.h>
 
 class Bus : public Mem_device {
 private:
diff --git a/memory/mem_device.cpp b/memory/device.cpp
similarity index 89%
rename from memory/mem_device.cpp
rename to memory/device.cpp
index 10201db..468cf87 100644
--- a/memory/mem_device.cpp
+++ b/memory/device.cpp
@@ -1,4 +1,4 @@
-#include "memory/mem_device.h"
+#include <memory/device.h>
 
 void Mem_device::write16(u16 addr, u16 data)
 {
diff --git a/memory/mem_device.h b/memory/device.h
similarity index 100%
rename from memory/mem_device.h
rename to memory/device.h
diff --git a/memory/ram.h b/memory/ram.h
index d709fe9..a28e673 100644
--- a/memory/ram.h
+++ b/memory/ram.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <memory/mem_device.h>
+#include <memory/device.h>
 
 class RAM : public Mem_device {
 private:
diff --git a/memory/register.h b/memory/register.h
index 92aef64..6bbd1cb 100644
--- a/memory/register.h
+++ b/memory/register.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <misc/types.h>
-#include <memory/mem_device.h>
+#include <memory/device.h>
 
 class BoundRegister : public Mem_device {
 private: