diff --git a/completion/available/gvm.completion.bash b/completion/available/gvmtool.completion.bash
similarity index 100%
rename from completion/available/gvm.completion.bash
rename to completion/available/gvmtool.completion.bash
diff --git a/plugins/available/gvm.plugin.bash b/plugins/available/gvmtool.plugin.bash
similarity index 71%
rename from plugins/available/gvm.plugin.bash
rename to plugins/available/gvmtool.plugin.bash
index 596c0276..ee69a669 100644
--- a/plugins/available/gvm.plugin.bash
+++ b/plugins/available/gvmtool.plugin.bash
@@ -1,5 +1,5 @@
 cite about-plugin
-about-plugin 'load gvm environment'
+about-plugin 'load groovy environment manager'
 
 GVM_DIR="$HOME/.gvm"