diff --git a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components.ts b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components.ts
index b91293c81d9c0bc662f2ba91cbc1a14a03b9b548..eb3c618504707e0ab04322b655320bc57cdb9709 100644
--- a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components.ts
@@ -25,7 +25,7 @@ export class VorgangFormularButtonsE2EComponent {
   private readonly abschliessenButton: string = 'abschliessen-button';
   private readonly annehmenButton: string = 'annehmen-button';
   private readonly bearbeitenButton: string = 'bearbeiten-button';
-  private readonly forwardButton: string = 'forward-by-ozgcloud-button';
+  private readonly forwardButton: string = 'forwarding-button';
   private readonly bescheidenButton: string = 'bescheiden-button';
   private readonly endgueltigLoeschenButton: string = 'endgueltig-loeschen-button';
   private readonly loeschAnforderungZuruecknehmenButton: string = 'loesch-anforderung-zuruecknehmen-button';
diff --git a/alfa-client/libs/forwarding/src/index.ts b/alfa-client/libs/forwarding/src/index.ts
index 24d937c3408da87eef49107297ff05faf4ffd709..49ebdccb493b46cfb0c7565d0635dfb7ee617d18 100644
--- a/alfa-client/libs/forwarding/src/index.ts
+++ b/alfa-client/libs/forwarding/src/index.ts
@@ -21,6 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-export * from './lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component';
+export * from './lib/forwarding-button-container/forwarding-button-container.component';
+export * from './lib/forwarding-by-email-container/forwarding-by-email-container.component';
 export * from './lib/forwarding.module';
-export * from './lib/vorgang-forwarding-container/vorgang-forwarding-container.component';
diff --git a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
similarity index 84%
rename from alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
index 13e96065df01af48d1501a2d296068dc44df3d97..bdf8537e74921852fa7d6d5c614dacc7179b1cf4 100644
--- a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
@@ -5,12 +5,12 @@
       tooltipAriaType="aria-labelledby"
       variant="ghost"
       size="fit"
-      dataTestId="forward-by-ozgcloud-icon-button"
+      dataTestId="forwarding-icon-button"
     >
       <ods-forward-vorgang-icon icon class="fill-text" />
     </ods-open-dialog-button>
   } @else {
-    <ods-open-dialog-button label="Weiterleiten" variant="outline" dataTestId="forward-by-ozgcloud-button">
+    <ods-open-dialog-button label="Weiterleiten" variant="outline" dataTestId="forwarding-button">
       <ods-forward-vorgang-icon icon class="fill-primary" />
     </ods-open-dialog-button>
   }
diff --git a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts
similarity index 79%
rename from alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts
index a5bb3728153bdd308d54f27377b1c190b9070a41..64f911229dabdbf02698f7d1faddff016383be75 100644
--- a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts
@@ -7,18 +7,18 @@ import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
 import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 import { MockComponent, MockDirective } from 'ng-mocks';
-import { ForwardByOzgcloudButtonContainerComponent } from './forward-by-ozgcloud-button-container.component';
+import { ForwardingButtonContainerComponent } from './forwarding-button-container.component';
 
-describe('ForwardByOzgcloudButtonContainerComponent', () => {
-  let component: ForwardByOzgcloudButtonContainerComponent;
-  let fixture: ComponentFixture<ForwardByOzgcloudButtonContainerComponent>;
+describe('ForwardingButtonContainerComponent', () => {
+  let component: ForwardingButtonContainerComponent;
+  let fixture: ComponentFixture<ForwardingButtonContainerComponent>;
 
-  const iconButton: string = getDataTestIdAttributeOf('forward-by-ozgcloud-icon-button');
-  const button: string = getDataTestIdAttributeOf('forward-by-ozgcloud-button');
+  const iconButton: string = getDataTestIdAttributeOf('forwarding-icon-button');
+  const button: string = getDataTestIdAttributeOf('forwarding-button');
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ForwardByOzgcloudButtonContainerComponent, HasLinkPipe],
+      imports: [ForwardingButtonContainerComponent, HasLinkPipe],
       declarations: [
         MockComponent(OpenDialogButtonComponent),
         MockComponent(ForwardVorgangIconComponent),
@@ -26,7 +26,7 @@ describe('ForwardByOzgcloudButtonContainerComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(ForwardByOzgcloudButtonContainerComponent);
+    fixture = TestBed.createComponent(ForwardingButtonContainerComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts
similarity index 84%
rename from alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts
index 0cf9083577304e8773a4713809fa1fc40439822b..0f6d13f6a511dfed30763f27404380391a873e00 100644
--- a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts
@@ -8,14 +8,14 @@ import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
 import { ForwardingDialogContainerComponent } from '../forwarding-dialog-container/forwarding-dialog-container.component';
 
 @Component({
-  selector: 'alfa-forward-by-ozgcloud-button-container',
+  selector: 'alfa-forwarding-button-container',
   standalone: true,
   imports: [CommonModule, ForwardVorgangIconComponent, TooltipDirective, HasLinkPipe, OpenDialogButtonComponent],
-  templateUrl: './forward-by-ozgcloud-button-container.component.html',
+  templateUrl: './forwarding-button-container.component.html',
   providers: [{ provide: DIALOG_COMPONENT, useValue: ForwardingDialogContainerComponent }],
   styles: [':host {@apply empty:hidden}'],
 })
-export class ForwardByOzgcloudButtonContainerComponent {
+export class ForwardingButtonContainerComponent {
   @Input() vorgangWithEingang: VorgangWithEingangResource;
   @Input() showAsIconButton: boolean = false;
 
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.html
similarity index 88%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.html
index 2698ddc7e78cbb2a6b8c6d0a4a6bbd67806ecc85..6f6b5fecf630fc540d9be10a2ff9fa40897fef97 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.html
@@ -30,15 +30,15 @@
     *ngIf="forwardingStateResources$ | async as forwardingStateResources"
   >
     <ozgcloud-spinner [stateResource]="forwardingStateResources">
-      <alfa-vorgang-forwarding-info-list [forwardingList]="forwardingStateResources"></alfa-vorgang-forwarding-info-list>
+      <alfa-forwarding-by-email-info-list [forwardingList]="forwardingStateResources"></alfa-forwarding-by-email-info-list>
     </ozgcloud-spinner>
 
-    <alfa-vorgang-forward-formular
+    <alfa-forward-by-email-formular
       data-test-id="forward-formular"
       [vorgang]="vorgang"
       [pendingForwardCommand]="pendingForwardStateResource$ | async"
       (doSubmit)="submit()"
     >
-    </alfa-vorgang-forward-formular>
+    </alfa-forward-by-email-formular>
   </ozgcloud-expansion-panel>
 </ng-container>
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.spec.ts
similarity index 84%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.spec.ts
index 25691e2e369a3024d426d9a1e7a4e8976b37d228..a4dd016d064b1e6d4c377d4f37518d8f9811eb84 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.spec.ts
@@ -32,16 +32,16 @@ import { createCommandResource } from 'libs/command-shared/test/command';
 import { createVorgangForwardRequest, createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
-import { VorgangForwardFormService } from './vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice';
-import { VorgangForwardFormularComponent } from './vorgang-forward-formular/vorgang-forward-formular.component';
-import { VorgangForwardingContainerComponent } from './vorgang-forwarding-container.component';
-import { VorgangForwardingInfoListComponent } from './vorgang-forwarding-info-list/vorgang-forwarding-info-list.component';
+import { ForwardingByEmailContainerComponent } from './forwarding-by-email-container.component';
+import { ForwardingByEmailFormService } from './forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service';
+import { ForwardingByEmailFormularComponent } from './forwarding-by-email-formular/forwarding-by-email-formular.component';
+import { ForwardingByEmailInfoListComponent } from './forwarding-by-email-info-list/forwarding-by-email-info-list.component';
 
-describe('VorgangForwardingContainerComponent', () => {
-  let component: VorgangForwardingContainerComponent;
-  let fixture: ComponentFixture<VorgangForwardingContainerComponent>;
+describe('ForwardingByEmailContainerComponent', () => {
+  let component: ForwardingByEmailContainerComponent;
+  let fixture: ComponentFixture<ForwardingByEmailContainerComponent>;
 
-  const formService = mock(VorgangForwardFormService);
+  const formService = mock(ForwardingByEmailFormService);
   const service = mock(ForwardingService);
 
   const forwarding: string = '[data-test-id="forwarding"]';
@@ -49,17 +49,17 @@ describe('VorgangForwardingContainerComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [
-        VorgangForwardingContainerComponent,
+        ForwardingByEmailContainerComponent,
         HasLinkPipe,
         MockComponent(SpinnerComponent),
-        MockComponent(VorgangForwardingInfoListComponent),
-        MockComponent(VorgangForwardFormularComponent),
+        MockComponent(ForwardingByEmailInfoListComponent),
+        MockComponent(ForwardingByEmailFormularComponent),
         MockComponent(ExpansionPanelComponent),
       ],
       providers: [
         UntypedFormBuilder,
         {
-          provide: VorgangForwardFormService,
+          provide: ForwardingByEmailFormService,
           useValue: formService,
         },
         {
@@ -71,7 +71,7 @@ describe('VorgangForwardingContainerComponent', () => {
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(VorgangForwardingContainerComponent);
+    fixture = TestBed.createComponent(ForwardingByEmailContainerComponent);
     component = fixture.componentInstance;
     component.pendingForwardStateResource$ = of(
       createStateResource({
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.ts
similarity index 84%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.ts
index 9613957552ae86a387c108ecfa05f71463c8218b..f38fe66d56f971eef30db7804b5f8eea516853f1 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.ts
@@ -29,15 +29,15 @@ import { Component, Input, OnChanges } from '@angular/core';
 import { hasLink } from '@ngxp/rest';
 import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel';
 import { Observable, of } from 'rxjs';
-import { VorgangForwardFormService } from './vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice';
+import { ForwardingByEmailFormService } from './forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service';
 
 @Component({
-  selector: 'alfa-vorgang-forwarding-container',
-  templateUrl: './vorgang-forwarding-container.component.html',
-  styleUrls: ['./vorgang-forwarding-container.component.scss'],
-  providers: [VorgangForwardFormService],
+  selector: 'alfa-forwarding-by-email-container',
+  templateUrl: './forwarding-by-email-container.component.html',
+  styleUrls: ['./forwarding-by-email-container.component.scss'],
+  providers: [ForwardingByEmailFormService],
 })
-export class VorgangForwardingContainerComponent implements OnChanges {
+export class ForwardingByEmailContainerComponent implements OnChanges {
   @Input() public vorgang: VorgangWithEingangResource;
 
   forwardingStateResources$: Observable<StateResource<ForwardingListResource>> =
@@ -48,7 +48,7 @@ export class VorgangForwardingContainerComponent implements OnChanges {
   readonly vorgangLinkRel = VorgangWithEingangLinkRel;
 
   constructor(
-    public formService: VorgangForwardFormService,
+    public formService: ForwardingByEmailFormService,
     private forwardingService: ForwardingService,
   ) {}
 
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.spec.ts
similarity index 83%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.spec.ts
index d4de767de8c460d74794b21ec61a5152ee38d2c6..a7f290dba1dbce319cd3822a64c97d63ba0c2adc 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.spec.ts
@@ -32,26 +32,26 @@ import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 import { MockComponent } from 'ng-mocks';
-import { VorgangForwardFormComponent } from './vorgang-forward-form.component';
-import { VorgangForwardFormService } from './vorgang-forward.formservice';
+import { ForwardingByEmailFormComponent } from './forwarding-by-email-form.component';
+import { ForwardingByEmailFormService } from './forwarding-by-email-form.service';
 
-describe('VorgangForwardFormComponent', () => {
-  let component: VorgangForwardFormComponent;
-  let fixture: ComponentFixture<VorgangForwardFormComponent>;
+describe('ForwardingByEmailFormComponent', () => {
+  let component: ForwardingByEmailFormComponent;
+  let fixture: ComponentFixture<ForwardingByEmailFormComponent>;
 
   const form: UntypedFormGroup = new UntypedFormGroup({
-    [VorgangForwardFormService.FIELD_PASSWORD]: new UntypedFormControl(null),
-    [VorgangForwardFormService.FIELD_EMAIL]: new UntypedFormControl(null),
+    [ForwardingByEmailFormService.FIELD_PASSWORD]: new UntypedFormControl(null),
+    [ForwardingByEmailFormService.FIELD_EMAIL]: new UntypedFormControl(null),
   });
 
-  const formService = { ...mock(VorgangForwardFormService), form };
+  const formService = { ...mock(ForwardingByEmailFormService), form };
 
   const vorgangWithEingang: VorgangWithEingangResource = createVorgangWithEingangResource();
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [
-        VorgangForwardFormComponent,
+        ForwardingByEmailFormComponent,
         MatIcon,
         MockComponent(OzgcloudStrokedButtonWithSpinnerComponent),
         MockComponent(OzgcloudTextEditorComponent),
@@ -59,7 +59,7 @@ describe('VorgangForwardFormComponent', () => {
       imports: [MatFormFieldModule, MatInputModule, ReactiveFormsModule, BrowserAnimationsModule],
       providers: [
         {
-          provide: VorgangForwardFormService,
+          provide: ForwardingByEmailFormService,
           useValue: formService,
         },
       ],
@@ -67,7 +67,7 @@ describe('VorgangForwardFormComponent', () => {
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(VorgangForwardFormComponent);
+    fixture = TestBed.createComponent(ForwardingByEmailFormComponent);
     component = fixture.componentInstance;
     component.vorgang = vorgangWithEingang;
     fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.ts
similarity index 78%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.ts
index 202a4fe83e31c78ac708914a1ef041a3203dec2f..62056b753804b1ebc91d616df4205cd172f05485 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.ts
@@ -21,28 +21,28 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { UntypedFormGroup } from '@angular/forms';
 import { CommandResource } from '@alfa-client/command-shared';
 import { StateResource } from '@alfa-client/tech-shared';
 import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import { isNil } from 'lodash-es';
-import { VorgangForwardFormService } from './vorgang-forward.formservice';
+import { ForwardingByEmailFormService } from './forwarding-by-email-form.service';
 
 @Component({
-  selector: 'alfa-vorgang-forward-form',
-  templateUrl: './vorgang-forward-form.component.html',
-  styleUrls: ['./vorgang-forward-form.component.scss'],
+  selector: 'alfa-forward-by-email-form',
+  templateUrl: './forwarding-by-email-form.component.html',
+  styleUrls: ['./forwarding-by-email-form.component.scss'],
 })
-export class VorgangForwardFormComponent implements OnChanges {
+export class ForwardingByEmailFormComponent implements OnChanges {
   @Input() forwardStateResource: StateResource<CommandResource>;
   @Input() vorgang: VorgangWithEingangResource;
 
   @Output('doSubmit') submit: EventEmitter<void> = new EventEmitter();
 
-  readonly formServiceClass = VorgangForwardFormService;
+  readonly formServiceClass = ForwardingByEmailFormService;
 
-  constructor(private formService: VorgangForwardFormService) {}
+  constructor(private formService: ForwardingByEmailFormService) {}
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.vorgang && this.zustaendigeStelleEmailExists()) {
@@ -60,10 +60,7 @@ export class VorgangForwardFormComponent implements OnChanges {
   }
 
   patchEmail(): void {
-    this.formService.patchField(
-      VorgangForwardFormService.FIELD_EMAIL,
-      this.vorgang.eingang.zustaendigeStelle.email,
-    );
+    this.formService.patchField(ForwardingByEmailFormService.FIELD_EMAIL, this.vorgang.eingang.zustaendigeStelle.email);
   }
 
   get form(): UntypedFormGroup {
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service.ts
similarity index 88%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service.ts
index 68fc4c4a960aa2635f161a4b4413da33b7da7a7e..9cbe55ce655a5df52ab295788a8879602a7d9bb9 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service.ts
@@ -30,7 +30,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angul
 import { Observable } from 'rxjs';
 
 @Injectable()
-export class VorgangForwardFormService extends AbstractFormService<CommandResource> {
+export class ForwardingByEmailFormService extends AbstractFormService<CommandResource> {
   static readonly FIELD_PATH_PREFIX = 'command.redirectRequest';
 
   static readonly FIELD_EMAIL = 'email';
@@ -47,13 +47,13 @@ export class VorgangForwardFormService extends AbstractFormService<CommandResour
 
   protected initForm(): UntypedFormGroup {
     return this.formBuilder.group({
-      [VorgangForwardFormService.FIELD_EMAIL]: new UntypedFormControl(),
-      [VorgangForwardFormService.FIELD_PASSWORD]: new UntypedFormControl(),
+      [ForwardingByEmailFormService.FIELD_EMAIL]: new UntypedFormControl(),
+      [ForwardingByEmailFormService.FIELD_PASSWORD]: new UntypedFormControl(),
     });
   }
 
   protected getPathPrefix(): string {
-    return VorgangForwardFormService.FIELD_PATH_PREFIX;
+    return ForwardingByEmailFormService.FIELD_PATH_PREFIX;
   }
 
   public setVorgang(vorgang: VorgangResource): void {
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email.formservice.spec.ts
similarity index 89%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email.formservice.spec.ts
index bdf61274a7de5bee95e7f4192ec724b109bf6735..a20bed0488696ecb79c97108a03d0c2b5f1a36f8 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email.formservice.spec.ts
@@ -21,15 +21,15 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { ForwardingService } from '@alfa-client/forwarding-shared';
 import { mock, useFromMock } from '@alfa-client/test-utils';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
 import { of } from 'rxjs';
-import { VorgangForwardFormService } from './vorgang-forward.formservice';
+import { ForwardingByEmailFormService } from './forwarding-by-email-form.service';
 
-describe('VorgangForwardFormService', () => {
-  let formService: VorgangForwardFormService;
+describe('ForwardingByEmailFormService', () => {
+  let formService: ForwardingByEmailFormService;
   let service;
 
   const formBuilder: UntypedFormBuilder = new UntypedFormBuilder();
@@ -37,7 +37,7 @@ describe('VorgangForwardFormService', () => {
   beforeEach(() => {
     service = mock(ForwardingService);
 
-    formService = new VorgangForwardFormService(formBuilder, useFromMock(service));
+    formService = new ForwardingByEmailFormService(formBuilder, useFromMock(service));
   });
 
   it('should create', () => {
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.html
similarity index 95%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.html
index 62c2a5d4b5f9c70f8366791911cee5e02db1bf58..b3729e2b1a5da9a17c16b456c0d826c940816aeb 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.html
@@ -32,11 +32,11 @@
 >
 </ozgcloud-spinner>
 
-<alfa-vorgang-forward-form
+<alfa-forward-by-email-form
   *ngIf="vorgang | hasLink: vorgangLinkRel.FORWARD"
   data-test-id="forward-form"
   [vorgang]="vorgang"
   [forwardStateResource]="pendingForwardCommand"
   (doSubmit)="submit.emit()"
 >
-</alfa-vorgang-forward-form>
+</alfa-forward-by-email-form>
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.spec.ts
similarity index 81%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.spec.ts
index 1ae6e68ebdc117a55bab652ed62496bb3f00699d..cd26ff87ee2eb7cbec85b974db3aa23cc77f206c 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.spec.ts
@@ -21,34 +21,34 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { createEmptyStateResource, HasLinkPipe } from '@alfa-client/tech-shared';
 import { SpinnerComponent } from '@alfa-client/ui';
 import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 import { MockComponent } from 'ng-mocks';
-import { VorgangForwardFormComponent } from './vorgang-forward-form/vorgang-forward-form.component';
-import { VorgangForwardFormularComponent } from './vorgang-forward-formular.component';
+import { ForwardingByEmailFormComponent } from './forwarding-by-email-form/forwarding-by-email-form.component';
+import { ForwardingByEmailFormularComponent } from './forwarding-by-email-formular.component';
 
-describe('VorgangForwardFormularComponent', () => {
-  let component: VorgangForwardFormularComponent;
-  let fixture: ComponentFixture<VorgangForwardFormularComponent>;
+describe('ForwardingByEmailFormularComponent', () => {
+  let component: ForwardingByEmailFormularComponent;
+  let fixture: ComponentFixture<ForwardingByEmailFormularComponent>;
 
   const forwardFormular: string = '[data-test-id="forward-form"]';
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [
-        VorgangForwardFormularComponent,
+        ForwardingByEmailFormularComponent,
         HasLinkPipe,
         MockComponent(SpinnerComponent),
-        MockComponent(VorgangForwardFormComponent),
+        MockComponent(ForwardingByEmailFormComponent),
       ],
     });
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(VorgangForwardFormularComponent);
+    fixture = TestBed.createComponent(ForwardingByEmailFormularComponent);
     component = fixture.componentInstance;
     component.pendingForwardCommand = createEmptyStateResource();
     fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.ts
similarity index 88%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.ts
index 087ef0833ec89bdfd4a94cf766afde315b3fb838..90359c37ba60ac4ed31c983af4203cf476341cfc 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.ts
@@ -21,18 +21,18 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { CommandResource } from '@alfa-client/command-shared';
 import { StateResource } from '@alfa-client/tech-shared';
 import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel';
 
 @Component({
-  selector: 'alfa-vorgang-forward-formular',
-  templateUrl: './vorgang-forward-formular.component.html',
-  styleUrls: ['./vorgang-forward-formular.component.scss'],
+  selector: 'alfa-forward-by-email-formular',
+  templateUrl: './forwarding-by-email-formular.component.html',
+  styleUrls: ['./forwarding-by-email-formular.component.scss'],
 })
-export class VorgangForwardFormularComponent {
+export class ForwardingByEmailFormularComponent {
   @Input() public vorgang: VorgangWithEingangResource;
   @Input() public pendingForwardCommand: StateResource<CommandResource>;
 
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.html
similarity index 94%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.html
index a358b03574297c36505a0f6456632bd50124a8ed..cdaf3279726e35aadd126f4565d36ca8a165026f 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.html
@@ -23,10 +23,10 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<alfa-vorgang-forwarding-info
+<alfa-forwarding-by-email-info
   *ngFor="
     let forwarding of forwardingList.resource | toEmbeddedResources: listLinkRel.FORWARDING_LIST
   "
   [forwarding]="forwarding"
 >
-</alfa-vorgang-forwarding-info>
+</alfa-forwarding-by-email-info>
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.spec.ts
similarity index 72%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.spec.ts
index fcb17963b66bc13d7ca9204a20b46eb3c4dcdb0e..d4bd32a97b8b36df4c1bf911ce9a4e01a9d976a7 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.spec.ts
@@ -21,29 +21,25 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { createStateResource, ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { createCommandListResource } from 'libs/command-shared/test/command';
 import { MockComponent } from 'ng-mocks';
-import { VorgangForwardingInfoListComponent } from './vorgang-forwarding-info-list.component';
-import { VorgangForwardingInfoComponent } from './vorgang-forwarding-info/vorgang-forwarding-info.component';
+import { ForwardingByEmailInfoListComponent } from './forwarding-by-email-info-list.component';
+import { ForwardingByEmailInfoComponent } from './forwarding-by-email-info/forwarding-by-email-info.component';
 
-describe('VorgangForwardingInfoListComponent', () => {
-  let component: VorgangForwardingInfoListComponent;
-  let fixture: ComponentFixture<VorgangForwardingInfoListComponent>;
+describe('ForwardingByEmailInfoListComponent', () => {
+  let component: ForwardingByEmailInfoListComponent;
+  let fixture: ComponentFixture<ForwardingByEmailInfoListComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [
-        VorgangForwardingInfoListComponent,
-        MockComponent(VorgangForwardingInfoComponent),
-        ToEmbeddedResourcesPipe,
-      ],
+      declarations: [ForwardingByEmailInfoListComponent, MockComponent(ForwardingByEmailInfoComponent), ToEmbeddedResourcesPipe],
     }).compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(VorgangForwardingInfoListComponent);
+    fixture = TestBed.createComponent(ForwardingByEmailInfoListComponent);
     component = fixture.componentInstance;
     component.forwardingList = createStateResource(createCommandListResource());
     fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.ts
similarity index 85%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.ts
index 23c57cf9b93914849174a9550dbdc4ba5623f397..8cc5127425be7951f0105fe614745324f50344ce 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.ts
@@ -21,17 +21,17 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { Component, Input } from '@angular/core';
 import { CommandListResource } from '@alfa-client/command-shared';
 import { ForwardingListLinkRel } from '@alfa-client/forwarding-shared';
 import { StateResource } from '@alfa-client/tech-shared';
+import { Component, Input } from '@angular/core';
 
 @Component({
-  selector: 'alfa-vorgang-forwarding-info-list',
-  templateUrl: './vorgang-forwarding-info-list.component.html',
-  styleUrls: ['./vorgang-forwarding-info-list.component.scss'],
+  selector: 'alfa-forwarding-by-email-info-list',
+  templateUrl: './forwarding-by-email-info-list.component.html',
+  styleUrls: ['./forwarding-by-email-info-list.component.scss'],
 })
-export class VorgangForwardingInfoListComponent {
+export class ForwardingByEmailInfoListComponent {
   @Input() public forwardingList: StateResource<CommandListResource>;
 
   readonly listLinkRel = ForwardingListLinkRel;
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.html
similarity index 95%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.html
index e3fe65cb08140c7190e6c96f943895c744e00da0..add689836951a6d770d92fc47547d2eea730077e 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.html
@@ -42,7 +42,7 @@
     Versendet am {{ forwarding.sentAt | formatDateWithTimePipe }}
   </p>
 
-  <alfa-vorgang-forward-zustellen-container
+  <alfa-forward-by-email-zustellen-container
     [forwarding]="forwarding"
-  ></alfa-vorgang-forward-zustellen-container>
+  ></alfa-forward-by-email-zustellen-container>
 </ng-template>
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.spec.ts
similarity index 86%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.spec.ts
index 12b90483aed9a47eed13c6aa1cd7eff4d3828059..c42367bfa51ab3181cdfe38ea817f9d92ec1d8fb 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.spec.ts
@@ -21,6 +21,8 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { ForwardingLinkRel } from '@alfa-client/forwarding-shared';
+import { FormatDateWithTimePipe, HasLinkPipe } from '@alfa-client/tech-shared';
 import { registerLocaleData } from '@angular/common';
 import localeDe from '@angular/common/locales/de';
 import localeDeExtra from '@angular/common/locales/extra/de';
@@ -28,18 +30,16 @@ import { LOCALE_ID } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MAT_DATE_LOCALE } from '@angular/material/core';
 import { MatIcon } from '@angular/material/icon';
-import { ForwardingLinkRel } from '@alfa-client/forwarding-shared';
-import { FormatDateWithTimePipe, HasLinkPipe } from '@alfa-client/tech-shared';
 import { createForwardingResource } from 'libs/forwarding-shared/test/forwarding';
 import { MockComponent } from 'ng-mocks';
-import { VorgangForwardZustellenContainerComponent } from '../../../vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component';
-import { VorgangForwardingInfoComponent } from './vorgang-forwarding-info.component';
+import { ForwardingByEmailZustellenContainerComponent } from '../../../forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component';
+import { ForwardingByEmailInfoComponent } from './forwarding-by-email-info.component';
 
 registerLocaleData(localeDe, 'de', localeDeExtra);
 
-describe('VorgangForwardingInfoComponent', () => {
-  let component: VorgangForwardingInfoComponent;
-  let fixture: ComponentFixture<VorgangForwardingInfoComponent>;
+describe('ForwardingByEmailInfoComponent', () => {
+  let component: ForwardingByEmailInfoComponent;
+  let fixture: ComponentFixture<ForwardingByEmailInfoComponent>;
 
   const errorMessage: string = '[data-test-id="forwarding-error-message"]';
   const successMessage: string = '[data-test-id="forwarding-success-message"]';
@@ -47,11 +47,11 @@ describe('VorgangForwardingInfoComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [
-        VorgangForwardingInfoComponent,
+        ForwardingByEmailInfoComponent,
         FormatDateWithTimePipe,
         MatIcon,
         HasLinkPipe,
-        MockComponent(VorgangForwardZustellenContainerComponent),
+        MockComponent(ForwardingByEmailZustellenContainerComponent),
       ],
       providers: [
         { provide: LOCALE_ID, useValue: 'de' },
@@ -61,7 +61,7 @@ describe('VorgangForwardingInfoComponent', () => {
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(VorgangForwardingInfoComponent);
+    fixture = TestBed.createComponent(ForwardingByEmailInfoComponent);
     component = fixture.componentInstance;
     component.forwarding = createForwardingResource();
     fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.ts
similarity index 85%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.ts
index 3f4948987d118ab454fb65a25988fe5d1327e3e8..7c5490bb38db212d873a50ca4ead6f4eb93e338f 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.ts
@@ -21,15 +21,15 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { Component, Input } from '@angular/core';
 import { ForwardingLinkRel, ForwardingResource } from '@alfa-client/forwarding-shared';
+import { Component, Input } from '@angular/core';
 
 @Component({
-  selector: 'alfa-vorgang-forwarding-info',
-  templateUrl: './vorgang-forwarding-info.component.html',
-  styleUrls: ['./vorgang-forwarding-info.component.scss'],
+  selector: 'alfa-forwarding-by-email-info',
+  templateUrl: './forwarding-by-email-info.component.html',
+  styleUrls: ['./forwarding-by-email-info.component.scss'],
 })
-export class VorgangForwardingInfoComponent {
+export class ForwardingByEmailInfoComponent {
   @Input() public forwarding: ForwardingResource;
 
   readonly linkRel = ForwardingLinkRel;
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.spec.ts
similarity index 89%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.spec.ts
index 46602865bee94117dd136e994133029c41001d07..e28f66a088a6dff1fb47b02c4423fcad0ef3b042 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.spec.ts
@@ -21,23 +21,19 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatIcon } from '@angular/material/icon';
-import {
-  ForwardingLinkRel,
-  ForwardingResource,
-  ForwardingService,
-} from '@alfa-client/forwarding-shared';
+import { ForwardingLinkRel, ForwardingResource, ForwardingService } from '@alfa-client/forwarding-shared';
 import { HasLinkPipe } from '@alfa-client/tech-shared';
 import { mock } from '@alfa-client/test-utils';
 import { OzgcloudStrokedButtonWithSpinnerComponent } from '@alfa-client/ui';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatIcon } from '@angular/material/icon';
 import { createForwardingResource } from 'libs/forwarding-shared/test/forwarding';
 import { MockComponent } from 'ng-mocks';
-import { VorgangForwardZustellenContainerComponent } from './vorgang-forward-zustellen-container.component';
+import { ForwardingByEmailZustellenContainerComponent } from './forwarding-by-email-zustellen-container.component';
 
-describe('VorgangForwardZustellenContainerComponent', () => {
-  let component: VorgangForwardZustellenContainerComponent;
-  let fixture: ComponentFixture<VorgangForwardZustellenContainerComponent>;
+describe('ForwardingByEmailZustellenContainerComponent', () => {
+  let component: ForwardingByEmailZustellenContainerComponent;
+  let fixture: ComponentFixture<ForwardingByEmailZustellenContainerComponent>;
 
   const forwarding: ForwardingResource = createForwardingResource();
 
@@ -53,7 +49,7 @@ describe('VorgangForwardZustellenContainerComponent', () => {
     await TestBed.configureTestingModule({
       declarations: [
         HasLinkPipe,
-        VorgangForwardZustellenContainerComponent,
+        ForwardingByEmailZustellenContainerComponent,
         MatIcon,
         MockComponent(OzgcloudStrokedButtonWithSpinnerComponent),
       ],
@@ -67,7 +63,7 @@ describe('VorgangForwardZustellenContainerComponent', () => {
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(VorgangForwardZustellenContainerComponent);
+    fixture = TestBed.createComponent(ForwardingByEmailZustellenContainerComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.ts
similarity index 76%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.ts
index c7aebc99014825288f365709d57b693823d7fe3a..e4d6c197b9ec5eb09cbfd20a8cbcb9df7ca6d14a 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.ts
@@ -21,30 +21,24 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { Component, Input } from '@angular/core';
 import { CommandResource } from '@alfa-client/command-shared';
-import {
-  ForwardingLinkRel,
-  ForwardingResource,
-  ForwardingService,
-} from '@alfa-client/forwarding-shared';
+import { ForwardingLinkRel, ForwardingResource, ForwardingService } from '@alfa-client/forwarding-shared';
 import { createEmptyStateResource, StateResource } from '@alfa-client/tech-shared';
+import { Component, Input } from '@angular/core';
 import { Observable, of } from 'rxjs';
 
 @Component({
-  selector: 'alfa-vorgang-forward-zustellen-container',
-  templateUrl: './vorgang-forward-zustellen-container.component.html',
-  styleUrls: ['./vorgang-forward-zustellen-container.component.scss'],
+  selector: 'alfa-forward-by-email-zustellen-container',
+  templateUrl: './forwarding-by-email-zustellen-container.component.html',
+  styleUrls: ['./forwarding-by-email-zustellen-container.component.scss'],
 })
-export class VorgangForwardZustellenContainerComponent {
+export class ForwardingByEmailZustellenContainerComponent {
   @Input() forwarding: ForwardingResource;
 
-  public markAsSuccessCommandStateResource$: Observable<StateResource<CommandResource>> = of(
-    createEmptyStateResource<CommandResource>(),
-  );
-  public markAsFailCommandStateResource$: Observable<StateResource<CommandResource>> = of(
-    createEmptyStateResource<CommandResource>(),
-  );
+  public markAsSuccessCommandStateResource$: Observable<StateResource<CommandResource>> =
+    of(createEmptyStateResource<CommandResource>());
+  public markAsFailCommandStateResource$: Observable<StateResource<CommandResource>> =
+    of(createEmptyStateResource<CommandResource>());
 
   readonly linkRel = ForwardingLinkRel;
 
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
index aa520b8d99bca18bea17ba1939b8f9a38963ca9a..48c6469d8a7fee00ae2b4ff57f54aa9d7cfca6a7 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
@@ -1,3 +1,3 @@
-<ods-button-with-spinner text="Weiterleiten" variant="outline" dataTestId="forward-by-ozgcloud-button">
+<ods-button-with-spinner text="Weiterleiten" variant="outline" dataTestId="forwarding-button">
   <ods-forward-vorgang-icon icon class="fill-primary" />
 </ods-button-with-spinner>
\ No newline at end of file
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding.module.ts b/alfa-client/libs/forwarding/src/lib/forwarding.module.ts
index 973cf7b7a1603273e98ca30ee0bd511c57bb9cc1..387ac14e53f0810db203dcbe110b33cabe8b5ab0 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding.module.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding.module.ts
@@ -24,22 +24,17 @@
 import { CommandSharedModule } from '@alfa-client/command-shared';
 import { ForwardingSharedModule } from '@alfa-client/forwarding-shared';
 import { FormatDateWithTimePipe, HasLinkPipe, ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared';
-import {
-  ExpansionPanelComponent,
-  OzgcloudStrokedButtonWithSpinnerComponent,
-  OzgcloudTextEditorComponent,
-  SpinnerComponent,
-} from '@alfa-client/ui';
+import { ExpansionPanelComponent, OzgcloudStrokedButtonWithSpinnerComponent, OzgcloudTextEditorComponent, SpinnerComponent, } from '@alfa-client/ui';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatIcon } from '@angular/material/icon';
-import { VorgangForwardFormComponent } from './vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component';
-import { VorgangForwardFormularComponent } from './vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component';
-import { VorgangForwardingContainerComponent } from './vorgang-forwarding-container/vorgang-forwarding-container.component';
-import { VorgangForwardingInfoListComponent } from './vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component';
-import { VorgangForwardingInfoComponent } from './vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component';
-import { VorgangForwardZustellenContainerComponent } from './vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component';
+import { ForwardingByEmailContainerComponent } from './forwarding-by-email-container/forwarding-by-email-container.component';
+import { ForwardingByEmailFormComponent } from './forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component';
+import { ForwardingByEmailFormularComponent } from './forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component';
+import { ForwardingByEmailInfoListComponent } from './forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component';
+import { ForwardingByEmailInfoComponent } from './forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component';
+import { ForwardingByEmailZustellenContainerComponent } from './forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component';
 
 @NgModule({
   imports: [
@@ -57,15 +52,15 @@ import { VorgangForwardZustellenContainerComponent } from './vorgang-forwarding-
     ReactiveFormsModule,
   ],
   declarations: [
-    VorgangForwardZustellenContainerComponent,
-    VorgangForwardingContainerComponent,
-    VorgangForwardFormularComponent,
-    VorgangForwardingInfoComponent,
-    VorgangForwardingInfoListComponent,
-    VorgangForwardFormularComponent,
-    VorgangForwardZustellenContainerComponent,
-    VorgangForwardFormComponent,
+    ForwardingByEmailZustellenContainerComponent,
+    ForwardingByEmailContainerComponent,
+    ForwardingByEmailFormularComponent,
+    ForwardingByEmailInfoComponent,
+    ForwardingByEmailInfoListComponent,
+    ForwardingByEmailFormularComponent,
+    ForwardingByEmailZustellenContainerComponent,
+    ForwardingByEmailFormComponent,
   ],
-  exports: [VorgangForwardingContainerComponent],
+  exports: [ForwardingByEmailContainerComponent],
 })
 export class ForwardingModule {}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.html
index 7170a1ee9d6a52391ff3841614a4dff0a9cb4171..650f1390dbfeb14e5663d263719b0fbdbc98b24c 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.html
@@ -45,4 +45,4 @@
 <alfa-create-wiedervorlage-button-container [showAsIconButton]="showAsIconButton" [vorgang]="vorgangWithEingang" />
 <alfa-assign-user-profile-button-container [vorgang]="vorgangWithEingang" />
 <alfa-postfach-mail-button-container [showAsIconButton]="showAsIconButton" [vorgang]="vorgangWithEingang" />
-<alfa-forward-by-ozgcloud-button-container [vorgangWithEingang]="vorgangWithEingang" [showAsIconButton]="showAsIconButton" />
+<alfa-forwarding-button-container [vorgangWithEingang]="vorgangWithEingang" [showAsIconButton]="showAsIconButton" />
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts
index b8c3aed662cf6e6034a2a80d3eb99bd13472e235..4d860217f0985c53335390280988192e7f2427c9 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts
@@ -21,12 +21,8 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { ForwardByOzgcloudButtonContainerComponent } from '@alfa-client/forwarding';
-import {
-  EndgueltigLoeschenButtonContainerComponent,
-  LoeschAnforderungZuruecknehmenButtonContainerComponent,
-  LoeschenAnfordernButtonContainerComponent,
-} from '@alfa-client/loesch-anforderung';
+import { ForwardingButtonContainerComponent } from '@alfa-client/forwarding';
+import { EndgueltigLoeschenButtonContainerComponent, LoeschAnforderungZuruecknehmenButtonContainerComponent, LoeschenAnfordernButtonContainerComponent, } from '@alfa-client/loesch-anforderung';
 import { PostfachMailButtonContainerComponent } from '@alfa-client/postfach';
 import { HasLinkPipe } from '@alfa-client/tech-shared';
 import { existsAsHtmlElement, getMockComponent, notExistsAsHtmlElement } from '@alfa-client/test-utils';
@@ -77,7 +73,7 @@ describe('VorgangDetailActionButtonsComponent', () => {
         MockComponent(LoeschenAnfordernButtonContainerComponent),
         MockComponent(EndgueltigLoeschenButtonContainerComponent),
         MockComponent(LoeschAnforderungZuruecknehmenButtonContainerComponent),
-        MockComponent(ForwardByOzgcloudButtonContainerComponent),
+        MockComponent(ForwardingButtonContainerComponent),
       ],
     });
   });
@@ -123,10 +119,7 @@ describe('VorgangDetailActionButtonsComponent', () => {
 
     fixture.detectChanges();
 
-    const button: ForwardByOzgcloudButtonContainerComponent = getMockComponent(
-      fixture,
-      ForwardByOzgcloudButtonContainerComponent,
-    );
+    const button: ForwardingButtonContainerComponent = getMockComponent(fixture, ForwardingButtonContainerComponent);
     expect(button.vorgangWithEingang).toBe(vorgangWithEingang);
     expect(button.showAsIconButton).toBeTruthy();
   });
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
index 772fdbd05969b74f6fe626e05d5b74123f595f02..af35bf9c288929c532d54c232e770b764d94795a 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
@@ -60,10 +60,10 @@
 
       <div class="two-column">
         <div class="section" *ngIf="vorgangResource | hasLink: vorgangWithEingangLinkRel.FORWARD_BY_EMAIL">
-          <alfa-vorgang-forwarding-container
+          <alfa-forwarding-by-email-container
             [vorgang]="vorgangResource"
             data-test-id="forwarding-container-in-vorgang"
-          ></alfa-vorgang-forwarding-container>
+          ></alfa-forwarding-by-email-container>
         </div>
 
         <div class="section" *ngIf="vorgangResource | hasLink: vorgangHeaderLinkRel.WIEDERVORLAGEN">
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts
index 79d55a0dd7c4b095933d59e78923e8e786ae86a2..9a60edf8103e922ac4c2ed206fb0d56907c0b6f0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts
@@ -22,10 +22,10 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { CollaborationInVorgangContainerComponent } from '@alfa-client/collaboration';
-import { VorgangForwardingContainerComponent } from '@alfa-client/forwarding';
+import { ForwardingByEmailContainerComponent } from '@alfa-client/forwarding';
 import { KommentarListInVorgangContainerComponent } from '@alfa-client/kommentar';
 import { PostfachMailListContainerComponent } from '@alfa-client/postfach';
-import { HasLinkPipe, ToEmbeddedResourcesPipe, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
+import { createEmptyStateResource, createStateResource, HasLinkPipe, ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared';
 import { existsAsHtmlElement, getMockComponent, notExistsAsHtmlElement } from '@alfa-client/test-utils';
 import { ExpansionPanelComponent, OzgcloudStrokedButtonWithSpinnerComponent } from '@alfa-client/ui';
 import { VorgangHeaderLinkRel, VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
@@ -72,7 +72,7 @@ describe('VorgangDetailAreaComponent', () => {
         MockComponent(PostfachMailListContainerComponent),
         MockComponent(VorgangDetailAntragstellerComponent),
         MockComponent(VorgangDetailFormularDatenComponent),
-        MockComponent(VorgangForwardingContainerComponent),
+        MockComponent(ForwardingByEmailContainerComponent),
         MockComponent(BescheidListInVorgangContainerComponent),
         MockComponent(ExpansionPanelComponent),
         MockComponent(CollaborationInVorgangContainerComponent),
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.html
index 742a81193c28b8f3a3b199604b2ab1f36d8f5785..c11e59564e2b7878a53334eb7a9f1ed90fa3d63d 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.html
@@ -37,4 +37,4 @@
 }
 <alfa-endgueltig-loeschen-button-container [vorgang]="vorgangWithEingang" />
 <alfa-loesch-anforderung-zuruecknehmen-button-container />
-<alfa-forward-by-ozgcloud-button-container [vorgangWithEingang]="vorgangWithEingang" />
+<alfa-forwarding-button-container [vorgangWithEingang]="vorgangWithEingang" />
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts
index 4b16a16ee53c7fda49274e3002b8e111b8f93d30..04956f9d574e55013fd19ba30851dfdaf0010110 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts
@@ -21,12 +21,8 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { ForwardByOzgcloudButtonContainerComponent } from '@alfa-client/forwarding';
-import {
-  EndgueltigLoeschenButtonContainerComponent,
-  LoeschAnforderungZuruecknehmenButtonContainerComponent,
-  LoeschenAnfordernButtonContainerComponent,
-} from '@alfa-client/loesch-anforderung';
+import { ForwardingButtonContainerComponent } from '@alfa-client/forwarding';
+import { EndgueltigLoeschenButtonContainerComponent, LoeschAnforderungZuruecknehmenButtonContainerComponent, LoeschenAnfordernButtonContainerComponent, } from '@alfa-client/loesch-anforderung';
 import { HasLinkPipe } from '@alfa-client/tech-shared';
 import { existsAsHtmlElement, getMockComponent, notExistsAsHtmlElement } from '@alfa-client/test-utils';
 import { OzgcloudStrokedButtonWithSpinnerComponent } from '@alfa-client/ui';
@@ -70,7 +66,7 @@ describe('VorgangDetailFormularButtonsComponent', () => {
         MockComponent(LoeschenAnfordernButtonContainerComponent),
         MockComponent(EndgueltigLoeschenButtonContainerComponent),
         MockComponent(LoeschAnforderungZuruecknehmenButtonContainerComponent),
-        MockComponent(ForwardByOzgcloudButtonContainerComponent),
+        MockComponent(ForwardingButtonContainerComponent),
       ],
     });
   });
@@ -106,10 +102,7 @@ describe('VorgangDetailFormularButtonsComponent', () => {
     component.vorgangWithEingang = vorgangWithEingang;
     fixture.detectChanges();
 
-    const button: ForwardByOzgcloudButtonContainerComponent = getMockComponent(
-      fixture,
-      ForwardByOzgcloudButtonContainerComponent,
-    );
+    const button: ForwardingButtonContainerComponent = getMockComponent(fixture, ForwardingButtonContainerComponent);
     expect(button.vorgangWithEingang).toBe(vorgangWithEingang);
   });
 });
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index df1ec6563ff01d6130ab2cf54e144c5bfc970465..8721335caf1722ea64bcefb5c99f013e2f96c16d 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -24,7 +24,7 @@
 import { BescheidModule } from '@alfa-client/bescheid';
 import { BinaryFileModule } from '@alfa-client/binary-file';
 import { CollaborationModule } from '@alfa-client/collaboration';
-import { ForwardByOzgcloudButtonContainerComponent, ForwardingModule } from '@alfa-client/forwarding';
+import { ForwardingButtonContainerComponent, ForwardingModule } from '@alfa-client/forwarding';
 import { HistorieModule } from '@alfa-client/historie';
 import { KommentarModule } from '@alfa-client/kommentar';
 import { LoeschAnforderungModule } from '@alfa-client/loesch-anforderung';
@@ -32,21 +32,7 @@ import { LoeschAnforderungSharedModule } from '@alfa-client/loesch-anforderung-s
 import { PostfachModule } from '@alfa-client/postfach';
 import { PostfachSharedModule } from '@alfa-client/postfach-shared';
 import { ConvertForDataTestPipe, ConvertProblemDetailToErrorMessagesPipe, HasLinkPipe } from '@alfa-client/tech-shared';
-import {
-  BackButtonComponent,
-  DateEditorComponent,
-  ExpansionPanelComponent,
-  IconButtonWithSpinnerComponent,
-  OzgcloudIconButtonPrimaryComponent,
-  OzgcloudIconComponent,
-  OzgcloudMenuComponent,
-  OzgcloudPasteTextButtonComponent,
-  OzgcloudStrokedButtonWithSpinnerComponent,
-  OzgcloudTextEditorComponent,
-  SpinnerComponent,
-  SpinnerTransparencyComponent,
-  SubnavigationComponent,
-} from '@alfa-client/ui';
+import { BackButtonComponent, DateEditorComponent, ExpansionPanelComponent, IconButtonWithSpinnerComponent, OzgcloudIconButtonPrimaryComponent, OzgcloudIconComponent, OzgcloudMenuComponent, OzgcloudPasteTextButtonComponent, OzgcloudStrokedButtonWithSpinnerComponent, OzgcloudTextEditorComponent, SpinnerComponent, SpinnerTransparencyComponent, SubnavigationComponent, } from '@alfa-client/ui';
 import { UserProfileModule } from '@alfa-client/user-profile';
 import { UserProfileSharedModule } from '@alfa-client/user-profile-shared';
 import { VorgangSharedModule } from '@alfa-client/vorgang-shared';
@@ -60,13 +46,7 @@ import { MatIcon } from '@angular/material/icon';
 import { MatMenuTrigger } from '@angular/material/menu';
 import { MatTab, MatTabContent, MatTabGroup } from '@angular/material/tabs';
 import { RouterModule, Routes } from '@angular/router';
-import {
-  ButtonWithSpinnerComponent,
-  FileUploadEditorComponent,
-  SingleFileUploadEditorComponent,
-  TextareaEditorComponent,
-  TextEditorComponent,
-} from '@ods/component';
+import { ButtonWithSpinnerComponent, FileUploadEditorComponent, SingleFileUploadEditorComponent, TextareaEditorComponent, TextEditorComponent, } from '@ods/component';
 import {
   ArchiveIconComponent,
   AttachmentComponent,
@@ -230,7 +210,7 @@ const routes: Routes = [
     DropdownMenuTextItemComponent,
     MoreIconComponent,
     FileIconComponent,
-    ForwardByOzgcloudButtonContainerComponent,
+    ForwardingButtonContainerComponent,
     TooltipDirective,
     EditIconComponent,
     DiscardVorgangIconComponent,