diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java
index 90bf1cf..1ce47d6 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java
@@ -55,15 +55,15 @@ public class TikTokLiveClient implements LiveClient
     private final ListenersManager listenersManager;
     private final Logger logger;
     private final GiftsManager giftManager;
-    private final TikTokLiveMessageHandler messageHandler;
+    private final LiveMessagesHandler messageHandler;
 
     public TikTokLiveClient(
-            TikTokLiveMessageHandler messageHandler,
+            LiveMessagesHandler messageHandler,
             GiftsManager giftsManager,
             TikTokRoomInfo tikTokLiveMeta,
             LiveHttpClient tiktokHttpClient,
             SocketClient webSocketClient,
-            TikTokLiveEventHandler tikTokEventHandler,
+            LiveEventsHandler tikTokEventHandler,
             LiveClientSettings clientSettings,
             ListenersManager listenersManager,
             Logger logger) {
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveMessageHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveMessageHandler.java
index 9b41d42..9b75652 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveMessageHandler.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveMessageHandler.java
@@ -43,7 +43,7 @@ public class TikTokLiveMessageHandler implements LiveMessagesHandler {
     private final LiveEventsHandler tikTokEventHandler;
     private final LiveMapper mapper;
 
-    public TikTokLiveMessageHandler(TikTokLiveEventHandler tikTokEventHandler, LiveMapper mapper) {
+    public TikTokLiveMessageHandler(LiveEventsHandler tikTokEventHandler, LiveMapper mapper) {
         this.tikTokEventHandler = tikTokEventHandler;
         this.mapper = mapper;
     }