diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.html b/frontend/src/app/feature/game/blackjack/blackjack.component.html
index dd62189..db4d698 100644
--- a/frontend/src/app/feature/game/blackjack/blackjack.component.html
+++ b/frontend/src/app/feature/game/blackjack/blackjack.component.html
@@ -6,9 +6,9 @@
       <app-dealer-hand [cards]="dealerCards"></app-dealer-hand>
       <app-player-hand [cards]="playerCards"></app-player-hand>
       <app-game-controls
-        (onHit)="onHit()"
-        (onStand)="onStand()"
-        (onLeave)="leaveGame()"
+        (hit)="onHit()"
+        (stand)="onStand()"
+        (leave)="leaveGame()"
       ></app-game-controls>
     </div>
 
@@ -16,7 +16,7 @@
       <app-game-info
         [balance]="balance()"
         [currentBet]="currentBet"
-        (onNewGameClick)="onNewGame()"
+        (newGame)="onNewGame()"
       ></app-game-info>
     </div>
   </div>
diff --git a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts
index 92aac24..c78111f 100644
--- a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts
+++ b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts
@@ -8,19 +8,19 @@ import { CommonModule } from '@angular/common';
   template: `
     <div class="flex justify-center gap-4">
       <button
-        (click)="onHit.emit()"
+        (click)="hit.emit()"
         class="button-primary px-8 py-4 text-lg font-medium min-w-[120px]"
       >
         Ziehen
       </button>
       <button
-        (click)="onStand.emit()"
+        (click)="stand.emit()"
         class="button-primary px-8 py-4 text-lg font-medium min-w-[120px]"
       >
         Halten
       </button>
       <button
-        (click)="onLeave.emit()"
+        (click)="leave.emit()"
         class="bg-accent-red hover:bg-accent-red/80 px-8 py-4 rounded text-lg font-medium min-w-[120px] transition-all duration-300"
       >
         Abbrechen
@@ -30,7 +30,7 @@ import { CommonModule } from '@angular/common';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class GameControlsComponent {
-  @Output() onHit = new EventEmitter<void>();
-  @Output() onStand = new EventEmitter<void>();
-  @Output() onLeave = new EventEmitter<void>();
+  @Output() hit = new EventEmitter<void>();
+  @Output() stand = new EventEmitter<void>();
+  @Output() leave = new EventEmitter<void>();
 }
diff --git a/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts b/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts
index ab3f612..8f9d532 100644
--- a/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts
+++ b/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts
@@ -19,16 +19,14 @@ import { CommonModule, CurrencyPipe } from '@angular/common';
             {{ currentBet | currency: 'EUR' }}
           </span>
         </div>
-        <button class="button-primary w-full py-2" (click)="onNewGameClick.emit()">
-          Neues Spiel
-        </button>
+        <button class="button-primary w-full py-2" (click)="newGame.emit()">Neues Spiel</button>
       </div>
     </div>
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class GameInfoComponent {
-  @Input() balance: number = 0;
-  @Input() currentBet: number = 0;
-  @Output() onNewGameClick = new EventEmitter<void>();
+  @Input() balance = 0;
+  @Input() currentBet = 0;
+  @Output() newGame = new EventEmitter<void>();
 }