diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 25140be0e..8ad847c93 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -773,11 +773,11 @@ target:
       dual-egress-on: In this configuration, the client will attempt to  connect through any client-accessible "frontline" worker and reach the host through any filtered egress worker.
       dual-egress-on-ingress-on: In this configuration, the client will attempt to connect through any filtered ingress worker and reach the host through any filtered egress worker.
       hcp-dual-egress-on: In this configuration, the client will attempt to connect through any HCP-managed worker and reach the host through any filtered egress worker.
-    add-egress-worker-filter:
-      title: Add Egress Worker Filter
+    edit-egress-worker-filter:
+      title: Edit Egress Worker Filter
       description: Specify workers that have access to the target (such as within a private network).
-    add-ingress-worker-filter:
-      title: Add Ingress Worker Filter
+    edit-ingress-worker-filter:
+      title: Edit Ingress Worker Filter
       description: Specify workers Boundary should use to start the route to this target.
     worker-filter:
       title: Worker filter
@@ -786,8 +786,7 @@ target:
       egress-workers: Egress workers
       ingress-workers: Ingress workers
     actions:
-      add-worker-filter: Add worker filter
-      add-filter: Add filter
+      edit-worker-filter: Edit worker filter
 credential-store:
   title: Credential Store
   title_plural: Credential Stores
@@ -977,7 +976,7 @@ worker:
   actions:
     register: Register Worker
     delete: Remove Worker
-    create_tags: Create new tags
+    create_tags: Create New Tags
   messages:
     welcome:
       title: Welcome to Workers
@@ -996,8 +995,8 @@ worker:
   tags:
     title_plural: Tags
     create:
-      title: Create new tags
-      description: Create new api worker tags. You can only add API tags in the admin UI or CLI.
+      title: Create New Tags
+      description: Create new API tags. You can only add API tags in the admin UI or CLI.
       link: Config tags are added in the worker config file.
       success: Tag(s) successfully created
     description: Tags are used to define the type of worker and to make it distinguishable amongst other workers.
@@ -1013,12 +1012,12 @@ worker:
         label: Confirm removal
         help: 'Enter “REMOVE” to confirm — this is case-sensitive.'
     edit:
-      title: Edit tag
+      title: Edit Tag
       description: Edit the existing worker tag
       success: Tag successfully edited
       helper-text: Separate multiple values by comma
     actions:
-      remove: Remove tag
+      remove: Remove Tag
       add: Add tags to this worker
   flyout:
     title: Tags in {workerName}
diff --git a/ui/admin/app/components/form/target/worker-filter/index.hbs b/ui/admin/app/components/form/target/worker-filter/index.hbs
index 7b8bcdc44..ed65622f2 100644
--- a/ui/admin/app/components/form/target/worker-filter/index.hbs
+++ b/ui/admin/app/components/form/target/worker-filter/index.hbs
@@ -35,7 +35,7 @@
   </Hds::Form::Field>
 
   <form.actions
-    @submitText={{t 'resources.target.workers.actions.add-filter'}}
+    @submitText={{t 'actions.save'}}
     @cancelText={{t 'actions.cancel'}}
   />
 </Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/add-ingress-worker-filter.js b/ui/admin/app/controllers/scopes/scope/targets/target/edit-egress-worker-filter.js
similarity index 78%
rename from ui/admin/app/controllers/scopes/scope/targets/target/add-ingress-worker-filter.js
rename to ui/admin/app/controllers/scopes/scope/targets/target/edit-egress-worker-filter.js
index e5ded4ee3..8c3cada39 100644
--- a/ui/admin/app/controllers/scopes/scope/targets/target/add-ingress-worker-filter.js
+++ b/ui/admin/app/controllers/scopes/scope/targets/target/edit-egress-worker-filter.js
@@ -5,6 +5,6 @@
 
 import Controller, { inject as controller } from '@ember/controller';
 
-export default class ScopesScopeTargetsTargetAddIngressWorkerFilterController extends Controller {
+export default class ScopesScopeTargetsTargetEditEgressWorkerFilterController extends Controller {
   @controller('scopes/scope/targets/index') targets;
 }
diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/add-egress-worker-filter.js b/ui/admin/app/controllers/scopes/scope/targets/target/edit-ingress-worker-filter.js
similarity index 67%
rename from ui/admin/app/controllers/scopes/scope/targets/target/add-egress-worker-filter.js
rename to ui/admin/app/controllers/scopes/scope/targets/target/edit-ingress-worker-filter.js
index bd8407ea0..7dbe4c709 100644
--- a/ui/admin/app/controllers/scopes/scope/targets/target/add-egress-worker-filter.js
+++ b/ui/admin/app/controllers/scopes/scope/targets/target/edit-ingress-worker-filter.js
@@ -5,6 +5,6 @@
 
 import Controller, { inject as controller } from '@ember/controller';
 
-export default class ScopesScopeTargetsTargetAddEgressWorkerFilterController extends Controller {
+export default class ScopesScopeTargetsTargetEditIngressWorkerFilterController extends Controller {
   @controller('scopes/scope/targets/index') targets;
 }
diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js
index b165230f3..9d4a9af3a 100644
--- a/ui/admin/app/router.js
+++ b/ui/admin/app/router.js
@@ -99,8 +99,8 @@ Router.map(function () {
             this.route('create-storage-bucket');
           });
           this.route('workers');
-          this.route('add-ingress-worker-filter');
-          this.route('add-egress-worker-filter');
+          this.route('edit-ingress-worker-filter');
+          this.route('edit-egress-worker-filter');
         });
         this.route('new');
       });
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/add-ingress-worker-filter.js b/ui/admin/app/routes/scopes/scope/targets/target/edit-egress-worker-filter.js
similarity index 69%
rename from ui/admin/app/routes/scopes/scope/targets/target/add-ingress-worker-filter.js
rename to ui/admin/app/routes/scopes/scope/targets/target/edit-egress-worker-filter.js
index 92c8af20f..714fefbea 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/add-ingress-worker-filter.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/edit-egress-worker-filter.js
@@ -5,4 +5,4 @@
 
 import Route from '@ember/routing/route';
 
-export default class ScopesScopeTargetsTargetAddIngressWorkerFilterRoute extends Route {}
+export default class ScopesScopeTargetsTargetEditEgressWorkerFilterRoute extends Route {}
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/add-egress-worker-filter.js b/ui/admin/app/routes/scopes/scope/targets/target/edit-ingress-worker-filter.js
similarity index 57%
rename from ui/admin/app/routes/scopes/scope/targets/target/add-egress-worker-filter.js
rename to ui/admin/app/routes/scopes/scope/targets/target/edit-ingress-worker-filter.js
index fe8d1c108..6d23f9a5b 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/add-egress-worker-filter.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/edit-ingress-worker-filter.js
@@ -5,4 +5,4 @@
 
 import Route from '@ember/routing/route';
 
-export default class ScopesScopeTargetsTargetAddEgressWorkerFilterRoute extends Route {}
+export default class ScopesScopeTargetsTargetEditIngressWorkerFilterRoute extends Route {}
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-ingress-worker-filter.hbs b/ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs
similarity index 64%
rename from ui/admin/app/templates/scopes/scope/targets/target/add-ingress-worker-filter.hbs
rename to ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs
index 9e032fcc0..d6c5660bb 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/add-ingress-worker-filter.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs
@@ -3,10 +3,10 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-{{page-title (t 'resources.target.workers.add-ingress-worker-filter.title')}}
+{{page-title (t 'resources.target.workers.edit-egress-worker-filter.title')}}
 <Breadcrumbs::Item
-  @text={{t 'resources.target.workers.add-ingress-worker-filter.title'}}
-  @route='scopes.scope.targets.target.add-ingress-worker-filter'
+  @text={{t 'resources.target.workers.edit-egress-worker-filter.title'}}
+  @route='scopes.scope.targets.target.edit-egress-worker-filter'
 />
 
 <Rose::Layout::Page as |page|>
@@ -14,20 +14,19 @@
   <page.breadcrumbs>
     <Breadcrumbs::Container />
   </page.breadcrumbs>
-
   <page.header>
     <h2>
-      {{t 'resources.target.workers.add-ingress-worker-filter.title'}}
+      {{t 'resources.target.workers.edit-egress-worker-filter.title'}}
       <DocLink @doc='target.worker-filters' @iconSize='large' />
     </h2>
     <p>{{t
-        'resources.target.workers.add-ingress-worker-filter.description'
+        'resources.target.workers.edit-egress-worker-filter.description'
       }}</p>
   </page.header>
 
   <page.body class='target-workers'>
     <Form::Target::WorkerFilter
-      @name='ingress_worker_filter'
+      @name='egress_worker_filter'
       @model={{@model}}
       @submit={{fn this.targets.saveWorkerFilter @model}}
       @cancel={{fn this.targets.cancelWorkerFilter @model}}
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-egress-worker-filter.hbs b/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs
similarity index 58%
rename from ui/admin/app/templates/scopes/scope/targets/target/add-egress-worker-filter.hbs
rename to ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs
index 6520bb7ed..d9a2ff18a 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/add-egress-worker-filter.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs
@@ -3,10 +3,10 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-{{page-title (t 'resources.target.workers.add-egress-worker-filter.title')}}
+{{page-title (t 'resources.target.workers.edit-ingress-worker-filter.title')}}
 <Breadcrumbs::Item
-  @text={{t 'resources.target.workers.add-egress-worker-filter.title'}}
-  @route='scopes.scope.targets.target.add-egress-worker-filter'
+  @text={{t 'resources.target.workers.edit-ingress-worker-filter.title'}}
+  @route='scopes.scope.targets.target.edit-ingress-worker-filter'
 />
 
 <Rose::Layout::Page as |page|>
@@ -14,17 +14,20 @@
   <page.breadcrumbs>
     <Breadcrumbs::Container />
   </page.breadcrumbs>
+
   <page.header>
     <h2>
-      {{t 'resources.target.workers.add-egress-worker-filter.title'}}
+      {{t 'resources.target.workers.edit-ingress-worker-filter.title'}}
       <DocLink @doc='target.worker-filters' @iconSize='large' />
     </h2>
-    <p>{{t 'resources.target.workers.add-egress-worker-filter.description'}}</p>
+    <p>{{t
+        'resources.target.workers.edit-ingress-worker-filter.description'
+      }}</p>
   </page.header>
 
   <page.body class='target-workers'>
     <Form::Target::WorkerFilter
-      @name='egress_worker_filter'
+      @name='ingress_worker_filter'
       @model={{@model}}
       @submit={{fn this.targets.saveWorkerFilter @model}}
       @cancel={{fn this.targets.cancelWorkerFilter @model}}
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/workers.hbs b/ui/admin/app/templates/scopes/scope/targets/target/workers.hbs
index 2072dc4d9..eb51a2ee3 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/workers.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/workers.hbs
@@ -42,6 +42,7 @@
       {{#if (feature-flag 'target-worker-filters-v2-ingress')}}
         <A.Item
           @containsInteractive={{true}}
+          @isOpen={{@model.ingress_worker_filter}}
           data-test-target-ingress-workers-accordion-item
         >
           <:toggle>
@@ -50,9 +51,11 @@
                   'resources.target.workers.accordion-label.ingress-workers'
                 }}</span>
               <Hds::Link::Standalone
-                @icon='plus'
-                @text={{t 'resources.target.workers.actions.add-worker-filter'}}
-                @route='scopes.scope.targets.target.add-ingress-worker-filter'
+                @icon='edit'
+                @text={{t
+                  'resources.target.workers.actions.edit-worker-filter'
+                }}
+                @route='scopes.scope.targets.target.edit-ingress-worker-filter'
               />
             </div>
           </:toggle>
@@ -89,6 +92,7 @@
       {{/if}}
       <A.Item
         @containsInteractive={{true}}
+        @isOpen={{@model.egress_worker_filter}}
         data-test-target-egress-workers-accordion-item
       >
         <:toggle>
@@ -97,9 +101,9 @@
                 'resources.target.workers.accordion-label.egress-workers'
               }}</span>
             <Hds::Link::Standalone
-              @icon='plus'
-              @text={{t 'resources.target.workers.actions.add-worker-filter'}}
-              @route='scopes.scope.targets.target.add-egress-worker-filter'
+              @icon='edit'
+              @text={{t 'resources.target.workers.actions.edit-worker-filter'}}
+              @route='scopes.scope.targets.target.edit-egress-worker-filter'
             />
           </div>
         </:toggle>
diff --git a/ui/admin/app/templates/scopes/scope/workers/worker/tags.hbs b/ui/admin/app/templates/scopes/scope/workers/worker/tags.hbs
index efdfab87a..37c4150cb 100644
--- a/ui/admin/app/templates/scopes/scope/workers/worker/tags.hbs
+++ b/ui/admin/app/templates/scopes/scope/workers/worker/tags.hbs
@@ -155,7 +155,7 @@
         <M.Footer as |F|>
           <Hds::ButtonSet>
             <Hds::Button
-              @text={{t 'actions.confirm'}}
+              @text={{t 'actions.save'}}
               {{on 'click' this.editApiTag}}
             />
             <Hds::Button
diff --git a/ui/admin/tests/acceptance/targets/workers-test.js b/ui/admin/tests/acceptance/targets/workers-test.js
index d792d401d..de98bb3c5 100644
--- a/ui/admin/tests/acceptance/targets/workers-test.js
+++ b/ui/admin/tests/acceptance/targets/workers-test.js
@@ -45,8 +45,8 @@ module('Acceptance | targets | workers', function (hooks) {
     targets: null,
     target: null,
     targetWorkers: null,
-    targetAddEgressFilter: null,
-    targetAddIngressFilter: null,
+    targetEditEgressFilter: null,
+    targetEditIngressFilter: null,
   };
 
   hooks.beforeEach(function () {
@@ -73,8 +73,8 @@ module('Acceptance | targets | workers', function (hooks) {
     urls.targets = `${urls.projectScope}/targets`;
     urls.target = `${urls.targets}/${instances.target.id}`;
     urls.targetWorkers = `${urls.target}/workers`;
-    urls.targetAddEgressFilter = `${urls.target}/add-egress-worker-filter`;
-    urls.targetAddIngressFilter = `${urls.target}/add-ingress-worker-filter`;
+    urls.targetEditEgressFilter = `${urls.target}/edit-egress-worker-filter`;
+    urls.targetEditIngressFilter = `${urls.target}/edit-ingress-worker-filter`;
 
     authenticateSession({});
   });
@@ -93,8 +93,6 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(ACCORDION_DROPDOWN_SELECTOR('ingress'));
-    await click(ACCORDION_DROPDOWN_SELECTOR('egress'));
 
     assert
       .dom(CODE_BLOCK_SELECTOR('ingress'))
@@ -109,8 +107,6 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(ACCORDION_DROPDOWN_SELECTOR('ingress'));
-    await click(ACCORDION_DROPDOWN_SELECTOR('egress'));
 
     assert
       .dom(CODE_BLOCK_SELECTOR('ingress'))
@@ -125,7 +121,6 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(ACCORDION_DROPDOWN_SELECTOR('egress'));
 
     assert.dom(ACCORDION_DROPDOWN_SELECTOR('ingress')).doesNotExist();
     assert
@@ -133,13 +128,37 @@ module('Acceptance | targets | workers', function (hooks) {
       .hasText(instances.target.egress_worker_filter);
   });
 
+  test('user will automatically see worker filters if set', async function (assert) {
+    featureEdition.setEdition('hcp');
+    await visit(urls.target);
+
+    await click(`[href="${urls.targetWorkers}"]`);
+
+    assert
+      .dom(CODE_BLOCK_SELECTOR('ingress'))
+      .hasText(instances.target.ingress_worker_filter);
+    assert
+      .dom(CODE_BLOCK_SELECTOR('egress'))
+      .hasText(instances.target.egress_worker_filter);
+  });
+
+  test('user will not automatically see worker filters if not set', async function (assert) {
+    featureEdition.setEdition('hcp');
+    instances.target.egress_worker_filter = null;
+    instances.target.ingress_worker_filter = null;
+    await visit(urls.target);
+
+    await click(`[href="${urls.targetWorkers}"]`);
+
+    assert.dom(CODE_BLOCK_SELECTOR('ingress')).doesNotExist();
+    assert.dom(CODE_BLOCK_SELECTOR('egress')).doesNotExist();
+  });
+
   test('user can view egress and ingress filters when `target-worker-filters-v2-ingress` is enabled', async function (assert) {
     featuresService.enable('target-worker-filters-v2-ingress');
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(ACCORDION_DROPDOWN_SELECTOR('ingress'));
-    await click(ACCORDION_DROPDOWN_SELECTOR('egress'));
 
     assert
       .dom(CODE_BLOCK_SELECTOR('ingress'))
@@ -154,7 +173,6 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(ACCORDION_DROPDOWN_SELECTOR('egress'));
 
     assert.dom(ACCORDION_DROPDOWN_SELECTOR('ingress')).doesNotExist();
     assert
@@ -169,13 +187,12 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(`[href="${urls.targetAddIngressFilter}"]`);
+    await click(`[href="${urls.targetEditIngressFilter}"]`);
 
-    assert.strictEqual(currentURL(), urls.targetAddIngressFilter);
+    assert.strictEqual(currentURL(), urls.targetEditIngressFilter);
 
     await fillIn(CODE_EDITOR_CONTENT_SELECTOR, ingressWorkerFilter);
     await click(SAVE_BUTTON_SELECTOR);
-    await click(ACCORDION_DROPDOWN_SELECTOR('ingress'));
 
     assert.strictEqual(currentURL(), urls.targetWorkers);
     assert.dom(CODE_BLOCK_SELECTOR('ingress')).hasText(ingressWorkerFilter);
@@ -187,13 +204,12 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(`[href="${urls.targetAddIngressFilter}"]`);
+    await click(`[href="${urls.targetEditIngressFilter}"]`);
 
-    assert.strictEqual(currentURL(), urls.targetAddIngressFilter);
+    assert.strictEqual(currentURL(), urls.targetEditIngressFilter);
 
     await fillIn(CODE_EDITOR_CONTENT_SELECTOR, ingressWorkerFilter);
     await click(CANCEL_BUTTON_SELECTOR);
-    await click(ACCORDION_DROPDOWN_SELECTOR('ingress'));
 
     assert.strictEqual(currentURL(), urls.targetWorkers);
     assert.notEqual(instances.target.inress_worker_filter, ingressWorkerFilter);
@@ -208,13 +224,12 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(`[href="${urls.targetAddEgressFilter}"]`);
+    await click(`[href="${urls.targetEditEgressFilter}"]`);
 
-    assert.strictEqual(currentURL(), urls.targetAddEgressFilter);
+    assert.strictEqual(currentURL(), urls.targetEditEgressFilter);
 
     await fillIn(CODE_EDITOR_CONTENT_SELECTOR, egressWorkerFilter);
     await click(SAVE_BUTTON_SELECTOR);
-    await click(ACCORDION_DROPDOWN_SELECTOR('egress'));
 
     assert.strictEqual(currentURL(), urls.targetWorkers);
     assert.dom(CODE_BLOCK_SELECTOR('egress')).hasText(egressWorkerFilter);
@@ -225,12 +240,11 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(`[href="${urls.targetAddEgressFilter}"]`);
+    await click(`[href="${urls.targetEditEgressFilter}"]`);
 
-    assert.strictEqual(currentURL(), urls.targetAddEgressFilter);
+    assert.strictEqual(currentURL(), urls.targetEditEgressFilter);
     await fillIn(CODE_EDITOR_CONTENT_SELECTOR, egressWorkerFilter);
     await click(CANCEL_BUTTON_SELECTOR);
-    await click(ACCORDION_DROPDOWN_SELECTOR('egress'));
 
     assert.strictEqual(currentURL(), urls.targetWorkers);
     assert.notEqual(instances.target.egress_worker_filter, egressWorkerFilter);
@@ -247,9 +261,9 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(`[href="${urls.targetAddIngressFilter}"]`);
+    await click(`[href="${urls.targetEditIngressFilter}"]`);
 
-    assert.strictEqual(currentURL(), urls.targetAddIngressFilter);
+    assert.strictEqual(currentURL(), urls.targetEditIngressFilter);
     await fillIn(CODE_EDITOR_CONTENT_SELECTOR, ingressWorkerFilter);
     await click(`[href="${urls.target}"]`);
 
@@ -272,9 +286,9 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(`[href="${urls.targetAddIngressFilter}"]`);
+    await click(`[href="${urls.targetEditIngressFilter}"]`);
 
-    assert.strictEqual(currentURL(), urls.targetAddIngressFilter);
+    assert.strictEqual(currentURL(), urls.targetEditIngressFilter);
     await fillIn(CODE_EDITOR_CONTENT_SELECTOR, ingressWorkerFilter);
     await click(`[href="${urls.target}"]`);
 
@@ -282,7 +296,7 @@ module('Acceptance | targets | workers', function (hooks) {
 
     await click(MODAL_CANCEL_BUTTON_SELECTOR, 'Click Cancel');
 
-    assert.strictEqual(currentURL(), urls.targetAddIngressFilter);
+    assert.strictEqual(currentURL(), urls.targetEditIngressFilter);
     assert.notEqual(
       instances.target.ingress_worker_filter,
       ingressWorkerFilter,
@@ -296,9 +310,9 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(`[href="${urls.targetAddEgressFilter}"]`);
+    await click(`[href="${urls.targetEditEgressFilter}"]`);
 
-    assert.strictEqual(currentURL(), urls.targetAddEgressFilter);
+    assert.strictEqual(currentURL(), urls.targetEditEgressFilter);
     await fillIn(CODE_EDITOR_CONTENT_SELECTOR, egressWorkerFilter);
     await click(`[href="${urls.target}"]`);
 
@@ -317,9 +331,9 @@ module('Acceptance | targets | workers', function (hooks) {
     await visit(urls.target);
 
     await click(`[href="${urls.targetWorkers}"]`);
-    await click(`[href="${urls.targetAddEgressFilter}"]`);
+    await click(`[href="${urls.targetEditEgressFilter}"]`);
 
-    assert.strictEqual(currentURL(), urls.targetAddEgressFilter);
+    assert.strictEqual(currentURL(), urls.targetEditEgressFilter);
     await fillIn(CODE_EDITOR_CONTENT_SELECTOR, egressWorkerFilter);
     await click(`[href="${urls.target}"]`);
 
@@ -327,7 +341,7 @@ module('Acceptance | targets | workers', function (hooks) {
 
     await click(MODAL_CANCEL_BUTTON_SELECTOR, 'Click Cancel');
 
-    assert.strictEqual(currentURL(), urls.targetAddEgressFilter);
+    assert.strictEqual(currentURL(), urls.targetEditEgressFilter);
     assert.notEqual(instances.target.egress_worker_filter, egressWorkerFilter);
   });
 });
diff --git a/ui/admin/tests/acceptance/workers/tags-test.js b/ui/admin/tests/acceptance/workers/tags-test.js
index f0d49edfa..5da9e10da 100644
--- a/ui/admin/tests/acceptance/workers/tags-test.js
+++ b/ui/admin/tests/acceptance/workers/tags-test.js
@@ -152,7 +152,7 @@ module('Acceptance | workers | worker | tags', function (hooks) {
     await click(API_TAG_ACTION_SELECTOR);
 
     // Asserts first button is for editing and there is no second button
-    assert.dom(API_TAG_FIRST_BUTTON_SELECTOR).hasText('Edit tag');
+    assert.dom(API_TAG_FIRST_BUTTON_SELECTOR).hasText('Edit Tag');
     assert.dom(API_TAG_LAST_BUTTON_SELECTOR).doesNotExist();
   });
 
@@ -206,7 +206,7 @@ module('Acceptance | workers | worker | tags', function (hooks) {
     await click(API_TAG_ACTION_SELECTOR);
 
     // Asserts first button is for removing and there is no second button
-    assert.dom(API_TAG_FIRST_BUTTON_SELECTOR).hasText('Remove tag');
+    assert.dom(API_TAG_FIRST_BUTTON_SELECTOR).hasText('Remove Tag');
     assert.dom(API_TAG_LAST_BUTTON_SELECTOR).doesNotExist();
   });
 
diff --git a/ui/admin/tests/integration/components/workers/worker/actions/index-test.js b/ui/admin/tests/integration/components/workers/worker/actions/index-test.js
index 9e2ee87f9..a5a496423 100644
--- a/ui/admin/tests/integration/components/workers/worker/actions/index-test.js
+++ b/ui/admin/tests/integration/components/workers/worker/actions/index-test.js
@@ -28,7 +28,7 @@ module(
       await click('button');
 
       assert.dom(this.element).includesText('Remove Worker');
-      assert.dom(this.element).includesText('Create new tags');
+      assert.dom(this.element).includesText('Create New Tags');
     });
   },
 );
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-ingress-worker-filter-test.js b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/edit-egress-worker-filter-test.js
similarity index 74%
rename from ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-ingress-worker-filter-test.js
rename to ui/admin/tests/unit/controllers/scopes/scope/targets/target/edit-egress-worker-filter-test.js
index 18b2bcfc3..ed1d99926 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-ingress-worker-filter-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/edit-egress-worker-filter-test.js
@@ -7,13 +7,13 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
 module(
-  'Unit | Controller | scopes/scope/targets/target/add-ingress-worker-filter',
+  'Unit | Controller | scopes/scope/targets/target/edit-egress-worker-filter',
   function (hooks) {
     setupTest(hooks);
 
     test('it exists', function (assert) {
       let controller = this.owner.lookup(
-        'controller:scopes/scope/targets/target/add-ingress-worker-filter',
+        'controller:scopes/scope/targets/target/edit-egress-worker-filter',
       );
       assert.ok(controller);
     });
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-egress-worker-filter-test.js b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/edit-ingress-worker-filter-test.js
similarity index 68%
rename from ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-egress-worker-filter-test.js
rename to ui/admin/tests/unit/controllers/scopes/scope/targets/target/edit-ingress-worker-filter-test.js
index 0d53aa340..fa3c70efa 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-egress-worker-filter-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/edit-ingress-worker-filter-test.js
@@ -7,13 +7,13 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
 module(
-  'Unit | Controller | scopes/scope/targets/target/add-egress-worker-filter',
+  'Unit | Controller | scopes/scope/targets/target/edit-ingress-worker-filter',
   function (hooks) {
     setupTest(hooks);
 
     test('it exists', function (assert) {
       let controller = this.owner.lookup(
-        'controller:scopes/scope/targets/target/add-egress-worker-filter',
+        'controller:scopes/scope/targets/target/edit-ingress-worker-filter',
       );
       assert.ok(controller);
     });
diff --git a/ui/admin/tests/unit/routes/scopes/scope/targets/target/add-ingress-worker-filter-test.js b/ui/admin/tests/unit/routes/scopes/scope/targets/target/edit-egress-worker-filter-test.js
similarity index 73%
rename from ui/admin/tests/unit/routes/scopes/scope/targets/target/add-ingress-worker-filter-test.js
rename to ui/admin/tests/unit/routes/scopes/scope/targets/target/edit-egress-worker-filter-test.js
index fa2d220a6..984f7820c 100644
--- a/ui/admin/tests/unit/routes/scopes/scope/targets/target/add-ingress-worker-filter-test.js
+++ b/ui/admin/tests/unit/routes/scopes/scope/targets/target/edit-egress-worker-filter-test.js
@@ -7,13 +7,13 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
 module(
-  'Unit | Route | scopes/scope/targets/target/add-ingress-worker-filter',
+  'Unit | Route | scopes/scope/targets/target/edit-egress-worker-filter',
   function (hooks) {
     setupTest(hooks);
 
     test('it exists', function (assert) {
       let route = this.owner.lookup(
-        'route:scopes/scope/targets/target/add-ingress-worker-filter',
+        'route:scopes/scope/targets/target/edit-egress-worker-filter',
       );
       assert.ok(route);
     });
diff --git a/ui/admin/tests/unit/routes/scopes/scope/targets/target/add-egress-worker-filter-test.js b/ui/admin/tests/unit/routes/scopes/scope/targets/target/edit-ingress-worker-filter-test.js
similarity index 69%
rename from ui/admin/tests/unit/routes/scopes/scope/targets/target/add-egress-worker-filter-test.js
rename to ui/admin/tests/unit/routes/scopes/scope/targets/target/edit-ingress-worker-filter-test.js
index a04afdca3..e7d671cf6 100644
--- a/ui/admin/tests/unit/routes/scopes/scope/targets/target/add-egress-worker-filter-test.js
+++ b/ui/admin/tests/unit/routes/scopes/scope/targets/target/edit-ingress-worker-filter-test.js
@@ -7,13 +7,13 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
 module(
-  'Unit | Route | scopes/scope/targets/target/add-egress-worker-filter',
+  'Unit | Route | scopes/scope/targets/target/edit-ingress-worker-filter',
   function (hooks) {
     setupTest(hooks);
 
     test('it exists', function (assert) {
       let route = this.owner.lookup(
-        'route:scopes/scope/targets/target/add-egress-worker-filter',
+        'route:scopes/scope/targets/target/edit-ingress-worker-filter',
       );
       assert.ok(route);
     });