diff --git a/ui/core/app/helpers/doc-url.js b/ui/core/app/helpers/doc-url.js
index e31e4932a..bff751918 100644
--- a/ui/core/app/helpers/doc-url.js
+++ b/ui/core/app/helpers/doc-url.js
@@ -1,12 +1,11 @@
 import { helper } from '@ember/component/helper';
-import { get } from '@ember/object';
 import { assert } from '@ember/debug';
 import config from '../config/environment';
 
 export default helper(function docUrl(params/*, hash*/) {
   const baseURL = config.documentation.baseURL;
   const docKey = params[0] || '';
-  const configuredPath = get(config.documentation, docKey);
+  const configuredPath = config.documentation.topics[docKey];
   if (docKey) {
     assert(`
       Documentation for "${docKey}" could not be found. Please ensure that
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
index 98ab86788..080012f3b 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.auth-method.title"}}
-  <DocLink @doc="topics.auth-method" @iconSize="large" />
+  <DocLink @doc="auth-method" @iconSize="large" />
 </h2>
 <p>{{t "resources.auth-method.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
index 7dd6fd4cb..c74f1844c 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.account.title"}}
-  <DocLink @doc="topics.account" @iconSize="large" />
+  <DocLink @doc="account" @iconSize="large" />
 </h2>
 <Copyable
   @text={{@model.id}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs
index ace8ccb08..00086a2d0 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs
@@ -1 +1,4 @@
-<h2>{{t "titles.new"}}</h2>
\ No newline at end of file
+<h2>
+  {{t "titles.new"}}
+  <DocLink @doc="account.new" @iconSize="large" />
+</h2>
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
index 5d3f270d2..a796c66f5 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
@@ -2,7 +2,7 @@
   <page.header>
     <h2>
       {{t "resources.auth-method.title_plural"}}
-      <DocLink @doc="topics.auth-method" @iconSize="large" />
+      <DocLink @doc="auth-method" @iconSize="large" />
     </h2>
     <p>{{t "resources.auth-method.description"}}</p>
   </page.header>
diff --git a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
index ad843f83a..6dab6766a 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.group.title"}}
-  <DocLink @doc="topics.group" @iconSize="large" />
+  <DocLink @doc="group" @iconSize="large" />
 </h2>
 <p>{{t "resources.group.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/groups/group/add-members/-header.hbs b/ui/core/app/templates/scopes/scope/groups/group/add-members/-header.hbs
index 6d2cadabc..207f55d46 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/add-members/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/add-members/-header.hbs
@@ -1,2 +1,5 @@
-<h2>{{t "resources.group.messages.add-members.title"}}</h2>
+<h2>
+  {{t "resources.group.messages.add-members.title"}}
+  <DocLink @doc="group.add-members" @iconSize="large" />
+</h2>
 <p>{{t "resources.group.messages.add-members.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/groups/index.hbs b/ui/core/app/templates/scopes/scope/groups/index.hbs
index 197782427..7dbf66358 100644
--- a/ui/core/app/templates/scopes/scope/groups/index.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.group.title_plural"}}
-      <DocLink @doc="topics.group" @iconSize="large" />
+      <DocLink @doc="group" @iconSize="large" />
     </h2>
     <p>{{t "resources.group.description"}}</p>
   </page.header>
diff --git a/ui/core/app/templates/scopes/scope/orgs/index.hbs b/ui/core/app/templates/scopes/scope/orgs/index.hbs
index b888817fb..7218551bb 100644
--- a/ui/core/app/templates/scopes/scope/orgs/index.hbs
+++ b/ui/core/app/templates/scopes/scope/orgs/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.org.title_plural"}}
-      <DocLink @doc="topics.org" @iconSize="large" />
+      <DocLink @doc="org" @iconSize="large" />
     </h2>
     {{#if @model}}
       <p>{{t "resources.org.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/orgs/new.hbs b/ui/core/app/templates/scopes/scope/orgs/new.hbs
index d9fe8b361..390f0f04b 100644
--- a/ui/core/app/templates/scopes/scope/orgs/new.hbs
+++ b/ui/core/app/templates/scopes/scope/orgs/new.hbs
@@ -7,7 +7,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "titles.new"}}</h2>
+    <h2>
+      {{t "titles.new"}}
+      <DocLink @doc="org.new" @iconSize="large" />
+    </h2>
   </page.header>
 
   <page.body>
diff --git a/ui/core/app/templates/scopes/scope/projects/index.hbs b/ui/core/app/templates/scopes/scope/projects/index.hbs
index ebf9e2e21..2c220f15b 100644
--- a/ui/core/app/templates/scopes/scope/projects/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.project.title_plural"}}
-      <DocLink @doc="topics.project" @iconSize="large" />
+      <DocLink @doc="project" @iconSize="large" />
     </h2>
     {{#if @model}}
       <p>{{t "resources.project.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/projects/new.hbs b/ui/core/app/templates/scopes/scope/projects/new.hbs
index a8758e3c0..0e9dedf59 100644
--- a/ui/core/app/templates/scopes/scope/projects/new.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/new.hbs
@@ -7,7 +7,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "titles.new"}}</h2>
+    <h2>
+      {{t "titles.new"}}
+      <DocLink @doc="project.new" @iconSize="large" />
+    </h2>
   </page.header>
 
   <page.body>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
index f4d885fae..58e6f4b02 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.host-catalog.title"}}
-  <DocLink @doc="topics.host-catalog" @iconSize="large" />
+  <DocLink @doc="host-catalog" @iconSize="large" />
 </h2>
 <p>{{t "resources.host-catalog.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs
index 1d63aa7e0..a101b0a8a 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.host-set.title"}}
-  <DocLink @doc="topics.host-set" @iconSize="large" />
+  <DocLink @doc="host-set" @iconSize="large" />
 </h2>
 <p>{{t "resources.host-set.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs
index ef9992c2c..6ff650141 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs
@@ -1,2 +1,5 @@
-<h2>{{t "resources.host-set.host.messages.add.title"}}</h2>
-<p>{{t "resources.host-set.host.messages.add.description"}}</p>
\ No newline at end of file
+<h2>
+  {{t "resources.host-set.host.messages.add.title"}}
+  <DocLink @doc="host-set.add-hosts" @iconSize="large" />
+</h2>
+<p>{{t "resources.host-set.host.messages.add.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs
index ace8ccb08..38ae01334 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs
@@ -1 +1,4 @@
-<h2>{{t "titles.new"}}</h2>
\ No newline at end of file
+<h2>
+  {{t "titles.new"}}
+  <DocLink @doc="host-set.new" @iconSize="large" />
+</h2>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs
index 3c28edc80..7b15e6f0f 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.host.title"}}
-  <DocLink @doc="topics.host" @iconSize="large" />
+  <DocLink @doc="host" @iconSize="large" />
 </h2>
 <p>{{t "resources.host.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/new/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/new/-header.hbs
index ace8ccb08..3122f3b43 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/new/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/new/-header.hbs
@@ -1 +1,4 @@
-<h2>{{t "titles.new"}}</h2>
\ No newline at end of file
+<h2>
+  {{t "titles.new"}}
+  <DocLink @doc="host.new" @iconSize="large" />
+</h2>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
index 120ae0e48..91a17f32d 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.host-catalog.title_plural"}}
-      <DocLink @doc="topics.host-catalog" @iconSize="large" />
+      <DocLink @doc="host-catalog" @iconSize="large" />
     </h2>
     <p>{{t "resources.host-catalog.description"}}</p>
   </page.header>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs
index 0d969f874..641fd3ff9 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs
@@ -7,7 +7,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "titles.new"}}</h2>
+    <h2>
+      {{t "titles.new"}}
+      <DocLink @doc="host-catalog.new" @iconSize="large" />
+    </h2>
   </page.header>
 
   <page.body>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/index.hbs
index 4cb31e30a..02f7a667b 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.project.title"}}
-      <DocLink @doc="topics.project" @iconSize="large" />
+      <DocLink @doc="project" @iconSize="large" />
     </h2>
     <p>{{t "resources.project.description"}}</p>
     <Copyable
diff --git a/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
index 7ebdf1ece..2271e2473 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/sessions/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.session.title_plural"}}
-      <DocLink @doc="topics.session" @iconSize="large" />
+      <DocLink @doc="session" @iconSize="large" />
     </h2>
     <p>{{t "resources.session.description"}}</p>
   </page.header>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
index 9615a7c2d..6efba5727 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.target.title_plural"}}
-      <DocLink @doc="topics.target" @iconSize="large" />
+      <DocLink @doc="target" @iconSize="large" />
     </h2>
     {{#if @model}}
       <p>{{t "resources.target.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs
index 4ac91435b..f161f252b 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs
@@ -7,7 +7,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "titles.new"}}</h2>
+    <h2>
+      {{t "titles.new"}}
+      <DocLink @doc="target.new" @iconSize="large" />
+    </h2>
   </page.header>
 
   <page.body>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
index b94a925a8..14e01c1de 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.target.title"}}
-  <DocLink @doc="topics.target" @iconSize="large" />
+  <DocLink @doc="target" @iconSize="large" />
 </h2>
 <p>{{t "resources.target.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/add-host-sets/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/add-host-sets/-header.hbs
index 794392a62..64fc3df9a 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/add-host-sets/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/add-host-sets/-header.hbs
@@ -1,2 +1,5 @@
-<h2>{{t "resources.target.host-set.messages.add.title"}}</h2>
-<p>{{t "resources.target.host-set.messages.add.description"}}</p>
\ No newline at end of file
+<h2>
+  {{t "resources.target.host-set.messages.add.title"}}
+  <DocLink @doc="target.add-host-sets" @iconSize="large" />
+</h2>
+<p>{{t "resources.target.host-set.messages.add.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/roles/index.hbs b/ui/core/app/templates/scopes/scope/roles/index.hbs
index 2175ad1a9..8acc8ee3a 100644
--- a/ui/core/app/templates/scopes/scope/roles/index.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.role.title_plural"}}
-      <DocLink @doc="topics.role" @iconSize="large" />
+      <DocLink @doc="role" @iconSize="large" />
     </h2>
     {{#if @model}}
       <p>{{t "resources.role.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
index a04e5edc1..142af2e8d 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.role.title"}}
-  <DocLink @doc="topics.role" @iconSize="large" />
+  <DocLink @doc="role" @iconSize="large" />
 </h2>
 <p>{{t "resources.role.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/roles/role/add-principals/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/add-principals/-header.hbs
index 819b49dda..f49d2b130 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/add-principals/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/add-principals/-header.hbs
@@ -1,2 +1,5 @@
-<h2>{{t "resources.role.principal.messages.add-principals.title"}}</h2>
-<p>{{t "resources.role.principal.messages.add-principals.description"}}</p>
\ No newline at end of file
+<h2>
+  {{t "resources.role.principal.messages.add-principals.title"}}
+  <DocLink @doc="role.add-principals" @iconSize="large" />
+</h2>
+<p>{{t "resources.role.principal.messages.add-principals.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
index 84395fb77..4aea69c7e 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.role.title"}}
-  <DocLink @doc="topics.role" @iconSize="large" />
+  <DocLink @doc="role" @iconSize="large" />
 </h2>
 <p>{{t "resources.role.grant.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
index 8854ae095..b6c179259 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.role.title"}}
-  <DocLink @doc="topics.role" @iconSize="large" />
+  <DocLink @doc="role" @iconSize="large" />
 </h2>
 <p>{{t "resources.role.principal.description"}}</p>
 <Copyable
diff --git a/ui/core/app/templates/scopes/scope/users/index.hbs b/ui/core/app/templates/scopes/scope/users/index.hbs
index ad66923e5..2cc8357ed 100644
--- a/ui/core/app/templates/scopes/scope/users/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/index.hbs
@@ -7,7 +7,7 @@
   <page.header>
     <h2>
       {{t "resources.user.title_plural"}}
-      <DocLink @doc="topics.user" @iconSize="large" />
+      <DocLink @doc="user" @iconSize="large" />
     </h2>
     {{#if @model}}
       <p>{{t "resources.user.description"}}</p>
diff --git a/ui/core/app/templates/scopes/scope/users/user/-header.hbs b/ui/core/app/templates/scopes/scope/users/user/-header.hbs
index 1f80dcfc5..d6208892e 100644
--- a/ui/core/app/templates/scopes/scope/users/user/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/-header.hbs
@@ -1,6 +1,6 @@
 <h2>
   {{t "resources.user.title"}}
-  <DocLink @doc="topics.user" @iconSize="large" />
+  <DocLink @doc="user" @iconSize="large" />
 </h2>
 <p>{{t "resources.user.description"}}</p>
 <Copyable
diff --git a/ui/core/config/environment.js b/ui/core/config/environment.js
index 0eb7294af..35a77d0f3 100644
--- a/ui/core/config/environment.js
+++ b/ui/core/config/environment.js
@@ -41,18 +41,29 @@ module.exports = function (environment) {
     documentation: {
       baseURL: 'https://boundaryproject.io/help/admin-ui',
       topics: {
-        org: '/org',
-        project: '/project',
-        account: '/account',
-        'auth-method': '/auth-method',
-        group: '/group',
-        'host-catalog': '/host-catalog',
-        'host-set': '/host-set',
-        host: '/host',
-        role: '/role',
-        session: '/session',
-        target: '/target',
-        user: '/user'
+        org: '/orgs',
+        'org.new': '/orgs/new',
+        project: '/projects',
+        'project.new': '/projects/new',
+        account: '/accounts',
+        'account.new': '/accounts/new',
+        'auth-method': '/auth-methods',
+        group: '/groups',
+        'group.add-members': '/groups/add-members',
+        'host-catalog': '/host-catalogs',
+        'host-catalog.new': '/host-catalogs/new',
+        'host-set': '/host-sets',
+        'host-set.new': '/host-sets/new',
+        'host-set.add-hosts': '/host-sets/add-hosts',
+        host: '/hosts',
+        'host.new': '/hosts/new',
+        role: '/roles',
+        'role.add-principals': '/roles/add-principals',
+        session: '/sessions',
+        target: '/targets',
+        'target.new': '/targets/new',
+        'target.add-host-sets': '/targets/add-host-sets',
+        user: '/users'
       }
     },
 
diff --git a/ui/core/tests/integration/components/doc-link-test.js b/ui/core/tests/integration/components/doc-link-test.js
index 36947afcc..43d0b9a1c 100644
--- a/ui/core/tests/integration/components/doc-link-test.js
+++ b/ui/core/tests/integration/components/doc-link-test.js
@@ -8,7 +8,7 @@ module('Integration | Component | doc-link', function(hooks) {
 
   test('it renders', async function(assert) {
     assert.expect(1);
-    await render(hbs`<DocLink @doc="topics.account" @iconSize="large" />`);
+    await render(hbs`<DocLink @doc="account" @iconSize="large" />`);
     assert.ok(find('.doc-link .rose-icon.large'));
   });
 });
diff --git a/ui/core/tests/integration/helpers/doc-url-test.js b/ui/core/tests/integration/helpers/doc-url-test.js
index d91c9eeed..d4263c1eb 100644
--- a/ui/core/tests/integration/helpers/doc-url-test.js
+++ b/ui/core/tests/integration/helpers/doc-url-test.js
@@ -11,7 +11,7 @@ module('Integration | Helper | doc-url', function(hooks) {
     assert.expect(3);
     const baseURL = config.documentation.baseURL;
     const path = config.documentation.topics.account;
-    await render(hbs`{{doc-url 'topics.account'}}`);
+    await render(hbs`{{doc-url 'account'}}`);
     assert.ok(baseURL);
     assert.ok(path);
     assert.equal(this.element.textContent.trim(), `${baseURL}${path}`);
@@ -20,7 +20,7 @@ module('Integration | Helper | doc-url', function(hooks) {
   test('it throws an error if the specified documentation path cannot be found', async function(assert) {
     assert.expect(2);
     const helper = this.owner.lookup('helper:doc-url');
-    assert.ok(helper.compute(['topics.account']), 'Specified document exists.')
+    assert.ok(helper.compute(['account']), 'Specified document exists.')
     assert.throws(() => {
       helper.compute(['no.such.doc']);
     }, 'Specified documentation was not found, so the helper threw an error.');
diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml
index fccc4b485..bdb87f84a 100644
--- a/ui/core/translations/resources/en-us.yaml
+++ b/ui/core/translations/resources/en-us.yaml
@@ -107,14 +107,14 @@ session:
 org:
   title: Organization
   title_plural: Organizations
-  description: An organization is a type of scope used to organize projects and IAM resources.  Organizations contain projects and is a child scope of global.
+  description: An organization is a type of scope used to organize projects and IAM resources.  Organizations are child scopes of the global scope.
   messages:
     welcome:
       title: Welcome to Organizations
 project:
   title: Project
   title_plural: Projects
-  description: A project is a type of scope used to organize resources such as by targets and host catalogs.
+  description: A project is a type of scope used to organize resources such as targets and host catalogs.
   messages:
     welcome:
       title: Welcome to Projects