diff --git a/ui/admin/app/components/form/target/worker-filter/index.hbs b/ui/admin/app/components/worker-filter/index.hbs
similarity index 100%
rename from ui/admin/app/components/form/target/worker-filter/index.hbs
rename to ui/admin/app/components/worker-filter/index.hbs
diff --git a/ui/admin/app/components/form/target/worker-filter/index.js b/ui/admin/app/components/worker-filter/index.js
similarity index 66%
rename from ui/admin/app/components/form/target/worker-filter/index.js
rename to ui/admin/app/components/worker-filter/index.js
index 818fc29983..4da609eb11 100644
--- a/ui/admin/app/components/form/target/worker-filter/index.js
+++ b/ui/admin/app/components/worker-filter/index.js
@@ -6,12 +6,12 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
-export default class FormTargetWorkerFilterIndexComponent extends Component {
+export default class WorkerFilterComponent extends Component {
   // =actions
 
   /**
-   * Sets the target model filter to the passed in value.
-   * @param {TargetModel} model
+   * Sets the model filter to the passed in value.
+   * @param {Model} model
    * @param {string} filter
    * @param {string} value
    */
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs b/ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs
index d6c5660bb6..21a17a612f 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/edit-egress-worker-filter.hbs
@@ -25,7 +25,7 @@
   </page.header>
 
   <page.body class='target-workers'>
-    <Form::Target::WorkerFilter
+    <WorkerFilter
       @name='egress_worker_filter'
       @model={{@model}}
       @submit={{fn this.targets.saveWorkerFilter @model}}
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs b/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs
index d9a2ff18a9..915eb8a018 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs
@@ -26,7 +26,7 @@
   </page.header>
 
   <page.body class='target-workers'>
-    <Form::Target::WorkerFilter
+    <WorkerFilter
       @name='ingress_worker_filter'
       @model={{@model}}
       @submit={{fn this.targets.saveWorkerFilter @model}}
diff --git a/ui/admin/tests/integration/components/form/target/worker-filter-test.js b/ui/admin/tests/integration/components/worker-filter/index-test.js
similarity index 76%
rename from ui/admin/tests/integration/components/form/target/worker-filter-test.js
rename to ui/admin/tests/integration/components/worker-filter/index-test.js
index 7e60e6ec99..be095b2135 100644
--- a/ui/admin/tests/integration/components/form/target/worker-filter-test.js
+++ b/ui/admin/tests/integration/components/worker-filter/index-test.js
@@ -9,7 +9,7 @@ import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupIntl } from 'ember-intl/test-support';
 
-module('Integration | Component | form/target/worker-filter', function (hooks) {
+module('Integration | Component | worker-filter/index', function (hooks) {
   setupRenderingTest(hooks);
   setupIntl(hooks, 'en-us');
 
@@ -19,7 +19,7 @@ module('Integration | Component | form/target/worker-filter', function (hooks) {
     this.cancel = () => {};
     this.model = { egress_worker_filter: 'egress filter' };
     await render(
-      hbs`<Form::Target::WorkerFilter @name='egress_worker_filter' @model={{this.model}} @onInput={{this.onInput}} @submit={{this.submit}} @cancel={{this.cancel}} />`,
+      hbs`<WorkerFilter @name='egress_worker_filter' @model={{this.model}} @onInput={{this.onInput}} @submit={{this.submit}} @cancel={{this.cancel}} />`,
     );
 
     assert.dom('[data-test-code-editor-field-editor]').isVisible();
@@ -34,7 +34,7 @@ module('Integration | Component | form/target/worker-filter', function (hooks) {
     this.cancel = () => {};
     this.model = { ingress_worker_filter: 'ingress filter' };
     await render(
-      hbs`<Form::Target::WorkerFilter @name='ingress_worker_filter' @model={{this.model}} @onInput={{this.onInput}} @submit={{this.submit}} @cancel={{this.cancel}}/>`,
+      hbs`<WorkerFilter @name='ingress_worker_filter' @model={{this.model}} @onInput={{this.onInput}} @submit={{this.submit}} @cancel={{this.cancel}}/>`,
     );
 
     assert.dom('[data-test-code-editor-field-editor]').isVisible();