diff --git a/dokku b/dokku
index 01bd228fb..637b6379a 100755
--- a/dokku
+++ b/dokku
@@ -90,9 +90,9 @@ case "$1" in
 
   help)
     cat<<EOF | pluginhook commands help | sort
-    help                Print the list of commands
-    plugins             Print active plugins
-    plugins-install     Install active plugins
+    help            Print the list of commands
+    plugins         Print active plugins
+    plugins-install Install active plugins
 EOF
     ;;
 
diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index ed32e53e9..6d600b8c8 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -5,7 +5,7 @@ set -e; case "$1" in
     docker logs $CONTAINER | tail -n 100
     ;;
 
-  run-cli)
+  run)
     if [[ -z $2 ]]; then
         echo "Please specify an app to run the command on"
         exit 1
@@ -16,13 +16,13 @@ set -e; case "$1" in
         exit 1
     fi
     shift 2
-    docker run $IMAGE /run-cli "$@"
+    docker run $IMAGE /exec "$@"
     ;;
 
   help)
     cat && cat<<EOF
-    logs <app>          Show the last logs for an application
-    run-cli <app> <cmd> Run a command in the environment of an application
+    logs <app>      Show the last logs for an application
+    run <app> <cmd> Run a command in the environment of an application
 EOF
     ;;
 
diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands
index eb0efe4b6..6b6731a3a 100755
--- a/plugins/nginx-vhosts/commands
+++ b/plugins/nginx-vhosts/commands
@@ -10,7 +10,7 @@ set -e; case "$1" in
     ;;
 
   help) cat && cat<<EOF
-    url <app>           Show the URL for an application
+    url <app>       Show the URL for an application
 EOF
     ;;