diff --git a/dist/tools/renode/renode-debug.sh b/dist/tools/emulator/debug.sh
similarity index 94%
rename from dist/tools/renode/renode-debug.sh
rename to dist/tools/emulator/debug.sh
index 4db5c24253..efd5d90423 100755
--- a/dist/tools/renode/renode-debug.sh
+++ b/dist/tools/emulator/debug.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# This script wraps Renode emulator GDB server and a debugger
+# This script wraps an emulator GDB server (renode or qemu) and a debugger
 # client in a single command and takes 4 arguments: the board to emulate,
 # the application directory of the the current application, the elffile
 # containing the firmware to debug, the debugger port and custom debugger client
@@ -42,7 +42,7 @@ trap "cleanup ${EMULATOR_PIDFILE}" EXIT
 # don't trap on Ctrl+C, because GDB keeps running
 trap '' INT
 
-# start Renode GDB server
+# start emulator GDB server
 sh -c "\
     GDB_PORT=${GDB_PORT} \
     EMULATOR_PIDFILE=${EMULATOR_PIDFILE} \
diff --git a/makefiles/tools/qemu.inc.mk b/makefiles/tools/qemu.inc.mk
index 6ff35c5dad..8160922d8a 100644
--- a/makefiles/tools/qemu.inc.mk
+++ b/makefiles/tools/qemu.inc.mk
@@ -18,4 +18,4 @@ DEBUGSERVER ?= $(EMULATOR)
 DEBUGSERVER_FLAGS ?= $(QEMU_DEBUG_FLAGS)
 
 DEBUGGER_FLAGS ?= $(BOARD) $(APPDIR) $(ELFFILE) $(GDB_PORT)
-DEBUGGER ?= $(RIOTTOOLS)/renode/renode-debug.sh
+DEBUGGER ?= $(RIOTTOOLS)/emulator/debug.sh
diff --git a/makefiles/tools/renode.inc.mk b/makefiles/tools/renode.inc.mk
index 0335fe0372..12ca50dc56 100644
--- a/makefiles/tools/renode.inc.mk
+++ b/makefiles/tools/renode.inc.mk
@@ -28,4 +28,4 @@ DEBUGSERVER ?= $(EMULATOR)
 DEBUGSERVER_FLAGS ?= $(RENODE_DEBUG_FLAGS)
 
 DEBUGGER_FLAGS ?= $(BOARD) $(APPDIR) $(ELFFILE) $(GDB_PORT) "-ex \"monitor start\""
-DEBUGGER ?= $(RIOTTOOLS)/renode/renode-debug.sh
+DEBUGGER ?= $(RIOTTOOLS)/emulator/debug.sh