diff --git a/oh-my-fish.fish b/oh-my-fish.fish
index 8d5090f..144298e 100644
--- a/oh-my-fish.fish
+++ b/oh-my-fish.fish
@@ -30,7 +30,7 @@ end
 
 function _fish_source_plugin_load_file
   set -l plugin $argv[1]
-  set -l load_file_path "plugins/$plugin/$plugin.load.fish"
+  set -l load_file_path "plugins/$plugin/$plugin.load"
 
   if test -e $fish_path/$load_file_path
     . $fish_path/$load_file_path
@@ -69,7 +69,7 @@ end
 set fish_function_path $fish_path/themes/$fish_theme $fish_function_path
 
 # Source all files inside custom folder
-for config_file in $fish_custom/*.load.fish
+for config_file in $fish_custom/*.load
   . $config_file
 end
 
diff --git a/plugins/brew/brew.load.fish b/plugins/brew/brew.load
similarity index 100%
rename from plugins/brew/brew.load.fish
rename to plugins/brew/brew.load
diff --git a/plugins/bundler/bundler.load.fish b/plugins/bundler/bundler.load
similarity index 100%
rename from plugins/bundler/bundler.load.fish
rename to plugins/bundler/bundler.load
diff --git a/plugins/rbenv/rbenv.load.fish b/plugins/rbenv/rbenv.load
similarity index 100%
rename from plugins/rbenv/rbenv.load.fish
rename to plugins/rbenv/rbenv.load