diff --git a/Core/gb.h b/Core/gb.h
index 39f4162..c45a22d 100644
--- a/Core/gb.h
+++ b/Core/gb.h
@@ -17,7 +17,7 @@
 #include "printer.h"
 #include "timing.h"
 #include "rewind.h"
-#include "z80_cpu.h"
+#include "sm83_cpu.h"
 #include "symbol_hash.h"
 #include "sgb.h"
 
diff --git a/Core/z80_cpu.c b/Core/sm83_cpu.c
similarity index 100%
rename from Core/z80_cpu.c
rename to Core/sm83_cpu.c
diff --git a/Core/z80_cpu.h b/Core/sm83_cpu.h
similarity index 74%
rename from Core/z80_cpu.h
rename to Core/sm83_cpu.h
index 3541fa8..49fa80b 100644
--- a/Core/z80_cpu.h
+++ b/Core/sm83_cpu.h
@@ -1,5 +1,5 @@
-#ifndef z80_cpu_h
-#define z80_cpu_h
+#ifndef sm83_cpu_h
+#define sm83_cpu_h
 #include "gb_struct_def.h"
 #include <stdint.h>
 
@@ -8,4 +8,4 @@ void GB_cpu_disassemble(GB_gameboy_t *gb, uint16_t pc, uint16_t count);
 void GB_cpu_run(GB_gameboy_t *gb);
 #endif
 
-#endif /* z80_cpu_h */
+#endif /* sm83_cpu_h */
diff --git a/Core/z80_disassembler.c b/Core/sm83_disassembler.c
similarity index 100%
rename from Core/z80_disassembler.c
rename to Core/sm83_disassembler.c
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 889e972..dfedccf 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -8,7 +8,7 @@ SOURCES_C   := $(CORE_DIR)/Core/gb.c \
                $(CORE_DIR)/Core/display.c \
                $(CORE_DIR)/Core/symbol_hash.c \
                $(CORE_DIR)/Core/camera.c \
-               $(CORE_DIR)/Core/z80_cpu.c \
+               $(CORE_DIR)/Core/sm83_cpu.c \
                $(CORE_DIR)/Core/joypad.c \
                $(CORE_DIR)/Core/save_state.c \
                $(CORE_DIR)/libretro/agb_boot.c \