diff --git a/command/plugin/repo_plugins_command.go b/command/plugin/repo_plugins_command.go
index bbc825bddce..f73b4dd1e9c 100644
--- a/command/plugin/repo_plugins_command.go
+++ b/command/plugin/repo_plugins_command.go
@@ -8,7 +8,7 @@ import (
 type RepoPluginsCommand struct {
 	RegisteredRepository string      `short:"r" description:"Name of a registered repository"`
 	usage                interface{} `usage:"CF_NAME repo-plugins [-r REPO_NAME]\n\nEXAMPLES:\n   CF_NAME repo-plugins -r PrivateRepo"`
-	relatedCommands      interface{} `related_commands:"add-plugin-repo, delete-plugin-repo, install-plugin"`
+	relatedCommands      interface{} `related_commands:"add-plugin-repo, remove-plugin-repo, install-plugin"`
 }
 
 func (RepoPluginsCommand) Setup(config command.Config, ui command.UI) error {
diff --git a/command/v7/buildpacks_command.go b/command/v7/buildpacks_command.go
index 7ab3e670fc8..ac97e4dd90c 100644
--- a/command/v7/buildpacks_command.go
+++ b/command/v7/buildpacks_command.go
@@ -13,7 +13,7 @@ type BuildpacksCommand struct {
 	BaseCommand
 
 	usage           interface{} `usage:"CF_NAME buildpacks [--labels SELECTOR] [--lifecycle buildpack|cnb]\n\nEXAMPLES:\n   CF_NAME buildpacks\n   CF_NAME buildpacks --labels 'environment in (production,staging),tier in (backend)'\n   CF_NAME buildpacks --labels 'env=dev,!chargeback-code,tier in (backend,worker)'\n   CF_NAME buildpacks --lifecycle cnb"`
-	relatedCommands interface{} `related_commands:"create-buildpack, delete-buildpack, rename-buildpack, update-buildpack"`
+	relatedCommands interface{} `related_commands:"create-buildpack, delete-buildpack, update-buildpack"`
 	Labels          string      `long:"labels" description:"Selector to filter buildpacks by labels"`
 	Lifecycle       string      `long:"lifecycle" description:"Filter buildpacks by lifecycle ('buildpack' or 'cnb')"`
 }
diff --git a/command/v7/delete_orphaned_routes_command.go b/command/v7/delete_orphaned_routes_command.go
index 3e006d9e630..56b3c0358f6 100644
--- a/command/v7/delete_orphaned_routes_command.go
+++ b/command/v7/delete_orphaned_routes_command.go
@@ -5,7 +5,7 @@ type DeleteOrphanedRoutesCommand struct {
 
 	usage           interface{} `usage:"CF_NAME delete-orphaned-routes [-f]\n"`
 	Force           bool        `short:"f" description:"Force deletion without confirmation"`
-	relatedCommands interface{} `related_commands:"delete-routes, routes"`
+	relatedCommands interface{} `related_commands:"delete-route, routes"`
 }
 
 func (cmd DeleteOrphanedRoutesCommand) Execute(args []string) error {
diff --git a/command/v7/stacks_command.go b/command/v7/stacks_command.go
index 0e4b7926331..2bb996d5c8e 100644
--- a/command/v7/stacks_command.go
+++ b/command/v7/stacks_command.go
@@ -12,7 +12,7 @@ type StacksCommand struct {
 	BaseCommand
 
 	usage           interface{} `usage:"CF_NAME stacks [--labels SELECTOR]\n\nEXAMPLES:\n   CF_NAME stacks\n   CF_NAME stacks --labels 'environment in (production,staging),tier in (backend)'\n   CF_NAME stacks --labels 'env=dev,!chargeback-code,tier in (backend,worker)'"`
-	relatedCommands interface{} `related_commands:"create-buildpack, delete-buildpack, rename-buildpack, stack, update-buildpack"`
+	relatedCommands interface{} `related_commands:"create-buildpack, delete-buildpack, stack, update-buildpack"`
 	Labels          string      `long:"labels" description:"Selector to filter stacks by labels"`
 }
 
diff --git a/integration/v7/isolated/buildpacks_command_test.go b/integration/v7/isolated/buildpacks_command_test.go
index ae357673e2f..0e940ac0616 100644
--- a/integration/v7/isolated/buildpacks_command_test.go
+++ b/integration/v7/isolated/buildpacks_command_test.go
@@ -32,7 +32,7 @@ var _ = Describe("buildpacks command", func() {
 			Eventually(session).Should(Say("OPTIONS:"))
 			Eventually(session).Should(Say(`--labels\s+Selector to filter buildpacks by labels`))
 			Eventually(session).Should(Say("SEE ALSO:"))
-			Eventually(session).Should(Say("create-buildpack, delete-buildpack, rename-buildpack, update-buildpack"))
+			Eventually(session).Should(Say("create-buildpack, delete-buildpack, update-buildpack"))
 			Eventually(session).Should(Exit(0))
 		})
 	})
diff --git a/integration/v7/isolated/delete_orphaned_routes_command_test.go b/integration/v7/isolated/delete_orphaned_routes_command_test.go
index ca34b582531..87c6b244af5 100644
--- a/integration/v7/isolated/delete_orphaned_routes_command_test.go
+++ b/integration/v7/isolated/delete_orphaned_routes_command_test.go
@@ -34,7 +34,7 @@ var _ = Describe("delete-orphaned-routes command", func() {
 			Eventually(session).Should(Say(`\n`))
 
 			Eventually(session).Should(Say(`SEE ALSO:`))
-			Eventually(session).Should(Say(`delete-routes, routes`))
+			Eventually(session).Should(Say(`delete-route, routes`))
 
 			Eventually(session).Should(Exit(0))
 		})
diff --git a/integration/v7/isolated/stacks_command_test.go b/integration/v7/isolated/stacks_command_test.go
index 3403d3cda63..4fe274731d8 100644
--- a/integration/v7/isolated/stacks_command_test.go
+++ b/integration/v7/isolated/stacks_command_test.go
@@ -33,7 +33,7 @@ var _ = Describe("stacks command", func() {
 			Eventually(session).Should(Say("OPTIONS:"))
 			Eventually(session).Should(Say(`--labels\s+Selector to filter stacks by labels`))
 			Eventually(session).Should(Say("SEE ALSO:"))
-			Eventually(session).Should(Say("create-buildpack, delete-buildpack, rename-buildpack, stack, update-buildpack"))
+			Eventually(session).Should(Say("create-buildpack, delete-buildpack, stack, update-buildpack"))
 			Eventually(session).Should(Exit(0))
 		})
 	})