diff --git a/cli/app/app.go b/cli/app/app.go
index 64e3f55a..2135b063 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -7,7 +7,7 @@ import (
 // AppCommand defines the `abra app` command and ets subcommands
 var AppCommand = &cli.Command{
 	Name:      "app",
-	Usage:     "Manage deployed apps",
+	Usage:     "Manage apps",
 	Aliases:   []string{"a"},
 	ArgsUsage: "<app>",
 	Description: `
diff --git a/cli/app/restart.go b/cli/app/restart.go
index 2b0d7d65..0b7ddf69 100644
--- a/cli/app/restart.go
+++ b/cli/app/restart.go
@@ -17,7 +17,7 @@ import (
 var appRestartCommand = &cli.Command{
 	Name:        "restart",
 	Usage:       "Restart an app",
-	Aliases:     []string{"R"},
+	Aliases:     []string{"re"},
 	ArgsUsage:   "<service>",
 	Description: `This command restarts a service within a deployed app.`,
 	Action: func(c *cli.Context) error {
diff --git a/cli/app/restore.go b/cli/app/restore.go
index acf59983..35471b36 100644
--- a/cli/app/restore.go
+++ b/cli/app/restore.go
@@ -27,7 +27,7 @@ var restoreAllServicesFlag = &cli.BoolFlag{
 var appRestoreCommand = &cli.Command{
 	Name:      "restore",
 	Usage:     "Restore an app from a backup",
-	Aliases:   []string{"r"},
+	Aliases:   []string{"rs"},
 	Flags:     []cli.Flag{restoreAllServicesFlag},
 	ArgsUsage: "<service> [<backup file>]",
 	Action: func(c *cli.Context) error {
diff --git a/cli/app/rollback.go b/cli/app/rollback.go
index 00953a47..8e977c8b 100644
--- a/cli/app/rollback.go
+++ b/cli/app/rollback.go
@@ -21,7 +21,7 @@ import (
 var appRollbackCommand = &cli.Command{
 	Name:      "rollback",
 	Usage:     "Roll an app back to a previous version",
-	Aliases:   []string{"r", "downgrade"},
+	Aliases:   []string{"rl"},
 	ArgsUsage: "<app>",
 	Flags: []cli.Flag{
 		internal.ForceFlag,
diff --git a/cli/app/undeploy.go b/cli/app/undeploy.go
index 58709807..9f9e1e61 100644
--- a/cli/app/undeploy.go
+++ b/cli/app/undeploy.go
@@ -11,7 +11,7 @@ import (
 
 var appUndeployCommand = &cli.Command{
 	Name:    "undeploy",
-	Aliases: []string{"u"},
+	Aliases: []string{"un"},
 	Usage:   "Undeploy an app",
 	Description: `
 This does not destroy any of the application data. However, you should remain
diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go
index 4a0af80e..2e559ca7 100644
--- a/cli/app/upgrade.go
+++ b/cli/app/upgrade.go
@@ -19,7 +19,7 @@ import (
 
 var appUpgradeCommand = &cli.Command{
 	Name:      "upgrade",
-	Aliases:   []string{"u"},
+	Aliases:   []string{"up"},
 	Usage:     "Upgrade an app",
 	ArgsUsage: "<app>",
 	Flags: []cli.Flag{
diff --git a/cli/autocomplete.go b/cli/autocomplete.go
index a9540739..076023dc 100644
--- a/cli/autocomplete.go
+++ b/cli/autocomplete.go
@@ -16,7 +16,7 @@ import (
 // AutoCompleteCommand helps people set up auto-complete in their shells
 var AutoCompleteCommand = &cli.Command{
 	Name:    "autocomplete",
-	Usage:   "Help set up shell autocompletion",
+	Usage:   "Configure shell autocompletion (recommended)",
 	Aliases: []string{"ac"},
 	Description: `
 This command helps set up autocompletion in your shell by downloading the
diff --git a/cli/cli.go b/cli/cli.go
index c2831f85..95c95c87 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -28,10 +28,7 @@ func newAbraApp(version, commit string) *cli.App {
   | |__| (_) |_____| (_) | |_) | | |___| | (_) | |_| | (_| |
    \____\___/       \___/| .__/   \____|_|\___/ \__,_|\__,_|
                          |_|
-
-If you haven't already done so, consider setting up autocompletion for a more
-convenient command-line experience. See "abra autocomplete -h" for more.
-		`,
+`,
 		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
 		Commands: []*cli.Command{
 			app.AppCommand,
diff --git a/cli/record/record.go b/cli/record/record.go
index 622be875..587a6e9d 100644
--- a/cli/record/record.go
+++ b/cli/record/record.go
@@ -7,7 +7,7 @@ import (
 // RecordCommand supports managing DNS entries.
 var RecordCommand = &cli.Command{
 	Name:      "record",
-	Usage:     "Manage domain name records via 3rd party providers",
+	Usage:     "Manage domain name records",
 	Aliases:   []string{"rc"},
 	ArgsUsage: "<record>",
 	Description: `
diff --git a/cli/server/server.go b/cli/server/server.go
index c299e1d1..e8018a86 100644
--- a/cli/server/server.go
+++ b/cli/server/server.go
@@ -8,7 +8,7 @@ import (
 var ServerCommand = &cli.Command{
 	Name:    "server",
 	Aliases: []string{"s"},
-	Usage:   "Manage servers via 3rd party providers",
+	Usage:   "Manage servers",
 	Description: `
 These commands support creating, managing and removing servers using 3rd party
 integrations. 
diff --git a/cli/upgrade.go b/cli/upgrade.go
index 94781704..aaf4f716 100644
--- a/cli/upgrade.go
+++ b/cli/upgrade.go
@@ -15,8 +15,9 @@ var releaseCandidateURL = "https://git.coopcloud.tech/coop-cloud/abra/raw/branch
 
 // UpgradeCommand upgrades abra in-place.
 var UpgradeCommand = &cli.Command{
-	Name:  "upgrade",
-	Usage: "Upgrade Abra",
+	Name:    "upgrade",
+	Usage:   "Upgrade Abra itself",
+	Aliases: []string{"u"},
 	Description: `
 This command allows you to upgrade Abra in-place with the latest stable or
 release candidate.