diff --git a/init.zsh b/init.zsh
index 6871aad..7f5c6b6 100755
--- a/init.zsh
+++ b/init.zsh
@@ -36,10 +36,8 @@ fi
     if [[ ! -d ${zmodule_dir} ]]; then
       print "No such module \"${zmodule}\"." >&2
     else
-      for zmodule_file (${zmodule_dir}/{,zsh-}${zmodule}.zsh-theme \
-          ${zmodule_dir}/init.zsh \
-          ${zmodule_dir}/{,zsh-}${zmodule}.plugin.zsh \
-          ${zmodule_dir}/{,zsh-}${zmodule}.{z,}sh); do
+      for zmodule_file (${zmodule_dir}/init.zsh \
+          ${zmodule_dir}/{,zsh-}${zmodule}.{zsh,plugin.zsh,zsh-theme,sh}); do
         if [[ -f ${zmodule_file} ]]; then
           source ${zmodule_file}
           break
diff --git a/login_init.zsh b/login_init.zsh
index bc856dc..0be8a94 100755
--- a/login_init.zsh
+++ b/login_init.zsh
@@ -8,7 +8,7 @@
 #
 
 (
-  local dir file
+  local dir file zmodule zmodule_dir
   setopt LOCAL_OPTIONS EXTENDED_GLOB
   autoload -U zrecompile
 
@@ -24,14 +24,11 @@
   done
 
   # zcompile enabled module init scripts
-  local zmodule zmodule_dir
   for zmodule (${zmodules}); do
     zmodule_dir=${ZIM_HOME}/modules/${zmodule}
     if [[ -d ${zmodule_dir} ]]; then
-      for file (${zmodule_dir}/{,zsh-}${zmodule}.zsh-theme \
-          ${zmodule_dir}/init.zsh \
-          ${zmodule_dir}/{,zsh-}${zmodule}.plugin.zsh \
-          ${zmodule_dir}/{,zsh-}${zmodule}.{z,}sh); do
+      for file (${zmodule_dir}/init.zsh \
+          ${zmodule_dir}/{,zsh-}${zmodule}.{zsh,plugin.zsh,zsh-theme,sh}); do
         if [[ -f ${file} ]]; then
           zrecompile -pq ${file}
           break