diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 20d2e354c..e047d4834 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -151,8 +151,8 @@ _omz_source() {
 
   # Construct zstyle context based on path
   case "$filepath" in
-  lib/*) context="lib:${filepath:t:r}" ;;          # :t = lib_name.zsh, :r = lib_name
-  plugins/*) context="plugins:${filepath:h2:t}" ;; # :h2 = plugins/plugin_name, :t = plugin_name
+  lib/*) context="lib:${filepath:t:r}" ;;         # :t = lib_name.zsh, :r = lib_name
+  plugins/*) context="plugins:${filepath:h:t}" ;; # :h = plugins/plugin_name, :t = plugin_name
   esac
 
   local disable_aliases=0
@@ -184,7 +184,7 @@ _omz_source() {
 # Load all of the config files in ~/oh-my-zsh that end in .zsh
 # TIP: Add files you don't want in git to .gitignore
 for config_file ("$ZSH"/lib/*.zsh); do
-  _omz_source "${config_file:t2}"
+  _omz_source "lib/${config_file:t}"
 done
 unset custom_config_file