diff --git a/plugins/available/alias-completion.plugin.bash b/completion/available/aliases.completion.bash
similarity index 100%
rename from plugins/available/alias-completion.plugin.bash
rename to completion/available/aliases.completion.bash
diff --git a/profiles/default.bash_it b/profiles/default.bash_it
index 5e4f4631d5..9a55f6c7de 100644
--- a/profiles/default.bash_it
+++ b/profiles/default.bash_it
@@ -1,10 +1,10 @@
 # This is the default profile of Bash-it
 
 # plugins
-plugins alias-completion
 plugins base
 
 # completion
+completion aliases
 completion bash-it
 completion system
 
diff --git a/test/plugins/alias-completion.plugin.bats b/test/completion/aliases.completion.bats
similarity index 100%
rename from test/plugins/alias-completion.plugin.bats
rename to test/completion/aliases.completion.bats