diff --git a/ui/core/app/components/form/account/password/change-password/index.hbs b/ui/core/app/components/form/account/password/change-password/index.hbs
index a0d85390d..e3ebf0775 100644
--- a/ui/core/app/components/form/account/password/change-password/index.hbs
+++ b/ui/core/app/components/form/account/password/change-password/index.hbs
@@ -10,7 +10,7 @@
     @name="currentPassword"
     @type="password"
     @value={{this.currentPassword}}
-    @label={{t "form.label.current_password"}}
+    @label={{t "form.current_password.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
     autocomplete="current-password"
@@ -28,7 +28,7 @@
     @name="newPassword"
     @type="password"
     @value={{this.newPassword}}
-    @label={{t "form.label.new_password"}}
+    @label={{t "form.new_password.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
     autocomplete="new-password"
diff --git a/ui/core/app/components/form/account/password/index.hbs b/ui/core/app/components/form/account/password/index.hbs
index facd43c2f..391a524d5 100644
--- a/ui/core/app/components/form/account/password/index.hbs
+++ b/ui/core/app/components/form/account/password/index.hbs
@@ -7,7 +7,7 @@
 >
   <form.input
   @value={{t (concat 'account.types.' @model.type)}}
-  @label={{t "form.label.type"}}
+  @label={{t "form.type.label"}}
   readonly={{true}}
   @disabled={{true}} />
 
@@ -15,7 +15,7 @@
     @name="name"
     @type="name"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -32,7 +32,7 @@
     @name="description"
     @type="description"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
@@ -50,7 +50,7 @@
     @name="login_name"
     @type="text"
     @value={{@model.attributes.login_name}}
-    @label={{t "form.label.identification"}}
+    @label={{t "form.login_name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -68,7 +68,7 @@
       @name="password"
       @type="password"
       @value={{this.password}}
-      @label={{t "form.label.password"}}
+      @label={{t "form.password.label"}}
       @error={{@model.errors.name}}
       readonly={{false}}
       autocomplete="new-password"
diff --git a/ui/core/app/components/form/account/password/set-password/index.hbs b/ui/core/app/components/form/account/password/set-password/index.hbs
index 7d88d57eb..80780ccc3 100644
--- a/ui/core/app/components/form/account/password/set-password/index.hbs
+++ b/ui/core/app/components/form/account/password/set-password/index.hbs
@@ -10,7 +10,7 @@
     @name="password"
     @type="password"
     @value={{this.password}}
-    @label={{t "form.label.password"}}
+    @label={{t "form.password.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
     autocomplete="new-password"
diff --git a/ui/core/app/components/form/auth-method/index.hbs b/ui/core/app/components/form/auth-method/index.hbs
index 7c1bc5162..782dceefd 100644
--- a/ui/core/app/components/form/auth-method/index.hbs
+++ b/ui/core/app/components/form/auth-method/index.hbs
@@ -7,7 +7,7 @@
 >
   <form.input
   @value={{t (concat 'auth.method-types.' @model.type)}}
-  @label={{t "form.label.type"}}
+  @label={{t "form.type.label"}}
   readonly={{true}}
   @disabled={{true}} />
 
@@ -15,7 +15,7 @@
     @name="name"
     @type="name"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -32,7 +32,7 @@
     @name="description"
     @type="description"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
diff --git a/ui/core/app/components/form/group/add-members/index.hbs b/ui/core/app/components/form/group/add-members/index.hbs
index 30f9308c6..14943ae3f 100644
--- a/ui/core/app/components/form/group/add-members/index.hbs
+++ b/ui/core/app/components/form/group/add-members/index.hbs
@@ -15,8 +15,8 @@
     <Rose::Table as |table|>
       <table.header as |header|>
         <header.row as |row|>
-          <row.headerCell>{{t 'form.label.id'}}</row.headerCell>
-          <row.headerCell>{{t 'form.label.name'}}</row.headerCell>
+          <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+          <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
         </header.row>
       </table.header>
       <table.body as |body|>
diff --git a/ui/core/app/components/form/group/index.hbs b/ui/core/app/components/form/group/index.hbs
index 45adc26d0..0bcc6df4c 100644
--- a/ui/core/app/components/form/group/index.hbs
+++ b/ui/core/app/components/form/group/index.hbs
@@ -10,7 +10,7 @@
     @name="name"
     @type="name"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -27,7 +27,7 @@
     @name="description"
     @type="description"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
diff --git a/ui/core/app/components/form/host-catalog/index.hbs b/ui/core/app/components/form/host-catalog/index.hbs
index 45adc26d0..0bcc6df4c 100644
--- a/ui/core/app/components/form/host-catalog/index.hbs
+++ b/ui/core/app/components/form/host-catalog/index.hbs
@@ -10,7 +10,7 @@
     @name="name"
     @type="name"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -27,7 +27,7 @@
     @name="description"
     @type="description"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
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 b6428b1c1..b743efe0b 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
@@ -15,9 +15,9 @@
     <Rose::Table as |table|>
       <table.header as |header|>
         <header.row as |row|>
-          <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-          <row.headerCell>{{t "form.label.type"}}</row.headerCell>
-          <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+          <row.headerCell>{{t "form.name.label"}}</row.headerCell>
+          <row.headerCell>{{t "form.type.label"}}</row.headerCell>
+          <row.headerCell>{{t "form.id.label"}}</row.headerCell>
         </header.row>
       </table.header>
       <table.body as |body|>
diff --git a/ui/core/app/components/form/host-set/hosts/index.hbs b/ui/core/app/components/form/host-set/hosts/index.hbs
index 088270a0b..6fb9e5158 100644
--- a/ui/core/app/components/form/host-set/hosts/index.hbs
+++ b/ui/core/app/components/form/host-set/hosts/index.hbs
@@ -25,9 +25,9 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.headerCell>{{t 'form.label.id'}}</row.headerCell>
-        <row.headerCell>{{t 'form.label.name'}}</row.headerCell>
-        <row.headerCell>{{t 'form.label.address'}}</row.headerCell>
+        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.address.label'}}</row.headerCell>
       </header.row>
     </table.header>
     <table.body as |body|>
diff --git a/ui/core/app/components/form/host-set/index.hbs b/ui/core/app/components/form/host-set/index.hbs
index beb85b652..82f093d2c 100644
--- a/ui/core/app/components/form/host-set/index.hbs
+++ b/ui/core/app/components/form/host-set/index.hbs
@@ -8,7 +8,7 @@
 
   <form.input
   @value={{t (concat 'host-set.types.' @model.type)}}
-  @label={{t "form.label.type"}}
+  @label={{t "form.type.label"}}
   readonly={{true}}
   @disabled={{true}} />
 
@@ -16,7 +16,7 @@
     @name="name"
     @type="name"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -33,7 +33,7 @@
     @name="description"
     @type="description"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
diff --git a/ui/core/app/components/form/host/index.hbs b/ui/core/app/components/form/host/index.hbs
index 72951a2a4..7c0fcb8ef 100644
--- a/ui/core/app/components/form/host/index.hbs
+++ b/ui/core/app/components/form/host/index.hbs
@@ -8,7 +8,7 @@
 
   <form.input
   @value={{t (concat 'host.types.' @model.type)}}
-  @label={{t "form.label.type"}}
+  @label={{t "form.type.label"}}
   readonly={{true}}
   @disabled={{true}} />
 
@@ -16,7 +16,7 @@
     @name="name"
     @type="name"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -33,7 +33,7 @@
     @name="description"
     @type="description"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
@@ -51,7 +51,7 @@
     @name="address"
     @type="text"
     @value={{@model.attributes.address}}
-    @label={{t "form.label.address"}}
+    @label={{t "form.address.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
diff --git a/ui/core/app/components/form/org/index.hbs b/ui/core/app/components/form/org/index.hbs
index 45adc26d0..0bcc6df4c 100644
--- a/ui/core/app/components/form/org/index.hbs
+++ b/ui/core/app/components/form/org/index.hbs
@@ -10,7 +10,7 @@
     @name="name"
     @type="name"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -27,7 +27,7 @@
     @name="description"
     @type="description"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
diff --git a/ui/core/app/components/form/project/index.hbs b/ui/core/app/components/form/project/index.hbs
index 45adc26d0..0bcc6df4c 100644
--- a/ui/core/app/components/form/project/index.hbs
+++ b/ui/core/app/components/form/project/index.hbs
@@ -10,7 +10,7 @@
     @name="name"
     @type="name"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -27,7 +27,7 @@
     @name="description"
     @type="description"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
diff --git a/ui/core/app/components/form/role/add-principals/index.hbs b/ui/core/app/components/form/role/add-principals/index.hbs
index 86cefd36a..29e1a460c 100644
--- a/ui/core/app/components/form/role/add-principals/index.hbs
+++ b/ui/core/app/components/form/role/add-principals/index.hbs
@@ -15,9 +15,9 @@
     <Rose::Table as |table|>
       <table.header as |header|>
         <header.row as |row|>
-          <row.headerCell>{{t 'form.label.id'}}</row.headerCell>
-          <row.headerCell>{{t 'form.label.name'}}</row.headerCell>
-          <row.headerCell>{{t 'form.label.type'}}</row.headerCell>
+          <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+          <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+          <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
         </header.row>
       </table.header>
       <table.body as |body|>
diff --git a/ui/core/app/components/form/role/grants/index.hbs b/ui/core/app/components/form/role/grants/index.hbs
index 098621b45..9cd980868 100644
--- a/ui/core/app/components/form/role/grants/index.hbs
+++ b/ui/core/app/components/form/role/grants/index.hbs
@@ -63,7 +63,7 @@
           @error={{@model.errors.grants}}
         as |input|>
           <item.key>
-            <input.label>{{t "form.label.grant"}}</input.label>
+            <input.label>{{t "form.grant.label"}}</input.label>
           </item.key>
           <item.cell>
             <input.field />
diff --git a/ui/core/app/components/form/role/index.hbs b/ui/core/app/components/form/role/index.hbs
index 45adc26d0..0bcc6df4c 100644
--- a/ui/core/app/components/form/role/index.hbs
+++ b/ui/core/app/components/form/role/index.hbs
@@ -10,7 +10,7 @@
     @name="name"
     @type="name"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -27,7 +27,7 @@
     @name="description"
     @type="description"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
diff --git a/ui/core/app/components/form/target/add-host-sets/index.hbs b/ui/core/app/components/form/target/add-host-sets/index.hbs
index bd0f9f5fe..46fc66308 100644
--- a/ui/core/app/components/form/target/add-host-sets/index.hbs
+++ b/ui/core/app/components/form/target/add-host-sets/index.hbs
@@ -14,9 +14,9 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.headerCell>{{t 'form.label.id'}}</row.headerCell>
-        <row.headerCell>{{t 'form.label.name'}}</row.headerCell>
-        <row.headerCell>{{t 'form.label.type'}}</row.headerCell>
+        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
         <row.headerCell>{{t 'resources.host-catalog'}}</row.headerCell>
       </header.row>
     </table.header>
diff --git a/ui/core/app/components/form/target/index.hbs b/ui/core/app/components/form/target/index.hbs
index 5a977d2e4..7cc431613 100644
--- a/ui/core/app/components/form/target/index.hbs
+++ b/ui/core/app/components/form/target/index.hbs
@@ -8,7 +8,7 @@
 
   <form.input
   @value={{t (concat 'target.types.' @model.type)}}
-  @label={{t "form.label.type"}}
+  @label={{t "form.type.label"}}
   readonly={{true}}
   @disabled={{true}} />
 
@@ -16,7 +16,7 @@
     @name="name"
     @type="text"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
   as |field|>
     {{#if @model.errors.name}}
@@ -32,7 +32,7 @@
     @name="description"
     @type="text"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
   as |field|>
     {{#if @model.errors.description}}
@@ -49,7 +49,7 @@
     @name="default_port"
     @type="number"
     @value={{@model.attributes.default_port}}
-    @label={{t "form.label.default_port"}}
+    @label={{t "form.default_port.label"}}
     @error={{@model.errors.default_port}}
     min="0"
     step="1"
diff --git a/ui/core/app/components/form/user/index.hbs b/ui/core/app/components/form/user/index.hbs
index 45adc26d0..0bcc6df4c 100644
--- a/ui/core/app/components/form/user/index.hbs
+++ b/ui/core/app/components/form/user/index.hbs
@@ -10,7 +10,7 @@
     @name="name"
     @type="name"
     @value={{@model.name}}
-    @label={{t "form.label.name"}}
+    @label={{t "form.name.label"}}
     @error={{@model.errors.name}}
     readonly={{false}}
   as |field|>
@@ -27,7 +27,7 @@
     @name="description"
     @type="description"
     @value={{@model.description}}
-    @label={{t "form.label.description"}}
+    @label={{t "form.description.label"}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
index 83ed4fa1a..a1af0308d 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
@@ -3,9 +3,9 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.headerCell>{{t 'form.label.name'}}</row.headerCell>
-        <row.headerCell>{{t 'form.label.identification'}}</row.headerCell>
-        <row.headerCell>{{t 'form.label.id'}}</row.headerCell>
+        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.login_name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
       </header.row>
     </table.header>
     <table.body as |body|>
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 78e39a496..90ac6b2bc 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
@@ -22,9 +22,9 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.headerCell>{{t 'form.label.name'}}</row.headerCell>
-            <row.headerCell>{{t 'form.label.type'}}</row.headerCell>
-            <row.headerCell>{{t 'form.label.id'}}</row.headerCell>
+            <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
           </header.row>
         </table.header>
 
diff --git a/ui/core/app/templates/scopes/scope/authenticate/method.hbs b/ui/core/app/templates/scopes/scope/authenticate/method.hbs
index 014adf65b..589acdbfa 100644
--- a/ui/core/app/templates/scopes/scope/authenticate/method.hbs
+++ b/ui/core/app/templates/scopes/scope/authenticate/method.hbs
@@ -11,13 +11,13 @@
     @name="identification"
     @type="text"
     @value={{this.identification}}
-    @label={{t "form.label.identification"}} />
+    @label={{t "form.login_name.label"}} />
 
   <form.input
     @name="password"
     @type="password"
     @value={{this.password}}
-    @label={{t "form.label.password"}} />
+    @label={{t "form.password.label"}} />
 
   <form.actions
     @submitText={{t "actions.authenticate"}}
diff --git a/ui/core/app/templates/scopes/scope/groups/group/members.hbs b/ui/core/app/templates/scopes/scope/groups/group/members.hbs
index 24a6e13d9..7080c05f1 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/members.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/members.hbs
@@ -5,8 +5,8 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.headerCell>{{t 'form.label.name'}}</row.headerCell>
-        <row.headerCell>{{t 'form.label.id'}}</row.headerCell>
+        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
         <row.headerCell>{{t "titles.actions"}}</row.headerCell>
       </header.row>
     </table.header>
diff --git a/ui/core/app/templates/scopes/scope/groups/index.hbs b/ui/core/app/templates/scopes/scope/groups/index.hbs
index 21fd64095..8b153a923 100644
--- a/ui/core/app/templates/scopes/scope/groups/index.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/index.hbs
@@ -22,8 +22,8 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-            <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+            <row.headerCell>{{t "form.name.label"}}</row.headerCell>
+            <row.headerCell>{{t "form.id.label"}}</row.headerCell>
           </header.row>
         </table.header>
         <table.body as |body|>
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 b0ef4a625..6a89c2bc1 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
@@ -3,9 +3,9 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-        <row.headerCell>{{t "form.label.type"}}</row.headerCell>
-        <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+        <row.headerCell>{{t "form.name.label"}}</row.headerCell>
+        <row.headerCell>{{t "form.type.label"}}</row.headerCell>
+        <row.headerCell>{{t "form.id.label"}}</row.headerCell>
         <row.headerCell>{{t "titles.actions"}}</row.headerCell>
       </header.row>
     </table.header>
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 a97f7852d..be027d78c 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
@@ -3,9 +3,9 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-        <row.headerCell>{{t "form.label.type"}}</row.headerCell>
-        <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+        <row.headerCell>{{t "form.name.label"}}</row.headerCell>
+        <row.headerCell>{{t "form.type.label"}}</row.headerCell>
+        <row.headerCell>{{t "form.id.label"}}</row.headerCell>
       </header.row>
     </table.header>
     <table.body as |body|>
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 2cac93ee4..98bc8c2b9 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
@@ -3,10 +3,10 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-        <row.headerCell>{{t "form.label.type"}}</row.headerCell>
-        <row.headerCell>{{t "form.label.id"}}</row.headerCell>
-        <row.headerCell>{{t "form.label.address"}}</row.headerCell>
+        <row.headerCell>{{t "form.name.label"}}</row.headerCell>
+        <row.headerCell>{{t "form.type.label"}}</row.headerCell>
+        <row.headerCell>{{t "form.id.label"}}</row.headerCell>
+        <row.headerCell>{{t "form.address.label"}}</row.headerCell>
       </header.row>
     </table.header>
     <table.body as |body|>
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 1a4717479..dda201a70 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
@@ -24,9 +24,9 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-            <row.headerCell>{{t "form.label.type"}}</row.headerCell>
-            <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+            <row.headerCell>{{t "form.name.label"}}</row.headerCell>
+            <row.headerCell>{{t "form.type.label"}}</row.headerCell>
+            <row.headerCell>{{t "form.id.label"}}</row.headerCell>
           </header.row>
         </table.header>
         <table.body as |body|>
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 6fe82d12b..587b6a963 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
@@ -15,11 +15,11 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+            <row.headerCell>{{t "form.id.label"}}</row.headerCell>
             <row.headerCell>{{t "resources.user"}}</row.headerCell>
             <row.headerCell>{{t "resources.target"}}</row.headerCell>
-            <row.headerCell>{{t "form.label.started"}}</row.headerCell>
-            <row.headerCell>{{t "form.label.status"}}</row.headerCell>
+            <row.headerCell>{{t "form.started.label"}}</row.headerCell>
+            <row.headerCell>{{t "form.status.label"}}</row.headerCell>
             <row.headerCell>{{t "titles.actions"}}</row.headerCell>
           </header.row>
         </table.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 af99edaec..987d342d1 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
@@ -24,9 +24,9 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-            <row.headerCell>{{t "form.label.type"}}</row.headerCell>
-            <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+            <row.headerCell>{{t "form.name.label"}}</row.headerCell>
+            <row.headerCell>{{t "form.type.label"}}</row.headerCell>
+            <row.headerCell>{{t "form.id.label"}}</row.headerCell>
           </header.row>
         </table.header>
         <table.body as |body|>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
index 583a8df55..acdad4643 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
@@ -5,9 +5,9 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-        <row.headerCell>{{t "form.label.type"}}</row.headerCell>
-        <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+        <row.headerCell>{{t "form.name.label"}}</row.headerCell>
+        <row.headerCell>{{t "form.type.label"}}</row.headerCell>
+        <row.headerCell>{{t "form.id.label"}}</row.headerCell>
         <row.headerCell>{{t "titles.actions"}}</row.headerCell>
       </header.row>
     </table.header>
diff --git a/ui/core/app/templates/scopes/scope/roles/index.hbs b/ui/core/app/templates/scopes/scope/roles/index.hbs
index dcb462b4d..cf9ae52ca 100644
--- a/ui/core/app/templates/scopes/scope/roles/index.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/index.hbs
@@ -22,8 +22,8 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-            <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+            <row.headerCell>{{t "form.name.label"}}</row.headerCell>
+            <row.headerCell>{{t "form.id.label"}}</row.headerCell>
           </header.row>
         </table.header>
         <table.body as |body|>
diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
index 160c91c7b..2acc62cd0 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
@@ -5,9 +5,9 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.headerCell>{{t 'form.label.name'}}</row.headerCell>
-        <row.headerCell>{{t 'form.label.type'}}</row.headerCell>
-        <row.headerCell>{{t 'form.label.id'}}</row.headerCell>
+        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
         <row.headerCell>{{t "titles.actions"}}</row.headerCell>
       </header.row>
     </table.header>
diff --git a/ui/core/app/templates/scopes/scope/users/index.hbs b/ui/core/app/templates/scopes/scope/users/index.hbs
index 506abc01f..8ecec771c 100644
--- a/ui/core/app/templates/scopes/scope/users/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/index.hbs
@@ -22,8 +22,8 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-            <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+            <row.headerCell>{{t "form.name.label"}}</row.headerCell>
+            <row.headerCell>{{t "form.id.label"}}</row.headerCell>
           </header.row>
         </table.header>
         <table.body as |body|>
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index e462d9b33..2f30bf22e 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -83,26 +83,3 @@ descriptions:
   account-set-password: Set a password for the account.
   accounts-welcome: No accounts are available in this auth method.
   no-sessions: There are no active sessions at this time.
-states:
-  info: Info
-  success: Success
-  warning: Warning
-  error: Error
-form:
-  label:
-    id: ID
-    name: Name
-    description: Description
-    type: Type
-    identification: Username
-    password: Password
-    grant: Grant
-    principal: Principal
-    address: Address
-    protocol: Protocol
-    actions: Actions
-    default_port: Default Port
-    current_password: Current Password
-    new_password: New Password
-    started: Started
-    status: Status
diff --git a/ui/core/translations/form/en-us.yaml b/ui/core/translations/form/en-us.yaml
new file mode 100644
index 000000000..ff2030cff
--- /dev/null
+++ b/ui/core/translations/form/en-us.yaml
@@ -0,0 +1,26 @@
+id:
+  label: ID
+name:
+  label: Name
+description:
+  label: Description
+type:
+  label: Type
+login_name:
+  label: Username
+password:
+  label: Password
+grant:
+  label: Grant
+address:
+  label: Address
+default_port:
+  label: Default Port
+current_password:
+  label: Current Password
+new_password:
+  label: New Password
+started:
+  label: Started
+status:
+  label: Status
diff --git a/ui/core/translations/states/en-us.yaml b/ui/core/translations/states/en-us.yaml
new file mode 100644
index 000000000..585ed6a26
--- /dev/null
+++ b/ui/core/translations/states/en-us.yaml
@@ -0,0 +1,4 @@
+info: Info
+success: Success
+warning: Warning
+error: Error