diff --git a/packages/cli/src/commands/spaces/outbound-rules/add.ts b/packages/cli/src/commands/spaces/outbound-rules/add.ts
index d32892e2ea..dac5c44efb 100644
--- a/packages/cli/src/commands/spaces/outbound-rules/add.ts
+++ b/packages/cli/src/commands/spaces/outbound-rules/add.ts
@@ -8,7 +8,8 @@ import {SpaceCompletion} from '@heroku-cli/command/lib/completions'
 import {ProtocolCompletion} from '../../../lib/autocomplete/completions'
 
 export default class Add extends Command {
-  static topic = 'outbound-rules'
+  static topic = 'spaces'
+  static aliases = ['outbound-rules:add']
   static description = heredoc(`
     Add outbound rules to a Private Space
 
@@ -38,7 +39,6 @@ export default class Add extends Command {
   ]
 
   static hidden = true
-  static aliases = ['outbound-rules:add']
   static flags = {
     space: flags.string({
       char: 's',
diff --git a/packages/cli/src/commands/spaces/outbound-rules/index.ts b/packages/cli/src/commands/spaces/outbound-rules/index.ts
index 99f99c3b82..a67616b27f 100644
--- a/packages/cli/src/commands/spaces/outbound-rules/index.ts
+++ b/packages/cli/src/commands/spaces/outbound-rules/index.ts
@@ -6,6 +6,8 @@ import * as Heroku from '@heroku-cli/schema'
 import {SpaceCompletion} from '@heroku-cli/command/lib/completions'
 
 export default class Index extends Command {
+  static topic = 'spaces'
+  static aliases = ['outbound-rules']
   static description = heredoc(`
     list Outbound Rules for a space
     Outbound Rules are only available on Private Spaces.
@@ -18,7 +20,6 @@ export default class Index extends Command {
     You can add specific rules that only allow your dyno to communicate with trusted hosts.
   `)
 
-  static aliases = ['outbound-rules']
   static hidden = true
   static flags = {
     space: flags.string({char: 's', description: 'space to get outbound rules from', completion: SpaceCompletion}),
diff --git a/packages/cli/src/commands/spaces/outbound-rules/remove.ts b/packages/cli/src/commands/spaces/outbound-rules/remove.ts
index e16e778ac6..d419805247 100644
--- a/packages/cli/src/commands/spaces/outbound-rules/remove.ts
+++ b/packages/cli/src/commands/spaces/outbound-rules/remove.ts
@@ -6,8 +6,8 @@ import heredoc from 'tsheredoc'
 import confirmCommand from '../../../lib/confirmCommand'
 
 export default class Remove extends Command {
+  static topic = 'spaces'
   static aliases = ['outbound-rules:remove']
-  static topic = 'outbound-rules'
   static description = 'Remove a Rules from the list of Outbound Rules';
   static examples = [heredoc(`
   $ heroku outbound-rules:remove --space my-space 4
diff --git a/packages/cli/src/commands/spaces/trusted-ips/add.ts b/packages/cli/src/commands/spaces/trusted-ips/add.ts
index b07a5b4d70..3374ef76ed 100644
--- a/packages/cli/src/commands/spaces/trusted-ips/add.ts
+++ b/packages/cli/src/commands/spaces/trusted-ips/add.ts
@@ -5,8 +5,8 @@ import * as Heroku from '@heroku-cli/schema'
 import heredoc from 'tsheredoc'
 
 export default class Add extends Command {
+  static topic = 'spaces'
   static aliases = ['trusted-ips:add']
-  static topic = 'trusted-ips'
   static description = heredoc(`
   Add one range to the list of trusted IP ranges
   Uses CIDR notation.`)
diff --git a/packages/cli/src/commands/spaces/trusted-ips/index.ts b/packages/cli/src/commands/spaces/trusted-ips/index.ts
index 711bb2c02c..41d3ab37d6 100644
--- a/packages/cli/src/commands/spaces/trusted-ips/index.ts
+++ b/packages/cli/src/commands/spaces/trusted-ips/index.ts
@@ -4,8 +4,8 @@ import * as Heroku from '@heroku-cli/schema'
 import heredoc from 'tsheredoc'
 
 export default class Index extends Command {
+  static topic = 'spaces'
   static aliases = ['trusted-ips']
-  static topic = 'trusted-ips'
   static description = heredoc(`
   list trusted IP ranges for a space
   Trusted IP ranges are only available on Private Spaces.
diff --git a/packages/cli/src/commands/spaces/trusted-ips/remove.ts b/packages/cli/src/commands/spaces/trusted-ips/remove.ts
index 97bbbd705c..933195cb41 100644
--- a/packages/cli/src/commands/spaces/trusted-ips/remove.ts
+++ b/packages/cli/src/commands/spaces/trusted-ips/remove.ts
@@ -5,8 +5,8 @@ import * as Heroku from '@heroku-cli/schema'
 import heredoc from 'tsheredoc'
 
 export default class Remove extends Command {
+  static topic = 'spaces'
   static aliases = ['trusted-ips:remove']
-  static topic = 'trusted-ips'
   static description = heredoc(`
   Remove a range from the list of trusted IP ranges
   Uses CIDR notation.`)