diff --git a/bash/bash.d/password-storage b/bash/bash.d/password-store
similarity index 89%
rename from bash/bash.d/password-storage
rename to bash/bash.d/password-store
index 6c2f67b..c8cb3b3 100644
--- a/bash/bash.d/password-storage
+++ b/bash/bash.d/password-store
@@ -1,6 +1,6 @@
 # Enable password-storage and its bash completion
 
-PASSDIR="${DOTFILES}/password-storage"
+PASSDIR="${DOTFILES}/password-store"
 
 # Only do this when the submodule is loaded
 if [ -d "${PASSDIR}/src" ]; then
diff --git a/bash/rc b/bash/rc
index 5de1115..f8a022b 100644
--- a/bash/rc
+++ b/bash/rc
@@ -31,7 +31,7 @@ fi
 
 # Load main things
 if [ -d "$DOTBASH/bash.d" ]; then
-	for f in colours aliases history 00-marietje prompt_command
+	for f in colours aliases history 00-marietje prompt_command password-store
 	do
 		if [ -r "$DOTBASH/bash.d/$f" ]; then
 			source "$DOTBASH/bash.d/$f"