diff --git a/src/cmd/help.go b/src/cmd/help.go
index cf3fad5..1749e0a 100644
--- a/src/cmd/help.go
+++ b/src/cmd/help.go
@@ -82,7 +82,7 @@ func helpShowManual(args []string) error {
 
 	if len(args) == 0 {
 		manual = "toolbox"
-	} else if args[0] == "toolbox" {
+	} else if args[0] == executableBase {
 		manual = "toolbox"
 	} else {
 		manual = "toolbox-" + args[0]
diff --git a/src/cmd/root.go b/src/cmd/root.go
index 9a8f921..bd7c9d3 100644
--- a/src/cmd/root.go
+++ b/src/cmd/root.go
@@ -151,14 +151,14 @@ func rootRun(cmd *cobra.Command, args []string) error {
 	fmt.Fprintf(&builder, "enter     Enter an existing toolbox container\n")
 	fmt.Fprintf(&builder, "list      List all existing toolbox containers and images\n")
 	fmt.Fprintf(&builder, "\n")
-	fmt.Fprintf(&builder, "Run 'toolbox --help' for usage.")
+	fmt.Fprintf(&builder, "Run '%s --help' for usage.", executableBase)
 
 	errMsg := builder.String()
 	return errors.New(errMsg)
 }
 
 func rootUsage(cmd *cobra.Command) error {
-	err := errors.New("Run 'toolbox --help' for usage.")
+	err := fmt.Errorf("Run '%s --help' for usage.", executableBase)
 	fmt.Fprintf(os.Stderr, "%s", err)
 	return err
 }