diff --git a/.doomrc b/.doomrc
index ae1abdc9f..12180d703 100644
--- a/.doomrc
+++ b/.doomrc
@@ -41,8 +41,8 @@
              #'doom-glob (if (string-prefix-p ":" scope)
                              (format "%s" (substring scope 1))
                            (format "*/%s" scope)))
-            (list (doom-dir (dir!) "../modules/")
-                  (doom-dir doom-user-dir "modules/"))))
+            (list (doom-path (dir!) "../modules/")
+                  (doom-path doom-user-dir "modules/"))))
 
 (defun ci-check-docs-scope (scope _)
   "Allow any filename in docs/* as a scope for docs commits."
diff --git a/lisp/cli/doctor.el b/lisp/cli/doctor.el
index 9c5a99c12..4ff1f3443 100644
--- a/lisp/cli/doctor.el
+++ b/lisp/cli/doctor.el
@@ -119,7 +119,7 @@ in."
   (let* ((xdg-dir (concat (or (getenv "XDG_CONFIG_HOME")
                               "~/.config")
                           "/doom/"))
-         (doom-dir (or (getenv "DOOMDIR")
+         (doom-path (or (getenv "DOOMDIR")
                        "~/.doom.d/"))
          (dir (if (file-directory-p xdg-dir)
                   xdg-dir
diff --git a/lisp/lib/files.el b/lisp/lib/files.el
index 6e055e41d..378a4c7e5 100644
--- a/lisp/lib/files.el
+++ b/lisp/lib/files.el
@@ -72,12 +72,7 @@ If the glob ends in a slash, only returns matching directories."
       (file-expand-wildcards path full?))))
 
 ;;;###autoload
-(defun doom-dir (&rest segments)
-  "Constructs a path from SEGMENTS.
-See `doom-path'.
-Ignores `nil' elements in SEGMENTS."
-  (when-let (path (doom-path segments))
-    (directory-file-name path)))
+(define-obsolete-function-alias 'doom-dir 'doom-path "3.0.0")
 
 ;;;###autoload
 (cl-defun doom-files-in