diff --git a/scripts/openapi-generator-cli-completion.bash b/scripts/openapi-generator-cli-completion.bash
index 96233fb22ed..b092dbb3ea8 100644
--- a/scripts/openapi-generator-cli-completion.bash
+++ b/scripts/openapi-generator-cli-completion.bash
@@ -43,4 +43,6 @@ _openapi_generator_cli_completions() {
   fi
 }
 
-complete -F _openapi_generator_cli_completions openapi-generator-cli
+for i in openapi-generator-cli openapi-generator; do
+  type $i > /dev/null 2>&1 && complete -F _openapi_generator_cli_completions $i
+done