diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index 4c8e926ea5c4296ee1ac9df47ee4e4d4bca6fb24..1da6032af835be6788a6884056e503bbb6f48f10 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -7,9 +7,9 @@
 
     <div class="mb-6" style="height: calc(50vh + 4.5rem)">
       @if (!selectedSearchResult) {
-        <alfa-forwarding-search-organisations-einheit cdkFocusInitial data-test-id="zufi-search" />
+        <alfa-forwarding-search-organisations-einheit cdkFocusInitial data-test-id="organisations-einheit-search" />
       } @else {
-        <alfa-search-selected [organisationsEinheitResource]="selectedSearchResult" data-test-id="forwarding-item" />
+        <alfa-search-item-selected [organisationsEinheitResource]="selectedSearchResult" data-test-id="search-item-selected" />
       }
     </div>
 
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
index 82a577be60c09aa9ae4206d0f7ba3d175db6207d..1e2238fe263cd310979ac5d135e320a848fdf7fd 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
@@ -8,23 +8,24 @@ import { createOrganisationsEinheitResource } from '../../../../../zustaendige-s
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
 import { ForwardingDialogComponent } from './forwarding-dialog.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
-import { SearchSelectedComponent } from './search-selected/search-selected.component';
+import { SearchItemSelectedComponent } from './search-selected/search-item-selected.component';
 
 describe('ForwardingDialogComponent', () => {
   let component: ForwardingDialogComponent;
   let fixture: ComponentFixture<ForwardingDialogComponent>;
 
-  const zufiSearch: string = getDataTestIdOf('zufi-search');
-  const forwardingItem: string = getDataTestIdOf('forwarding-item');
+  const organisationsEinheitSearch: string = getDataTestIdOf('organisations-einheit-search');
+  const searchItemSelected: string = getDataTestIdOf('search-item-selected');
 
   const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [ForwardingDialogComponent],
       declarations: [
         MockComponent(CancelDialogButtonComponent),
         MockComponent(ForwardingButtonComponent),
-        MockComponent(SearchSelectedComponent),
+        MockComponent(SearchItemSelectedComponent),
         MockComponent(ForwardingSearchOrganisationsEinheitComponent),
       ],
     }).compileComponents();
@@ -45,7 +46,7 @@ describe('ForwardingDialogComponent', () => {
 
         fixture.detectChanges();
 
-        existsAsHtmlElement(fixture, zufiSearch);
+        existsAsHtmlElement(fixture, organisationsEinheitSearch);
       });
 
       it('should NOT render if selectedSearchResult is NOT null', () => {
@@ -53,7 +54,7 @@ describe('ForwardingDialogComponent', () => {
 
         fixture.detectChanges();
 
-        notExistsAsHtmlElement(fixture, zufiSearch);
+        notExistsAsHtmlElement(fixture, organisationsEinheitSearch);
       });
     });
   });
@@ -71,7 +72,7 @@ describe('ForwardingDialogComponent', () => {
 
         fixture.detectChanges();
 
-        existsAsHtmlElement(fixture, forwardingItem);
+        existsAsHtmlElement(fixture, searchItemSelected);
       });
 
       it('should NOT render if selectedSearchResult is null', () => {
@@ -79,7 +80,7 @@ describe('ForwardingDialogComponent', () => {
 
         fixture.detectChanges();
 
-        notExistsAsHtmlElement(fixture, forwardingItem);
+        notExistsAsHtmlElement(fixture, searchItemSelected);
       });
     });
   });
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
index 4efb0c7949e4826402d5ba3436af676523172b12..2350186c3531b19ee69e6f5ec8f341dc4758d9d8 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.ts
@@ -6,8 +6,8 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { CancelDialogButtonComponent } from '@ods/component';
 import { DialogContainerComponent } from '@ods/system';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
+import { SearchItemSelectedComponent } from './search-item-selected/search-item-selected.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
-import { SearchSelectedComponent } from './search-selected/search-selected.component';
 
 @Component({
   selector: 'alfa-forwarding-dialog',
@@ -19,7 +19,7 @@ import { SearchSelectedComponent } from './search-selected/search-selected.compo
     ZustaendigeStelleModule,
     ForwardingButtonComponent,
     ForwardingSearchOrganisationsEinheitComponent,
-    SearchSelectedComponent,
+    SearchItemSelectedComponent,
     DialogContainerComponent,
   ],
   templateUrl: './forwarding-dialog.component.html',
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.spec.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.spec.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.ts
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/change-button-container/change-button-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/change-button-container/change-button-container.component.ts
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts
similarity index 85%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts
index 3866c3776694dc56680f0d71ac95b13cd0ba028a..ff1f2e2a77ad69b5d17d7871cf0e7167af3a4132 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts
@@ -6,18 +6,18 @@ import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/syste
 import { MockComponent } from 'ng-mocks';
 import { createOrganisationsEinheitResource } from '../../../../../../zustaendige-stelle-shared/test/organisations-einheit';
 import { ChangeButtonContainerComponent } from './change-button-container/change-button-container.component';
-import { SearchSelectedComponent } from './search-selected.component';
+import { SearchItemSelectedComponent } from './search-item-selected.component';
 
 describe('ForwardingSearchOrganisationsEinheitComponent', () => {
-  let component: SearchSelectedComponent;
-  let fixture: ComponentFixture<SearchSelectedComponent>;
+  let component: SearchItemSelectedComponent;
+  let fixture: ComponentFixture<SearchItemSelectedComponent>;
 
   const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
   const anschrift: Anschrift = organisationsEinheitResource.anschrift;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [SearchSelectedComponent],
+      imports: [SearchItemSelectedComponent],
       declarations: [
         MockComponent(ChangeButtonContainerComponent),
         MockComponent(ForwardingItemComponent),
@@ -25,7 +25,7 @@ describe('ForwardingSearchOrganisationsEinheitComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(SearchSelectedComponent);
+    fixture = TestBed.createComponent(SearchItemSelectedComponent);
     component = fixture.componentInstance;
     component.organisationsEinheitResource = organisationsEinheitResource;
     fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts
similarity index 80%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts
index eaf514653f6655f9305932a363cfa327af054ded..640f93dfb6e8cad5685492fd536e55c403190fce 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-selected/search-selected.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts
@@ -4,11 +4,11 @@ import { ForwardingItemComponent, ForwardingItemInfoComponent } from '@ods/syste
 import { ChangeButtonContainerComponent } from './change-button-container/change-button-container.component';
 
 @Component({
-  selector: 'alfa-search-selected',
+  selector: 'alfa-search-item-selected',
   standalone: true,
   imports: [ChangeButtonContainerComponent, AnschriftToStringPipe, ForwardingItemComponent, ForwardingItemInfoComponent],
-  templateUrl: './search-selected.component.html',
+  templateUrl: './search-item-selected.component.html',
 })
-export class SearchSelectedComponent {
+export class SearchItemSelectedComponent {
   @Input() organisationsEinheitResource: OrganisationsEinheitResource;
 }