I never learned the alphabet...

src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java

@@ -27,7 +27,7 @@ import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
 import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer;
 import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer;
 import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer;
-import com.eu.habbo.messages.outgoing.users.UserPointsComposer;
+import com.eu.habbo.messages.outgoing.users.HabboActivityPointNotificationMessageComposer;
 import com.eu.habbo.plugin.events.emulator.EmulatorLoadCatalogManagerEvent;
 import com.eu.habbo.plugin.events.users.catalog.UserCatalogFurnitureBoughtEvent;
 import com.eu.habbo.plugin.events.users.catalog.UserCatalogItemPurchasedEvent;
@@ -547,7 +547,7 @@ public class CatalogManager {
 
         if (voucher.points > 0) {
             client.getHabbo().getHabboInfo().addCurrencyAmount(voucher.pointsType, voucher.points);
-            client.sendResponse(new UserPointsComposer(client.getHabbo().getHabboInfo().getCurrencyAmount(voucher.pointsType), voucher.points, voucher.pointsType));
+            client.sendResponse(new HabboActivityPointNotificationMessageComposer(client.getHabbo().getHabboInfo().getCurrencyAmount(voucher.pointsType), voucher.points, voucher.pointsType));
         }
 
         if (voucher.credits > 0) {
@@ -1078,7 +1078,7 @@ public class CatalogManager {
                 if (!free && !habbo.getClient().getHabbo().hasPermission(Permission.ACC_INFINITE_POINTS)) {
                     if (purchasedEvent.totalPoints > 0) {
                         habbo.getClient().getHabbo().getHabboInfo().addCurrencyAmount(item.getPointsType(), -purchasedEvent.totalPoints);
-                        habbo.getClient().sendResponse(new UserPointsComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(item.getPointsType()), -purchasedEvent.totalPoints, item.getPointsType()));
+                        habbo.getClient().sendResponse(new HabboActivityPointNotificationMessageComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(item.getPointsType()), -purchasedEvent.totalPoints, item.getPointsType()));
                     }
                 }
 

src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.campaign.calendar.CalendarCampaign;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDataMessageComposer;
-import com.eu.habbo.messages.outgoing.habboway.nux.NuxAlertComposer;
+import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer;
 
 import java.sql.Timestamp;
 import java.util.Date;
@@ -33,7 +33,7 @@ public class CalendarCommand extends Command {
 
             if (daysBetween >= 0) {
                 gameClient.sendResponse(new CampaignCalendarDataMessageComposer(campaign.getName(), campaign.getImage(), campaign.getTotalDays(), daysBetween, gameClient.getHabbo().getHabboStats().calendarRewardsClaimed, campaign.getLockExpired()));
-                gameClient.sendResponse(new NuxAlertComposer("openView/calendar"));
+                gameClient.sendResponse(new InClientLinkMessageComposer("openView/calendar"));
             }
         }
 

src/main/java/com/eu/habbo/habbohotel/commands/HappyHourCommand.java

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.achievements.AchievementManager;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer;
 
 import java.util.Map;
 
@@ -15,7 +15,7 @@ public class HappyHourCommand extends Command {
 
     @Override
     public boolean handle(GameClient gameClient, String[] params) throws Exception {
-        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GenericAlertComposer("Happy Hour!"));
+        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new HabboBroadcastMessageComposer("Happy Hour!"));
 
         for (Map.Entry<Integer, Habbo> set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) {
             AchievementManager.progressAchievement(set.getValue(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("HappyHour"));

src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.messages.outgoing.rooms.users.RoomUserIgnoredComposer;
+import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer;
 
 public class MuteCommand extends Command {
     public MuteCommand() {
@@ -46,7 +46,7 @@ public class MuteCommand extends Command {
             habbo.mute(duration, false);
 
             if (habbo.getHabboInfo().getCurrentRoom() != null) {
-                habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.MUTED).compose()); //: RoomUserIgnoredComposer.UNIGNORED
+                habbo.getHabboInfo().getCurrentRoom().sendComposer(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.MUTED).compose()); //: RoomUserIgnoredComposer.UNIGNORED
             }
 
             gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_mute.muted").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT);

src/main/java/com/eu/habbo/habbohotel/commands/RoomKickCommand.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer;
 
 public class RoomKickCommand extends Command {
     public RoomKickCommand() {
@@ -21,7 +21,7 @@ public class RoomKickCommand extends Command {
                 for (int i = 1; i < params.length; i++) {
                     message.append(params[i]).append(" ");
                 }
-                room.sendComposer(new GenericAlertComposer(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername()).compose());
+                room.sendComposer(new HabboBroadcastMessageComposer(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername()).compose());
             }
 
             for (Habbo habbo : room.getHabbos()) {

src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.rooms.RoomTrade;
 import com.eu.habbo.messages.ServerMessage;
-import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer;
 import com.eu.habbo.threading.runnables.ShutdownEmulator;
 
@@ -34,7 +34,7 @@ public class ShutdownCommand extends Command {
 
         ServerMessage message;
         if (!reason.toString().equals("-")) {
-            message = new GenericAlertComposer("<b>" + Emulator.getTexts().getValue("generic.warning") + "</b> \r\n" +
+            message = new HabboBroadcastMessageComposer("<b>" + Emulator.getTexts().getValue("generic.warning") + "</b> \r\n" +
                     Emulator.getTexts().getValue("generic.shutdown").replace("%minutes%", minutes + "") + "\r\n" +
                     Emulator.getTexts().getValue("generic.reason.specified") + ": <b>" + reason + "</b>\r" +
                     "\r" +

src/main/java/com/eu/habbo/habbohotel/commands/StalkCommand.java

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.messages.outgoing.rooms.RoomDataComposer;
+import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer;
 
 public class StalkCommand extends Command {
     public StalkCommand() {
@@ -39,7 +39,7 @@ public class StalkCommand extends Command {
                 return true;
             }
 
-            gameClient.sendResponse(new RoomDataComposer(habbo.getHabboInfo().getCurrentRoom(), gameClient.getHabbo(), true, false));
+            gameClient.sendResponse(new GetGuestRoomResultComposer(habbo.getHabboInfo().getCurrentRoom(), gameClient.getHabbo(), true, false));
             //gameClient.sendResponse(new ForwardToRoomComposer(habbo.getHabboInfo().getCurrentRoom().getId()));
             return true;
         } else {

src/main/java/com/eu/habbo/habbohotel/commands/UpdateCatalogCommand.java

@@ -19,7 +19,7 @@ public class UpdateCatalogCommand extends Command {
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BuildersClubFurniCountMessageComposer(0));
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BundleDiscountRulesetMessageComposer());
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigComposer());
-        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GiftConfigurationComposer());
+        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GiftWrappingConfigurationComposer());
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new RecyclerLogicComposer());
         Emulator.getGameEnvironment().getCraftingManager().reload();
         gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_update_catalog"), RoomChatMessageBubbles.ALERT);

src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
-import com.eu.habbo.messages.outgoing.rooms.RoomRelativeMapComposer;
+import com.eu.habbo.messages.outgoing.rooms.HeightMapComposer;
 
 public class UpdateItemsCommand extends Command {
     public UpdateItemsCommand() {
@@ -20,7 +20,7 @@ public class UpdateItemsCommand extends Command {
         synchronized (Emulator.getGameEnvironment().getRoomManager().getActiveRooms()) {
             for (Room room : Emulator.getGameEnvironment().getRoomManager().getActiveRooms()) {
                 if (room.isLoaded() && room.getUserCount() > 0 && room.getLayout() != null) {
-                    room.sendComposer(new RoomRelativeMapComposer(room).compose());
+                    room.sendComposer(new HeightMapComposer(room).compose());
                 }
             }
         }

src/main/java/com/eu/habbo/habbohotel/commands/UpdateYoutubePlaylistsCommand.java

@@ -2,9 +2,7 @@ package com.eu.habbo.habbohotel.commands;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
-import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
-import com.eu.habbo.messages.outgoing.rooms.RoomRelativeMapComposer;
 
 public class UpdateYoutubePlaylistsCommand extends Command {
     public UpdateYoutubePlaylistsCommand() {

src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.achievements.AchievementManager;
 import com.eu.habbo.habbohotel.games.GamePlayer;
 import com.eu.habbo.habbohotel.games.GameTeamColors;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.messages.outgoing.rooms.FreezeLivesComposer;
+import com.eu.habbo.messages.outgoing.rooms.GamePlayerValueMessageComposer;
 
 public class FreezeGamePlayer extends GamePlayer {
     public boolean nextDiagonal;
@@ -50,7 +50,7 @@ public class FreezeGamePlayer extends GamePlayer {
     public void addLife() {
         if (this.lives < FreezeGame.MAX_LIVES) {
             this.lives++;
-            super.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new FreezeLivesComposer(this).compose());
+            super.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new GamePlayerValueMessageComposer(this).compose());
         }
     }
 
@@ -65,7 +65,7 @@ public class FreezeGamePlayer extends GamePlayer {
                 game.playerDies(this);
             }
         } else {
-            super.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new FreezeLivesComposer(this).compose());
+            super.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new GamePlayerValueMessageComposer(this).compose());
         }
     }
 

src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java

@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.modtool.ModToolIssue;
 import com.eu.habbo.habbohotel.modtool.ModToolTicketType;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.outgoing.guardians.*;
-import com.eu.habbo.messages.outgoing.guides.BullyReportClosedComposer;
+import com.eu.habbo.messages.outgoing.guides.GuideTicketResolutionMessageComposer;
 import com.eu.habbo.threading.runnables.GuardianNotAccepted;
 import com.eu.habbo.threading.runnables.GuardianVotingFinish;
 import gnu.trove.map.hash.THashMap;
@@ -120,7 +120,7 @@ public class GuardianTicket {
                 Emulator.getGameEnvironment().getModToolManager().addTicket(issue);
                 Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue);
 
-                this.reporter.getClient().sendResponse(new BullyReportClosedComposer(BullyReportClosedComposer.CLOSED));
+                this.reporter.getClient().sendResponse(new GuideTicketResolutionMessageComposer(GuideTicketResolutionMessageComposer.CLOSED));
             } else {
                 this.timeLeft = 30;
                 Emulator.getThreading().run(new GuardianVotingFinish(this), 10000);
@@ -142,9 +142,9 @@ public class GuardianTicket {
             Emulator.getGameEnvironment().getGuideManager().closeTicket(this);
 
             if (this.verdict == GuardianVoteType.ACCEPTABLY)
-                this.reporter.getClient().sendResponse(new BullyReportClosedComposer(BullyReportClosedComposer.MISUSE));
+                this.reporter.getClient().sendResponse(new GuideTicketResolutionMessageComposer(GuideTicketResolutionMessageComposer.MISUSE));
             else
-                this.reporter.getClient().sendResponse(new BullyReportClosedComposer(BullyReportClosedComposer.CLOSED));
+                this.reporter.getClient().sendResponse(new GuideTicketResolutionMessageComposer(GuideTicketResolutionMessageComposer.CLOSED));
         }
     }
 

src/main/java/com/eu/habbo/habbohotel/guides/GuideManager.java

@@ -69,8 +69,8 @@ public class GuideManager {
                     if (!tour.hasDeclined(set.getKey().getHabboInfo().getId())) {
                         tour.checkSum++;
                         tour.setHelper(set.getKey());
-                        set.getKey().getClient().sendResponse(new GuideSessionAttachedComposer(tour, true));
+                        set.getKey().getClient().sendResponse(new GuideSessionAttachedMessageComposer(tour, true));
-                        tour.getNoob().getClient().sendResponse(new GuideSessionAttachedComposer(tour, false));
+                        tour.getNoob().getClient().sendResponse(new GuideSessionAttachedMessageComposer(tour, false));
                         Emulator.getThreading().run(new GuideFindNewHelper(tour, set.getKey()), 60000);
                         this.activeTours.add(tour);
                         return true;
@@ -79,7 +79,7 @@ public class GuideManager {
             }
         }
         this.endSession(tour);
-        tour.getNoob().getClient().sendResponse(new GuideSessionErrorComposer(GuideSessionErrorComposer.NO_HELPERS_AVAILABLE));
+        tour.getNoob().getClient().sendResponse(new GuideSessionErrorMessageComposer(GuideSessionErrorMessageComposer.NO_HELPERS_AVAILABLE));
 
         return false;
     }
@@ -89,11 +89,11 @@ public class GuideManager {
         Habbo helper = tour.getHelper();
         tour.addDeclinedHelper(tour.getHelper().getHabboInfo().getId());
         tour.setHelper(null);
-        helper.getClient().sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED));
+        helper.getClient().sendResponse(new GuideSessionEndedMessageComposer(GuideSessionEndedMessageComposer.HELP_CASE_CLOSED));
-        helper.getClient().sendResponse(new GuideSessionDetachedComposer());
+        helper.getClient().sendResponse(new GuideSessionDetachedMessageComposer());
         if (!this.findHelper(tour)) {
             this.endSession(tour);
-            tour.getNoob().getClient().sendResponse(new GuideSessionErrorComposer(GuideSessionErrorComposer.NO_HELPERS_AVAILABLE));
+            tour.getNoob().getClient().sendResponse(new GuideSessionErrorMessageComposer(GuideSessionErrorMessageComposer.NO_HELPERS_AVAILABLE));
         }
     }
 
@@ -116,14 +116,14 @@ public class GuideManager {
     public void endSession(GuideTour tour) {
         synchronized (this.activeTours) {
             synchronized (this.activeHelpers) {
-                tour.getNoob().getClient().sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED));
+                tour.getNoob().getClient().sendResponse(new GuideSessionEndedMessageComposer(GuideSessionEndedMessageComposer.HELP_CASE_CLOSED));
                 tour.end();
 
                 if (tour.getHelper() != null) {
                     this.activeHelpers.put(tour.getHelper(), false);
-                    tour.getHelper().getClient().sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED));
+                    tour.getHelper().getClient().sendResponse(new GuideSessionEndedMessageComposer(GuideSessionEndedMessageComposer.HELP_CASE_CLOSED));
-                    tour.getHelper().getClient().sendResponse(new GuideSessionDetachedComposer());
+                    tour.getHelper().getClient().sendResponse(new GuideSessionDetachedMessageComposer());
-                    tour.getHelper().getClient().sendResponse(new GuideToolsComposer(true));
+                    tour.getHelper().getClient().sendResponse(new GuideOnDutyStatusMessageComposer(true));
                 }
             }
         }
@@ -133,7 +133,7 @@ public class GuideManager {
     public void recommend(GuideTour tour, boolean recommend) {
         synchronized (this.activeTours) {
             tour.setWouldRecommend(recommend ? GuideRecommendStatus.YES : GuideRecommendStatus.NO);
-            tour.getNoob().getClient().sendResponse(new GuideSessionDetachedComposer());
+            tour.getNoob().getClient().sendResponse(new GuideSessionDetachedMessageComposer());
             AchievementManager.progressAchievement(tour.getNoob(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("GuideFeedbackGiver"));
 
             this.activeTours.remove(tour);

src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java

@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.guilds.forums.ForumView;
 import com.eu.habbo.habbohotel.items.interactions.InteractionGuildFurni;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.messages.outgoing.guilds.GuildJoinErrorComposer;
+import com.eu.habbo.messages.outgoing.guilds.HabboGroupJoinFailedMessageComposer;
 import gnu.trove.TCollections;
 import gnu.trove.iterator.TIntObjectIterator;
 import gnu.trove.map.TIntObjectMap;
@@ -199,9 +199,9 @@ public class GuildManager {
                         if (set.getInt(1) >= 100) {
                             //TODO Add non acceptRequest errors. See Outgoing.GroupEditFailComposer
                             if (userId == 0)
-                                client.sendResponse(new GuildJoinErrorComposer(GuildJoinErrorComposer.GROUP_LIMIT_EXCEED));
+                                client.sendResponse(new HabboGroupJoinFailedMessageComposer(HabboGroupJoinFailedMessageComposer.GROUP_LIMIT_EXCEED));
                             else
-                                client.sendResponse(new GuildJoinErrorComposer(GuildJoinErrorComposer.MEMBER_FAIL_JOIN_LIMIT_EXCEED_NON_HC));
+                                client.sendResponse(new HabboGroupJoinFailedMessageComposer(HabboGroupJoinFailedMessageComposer.MEMBER_FAIL_JOIN_LIMIT_EXCEED_NON_HC));
 
                             error = true;
                         }
@@ -215,7 +215,7 @@ public class GuildManager {
                     try (ResultSet set = statement.executeQuery()) {
                         if (set.next()) {
                             if (set.getInt(1) >= 50000) {
-                                client.sendResponse(new GuildJoinErrorComposer(GuildJoinErrorComposer.GROUP_FULL));
+                                client.sendResponse(new HabboGroupJoinFailedMessageComposer(HabboGroupJoinFailedMessageComposer.GROUP_FULL));
                                 error = true;
                             }
                         }
@@ -229,7 +229,7 @@ public class GuildManager {
                             try (ResultSet set = statement.executeQuery()) {
                                 if (set.next()) {
                                     if (set.getInt(1) >= 100) {
-                                        client.sendResponse(new GuildJoinErrorComposer(GuildJoinErrorComposer.GROUP_NOT_ACCEPT_REQUESTS));
+                                        client.sendResponse(new HabboGroupJoinFailedMessageComposer(HabboGroupJoinFailedMessageComposer.GROUP_NOT_ACCEPT_REQUESTS));
                                         error = true;
                                     }
                                 }

src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionInformationTerminal.java

@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.items.Item;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomUnit;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.messages.outgoing.habboway.nux.NuxAlertComposer;
+import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer;
 import gnu.trove.map.hash.THashMap;
 
 import java.sql.ResultSet;
@@ -31,7 +31,7 @@ public class InteractionInformationTerminal extends InteractionCustomValues {
 
         Habbo habbo = room.getHabbo(roomUnit);
         if (habbo != null && this.values.containsKey("internalLink")) {
-            habbo.getClient().sendResponse(new NuxAlertComposer(this.values.get("internalLink")));
+            habbo.getClient().sendResponse(new InClientLinkMessageComposer(this.values.get("internalLink")));
         }
     }
 }

src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionBreed.java

@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.pets.PetAction;
 import com.eu.habbo.habbohotel.pets.PetTasks;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.habbohotel.users.HabboItem;
-import com.eu.habbo.messages.outgoing.rooms.pets.breeding.PetBreedingStartFailedComposer;
+import com.eu.habbo.messages.outgoing.rooms.pets.breeding.GoToBreedingNestFailureComposer;
 import org.apache.commons.lang3.StringUtils;
 
 public class ActionBreed extends PetAction {
@@ -31,7 +31,7 @@ public class ActionBreed extends PetAction {
 
             return true;
         } else {
-            habbo.getClient().sendResponse(new PetBreedingStartFailedComposer(PetBreedingStartFailedComposer.NO_NESTS));
+            habbo.getClient().sendResponse(new GoToBreedingNestFailureComposer(GoToBreedingNestFailureComposer.NO_NESTS));
         }
 
         return false;

src/main/java/com/eu/habbo/habbohotel/rooms/Room.java

@@ -36,8 +36,8 @@ import com.eu.habbo.habbohotel.wired.WiredTriggerType;
 import com.eu.habbo.messages.ISerialize;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
-import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer;
-import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorMessagesComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
 import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer;
 import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
@@ -561,7 +561,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
             tile.setState(this.calculateTileState(tile));
         }
 
-        this.sendComposer(new UpdateStackHeightComposer(this, tiles).compose());
+        this.sendComposer(new HeightMapUpdateMessageComposer(this, tiles).compose());
     }
 
     private RoomTileState calculateTileState(RoomTile tile) {
@@ -693,7 +693,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
                     }
                 }
             }
-            this.sendComposer(new UpdateStackHeightComposer(this, updatedTiles).compose());
+            this.sendComposer(new HeightMapUpdateMessageComposer(this, updatedTiles).compose());
             this.updateTiles(updatedTiles);
             for (RoomTile tile : updatedTiles) {
                 this.updateHabbosAt(tile.x, tile.y);
@@ -1245,7 +1245,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
 
                     if (habbo.getHabboStats().mutedBubbleTracker && habbo.getHabboStats().allowTalk()) {
                         habbo.getHabboStats().mutedBubbleTracker = false;
-                        this.sendComposer(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.UNIGNORED).compose());
+                        this.sendComposer(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.UNIGNORED).compose());
                     }
 
                     // Substract 1 from the chatCounter every odd cycle, which is every (500ms * 2).
@@ -2652,7 +2652,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
 
     public void kickHabbo(Habbo habbo, boolean alert) {
         if (alert) {
-            habbo.getClient().sendResponse(new GenericErrorMessagesComposer(GenericErrorMessagesComposer.KICKED_OUT_OF_THE_ROOM));
+            habbo.getClient().sendResponse(new GenericErrorComposer(GenericErrorComposer.KICKED_OUT_OF_THE_ROOM));
         }
 
         habbo.getRoomUnit().isKicked = true;
@@ -4430,7 +4430,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
     }
 
     public void alert(String message) {
-        this.sendComposer(new GenericAlertComposer(message).compose());
+        this.sendComposer(new HabboBroadcastMessageComposer(message).compose());
     }
 
     public int itemCount() {

src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java

@@ -29,7 +29,7 @@ import com.eu.habbo.habbohotel.users.*;
 import com.eu.habbo.habbohotel.wired.WiredHandler;
 import com.eu.habbo.habbohotel.wired.WiredTriggerType;
 import com.eu.habbo.messages.incoming.users.UserNuxEvent;
-import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorMessagesComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorComposer;
 import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer;
 import com.eu.habbo.messages.outgoing.polls.PollStartComposer;
 import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollAnswersComposer;
@@ -560,7 +560,7 @@ public class RoomManager {
             if (room.getPassword().equalsIgnoreCase(password))
                 this.openRoom(habbo, room, doorLocation);
             else {
-                habbo.getClient().sendResponse(new GenericErrorMessagesComposer(GenericErrorMessagesComposer.WRONG_PASSWORD_USED));
+                habbo.getClient().sendResponse(new GenericErrorComposer(GenericErrorComposer.WRONG_PASSWORD_USED));
                 habbo.getClient().sendResponse(new CloseConnectionMessageComposer());
                 habbo.getHabboInfo().setLoadingRoom(0);
             }
@@ -752,7 +752,7 @@ public class RoomManager {
                 Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(habbo.getHabboStats().guild);
 
                 if (guild != null) {
-                    room.sendComposer(new RoomUsersAddGuildBadgeComposer(guild).compose());
+                    room.sendComposer(new HabboAddGroupBadgesMessageComposer(guild).compose());
                 }
             }
 
@@ -783,7 +783,7 @@ public class RoomManager {
 
         habbo.getClient().sendResponse(new RoomThicknessComposer(room));
 
-        habbo.getClient().sendResponse(new RoomDataComposer(room, habbo.getClient().getHabbo(), false, true));
+        habbo.getClient().sendResponse(new GetGuestRoomResultComposer(room, habbo.getClient().getHabbo(), false, true));
 
         habbo.getClient().sendResponse(new RoomWallItemsComposer(room));
         {
@@ -830,7 +830,7 @@ public class RoomManager {
             int remainingMuteTime = habbo.getHabboStats().remainingMuteTime();
             habbo.getClient().sendResponse(new FloodControlMessageComposer(remainingMuteTime));
             habbo.getClient().sendResponse(new MutedWhisperComposer(remainingMuteTime));
-            room.sendComposer(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.MUTED).compose());
+            room.sendComposer(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.MUTED).compose());
         } else if (habbo.getHabboStats().mutedBubbleTracker) {
             habbo.getHabboStats().mutedBubbleTracker = false;
         }
@@ -855,13 +855,13 @@ public class RoomManager {
                 }
 
                 if (roomHabbo.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) {
-                    roomHabbo.getClient().sendResponse(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.IGNORED));
+                    roomHabbo.getClient().sendResponse(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.IGNORED));
                 }
 
                 if (!roomHabbo.getHabboStats().allowTalk()) {
-                    habbo.getClient().sendResponse(new RoomUserIgnoredComposer(roomHabbo, RoomUserIgnoredComposer.MUTED));
+                    habbo.getClient().sendResponse(new IgnoreResultMessageComposer(roomHabbo, IgnoreResultMessageComposer.MUTED));
                 } else if (habbo.getHabboStats().userIgnored(roomHabbo.getHabboInfo().getId())) {
-                    habbo.getClient().sendResponse(new RoomUserIgnoredComposer(roomHabbo, RoomUserIgnoredComposer.IGNORED));
+                    habbo.getClient().sendResponse(new IgnoreResultMessageComposer(roomHabbo, IgnoreResultMessageComposer.IGNORED));
                 }
 
                 if (roomHabbo.getHabboStats().guild != 0 && !guildBadges.containsKey(roomHabbo.getHabboStats().guild)) {
@@ -883,7 +883,7 @@ public class RoomManager {
             }
         }
 
-        habbo.getClient().sendResponse(new RoomUsersGuildBadgesComposer(guildBadges));
+        habbo.getClient().sendResponse(new HabboGroupBadgesMessageComposer(guildBadges));
 
         if (room.hasRights(habbo) || (room.hasGuild() && room.getGuildRightLevel(habbo).isEqualOrGreaterThan(RoomRightLevels.GUILD_RIGHTS))) {
             if (!room.getHabboQueue().isEmpty()) {

src/main/java/com/eu/habbo/habbohotel/users/Habbo.java

@@ -265,7 +265,7 @@ public class Habbo implements Runnable {
 
         this.getHabboInfo().addCurrencyAmount(event.type, event.points);
         if (this.client != null)
-            this.client.sendResponse(new UserPointsComposer(this.client.getHabbo().getHabboInfo().getCurrencyAmount(type), event.points, event.type));
+            this.client.sendResponse(new HabboActivityPointNotificationMessageComposer(this.client.getHabbo().getHabboInfo().getCurrencyAmount(type), event.points, event.type));
     }
 
 
@@ -309,7 +309,7 @@ public class Habbo implements Runnable {
         if (Emulator.getConfig().getBoolean("hotel.alert.oldstyle")) {
             this.client.sendResponse(new MessagesForYouComposer(new String[]{message}));
         } else {
-            this.client.sendResponse(new GenericAlertComposer(message));
+            this.client.sendResponse(new HabboBroadcastMessageComposer(message));
         }
     }
 
@@ -421,7 +421,7 @@ public class Habbo implements Runnable {
 
             Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
             if (room != null && !isFlood) {
-                room.sendComposer(new RoomUserIgnoredComposer(this, RoomUserIgnoredComposer.MUTED).compose());
+                room.sendComposer(new IgnoreResultMessageComposer(this, IgnoreResultMessageComposer.MUTED).compose());
             }
         }
     }
@@ -431,7 +431,7 @@ public class Habbo implements Runnable {
         this.client.sendResponse(new FloodControlMessageComposer(3));
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
         if (room != null) {
-            room.sendComposer(new RoomUserIgnoredComposer(this, RoomUserIgnoredComposer.UNIGNORED).compose());
+            room.sendComposer(new IgnoreResultMessageComposer(this, IgnoreResultMessageComposer.UNIGNORED).compose());
         }
     }
 

src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java

@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.permissions.Rank;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.catalog.*;
 import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigComposer;
-import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer;
 import com.eu.habbo.messages.outgoing.modtool.ModToolComposer;
 import com.eu.habbo.messages.outgoing.users.UserPerksComposer;
 import com.eu.habbo.messages.outgoing.users.UserPermissionsComposer;
@@ -278,7 +278,7 @@ public class HabboManager {
             habbo.getClient().sendResponse(new BuildersClubFurniCountMessageComposer(0));
             habbo.getClient().sendResponse(new BundleDiscountRulesetMessageComposer());
             habbo.getClient().sendResponse(new MarketplaceConfigComposer());
-            habbo.getClient().sendResponse(new GiftConfigurationComposer());
+            habbo.getClient().sendResponse(new GiftWrappingConfigurationComposer());
             habbo.getClient().sendResponse(new RecyclerLogicComposer());
             habbo.alert(Emulator.getTexts().getValue("commands.generic.cmd_give_rank.new_rank").replace("id", newRank.getName()));
         } else {
@@ -311,7 +311,7 @@ public class HabboManager {
 
     public void staffAlert(String message) {
         message = Emulator.getTexts().getValue("commands.generic.cmd_staffalert.title") + "\r\n" + message;
-        ServerMessage msg = new GenericAlertComposer(message).compose();
+        ServerMessage msg = new HabboBroadcastMessageComposer(message).compose();
         Emulator.getGameEnvironment().getHabboManager().sendPacketToHabbosWithPermission(msg, "cmd_staffalert");
     }
 }

src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java

@@ -383,7 +383,7 @@ public class SubscriptionHabboClub extends Subscription {
             case "diamond":
                 pointCurrency = 5;
                 habbo.getClient().getHabbo().getHabboInfo().addCurrencyAmount(pointCurrency, amount);
-                habbo.getClient().sendResponse(new UserPointsComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency));
+                habbo.getClient().sendResponse(new HabboActivityPointNotificationMessageComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency));
                 break;
 
             case "duckets":
@@ -392,7 +392,7 @@ public class SubscriptionHabboClub extends Subscription {
             case "pixel":
                 pointCurrency = 0;
                 habbo.getClient().getHabbo().getHabboInfo().addCurrencyAmount(pointCurrency, amount);
-                habbo.getClient().sendResponse(new UserPointsComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency));
+                habbo.getClient().sendResponse(new HabboActivityPointNotificationMessageComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency));
                 break;
 
             default:
@@ -406,7 +406,7 @@ public class SubscriptionHabboClub extends Subscription {
 
                 if (pointCurrency >= 0) {
                     habbo.getClient().getHabbo().getHabboInfo().addCurrencyAmount(pointCurrency, amount);
-                    habbo.getClient().sendResponse(new UserPointsComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency));
+                    habbo.getClient().sendResponse(new HabboActivityPointNotificationMessageComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency));
                 }
                 break;
         }

src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java

@@ -18,11 +18,11 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.*;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
-import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer;
 import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
 import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
-import com.eu.habbo.messages.outgoing.users.UserPointsComposer;
+import com.eu.habbo.messages.outgoing.users.HabboActivityPointNotificationMessageComposer;
 import com.eu.habbo.threading.runnables.ShutdownEmulator;
 import gnu.trove.map.hash.THashMap;
 import gnu.trove.set.hash.THashSet;
@@ -75,7 +75,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler {
                     return;
                 }
 
-                if (!GiftConfigurationComposer.BOX_TYPES.contains(color) || !GiftConfigurationComposer.RIBBON_TYPES.contains(ribbonId)) {
+                if (!GiftWrappingConfigurationComposer.BOX_TYPES.contains(color) || !GiftWrappingConfigurationComposer.RIBBON_TYPES.contains(ribbonId)) {
                     this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR).compose());
                     return;
                 }
@@ -308,7 +308,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler {
                                 }
                             } else {
                                 this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR));
-                                this.client.sendResponse(new GenericAlertComposer(Emulator.getTexts().getValue("error.catalog.buy.not_yet")));
+                                this.client.sendResponse(new HabboBroadcastMessageComposer(Emulator.getTexts().getValue("error.catalog.buy.not_yet")));
                                 return;
                             }
                         }
@@ -362,7 +362,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler {
                         } else if (!this.client.getHabbo().hasPermission(Permission.ACC_INFINITE_POINTS)) {
                             this.client.getHabbo().getHabboInfo().addCurrencyAmount(item.getPointsType(), -totalPoints);
                         }
-                        this.client.sendResponse(new UserPointsComposer(this.client.getHabbo().getHabboInfo().getCurrencyAmount(item.getPointsType()), -totalPoints, item.getPointsType()));
+                        this.client.sendResponse(new HabboActivityPointNotificationMessageComposer(this.client.getHabbo().getHabboInfo().getCurrencyAmount(item.getPointsType()), -totalPoints, item.getPointsType()));
                     }
 
                     this.client.sendResponse(new PurchaseOKComposer(item));

src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.catalog.ClubOffer;
 import com.eu.habbo.habbohotel.users.subscriptions.Subscription;
 import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.unknown.ExtendClubMessageComposer;
+import com.eu.habbo.messages.outgoing.unknown.HabboClubExtendOfferMessageComposer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,7 +38,7 @@ public class CatalogRequestClubDiscountEvent extends MessageHandler {
             if(deal != null) {
                 ClubOffer regular = Emulator.getGameEnvironment().getCatalogManager().getClubOffers().stream().filter(x -> x.getDays() == deal.getDays()).findAny().orElse(null);
                 if(regular != null) {
-                    this.client.sendResponse(new ExtendClubMessageComposer(this.client.getHabbo(), deal, regular.getCredits(), regular.getPoints(), regular.getPointsType(), Math.max(0, days)));
+                    this.client.sendResponse(new HabboClubExtendOfferMessageComposer(this.client.getHabbo(), deal, regular.getCredits(), regular.getPoints(), regular.getPointsType(), Math.max(0, days)));
                 }
             }
         }

src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubDataEvent.java

@@ -1,13 +1,11 @@
 package com.eu.habbo.messages.incoming.catalog;
 
-import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.catalog.ClubCenterDataComposer;
+import com.eu.habbo.messages.outgoing.catalog.HabboClubOffersMessageComposer;
-import com.eu.habbo.messages.outgoing.catalog.ClubDataComposer;
 
 public class RequestClubDataEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new ClubDataComposer(this.client.getHabbo(), this.packet.readInt()));
+        this.client.sendResponse(new HabboClubOffersMessageComposer(this.client.getHabbo(), this.packet.readInt()));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/catalog/RequestGiftConfigurationEvent.java

@@ -1,11 +1,11 @@
 package com.eu.habbo.messages.incoming.catalog;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.catalog.GiftConfigurationComposer;
+import com.eu.habbo.messages.outgoing.catalog.GiftWrappingConfigurationComposer;
 
 public class RequestGiftConfigurationEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new GiftConfigurationComposer());
+        this.client.sendResponse(new GiftWrappingConfigurationComposer());
     }
 }

src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/OpenRecycleBoxEvent.java

@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
 import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
-import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer;
+import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.PresentItemOpenedComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer;
 import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer;
@@ -64,7 +64,7 @@ public class OpenRecycleBoxEvent extends MessageHandler {
                         z = roomTile.z;
                     }
                 }
-                room.sendComposer(new UpdateStackHeightComposer(item.getX(), item.getY(), z, room.getStackHeight(item.getX(), item.getY(), true)).compose());
+                room.sendComposer(new HeightMapUpdateMessageComposer(item.getX(), item.getY(), z, room.getStackHeight(item.getX(), item.getY(), true)).compose());
             }
         }
     }

src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java

@@ -8,7 +8,7 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
-import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer;
 import gnu.trove.set.hash.THashSet;
 
@@ -21,7 +21,7 @@ public class FloorPlanEditorSaveEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (!this.client.getHabbo().hasPermission(Permission.ACC_FLOORPLAN_EDITOR)) {
-            this.client.sendResponse(new GenericAlertComposer(Emulator.getTexts().getValue("floorplan.permission")));
+            this.client.sendResponse(new HabboBroadcastMessageComposer(Emulator.getTexts().getValue("floorplan.permission")));
             return;
         }
 

src/main/java/com/eu/habbo/messages/incoming/friends/SearchUserEvent.java

@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.friends;
 import com.eu.habbo.habbohotel.messenger.Messenger;
 import com.eu.habbo.habbohotel.messenger.MessengerBuddy;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.friends.UserSearchResultComposer;
+import com.eu.habbo.messages.outgoing.friends.HabboSearchResultComposer;
 import gnu.trove.set.hash.THashSet;
 
 import java.util.concurrent.ConcurrentHashMap;
@@ -33,7 +33,7 @@ public class SearchUserEvent extends MessageHandler {
                 cachedResults.put(username, buddies);
             }
 
-            this.client.sendResponse(new UserSearchResultComposer(buddies, this.client.getHabbo().getMessenger().getFriends(username), this.client.getHabbo()));
+            this.client.sendResponse(new HabboSearchResultComposer(buddies, this.client.getHabbo().getMessenger().getFriends(username), this.client.getHabbo()));
         }
     }
 }

src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestAccountStatusEvent.java

@@ -1,11 +1,11 @@
 package com.eu.habbo.messages.incoming.gamecenter;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.gamecenter.GameCenterAccountInfoComposer;
+import com.eu.habbo.messages.outgoing.gamecenter.Game2AccountGameStatusMessageComposer;
 
 public class GameCenterRequestAccountStatusEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new GameCenterAccountInfoComposer(this.packet.readInt(), 10));
+        this.client.sendResponse(new Game2AccountGameStatusMessageComposer(this.packet.readInt(), 10));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/guides/GuideInviteUserEvent.java

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guides.GuideSessionInvitedToGuideRoomComposer;
+import com.eu.habbo.messages.outgoing.guides.GuideSessionInvitedToGuideRoomMessageComposer;
 
 public class GuideInviteUserEvent extends MessageHandler {
     @Override
@@ -12,7 +12,7 @@ public class GuideInviteUserEvent extends MessageHandler {
         GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHelper(this.client.getHabbo());
 
         if (tour != null) {
-            ServerMessage message = new GuideSessionInvitedToGuideRoomComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom()).compose();
+            ServerMessage message = new GuideSessionInvitedToGuideRoomMessageComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom()).compose();
             tour.getNoob().getClient().sendResponse(message);
             tour.getHelper().getClient().sendResponse(message);
         }

src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java

@@ -6,8 +6,8 @@ import com.eu.habbo.habbohotel.modtool.ModToolIssue;
 import com.eu.habbo.habbohotel.modtool.ModToolTicketType;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guides.GuideSessionDetachedComposer;
+import com.eu.habbo.messages.outgoing.guides.GuideSessionDetachedMessageComposer;
-import com.eu.habbo.messages.outgoing.guides.GuideSessionEndedComposer;
+import com.eu.habbo.messages.outgoing.guides.GuideSessionEndedMessageComposer;
 import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer;
 
 public class GuideReportHelperEvent extends MessageHandler {
@@ -37,11 +37,11 @@ public class GuideReportHelperEvent extends MessageHandler {
             Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue);
             this.client.sendResponse(new CallForHelpResultMessageComposer(CallForHelpResultMessageComposer.REPORT_RECEIVED, message));
 
-            this.client.sendResponse(new GuideSessionDetachedComposer());
+            this.client.sendResponse(new GuideSessionDetachedMessageComposer());
-            this.client.sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED));
+            this.client.sendResponse(new GuideSessionEndedMessageComposer(GuideSessionEndedMessageComposer.HELP_CASE_CLOSED));
 
-            reported.getClient().sendResponse(new GuideSessionDetachedComposer());
+            reported.getClient().sendResponse(new GuideSessionDetachedMessageComposer());
-            reported.getClient().sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED));
+            reported.getClient().sendResponse(new GuideSessionEndedMessageComposer(GuideSessionEndedMessageComposer.HELP_CASE_CLOSED));
         }
     }
 }

src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserMessageEvent.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.guides.GuideChatMessage;
 import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guides.GuideSessionMessageComposer;
+import com.eu.habbo.messages.outgoing.guides.GuideSessionMessageMessageComposer;
 
 public class GuideUserMessageEvent extends MessageHandler {
     @Override
@@ -15,7 +15,7 @@ public class GuideUserMessageEvent extends MessageHandler {
         if (tour != null) {
             GuideChatMessage chatMessage = new GuideChatMessage(this.client.getHabbo().getHabboInfo().getId(), this.packet.readString(), Emulator.getIntUnixTimestamp());
             tour.addMessage(chatMessage);
-            ServerMessage serverMessage = new GuideSessionMessageComposer(chatMessage).compose();
+            ServerMessage serverMessage = new GuideSessionMessageMessageComposer(chatMessage).compose();
             tour.getHelper().getClient().sendResponse(serverMessage);
             tour.getNoob().getClient().sendResponse(serverMessage);
         }

src/main/java/com/eu/habbo/messages/incoming/guides/GuideVisitUserEvent.java

@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guides;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guides.GuideSessionRequesterRoomComposer;
+import com.eu.habbo.messages.outgoing.guides.GuideSessionRequesterRoomMessageComposer;
 
 public class GuideVisitUserEvent extends MessageHandler {
     @Override
@@ -11,7 +11,7 @@ public class GuideVisitUserEvent extends MessageHandler {
         GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHelper(this.client.getHabbo());
 
         if (tour != null) {
-            this.client.sendResponse(new GuideSessionRequesterRoomComposer(tour.getNoob().getHabboInfo().getCurrentRoom()));
+            this.client.sendResponse(new GuideSessionRequesterRoomMessageComposer(tour.getNoob().getHabboInfo().getCurrentRoom()));
         }
     }
 }

src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideAssistanceEvent.java

@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guides;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guides.GuideSessionErrorComposer;
+import com.eu.habbo.messages.outgoing.guides.GuideSessionErrorMessageComposer;
 
 public class RequestGuideAssistanceEvent extends MessageHandler {
     @Override
@@ -14,7 +14,7 @@ public class RequestGuideAssistanceEvent extends MessageHandler {
         GuideTour activeTour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHabbo(this.client.getHabbo());
 
         if (activeTour != null) {
-            this.client.sendResponse(new GuideSessionErrorComposer(GuideSessionErrorComposer.SOMETHING_WRONG_REQUEST));
+            this.client.sendResponse(new GuideSessionErrorMessageComposer(GuideSessionErrorMessageComposer.SOMETHING_WRONG_REQUEST));
             return;
         }
 

src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideToolEvent.java

@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guides;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guides.GuideToolsComposer;
+import com.eu.habbo.messages.outgoing.guides.GuideOnDutyStatusMessageComposer;
 
 public class RequestGuideToolEvent extends MessageHandler {
     @Override
@@ -32,11 +32,11 @@ public class RequestGuideToolEvent extends MessageHandler {
                 Emulator.getGameEnvironment().getGuideManager().setOnGuardian(this.client.getHabbo(), onDuty);
             }
 
-            this.client.sendResponse(new GuideToolsComposer(onDuty));
+            this.client.sendResponse(new GuideOnDutyStatusMessageComposer(onDuty));
         } else {
             Emulator.getGameEnvironment().getGuideManager().setOnGuide(this.client.getHabbo(), onDuty);
             Emulator.getGameEnvironment().getGuideManager().setOnGuardian(this.client.getHabbo(), onDuty);
-            this.client.sendResponse(new GuideToolsComposer(onDuty));
+            this.client.sendResponse(new GuideOnDutyStatusMessageComposer(onDuty));
         }
     }
 }

src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java

@@ -8,9 +8,9 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guilds.GuildAcceptMemberErrorComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildMemberMgmtFailedMessageComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
-import com.eu.habbo.messages.outgoing.guilds.GuildRefreshMembersListComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildMembershipRejectedMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildAcceptedMembershipEvent;
 
 public class GuildAcceptMembershipEvent extends MessageHandler {
@@ -25,8 +25,8 @@ public class GuildAcceptMembershipEvent extends MessageHandler {
         if (guild != null) {
             GuildMember groupMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, this.client.getHabbo());
             if (userId == this.client.getHabbo().getHabboInfo().getId() || guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || groupMember.getRank().equals(GuildRank.ADMIN) || groupMember.getRank().equals(GuildRank.OWNER) || this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN)) {
-                if (habbo != null) {
                     if (habbo.getHabboStats().hasGuild(guild.getId())) {
+                if (habbo != null) {
                         this.client.sendResponse(new GuildAcceptMemberErrorComposer(guild.getId(), GuildAcceptMemberErrorComposer.ALREADY_ACCEPTED));
                         return;
                     } else {

src/main/java/com/eu/habbo/messages/incoming/guilds/GuildConfirmRemoveMemberEvent.java

@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.guilds.GuildRank;
 import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guilds.GuildConfirmRemoveMemberComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildMemberFurniCountInHQMessageComposer;
 
 public class GuildConfirmRemoveMemberEvent extends MessageHandler {
     @Override
@@ -25,7 +25,7 @@ public class GuildConfirmRemoveMemberEvent extends MessageHandler {
                 if (room != null) {
                     count = room.getUserFurniCount(userId);
                 }
-                this.client.sendResponse(new GuildConfirmRemoveMemberComposer(userId, count));
+                this.client.sendResponse(new GuildMemberFurniCountInHQMessageComposer(userId, count));
             }
         }
 

src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeclineMembershipEvent.java

@@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildMembersComposer;
-import com.eu.habbo.messages.outgoing.guilds.GuildRefreshMembersListComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildMembershipRejectedMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildDeclinedMembershipEvent;
 
 public class GuildDeclineMembershipEvent extends MessageHandler {
@@ -27,7 +27,7 @@ public class GuildDeclineMembershipEvent extends MessageHandler {
                 guild.decreaseRequestCount();
                 Emulator.getGameEnvironment().getGuildManager().removeMember(guild, userId);
                 this.client.sendResponse(new GuildMembersComposer(guild, Emulator.getGameEnvironment().getGuildManager().getGuildMembers(guild, 0, 0, ""), this.client.getHabbo(), 0, 0, "", true, Emulator.getGameEnvironment().getGuildManager().getGuildMembersCount(guild, 0, 0, "")));
-                this.client.sendResponse(new GuildRefreshMembersListComposer(guild));
+                this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild));
 
                 Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId);
                 Emulator.getPluginManager().fireEvent(new GuildDeclinedMembershipEvent(guild, userId, habbo, this.client.getHabbo()));

src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeleteEvent.java

@@ -7,8 +7,8 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.FavoriteMembershipUpdateMessageComposer;
-import com.eu.habbo.messages.outgoing.guilds.RemoveGuildFromRoomComposer;
+import com.eu.habbo.messages.outgoing.guilds.HabboGroupDeactivatedMessageComposer;
-import com.eu.habbo.messages.outgoing.rooms.RoomDataComposer;
+import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer;
 import com.eu.habbo.plugin.events.guilds.GuildDeletedEvent;
 import gnu.trove.set.hash.THashSet;
 
@@ -33,11 +33,11 @@ public class GuildDeleteEvent extends MessageHandler {
 
                 Emulator.getGameEnvironment().getGuildManager().deleteGuild(guild);
                 Emulator.getPluginManager().fireEvent(new GuildDeletedEvent(guild, this.client.getHabbo()));
-                Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId()).sendComposer(new RemoveGuildFromRoomComposer(guildId).compose());
+                Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId()).sendComposer(new HabboGroupDeactivatedMessageComposer(guildId).compose());
 
                 if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) {
                     if (guild.getRoomId() == this.client.getHabbo().getHabboInfo().getCurrentRoom().getId()) {
-                        this.client.sendResponse(new RoomDataComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom(), this.client.getHabbo(), false, false));
+                        this.client.sendResponse(new GetGuestRoomResultComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom(), this.client.getHabbo(), false, false));
                     }
                 }
             }

src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java

@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
-import com.eu.habbo.messages.outgoing.guilds.GuildMemberUpdateComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildMembershipUpdatedMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildRemovedAdminEvent;
 
 public class GuildRemoveAdminEvent extends MessageHandler {
@@ -40,7 +40,7 @@ public class GuildRemoveAdminEvent extends MessageHandler {
                 }
                 GuildMember guildMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, userId);
 
-                this.client.sendResponse(new GuildMemberUpdateComposer(guild, guildMember));
+                this.client.sendResponse(new GuildMembershipUpdatedMessageComposer(guild, guildMember));
             }
         }
     }

src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java

@@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.FavoriteMembershipUpdateMessageComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
-import com.eu.habbo.messages.outgoing.guilds.GuildRefreshMembersListComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildMembershipRejectedMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildRemovedMemberEvent;
 
 public class GuildRemoveMemberEvent extends MessageHandler {
@@ -35,7 +35,7 @@ public class GuildRemoveMemberEvent extends MessageHandler {
                 guild.decreaseMemberCount();
 
                 if (userId != this.client.getHabbo().getHabboInfo().getId()) {
-                    this.client.sendResponse(new GuildRefreshMembersListComposer(guild));
+                    this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild));
                 }
 
                 Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(guild.getRoomId());

src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java

@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guilds.GuildMemberUpdateComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildMembershipUpdatedMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildGivenAdminEvent;
 
 public class GuildSetAdminEvent extends MessageHandler {
@@ -40,7 +40,7 @@ public class GuildSetAdminEvent extends MessageHandler {
 
                 GuildMember guildMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, userId);
 
-                this.client.sendResponse(new GuildMemberUpdateComposer(guild, guildMember));
+                this.client.sendResponse(new GuildMembershipUpdatedMessageComposer(guild, guildMember));
             }
         }
     }

src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetFavoriteEvent.java

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guilds.Guild;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.FavoriteMembershipUpdateMessageComposer;
-import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersAddGuildBadgeComposer;
+import com.eu.habbo.messages.outgoing.rooms.users.HabboAddGroupBadgesMessageComposer;
 import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildFavoriteSetEvent;
 
@@ -26,7 +26,7 @@ public class GuildSetFavoriteEvent extends MessageHandler {
 
             if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) {
                 if (guild != null) {
-                    this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUsersAddGuildBadgeComposer(guild).compose());
+                    this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new HabboAddGroupBadgesMessageComposer(guild).compose());
                     this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new FavoriteMembershipUpdateMessageComposer(this.client.getHabbo().getRoomUnit(), guild).compose());
                 }
             }

src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java

@@ -9,8 +9,8 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer;
 import com.eu.habbo.messages.outgoing.catalog.PurchaseOKComposer;
-import com.eu.habbo.messages.outgoing.guilds.GuildBoughtComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildCreatedMessageComposer;
-import com.eu.habbo.messages.outgoing.guilds.GuildEditFailComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildEditFailedMessageComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
 import com.eu.habbo.plugin.events.guilds.GuildPurchasedEvent;
 import org.slf4j.Logger;
@@ -28,7 +28,7 @@ public class RequestGuildBuyEvent extends MessageHandler {
             return;
 
         if (Emulator.getConfig().getBoolean("catalog.guild.hc_required", true) && !this.client.getHabbo().getHabboStats().hasActiveClub()) {
-            this.client.sendResponse(new GuildEditFailComposer(GuildEditFailComposer.HC_REQUIRED));
+            this.client.sendResponse(new GuildEditFailedMessageComposer(GuildEditFailedMessageComposer.HC_REQUIRED));
             return;
         }
 
@@ -48,7 +48,7 @@ public class RequestGuildBuyEvent extends MessageHandler {
 
         if (r != null) {
             if (r.hasGuild()) {
-                this.client.sendResponse(new GuildEditFailComposer(GuildEditFailComposer.ROOM_ALREADY_IN_USE));
+                this.client.sendResponse(new GuildEditFailedMessageComposer(GuildEditFailedMessageComposer.ROOM_ALREADY_IN_USE));
                 return;
             }
 
@@ -80,7 +80,7 @@ public class RequestGuildBuyEvent extends MessageHandler {
                     }
 
                     if(name.length() > 29){
-                        this.client.sendResponse(new GuildEditFailComposer(GuildEditFailComposer.INVALID_GUILD_NAME));
+                        this.client.sendResponse(new GuildEditFailedMessageComposer(GuildEditFailedMessageComposer.INVALID_GUILD_NAME));
                         return;
                     }
                     if(description.length() > 254){
@@ -97,7 +97,7 @@ public class RequestGuildBuyEvent extends MessageHandler {
                     }
 
                     this.client.sendResponse(new PurchaseOKComposer());
-                    this.client.sendResponse(new GuildBoughtComposer(guild));
+                    this.client.sendResponse(new GuildCreatedMessageComposer(guild));
                     for (Habbo habbo : r.getHabbos()) {
                         habbo.getClient().sendResponse(new GuildInfoComposer(guild, habbo.getClient(), false, null));
                     }

src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyRoomsEvent.java

@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guilds;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guilds.GuildBuyRoomsComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildCreationInfoMessageComposer;
 import gnu.trove.set.hash.THashSet;
 
 import java.util.List;
@@ -20,6 +20,6 @@ public class RequestGuildBuyRoomsEvent extends MessageHandler {
                 roomList.add(room);
         }
 
-        this.client.sendResponse(new GuildBuyRoomsComposer(roomList));
+        this.client.sendResponse(new GuildCreationInfoMessageComposer(roomList));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildFurniWidgetEvent.java

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guilds.Guild;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guilds.GuildFurniWidgetComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildFurniContextMenuInfoMessageComposer;
 
 public class RequestGuildFurniWidgetEvent extends MessageHandler {
     @Override
@@ -17,7 +17,7 @@ public class RequestGuildFurniWidgetEvent extends MessageHandler {
             Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId);
 
             if (item != null && guild != null)
-                this.client.sendResponse(new GuildFurniWidgetComposer(this.client.getHabbo(), guild, item));
+                this.client.sendResponse(new GuildFurniContextMenuInfoMessageComposer(this.client.getHabbo(), guild, item));
         }
     }
 }

src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildJoinEvent.java

@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.guilds.GuildState;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
-import com.eu.habbo.messages.outgoing.guilds.GuildJoinErrorComposer;
+import com.eu.habbo.messages.outgoing.guilds.HabboGroupJoinFailedMessageComposer;
 
 public class RequestGuildJoinEvent extends MessageHandler {
     @Override
@@ -22,7 +22,7 @@ public class RequestGuildJoinEvent extends MessageHandler {
             return;
 
         if (guild.getState() == GuildState.CLOSED || guild.getState() == GuildState.LARGE_CLOSED) {
-            this.client.sendResponse(new GuildJoinErrorComposer(GuildJoinErrorComposer.GROUP_CLOSED));
+            this.client.sendResponse(new HabboGroupJoinFailedMessageComposer(HabboGroupJoinFailedMessageComposer.GROUP_CLOSED));
             return;
         }
 

src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildManageEvent.java

@@ -3,13 +3,13 @@ package com.eu.habbo.messages.incoming.guilds;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guilds.Guild;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guilds.GuildManageComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildEditInfoMessageComposer;
 
 public class RequestGuildManageEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(this.packet.readInt());
 
-        this.client.sendResponse(new GuildManageComposer(guild));
+        this.client.sendResponse(new GuildEditInfoMessageComposer(guild));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildPartsEvent.java

@@ -1,11 +1,11 @@
 package com.eu.habbo.messages.incoming.guilds;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guilds.GuildPartsComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildEditorDataMessageComposer;
 
 public class RequestGuildPartsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new GuildPartsComposer());
+        this.client.sendResponse(new GuildEditorDataMessageComposer());
     }
 }

src/main/java/com/eu/habbo/messages/incoming/guilds/RequestOwnGuildsEvent.java

@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guilds;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guilds.Guild;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.guilds.GuildListComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildMembershipsMessageComposer;
 import gnu.trove.set.hash.THashSet;
 
 public class RequestOwnGuildsEvent extends MessageHandler {
@@ -22,6 +22,6 @@ public class RequestOwnGuildsEvent extends MessageHandler {
             }
         }
 
-        this.client.sendResponse(new GuildListComposer(guilds, this.client.getHabbo()));
+        this.client.sendResponse(new GuildMembershipsMessageComposer(guilds, this.client.getHabbo()));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java

@@ -19,12 +19,12 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.TargetedOfferComposer;
 import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDataMessageComposer;
-import com.eu.habbo.messages.outgoing.gamecenter.GameCenterAccountInfoComposer;
+import com.eu.habbo.messages.outgoing.gamecenter.Game2AccountGameStatusMessageComposer;
-import com.eu.habbo.messages.outgoing.gamecenter.GameCenterGameListComposer;
+import com.eu.habbo.messages.outgoing.gamecenter.GameListMessageComposer;
-import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
+import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer;
 import com.eu.habbo.messages.outgoing.habboway.nux.NewUserIdentityComposer;
-import com.eu.habbo.messages.outgoing.habboway.nux.NuxAlertComposer;
+import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer;
 import com.eu.habbo.messages.outgoing.handshake.EnableNotificationsComposer;
 import com.eu.habbo.messages.outgoing.handshake.AuthenticationOKMessageComposer;
 import com.eu.habbo.messages.outgoing.handshake.AvailabilityStatusMessageComposer;
@@ -214,9 +214,9 @@ public class SecureLoginEvent extends MessageHandler {
                 messages.add(new BuildersClubSubscriptionStatusMessageComposer().compose());
                 messages.add(new CfhTopicsInitComposer().compose());
                 messages.add(new FavouriteChangedComposer(this.client.getHabbo()).compose());
-                messages.add(new GameCenterGameListComposer().compose());
+                messages.add(new GameListMessageComposer().compose());
-                messages.add(new GameCenterAccountInfoComposer(3, 100).compose());
+                messages.add(new Game2AccountGameStatusMessageComposer(3, 100).compose());
-                messages.add(new GameCenterAccountInfoComposer(0, 100).compose());
+                messages.add(new Game2AccountGameStatusMessageComposer(0, 100).compose());
 
                 messages.add(new UserClubComposer(this.client.getHabbo(), SubscriptionHabboClub.HABBO_CLUB, UserClubComposer.RESPONSE_TYPE_LOGIN).compose());
 
@@ -231,7 +231,7 @@ public class SecureLoginEvent extends MessageHandler {
                     if (daysBetween >= 0) {
                         messages.add(new CampaignCalendarDataMessageComposer(campaign.getName(), campaign.getImage(), campaign.getTotalDays(), (int) daysBetween, this.client.getHabbo().getHabboStats().calendarRewardsClaimed, campaign.getLockExpired()).compose());
                         if(Emulator.getConfig().getBoolean("hotel.login.show.calendar", false)) {
-                            messages.add(new NuxAlertComposer("openView/calendar").compose());
+                            messages.add(new InClientLinkMessageComposer("openView/calendar").compose());
                         }
                     }
                 }
@@ -291,7 +291,7 @@ public class SecureLoginEvent extends MessageHandler {
                         if (Emulator.getConfig().getBoolean("hotel.welcome.alert.oldstyle")) {
                             SecureLoginEvent.this.client.sendResponse(new MessagesForYouComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername()).split("<br/>")));
                         } else {
-                            SecureLoginEvent.this.client.sendResponse(new GenericAlertComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername())));
+                            SecureLoginEvent.this.client.sendResponse(new HabboBroadcastMessageComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername())));
                         }
                     }, Emulator.getConfig().getInt("hotel.welcome.alert.delay", 5000));
                 }

src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java

@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.modtool.ModToolChatLog;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.modtool.BullyReportedMessageComposer;
+import com.eu.habbo.messages.outgoing.modtool.GuideTicketCreationResultMessageComposer;
 import com.eu.habbo.messages.outgoing.modtool.CallForHelpDisabledNotifyMessageComposer;
 
 import java.util.ArrayList;
@@ -35,20 +35,20 @@ public class ReportBullyEvent extends MessageHandler {
                 GuardianTicket ticket = Emulator.getGameEnvironment().getGuideManager().getOpenReportedHabboTicket(habbo);
 
                 if (ticket != null) {
-                    this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.ALREADY_REPORTED));
+                    this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.ALREADY_REPORTED));
                     return;
                 }
 
                 ArrayList<ModToolChatLog> chatLog = Emulator.getGameEnvironment().getModToolManager().getRoomChatlog(roomId);
 
                 if (chatLog.isEmpty()) {
-                    this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.NO_CHAT));
+                    this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.NO_CHAT));
                     return;
                 }
 
                 Emulator.getGameEnvironment().getGuideManager().addGuardianTicket(new GuardianTicket(this.client.getHabbo(), habbo, chatLog));
 
-                this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.RECEIVED));
+                this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.RECEIVED));
             }
         }
     }

src/main/java/com/eu/habbo/messages/incoming/modtool/ReportEvent.java

@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.*;
-import com.eu.habbo.messages.outgoing.rooms.users.RoomUserIgnoredComposer;
+import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer;
 import com.eu.habbo.threading.runnables.InsertModToolIssue;
 
 import java.util.ArrayList;
@@ -45,20 +45,20 @@ public class ReportEvent extends MessageHandler {
                     GuardianTicket ticket = Emulator.getGameEnvironment().getGuideManager().getOpenReportedHabboTicket(reported);
 
                     if (ticket != null) {
-                        this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.ALREADY_REPORTED));
+                        this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.ALREADY_REPORTED));
                         return;
                     }
 
                     ArrayList<ModToolChatLog> chatLog = Emulator.getGameEnvironment().getModToolManager().getRoomChatlog(roomId);
 
                     if (chatLog.isEmpty()) {
-                        this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.NO_CHAT));
+                        this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.NO_CHAT));
                         return;
                     }
 
                     Emulator.getGameEnvironment().getGuideManager().addGuardianTicket(new GuardianTicket(this.client.getHabbo(), reported, chatLog));
 
-                    this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.RECEIVED));
+                    this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.RECEIVED));
                 } else {
                     ModToolIssue issue = new ModToolIssue(this.client.getHabbo().getHabboInfo().getId(), this.client.getHabbo().getHabboInfo().getUsername(), reported.getHabboInfo().getId(), reported.getHabboInfo().getUsername(), roomId, message, ModToolTicketType.NORMAL);
                     issue.category = topic;
@@ -74,7 +74,7 @@ public class ReportEvent extends MessageHandler {
                                 if (issue.state == ModToolTicketState.OPEN) {
                                     if (cfhTopic.action == CfhActionType.AUTO_IGNORE) {
                                         if (ReportEvent.this.client.getHabbo().getHabboStats().ignoreUser(ReportEvent.this.client, reported.getHabboInfo().getId())) {
-                                            ReportEvent.this.client.sendResponse(new RoomUserIgnoredComposer(reported, RoomUserIgnoredComposer.IGNORED));
+                                            ReportEvent.this.client.sendResponse(new IgnoreResultMessageComposer(reported, IgnoreResultMessageComposer.IGNORED));
                                         }
                                     }
 
@@ -103,7 +103,7 @@ public class ReportEvent extends MessageHandler {
                                 if (ReportEvent.this.client.getHabbo().getHabboStats().ignoreUser(ReportEvent.this.client, issue.reportedId)) {
                                     Habbo reported = Emulator.getGameEnvironment().getHabboManager().getHabbo(issue.reportedId);
                                     if (reported != null) {
-                                        ReportEvent.this.client.sendResponse(new RoomUserIgnoredComposer(reported, RoomUserIgnoredComposer.IGNORED));
+                                        ReportEvent.this.client.sendResponse(new IgnoreResultMessageComposer(reported, IgnoreResultMessageComposer.IGNORED));
                                     }
                                 }
                             }

src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportUserBullyingEvent.java

@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.modtool;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guides.GuardianTicket;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.modtool.BullyReportRequestComposer;
+import com.eu.habbo.messages.outgoing.modtool.GuideReportingStatusMessageComposer;
 
 import java.util.Calendar;
 
@@ -14,16 +14,16 @@ public class RequestReportUserBullyingEvent extends MessageHandler {
 
         if (ticket != null) {
             if (ticket.inProgress()) {
-                this.client.sendResponse(new BullyReportRequestComposer(BullyReportRequestComposer.ONGOING_HELPER_CASE, 1));
+                this.client.sendResponse(new GuideReportingStatusMessageComposer(GuideReportingStatusMessageComposer.ONGOING_HELPER_CASE, 1));
                 return;
             }
 
             if ((Calendar.getInstance().getTime().getTime() / 1000) - ticket.getDate().getTime() < Emulator.getConfig().getInt("guardians.reporting.cooldown")) {
-                this.client.sendResponse(new BullyReportRequestComposer(BullyReportRequestComposer.TOO_RECENT, 1));
+                this.client.sendResponse(new GuideReportingStatusMessageComposer(GuideReportingStatusMessageComposer.TOO_RECENT, 1));
                 return;
             }
         }
 
-        this.client.sendResponse(new BullyReportRequestComposer(BullyReportRequestComposer.START_REPORT, 0));
+        this.client.sendResponse(new GuideReportingStatusMessageComposer(GuideReportingStatusMessageComposer.START_REPORT, 0));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/RequestHighestScoreRoomsEvent.java

@@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class RequestHighestScoreRoomsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsByScore()));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsByScore()));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/RequestMyRoomsEvent.java

@@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class RequestMyRoomsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo())));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo())));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPopularRoomsEvent.java

@@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class RequestPopularRoomsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getActiveRooms(-1)));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getActiveRooms(-1)));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPromotedRoomsEvent.java

@@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class RequestPromotedRoomsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsPromoted()));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsPromoted()));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsByTagEvent.java

@@ -2,13 +2,13 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class SearchRoomsByTagEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String tag = this.packet.readString();
 
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithTag(tag)));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithTag(tag)));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsEvent.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.permissions.Rank;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 import com.eu.habbo.plugin.events.navigator.NavigatorSearchResultEvent;
 import gnu.trove.map.hash.THashMap;
 
@@ -46,7 +46,7 @@ public class SearchRoomsEvent extends MessageHandler {
                 rooms = Emulator.getGameEnvironment().getRoomManager().getRoomsWithName(name);
             }
 
-            message = new PrivateRoomsComposer(rooms).compose();
+            message = new GuestRoomSearchResultComposer(rooms).compose();
             THashMap<String, ServerMessage> map = cachedResults.get(this.client.getHabbo().getHabboInfo().getRank());
 
             if (map == null) {

src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsNowEvent.java

@@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class SearchRoomsFriendsNowEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsNow(this.client.getHabbo())));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsNow(this.client.getHabbo())));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsOwnEvent.java

@@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class SearchRoomsFriendsOwnEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsOwn(this.client.getHabbo())));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsOwn(this.client.getHabbo())));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsInGroupEvent.java

@@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class SearchRoomsInGroupEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsInGroup(this.client.getHabbo())));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsInGroup(this.client.getHabbo())));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsMyFavouriteEvent.java

@@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class SearchRoomsMyFavouriteEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFavourite(this.client.getHabbo())));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFavourite(this.client.getHabbo())));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsVisitedEvent.java

@@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class SearchRoomsVisitedEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsVisited(this.client.getHabbo(), false, 25)));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsVisited(this.client.getHabbo(), false, 25)));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsWithRightsEvent.java

@@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer;
+import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
 public class SearchRoomsWithRightsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithRights(this.client.getHabbo())));
+        this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithRights(this.client.getHabbo())));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomDataEvent.java

@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.rooms.RoomDataComposer;
+import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer;
 
 public class RequestRoomDataEvent extends MessageHandler {
     @Override
@@ -20,7 +20,7 @@ public class RequestRoomDataEvent extends MessageHandler {
             }
 
             //this.client.getHabbo().getHabboInfo().getCurrentRoom() != room
-            this.client.sendResponse(new RoomDataComposer(room, this.client.getHabbo(), true, unknown));
+            this.client.sendResponse(new GetGuestRoomResultComposer(room, this.client.getHabbo(), true, unknown));
         }
     }
 }

src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.FloorHeightMapComposer;
-import com.eu.habbo.messages.outgoing.rooms.RoomRelativeMapComposer;
+import com.eu.habbo.messages.outgoing.rooms.HeightMapComposer;
 
 public class RequestRoomHeightmapEvent extends MessageHandler {
     @Override
@@ -13,7 +13,7 @@ public class RequestRoomHeightmapEvent extends MessageHandler {
             Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(this.client.getHabbo().getHabboInfo().getLoadingRoom());
 
             if (room != null && room.getLayout() != null) {
-                this.client.sendResponse(new RoomRelativeMapComposer(room));
+                this.client.sendResponse(new HeightMapComposer(room));
 
                 this.client.sendResponse(new FloorHeightMapComposer(room));
 

src/main/java/com/eu/habbo/messages/incoming/rooms/RoomStaffPickEvent.java

@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.rooms.RoomDataComposer;
+import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer;
 
 public class RoomStaffPickEvent extends MessageHandler {
     @Override
@@ -38,7 +38,7 @@ public class RoomStaffPickEvent extends MessageHandler {
                     }
                 }
 
-                this.client.sendResponse(new RoomDataComposer(room, this.client.getHabbo(), true, false));
+                this.client.sendResponse(new GetGuestRoomResultComposer(room, this.client.getHabbo(), true, false));
             }
         }
     }

src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java

@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
-import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer;
+import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer;
 import com.eu.habbo.messages.outgoing.users.FigureSetIdsComposer;
 import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
@@ -40,7 +40,7 @@ public class RedeemClothingEvent extends MessageHandler {
                             RoomTile tile = this.client.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTile(item.getX(), item.getY());
                             this.client.getHabbo().getHabboInfo().getCurrentRoom().removeHabboItem(item);
                             this.client.getHabbo().getHabboInfo().getCurrentRoom().updateTile(tile);
-                            this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UpdateStackHeightComposer(tile.x, tile.y, tile.z, tile.relativeHeight()).compose());
+                            this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new HeightMapUpdateMessageComposer(tile.x, tile.y, tile.z, tile.relativeHeight()).compose());
                             this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RemoveFloorItemComposer(item, true).compose());
                             Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId()));
 

src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomTile;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer;
+import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer;
 import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer;
 import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer;
@@ -102,7 +102,7 @@ public class RedeemItemEvent extends MessageHandler {
                     RoomTile t = room.getLayout().getTile(item.getX(), item.getY());
                     t.setStackHeight(room.getStackHeight(item.getX(), item.getY(), false));
                     room.updateTile(t);
-                    room.sendComposer(new UpdateStackHeightComposer(item.getX(), item.getY(), t.z, t.relativeHeight()).compose());
+                    room.sendComposer(new HeightMapUpdateMessageComposer(item.getX(), item.getY(), t.z, t.relativeHeight()).compose());
                     Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId()));
 
                     switch (furniRedeemEvent.currencyID) {

src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetStackHelperHeightEvent.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomTile;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer;
+import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.UpdateStackHeightTileHeightComposer;
 import gnu.trove.set.hash.THashSet;
 
@@ -51,7 +51,7 @@ public class SetStackHelperHeightEvent extends MessageHandler {
                 item.needsUpdate(true);
                 this.client.getHabbo().getHabboInfo().getCurrentRoom().updateItem(item);
                 this.client.getHabbo().getHabboInfo().getCurrentRoom().updateTiles(tiles);
-                this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UpdateStackHeightComposer(room, tiles).compose());
+                this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new HeightMapUpdateMessageComposer(room, tiles).compose());
                 this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UpdateStackHeightTileHeightComposer(item, (int) ((height) * 100)).compose());
             }
         }

src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPackageNameEvent.java

@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTile;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer;
-import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer;
+import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer;
 import com.eu.habbo.messages.outgoing.rooms.pets.PetPackageNameValidationComposer;
 import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
@@ -62,7 +62,7 @@ public class PetPackageNameEvent extends MessageHandler {
                             room.sendComposer(new RemoveFloorItemComposer(item).compose());
                             RoomTile tile = room.getLayout().getTile(item.getX(), item.getY());
                             room.updateTile(room.getLayout().getTile(item.getX(), item.getY()));
-                            room.sendComposer(new UpdateStackHeightComposer(tile.x, tile.y, tile.z, tile.relativeHeight()).compose());
+                            room.sendComposer(new HeightMapUpdateMessageComposer(tile.x, tile.y, tile.z, tile.relativeHeight()).compose());
                             item.setUserId(0);
                         } else {
                             this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR));

src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreRoomUserEvent.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.achievements.AchievementManager;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.rooms.users.RoomUserIgnoredComposer;
+import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer;
 
 public class IgnoreRoomUserEvent extends MessageHandler {
     @Override
@@ -22,7 +22,7 @@ public class IgnoreRoomUserEvent extends MessageHandler {
                     return;
 
                 if (this.client.getHabbo().getHabboStats().ignoreUser(this.client, habbo.getHabboInfo().getId())) {
-                    this.client.sendResponse(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.IGNORED));
+                    this.client.sendResponse(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.IGNORED));
                     AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("SelfModIgnoreSeen"));
                 }
             }

src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnIgnoreRoomUserEvent.java

@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms.users;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.rooms.users.RoomUserIgnoredComposer;
+import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer;
 
 public class UnIgnoreRoomUserEvent extends MessageHandler {
     @Override
@@ -18,7 +18,7 @@ public class UnIgnoreRoomUserEvent extends MessageHandler {
             if (habbo != null) {
                 if (habbo.getHabboStats().allowTalk()) {
                     this.client.getHabbo().getHabboStats().unignoreUser(habbo.getHabboInfo().getId());
-                    this.client.sendResponse(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.UNIGNORED));
+                    this.client.sendResponse(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.UNIGNORED));
                 }
             }
         }

src/main/java/com/eu/habbo/messages/incoming/users/GetIgnoredUsersEvent.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.habbohotel.users.HabboInfo;
 import com.eu.habbo.habbohotel.users.HabboManager;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.unknown.IgnoredUsersComposer;
+import com.eu.habbo.messages.outgoing.unknown.IgnoredUsersMessageComposer;
 import gnu.trove.list.array.TIntArrayList;
 
 import java.util.ArrayList;
@@ -28,6 +28,6 @@ public class GetIgnoredUsersEvent extends MessageHandler {
             if(user != null) ignoredUsernames.add(user.getUsername());
         }
 
-        this.client.sendResponse(new IgnoredUsersComposer(ignoredUsernames));
+        this.client.sendResponse(new IgnoredUsersMessageComposer(ignoredUsernames));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/users/UserNuxEvent.java

@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.users;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.habboway.nux.NuxAlertComposer;
+import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -30,12 +30,12 @@ public class UserNuxEvent extends MessageHandler {
         int step = habbo.getHabboStats().nuxStep++;
 
         if (keys.containsKey(step)) {
-            habbo.getClient().sendResponse(new NuxAlertComposer("helpBubble/add/" + keys.get(step) + "/" + Emulator.getTexts().getValue("nux.step." + step)));
+            habbo.getClient().sendResponse(new InClientLinkMessageComposer("helpBubble/add/" + keys.get(step) + "/" + Emulator.getTexts().getValue("nux.step." + step)));
         } else if (!habbo.getHabboStats().nuxReward) {
 
 
         } else {
-            habbo.getClient().sendResponse(new NuxAlertComposer("nux/lobbyoffer/show"));
+            habbo.getClient().sendResponse(new InClientLinkMessageComposer("nux/lobbyoffer/show"));
         }
     }
 

src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftWrappingConfigurationComposer.java

@@ -9,7 +9,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-public class GiftConfigurationComposer extends MessageComposer {
+public class GiftWrappingConfigurationComposer extends MessageComposer {
     public static List<Integer> BOX_TYPES = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 8);
     public static List<Integer> RIBBON_TYPES = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
 

src/main/java/com/eu/habbo/messages/outgoing/catalog/HabboClubOffersMessageComposer.java

@@ -9,11 +9,11 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 
 import java.util.List;
 
-public class ClubDataComposer extends MessageComposer {
+public class HabboClubOffersMessageComposer extends MessageComposer {
     private final int windowId;
     private final Habbo habbo;
 
-    public ClubDataComposer(Habbo habbo, int windowId) {
+    public HabboClubOffersMessageComposer(Habbo habbo, int windowId) {
         this.habbo = habbo;
         this.windowId = windowId;
     }

src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/GotMysteryBoxPrizeMessageComposer.java

@@ -4,11 +4,11 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class MysticBoxPrizeComposer extends MessageComposer {
+public class GotMysteryBoxPrizeMessageComposer extends MessageComposer {
     private final String type;
     private final int itemId;
 
-    public MysticBoxPrizeComposer(String type, int itemId) {
+    public GotMysteryBoxPrizeMessageComposer(String type, int itemId) {
         this.type = type;
         this.itemId = itemId;
     }

src/main/java/com/eu/habbo/messages/outgoing/friends/HabboSearchResultComposer.java

@@ -11,14 +11,14 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-public class UserSearchResultComposer extends MessageComposer {
+public class HabboSearchResultComposer extends MessageComposer {
     private final THashSet<MessengerBuddy> users;
     private final THashSet<MessengerBuddy> friends;
     private final Habbo habbo;
 
     private static Comparator COMPARATOR = Comparator.comparing((MessengerBuddy b) -> b.getUsername().length()).thenComparing((MessengerBuddy b, MessengerBuddy b2) -> b.getUsername().compareToIgnoreCase(b2.getUsername()));
 
-    public UserSearchResultComposer(THashSet<MessengerBuddy> users, THashSet<MessengerBuddy> friends, Habbo habbo) {
+    public HabboSearchResultComposer(THashSet<MessengerBuddy> users, THashSet<MessengerBuddy> friends, Habbo habbo) {
         this.users = users;
         this.friends = friends;
         this.habbo = habbo;
@@ -37,8 +37,8 @@ public class UserSearchResultComposer extends MessageComposer {
 
         List<MessengerBuddy> friends = new ArrayList<>(this.friends);
 
-        u.sort(UserSearchResultComposer.COMPARATOR);
+        u.sort(HabboSearchResultComposer.COMPARATOR);
-        friends.sort(UserSearchResultComposer.COMPARATOR);
+        friends.sort(HabboSearchResultComposer.COMPARATOR);
 
         this.response.appendInt(this.friends.size());
         for (MessengerBuddy buddy : this.friends) {

src/main/java/com/eu/habbo/messages/outgoing/gamecenter/Game2AccountGameStatusMessageComposer.java

@@ -4,11 +4,11 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GameCenterAccountInfoComposer extends MessageComposer {
+public class Game2AccountGameStatusMessageComposer extends MessageComposer {
     private final int gameId;
     private final int gamesLeft;
 
-    public GameCenterAccountInfoComposer(int gameId, int gamesLeft) {
+    public Game2AccountGameStatusMessageComposer(int gameId, int gamesLeft) {
         this.gameId = gameId;
         this.gamesLeft = gamesLeft;
     }

src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameListMessageComposer.java

@@ -5,7 +5,7 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GameCenterGameListComposer extends MessageComposer {
+public class GameListMessageComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
         this.response.init(Outgoing.GameListMessageComposer);

src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorComposer.java

@@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GenericErrorMessagesComposer extends MessageComposer {
+public class GenericErrorComposer extends MessageComposer {
     public static final int AUTHENTICATION_FAILED = -3;
     public static final int CONNECTING_TO_THE_SERVER_FAILED = -400;
     public static final int KICKED_OUT_OF_THE_ROOM = 4008;
@@ -15,7 +15,7 @@ public class GenericErrorMessagesComposer extends MessageComposer {
 
     private final int errorCode;
 
-    public GenericErrorMessagesComposer(int errorCode) {
+    public GenericErrorComposer(int errorCode) {
         this.errorCode = errorCode;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HabboBroadcastMessageComposer.java

@@ -5,14 +5,14 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GenericAlertComposer extends MessageComposer {
+public class HabboBroadcastMessageComposer extends MessageComposer {
     private final String message;
 
-    public GenericAlertComposer(String message) {
+    public HabboBroadcastMessageComposer(String message) {
         this.message = message;
     }
 
-    public GenericAlertComposer(String message, Habbo habbo) {
+    public HabboBroadcastMessageComposer(String message, Habbo habbo) {
         this.message = message.replace("%username%", habbo.getHabboInfo().getUsername());
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guides/GuideOnDutyStatusMessageComposer.java

@@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuideToolsComposer extends MessageComposer {
+public class GuideOnDutyStatusMessageComposer extends MessageComposer {
     private final boolean onDuty;
 
-    public GuideToolsComposer(boolean onDuty) {
+    public GuideOnDutyStatusMessageComposer(boolean onDuty) {
         this.onDuty = onDuty;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedMessageComposer.java

@@ -6,11 +6,11 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuideSessionAttachedComposer extends MessageComposer {
+public class GuideSessionAttachedMessageComposer extends MessageComposer {
     private final GuideTour tour;
     private final boolean isHelper;
 
-    public GuideSessionAttachedComposer(GuideTour tour, boolean isHelper) {
+    public GuideSessionAttachedMessageComposer(GuideTour tour, boolean isHelper) {
         this.tour = tour;
         this.isHelper = isHelper;
     }

src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedMessageComposer.java

@@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuideSessionDetachedComposer extends MessageComposer {
+public class GuideSessionDetachedMessageComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
         this.response.init(Outgoing.GuideSessionDetachedMessageComposer);

src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedMessageComposer.java

@@ -4,13 +4,13 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuideSessionEndedComposer extends MessageComposer {
+public class GuideSessionEndedMessageComposer extends MessageComposer {
     public static final int SOMETHING_WRONG = 0;
     public static final int HELP_CASE_CLOSED = 1;
 
     private final int errorCode;
 
-    public GuideSessionEndedComposer(int errorCode) {
+    public GuideSessionEndedMessageComposer(int errorCode) {
         this.errorCode = errorCode;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorMessageComposer.java

@@ -4,14 +4,14 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuideSessionErrorComposer extends MessageComposer {
+public class GuideSessionErrorMessageComposer extends MessageComposer {
     public static final int SOMETHING_WRONG_REQUEST = 0;
     public static final int NO_HELPERS_AVAILABLE = 1;
     public static final int NO_GUARDIANS_AVAILABLE = 2;
 
     private final int errorCode;
 
-    public GuideSessionErrorComposer(int errorCode) {
+    public GuideSessionErrorMessageComposer(int errorCode) {
         this.errorCode = errorCode;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomMessageComposer.java

@@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuideSessionInvitedToGuideRoomComposer extends MessageComposer {
+public class GuideSessionInvitedToGuideRoomMessageComposer extends MessageComposer {
     private final Room room;
 
-    public GuideSessionInvitedToGuideRoomComposer(Room room) {
+    public GuideSessionInvitedToGuideRoomMessageComposer(Room room) {
         this.room = room;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageMessageComposer.java

@@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuideSessionMessageComposer extends MessageComposer {
+public class GuideSessionMessageMessageComposer extends MessageComposer {
     private final GuideChatMessage message;
 
-    public GuideSessionMessageComposer(GuideChatMessage message) {
+    public GuideSessionMessageMessageComposer(GuideChatMessage message) {
         this.message = message;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomMessageComposer.java

@@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuideSessionRequesterRoomComposer extends MessageComposer {
+public class GuideSessionRequesterRoomMessageComposer extends MessageComposer {
     private final Room room;
 
-    public GuideSessionRequesterRoomComposer(Room room) {
+    public GuideSessionRequesterRoomMessageComposer(Room room) {
         this.room = room;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guides/GuideTicketResolutionMessageComposer.java

@@ -4,13 +4,13 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class BullyReportClosedComposer extends MessageComposer {
+public class GuideTicketResolutionMessageComposer extends MessageComposer {
     public final static int CLOSED = 1;
     public final static int MISUSE = 2;
 
     public final int code;
 
-    public BullyReportClosedComposer(int code) {
+    public GuideTicketResolutionMessageComposer(int code) {
         this.code = code;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreatedMessageComposer.java

@@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuildBoughtComposer extends MessageComposer {
+public class GuildCreatedMessageComposer extends MessageComposer {
     private final Guild guild;
 
-    public GuildBoughtComposer(Guild guild) {
+    public GuildCreatedMessageComposer(Guild guild) {
         this.guild = guild;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreationInfoMessageComposer.java

@@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 import gnu.trove.set.hash.THashSet;
 
-public class GuildBuyRoomsComposer extends MessageComposer {
+public class GuildCreationInfoMessageComposer extends MessageComposer {
     private final THashSet<Room> rooms;
 
-    public GuildBuyRoomsComposer(THashSet<Room> rooms) {
+    public GuildCreationInfoMessageComposer(THashSet<Room> rooms) {
         this.rooms = rooms;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailedMessageComposer.java

@@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuildEditFailComposer extends MessageComposer {
+public class GuildEditFailedMessageComposer extends MessageComposer {
     public static final int ROOM_ALREADY_IN_USE = 0;
     public static final int INVALID_GUILD_NAME = 1;
     public static final int HC_REQUIRED = 2;
@@ -12,7 +12,7 @@ public class GuildEditFailComposer extends MessageComposer {
 
     private int errorCode;
 
-    public GuildEditFailComposer(int errorCode) {
+    public GuildEditFailedMessageComposer(int errorCode) {
         this.errorCode = errorCode;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditInfoMessageComposer.java

@@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuildManageComposer extends MessageComposer {
+public class GuildEditInfoMessageComposer extends MessageComposer {
     private final Guild guild;
 
-    public GuildManageComposer(Guild guild) {
+    public GuildEditInfoMessageComposer(Guild guild) {
         this.guild = guild;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditorDataMessageComposer.java

@@ -6,7 +6,7 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuildPartsComposer extends MessageComposer {
+public class GuildEditorDataMessageComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
         this.response.init(Outgoing.GuildEditorDataMessageComposer);

src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniContextMenuInfoMessageComposer.java

@@ -8,12 +8,12 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class GuildFurniWidgetComposer extends MessageComposer {
+public class GuildFurniContextMenuInfoMessageComposer extends MessageComposer {
     private final HabboItem item;
     private final Guild guild;
     private final Habbo habbo;
 
-    public GuildFurniWidgetComposer(Habbo habbo, Guild guild, HabboItem item) {
+    public GuildFurniContextMenuInfoMessageComposer(Habbo habbo, Guild guild, HabboItem item) {
         this.habbo = habbo;
         this.item = item;
         this.guild = guild;