diff --git a/plugins/20_events/help-functions b/plugins/20_events/help-functions
index 610242ada..a9fcfe7ab 100755
--- a/plugins/20_events/help-functions
+++ b/plugins/20_events/help-functions
@@ -8,8 +8,8 @@ cmd-events-help() {
   local plugin_name="events"
   local plugin_description="Manage event logging"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/certs/help-functions b/plugins/certs/help-functions
index 0aefc2a0b..1a676c4dc 100755
--- a/plugins/certs/help-functions
+++ b/plugins/certs/help-functions
@@ -8,8 +8,8 @@ cmd-certs-help() {
   local plugin_name="certs"
   local plugin_description="Manage SSL (TLS) certs"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/checks/help-functions b/plugins/checks/help-functions
index d01d0c64d..b5328dbaf 100755
--- a/plugins/checks/help-functions
+++ b/plugins/checks/help-functions
@@ -8,8 +8,8 @@ cmd-checks-help() {
   local plugin_name="checks"
   local plugin_description="Manage zero-downtime settings"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/docker-options/help-functions b/plugins/docker-options/help-functions
index 3635b8c3c..71d8c427a 100755
--- a/plugins/docker-options/help-functions
+++ b/plugins/docker-options/help-functions
@@ -8,8 +8,8 @@ cmd-docker-options-help() {
   local plugin_name="docker-options"
   local plugin_description="Manage docker options for an app"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/domains/help-functions b/plugins/domains/help-functions
index 1221ccf06..0f66a8734 100755
--- a/plugins/domains/help-functions
+++ b/plugins/domains/help-functions
@@ -8,8 +8,8 @@ cmd-domains-help() {
   local plugin_name="domains"
   local plugin_description="Manage domains used by the proxy"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/enter/help-functions b/plugins/enter/help-functions
index 3df2892e5..71ffdbe1d 100755
--- a/plugins/enter/help-functions
+++ b/plugins/enter/help-functions
@@ -8,8 +8,8 @@ cmd-enter-help() {
   local plugin_name="enter"
   local plugin_description="Enter running app containers"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/git/help-functions b/plugins/git/help-functions
index 72d075bf3..35841f062 100755
--- a/plugins/git/help-functions
+++ b/plugins/git/help-functions
@@ -8,8 +8,8 @@ cmd-git-help() {
   local plugin_name="git"
   local plugin_description="Manage app deploys via git"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/nginx-vhosts/help-functions b/plugins/nginx-vhosts/help-functions
index ad8ba634b..f34f32b02 100755
--- a/plugins/nginx-vhosts/help-functions
+++ b/plugins/nginx-vhosts/help-functions
@@ -8,8 +8,8 @@ cmd-nginx-vhosts-help() {
   local plugin_name="nginx"
   local plugin_description="Manage the nginx proxy"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/plugin/help-functions b/plugins/plugin/help-functions
index b30b86660..909045612 100755
--- a/plugins/plugin/help-functions
+++ b/plugins/plugin/help-functions
@@ -8,8 +8,8 @@ cmd-plugin-help() {
   local plugin_name="plugin"
   local plugin_description="Manage installed plugins"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/scheduler-docker-local/help-functions b/plugins/scheduler-docker-local/help-functions
index cdfa2d3ba..97f67800d 100755
--- a/plugins/scheduler-docker-local/help-functions
+++ b/plugins/scheduler-docker-local/help-functions
@@ -8,8 +8,8 @@ cmd-scheduler-docker-local-help() {
   local plugin_name="scheduler-docker-local"
   local plugin_description="Manage the docker-local scheduler integration for an app"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/shell/help-functions b/plugins/shell/help-functions
index 9530cce29..ea717ddd5 100755
--- a/plugins/shell/help-functions
+++ b/plugins/shell/help-functions
@@ -8,8 +8,8 @@ cmd-shell-help() {
   local plugin_name="shell"
   local plugin_description="Interactive dokku prompt"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/ssh-keys/help-functions b/plugins/ssh-keys/help-functions
index c26d3c196..262fb9e1c 100755
--- a/plugins/ssh-keys/help-functions
+++ b/plugins/ssh-keys/help-functions
@@ -8,8 +8,8 @@ cmd-ssh-keys-help() {
   local plugin_name="ssh-keys"
   local plugin_description="Manage public ssh keys used for deployment"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/storage/help-functions b/plugins/storage/help-functions
index b34df5296..ac324d47b 100755
--- a/plugins/storage/help-functions
+++ b/plugins/storage/help-functions
@@ -8,8 +8,8 @@ cmd-storage-help() {
   local plugin_name="storage"
   local plugin_description="Manage mounted volumes"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/tags/help-functions b/plugins/tags/help-functions
index dbb013ecf..412df03d0 100755
--- a/plugins/tags/help-functions
+++ b/plugins/tags/help-functions
@@ -8,8 +8,8 @@ cmd-tags-help() {
   local plugin_name="tags"
   local plugin_description="Manage docker image tags"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/tar/help-functions b/plugins/tar/help-functions
index 7418c7a33..8ed7191c5 100755
--- a/plugins/tar/help-functions
+++ b/plugins/tar/help-functions
@@ -8,8 +8,8 @@ cmd-tar-help() {
   local plugin_name="tar"
   local plugin_description="Manage app deploys via tar"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''
diff --git a/plugins/trace/help-functions b/plugins/trace/help-functions
index 32a21e97f..8c3a35b4d 100755
--- a/plugins/trace/help-functions
+++ b/plugins/trace/help-functions
@@ -8,8 +8,8 @@ cmd-trace-help() {
   local plugin_name="trace"
   local plugin_description="Manage trace mode"
 
-  if [[ "$CMD" == "$plugin_name:help" ]]; then
-    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
     echo ''
     echo "$plugin_description"
     echo ''