diff --git a/ui/core/app/components/form/host-set/add-hosts/index.hbs b/ui/core/app/components/form/host-set/add-hosts/index.hbs
index b743efe0b..09be10a5b 100644
--- a/ui/core/app/components/form/host-set/add-hosts/index.hbs
+++ b/ui/core/app/components/form/host-set/add-hosts/index.hbs
@@ -43,9 +43,9 @@
 
 {{#unless this.hasAvailableHosts}}
   <Rose::Layout::Centered>
-    <Rose::Message @title={{t "titles.no-host-set-hosts"}} as |message|>
+    <Rose::Message @title={{t "resources.host-set.messages.add-hosts.title"}} as |message|>
       <message.description>
-        {{t "descriptions.no-host-set-hosts"}}
+        {{t "resources.host-set.messages.add-hosts.description"}}
       </message.description>
       <message.link @route="scopes.scope.projects.project.host-catalogs.host-catalog.host-sets.host-set.hosts">
         <Rose::Icon @name="chevron-left" />
diff --git a/ui/core/app/components/form/host-set/index.hbs b/ui/core/app/components/form/host-set/index.hbs
index 82f093d2c..24e7c84da 100644
--- a/ui/core/app/components/form/host-set/index.hbs
+++ b/ui/core/app/components/form/host-set/index.hbs
@@ -7,7 +7,7 @@
 >
 
   <form.input
-  @value={{t (concat 'host-set.types.' @model.type)}}
+  @value={{t (concat 'resources.host-set.types.' @model.type)}}
   @label={{t "form.type.label"}}
   readonly={{true}}
   @disabled={{true}} />
diff --git a/ui/core/app/components/form/host/index.hbs b/ui/core/app/components/form/host/index.hbs
index af2ddf471..2cc1d3157 100644
--- a/ui/core/app/components/form/host/index.hbs
+++ b/ui/core/app/components/form/host/index.hbs
@@ -7,7 +7,7 @@
 >
 
   <form.input
-  @value={{t (concat 'host.types.' @model.type)}}
+  @value={{t (concat 'resources.host.types.' @model.type)}}
   @label={{t "form.type.label"}}
   readonly={{true}}
   @disabled={{true}} />
diff --git a/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js b/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js
index 381afcab6..2ec9620d3 100644
--- a/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js
+++ b/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js
@@ -13,6 +13,6 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsCo
    * @type {string}
    */
   get breadCrumb() {
-    return this.intl.t('resources.host-sets');
+    return this.intl.t('resources.host-set.title_plural');
   }
 }
diff --git a/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.js b/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.js
index 04a32f97f..589649129 100644
--- a/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.js
+++ b/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.js
@@ -13,6 +13,6 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostsContr
    * @type {string}
    */
   get breadCrumb() {
-    return this.intl.t('resources.hosts');
+    return this.intl.t('resources.host.title_plural');
   }
 }
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs
index 1313c2f9a..557d572ba 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs
@@ -3,13 +3,13 @@
     @route="scopes.scope.projects.project.host-catalogs.host-catalog.hosts.new"
     @model={{@model}}
   >
-    {{t "actions.add-host"}}
+    {{t "resources.host.actions.add"}}
   </dropdown.link>
   <dropdown.link
     @route="scopes.scope.projects.project.host-catalogs.host-catalog.host-sets.new"
     @model={{@model}}
   >
-    {{t "actions.add-host-set"}}
+    {{t "resources.host-set.actions.add"}}
   </dropdown.link>
   <dropdown.separator />
   <dropdown.button
@@ -17,6 +17,6 @@
     @disabled={{@model.canSave}}
     {{on "click" (route-action "delete" @model)}}
   >
-    {{t 'actions.delete-host-catalog'}}
+    {{t 'resources.host-catalog.actions.delete'}}
   </dropdown.button>
 </Rose::Dropdown>
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-navigation.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-navigation.hbs
index 0e02c6c14..5be44792b 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-navigation.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-navigation.hbs
@@ -3,9 +3,9 @@
     {{t 'titles.details'}}
   </nav.link>
   <nav.link @route='scopes.scope.projects.project.host-catalogs.host-catalog.host-sets'>
-    {{t 'titles.host-sets'}}
+    {{t 'resources.host-set.title_plural'}}
   </nav.link>
   <nav.link @route='scopes.scope.projects.project.host-catalogs.host-catalog.hosts'>
-    {{t 'titles.hosts'}}
+    {{t 'resources.host.title_plural'}}
   </nav.link>
 </Rose::Nav::Tabs>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.hbs
index 49966461b..37ecd2d33 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.host-sets")}}
+{{title (t "resources.host-set.title_plural")}}
 
 {{outlet}}
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions.hbs
index ec81ba648..0b6331854 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions.hbs
@@ -1,12 +1,12 @@
 <Rose::Dropdown @text="{{t 'actions.manage'}}" @dropdownRight={{true}} as |dropdown|>
   <dropdown.link @route="scopes.scope.projects.project.host-catalogs.host-catalog.host-sets.host-set.add-hosts">
-    {{t 'actions.add-hosts'}}
+    {{t 'resources.host-set.actions.add-hosts'}}
   </dropdown.link>
   <dropdown.button
     @style="danger"
     @disabled={{@model.canSave}}
     {{on "click" (route-action "delete" @model)}}
   >
-    {{t 'actions.delete-host-set'}}
+    {{t 'resources.host-set.actions.delete'}}
   </dropdown.button>
 </Rose::Dropdown>
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
index 05fa412e3..9cc76e026 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
@@ -1,2 +1,2 @@
-<h2>{{t "resources.host-set"}}</h2>
-<p>{{t "resources.descriptions.host-set"}}</p>
\ No newline at end of file
+<h2>{{t "resources.host-set.title"}}</h2>
+<p>{{t "resources.host-set.description"}}</p>
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation.hbs
index 8e2795027..93590ba90 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation.hbs
@@ -3,6 +3,6 @@
     {{t 'titles.details'}}
   </nav.link>
   <nav.link @route='scopes.scope.projects.project.host-catalogs.host-catalog.host-sets.host-set.hosts'>
-    {{t 'resources.hosts'}}
+    {{t 'resources.host.title_plural'}}
   </nav.link>
 </Rose::Nav::Tabs>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs
index 3b3070bf7..b185f9550 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs
@@ -1,4 +1,4 @@
-{{title (t "actions.add-hosts")}}
+{{title (t "resources.host-set.actions.add-hosts")}}
 
 <Form::HostSet::AddHosts
   @model={{@model.hostSet}}
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 eab1e4623..2267ffd96 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 +1 @@
-<h2>{{t "actions.add-hosts"}}</h2>
+<h2>{{t "resources.host-set.actions.add-hosts"}}</h2>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
index 6a89c2bc1..ae7c6ec90 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
@@ -52,9 +52,9 @@
 
 {{#unless @model.hosts}}
   <Rose::Layout::Centered>
-    <Rose::Message @title={{t "titles.no-host-set-hosts"}} as |message|>
+    <Rose::Message @title={{t "resources.host.messages.none.title"}} as |message|>
       <message.description>
-        {{t "descriptions.no-host-set-hosts"}}
+        {{t "resources.host.messages.none.description"}}
       </message.description>
       <message.link @route="scopes.scope.projects.project.host-catalogs.host-catalog.hosts.new">
         <Rose::Icon @name="plus-circle-outline" />
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
index be027d78c..0b0b90663 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
@@ -21,7 +21,9 @@
             <p>{{hostSet.description}}</p>
           </row.headerCell>
           <row.cell>
-            <Rose::Badge>{{hostSet.type}}</Rose::Badge>
+            <Rose::Badge>
+              {{t (concat 'resources.host-set.types.' hostSet.type)}}
+            </Rose::Badge>
           </row.cell>
           <row.cell>
             <code>{{hostSet.id}}</code>
@@ -34,9 +36,9 @@
 {{else}}
 
   <Rose::Layout::Centered>
-    <Rose::Message @title={{t "titles.host-sets-welcome"}} as |message|>
+    <Rose::Message @title={{t "resources.host-set.messages.welcome.title"}} as |message|>
       <message.description>
-        {{t "descriptions.host-sets-welcome"}}
+        {{t "resources.host-set.description"}}
       </message.description>
       <message.link @route="scopes.scope.projects.project.host-catalogs.host-catalog.host-sets.new">
         <Rose::Icon @name="plus-circle-outline" />
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.hbs
index 863e34ea9..aff384fe4 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.hosts")}}
+{{title (t "resources.host.title_plural")}}
 
 {{outlet}}
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-actions.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-actions.hbs
index cef4c03c0..d01333c17 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-actions.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-actions.hbs
@@ -4,6 +4,6 @@
     @disabled={{@model.canSave}}
     {{on "click" (route-action "delete" @model)}}
   >
-    {{t 'actions.delete-host'}}
+    {{t 'resources.host.actions.delete'}}
   </dropdown.button>
 </Rose::Dropdown>
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
index d9eea7635..5896f2a8c 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs
@@ -1,2 +1,2 @@
-<h2>{{t "resources.host"}}</h2>
-<p>{{t "resources.descriptions.host"}}</p>
\ No newline at end of file
+<h2>{{t "resources.host.title"}}</h2>
+<p>{{t "resources.host.description"}}</p>
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
index 98bc8c2b9..3f1c23860 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
@@ -22,7 +22,9 @@
             <p>{{host.description}}</p>
           </row.headerCell>
           <row.cell>
-            <Rose::Badge>{{host.type}}</Rose::Badge>
+            <Rose::Badge>
+              {{t (concat 'resources.host.types.' host.type)}}
+            </Rose::Badge>
           </row.cell>
           <row.cell>
             <code>{{host.id}}</code>
@@ -38,9 +40,9 @@
 {{else}}
 
   <Rose::Layout::Centered>
-    <Rose::Message @title={{t "titles.hosts-welcome"}} as |message|>
+    <Rose::Message @title={{t "resources.host.messages.welcome.title"}} as |message|>
       <message.description>
-        {{t "descriptions.hosts-welcome"}}
+        {{t "resources.host.description"}}
       </message.description>
       <message.link @route="scopes.scope.projects.project.host-catalogs.host-catalog.hosts.new">
         <Rose::Icon @name="plus-circle-outline" />
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 e19459843..578a59c4a 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
@@ -43,7 +43,7 @@
               </row.headerCell>
               <row.cell>
                 <Rose::Badge>
-                  {{hostCatalog.type}}
+                  {{t (concat 'resources.host-catalog.types.' hostCatalog.type)}}
                 </Rose::Badge>
               </row.cell>
               <row.cell>
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index 6561047d6..f7f1be5d6 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -5,15 +5,9 @@ auth:
     no-scopes: No scopes were found.  To authenticate, ask your administrator to create an scope and grant you access.
     choose-org: Choose a scope to authenticate.
     authenticating-with-org: "You're authenticating with {name}."
-host-set:
-  types:
-    static: Static
 target:
   types:
     tcp: TCP
-host:
-  types:
-    static: Static
 titles:
   iam: IAM
   new: New
@@ -23,24 +17,16 @@ titles:
   overview: Overview
   settings: Settings
   empty-set: No Items Yet
-  host-sets-welcome: Welcome to Host Sets
-  hosts-welcome: Welcome to Hosts
   targets-welcome: Create your first Target
   target-host-sets-welcome: No Host Sets Associated
-  host-sets: Host Sets
-  hosts: Hosts
   targets: Targets
   global: Global
-  no-host-set-hosts: No Hosts Available
   no-host-sets-for-target: No Host Sets Available
   no-available-users: No Users Available
   actions: Actions
 descriptions:
   empty-set: There are no items to display yet.  You may be able to add items or try back later.
-  host-sets-welcome: Configure a static host set in this host catalog.
-  hosts-welcome: Configure a static host in this host catalog.
   targets-welcome: Targets provide Users the means to connect to and interact networked services. A Target contains a collection of Hosts and a collection of Credentials.
   target-host-sets-welcome: Add Host Sets to this target to provide access.
-  no-host-set-hosts: Before associating hosts with this host set, create hosts within the host catalog.
   no-host-sets-for-target: No host sets are available to add to this target.
   no-available-users: No users are available to add to this group.
diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml
index 1c1287707..87ad8d7a7 100644
--- a/ui/core/translations/resources/en-us.yaml
+++ b/ui/core/translations/resources/en-us.yaml
@@ -51,6 +51,43 @@ host-catalog:
   messages:
     welcome:
       title: Welcome to Host Catalogs
+  actions:
+    delete: Delete Host Catalog
+  types:
+    static: Static
+host-set:
+  title: Host Set
+  title_plural: Host Sets
+  description: A host set is a collection of hosts within a host catalog.
+  actions:
+    add: Add Host Set
+    create: New Host Set
+    delete: Delete Host Set
+    add-hosts: Add Hosts
+  messages:
+    welcome:
+      title: Welcome to Host Sets
+    add-hosts:
+      title: No Hosts Available
+      description: No hosts available in this scope for association.
+  types:
+    static: Static
+host:
+  title: Host
+  title_plural: Hosts
+  description: A host is a resource that may be accessed by a Boundary target.
+  messages:
+    welcome:
+      title: Welcome to Hosts
+    none:
+      title: No Hosts
+      description: No hosts available in this scope.
+  actions:
+    add: Add Host
+    create: New Host
+    delete: Delete Host
+  types:
+    static: Static
 session:
   title: Session
   title_plural: Sessions
@@ -115,16 +152,8 @@ role:
     description: Grants are permissions which allow roles to take actions and access resources
     actions:
       create: New Grant
-host-set: Host Set
-host-sets: Host Sets
-host: Host
-hosts: Hosts
 target: Target
 targets: Targets
 descriptions:
-  host-set: Host Set is abstract. A Host Set is deleted when the Host Catalog it belongs to is deleted.
-  host-sets: A host set is a resource which provides a subset of Hosts from the set of Hosts of the Host Catalog it belongs to. A Host Set belongs to one and only one Host Catalog. A Host Set can contain zero or more Hosts. A Host Set can be contained by zero or more Targets. The lifecycle of a Host Set is not tied to the lifecycle of any Targets or Hosts.
-  host: Host is abstract. A Host is deleted when the Host Catalog it belongs to is deleted.
-  hosts: A host is a computing element with a network address reachable from Boundary. A Host belongs to one and only one Host Catalog. A Host can be contained by zero or more Host Sets. The lifecycle of a Host is not tied to the lifecycle of any Host Sets.
   target: Target is abstract. A Target is deleted when the Scope it belongs to is deleted.
   targets: A target is a networked service a User can connect to and interact with through Boundary. A Target does not directly contain any secrets. A Target contains a collection of Hosts. A Target belongs to one and only one Scope. A Target can contain zero or more Host Sets. The lifecycle of a Target is not tied to the lifecycle of any Host Set.