diff --git a/apps/server/src/domains/game/handlers/onDisconnect.ts b/apps/server/src/domains/game/handlers/onDisconnect.ts
index d5856af..5555397 100644
--- a/apps/server/src/domains/game/handlers/onDisconnect.ts
+++ b/apps/server/src/domains/game/handlers/onDisconnect.ts
@@ -1,6 +1,6 @@
 import { Server } from "socket.io";
 import { GameManager } from "@server/domains/game/GameManager";
-import { disconnectUseCase } from "@server/domains/game/application/useCases/executeDisconnectUseCase";
+import { disconnectUseCase } from "@server/domains/game/application/useCases/disconnectUseCase";
 
 export const onDisconnect = (
   io: Server,
diff --git a/apps/server/src/domains/game/handlers/onMove.ts b/apps/server/src/domains/game/handlers/onMove.ts
index 32383df..b07d713 100644
--- a/apps/server/src/domains/game/handlers/onMove.ts
+++ b/apps/server/src/domains/game/handlers/onMove.ts
@@ -1,6 +1,6 @@
 import { GameManager } from "@server/domains/game/GameManager";
 import type { playerTypes } from "@repo/shared";
-import { movePlayerUseCase } from "@server/domains/game/application/useCases/executeMovePlayerUseCase";
+import { movePlayerUseCase } from "@server/domains/game/application/useCases/movePlayerUseCase";
 
 export const onMove = (
   gameManager: GameManager,
diff --git a/apps/server/src/domains/game/handlers/onPing.ts b/apps/server/src/domains/game/handlers/onPing.ts
index 8cc8ac0..99c8f88 100644
--- a/apps/server/src/domains/game/handlers/onPing.ts
+++ b/apps/server/src/domains/game/handlers/onPing.ts
@@ -1,5 +1,5 @@
 import { Socket } from "socket.io";
-import { pingUseCase } from "@server/domains/game/application/useCases/executePingUseCase";
+import { pingUseCase } from "@server/domains/game/application/useCases/pingUseCase";
 
 export const onPing = (socket: Socket, clientTime: number) => {
   pingUseCase({
diff --git a/apps/server/src/domains/game/handlers/onReadyForGame.ts b/apps/server/src/domains/game/handlers/onReadyForGame.ts
index 06d8897..6bece4f 100644
--- a/apps/server/src/domains/game/handlers/onReadyForGame.ts
+++ b/apps/server/src/domains/game/handlers/onReadyForGame.ts
@@ -1,6 +1,6 @@
 import { Socket } from "socket.io";
 import { GameManager } from "@server/domains/game/GameManager";
-import { readyForGameUseCase } from "@server/domains/game/application/useCases/executeReadyForGameUseCase";
+import { readyForGameUseCase } from "@server/domains/game/application/useCases/readyForGameUseCase";
 
 export const onReadyForGame = (
   socket: Socket,
diff --git a/apps/server/src/domains/game/handlers/onStartGame.ts b/apps/server/src/domains/game/handlers/onStartGame.ts
index 8fa6df6..528caaa 100644
--- a/apps/server/src/domains/game/handlers/onStartGame.ts
+++ b/apps/server/src/domains/game/handlers/onStartGame.ts
@@ -1,7 +1,7 @@
 import { Server } from "socket.io";
 import { GameManager } from "@server/domains/game/GameManager";
 import { RoomManager } from "@server/domains/room/RoomManager";
-import { startGameUseCase } from "@server/domains/game/application/useCases/executeStartGameUseCase";
+import { startGameUseCase } from "@server/domains/game/application/useCases/startGameUseCase";
 
 export const onStartGame = (
   io: Server,
diff --git a/apps/server/src/domains/room/RoomHandler.ts b/apps/server/src/domains/room/RoomHandler.ts
index c67d521..756cb63 100644
--- a/apps/server/src/domains/room/RoomHandler.ts
+++ b/apps/server/src/domains/room/RoomHandler.ts
@@ -2,8 +2,8 @@
 import { RoomManager } from "./RoomManager";
 import { protocol } from "@repo/shared";
 import type { roomTypes } from "@repo/shared";
-import { joinRoomUseCase } from "./application/useCases/executeJoinRoomUseCase";
-import { roomDisconnectUseCase } from "./application/useCases/executeRoomDisconnectUseCase";
+import { joinRoomUseCase } from "./application/useCases/joinRoomUseCase";
+import { roomDisconnectUseCase } from "./application/useCases/roomDisconnectUseCase";
 
 export const registerRoomHandlers = (io: Server, socket: Socket, roomManager: RoomManager) => {