diff --git a/core/autoload/help.el b/core/autoload/help.el
index e3dbbcb1c..21b54f9e3 100644
--- a/core/autoload/help.el
+++ b/core/autoload/help.el
@@ -544,7 +544,7 @@ If prefix arg is present, refresh the cache."
 
 ;;;###autoload
 (defun doom/help-package-config (package)
-  "Jump to any `def-package!', `after!' or ;;;###package block for PACKAGE.
+  "Jump to any `use-package!', `after!' or ;;;###package block for PACKAGE.
 
 This only searches `doom-emacs-dir' (typically ~/.emacs.d) and does not include
 config blocks in your private config."
diff --git a/core/core-packages.el b/core/core-packages.el
index 6a684ee43..8c96430ff 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -208,7 +208,7 @@ Accepts the following properties:
    Takes a MELPA-style recipe (see `quelpa-recipe' in `quelpa' for an example);
    for packages to be installed from external sources.
  :disable BOOL
-   Do not install or update this package AND disable all of its `def-package!'
+   Do not install or update this package AND disable all of its `use-package!'
    blocks.
  :ignore FORM
    Do not install this package.
diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el
index 9432513ae..5c413a018 100644
--- a/modules/lang/emacs-lisp/autoload.el
+++ b/modules/lang/emacs-lisp/autoload.el
@@ -135,7 +135,7 @@ if it's callable, `apropos' otherwise."
         `(("Section" "^[ \t]*;;;;*[ \t]+\\([^\n]+\\)" 1)
           ("Evil commands" "^\\s-*(evil-define-\\(?:command\\|operator\\|motion\\) +\\(\\_<[^ ()\n]+\\_>\\)" 1)
           ("Unit tests" "^\\s-*(\\(?:ert-deftest\\|describe\\) +\"\\([^\")]+\\)\"" 1)
-          ("Package" "^\\s-*(\\(?:;;;###package\\|def-package!\\|package!\\|use-package\\|after!\\) +\\(\\_<[^ ()\n]+\\_>\\)" 1)
+          ("Package" "^\\s-*(\\(?:;;;###package\\|package!\\|use-package!?\\|after!\\) +\\(\\_<[^ ()\n]+\\_>\\)" 1)
           ("Major modes" "^\\s-*(define-derived-mode +\\([^ ()\n]+\\)" 1)
           ("Minor modes" "^\\s-*(define-\\(?:global\\(?:ized\\)?-minor\\|generic\\|minor\\)-mode +\\([^ ()\n]+\\)" 1)
           ("Modelines" "^\\s-*(def-modeline! +\\([^ ()\n]+\\)" 1)
diff --git a/modules/ui/popup/+hacks.el b/modules/ui/popup/+hacks.el
index c166a842e..e4af5d7b0 100644
--- a/modules/ui/popup/+hacks.el
+++ b/modules/ui/popup/+hacks.el
@@ -21,7 +21,7 @@
 ;;
 ;; Hacks should be kept in alphabetical order, named after the feature they
 ;; modify, and should follow a ;;;## package-name header line (if not using
-;; `after!' or `def-package!').
+;; `after!' or `use-package!').
 
 ;;
 ;;; Core functions