diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 5cee71441..35e000970 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -85,19 +85,21 @@ host-catalog:
   actions:
     delete: Delete Host Catalog
   types:
-    static: Static
-    unknown: Unknown
-    aws: AWS
-    azure: Azure
-    dynamic: Dynamic
+    static:
+      label: Static
+      help: Provide a list of hosts and host sets with static addresses
+    unknown:
+      label: Unknown
+    aws:
+      label: AWS
+    azure:
+      label: Azure
+    dynamic: 
+      label: Dynamic
+      help: Automate discovery of target hosts and services on Azure or AWS
   form:
-    provider-details: 
+    provider_details: 
       label: Provider Details
-    types:
-      static: 
-        help: Provide a list of hosts and host sets with static addresses
-      dynamic: 
-        help: Automate discovery of target hosts and services on Azure or AWS
 host-set:
   title: Host Set
   title_plural: Host Sets
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index c94fe1f24..77dfc8a52 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -57,15 +57,15 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.static'}}
+            @label={{t 'resources.host-catalog.types.static.label'}}
             @value='static'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @helperText={{t 'resources.host-catalog.types.static.help'}}
             @layout='wide'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.dynamic'}}
+            @label={{t 'resources.host-catalog.types.dynamic.label'}}
             @value='plugin'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @helperText={{t 'resources.host-catalog.types.dynamic.help'}}
             @layout='wide'
           />
         </form.radioGroup>
@@ -76,7 +76,7 @@
 
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider-details.label'
+          'resources.host-catalog.form.provider_details.label'
         }}</:title>
       <:body>
         <form.radioGroup
@@ -86,13 +86,13 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.aws'}}
+            @label={{t 'resources.host-catalog.types.aws.label'}}
             @value='aws'
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.azure'}}
+            @label={{t 'resources.host-catalog.types.azure.label'}}
             @value='azure'
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
@@ -103,7 +103,7 @@
   {{else}}
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider-details.label'
+          'resources.host-catalog.form.provider_details.label'
         }}</:title>
       <:body>
         <form.radioGroup
@@ -113,7 +113,7 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.aws'}}
+            @label={{t 'resources.host-catalog.types.aws.label'}}
             @value='aws'
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs
index ee9696527..286d87f93 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -57,15 +57,15 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.static'}}
+            @label={{t 'resources.host-catalog.types.static.label'}}
             @value='static'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @helperText={{t 'resources.host-catalog.types.static.help'}}
             @layout='wide'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.dynamic'}}
+            @label={{t 'resources.host-catalog.types.dynamic.label'}}
             @value='plugin'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @helperText={{t 'resources.host-catalog.types.dynamic.help'}}
             @layout='wide'
           />
         </form.radioGroup>
@@ -74,7 +74,7 @@
     <Rose::Separator />
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider-details.label'
+          'resources.host-catalog.form.provider_details.label'
         }}</:title>
       <:body>
         <form.radioGroup
@@ -84,13 +84,13 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.aws'}}
+            @label={{t 'resources.host-catalog.types.aws.label'}}
             @value='aws'
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.azure'}}
+            @label={{t 'resources.host-catalog.types.azure.label'}}
             @value='azure'
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
@@ -101,7 +101,7 @@
   {{else}}
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider-details.label'
+          'resources.host-catalog.form.provider_details.label'
         }}</:title>
       <:body>
         <form.radioGroup
@@ -111,7 +111,7 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.azure'}}
+            @label={{t 'resources.host-catalog.types.azure.label'}}
             @value='azure'
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 10629e9db..548a66288 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -57,15 +57,15 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.static'}}
+            @label={{t 'resources.host-catalog.types.static.label'}}
             @value='static'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @helperText={{t 'resources.host-catalog.types.static.help'}}
             @layout='wide'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.dynamic'}}
+            @label={{t 'resources.host-catalog.types.dynamic.label'}}
             @value='plugin'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @helperText={{t 'resources.host-catalog.types.dynamic.help'}}
             @layout='wide'
           />
         </form.radioGroup>
@@ -76,7 +76,7 @@
       <Rose::Separator />
       <form.fieldset>
         <:title>{{t
-            'resources.host-catalog.form.provider-details.label'
+            'resources.host-catalog.form.provider_details.label'
           }}</:title>
         <:body>
           <form.radioGroup
@@ -86,12 +86,12 @@
             as |radioGroup|
           >
             <radioGroup.card
-              @label={{t 'resources.host-catalog.types.aws'}}
+              @label={{t 'resources.host-catalog.types.aws.label'}}
               @value='aws'
               @layout='tile'
             />
             <radioGroup.card
-              @label={{t 'resources.host-catalog.types.azure'}}
+              @label={{t 'resources.host-catalog.types.azure.label'}}
               @value='azure'
               @layout='tile'
             />
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
index f7def8b62..79e33a11c 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
@@ -62,6 +62,7 @@
                       (concat
                         'resources.host-catalog.types.'
                         hostCatalog.compositeType
+                        '.label'
                       )
                     }}
                   </Rose::Badge>
@@ -71,6 +72,7 @@
                       (concat
                         'resources.host-catalog.types.'
                         hostCatalog.compositeType
+                        '.label'
                       )
                     }}
                   </Rose::Badge>
@@ -86,6 +88,7 @@
                       (concat
                         'resources.host-catalog.types.'
                         hostCatalog.compositeType
+                        '.label'
                       )
                     }}
                   </Rose::Badge>