 (defmacro @doom (&rest modules)
   "DOOM Emacs bootstrap macro. List the modules to load. Benefits from
 byte-compilation."
-  (doom--enable-modules modules)
+  (doom-initialize-modules modules)
   (unless noninteractive
     `(let (file-name-handler-alist)
        (setq doom-modules ',doom-modules)
 
-       ,@(mapcar (lambda (pkg)
-                   `(@require ,(car pkg) ,(cdr pkg) t))
+       ,@(mapcar (lambda (module) `(@require ,(car module) ,(cdr module) t))
                  (doom--module-pairs))
 
        (when (display-graphic-p)

            (--map (doom-module-path (car it) (cdr it) "packages.el")
                   (doom--module-pairs))))))

(defun doom-module-path (module submodule &optional file)
  "Get the full path to a module: e.g. :lang emacs-lisp maps to
~/.emacs.d/modules/lang/emacs-lisp/ and will append FILE if non-nil."

`doom-initialize' sets this.")

(defvar doom-modules nil
  "A hash table of enabled modules.")

(defvar doom-packages nil
  "A list of enabled packages. Each element is a sublist, whose CAR is the
