diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
index 1910f3d1708e690afa1c807bb8541d4d5dd08bb1..4f08165701d0eaf85317419d63d49443c8a412b5 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
@@ -30,7 +30,7 @@
     text="Bescheiden"
     svgIcon="stamp"
     [stateResource]="commandStateResource$ | async"
-    (clickEmitter)="onClickHandler()"
+    (clickEmitter)="onClick()"
   >
   </ozgcloud-stroked-button-with-spinner>
 
@@ -40,7 +40,7 @@
     svgIcon="stamp"
     toolTip="Vorgang bescheiden"
     [stateResource]="commandStateResource$ | async"
-    (clickEmitter)="onClickHandler()"
+    (clickEmitter)="onClick()"
   >
   </ozgcloud-icon-button-with-spinner>
 </ng-container>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
index f7c15e2cebe5564e00ed70d214763bf423a56317..a60d700113e084589268d8cdc65e485646bdf1b1 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
@@ -124,20 +124,20 @@ describe('BescheidenButtonComponent', () => {
     });
   });
 
-  describe('onClickHandler', () => {
+  describe('onClick', () => {
     it('should call openBescheidenWizard', () => {
-      const mock = (component.openBescheidenWizard = jest.fn());
+      const openBescheidenWizard = (component.openBescheidenWizard = jest.fn());
       component.vorgang = createVorgangWithEingangResource([
         VorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT,
       ]);
 
-      component.onClickHandler();
+      component.onClick();
 
-      expect(mock).toHaveBeenCalled();
+      expect(openBescheidenWizard).toHaveBeenCalled();
     });
 
     it('should call vorgangCommandService.bescheiden', () => {
-      component.onClickHandler();
+      component.onClick();
 
       expect(vorgangCommandService.bescheiden).toHaveBeenCalled();
     });
@@ -173,20 +173,21 @@ describe('BescheidenButtonComponent', () => {
       component.vorgang = createVorgangWithEingangResource([
         VorgangWithEingangLinkRel.BESCHEID_DRAFT,
       ]);
-      const mock = (component.openBescheidenDialogWithExistingDraft = jest.fn());
+      const openBescheidenDialogWithExistingDraft =
+        (component.openBescheidenDialogWithExistingDraft = jest.fn());
 
       component.openBescheidenWizard();
 
-      expect(mock).toHaveBeenCalled();
+      expect(openBescheidenDialogWithExistingDraft).toHaveBeenCalled();
     });
 
     it('should open bescheiden dialog with new draft', () => {
       component.vorgang = createVorgangWithEingangResource();
-      const mock = (component.openBescheidDialogWithNewDraft = jest.fn());
+      const openBescheidDialogWithNewDraft = (component.openBescheidDialogWithNewDraft = jest.fn());
 
       component.openBescheidenWizard();
 
-      expect(mock).toHaveBeenCalled();
+      expect(openBescheidDialogWithNewDraft).toHaveBeenCalled();
     });
   });
 
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.ts
index 75600aa94230ba1e899e30d3ec25b7d5ea50f1ad..e7faa08933b60abb77b0850b9dd0409bc460e746 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.ts
@@ -61,7 +61,7 @@ export class BescheidenButtonComponent implements OnInit {
     this.commandStateResource$ = this.vorgangCommandService.getBeschiedenCommand();
   }
 
-  public onClickHandler(): void {
+  public onClick(): void {
     if (hasLink(this.vorgang, VorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT)) {
       this.openBescheidenWizard();
     } else {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
index b15d2652b603d4e8123a30a97c26cf5e87448431..1b5791a219f69124dca4c77093010d54250cf451 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
@@ -33,17 +33,17 @@ describe('BescheidenFormServiceService', () => {
   });
 
   describe('getValue', () => {
-    let getFormValueMock;
+    let getFormValue;
 
     beforeEach(() => {
-      getFormValueMock = service.getFormValue = jest.fn();
-      getFormValueMock.mockReturnValue({ beschiedenAm: now, bewilligt: 'true' });
+      getFormValue = service.getFormValue = jest.fn();
+      getFormValue.mockReturnValue({ beschiedenAm: now, bewilligt: 'true' });
     });
 
     it('should call getFormValue', () => {
       service.getValue();
 
-      expect(getFormValueMock).toHaveBeenCalled();
+      expect(getFormValue).toHaveBeenCalled();
     });
 
     it('should return bescheid', () => {
@@ -63,16 +63,16 @@ describe('BescheidenFormServiceService', () => {
 
   describe('patchValues', () => {
     const bescheid = createBescheid();
-    let patchMock;
+    let patch;
 
     beforeEach(() => {
-      patchMock = service.patch = jest.fn();
+      patch = service.patch = jest.fn();
     });
 
     it('should call patch', () => {
       service.patchValues(bescheid);
 
-      expect(patchMock).toHaveBeenCalledWith({
+      expect(patch).toHaveBeenCalledWith({
         [BescheidenFormService.FIELD_BESCHIEDEN_AM]: bescheid.beschiedenAm,
         [BescheidenFormService.FIELD_BEWILLIGT]: String(bescheid.bewilligt),
       });
@@ -81,7 +81,7 @@ describe('BescheidenFormServiceService', () => {
     it('should not call patch', () => {
       service.patchValues(null);
 
-      expect(patchMock).not.toHaveBeenCalled();
+      expect(patch).not.toHaveBeenCalled();
     });
   });