diff --git a/hosts.autocomplete.bash b/hosts-completion.bash
similarity index 100%
rename from hosts.autocomplete.bash
rename to hosts-completion.bash
diff --git a/hosts.autocomplete.zsh b/hosts-completion.zsh
similarity index 90%
rename from hosts.autocomplete.zsh
rename to hosts-completion.zsh
index ca26af2..2051dc5 100644
--- a/hosts.autocomplete.zsh
+++ b/hosts-completion.zsh
@@ -1,3 +1,5 @@
+#compdef hosts
+
 __hosts_subcommands() {
   local _commands
   _commands=($(hosts commands --raw))
@@ -21,4 +23,4 @@ __hosts_subcommands() {
   fi
 }
 
-compdef __hosts_subcommands hosts
+__hosts_subcommands "$@"