Refactored all outgoing composer names beginning with G

src/main/java/com/eu/habbo/habbohotel/bots/Bot.java

@@ -220,7 +220,7 @@ public class Bot implements Runnable {
             this.room.botChat(new ChatMessageComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId()))).compose());
 
             if (message.equals("o/") || message.equals("_o/")) {
-                this.room.sendComposer(new RoomUserActionComposer(this.roomUnit, RoomUserAction.WAVE).compose());
+                this.room.sendComposer(new ExpressionMessageComposer(this.roomUnit, RoomUserAction.WAVE).compose());
             }
         }
     }
@@ -235,7 +235,7 @@ public class Bot implements Runnable {
             this.room.botChat(new RoomUserShoutComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId()))).compose());
 
             if (message.equals("o/") || message.equals("_o/")) {
-                this.room.sendComposer(new RoomUserActionComposer(this.roomUnit, RoomUserAction.WAVE).compose());
+                this.room.sendComposer(new ExpressionMessageComposer(this.roomUnit, RoomUserAction.WAVE).compose());
             }
         }
     }

src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java

@@ -13,7 +13,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTile;
 import com.eu.habbo.habbohotel.rooms.RoomUserAction;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.habbohotel.users.HabboItem;
-import com.eu.habbo.messages.outgoing.rooms.users.RoomUserActionComposer;
+import com.eu.habbo.messages.outgoing.rooms.users.ExpressionMessageComposer;
 import com.eu.habbo.threading.runnables.BattleBanzaiTilesFlicker;
 import gnu.trove.map.hash.THashMap;
 import gnu.trove.set.hash.THashSet;
@@ -193,7 +193,7 @@ public class BattleBanzaiGame extends Game {
             if (!singleTeamGame) {
                 for (GamePlayer player : winningTeam.getMembers()) {
                     if (player.getScoreAchievementValue() > 0) {
-                        this.room.sendComposer(new RoomUserActionComposer(player.getHabbo().getRoomUnit(), RoomUserAction.WAVE).compose());
+                        this.room.sendComposer(new ExpressionMessageComposer(player.getHabbo().getRoomUnit(), RoomUserAction.WAVE).compose());
                         AchievementManager.progressAchievement(player.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("BattleBallWinner"));
                     }
                 }

src/main/java/com/eu/habbo/habbohotel/games/football/FootballGame.java

@@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomUnit;
 import com.eu.habbo.habbohotel.rooms.RoomUserAction;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.messages.outgoing.rooms.users.RoomUserActionComposer;
+import com.eu.habbo.messages.outgoing.rooms.users.ExpressionMessageComposer;
 
 import java.util.Map;
 
@@ -43,7 +43,7 @@ public class FootballGame extends Game {
             }
         }
 
-        this.room.sendComposer(new RoomUserActionComposer(kicker, RoomUserAction.WAVE).compose());
+        this.room.sendComposer(new ExpressionMessageComposer(kicker, RoomUserAction.WAVE).compose());
 
         for (Map.Entry<Integer, InteractionFootballScoreboard> scoreBoard : this.room.getRoomSpecialTypes().getFootballScoreboards(team).entrySet()) {
             scoreBoard.getValue().changeScore(1);

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

@@ -15,7 +15,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTile;
 import com.eu.habbo.habbohotel.rooms.RoomUserAction;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.habbohotel.users.HabboItem;
-import com.eu.habbo.messages.outgoing.rooms.users.RoomUserActionComposer;
+import com.eu.habbo.messages.outgoing.rooms.users.ExpressionMessageComposer;
 import com.eu.habbo.plugin.EventHandler;
 import com.eu.habbo.plugin.events.emulator.EmulatorConfigUpdatedEvent;
 import com.eu.habbo.threading.runnables.freeze.FreezeClearEffects;
@@ -290,7 +290,7 @@ public class FreezeGame extends Game {
                 if (p.getScoreAchievementValue() > 0) {
                     if (team.equals(winningTeam)) {
                         AchievementManager.progressAchievement(p.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("FreezeWinner"), p.getScoreAchievementValue());
-                        this.room.sendComposer(new RoomUserActionComposer(p.getHabbo().getRoomUnit(), RoomUserAction.WAVE).compose());
+                        this.room.sendComposer(new ExpressionMessageComposer(p.getHabbo().getRoomUnit(), RoomUserAction.WAVE).compose());
                     }
 
                     AchievementManager.progressAchievement(p.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("FreezePlayer"));

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

@@ -466,7 +466,7 @@ public class Habbo implements Runnable {
             this.client.getHabbo().getHabboStats().respectPointsGiven++;
             this.client.getHabbo().getHabboStats().respectPointsToGive--;
             this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserRespectComposer(target).compose());
-            this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserActionComposer(this.client.getHabbo().getRoomUnit(), RoomUserAction.THUMB_UP).compose());
+            this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new ExpressionMessageComposer(this.client.getHabbo().getRoomUnit(), RoomUserAction.THUMB_UP).compose());
 
             AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("RespectGiven"));
             AchievementManager.progressAchievement(target, Emulator.getGameEnvironment().getAchievementManager().getAchievement("RespectEarned"));

src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveFavoriteEvent.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.GuildFavoriteRoomUserUpdateComposer;
-import com.eu.habbo.messages.outgoing.users.UserProfileComposer;
+import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildRemovedFavoriteEvent;
 
 public class GuildRemoveFavoriteEvent extends MessageHandler {
@@ -25,7 +25,7 @@ public class GuildRemoveFavoriteEvent extends MessageHandler {
                 this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new GuildFavoriteRoomUserUpdateComposer(this.client.getHabbo().getRoomUnit(), null).compose());
             }
 
-            this.client.sendResponse(new UserProfileComposer(this.client.getHabbo(), this.client));
+            this.client.sendResponse(new ExtendedProfileMessageComposer(this.client.getHabbo(), this.client));
         }
     }
 }

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

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.guilds.Guild;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.GuildFavoriteRoomUserUpdateComposer;
 import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersAddGuildBadgeComposer;
-import com.eu.habbo.messages.outgoing.users.UserProfileComposer;
+import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildFavoriteSetEvent;
 
 public class GuildSetFavoriteEvent extends MessageHandler {
@@ -31,7 +31,7 @@ public class GuildSetFavoriteEvent extends MessageHandler {
                 }
             }
 
-            this.client.sendResponse(new UserProfileComposer(this.client.getHabbo(), this.client));
+            this.client.sendResponse(new ExtendedProfileMessageComposer(this.client.getHabbo(), this.client));
         }
     }
 }

src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumListEvent.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.forums.GuildForumListComposer;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 import gnu.trove.set.hash.THashSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,7 +65,7 @@ public class GuildForumListEvent extends MessageHandler {
             }
         } catch (SQLException e) {
             LOGGER.error("Caught SQL exception", e);
-            this.client.sendResponse(new ConnectionErrorComposer(500));
+            this.client.sendResponse(new ErrorReportComposer(500));
         }
 
         return guilds;
@@ -89,7 +89,7 @@ public class GuildForumListEvent extends MessageHandler {
             }
         } catch (SQLException e) {
             LOGGER.error("Caught SQL exception", e);
-            this.client.sendResponse(new ConnectionErrorComposer(500));
+            this.client.sendResponse(new ErrorReportComposer(500));
         }
 
         return guilds;

src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateMessageEvent.java

@@ -12,7 +12,7 @@ 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.guilds.forums.PostUpdateMessageComposer;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 
 public class GuildForumModerateMessageEvent extends MessageHandler {
@@ -27,13 +27,13 @@ public class GuildForumModerateMessageEvent extends MessageHandler {
         ForumThread thread = ForumThread.getById(threadId);
 
         if (guild == null || thread == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(404));
+            this.client.sendResponse(new ErrorReportComposer(404));
             return;
         }
 
         ForumThreadComment comment = thread.getCommentById(messageId);
         if (comment == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(404));
+            this.client.sendResponse(new ErrorReportComposer(404));
             return;
         }
 
@@ -41,19 +41,19 @@ public class GuildForumModerateMessageEvent extends MessageHandler {
 
         GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, this.client.getHabbo().getHabboInfo().getId());
         if (member == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(401));
+            this.client.sendResponse(new ErrorReportComposer(401));
             return;
         }
 
         boolean isGuildAdministrator = (guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || member.getRank().equals(GuildRank.ADMIN));
 
         if (!isGuildAdministrator && !hasStaffPermissions) {
-            this.client.sendResponse(new ConnectionErrorComposer(403));
+            this.client.sendResponse(new ErrorReportComposer(403));
             return;
         }
 
         if (state == ForumThreadState.HIDDEN_BY_GUILD_ADMIN.getStateId() && !hasStaffPermissions) {
-            this.client.sendResponse(new ConnectionErrorComposer(403));
+            this.client.sendResponse(new ErrorReportComposer(403));
             return;
         }
 

src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateThreadEvent.java

@@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
 import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadMessagesComposer;
 import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadsComposer;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 
 public class GuildForumModerateThreadEvent extends MessageHandler {
@@ -28,7 +28,7 @@ public class GuildForumModerateThreadEvent extends MessageHandler {
         ForumThread thread = ForumThread.getById(threadId);
 
         if (guild == null || thread == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(404));
+            this.client.sendResponse(new ErrorReportComposer(404));
             return;
         }
 
@@ -38,15 +38,15 @@ public class GuildForumModerateThreadEvent extends MessageHandler {
 
 
         if (member == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(401));
+            this.client.sendResponse(new ErrorReportComposer(401));
             return;
         }
         if (!isGuildAdmin && !hasStaffPerms) {
-            this.client.sendResponse(new ConnectionErrorComposer(403));
             return;
         }
 
         thread.setState(ForumThreadState.fromValue(state)); // sets state as defined in the packet
+        thread.setAdminId(this.client.getHabbo().getHabboInfo().getId());
         thread.run();
 
         switch (state) {

src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java

@@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumAddCommentComposer;
 import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadMessagesComposer;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 
 public class GuildForumPostThreadEvent extends MessageHandler {
@@ -30,12 +30,12 @@ public class GuildForumPostThreadEvent extends MessageHandler {
         Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId);
 
         if (guild == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(404));
+            this.client.sendResponse(new ErrorReportComposer(404));
             return;
         }
 
         if (message.length() < 10 || message.length() > 4000 || (threadId == 0 && (subject.length() < 10 || subject.length() > 120))) {
-            this.client.sendResponse(new ConnectionErrorComposer(400));
+            this.client.sendResponse(new ErrorReportComposer(400));
             return;
         }
 
@@ -51,7 +51,7 @@ public class GuildForumPostThreadEvent extends MessageHandler {
                     || (guild.canPostThreads().state == 2 && member != null && (member.getRank().type < GuildRank.MEMBER.type))
                     || (guild.canPostThreads().state == 3 && guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId())
                     || isStaff)) {
-                this.client.sendResponse(new ConnectionErrorComposer(403));
+                this.client.sendResponse(new ErrorReportComposer(403));
                 return;
             }
 
@@ -59,7 +59,7 @@ public class GuildForumPostThreadEvent extends MessageHandler {
             thread = ForumThread.create(guild, this.client.getHabbo(), subject, message);
 
             if (thread == null) {
-                this.client.sendResponse(new ConnectionErrorComposer(500));
+                this.client.sendResponse(new ErrorReportComposer(500));
                 return;
             }
 
@@ -70,7 +70,7 @@ public class GuildForumPostThreadEvent extends MessageHandler {
         }
 
         if (thread == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(404));
+            this.client.sendResponse(new ErrorReportComposer(404));
             return;
         }
 
@@ -80,7 +80,7 @@ public class GuildForumPostThreadEvent extends MessageHandler {
                 || (guild.canPostMessages().state == 2 && member != null && (member.getRank().type < GuildRank.MEMBER.type))
                 || (guild.canPostMessages().state == 3 && guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId())
                 || isStaff)) {
-            this.client.sendResponse(new ConnectionErrorComposer(403));
+            this.client.sendResponse(new ErrorReportComposer(403));
             return;
         }
 
@@ -93,7 +93,7 @@ public class GuildForumPostThreadEvent extends MessageHandler {
             thread.setPostsCount(thread.getPostsCount() + 1);
             this.client.sendResponse(new GuildForumAddCommentComposer(comment));
         } else {
-            this.client.sendResponse(new ConnectionErrorComposer(500));
+            this.client.sendResponse(new ErrorReportComposer(500));
         }
     }
 }

src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadUpdateEvent.java

@@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
 import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadsComposer;
 import com.eu.habbo.messages.outgoing.guilds.forums.ThreadUpdatedMessageComposer;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 public class GuildForumThreadUpdateEvent extends MessageHandler {
     @Override
@@ -26,7 +26,7 @@ public class GuildForumThreadUpdateEvent extends MessageHandler {
         ForumThread thread = ForumThread.getById(threadId);
 
         if (guild == null || thread == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(404));
+            this.client.sendResponse(new ErrorReportComposer(404));
             return;
         }
 
@@ -34,14 +34,14 @@ public class GuildForumThreadUpdateEvent extends MessageHandler {
 
         GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, this.client.getHabbo().getHabboInfo().getId());
         if (member == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(401));
+            this.client.sendResponse(new ErrorReportComposer(401));
             return;
         }
 
         boolean isAdmin = (guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || member.getRank().type < GuildRank.MEMBER.type);
 
         if ((guild.canModForum() == SettingsState.OWNER && guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() && !isStaff) || (guild.canModForum() == SettingsState.ADMINS && !isAdmin && !isStaff)) {
-            this.client.sendResponse(new ConnectionErrorComposer(403));
+            this.client.sendResponse(new ErrorReportComposer(403));
             return;
         }
 

src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsEvent.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.guilds.Guild;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumDataComposer;
 import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadsComposer;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 public class GuildForumThreadsEvent extends MessageHandler {
     @Override
@@ -16,7 +16,7 @@ public class GuildForumThreadsEvent extends MessageHandler {
         Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId);
 
         if (guild == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(404));
+            this.client.sendResponse(new ErrorReportComposer(404));
             return;
         }
 

src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsMessagesEvent.java

@@ -13,7 +13,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
 import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumCommentsComposer;
 import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumDataComposer;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 
 
@@ -30,7 +30,7 @@ public class GuildForumThreadsMessagesEvent extends MessageHandler {
         ForumThread thread = ForumThread.getById(threadId);
         boolean hasStaffPermissions = this.client.getHabbo().hasPermission(Permission.ACC_MODTOOL_TICKET_Q);
         if (guild == null || thread == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(404));
+            this.client.sendResponse(new ErrorReportComposer(404));
             return;
         }
         GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, this.client.getHabbo().getHabboInfo().getId());

src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumUpdateSettingsEvent.java

@@ -7,7 +7,7 @@ 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.guilds.forums.GuildForumDataComposer;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 public class GuildForumUpdateSettingsEvent extends MessageHandler {
     @Override
@@ -21,12 +21,12 @@ public class GuildForumUpdateSettingsEvent extends MessageHandler {
         Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId);
 
         if (guild == null) {
-            this.client.sendResponse(new ConnectionErrorComposer(404));
+            this.client.sendResponse(new ErrorReportComposer(404));
             return;
         }
 
         if (guild.getOwnerId() != this.client.getHabbo().getHabboInfo().getId()) {
-            this.client.sendResponse(new ConnectionErrorComposer(403));
+            this.client.sendResponse(new ErrorReportComposer(403));
             return;
         }
 

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

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.items.YoutubeManager;
 import com.eu.habbo.habbohotel.items.interactions.InteractionYoutubeTV;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeDisplayListComposer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,7 +29,7 @@ public class YoutubeRequestPlaylists extends MessageHandler {
 
                 if (playlists == null) {
                     LOGGER.error("No YouTube playlists set for base item #" + item.getBaseItem().getId());
-                    this.client.sendResponse(new ConnectionErrorComposer(1000));
+                    this.client.sendResponse(new ErrorReportComposer(1000));
                     return;
                 }
 

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

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomUserAction;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.rooms.users.RoomUserActionComposer;
+import com.eu.habbo.messages.outgoing.rooms.users.ExpressionMessageComposer;
 import com.eu.habbo.plugin.events.users.UserIdleEvent;
 
 public class RoomUserActionEvent extends MessageHandler {
@@ -50,7 +50,7 @@ public class RoomUserActionEvent extends MessageHandler {
 
             }
 
-            room.sendComposer(new RoomUserActionComposer(habbo.getRoomUnit(), RoomUserAction.fromValue(action)).compose());
+            room.sendComposer(new ExpressionMessageComposer(habbo.getRoomUnit(), RoomUserAction.fromValue(action)).compose());
         }
     }
 }

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

@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.habbohotel.users.HabboManager;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.users.UserProfileComposer;
+import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer;
 
 public class RequestUserProfileEvent extends MessageHandler {
     @Override
@@ -13,8 +13,8 @@ public class RequestUserProfileEvent extends MessageHandler {
         Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(habboId);
 
         if (habbo != null)
-            this.client.sendResponse(new UserProfileComposer(habbo, this.client));
+            this.client.sendResponse(new ExtendedProfileMessageComposer(habbo, this.client));
         else
-            this.client.sendResponse(new UserProfileComposer(HabboManager.getOfflineHabboInfo(habboId), this.client));
+            this.client.sendResponse(new ExtendedProfileMessageComposer(HabboManager.getOfflineHabboInfo(habboId), this.client));
     }
 }

src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java

@@ -11,7 +11,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 import gnu.trove.set.hash.THashSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -161,7 +161,7 @@ public class GuildForumDataComposer extends MessageComposer {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return new ConnectionErrorComposer(500).compose();
+            return new ErrorReportComposer(500).compose();
         }
 
         return this.response;

src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java

@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.guilds.forums.ForumThread;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
-import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer;
+import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,7 +28,7 @@ public class GuildForumThreadsComposer extends MessageComposer {
         try {
             threads = new ArrayList<>(ForumThread.getByGuildId(guild.getId()));
         } catch (Exception e) {
-            return new ConnectionErrorComposer(500).compose();
+            return new ErrorReportComposer(500).compose();
         }
 
         threads.sort(Comparator.comparingInt(o -> o.isPinned() ? Integer.MAX_VALUE : o.getUpdatedAt()));

src/main/java/com/eu/habbo/messages/outgoing/handshake/ErrorReportComposer.java

@@ -4,18 +4,18 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class ConnectionErrorComposer extends MessageComposer {
+public class ErrorReportComposer extends MessageComposer {
     private final int messageId;
     private final int errorCode;
     private final String timestamp;
 
-    public ConnectionErrorComposer(int errorCode) {
+    public ErrorReportComposer(int errorCode) {
         this.messageId = 0;
         this.errorCode = errorCode;
         this.timestamp = "";
     }
 
-    public ConnectionErrorComposer(int messageId, int errorCode, String timestamp) {
+    public ErrorReportComposer(int messageId, int errorCode, String timestamp) {
         this.messageId = messageId;
         this.errorCode = errorCode;
         this.timestamp = timestamp;

src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ExpressionMessageComposer.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 RoomUserActionComposer extends MessageComposer {
+public class ExpressionMessageComposer extends MessageComposer {
     private RoomUserAction action;
     private RoomUnit roomUnit;
 
-    public RoomUserActionComposer(RoomUnit roomUnit, RoomUserAction action) {
+    public ExpressionMessageComposer(RoomUnit roomUnit, RoomUserAction action) {
         this.roomUnit = roomUnit;
         this.action = action;
     }

src/main/java/com/eu/habbo/messages/outgoing/unknown/ElementPointerMessageComposer.java

@@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class UnknownHintComposer extends MessageComposer {
+public class ElementPointerMessageComposer extends MessageComposer {
     private final String key;
 
-    public UnknownHintComposer(String key) {
+    public ElementPointerMessageComposer(String key) {
         this.key = key;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/unknown/EmailStatusResultComposer.java

@@ -4,12 +4,12 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class TalentTrackEmailVerifiedComposer extends MessageComposer {
+public class EmailStatusResultComposer extends MessageComposer {
     private final String email;
     private final boolean unknownB1;
     private final boolean unknownB2;
 
-    public TalentTrackEmailVerifiedComposer(String email, boolean unknownB1, boolean unknownB2) {
+    public EmailStatusResultComposer(String email, boolean unknownB1, boolean unknownB2) {
         this.email = email;
         this.unknownB1 = unknownB1;
         this.unknownB2 = unknownB2;

src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupMessageComposer.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 EpicPopupFrameComposer extends MessageComposer {
+public class EpicPopupMessageComposer extends MessageComposer {
     public static final String LIBRARY_URL = "${image.library.url}";
     private final String assetURI;
 
-    public EpicPopupFrameComposer(String assetURI) {
+    public EpicPopupMessageComposer(String assetURI) {
         this.assetURI = assetURI;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendedProfileChangedMessageComposer.java

@@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class UnknownGuildComposer3 extends MessageComposer {
+public class ExtendedProfileChangedMessageComposer extends MessageComposer {
     private final int userId;
 
-    public UnknownGuildComposer3(int userId) {
+    public ExtendedProfileChangedMessageComposer(int userId) {
         this.userId = userId;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/users/ExtendedProfileMessageComposer.java

@@ -21,19 +21,19 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-public class UserProfileComposer extends MessageComposer {
+public class ExtendedProfileMessageComposer extends MessageComposer {
-    private static final Logger LOGGER = LoggerFactory.getLogger(UserProfileComposer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExtendedProfileMessageComposer.class);
 
     private final HabboInfo habboInfo;
     private Habbo habbo;
     private GameClient viewer;
 
-    public UserProfileComposer(HabboInfo habboInfo, GameClient viewer) {
+    public ExtendedProfileMessageComposer(HabboInfo habboInfo, GameClient viewer) {
         this.habboInfo = habboInfo;
         this.viewer = viewer;
     }
 
-    public UserProfileComposer(Habbo habbo, GameClient viewer) {
+    public ExtendedProfileMessageComposer(Habbo habbo, GameClient viewer) {
         this.habbo = habbo;
         this.habboInfo = habbo.getHabboInfo();
         this.viewer = viewer;