diff --git a/core/core-modules.el b/core/core-modules.el
index 032c867d0..904c9ef63 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -26,7 +26,8 @@
               (lookup (:tools lookup))
               (debugger (:tools debugger)))
     (:tools (rotate-text (:editor rotate-text))
-            (vterm (:term vterm)))
+            (vterm (:term vterm))
+            (password-store (:tools pass)))
     (:emacs (electric-indent (:emacs electric))
             (hideshow (:editor fold))
             (eshell (:term eshell))
diff --git a/init.example.el b/init.example.el
index b1fd52c23..d198184a9 100644
--- a/init.example.el
+++ b/init.example.el
@@ -83,7 +83,7 @@
        ;;macos             ; MacOS-specific commands
        magit             ; a git porcelain for Emacs
        ;;make              ; run make tasks from Emacs
-       ;;password-store    ; password manager for nerds
+       ;;pass              ; password manager for nerds
        ;;pdf               ; pdf enhancements
        ;;prodigy           ; FIXME managing external services & code builders
        ;;rgb               ; creating color strings
diff --git a/init.test.el b/init.test.el
index 85e39d13d..b59d71568 100644
--- a/init.test.el
+++ b/init.test.el
@@ -9,7 +9,7 @@
        :editor
        evil
        :tools
-       password-store
+       pass
        :lang
        org
        web)
diff --git a/modules/README.org b/modules/README.org
index 12dd47bbc..13214537d 100644
--- a/modules/README.org
+++ b/modules/README.org
@@ -91,7 +91,7 @@ Small modules that give Emacs access to external tools & services.
 + macos:
 + magit:
 + make:
-+ password-store:
++ pass:
 + pdf:
 + prodigy:
 + rgb:
diff --git a/modules/app/irc/README.org b/modules/app/irc/README.org
index 0ac15e5df..2af6489cb 100644
--- a/modules/app/irc/README.org
+++ b/modules/app/irc/README.org
@@ -71,7 +71,7 @@ some ways to avoid that:
 
 ** Pass: the unix password manager
 [[https://www.passwordstore.org/][Pass]] is my tool of choice. I use it to manage my passwords. If you activate the
-[[../../../modules/tools/password-store/README.org][:tools password-store]] module you get an elisp API through which to access your
+[[../../../modules/tools/pass/README.org][:tools pass]] module you get an elisp API through which to access your
 password store.
 
 ~set-irc-server!~ accepts a plist can use functions instead of strings.
diff --git a/modules/tools/password-store/autoload.el b/modules/tools/pass/autoload.el
similarity index 98%
rename from modules/tools/password-store/autoload.el
rename to modules/tools/pass/autoload.el
index 073a4526c..2bd2c0123 100644
--- a/modules/tools/password-store/autoload.el
+++ b/modules/tools/pass/autoload.el
@@ -1,4 +1,4 @@
-;;; tools/password-store/autoload.el -*- lexical-binding: t; -*-
+;;; tools/pass/autoload.el -*- lexical-binding: t; -*-
 
 (defun +pass--open-url (entry)
   (if-let* ((url (+pass-get-field entry +pass-url-fields)))
diff --git a/modules/tools/password-store/config.el b/modules/tools/pass/config.el
similarity index 84%
rename from modules/tools/password-store/config.el
rename to modules/tools/pass/config.el
index b161badae..e76a49081 100644
--- a/modules/tools/password-store/config.el
+++ b/modules/tools/pass/config.el
@@ -1,4 +1,4 @@
-;;; tools/password-store/config.el -*- lexical-binding: t; -*-
+;;; tools/pass/config.el -*- lexical-binding: t; -*-
 
 (defvar +pass-user-fields '("login" "user" "username" "email")
   "A list of fields for `+pass/ivy' to search for the username.")
@@ -14,13 +14,13 @@
 (setq password-store-password-length 12)
 
 ;; Fix hard-coded password-store location; respect PASSWORD_STORE_DIR envvar
-(defun +password-store*read-entry (entry)
+(defun +pass*read-entry (entry)
   "Return a string with the file content of ENTRY."
   (with-temp-buffer
     (insert-file-contents
      (expand-file-name (format "%s.gpg" entry) (password-store-dir)))
     (buffer-substring-no-properties (point-min) (point-max))))
-(advice-add #'auth-source-pass--read-entry :override #'+password-store*read-entry)
+(advice-add #'auth-source-pass--read-entry :override #'+pass*read-entry)
 
 
 ;; `pass'
diff --git a/modules/tools/password-store/packages.el b/modules/tools/pass/packages.el
similarity index 89%
rename from modules/tools/password-store/packages.el
rename to modules/tools/pass/packages.el
index 10744af9d..8c92e6435 100644
--- a/modules/tools/password-store/packages.el
+++ b/modules/tools/pass/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
-;;; tools/password-store/packages.el
+;;; tools/pass/packages.el
 
 (package! pass)
 (package! password-store)
diff --git a/modules/tools/password-store/test/test-pass.el b/modules/tools/pass/test/test-pass.el
similarity index 95%
rename from modules/tools/password-store/test/test-pass.el
rename to modules/tools/pass/test/test-pass.el
index b1138fa75..864e800ac 100644
--- a/modules/tools/password-store/test/test-pass.el
+++ b/modules/tools/pass/test/test-pass.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
-;;; tools/password-store/test/test-pass.el
+;;; tools/pass/test/test-pass.el
 
-(describe "tools/password-store"
+(describe "tools/pass"
   (before-all
     (load! "../autoload"))