diff --git a/src/main/java/com/eu/habbo/messages/PacketManager.java b/src/main/java/com/eu/habbo/messages/PacketManager.java
index b5927692..ed56114e 100644
--- a/src/main/java/com/eu/habbo/messages/PacketManager.java
+++ b/src/main/java/com/eu/habbo/messages/PacketManager.java
@@ -311,14 +311,14 @@ public class PacketManager {
         this.registerHandler(Incoming.SaveBlockCameraFollowEvent, SaveBlockCameraFollowEvent.class);
         this.registerHandler(Incoming.SetIgnoreRoomInvitesEvent, SaveIgnoreRoomInvitesEvent.class);
         this.registerHandler(Incoming.SavePreferOldChatEvent, SavePreferOldChatEvent.class);
-        this.registerHandler(Incoming.AvatarEffectActivatedComposer, ActivateEffectEvent.class);
-        this.registerHandler(Incoming.AvatarEffectSelectedComposer, EnableEffectEvent.class);
+        this.registerHandler(Incoming.AvatarEffectActivatedEvent, ActivateEffectEvent.class);
+        this.registerHandler(Incoming.AvatarEffectSelectedEvent, EnableEffectEvent.class);
         this.registerHandler(Incoming.EventLogEvent, UserActivityEvent.class);
         this.registerHandler(Incoming.UserNuxEvent, UserNuxEvent.class);
         this.registerHandler(Incoming.PickNewUserGiftEvent, PickNewUserGiftEvent.class);
         this.registerHandler(Incoming.CheckUserNameEvent, ChangeNameCheckUsernameEvent.class);
         this.registerHandler(Incoming.ChangeUserNameEvent, ConfirmChangeNameEvent.class);
-        this.registerHandler(Incoming.SetChatStylePreferenceComposer, ChangeChatBubbleEvent.class);
+        this.registerHandler(Incoming.SetChatStylePreferenceEvent, ChangeChatBubbleEvent.class);
         this.registerHandler(Incoming.UpdateUIFlagsEvent, UpdateUIFlagsEvent.class);
     }
 
@@ -447,7 +447,7 @@ public class PacketManager {
         this.registerHandler(Incoming.JukeBoxEventOne, JukeBoxEventOne.class);
         this.registerHandler(Incoming.JukeBoxEventTwo, JukeBoxEventTwo.class);
         this.registerHandler(Incoming.SavePostItStickyPoleEvent, SavePostItStickyPoleEvent.class);
-        this.registerHandler(Incoming.GetRoomAdPurchaseInfoComposer, RequestPromotionRoomsEvent.class);
+        this.registerHandler(Incoming.GetRoomAdPurchaseInfoEvent, RequestPromotionRoomsEvent.class);
         this.registerHandler(Incoming.BuyRoomPromotionEvent, BuyRoomPromotionEvent.class);
         this.registerHandler(Incoming.EditRoomPromotionMessageEvent, UpdateRoomPromotionEvent.class);
         this.registerHandler(Incoming.IgnoreUserEvent, IgnoreRoomUserEvent.class);
@@ -467,7 +467,7 @@ public class PacketManager {
 
     void registerPolls() throws Exception {
         this.registerHandler(Incoming.CancelPollEvent, CancelPollEvent.class);
-        this.registerHandler(Incoming.PollStartComposer, GetPollDataEvent.class);
+        this.registerHandler(Incoming.PollStartEvent, GetPollDataEvent.class);
         this.registerHandler(Incoming.AnswerPollEvent, AnswerPollEvent.class);
     }
 
@@ -639,7 +639,7 @@ public class PacketManager {
         this.registerHandler(Incoming.GameCenterRequestGamesEvent, GameCenterRequestGamesEvent.class);
         this.registerHandler(Incoming.GameCenterRequestAccountStatusEvent, GameCenterRequestAccountStatusEvent.class);
         this.registerHandler(Incoming.GameCenterJoinGameEvent, GameCenterJoinGameEvent.class);
-        this.registerHandler(Incoming.GetWeeklyGameRewardWinnersComposer, GameCenterLoadGameEvent.class);
+        this.registerHandler(Incoming.GetWeeklyGameRewardWinnersEvent, GameCenterLoadGameEvent.class);
         this.registerHandler(Incoming.GameCenterLeaveGameEvent, GameCenterLeaveGameEvent.class);
         this.registerHandler(Incoming.GameCenterEvent, GameCenterEvent.class);
         this.registerHandler(Incoming.Game2GetAccountGameStatusEvent, GameCenterRequestGameStatusEvent.class);
diff --git a/src/main/java/com/eu/habbo/messages/incoming/Incoming.java b/src/main/java/com/eu/habbo/messages/incoming/Incoming.java
index da2f9b64..e93ecb77 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/Incoming.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/Incoming.java
@@ -4,8 +4,8 @@ public class Incoming {
     public static final int PongEvent = 2596;
     public static final int CheckUserNameEvent = 3950;
     public static final int ChangeUserNameEvent = 2977;
-    public static final int AvatarEffectActivatedComposer = 2959;
-    public static final int AvatarEffectSelectedComposer = 1752;
+    public static final int AvatarEffectActivatedEvent = 2959;
+    public static final int AvatarEffectSelectedEvent = 1752;
     public static final int EventLogEvent = 3457;
     public static final int NavigatorSetSearchCodeViewModeEvent = 1202;
     public static final int NavigatorCollapseCategoryEvent = 1834;
@@ -107,7 +107,7 @@ public class Incoming {
     public static final int RequestProfileFriendsEvent = 2138;
     public static final int TradeCancelOfferItemEvent = 3845;
     public static final int TriggerDiceEvent = 1990;
-    public static final int PollStartComposer = 109;
+    public static final int PollStartEvent = 109;
     public static final int MachineIDEvent = 2490;
     public static final int RequestDiscountEvent = 223;
     public static final int RequestFriendRequestEvent = 2448;
@@ -264,7 +264,7 @@ public class Incoming {
     public static final int RoomUserMuteEvent = 3485;
     //public static final int JukeBoxEventThree = 3846;
     public static final int RequestDeleteRoomEvent = 532;
-    public static final int GetRoomAdPurchaseInfoComposer = 1075;
+    public static final int GetRoomAdPurchaseInfoEvent = 1075;
     public static final int BuyRoomPromotionEvent = 777;
     public static final int EditRoomPromotionMessageEvent = 3991;
     public static final int RequestGuideToolEvent = 1922;
@@ -299,7 +299,7 @@ public class Incoming {
     public static final int RoomUserBanEvent = 1477;
     public static final int RequestNavigatorSettingsEvent = 1782;
     public static final int AddSavedSearchEvent = 2226;
-    public static final int WhisperGroupComposer = 1118;
+    public static final int WhisperGroupEvent = 1118;
     public static final int DeleteSavedSearchEvent = 1954;
     public static final int SaveWindowSettingsEvent = 3159;
     public static final int GetHabboGuildBadgesMessageEvent = 21;
@@ -342,7 +342,7 @@ public class Incoming {
     public static final int InterstitialShownEvent = 1109;
 
     public static final int GameCenterJoinGameEvent = 1458;
-    public static final int GetWeeklyGameRewardWinnersComposer = 1054;
+    public static final int GetWeeklyGameRewardWinnersEvent = 1054;
     public static final int GameCenterEvent = 2914;
     public static final int GameCenterLeaveGameEvent = 3207;
     public static final int ExtendRentOrBuyoutFurniEvent = 1071;
@@ -357,7 +357,7 @@ public class Incoming {
     public static final int ModToolIssueDefaultSanctionEvent = 2717;
 
     public static final int TradeCancelEvent = 2341;
-    public static final int SetChatStylePreferenceComposer = 1030;
+    public static final int SetChatStylePreferenceEvent = 1030;
     public static final int LoveLockStartConfirmEvent = 3775;
 
     public static final int HotelViewRequestLTDAvailabilityEvent = 410;