diff --git a/Makefile b/Makefile
index 76ee132..4368616 100644
--- a/Makefile
+++ b/Makefile
@@ -47,9 +47,9 @@ DOTOS = src/main.o \
 	src/x48.o
 
 ifeq ($(WITH_DEBUGGER), yes)
-	DOTOS += src/x48_debugger.o \
-		 src/x48_debugger_disasm.o \
-		 src/x48_debugger_rpl.o
+	DOTOS += src/debugger.o \
+		 src/debugger_disasm.o \
+		 src/debugger_rpl.o
 	CFLAGS += $(shell pkg-config --cflags readline) -DWITH_DEBUGGER=1
 	LIBS += $(shell pkg-config --libs readline)
 endif
@@ -75,9 +75,11 @@ dist/x48ng: $(DOTOS)
 clean:
 	rm -f src/*.o src/tools/*.o
 
-clean-all: clean
+mrproper: clean
 	rm -f dist/mkcard dist/checkrom dist/dump2rom dist/x48ng
 
+clean-all: mrproper
+
 # Formatting
 pretty-code:
 	clang-format -i src/*.c src/*.h
diff --git a/src/x48_debugger.c b/src/debugger.c
similarity index 99%
rename from src/x48_debugger.c
rename to src/debugger.c
index 2df7b40..736906f 100644
--- a/src/x48_debugger.c
+++ b/src/debugger.c
@@ -12,7 +12,7 @@
 #include "romio.h"
 #include "timer.h"
 #include "x48.h" /* for exit_x48() */
-#include "x48_debugger.h"
+#include "debugger.h"
 #include "x48_resources.h"
 
 #define MAX_ARGS 16
diff --git a/src/x48_debugger.h b/src/debugger.h
similarity index 98%
rename from src/x48_debugger.h
rename to src/debugger.h
index 452d2c2..de4ba1d 100644
--- a/src/x48_debugger.h
+++ b/src/debugger.h
@@ -25,7 +25,7 @@ extern int step_instruction( void );
 extern char* str_nibbles( word_20 addr, int n );
 
 /*************************/
-/* x48_debugger_disasm.h */
+/* debugger_disasm.h */
 /*************************/
 
 /* #ifndef _DISASM_H */
@@ -46,7 +46,7 @@ extern word_20 disassemble( word_20 addr, char* out );
 /* #endif /\* !_DISASM_H *\/ */
 
 /*************************/
-/* x48_debugger_rpl.h */
+/* debugger_rpl.h */
 /*************************/
 
 /* #ifndef _RPL_H */
diff --git a/src/x48_debugger_disasm.c b/src/debugger_disasm.c
similarity index 99%
rename from src/x48_debugger_disasm.c
rename to src/debugger_disasm.c
index 015ca22..1574607 100644
--- a/src/x48_debugger_disasm.c
+++ b/src/debugger_disasm.c
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include "hp48.h"
-#include "x48_debugger.h"
+#include "debugger.h"
 
 #define TAB_SKIP 8
 
diff --git a/src/x48_debugger_rpl.c b/src/debugger_rpl.c
similarity index 99%
rename from src/x48_debugger_rpl.c
rename to src/debugger_rpl.c
index eb421ad..3d61c56 100644
--- a/src/x48_debugger_rpl.c
+++ b/src/debugger_rpl.c
@@ -6,7 +6,7 @@
 #include "hp48.h"
 #include "hp48emu.h"
 #include "romio.h"
-#include "x48_debugger.h"
+#include "debugger.h"
 
 /* #ifndef _HP48CHAR_H */
 /* #define _HP48CHAR_H 1 */
diff --git a/src/hp48_emulate.c b/src/hp48_emulate.c
index 06dbb05..bb9cd6a 100644
--- a/src/hp48_emulate.c
+++ b/src/hp48_emulate.c
@@ -7,7 +7,7 @@
 #include "x48.h"
 
 #if defined( WITH_DEBUGGER )
-#include "x48_debugger.h" /* enter_debugger, TRAP_INSTRUCTION, ILLEGAL_INSTRUCTION */
+#include "debugger.h" /* enter_debugger, TRAP_INSTRUCTION, ILLEGAL_INSTRUCTION */
 #endif
 
 extern int throttle;
diff --git a/src/hp48emu_actions.c b/src/hp48emu_actions.c
index 2bfaf97..837b977 100644
--- a/src/hp48emu_actions.c
+++ b/src/hp48emu_actions.c
@@ -9,7 +9,7 @@
 #include "x48.h"
 
 #if defined( WITH_DEBUGGER )
-#include "x48_debugger.h" /* in_debugger, enter_debugger */
+#include "debugger.h" /* in_debugger, enter_debugger */
 #endif
 
 static int interrupt_called = 0;
diff --git a/src/main.c b/src/main.c
index 6cebb1d..73f90e9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 #include "x48_resources.h"
 
 #if defined( WITH_DEBUGGER )
-#include "x48_debugger.h" /* enter_debugger, USER_INTERRUPT, exec_flags, emulate_debug, debug */
+#include "debugger.h" /* enter_debugger, USER_INTERRUPT, exec_flags, emulate_debug, debug */
 #endif
 
 #if defined( GUI_IS_X11 )
diff --git a/src/timer.c b/src/timer.c
index 53243c0..93927d7 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -6,7 +6,7 @@
 
 #include "romio.h"
 #include "timer.h"
-#include "x48_debugger.h" /* used for in_debugger */
+#include "debugger.h" /* used for in_debugger */
 
 typedef struct x48_timer_t {
     word_1 run;
diff --git a/src/x48_resources.c b/src/x48_resources.c
index c6887bb..e7ec7bb 100644
--- a/src/x48_resources.c
+++ b/src/x48_resources.c
@@ -8,7 +8,7 @@
 #include "x48_resources.h"
 
 #if defined( WITH_DEBUGGER )
-#include "x48_debugger.h" /* `disassembler_mode` & `CLASS_MNEMONICS` */
+#include "debugger.h" /* `disassembler_mode` & `CLASS_MNEMONICS` */
 #else
 #define HP_MNEMONICS 0
 #define CLASS_MNEMONICS 1