diff --git a/fish/.config/fish/config.fish.symlink b/fish/.config/fish/config.fish.symlink
index 83e1309..d422aa4 100644
--- a/fish/.config/fish/config.fish.symlink
+++ b/fish/.config/fish/config.fish.symlink
@@ -23,20 +23,20 @@ if [ -e "$HOME/.local.env" ]
 end
 
 # All fish dotfiles.
-set config_files $DOT/**/*.fish
+set config_files $DOT/**/*.config.fish
 
 # Load path files first.
-for file in (string match -r '^.*\/path.fish$' $config_files)
+for file in (string match -r '^.*\/path.config.fish$' $config_files)
   source $file
 end
 
 # Load everything else, except completion.
-for file in (string match -v -r '^.*\/(path|completion|install)\.fish$' $config_files)
+for file in (string match -v -r '^.*\/(path|completion)\.config.fish$' $config_files)
   source $file
 end
 
 # Load completions functions.
-for file in (string match -r '^.*\/completion.fish$' $config_files)
+for file in (string match -r '^.*\/completion.config.fish$' $config_files)
   source $file
 end
 
diff --git a/git/aliases.fish b/git/aliases.config.fish
similarity index 100%
rename from git/aliases.fish
rename to git/aliases.config.fish
diff --git a/homebrew/brew.fish b/homebrew/brew.config.fish
similarity index 100%
rename from homebrew/brew.fish
rename to homebrew/brew.config.fish