diff --git a/.config/shell/login.d/xdg.sh b/.config/shell/login.d/env-xdg.sh
similarity index 100%
rename from .config/shell/login.d/xdg.sh
rename to .config/shell/login.d/env-xdg.sh
diff --git a/.config/shell/login.d/go.sh b/.config/shell/login.d/go-path.sh
similarity index 100%
rename from .config/shell/login.d/go.sh
rename to .config/shell/login.d/go-path.sh
diff --git a/.config/shell/login.d/dotfilescripts.sh b/.config/shell/login.d/local-bin-path.sh
similarity index 100%
rename from .config/shell/login.d/dotfilescripts.sh
rename to .config/shell/login.d/local-bin-path.sh
diff --git a/.config/shell/rc.d/base-aliases.sh b/.config/shell/rc.d/alias-base.sh
similarity index 100%
rename from .config/shell/rc.d/base-aliases.sh
rename to .config/shell/rc.d/alias-base.sh
diff --git a/.config/shell/rc.d/fuzzy-finding.sh b/.config/shell/rc.d/alias-fuzzy-finding.sh
similarity index 100%
rename from .config/shell/rc.d/fuzzy-finding.sh
rename to .config/shell/rc.d/alias-fuzzy-finding.sh
diff --git a/.config/shell/rc.d/nvim-to-vim.sh b/.config/shell/rc.d/alias-nvim-to-vim.sh
similarity index 100%
rename from .config/shell/rc.d/nvim-to-vim.sh
rename to .config/shell/rc.d/alias-nvim-to-vim.sh
diff --git a/.config/shell/rc.d/vifm-to-vm.sh b/.config/shell/rc.d/alias-vifm-to-vm.sh
similarity index 100%
rename from .config/shell/rc.d/vifm-to-vm.sh
rename to .config/shell/rc.d/alias-vifm-to-vm.sh
diff --git a/.config/shell/rc.d/set-wiki-root.sh b/.config/shell/rc.d/env-wiki-root.sh
similarity index 100%
rename from .config/shell/rc.d/set-wiki-root.sh
rename to .config/shell/rc.d/env-wiki-root.sh
diff --git a/.config/shell/rc.d/set-locale-to-us-utf8.sh b/.config/shell/rc.d/locale-utf-8.sh
similarity index 100%
rename from .config/shell/rc.d/set-locale-to-us-utf8.sh
rename to .config/shell/rc.d/locale-utf-8.sh