diff --git a/modules/feature/debug/autoload/debug.el b/modules/feature/debugger/autoload/debug.el
similarity index 59%
rename from modules/feature/debug/autoload/debug.el
rename to modules/feature/debugger/autoload/debug.el
index 4fa5c59be..4fafa49c5 100644
--- a/modules/feature/debug/autoload/debug.el
+++ b/modules/feature/debugger/autoload/debug.el
@@ -1,7 +1,7 @@
-;;; feature/debug/autoload/debug.el -*- lexical-binding: t; -*-
+;;; feature/debugger/autoload/debug.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
-(defun +debug/quit ()
+(defun +debugger/quit ()
   (interactive)
   (ignore-errors (call-interactively 'realgud:cmd-quit))
   (doom/popup-close)
diff --git a/modules/feature/debug/autoload/evil.el b/modules/feature/debugger/autoload/evil.el
similarity index 71%
rename from modules/feature/debug/autoload/evil.el
rename to modules/feature/debugger/autoload/evil.el
index 847fa739a..7dac43c51 100644
--- a/modules/feature/debug/autoload/evil.el
+++ b/modules/feature/debugger/autoload/evil.el
@@ -1,7 +1,7 @@
-;;; feature/debug/autoload/evil.el -*- lexical-binding: t; -*-
+;;; feature/debugger/autoload/evil.el -*- lexical-binding: t; -*-
 
-;;;###autoload (autoload '+debug:run "feature/debug/autoload/evil" nil t)
-(evil-define-command +debug:run (&optional path)
+;;;###autoload (autoload '+debugger:run "feature/debugger/autoload/evil" nil t)
+(evil-define-command +debugger:run (&optional path)
   "Initiate debugger for current major mode"
   (interactive "<f>")
   (let ((default-directory (doom-project-root)))
@@ -25,7 +25,7 @@
            (haskell-debug))
           (t (user-error "No debugger for %s" major-mode)))))
 
-;;;###autoload (autoload '+debug:toggle-breakpoint "feature/debug/autoload/evil" nil t)
-(evil-define-command +debug:toggle-breakpoint (&optional bang)
+;;;###autoload (autoload '+debugger:toggle-breakpoint "feature/debugger/autoload/evil" nil t)
+(evil-define-command +debugger:toggle-breakpoint (&optional bang)
   (interactive "<!>")
-  (call-interactively (if bang 'realgud:cmd-clear 'realgud:cmd-break)))
+  (call-interactively (if bang #'realgud:cmd-clear #'realgud:cmd-break)))
diff --git a/modules/feature/debug/config.el b/modules/feature/debugger/config.el
similarity index 92%
rename from modules/feature/debug/config.el
rename to modules/feature/debugger/config.el
index 66b89194d..384975d2f 100644
--- a/modules/feature/debug/config.el
+++ b/modules/feature/debugger/config.el
@@ -1,4 +1,4 @@
-;;; feature/debug/config.el -*- lexical-binding: t; -*-
+;;; feature/debugger/config.el -*- lexical-binding: t; -*-
 
 (def-package! realgud
   :commands (realgud:gdb realgud:trepanjs realgud:bashdb realgud:zshdb)
@@ -19,7 +19,7 @@
   ;; Monkey-patch `realgud:run-process' to run in a popup.
   ;; TODO Find a more elegant solution
   ;; FIXME Causes realgud:cmd-* to focus popup on every invocation
-  (defun +debug*realgud-run-process
+  (defun +debugger*realgud-run-process
       (debugger-name script-filename cmd-args minibuffer-history-var &optional no-reset)
     (let* ((cmd-buf (apply #'realgud-exec-shell debugger-name script-filename
                            (car cmd-args) no-reset (cdr cmd-args)))
@@ -42,5 +42,5 @@
              (if cmd-buf (switch-to-buffer cmd-buf))
              (message "Error running command: %s" (mapconcat #'identity cmd-args " "))))
       cmd-buf))
-  (advice-add #'realgud:run-process :override #'+debug*realgud-run-process))
+  (advice-add #'realgud:run-process :override #'+debugger*realgud-run-process))
 
diff --git a/modules/feature/debug/packages.el b/modules/feature/debugger/packages.el
similarity index 60%
rename from modules/feature/debug/packages.el
rename to modules/feature/debugger/packages.el
index b5da02cc9..e16548605 100644
--- a/modules/feature/debug/packages.el
+++ b/modules/feature/debugger/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
-;;; feature/debug/packages.el
+;;; feature/debugger/packages.el
 
 (package! realgud)