diff --git a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html
index d510079eb..1b6d3c497 100644
--- a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html
+++ b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html
@@ -34,7 +34,7 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
               <div>
                 <label
                   class="font-weight-bold"
-                  for="name">Name Label</label>
+                  for="name">Sink Name</label>
                 <span class="required">*</span>
               </div>
               <input
diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.html b/ui/src/app/pages/fleet/agents/key/agent.key.component.html
index 752339888..e1c88b8be 100644
--- a/ui/src/app/pages/fleet/agents/key/agent.key.component.html
+++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.html
@@ -28,7 +28,7 @@
 
     <label>Provisioning Command</label>
     <p>
-      <a href="https://getorb.io/docs/#running-orb-agent"
+      <a href="https://orb.community/documentation/running_orb_agent/"
          target="_blank">See here
       </a>
       for more advanced options.
diff --git a/ui/src/app/pages/sinks/add/sink.add.component.html b/ui/src/app/pages/sinks/add/sink.add.component.html
index 55c6ed239..d51c8d6b2 100644
--- a/ui/src/app/pages/sinks/add/sink.add.component.html
+++ b/ui/src/app/pages/sinks/add/sink.add.component.html
@@ -27,7 +27,7 @@ <h4>{{strings.sink[isEdit ? 'edit' : 'add']['header']}}</h4>
             <nb-form-field>
               <div class="d-flex flex-column">
                 <div>
-                  <label class="font-weight-bold">Name Label</label>
+                  <label class="font-weight-bold">Sink Name</label>
                   <span class="required">*</span>
                 </div>
                 <input autofocus
@@ -247,7 +247,7 @@ <h4>{{strings.sink[isEdit ? 'edit' : 'add']['header']}}</h4>
           <div class="d-flex row">
             <div class="col-md-12 col-xl-6">
               <div>
-                <label class="font-weight-bold">Name Label</label>
+                <label class="font-weight-bold">Sink Name</label>
                 <p data-orb-qa-id="review-name">{{firstFormGroup?.controls.name.value}}</p>
               </div>
             </div>
diff --git a/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.html b/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.html
index 858da28ed..e525bfc35 100644
--- a/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.html
+++ b/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.html
@@ -40,7 +40,7 @@
 
 <ng-template #groupTemplateCell let-i="index" let-row="row" let-value="value">
     <button (click)="onOpenGroupDetails(row?.agent_group)"
-            class="edit-dataset-button" nbTooltip="{{ row?.agent_group?.id }}">
+            class="edit-dataset-button" matTooltip="{{ row?.agent_group?.name }}">
         {{ row?.agent_group?.name }}
     </button>
 </ng-template>
diff --git a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html
index 8df8250a1..546a226c6 100644
--- a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html
+++ b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html
@@ -27,7 +27,7 @@
 <ng-template #readView>
   <div class="d-flex flex-column">
     <div class="flex-row">
-      <label class="summary-accent">Name<span class="required">*</span></label>
+      <label class="summary-accent">Name</label>
       <p>{{ policy?.name }}</p>
     </div>
     <div class="flex-row">