diff --git a/cmd/gomote/destroy.go b/cmd/gomote/destroy.go
index 77d7110f6..aa3d7f033 100644
--- a/cmd/gomote/destroy.go
+++ b/cmd/gomote/destroy.go
@@ -13,7 +13,7 @@ import (
 func destroy(args []string) error {
 	fs := flag.NewFlagSet("destroy", flag.ContinueOnError)
 	fs.Usage = func() {
-		fmt.Fprintln(os.Stderr, "create usage: gomote destroy <instance>")
+		fmt.Fprintln(os.Stderr, "destroy usage: gomote destroy <instance>")
 		fs.PrintDefaults()
 		os.Exit(1)
 	}
diff --git a/cmd/gomote/get.go b/cmd/gomote/get.go
index 576b6188e..12a0540be 100644
--- a/cmd/gomote/get.go
+++ b/cmd/gomote/get.go
@@ -16,7 +16,7 @@ import (
 func getTar(args []string) error {
 	fs := flag.NewFlagSet("get", flag.ContinueOnError)
 	fs.Usage = func() {
-		fmt.Fprintln(os.Stderr, "create usage: gomote gettar [get-opts] <buildlet-name>")
+		fmt.Fprintln(os.Stderr, "gettar usage: gomote gettar [get-opts] <buildlet-name>")
 		fs.PrintDefaults()
 		os.Exit(1)
 	}
diff --git a/cmd/gomote/gomote.go b/cmd/gomote/gomote.go
index e443d238a..7114eb03d 100644
--- a/cmd/gomote/gomote.go
+++ b/cmd/gomote/gomote.go
@@ -45,7 +45,7 @@ To list all the builder types available, run "create" with no arguments:
 The "gomote run" command has many of its own flags:
 
   $ gomote run -h
-  create usage: gomote run [run-opts] <instance> <cmd> [args...]
+  run usage: gomote run [run-opts] <instance> <cmd> [args...]
     -builderenv string
           Optional alternate builder to act like. Must share the same
           underlying buildlet host type, or it's an error. For
diff --git a/cmd/gomote/ls.go b/cmd/gomote/ls.go
index 8386d6237..de76ffd1e 100644
--- a/cmd/gomote/ls.go
+++ b/cmd/gomote/ls.go
@@ -16,7 +16,7 @@ import (
 func ls(args []string) error {
 	fs := flag.NewFlagSet("ls", flag.ContinueOnError)
 	fs.Usage = func() {
-		fmt.Fprintln(os.Stderr, "create usage: gomote ls <instance> [-R] [dir]")
+		fmt.Fprintln(os.Stderr, "ls usage: gomote ls <instance> [-R] [dir]")
 		fs.PrintDefaults()
 		os.Exit(1)
 	}
diff --git a/cmd/gomote/ping.go b/cmd/gomote/ping.go
index 4c9e0cce4..7789945d7 100644
--- a/cmd/gomote/ping.go
+++ b/cmd/gomote/ping.go
@@ -13,7 +13,7 @@ import (
 func ping(args []string) error {
 	fs := flag.NewFlagSet("ping", flag.ContinueOnError)
 	fs.Usage = func() {
-		fmt.Fprintln(os.Stderr, "create usage: gomote ping <instance>")
+		fmt.Fprintln(os.Stderr, "ping usage: gomote ping <instance>")
 		fs.PrintDefaults()
 		os.Exit(1)
 	}
diff --git a/cmd/gomote/push.go b/cmd/gomote/push.go
index e07467e0c..abff22097 100644
--- a/cmd/gomote/push.go
+++ b/cmd/gomote/push.go
@@ -29,7 +29,7 @@ func push(args []string) error {
 	var dryRun bool
 	fs.BoolVar(&dryRun, "dry-run", false, "print what would be done only")
 	fs.Usage = func() {
-		fmt.Fprintln(os.Stderr, "create usage: gomote push <instance>")
+		fmt.Fprintln(os.Stderr, "push usage: gomote push <instance>")
 		fs.PrintDefaults()
 		os.Exit(1)
 	}
diff --git a/cmd/gomote/put.go b/cmd/gomote/put.go
index fcaacb8d7..a9d93af8d 100644
--- a/cmd/gomote/put.go
+++ b/cmd/gomote/put.go
@@ -22,7 +22,7 @@ import (
 func putTar(args []string) error {
 	fs := flag.NewFlagSet("put", flag.ContinueOnError)
 	fs.Usage = func() {
-		fmt.Fprintln(os.Stderr, "create usage: gomote puttar [put-opts] <buildlet-name> [tar.gz file or '-' for stdin]")
+		fmt.Fprintln(os.Stderr, "puttar usage: gomote puttar [put-opts] <buildlet-name> [tar.gz file or '-' for stdin]")
 		fs.PrintDefaults()
 		os.Exit(1)
 	}
@@ -90,7 +90,7 @@ func putTar(args []string) error {
 func put14(args []string) error {
 	fs := flag.NewFlagSet("put14", flag.ContinueOnError)
 	fs.Usage = func() {
-		fmt.Fprintln(os.Stderr, "create usage: gomote put14 <buildlet-name>")
+		fmt.Fprintln(os.Stderr, "put14 usage: gomote put14 <buildlet-name>")
 		fs.PrintDefaults()
 		os.Exit(1)
 	}
@@ -115,7 +115,7 @@ func put14(args []string) error {
 func put(args []string) error {
 	fs := flag.NewFlagSet("put", flag.ContinueOnError)
 	fs.Usage = func() {
-		fmt.Fprintln(os.Stderr, "create usage: gomote put [put-opts] <buildlet-name> <source or '-' for stdin> [destination]")
+		fmt.Fprintln(os.Stderr, "put usage: gomote put [put-opts] <buildlet-name> <source or '-' for stdin> [destination]")
 		fs.PrintDefaults()
 		os.Exit(1)
 	}
diff --git a/cmd/gomote/rm.go b/cmd/gomote/rm.go
index 93e4d0d74..d8b8ee0a8 100644
--- a/cmd/gomote/rm.go
+++ b/cmd/gomote/rm.go
@@ -13,8 +13,8 @@ import (
 func rm(args []string) error {
 	fs := flag.NewFlagSet("rm", flag.ContinueOnError)
 	fs.Usage = func() {
-		fmt.Fprintln(os.Stderr, "create usage: gomote rm <instance> <file-or-dir>+")
-		fmt.Fprintln(os.Stderr, "              gomote rm <instance> .  (to delete everything)")
+		fmt.Fprintln(os.Stderr, "rm usage: gomote rm <instance> <file-or-dir>+")
+		fmt.Fprintln(os.Stderr, "          gomote rm <instance> .  (to delete everything)")
 		fs.PrintDefaults()
 		os.Exit(1)
 	}
diff --git a/cmd/gomote/run.go b/cmd/gomote/run.go
index d110dc159..3b5d2a5f0 100644
--- a/cmd/gomote/run.go
+++ b/cmd/gomote/run.go
@@ -18,7 +18,7 @@ import (
 func run(args []string) error {
 	fs := flag.NewFlagSet("run", flag.ContinueOnError)
 	fs.Usage = func() {
-		fmt.Fprintln(os.Stderr, "create usage: gomote run [run-opts] <instance> <cmd> [args...]")
+		fmt.Fprintln(os.Stderr, "run usage: gomote run [run-opts] <instance> <cmd> [args...]")
 		fs.PrintDefaults()
 		os.Exit(1)
 	}