diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 9d001037f..52bd07d03 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -253,32 +253,36 @@ target:
   actions:
     create: New Target
     delete: Delete Target
-    add-host-sets: Add Host Sets
-    add-credential-libraries: Add Credential Libraries
+    add-host-sets: Add Host Sources
+    add-credential-libraries: Add Credential Sources
   types:
     tcp: TCP
   host-set:
+    title: Host Source
+    title_plural: Host Sources
     messages:
       welcome:
-        title: Welcome to Host Sets
-        description: No hosts sets in this target.
+        title: Welcome to Host Sources
+        description: No hosts sources in this target.
       none:
-        title: No Host Sets Available
-        description: No hosts sets available to add to target.
+        title: No Host Sources Available
+        description: No hosts sources available to add to target.
       add:
-        title: Add Host Sets
-        description: Select host sets to assign to this target.
+        title: Add Host Sources
+        description: Select host sources to assign to this target.
   credential-library:
+    title: Credential Source
+    title_plural: Credential Sources
     messages:
       welcome:
-        title: Welcome to Credential Libraries
-        description: No credential libraries in this target.
+        title: Welcome to Credential Sources
+        description: No credential sources in this target.
       none:
-        title: No Credential Libraries Available
-        description: No credential libraries available to add to this target.
+        title: No Credential Sources Available
+        description: No credential sources available to add to this target.
       add:
-        title: Add Credential Libraries
-        description: Select credential libraries to assign to this target.
+        title: Add Credential Sources
+        description: Select credential sources to assign to this target.
 credential-store:
   title: Credential Store
   title_plural: Credential Stores
diff --git a/ui/admin/app/components/form/target/add-host-sets/index.hbs b/ui/admin/app/components/form/target/add-host-sets/index.hbs
index 3bfd6b1b7..0ad80f766 100644
--- a/ui/admin/app/components/form/target/add-host-sets/index.hbs
+++ b/ui/admin/app/components/form/target/add-host-sets/index.hbs
@@ -9,7 +9,7 @@
   >
 
     <form.actions
-      @submitText={{t 'actions.add-host-sets'}}
+      @submitText={{t 'resources.target.actions.add-host-sets'}}
       @cancelText={{t 'actions.cancel'}}
     />
 
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/-navigation.hbs b/ui/admin/app/templates/scopes/scope/targets/target/-navigation.hbs
index c337646f9..027162874 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/-navigation.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/-navigation.hbs
@@ -3,11 +3,11 @@
     {{t 'titles.details'}}
   </nav.link>
   <nav.link @route='scopes.scope.targets.target.host-sets'>
-    {{t 'resources.host-set.title_plural'}}
+    {{t 'resources.target.host-set.title_plural'}}
   </nav.link>
   {{#if (feature-flag 'credential-store')}}
     <nav.link @route='scopes.scope.targets.target.credential-libraries'>
-      {{t 'resources.credential-library.title_plural'}}
+      {{t 'resources.target.credential-library.title_plural'}}
     </nav.link>
   {{/if}}
 </Rose::Nav::Tabs>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs b/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs
index f92cd3715..14d0b4d90 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs
@@ -1,4 +1,4 @@
-{{page-title (t 'resources.credential-library.title_plural')}}
+{{page-title (t 'resources.target.credential-library.title_plural')}}
 
 {{#if @model.credentialLibraries}}
 
@@ -79,6 +79,12 @@
       <message.description>
         {{t 'resources.target.credential-library.messages.welcome.description'}}
       </message.description>
+      <message.link
+        @route='scopes.scope.targets.target.add-credential-libraries'
+      >
+        <Rose::Icon @name='plus-circle-outline' />
+        {{t 'resources.target.actions.add-credential-libraries'}}
+      </message.link>
     </Rose::Message>
   </Rose::Layout::Centered>
 
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs b/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs
index 81a8e4c3c..ad9f10154 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs
@@ -1,4 +1,4 @@
-{{page-title (t 'resources.host-set.title_plural')}}
+{{page-title (t 'resources.target.host-set.title_plural')}}
 
 {{#if @model.hostSets}}