diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts b/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
index 75f8afba23a4ceced80e25438d6df2ef66730d09..fc5322e9e5371ac6f5a6dcc897224fce9b0a4c5e 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.spec.ts
@@ -56,7 +56,6 @@ describe('ButtonComponent', () => {
 
       it('should NOT emit click if button is disabled', () => {
         component.disabled = true;
-        fixture.detectChanges();
 
         component.onClick();
 
diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.ts b/alfa-client/libs/design-system/src/lib/button/button.component.ts
index a513012d4ce3b249df6abb552c21c2163067092e..3f88a32abc1bdb41fc4c12cabc4543f7c2def3c1 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.ts
@@ -140,7 +140,7 @@ export class ButtonComponent {
     return this.disabled || this.isLoading;
   }
 
-  onClick(): void {
+  public onClick(): void {
     if (!this.isDisabled) {
       this.clickEmitter.emit();
     }
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
index 0b9cd364d11a620b543e98204b4449c500669605..661105c1ad208f595ae5b3f7f1158e0529d9fe2f 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.spec.ts
@@ -1,3 +1,4 @@
+import { EMPTY_STRING } from '@alfa-client/tech-shared';
 import { dispatchEventFromFixture, MockEvent } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
@@ -32,13 +33,13 @@ describe('ForwardingButtonComponent', () => {
       it('should set tooltip text', () => {
         component.disabled = true;
 
-        expect(component.tooltip).not.toBe('');
+        expect(component.tooltip).not.toBe(EMPTY_STRING);
       });
 
       it('should set empty tooltip', () => {
         component.disabled = false;
 
-        expect(component.tooltip).toBe('');
+        expect(component.tooltip).toBe(EMPTY_STRING);
       });
     });
   });
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
index 3e0cb495d9c1e5af0b41e48876584a6be9c2ff55..e881014e936c13d57632ed0c9d059093bcb1d76a 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.ts
@@ -1,5 +1,5 @@
 import { CommandResource } from '@alfa-client/command-shared';
-import { StateResource } from '@alfa-client/tech-shared';
+import { EMPTY_STRING, StateResource } from '@alfa-client/tech-shared';
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
@@ -13,7 +13,7 @@ import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
 export class ForwardingButtonComponent {
   @Input() set disabled(value: boolean) {
     this._disabled = value;
-    this.tooltip = value ? 'Bitte ein Amt oder Stelle auswählen' : '';
+    this.tooltip = value ? 'Bitte ein Amt oder Stelle auswählen' : EMPTY_STRING;
   }
   @Input() stateResource: StateResource<CommandResource>;
 
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 7811a8e2d1683829746b372210bbba4f91fca440..af7bf0bb349af1ccbbf4e22cc0091b5b50e8bcd1 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
@@ -8,7 +8,7 @@
       @if (!selectedSearchResult) {
         <alfa-forwarding-search-organisations-einheit cdkFocusInitial data-test-id="organisations-einheit-search" />
       } @else {
-        <alfa-search-item-selected [organisationsEinheitResource]="selectedSearchResult" data-test-id="search-item-selected" />
+        <alfa-selected-search-item [organisationsEinheitResource]="selectedSearchResult" data-test-id="selected-search-item" />
       }
     </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 cc001a9f05bbd8f28c5427187c6b990e7bf7bbf5..7a57c749abf43d24d7274964dc87eee05bddd766 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
@@ -14,7 +14,7 @@ import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
 import { createOrganisationsEinheitResource } from '../../../../../zustaendige-stelle-shared/test/organisations-einheit';
 import { ForwardingButtonComponent } from './forwarding-button/forwarding-button.component';
 import { ForwardingDialogComponent } from './forwarding-dialog.component';
-import { SearchItemSelectedComponent } from './search-item-selected/search-item-selected.component';
+import { SelectedSearchItemComponent } from './search-item-selected/selected-search-item.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
 
 describe('ForwardingDialogComponent', () => {
@@ -22,7 +22,7 @@ describe('ForwardingDialogComponent', () => {
   let fixture: ComponentFixture<ForwardingDialogComponent>;
 
   const organisationsEinheitSearch: string = getDataTestIdOf('organisations-einheit-search');
-  const searchItemSelected: string = getDataTestIdOf('search-item-selected');
+  const selectedSearchItem: string = getDataTestIdOf('selected-search-item');
   const forwardButton: string = getDataTestIdOf('foward-dialog-forward-button');
 
   const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
@@ -33,7 +33,7 @@ describe('ForwardingDialogComponent', () => {
       declarations: [
         MockComponent(CancelDialogButtonComponent),
         MockComponent(ForwardingButtonComponent),
-        MockComponent(SearchItemSelectedComponent),
+        MockComponent(SelectedSearchItemComponent),
         MockComponent(ForwardingSearchOrganisationsEinheitComponent),
       ],
     }).compileComponents();
@@ -79,7 +79,7 @@ describe('ForwardingDialogComponent', () => {
 
       fixture.detectChanges();
 
-      existsAsHtmlElement(fixture, searchItemSelected);
+      existsAsHtmlElement(fixture, selectedSearchItem);
     });
 
     it('should NOT render if selectedSearchResult is null', () => {
@@ -87,7 +87,7 @@ describe('ForwardingDialogComponent', () => {
 
       fixture.detectChanges();
 
-      notExistsAsHtmlElement(fixture, searchItemSelected);
+      notExistsAsHtmlElement(fixture, selectedSearchItem);
     });
   });
 
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 58ab3e2f5429a1bef251ae99fd816e5503bf6983..c23893e1f5a09b3155b7ebf7ccfa092bb6d55f45 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
@@ -9,7 +9,7 @@ import { getUrl, ResourceUri } from '@ngxp/rest';
 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 { SelectedSearchItemComponent } from './search-item-selected/selected-search-item.component';
 import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisations-einheit/search-organisations-einheit.component';
 
 @Component({
@@ -22,7 +22,7 @@ import { ForwardingSearchOrganisationsEinheitComponent } from './search-organisa
     ZustaendigeStelleModule,
     ForwardingButtonComponent,
     ForwardingSearchOrganisationsEinheitComponent,
-    SearchItemSelectedComponent,
+    SelectedSearchItemComponent,
     DialogContainerComponent,
   ],
   templateUrl: './forwarding-dialog.component.html',
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.spec.ts
similarity index 85%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.spec.ts
index ff1f2e2a77ad69b5d17d7871cf0e7167af3a4132..c95fd052a78482a1a5aa3a15a60e3e3cd0b35ec3 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.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 { SearchItemSelectedComponent } from './search-item-selected.component';
+import { SelectedSearchItemComponent } from './selected-search-item.component';
 
 describe('ForwardingSearchOrganisationsEinheitComponent', () => {
-  let component: SearchItemSelectedComponent;
-  let fixture: ComponentFixture<SearchItemSelectedComponent>;
+  let component: SelectedSearchItemComponent;
+  let fixture: ComponentFixture<SelectedSearchItemComponent>;
 
   const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
   const anschrift: Anschrift = organisationsEinheitResource.anschrift;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [SearchItemSelectedComponent],
+      imports: [SelectedSearchItemComponent],
       declarations: [
         MockComponent(ChangeButtonContainerComponent),
         MockComponent(ForwardingItemComponent),
@@ -25,7 +25,7 @@ describe('ForwardingSearchOrganisationsEinheitComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(SearchItemSelectedComponent);
+    fixture = TestBed.createComponent(SelectedSearchItemComponent);
     component = fixture.componentInstance;
     component.organisationsEinheitResource = organisationsEinheitResource;
     fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.ts
similarity index 80%
rename from alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.component.ts
index 640f93dfb6e8cad5685492fd536e55c403190fce..c40737820507149807e1fe17be6de8a6033b6e6d 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/search-item-selected.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/search-item-selected/selected-search-item.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-item-selected',
+  selector: 'alfa-selected-search-item',
   standalone: true,
   imports: [ChangeButtonContainerComponent, AnschriftToStringPipe, ForwardingItemComponent, ForwardingItemInfoComponent],
-  templateUrl: './search-item-selected.component.html',
+  templateUrl: './selected-search-item.component.html',
 })
-export class SearchItemSelectedComponent {
+export class SelectedSearchItemComponent {
   @Input() organisationsEinheitResource: OrganisationsEinheitResource;
 }