From f1af67522a9f5ea2d69809efe30d2d9db96dab0d Mon Sep 17 00:00:00 2001
From: Harmonic <harmonicrain2016@gmail.com>
Date: Fri, 22 Apr 2022 07:32:22 -0700
Subject: [PATCH] Finished refactoring incoming.java

incoming and outgoing packets now match habbo's official names 1:1
---
 .../java/com/eu/habbo/core/CleanerThread.java |   8 +-
 .../catalog/marketplace/MarketPlace.java      |   8 +-
 .../habbo/habbohotel/rooms/RoomManager.java   |   4 +-
 .../com/eu/habbo/messages/PacketManager.java  | 726 +++++++++---------
 ...tsEvent.java => GetAchievementsEvent.java} |   2 +-
 ...ndEvent.java => AmbassadorAlertEvent.java} |   2 +-
 ...mmandEvent.java => FollowFriendEvent.java} |   2 +-
 ...ToWebEvent.java => PublishPhotoEvent.java} |  10 +-
 ...haseEvent.java => PurchasePhotoEvent.java} |  12 +-
 ...PictureEvent.java => RenderRoomEvent.java} |   2 +-
 ...ent.java => RenderRoomThumbnailEvent.java} |   2 +-
 ...etNameEvent.java => ApproveNameEvent.java} |   2 +-
 ...va => BuildersClubPlaceWallItemEvent.java} |   4 +-
 ... => BuildersClubQueryFurniCountEvent.java} |   2 +-
 ...ava => GetBundleDiscountRulesetEvent.java} |   2 +-
 ...deEvent.java => GetCatalogIndexEvent.java} |   2 +-
 ...ageEvent.java => GetCatalogPageEvent.java} |   2 +-
 ...ubGiftsEvent.java => GetClubGiftInfo.java} |   2 +-
 ...DataEvent.java => GetClubOffersEvent.java} |   2 +-
 ...=> GetGiftWrappingConfigurationEvent.java} |   2 +-
 ... => GetMarketplaceConfigurationEvent.java} |   2 +-
 ...Event.java => GetOfficialSongIdEvent.java} |   2 +-
 ...emEvent.java => GetProductOfferEvent.java} |   2 +-
 ....java => GetSellablePetPalettesEvent.java} |   2 +-
 ...ckDataEvent.java => GetSongInfoEvent.java} |   2 +-
 ...va => PurchaseFromCatalogAsGiftEvent.java} |   4 +-
 ...ent.java => PurchaseFromCatalogEvent.java} |   6 +-
 ...t.java => PurchaseTargetedOfferEvent.java} |   2 +-
 ... PurchaseVipMembershipExtensionEvent.java} |   4 +-
 ...iftEvent.java => SelectClubGiftEvent.java} |   4 +-
 ...t.java => SetTargetedOfferStateEvent.java} |   2 +-
 ...ent.java => BuyMarketplaceOfferEvent.java} |   2 +-
 ....java => CancelMarketplaceOfferEvent.java} |   2 +-
 ...a => GetMarketplaceCanMakeOfferEvent.java} |   2 +-
 ...java => GetMarketplaceItemStatsEvent.java} |   2 +-
 ...nt.java => GetMarketplaceOffersEvent.java} |   2 +-
 ...java => GetMarketplaceOwnOffersEvent.java} |   2 +-
 ...SellItemEvent.java => MakeOfferEvent.java} |   4 +-
 ...> RedeemMarketplaceOfferCreditsEvent.java} |   2 +-
 ...Event.java => GetRecyclerPrizesEvent.java} |   2 +-
 ...Event.java => GetRecyclerStatusEvent.java} |   2 +-
 ...cleBoxEvent.java => PresentOpenEvent.java} |   2 +-
 ...cycleEvent.java => RecycleItemsEvent.java} |   2 +-
 ...ingCraftItemEvent.java => CraftEvent.java} |   4 +-
 ...SecretEvent.java => CraftSecretEvent.java} |   2 +-
 ...nt.java => GetCraftableProductsEvent.java} |   2 +-
 ...Event.java => GetCraftingRecipeEvent.java} |   2 +-
 ... => GetCraftingRecipesAvailableEvent.java} |   2 +-
 ...OpenCampaignCalendarDoorAsStaffEvent.java} |   2 +-
 ...ava => OpenCampaignCalendarDoorEvent.java} |   2 +-
 ...sEvent.java => GetOccupiedTilesEvent.java} |   2 +-
 ...sEvent.java => GetRoomEntryTileEvent.java} |   2 +-
 ...t.java => UpdateFloorPropertiesEvent.java} |   2 +-
 ...questEvent.java => AcceptFriendEvent.java} |   4 +-
 ...uestEvent.java => DeclineFriendEvent.java} |   2 +-
 ...Event.java => GetFriendRequestsEvent.java} |   2 +-
 ...estFriendsEvent.java => GetMOTDEvent.java} |   2 +-
 ...chUserEvent.java => HabboSearchEvent.java} |   2 +-
 ...endsEvent.java => MessengerInitEvent.java} |   2 +-
 ...uestEvent.java => RequestFriendEvent.java} |   4 +-
 ...ateMessageEvent.java => SendMsgEvent.java} |   2 +-
 ...ndsEvent.java => SendRoomInviteEvent.java} |   2 +-
 ...t.java => SetRelationshipStatusEvent.java} |   2 +-
 ...lkFriendEvent.java => VisitUserEvent.java} |   2 +-
 ...va => Game2GetAccountGameStatusEvent.java} |   2 +-
 ...eGameEvent.java => GameUnloadedEvent.java} |   2 +-
 ...tGamesEvent.java => GetGameListEvent.java} |   2 +-
 ...atusEvent.java => GetGameStatusEvent.java} |   2 +-
 ...ent.java => GetWeeklyGameRewardEvent.java} |   2 +-
 ...a => GetWeeklyGameRewardWinnersEvent.java} |   2 +-
 ...JoinGameEvent.java => JoinQueueEvent.java} |   2 +-
 ...> ChatReviewGuideDecidesOnOfferEvent.java} |   2 +-
 ...java => ChatReviewGuideDetachedEvent.java} |   2 +-
 ...ent.java => ChatReviewGuideVoteEvent.java} |   4 +-
 ...vent.java => GuideSessionCreateEvent.java} |   2 +-
 ...nt.java => GuideSessionFeedbackEvent.java} |   2 +-
 ...=> GuideSessionGetRequesterRoomEvent.java} |   2 +-
 ...ava => GuideSessionGuideDecidesEvent.java} |   2 +-
 ... => GuideSessionInviteRequesterEvent.java} |   2 +-
 ...nt.java => GuideSessionIsTypingEvent.java} |   2 +-
 ...ent.java => GuideSessionMessageEvent.java} |   2 +-
 ...ava => GuideSessionOnDutyUpdateEvent.java} |   2 +-
 ...vent.java => GuideSessionReportEvent.java} |   2 +-
 ...=> GuideSessionRequesterCancelsEvent.java} |   2 +-
 ...nt.java => GuideSessionResolvedEvent.java} |   2 +-
 ....java => AddAdminRightsToMemberEvent.java} |   2 +-
 ...ava => ApproveMembershipRequestEvent.java} |   2 +-
 ...ildBuyEvent.java => CreateGuildEvent.java} |   4 +-
 ...teEvent.java => DeactivateGuildEvent.java} |   2 +-
 ... => DeselectFavouriteHabboGroupEvent.java} |   2 +-
 ...nt.java => GetGuildCreationInfoEvent.java} |   2 +-
 ...eEvent.java => GetGuildEditInfoEvent.java} |   2 +-
 ...vent.java => GetGuildEditorDataEvent.java} |   2 +-
 ...=> GetGuildFurniContextMenuInfoEvent.java} |   2 +-
 ...rsEvent.java => GetGuildMembersEvent.java} |   2 +-
 ...ent.java => GetGuildMembershipsEvent.java} |   2 +-
 ...ent.java => GetHabboGroupBadgesEvent.java} |   2 +-
 ...nt.java => GetHabboGroupDetailsEvent.java} |   2 +-
 ...java => GetMemberGuildItemCountEvent.java} |   2 +-
 ...oinEvent.java => JoinHabboGroupEvent.java} |   2 +-
 ...eMemberEvent.java => KickMemberEvent.java} |   2 +-
 ...java => RejectMembershipRequestEvent.java} |   2 +-
 ... => RemoveAdminRightsFromMemberEvent.java} |   2 +-
 ...va => SelectFavouriteHabboGroupEvent.java} |   2 +-
 ...eEvent.java => UpdateGuildBadgeEvent.java} |   2 +-
 ...Event.java => UpdateGuildColorsEvent.java} |   2 +-
 ...ent.java => UpdateGuildIdentityEvent.java} |   2 +-
 ...ent.java => UpdateGuildSettingsEvent.java} |   2 +-
 ...DataEvent.java => GetForumStatsEvent.java} |   2 +-
 ...ListEvent.java => GetForumsListEvent.java} |   4 +-
 ...ssagesEvent.java => GetMessagesEvent.java} |   3 +-
 ...ThreadsEvent.java => GetThreadsEvent.java} |   2 +-
 ...geEvent.java => ModerateMessageEvent.java} |   2 +-
 ...eadEvent.java => ModerateThreadEvent.java} |   2 +-
 ...ThreadEvent.java => PostMessageEvent.java} |   2 +-
 ...ent.java => UpdateForumSettingsEvent.java} |   2 +-
 ...pdateEvent.java => UpdateThreadEvent.java} |   2 +-
 ...ersionEvent.java => ClientHelloEvent.java} |   2 +-
 ...vent.java => LatencyPingRequestEvent.java} |   2 +-
 ...ureLoginEvent.java => SSOTicketEvent.java} |   8 +-
 ...MachineIDEvent.java => UniqueIDEvent.java} |   2 +-
 ...tatusEvent.java => GetCfhStatusEvent.java} |   2 +-
 ...ackEvent.java => GetTalentTrackEvent.java} |   2 +-
 ...eEvent.java => GetBonusRareInfoEvent.java} |   2 +-
 ...nt.java => GetCurrentTimingCodeEvent.java} |   4 +-
 ...=> GetLimitedOfferAppearingNextEvent.java} |   2 +-
 ...tEvent.java => GetPromoArticlesEvent.java} |   2 +-
 .../{HotelViewEvent.java => QuitEvent.java}   |   2 +-
 ...ryBadgesEvent.java => GetBadgesEvent.java} |   2 +-
 ...tsEvent.java => GetBotInventoryEvent.java} |   2 +-
 ...tsEvent.java => GetPetInventoryEvent.java} |   2 +-
 ...uestFurniInventoryWhenNotInRoomEvent.java} |   4 +-
 ...ReportEvent.java => CallForHelpEvent.java} |  14 +-
 ... => CallForHelpFromForumMessageEvent.java} |   2 +-
 ...a => CallForHelpFromForumThreadEvent.java} |   2 +-
 ...Event.java => CallForHelpFromIMEvent.java} |   2 +-
 ...nt.java => CallForHelpFromPhotoEvent.java} |   2 +-
 ...java => ChatReviewSessionCreateEvent.java} |   2 +-
 ...java => CloseIssueDefaultActionEvent.java} |   2 +-
 ...TicketEvent.java => CloseIssuesEvent.java} |   2 +-
 ...tlogEvent.java => GetCfhChatlogEvent.java} |   2 +-
 ...java => GetGuideReportingStatusEvent.java} |   2 +-
 ...nt.java => GetModeratorRoomInfoEvent.java} |   2 +-
 ...nt.java => GetModeratorUserInfoEvent.java} |   2 +-
 ....java => GetPendingCallsForHelpEvent.java} |   2 +-
 ...logEvent.java => GetRoomChatlogEvent.java} |   2 +-
 ...sitsEvent.java => GetRoomVisitsEvent.java} |   2 +-
 ...logEvent.java => GetUserChatlogEvent.java} |   2 +-
 ...tionAlertEvent.java => ModAlertEvent.java} |   2 +-
 ...SanctionBanEvent.java => ModBanEvent.java} |   4 +-
 ...odToolKickEvent.java => ModKickEvent.java} |   2 +-
 ...olAlertEvent.java => ModMessageEvent.java} |   2 +-
 ...nctionMuteEvent.java => ModMuteEvent.java} |   2 +-
 ...icEvent.java => ModToolSanctionEvent.java} |   2 +-
 ...ockEvent.java => ModTradingLockEvent.java} |   2 +-
 ...tingsEvent.java => ModerateRoomEvent.java} |   2 +-
 ...rtEvent.java => ModeratorActionEvent.java} |   2 +-
 ...kTicketEvent.java => PickIssuesEvent.java} |   2 +-
 ...cketEvent.java => ReleaseIssuesEvent.java} |   2 +-
 ...RoomEvent.java => CanCreateRoomEvent.java} |   2 +-
 ...ateRoomEvent.java => CreateFlatEvent.java} |   4 +-
 ...eteRoomEvent.java => DeleteRoomEvent.java} |   4 +-
 ...Event.java => ForwardToSomeRoomEvent.java} |   2 +-
 ...vent.java => GetPopularRoomTagsEvent.java} |   2 +-
 ...nt.java => GetUnreadForumsCountEvent.java} |   2 +-
 ...sEvent.java => GetUserEventCatsEvent.java} |   2 +-
 ...esEvent.java => GetUserFlatCatsEvent.java} |   2 +-
 ....java => MyFavouriteRoomsSearchEvent.java} |   2 +-
 ...nt.java => MyFriendsRoomsSearchEvent.java} |   2 +-
 ...vent.java => MyGuildBasesSearchEvent.java} |   2 +-
 ...ent.java => MyRoomHistorySearchEvent.java} |   2 +-
 ...vent.java => MyRoomRightsSearchEvent.java} |   2 +-
 ...oomsEvent.java => MyRoomsSearchEvent.java} |   2 +-
 ...> NavigatorAddCollapsedCategoryEvent.java} |   2 +-
 ...java => NavigatorAddSavedSearchEvent.java} |   2 +-
 ...a => NavigatorDeleteSavedSearchEvent.java} |   2 +-
 ...avigatorRemoveCollapsedCategoryEvent.java} |   2 +-
 ... NavigatorSetSearchCodeViewModeEvent.java} |   2 +-
 ...aEvent.java => NewNavigatorInitEvent.java} |   2 +-
 ...vent.java => NewNavigatorSearchEvent.java} |   4 +-
 ...vent.java => PopularRoomsSearchEvent.java} |   2 +-
 ...omsEvent.java => RoomTextSearchEvent.java} |   2 +-
 ...=> RoomsWhereMyFriendsAreSearchEvent.java} |   2 +-
 ... => RoomsWithHighestScoreSearchEvent.java} |   2 +-
 ...etNewNavigatorWindowPreferencesEvent.java} |   2 +-
 ...celPollEvent.java => PollRejectEvent.java} |   4 +-
 ...PollDataEvent.java => PollStartEvent.java} |   2 +-
 ...eEvent.java => AddFavouriteRoomEvent.java} |   2 +-
 ...ent.java => DeleteFavouriteRoomEvent.java} |   2 +-
 ....java => GetBannedUsersFromRoomEvent.java} |   2 +-
 ...ent.java => GetCustomRoomFilterEvent.java} |   2 +-
 ...vent.java => GetFlatControllersEvent.java} |   2 +-
 ...mDataEvent.java => GetGuestRoomEvent.java} |   2 +-
 ...pEvent.java => GetRoomEntryDataEvent.java} |   2 +-
 ...gsEvent.java => GetRoomSettingsEvent.java} |   2 +-
 ...DoorbellEvent.java => LetUserInEvent.java} |   2 +-
 ...MuteEvent.java => MuteAllInRoomEvent.java} |   2 +-
 ...vent.java => OpenFlatConnectionEvent.java} |   2 +-
 ...{RoomVoteEvent.java => RateFlatEvent.java} |   2 +-
 ...tsEvent.java => RemoveAllRightsEvent.java} |   2 +-
 ...java => RemoveOwnRoomRightsRoomEvent.java} |   2 +-
 ...Event.java => RequestRoomPropertySet.java} |   2 +-
 ...eEvent.java => SaveRoomSettingsEvent.java} |   4 +-
 ...a => SetRoomBackgroundColorDataEvent.java} |   2 +-
 ...java => SubmitRoomToCompetitionEvent.java} |   2 +-
 ...oomEvent.java => UpdateHomeRoomEvent.java} |   2 +-
 ...yEvent.java => UpdateRoomFilterEvent.java} |   2 +-
 ...ettingsEvent.java => CommandBotEvent.java} |   2 +-
 ... GetBotCommandConfigurationDataEvent.java} |   2 +-
 ...{BotPlaceEvent.java => PlaceBotEvent.java} |   2 +-
 ...Event.java => RemoveBotFromFlatEvent.java} |   2 +-
 ...Event.java => AddSpamWallPostItEvent.java} |   4 +-
 ...Event.java => CreditFurniRedeemEvent.java} |   4 +-
 ...ava => CustomizeAvatarWithFurniEvent.java} |   4 +-
 ...{CloseDiceEvent.java => DiceOffEvent.java} |   2 +-
 ...teEvent.java => EnterOneWayDoorEvent.java} |   2 +-
 ...stDataEvent.java => GetItemDataEvent.java} |   2 +-
 ...oveItemEvent.java => MoveObjectEvent.java} |   2 +-
 ...pItemEvent.java => PickupObjectEvent.java} |   2 +-
 ...ceItemEvent.java => PlaceObjectEvent.java} |   2 +-
 ...tPlaceEvent.java => PlacePostItEvent.java} |   2 +-
 ...tDeleteEvent.java => RemoveItemEvent.java} |   2 +-
 ...t.java => RoomDimmerChangeStateEvent.java} |   2 +-
 ...nt.java => RoomDimmerGetPresetsEvent.java} |   2 +-
 ...nt.java => RoomDimmerSavePresetEvent.java} |   2 +-
 ...t.java => SetClothingChangeDataEvent.java} |   2 +-
 ...java => SetCustomStackingHeightEvent.java} |   2 +-
 ...veDataEvent.java => SetItemDataEvent.java} |   2 +-
 ...vent.java => SetMannequinFigureEvent.java} |   2 +-
 ...eEvent.java => SetMannequinNameEvent.java} |   2 +-
 ...SaveEvent.java => SetObjectDataEvent.java} |   4 +-
 ...temEvent.java => SetRandomStateEvent.java} |   4 +-
 ...vent.java => SpinWheelOfFortuneEvent.java} |   2 +-
 ...ggerDiceEvent.java => ThrowDiceEvent.java} |   2 +-
 ...rItemEvent.java => UseFurnitureEvent.java} |   4 +-
 ...llItemEvent.java => UseWallItemEvent.java} |   2 +-
 ...ackEvent.java => AddJukeboxDiskEvent.java} |   3 +-
 ...vent.java => GetJukeboxPlayListEvent.java} |   2 +-
 ...xEventTwo.java => GetNowPlayingEvent.java} |   2 +-
 ...Event.java => RemoveJukeboxDiskEvent.java} |   2 +-
 ....java => FriendFurniConfirmLockEvent.java} |   2 +-
 ...java => RentableSpaceCancelRentEvent.java} |   2 +-
 ...Event.java => RentableSpaceRentEvent.java} |   2 +-
 ...> ControlYoutubeDisplayPlaybackEvent.java} |   2 +-
 ...java => GetYoutubeDisplayStatusEvent.java} |   4 +-
 ...va => SetYoutubeDisplayPlaylistEvent.java} |   2 +-
 ...erplantsEvent.java => BreedPetsEvent.java} |   2 +-
 ...Event.java => CancelPetBreedingEvent.java} |   2 +-
 ...plantEvent.java => CompostPlantEvent.java} |   4 +-
 ...t.java => CustomizePetWithFurniEvent.java} |   2 +-
 ...nelEvent.java => GetPetCommandsEvent.java} |   2 +-
 .../{PetRideEvent.java => MountPetEvent.java} |   2 +-
 ...ameEvent.java => OpenPetPackageEvent.java} |   2 +-
 ...{PetPlaceEvent.java => PlacePetEvent.java} |   2 +-
 ...Event.java => RemovePetFromFlatEvent.java} |   2 +-
 ...ent.java => RemoveSaddleFromPetEvent.java} |   4 +-
 ...atchPetEvent.java => RespectPetEvent.java} |   2 +-
 ... => TogglePetBreedingPermissionEvent.java} |   2 +-
 ...va => TogglePetRidingPermissionEvent.java} |   2 +-
 ...romotionEvent.java => EditEventEvent.java} |   2 +-
 ...t.java => GetRoomAdPurchaseInfoEvent.java} |   2 +-
 ...ionEvent.java => PurchaseRoomAdEvent.java} |   6 +-
 ...ightsEvent.java => AssignRightsEvent.java} |   2 +-
 ...nEvent.java => AvatarExpressionEvent.java} |   2 +-
 ...ent.java => BanUserWithDurationEvent.java} |   2 +-
 ...ypingEvent.java => CancelTypingEvent.java} |   2 +-
 ...rSitEvent.java => ChangePostureEvent.java} |   2 +-
 ...{RoomUserTalkEvent.java => ChatEvent.java} |   4 +-
 ...oomUserDanceEvent.java => DanceEvent.java} |   2 +-
 ...ItemEvent.java => DropCarryItemEvent.java} |   2 +-
 ...erTagsEvent.java => GetUserTagsEvent.java} |   2 +-
 ...oomUserEvent.java => IgnoreUserEvent.java} |   2 +-
 ...mUserLookAtPoint.java => LookToEvent.java} |   2 +-
 ...serWalkEvent.java => MoveAvatarEvent.java} |   4 +-
 ...ItemEvent.java => PassCarryItemEvent.java} |   2 +-
 ...ightsEvent.java => RemoveRightsEvent.java} |   2 +-
 ...espectEvent.java => RespectUserEvent.java} |   2 +-
 ...oomUserShoutEvent.java => ShoutEvent.java} |   4 +-
 ...{RoomUserSignEvent.java => SignEvent.java} |   2 +-
 ...TypingEvent.java => StartTypingEvent.java} |   2 +-
 ...Event.java => UnbanUserFromRoomEvent.java} |   2 +-
 ...mUserEvent.java => UnignoreUserEvent.java} |   2 +-
 ...serWhisperEvent.java => WhisperEvent.java} |   4 +-
 ...ceptEvent.java => AcceptTradingEvent.java} |   2 +-
 ...temEvent.java => AddItemToTradeEvent.java} |   2 +-
 ...msEvent.java => AddItemsToTradeEvent.java} |   2 +-
 ...CloseEvent.java => CloseTradingEvent.java} |   2 +-
 ...nt.java => ConfirmAcceptTradingEvent.java} |   2 +-
 ...t.java => ConfirmDeclineTradingEvent.java} |   2 +-
 ...eStartEvent.java => OpenTradingEvent.java} |   2 +-
 ...ent.java => RemoveItemFromTradeEvent.java} |   2 +-
 ...ptEvent.java => UnacceptTradingEvent.java} |   2 +-
 ...va => GetResolutionAchievementsEvent.java} |   2 +-
 ...t.java => AvatarEffectActivatedEvent.java} |   2 +-
 ...nt.java => AvatarEffectSelectedEvent.java} |   2 +-
 ...eMottoEvent.java => ChangeMottoEvent.java} |   2 +-
 ...ameEvent.java => ChangeUserNameEvent.java} |   4 +-
 ...nameEvent.java => CheckUserNameEvent.java} |   4 +-
 ...rActivityEvent.java => EventLogEvent.java} |   2 +-
 ...itsEvent.java => GetCreditsInfoEvent.java} |   2 +-
 ...vent.java => GetExtendedProfileEvent.java} |   2 +-
 ...va => GetRelationshipStatusInfoEvent.java} |   2 +-
 ...Event.java => GetSelectedBadgesEvent.java} |   2 +-
 ...sEvent.java => GetSoundSettingsEvent.java} |   2 +-
 ...ent.java => GetTalentTrackLevelEvent.java} |   2 +-
 ...rdrobeEvent.java => GetWardrobeEvent.java} |   2 +-
 ...rDataEvent.java => InfoRetrieveEvent.java} |   4 +-
 ...va => NewUserExperienceGetGiftsEvent.java} |   2 +-
 ... NewUserExperienceScriptProceedEvent.java} |   2 +-
 ...vent.java => SaveWardrobeOutfitEvent.java} |   2 +-
 ...vent.java => ScrGetKickbackInfoEvent.java} |   2 +-
 ...lubEvent.java => ScrGetUserInfoEvent.java} |   2 +-
 ...vent.java => SetActivatedBadgesEvent.java} |   2 +-
 ...vent.java => SetChatPreferencesEvent.java} |   2 +-
 ....java => SetChatStylePreferenceEvent.java} |   2 +-
 ...nt.java => SetIgnoreRoomInvitesEvent.java} |   2 +-
 ...ava => SetRoomCameraPreferencesEvent.java} |   2 +-
 ...sEvent.java => SetSoundSettingsEvent.java} |   2 +-
 ...kEvent.java => UpdateFigureDataEvent.java} |   4 +-
 ...ionsEvent.java => ApplySnapshotEvent.java} |   2 +-
 ...eDataEvent.java => UpdateActionEvent.java} |   2 +-
 ...taEvent.java => UpdateConditionEvent.java} |   2 +-
 ...DataEvent.java => UpdateTriggerEvent.java} |   2 +-
 .../com/eu/habbo/plugin/PluginManager.java    |  46 +-
 324 files changed, 771 insertions(+), 777 deletions(-)
 rename src/main/java/com/eu/habbo/messages/incoming/achievements/{RequestAchievementsEvent.java => GetAchievementsEvent.java} (84%)
 rename src/main/java/com/eu/habbo/messages/incoming/ambassadors/{AmbassadorAlertCommandEvent.java => AmbassadorAlertEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/ambassadors/{AmbassadorVisitCommandEvent.java => FollowFriendEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/camera/{CameraPublishToWebEvent.java => PublishPhotoEvent.java} (85%)
 rename src/main/java/com/eu/habbo/messages/incoming/camera/{CameraPurchaseEvent.java => PurchasePhotoEvent.java} (84%)
 rename src/main/java/com/eu/habbo/messages/incoming/camera/{CameraRoomPictureEvent.java => RenderRoomEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/camera/{CameraRoomThumbnailEvent.java => RenderRoomThumbnailEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{CheckPetNameEvent.java => ApproveNameEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{CatalogRequestClubDiscountEvent.java => BuildersClubPlaceWallItemEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{RequestCatalogIndexEvent.java => BuildersClubQueryFurniCountEvent.java} (79%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{RequestDiscountEvent.java => GetBundleDiscountRulesetEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{RequestCatalogModeEvent.java => GetCatalogIndexEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{RequestCatalogPageEvent.java => GetCatalogPageEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{RequestClubGiftsEvent.java => GetClubGiftInfo.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{RequestClubDataEvent.java => GetClubOffersEvent.java} (86%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{RequestGiftConfigurationEvent.java => GetGiftWrappingConfigurationEvent.java} (81%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{RequestMarketplaceConfigEvent.java => GetMarketplaceConfigurationEvent.java} (82%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{JukeBoxRequestTrackCodeEvent.java => GetOfficialSongIdEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{CatalogSearchedItemEvent.java => GetProductOfferEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{RequestPetBreedsEvent.java => GetSellablePetPalettesEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{JukeBoxRequestTrackDataEvent.java => GetSongInfoEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{CatalogBuyItemAsGiftEvent.java => PurchaseFromCatalogAsGiftEvent.java} (99%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{CatalogBuyItemEvent.java => PurchaseFromCatalogEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{PurchaseTargetOfferEvent.java => PurchaseTargetedOfferEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{CatalogBuyClubDiscountEvent.java => PurchaseVipMembershipExtensionEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{CatalogSelectClubGiftEvent.java => SelectClubGiftEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/{TargetOfferStateEvent.java => SetTargetedOfferStateEvent.java} (88%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/{BuyItemEvent.java => BuyMarketplaceOfferEvent.java} (84%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/{TakeBackItemEvent.java => CancelMarketplaceOfferEvent.java} (84%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/{RequestSellItemEvent.java => GetMarketplaceCanMakeOfferEvent.java} (88%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/{RequestItemInfoEvent.java => GetMarketplaceItemStatsEvent.java} (86%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/{RequestOffersEvent.java => GetMarketplaceOffersEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/{RequestOwnItemsEvent.java => GetMarketplaceOwnOffersEvent.java} (84%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/{SellItemEvent.java => MakeOfferEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/{RequestCreditsEvent.java => RedeemMarketplaceOfferCreditsEvent.java} (79%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/{RequestRecyclerLogicEvent.java => GetRecyclerPrizesEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/{ReloadRecyclerEvent.java => GetRecyclerStatusEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/{OpenRecycleBoxEvent.java => PresentOpenEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/{RecycleEvent.java => RecycleItemsEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/crafting/{CraftingCraftItemEvent.java => CraftEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/crafting/{CraftingCraftSecretEvent.java => CraftSecretEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/crafting/{CraftingAddRecipeEvent.java => GetCraftableProductsEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/crafting/{RequestCraftingRecipesEvent.java => GetCraftingRecipeEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/crafting/{RequestCraftingRecipesAvailableEvent.java => GetCraftingRecipesAvailableEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/events/calendar/{AdventCalendarOpenDayEvent.java => OpenCampaignCalendarDoorAsStaffEvent.java} (85%)
 rename src/main/java/com/eu/habbo/messages/incoming/events/calendar/{AdventCalendarForceOpenEvent.java => OpenCampaignCalendarDoorEvent.java} (86%)
 rename src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/{FloorPlanEditorRequestBlockedTilesEvent.java => GetOccupiedTilesEvent.java} (86%)
 rename src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/{FloorPlanEditorRequestDoorSettingsEvent.java => GetRoomEntryTileEvent.java} (89%)
 rename src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/{FloorPlanEditorSaveEvent.java => UpdateFloorPropertiesEvent.java} (99%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{AcceptFriendRequestEvent.java => AcceptFriendEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{DeclineFriendRequestEvent.java => DeclineFriendEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{RequestFriendRequestsEvent.java => GetFriendRequestsEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{RequestFriendsEvent.java => GetMOTDEvent.java} (85%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{SearchUserEvent.java => HabboSearchEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{RequestInitFriendsEvent.java => MessengerInitEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{FriendRequestEvent.java => RequestFriendEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{FriendPrivateMessageEvent.java => SendMsgEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{InviteFriendsEvent.java => SendRoomInviteEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{ChangeRelationEvent.java => SetRelationshipStatusEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/friends/{StalkFriendEvent.java => VisitUserEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/gamecenter/{GameCenterRequestGameStatusEvent.java => Game2GetAccountGameStatusEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/gamecenter/{GameCenterLeaveGameEvent.java => GameUnloadedEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/gamecenter/{GameCenterRequestGamesEvent.java => GetGameListEvent.java} (84%)
 rename src/main/java/com/eu/habbo/messages/incoming/gamecenter/{GameCenterRequestAccountStatusEvent.java => GetGameStatusEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/gamecenter/{GameCenterEvent.java => GetWeeklyGameRewardEvent.java} (73%)
 rename src/main/java/com/eu/habbo/messages/incoming/gamecenter/{GameCenterLoadGameEvent.java => GetWeeklyGameRewardWinnersEvent.java} (78%)
 rename src/main/java/com/eu/habbo/messages/incoming/gamecenter/{GameCenterJoinGameEvent.java => JoinQueueEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/guardians/{GuardianAcceptRequestEvent.java => ChatReviewGuideDecidesOnOfferEvent.java} (81%)
 rename src/main/java/com/eu/habbo/messages/incoming/guardians/{GuardianNoUpdatesWantedEvent.java => ChatReviewGuideDetachedEvent.java} (78%)
 rename src/main/java/com/eu/habbo/messages/incoming/guardians/{GuardianVoteEvent.java => ChatReviewGuideVoteEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{RequestGuideAssistanceEvent.java => GuideSessionCreateEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{GuideRecommendHelperEvent.java => GuideSessionFeedbackEvent.java} (89%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{GuideVisitUserEvent.java => GuideSessionGetRequesterRoomEvent.java} (89%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{GuideHandleHelpRequestEvent.java => GuideSessionGuideDecidesEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{GuideInviteUserEvent.java => GuideSessionInviteRequesterEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{GuideUserTypingEvent.java => GuideSessionIsTypingEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{GuideUserMessageEvent.java => GuideSessionMessageEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{RequestGuideToolEvent.java => GuideSessionOnDutyUpdateEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{GuideReportHelperEvent.java => GuideSessionReportEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{GuideCancelHelpRequestEvent.java => GuideSessionRequesterCancelsEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/guides/{GuideCloseHelpRequestEvent.java => GuideSessionResolvedEvent.java} (88%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildSetAdminEvent.java => AddAdminRightsToMemberEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildAcceptMembershipEvent.java => ApproveMembershipRequestEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{RequestGuildBuyEvent.java => CreateGuildEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildDeleteEvent.java => DeactivateGuildEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildRemoveFavoriteEvent.java => DeselectFavouriteHabboGroupEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{RequestGuildBuyRoomsEvent.java => GetGuildCreationInfoEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{RequestGuildManageEvent.java => GetGuildEditInfoEvent.java} (88%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{RequestGuildPartsEvent.java => GetGuildEditorDataEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{RequestGuildFurniWidgetEvent.java => GetGuildFurniContextMenuInfoEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{RequestGuildMembersEvent.java => GetGuildMembersEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{RequestOwnGuildsEvent.java => GetGuildMembershipsEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GetHabboGuildBadgesMessageEvent.java => GetHabboGroupBadgesEvent.java} (70%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{RequestGuildInfoEvent.java => GetHabboGroupDetailsEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildConfirmRemoveMemberEvent.java => GetMemberGuildItemCountEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{RequestGuildJoinEvent.java => JoinHabboGroupEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildRemoveMemberEvent.java => KickMemberEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildDeclineMembershipEvent.java => RejectMembershipRequestEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildRemoveAdminEvent.java => RemoveAdminRightsFromMemberEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildSetFavoriteEvent.java => SelectFavouriteHabboGroupEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildChangeBadgeEvent.java => UpdateGuildBadgeEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildChangeColorsEvent.java => UpdateGuildColorsEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildChangeNameDescEvent.java => UpdateGuildIdentityEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/{GuildChangeSettingsEvent.java => UpdateGuildSettingsEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/forums/{GuildForumDataEvent.java => GetForumStatsEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/forums/{GuildForumListEvent.java => GetForumsListEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/forums/{GuildForumThreadsMessagesEvent.java => GetMessagesEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/forums/{GuildForumThreadsEvent.java => GetThreadsEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/forums/{GuildForumModerateMessageEvent.java => ModerateMessageEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/forums/{GuildForumModerateThreadEvent.java => ModerateThreadEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/forums/{GuildForumPostThreadEvent.java => PostMessageEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/forums/{GuildForumUpdateSettingsEvent.java => UpdateForumSettingsEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/guilds/forums/{GuildForumThreadUpdateEvent.java => UpdateThreadEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/handshake/{ReleaseVersionEvent.java => ClientHelloEvent.java} (82%)
 rename src/main/java/com/eu/habbo/messages/incoming/handshake/{PingEvent.java => LatencyPingRequestEvent.java} (85%)
 rename src/main/java/com/eu/habbo/messages/incoming/handshake/{SecureLoginEvent.java => SSOTicketEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/handshake/{MachineIDEvent.java => UniqueIDEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/helper/{MySanctionStatusEvent.java => GetCfhStatusEvent.java} (84%)
 rename src/main/java/com/eu/habbo/messages/incoming/helper/{RequestTalentTrackEvent.java => GetTalentTrackEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/hotelview/{HotelViewRequestBonusRareEvent.java => GetBonusRareInfoEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/hotelview/{HotelViewDataEvent.java => GetCurrentTimingCodeEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/hotelview/{HotelViewRequestLTDAvailabilityEvent.java => GetLimitedOfferAppearingNextEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/hotelview/{RequestNewsListEvent.java => GetPromoArticlesEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/hotelview/{HotelViewEvent.java => QuitEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/inventory/{RequestInventoryBadgesEvent.java => GetBadgesEvent.java} (82%)
 rename src/main/java/com/eu/habbo/messages/incoming/inventory/{RequestInventoryBotsEvent.java => GetBotInventoryEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/inventory/{RequestInventoryPetsEvent.java => GetPetInventoryEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/inventory/{RequestInventoryItemsEvent.java => RequestFurniInventoryWhenNotInRoomEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ReportEvent.java => CallForHelpEvent.java} (85%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ReportCommentEvent.java => CallForHelpFromForumMessageEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ReportThreadEvent.java => CallForHelpFromForumThreadEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ReportFriendPrivateChatEvent.java => CallForHelpFromIMEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ReportPhotoEvent.java => CallForHelpFromPhotoEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ReportBullyEvent.java => ChatReviewSessionCreateEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolIssueDefaultSanctionEvent.java => CloseIssueDefaultActionEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolCloseTicketEvent.java => CloseIssuesEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolRequestIssueChatlogEvent.java => GetCfhChatlogEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{RequestReportUserBullyingEvent.java => GetGuideReportingStatusEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolRequestRoomInfoEvent.java => GetModeratorRoomInfoEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolRequestUserInfoEvent.java => GetModeratorUserInfoEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{RequestReportRoomEvent.java => GetPendingCallsForHelpEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolRequestRoomChatlogEvent.java => GetRoomChatlogEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolRequestRoomVisitsEvent.java => GetRoomVisitsEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolRequestUserChatlogEvent.java => GetUserChatlogEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolSanctionAlertEvent.java => ModAlertEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolSanctionBanEvent.java => ModBanEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolKickEvent.java => ModKickEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolAlertEvent.java => ModMessageEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolSanctionMuteEvent.java => ModMuteEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolIssueChangeTopicEvent.java => ModToolSanctionEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolSanctionTradeLockEvent.java => ModTradingLockEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolChangeRoomSettingsEvent.java => ModerateRoomEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolRoomAlertEvent.java => ModeratorActionEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolPickTicketEvent.java => PickIssuesEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/modtool/{ModToolReleaseTicketEvent.java => ReleaseIssuesEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestCanCreateRoomEvent.java => CanCreateRoomEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestCreateRoomEvent.java => CreateFlatEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestDeleteRoomEvent.java => DeleteRoomEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{NewNavigatorActionEvent.java => ForwardToSomeRoomEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestTagsEvent.java => GetPopularRoomTagsEvent.java} (86%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestPromotedRoomsEvent.java => GetUnreadForumsCountEvent.java} (86%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestNavigatorSettingsEvent.java => GetUserEventCatsEvent.java} (85%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestRoomCategoriesEvent.java => GetUserFlatCatsEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{SearchRoomsMyFavouriteEvent.java => MyFavouriteRoomsSearchEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{SearchRoomsFriendsOwnEvent.java => MyFriendsRoomsSearchEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{SearchRoomsInGroupEvent.java => MyGuildBasesSearchEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{SearchRoomsVisitedEvent.java => MyRoomHistorySearchEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{SearchRoomsWithRightsEvent.java => MyRoomRightsSearchEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestMyRoomsEvent.java => MyRoomsSearchEvent.java} (88%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{NavigatorCollapseCategoryEvent.java => NavigatorAddCollapsedCategoryEvent.java} (84%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{AddSavedSearchEvent.java => NavigatorAddSavedSearchEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{DeleteSavedSearchEvent.java => NavigatorDeleteSavedSearchEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{NavigatorUncollapseCategoryEvent.java => NavigatorRemoveCollapsedCategoryEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{NavigatorCategoryListModeEvent.java => NavigatorSetSearchCodeViewModeEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestNewNavigatorDataEvent.java => NewNavigatorInitEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestNewNavigatorRoomsEvent.java => NewNavigatorSearchEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestPopularRoomsEvent.java => PopularRoomsSearchEvent.java} (86%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{SearchRoomsEvent.java => RoomTextSearchEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{SearchRoomsFriendsNowEvent.java => RoomsWhereMyFriendsAreSearchEvent.java} (85%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{RequestHighestScoreRoomsEvent.java => RoomsWithHighestScoreSearchEvent.java} (85%)
 rename src/main/java/com/eu/habbo/messages/incoming/navigator/{SaveWindowSettingsEvent.java => SetNewNavigatorWindowPreferencesEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/polls/{CancelPollEvent.java => PollRejectEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/polls/{GetPollDataEvent.java => PollStartEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomFavoriteEvent.java => AddFavouriteRoomEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomUnFavoriteEvent.java => DeleteFavouriteRoomEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomRequestBannedUsersEvent.java => GetBannedUsersFromRoomEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RequestRoomWordFilterEvent.java => GetCustomRoomFilterEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RequestRoomRightsEvent.java => GetFlatControllersEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RequestRoomDataEvent.java => GetGuestRoomEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RequestRoomHeightmapEvent.java => GetRoomEntryDataEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RequestRoomSettingsEvent.java => GetRoomSettingsEvent.java} (89%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{HandleDoorbellEvent.java => LetUserInEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomMuteEvent.java => MuteAllInRoomEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RequestRoomLoadEvent.java => OpenFlatConnectionEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomVoteEvent.java => RateFlatEvent.java} (86%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomRemoveAllRightsEvent.java => RemoveAllRightsEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomRemoveRightsEvent.java => RemoveOwnRoomRightsRoomEvent.java} (84%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomPlacePaintEvent.java => RequestRoomPropertySet.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomSettingsSaveEvent.java => SaveRoomSettingsEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomBackgroundEvent.java => SetRoomBackgroundColorDataEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomStaffPickEvent.java => SubmitRoomToCompetitionEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{SetHomeRoomEvent.java => UpdateHomeRoomEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/{RoomWordFilterModifyEvent.java => UpdateRoomFilterEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/bots/{BotSaveSettingsEvent.java => CommandBotEvent.java} (99%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/bots/{BotSettingsEvent.java => GetBotCommandConfigurationDataEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/bots/{BotPlaceEvent.java => PlaceBotEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/bots/{BotPickupEvent.java => RemoveBotFromFlatEvent.java} (88%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{SavePostItStickyPoleEvent.java => AddSpamWallPostItEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{RedeemItemEvent.java => CreditFurniRedeemEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{RedeemClothingEvent.java => CustomizeAvatarWithFurniEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{CloseDiceEvent.java => DiceOffEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{TriggerOneWayGateEvent.java => EnterOneWayDoorEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{PostItRequestDataEvent.java => GetItemDataEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{RotateMoveItemEvent.java => MoveObjectEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{RoomPickupItemEvent.java => PickupObjectEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{RoomPlaceItemEvent.java => PlaceObjectEvent.java} (99%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{PostItPlaceEvent.java => PlacePostItEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{PostItDeleteEvent.java => RemoveItemEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{MoodLightTurnOnEvent.java => RoomDimmerChangeStateEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{MoodLightSettingsEvent.java => RoomDimmerGetPresetsEvent.java} (88%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{MoodLightSaveSettingsEvent.java => RoomDimmerSavePresetEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{FootballGateSaveLookEvent.java => SetClothingChangeDataEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{SetStackHelperHeightEvent.java => SetCustomStackingHeightEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{PostItSaveDataEvent.java => SetItemDataEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{MannequinSaveLookEvent.java => SetMannequinFigureEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{MannequinSaveNameEvent.java => SetMannequinNameEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{AdvertisingSaveEvent.java => SetObjectDataEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{UseRandomStateItemEvent.java => SetRandomStateEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{TriggerColorWheelEvent.java => SpinWheelOfFortuneEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{TriggerDiceEvent.java => ThrowDiceEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{ToggleFloorItemEvent.java => UseFurnitureEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/{ToggleWallItemEvent.java => UseWallItemEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/{JukeBoxAddSoundTrackEvent.java => AddJukeboxDiskEvent.java} (89%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/{JukeBoxRequestPlayListEvent.java => GetJukeboxPlayListEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/{JukeBoxEventTwo.java => GetNowPlayingEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/{JukeBoxRemoveSoundTrackEvent.java => RemoveJukeboxDiskEvent.java} (89%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/{LoveLockStartConfirmEvent.java => FriendFurniConfirmLockEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/{RentSpaceCancelEvent.java => RentableSpaceCancelRentEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/{RentSpaceEvent.java => RentableSpaceRentEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/{YoutubeRequestStateChange.java => ControlYoutubeDisplayPlaybackEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/{YoutubeRequestPlaylists.java => GetYoutubeDisplayStatusEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/{YoutubeRequestPlaylistChange.java => SetYoutubeDisplayPlaylistEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{BreedMonsterplantsEvent.java => BreedPetsEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{StopBreedingEvent.java => CancelPetBreedingEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{CompostMonsterplantEvent.java => CompostPlantEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{PetUseItemEvent.java => CustomizePetWithFurniEvent.java} (99%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{RequestPetTrainingPanelEvent.java => GetPetCommandsEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{PetRideEvent.java => MountPetEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{PetPackageNameEvent.java => OpenPetPackageEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{PetPlaceEvent.java => PlacePetEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{PetPickupEvent.java => RemovePetFromFlatEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{HorseRemoveSaddleEvent.java => RemoveSaddleFromPetEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{ScratchPetEvent.java => RespectPetEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{ToggleMonsterplantBreedableEvent.java => TogglePetBreedingPermissionEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/pets/{PetRideSettingsEvent.java => TogglePetRidingPermissionEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/{UpdateRoomPromotionEvent.java => EditEventEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/{RequestPromotionRoomsEvent.java => GetRoomAdPurchaseInfoEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/{BuyRoomPromotionEvent.java => PurchaseRoomAdEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserGiveRightsEvent.java => AssignRightsEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserActionEvent.java => AvatarExpressionEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserBanEvent.java => BanUserWithDurationEvent.java} (89%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserStopTypingEvent.java => CancelTypingEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserSitEvent.java => ChangePostureEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserTalkEvent.java => ChatEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserDanceEvent.java => DanceEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserDropHandItemEvent.java => DropCarryItemEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RequestRoomUserTagsEvent.java => GetUserTagsEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{IgnoreRoomUserEvent.java => IgnoreUserEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserLookAtPoint.java => LookToEvent.java} (97%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserWalkEvent.java => MoveAvatarEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserGiveHandItemEvent.java => PassCarryItemEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserRemoveRightsEvent.java => RemoveRightsEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserGiveRespectEvent.java => RespectUserEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserShoutEvent.java => ShoutEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserSignEvent.java => SignEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserStartTypingEvent.java => StartTypingEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{UnbanRoomUserEvent.java => UnbanUserFromRoomEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{UnIgnoreRoomUserEvent.java => UnignoreUserEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/rooms/users/{RoomUserWhisperEvent.java => WhisperEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/trading/{TradeAcceptEvent.java => AcceptTradingEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/trading/{TradeOfferItemEvent.java => AddItemToTradeEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/trading/{TradeOfferMultipleItemsEvent.java => AddItemsToTradeEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/trading/{TradeCloseEvent.java => CloseTradingEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/trading/{TradeConfirmEvent.java => ConfirmAcceptTradingEvent.java} (89%)
 rename src/main/java/com/eu/habbo/messages/incoming/trading/{TradeCancelEvent.java => ConfirmDeclineTradingEvent.java} (90%)
 rename src/main/java/com/eu/habbo/messages/incoming/trading/{TradeStartEvent.java => OpenTradingEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/trading/{TradeCancelOfferItemEvent.java => RemoveItemFromTradeEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/trading/{TradeUnAcceptEvent.java => UnacceptTradingEvent.java} (89%)
 rename src/main/java/com/eu/habbo/messages/incoming/unknown/{RequestResolutionEvent.java => GetResolutionAchievementsEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{ActivateEffectEvent.java => AvatarEffectActivatedEvent.java} (86%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{EnableEffectEvent.java => AvatarEffectSelectedEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{SaveMottoEvent.java => ChangeMottoEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{ConfirmChangeNameEvent.java => ChangeUserNameEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{ChangeNameCheckUsernameEvent.java => CheckUserNameEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{UserActivityEvent.java => EventLogEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{RequestUserCreditsEvent.java => GetCreditsInfoEvent.java} (88%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{RequestUserProfileEvent.java => GetExtendedProfileEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{RequestProfileFriendsEvent.java => GetRelationshipStatusInfoEvent.java} (91%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{RequestWearingBadgesEvent.java => GetSelectedBadgesEvent.java} (93%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{RequestMeMenuSettingsEvent.java => GetSoundSettingsEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{RequestUserCitizinShipEvent.java => GetTalentTrackLevelEvent.java} (83%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{RequestUserWardrobeEvent.java => GetWardrobeEvent.java} (85%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{RequestUserDataEvent.java => InfoRetrieveEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{PickNewUserGiftEvent.java => NewUserExperienceGetGiftsEvent.java} (94%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{UserNuxEvent.java => NewUserExperienceScriptProceedEvent.java} (95%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{SaveWardrobeEvent.java => SaveWardrobeOutfitEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{RequestClubCenterEvent.java => ScrGetKickbackInfoEvent.java} (85%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{RequestUserClubEvent.java => ScrGetUserInfoEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{UserWearBadgeEvent.java => SetActivatedBadgesEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{SavePreferOldChatEvent.java => SetChatPreferencesEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{ChangeChatBubbleEvent.java => SetChatStylePreferenceEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{SaveIgnoreRoomInvitesEvent.java => SetIgnoreRoomInvitesEvent.java} (87%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{SaveBlockCameraFollowEvent.java => SetRoomCameraPreferencesEvent.java} (86%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{SaveUserVolumesEvent.java => SetSoundSettingsEvent.java} (92%)
 rename src/main/java/com/eu/habbo/messages/incoming/users/{UserSaveLookEvent.java => UpdateFigureDataEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/wired/{WiredApplySetConditionsEvent.java => ApplySnapshotEvent.java} (98%)
 rename src/main/java/com/eu/habbo/messages/incoming/wired/{WiredEffectSaveDataEvent.java => UpdateActionEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/wired/{WiredConditionSaveDataEvent.java => UpdateConditionEvent.java} (96%)
 rename src/main/java/com/eu/habbo/messages/incoming/wired/{WiredTriggerSaveDataEvent.java => UpdateTriggerEvent.java} (96%)

diff --git a/src/main/java/com/eu/habbo/core/CleanerThread.java b/src/main/java/com/eu/habbo/core/CleanerThread.java
index e907d0ab..4d2a87a5 100644
--- a/src/main/java/com/eu/habbo/core/CleanerThread.java
+++ b/src/main/java/com/eu/habbo/core/CleanerThread.java
@@ -3,8 +3,8 @@ package com.eu.habbo.core;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guilds.forums.ForumThread;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.messages.incoming.friends.SearchUserEvent;
-import com.eu.habbo.messages.incoming.navigator.SearchRoomsEvent;
+import com.eu.habbo.messages.incoming.friends.HabboSearchEvent;
+import com.eu.habbo.messages.incoming.navigator.RoomTextSearchEvent;
 import com.eu.habbo.messages.outgoing.users.UserObjectComposer;
 import com.eu.habbo.threading.runnables.AchievementUpdater;
 import org.slf4j.Logger;
@@ -101,8 +101,8 @@ public class CleanerThread implements Runnable {
             LAST_HABBO_CACHE_CLEARED = time;
         }
 
-        SearchRoomsEvent.cachedResults.clear();
-        SearchUserEvent.cachedResults.clear();
+        RoomTextSearchEvent.cachedResults.clear();
+        HabboSearchEvent.cachedResults.clear();
     }
 
 
diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java
index 55544a4c..e4ac30e1 100644
--- a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java
+++ b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.ServerMessage;
-import com.eu.habbo.messages.incoming.catalog.marketplace.RequestOffersEvent;
+import com.eu.habbo.messages.incoming.catalog.marketplace.GetMarketplaceOffersEvent;
 import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceBuyOfferResultComposer;
 import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCancelOfferResultComposer;
 import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer;
@@ -65,7 +65,7 @@ public class MarketPlace {
 
     private static void takeBackItem(Habbo habbo, MarketPlaceOffer offer) {
         if (offer != null && habbo.getInventory().getMarketplaceItems().contains(offer)) {
-            RequestOffersEvent.cachedResults.clear();
+            GetMarketplaceOffersEvent.cachedResults.clear();
             try (Connection connection = Emulator.getDatabase().getDataSource().getConnection()) {
                 try (PreparedStatement ownerCheck = connection.prepareStatement("SELECT user_id FROM marketplace_items WHERE id = ?", ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY)) {
                     ownerCheck.setInt(1, offer.getOfferId());
@@ -240,7 +240,7 @@ public class MarketPlace {
 
 
     public static void buyItem(int offerId, GameClient client) {
-        RequestOffersEvent.cachedResults.clear();
+        GetMarketplaceOffersEvent.cachedResults.clear();
         try (Connection connection = Emulator.getDatabase().getDataSource().getConnection()) {
             try (PreparedStatement statement = connection.prepareStatement("SELECT * FROM marketplace_items WHERE id = ? LIMIT 1")) {
                 statement.setInt(1, offerId);
@@ -344,7 +344,7 @@ public class MarketPlace {
             return false;
         }
 
-        RequestOffersEvent.cachedResults.clear();
+        GetMarketplaceOffersEvent.cachedResults.clear();
 
         client.sendResponse(new FurniListRemoveComposer(event.item.getGiftAdjustedId()));
         client.sendResponse(new FurniListInvalidateComposer());
diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
index 01b192c4..f699715d 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
@@ -28,7 +28,7 @@ import com.eu.habbo.habbohotel.polls.PollManager;
 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.incoming.users.NewUserExperienceScriptProceedEvent;
 import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorComposer;
 import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer;
 import com.eu.habbo.messages.outgoing.polls.PollOfferComposer;
@@ -915,7 +915,7 @@ public class RoomManager {
         room.habboEntered(habbo);
 
         if (!habbo.getHabboStats().nux && (room.isOwner(habbo) || room.isPublicRoom())) {
-            UserNuxEvent.handle(habbo);
+            NewUserExperienceScriptProceedEvent.handle(habbo);
         }
     }
 
diff --git a/src/main/java/com/eu/habbo/messages/PacketManager.java b/src/main/java/com/eu/habbo/messages/PacketManager.java
index 8e37ab98..5559da79 100644
--- a/src/main/java/com/eu/habbo/messages/PacketManager.java
+++ b/src/main/java/com/eu/habbo/messages/PacketManager.java
@@ -5,69 +5,69 @@ import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.messages.incoming.Incoming;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.incoming.achievements.RequestAchievementConfigurationEvent;
-import com.eu.habbo.messages.incoming.achievements.RequestAchievementsEvent;
-import com.eu.habbo.messages.incoming.ambassadors.AmbassadorAlertCommandEvent;
-import com.eu.habbo.messages.incoming.ambassadors.AmbassadorVisitCommandEvent;
+import com.eu.habbo.messages.incoming.achievements.GetAchievementsEvent;
+import com.eu.habbo.messages.incoming.ambassadors.AmbassadorAlertEvent;
+import com.eu.habbo.messages.incoming.ambassadors.FollowFriendEvent;
 import com.eu.habbo.messages.incoming.camera.*;
 import com.eu.habbo.messages.incoming.catalog.*;
 import com.eu.habbo.messages.incoming.catalog.marketplace.*;
-import com.eu.habbo.messages.incoming.catalog.recycler.OpenRecycleBoxEvent;
-import com.eu.habbo.messages.incoming.catalog.recycler.RecycleEvent;
-import com.eu.habbo.messages.incoming.catalog.recycler.ReloadRecyclerEvent;
-import com.eu.habbo.messages.incoming.catalog.recycler.RequestRecyclerLogicEvent;
+import com.eu.habbo.messages.incoming.catalog.recycler.PresentOpenEvent;
+import com.eu.habbo.messages.incoming.catalog.recycler.RecycleItemsEvent;
+import com.eu.habbo.messages.incoming.catalog.recycler.GetRecyclerStatusEvent;
+import com.eu.habbo.messages.incoming.catalog.recycler.GetRecyclerPrizesEvent;
 import com.eu.habbo.messages.incoming.crafting.*;
-import com.eu.habbo.messages.incoming.events.calendar.AdventCalendarForceOpenEvent;
-import com.eu.habbo.messages.incoming.events.calendar.AdventCalendarOpenDayEvent;
-import com.eu.habbo.messages.incoming.floorplaneditor.FloorPlanEditorRequestBlockedTilesEvent;
-import com.eu.habbo.messages.incoming.floorplaneditor.FloorPlanEditorRequestDoorSettingsEvent;
-import com.eu.habbo.messages.incoming.floorplaneditor.FloorPlanEditorSaveEvent;
+import com.eu.habbo.messages.incoming.events.calendar.OpenCampaignCalendarDoorEvent;
+import com.eu.habbo.messages.incoming.events.calendar.OpenCampaignCalendarDoorAsStaffEvent;
+import com.eu.habbo.messages.incoming.floorplaneditor.GetOccupiedTilesEvent;
+import com.eu.habbo.messages.incoming.floorplaneditor.GetRoomEntryTileEvent;
+import com.eu.habbo.messages.incoming.floorplaneditor.UpdateFloorPropertiesEvent;
 import com.eu.habbo.messages.incoming.friends.*;
 import com.eu.habbo.messages.incoming.gamecenter.*;
-import com.eu.habbo.messages.incoming.guardians.GuardianAcceptRequestEvent;
-import com.eu.habbo.messages.incoming.guardians.GuardianNoUpdatesWantedEvent;
-import com.eu.habbo.messages.incoming.guardians.GuardianVoteEvent;
+import com.eu.habbo.messages.incoming.guardians.ChatReviewGuideDecidesOnOfferEvent;
+import com.eu.habbo.messages.incoming.guardians.ChatReviewGuideDetachedEvent;
+import com.eu.habbo.messages.incoming.guardians.ChatReviewGuideVoteEvent;
 import com.eu.habbo.messages.incoming.guides.*;
 import com.eu.habbo.messages.incoming.guilds.*;
 import com.eu.habbo.messages.incoming.guilds.forums.*;
 import com.eu.habbo.messages.incoming.handshake.*;
-import com.eu.habbo.messages.incoming.helper.MySanctionStatusEvent;
-import com.eu.habbo.messages.incoming.helper.RequestTalentTrackEvent;
+import com.eu.habbo.messages.incoming.helper.GetCfhStatusEvent;
+import com.eu.habbo.messages.incoming.helper.GetTalentTrackEvent;
 import com.eu.habbo.messages.incoming.hotelview.*;
-import com.eu.habbo.messages.incoming.inventory.RequestInventoryBadgesEvent;
-import com.eu.habbo.messages.incoming.inventory.RequestInventoryBotsEvent;
-import com.eu.habbo.messages.incoming.inventory.RequestInventoryItemsEvent;
-import com.eu.habbo.messages.incoming.inventory.RequestInventoryPetsEvent;
+import com.eu.habbo.messages.incoming.inventory.GetBadgesEvent;
+import com.eu.habbo.messages.incoming.inventory.GetBotInventoryEvent;
+import com.eu.habbo.messages.incoming.inventory.RequestFurniInventoryWhenNotInRoomEvent;
+import com.eu.habbo.messages.incoming.inventory.GetPetInventoryEvent;
 import com.eu.habbo.messages.incoming.modtool.*;
 import com.eu.habbo.messages.incoming.navigator.*;
 import com.eu.habbo.messages.incoming.polls.AnswerPollEvent;
-import com.eu.habbo.messages.incoming.polls.CancelPollEvent;
-import com.eu.habbo.messages.incoming.polls.GetPollDataEvent;
+import com.eu.habbo.messages.incoming.polls.PollRejectEvent;
+import com.eu.habbo.messages.incoming.polls.PollStartEvent;
 import com.eu.habbo.messages.incoming.rooms.*;
-import com.eu.habbo.messages.incoming.rooms.bots.BotPickupEvent;
-import com.eu.habbo.messages.incoming.rooms.bots.BotPlaceEvent;
-import com.eu.habbo.messages.incoming.rooms.bots.BotSaveSettingsEvent;
-import com.eu.habbo.messages.incoming.rooms.bots.BotSettingsEvent;
+import com.eu.habbo.messages.incoming.rooms.bots.RemoveBotFromFlatEvent;
+import com.eu.habbo.messages.incoming.rooms.bots.PlaceBotEvent;
+import com.eu.habbo.messages.incoming.rooms.bots.CommandBotEvent;
+import com.eu.habbo.messages.incoming.rooms.bots.GetBotCommandConfigurationDataEvent;
 import com.eu.habbo.messages.incoming.rooms.items.*;
 import com.eu.habbo.messages.incoming.rooms.items.jukebox.*;
-import com.eu.habbo.messages.incoming.rooms.items.lovelock.LoveLockStartConfirmEvent;
-import com.eu.habbo.messages.incoming.rooms.items.rentablespace.RentSpaceCancelEvent;
-import com.eu.habbo.messages.incoming.rooms.items.rentablespace.RentSpaceEvent;
-import com.eu.habbo.messages.incoming.rooms.items.youtube.YoutubeRequestPlaylistChange;
-import com.eu.habbo.messages.incoming.rooms.items.youtube.YoutubeRequestPlaylists;
-import com.eu.habbo.messages.incoming.rooms.items.youtube.YoutubeRequestStateChange;
+import com.eu.habbo.messages.incoming.rooms.items.lovelock.FriendFurniConfirmLockEvent;
+import com.eu.habbo.messages.incoming.rooms.items.rentablespace.RentableSpaceCancelRentEvent;
+import com.eu.habbo.messages.incoming.rooms.items.rentablespace.RentableSpaceRentEvent;
+import com.eu.habbo.messages.incoming.rooms.items.youtube.SetYoutubeDisplayPlaylistEvent;
+import com.eu.habbo.messages.incoming.rooms.items.youtube.GetYoutubeDisplayStatusEvent;
+import com.eu.habbo.messages.incoming.rooms.items.youtube.ControlYoutubeDisplayPlaybackEvent;
 import com.eu.habbo.messages.incoming.rooms.pets.*;
-import com.eu.habbo.messages.incoming.rooms.promotions.BuyRoomPromotionEvent;
-import com.eu.habbo.messages.incoming.rooms.promotions.RequestPromotionRoomsEvent;
-import com.eu.habbo.messages.incoming.rooms.promotions.UpdateRoomPromotionEvent;
+import com.eu.habbo.messages.incoming.rooms.promotions.PurchaseRoomAdEvent;
+import com.eu.habbo.messages.incoming.rooms.promotions.GetRoomAdPurchaseInfoEvent;
+import com.eu.habbo.messages.incoming.rooms.promotions.EditEventEvent;
 import com.eu.habbo.messages.incoming.rooms.users.*;
 import com.eu.habbo.messages.incoming.trading.*;
-import com.eu.habbo.messages.incoming.unknown.RequestResolutionEvent;
+import com.eu.habbo.messages.incoming.unknown.GetResolutionAchievementsEvent;
 import com.eu.habbo.messages.incoming.inventory.GetBadgePointLimitsEvent;
 import com.eu.habbo.messages.incoming.users.*;
-import com.eu.habbo.messages.incoming.wired.WiredApplySetConditionsEvent;
-import com.eu.habbo.messages.incoming.wired.WiredConditionSaveDataEvent;
-import com.eu.habbo.messages.incoming.wired.WiredEffectSaveDataEvent;
-import com.eu.habbo.messages.incoming.wired.WiredTriggerSaveDataEvent;
+import com.eu.habbo.messages.incoming.wired.ApplySnapshotEvent;
+import com.eu.habbo.messages.incoming.wired.UpdateConditionEvent;
+import com.eu.habbo.messages.incoming.wired.UpdateActionEvent;
+import com.eu.habbo.messages.incoming.wired.UpdateTriggerEvent;
 import com.eu.habbo.plugin.EventHandler;
 import com.eu.habbo.plugin.events.emulator.EmulatorConfigUpdatedEvent;
 import gnu.trove.map.hash.THashMap;
@@ -223,332 +223,332 @@ public class PacketManager {
     }
 
     private void registerAmbassadors() throws Exception {
-        this.registerHandler(Incoming.AmbassadorAlertEvent, AmbassadorAlertCommandEvent.class);
-        this.registerHandler(Incoming.FollowFriendEvent, AmbassadorVisitCommandEvent.class);
+        this.registerHandler(Incoming.AmbassadorAlertEvent, AmbassadorAlertEvent.class);
+        this.registerHandler(Incoming.FollowFriendEvent, FollowFriendEvent.class);
     }
 
     private void registerCatalog() throws Exception {
-        this.registerHandler(Incoming.GetRecyclerPrizesEvent, RequestRecyclerLogicEvent.class);
-        this.registerHandler(Incoming.GetBundleDiscountRulesetEvent, RequestDiscountEvent.class);
-        this.registerHandler(Incoming.GetGiftWrappingConfigurationEvent, RequestGiftConfigurationEvent.class);
-        this.registerHandler(Incoming.GetMarketplaceConfigurationEvent, RequestMarketplaceConfigEvent.class);
-        this.registerHandler(Incoming.GetCatalogIndexEvent, RequestCatalogModeEvent.class);
-        this.registerHandler(Incoming.BuildersClubQueryFurniCountEvent, RequestCatalogIndexEvent.class);
-        this.registerHandler(Incoming.GetCatalogPageEvent, RequestCatalogPageEvent.class);
-        this.registerHandler(Incoming.PurchaseFromCatalogAsGiftEvent, CatalogBuyItemAsGiftEvent.class);
-        this.registerHandler(Incoming.PurchaseFromCatalogEvent, CatalogBuyItemEvent.class);
+        this.registerHandler(Incoming.GetRecyclerPrizesEvent, GetRecyclerPrizesEvent.class);
+        this.registerHandler(Incoming.GetBundleDiscountRulesetEvent, GetBundleDiscountRulesetEvent.class);
+        this.registerHandler(Incoming.GetGiftWrappingConfigurationEvent, GetGiftWrappingConfigurationEvent.class);
+        this.registerHandler(Incoming.GetMarketplaceConfigurationEvent, GetMarketplaceConfigurationEvent.class);
+        this.registerHandler(Incoming.GetCatalogIndexEvent, GetCatalogIndexEvent.class);
+        this.registerHandler(Incoming.BuildersClubQueryFurniCountEvent, BuildersClubQueryFurniCountEvent.class);
+        this.registerHandler(Incoming.GetCatalogPageEvent, GetCatalogPageEvent.class);
+        this.registerHandler(Incoming.PurchaseFromCatalogAsGiftEvent, PurchaseFromCatalogAsGiftEvent.class);
+        this.registerHandler(Incoming.PurchaseFromCatalogEvent, PurchaseFromCatalogEvent.class);
         this.registerHandler(Incoming.RedeemVoucherEvent, RedeemVoucherEvent.class);
-        this.registerHandler(Incoming.GetRecyclerStatusEvent, ReloadRecyclerEvent.class);
-        this.registerHandler(Incoming.RecycleItemsEvent, RecycleEvent.class);
-        this.registerHandler(Incoming.PresentOpenEvent, OpenRecycleBoxEvent.class);
-        this.registerHandler(Incoming.GetMarketplaceOwnOffersEvent, RequestOwnItemsEvent.class);
-        this.registerHandler(Incoming.CancelMarketplaceOfferEvent, TakeBackItemEvent.class);
-        this.registerHandler(Incoming.GetMarketplaceOffersEvent, RequestOffersEvent.class);
-        this.registerHandler(Incoming.GetMarketplaceItemStatsEvent, RequestItemInfoEvent.class);
-        this.registerHandler(Incoming.BuyMarketplaceOfferEvent, BuyItemEvent.class);
-        this.registerHandler(Incoming.GetMarketplaceCanMakeOfferEvent, RequestSellItemEvent.class);
-        this.registerHandler(Incoming.MakeOfferEvent, SellItemEvent.class);
-        this.registerHandler(Incoming.RedeemMarketplaceOfferCreditsEvent, RequestCreditsEvent.class);
-        this.registerHandler(Incoming.GetSellablePetPalettesEvent, RequestPetBreedsEvent.class);
-        this.registerHandler(Incoming.ApproveNameEvent, CheckPetNameEvent.class);
-        this.registerHandler(Incoming.GetClubOffersEvent, RequestClubDataEvent.class);
-        this.registerHandler(Incoming.GetClubGiftInfo, RequestClubGiftsEvent.class);
-        this.registerHandler(Incoming.GetProductOfferEvent, CatalogSearchedItemEvent.class);
-        this.registerHandler(Incoming.PurchaseTargetedOfferEvent, PurchaseTargetOfferEvent.class);
-        this.registerHandler(Incoming.SetTargetedOfferStateEvent, TargetOfferStateEvent.class);
-        this.registerHandler(Incoming.SelectClubGiftEvent, CatalogSelectClubGiftEvent.class);
-        this.registerHandler(Incoming.ScrGetKickbackInfoEvent, RequestClubCenterEvent.class);
-        this.registerHandler(Incoming.BuildersClubPlaceWallItemEvent, CatalogRequestClubDiscountEvent.class);
-        this.registerHandler(Incoming.PurchaseVipMembershipExtensionEvent, CatalogBuyClubDiscountEvent.class);
+        this.registerHandler(Incoming.GetRecyclerStatusEvent, GetRecyclerStatusEvent.class);
+        this.registerHandler(Incoming.RecycleItemsEvent, RecycleItemsEvent.class);
+        this.registerHandler(Incoming.PresentOpenEvent, PresentOpenEvent.class);
+        this.registerHandler(Incoming.GetMarketplaceOwnOffersEvent, GetMarketplaceOwnOffersEvent.class);
+        this.registerHandler(Incoming.CancelMarketplaceOfferEvent, CancelMarketplaceOfferEvent.class);
+        this.registerHandler(Incoming.GetMarketplaceOffersEvent, GetMarketplaceOffersEvent.class);
+        this.registerHandler(Incoming.GetMarketplaceItemStatsEvent, GetMarketplaceItemStatsEvent.class);
+        this.registerHandler(Incoming.BuyMarketplaceOfferEvent, BuyMarketplaceOfferEvent.class);
+        this.registerHandler(Incoming.GetMarketplaceCanMakeOfferEvent, GetMarketplaceCanMakeOfferEvent.class);
+        this.registerHandler(Incoming.MakeOfferEvent, MakeOfferEvent.class);
+        this.registerHandler(Incoming.RedeemMarketplaceOfferCreditsEvent, RedeemMarketplaceOfferCreditsEvent.class);
+        this.registerHandler(Incoming.GetSellablePetPalettesEvent, GetSellablePetPalettesEvent.class);
+        this.registerHandler(Incoming.ApproveNameEvent, ApproveNameEvent.class);
+        this.registerHandler(Incoming.GetClubOffersEvent, GetClubOffersEvent.class);
+        this.registerHandler(Incoming.GetClubGiftInfo, GetClubGiftInfo.class);
+        this.registerHandler(Incoming.GetProductOfferEvent, GetProductOfferEvent.class);
+        this.registerHandler(Incoming.PurchaseTargetedOfferEvent, PurchaseTargetedOfferEvent.class);
+        this.registerHandler(Incoming.SetTargetedOfferStateEvent, SetTargetedOfferStateEvent.class);
+        this.registerHandler(Incoming.SelectClubGiftEvent, SelectClubGiftEvent.class);
+        this.registerHandler(Incoming.ScrGetKickbackInfoEvent, ScrGetKickbackInfoEvent.class);
+        this.registerHandler(Incoming.BuildersClubPlaceWallItemEvent, BuildersClubPlaceWallItemEvent.class);
+        this.registerHandler(Incoming.PurchaseVipMembershipExtensionEvent, PurchaseVipMembershipExtensionEvent.class);
     }
 
     private void registerEvent() throws Exception {
-        this.registerHandler(Incoming.OpenCampaignCalendarDoorAsStaffEvent, AdventCalendarOpenDayEvent.class);
-        this.registerHandler(Incoming.OpenCampaignCalendarDoorEvent, AdventCalendarForceOpenEvent.class);
+        this.registerHandler(Incoming.OpenCampaignCalendarDoorAsStaffEvent, OpenCampaignCalendarDoorAsStaffEvent.class);
+        this.registerHandler(Incoming.OpenCampaignCalendarDoorEvent, OpenCampaignCalendarDoorEvent.class);
     }
 
     private void registerHandshake() throws Exception {
-        this.registerHandler(Incoming.ClientHelloEvent, ReleaseVersionEvent.class);
+        this.registerHandler(Incoming.ClientHelloEvent, ClientHelloEvent.class);
         this.registerHandler(Incoming.InitDiffieHandshakeEvent, InitDiffieHandshakeEvent.class);
         this.registerHandler(Incoming.CompleteDiffieHandshakeEvent, CompleteDiffieHandshakeEvent.class);
-        this.registerHandler(Incoming.SSOTicketEvent, SecureLoginEvent.class);
-        this.registerHandler(Incoming.UniqueIDEvent, MachineIDEvent.class);
+        this.registerHandler(Incoming.SSOTicketEvent, SSOTicketEvent.class);
+        this.registerHandler(Incoming.UniqueIDEvent, UniqueIDEvent.class);
         this.registerHandler(Incoming.GetIgnoredUsersEvent, GetIgnoredUsersEvent.class);
-        this.registerHandler(Incoming.LatencyPingRequestEvent, PingEvent.class);
+        this.registerHandler(Incoming.LatencyPingRequestEvent, LatencyPingRequestEvent.class);
     }
 
     private void registerFriends() throws Exception {
-        this.registerHandler(Incoming.GetMOTDEvent, RequestFriendsEvent.class);
-        this.registerHandler(Incoming.SetRelationshipStatusEvent, ChangeRelationEvent.class);
+        this.registerHandler(Incoming.GetMOTDEvent, GetMOTDEvent.class);
+        this.registerHandler(Incoming.SetRelationshipStatusEvent, SetRelationshipStatusEvent.class);
         this.registerHandler(Incoming.RemoveFriendEvent, RemoveFriendEvent.class);
-        this.registerHandler(Incoming.HabboSearchEvent, SearchUserEvent.class);
-        this.registerHandler(Incoming.RequestFriendEvent, FriendRequestEvent.class);
-        this.registerHandler(Incoming.AcceptFriendEvent, AcceptFriendRequestEvent.class);
-        this.registerHandler(Incoming.DeclineFriendEvent, DeclineFriendRequestEvent.class);
-        this.registerHandler(Incoming.SendMsgEvent, FriendPrivateMessageEvent.class);
-        this.registerHandler(Incoming.GetFriendRequestsEvent, RequestFriendRequestsEvent.class);
-        this.registerHandler(Incoming.VisitUserEvent, StalkFriendEvent.class);
-        this.registerHandler(Incoming.MessengerInitEvent, RequestInitFriendsEvent.class);
+        this.registerHandler(Incoming.HabboSearchEvent, HabboSearchEvent.class);
+        this.registerHandler(Incoming.RequestFriendEvent, RequestFriendEvent.class);
+        this.registerHandler(Incoming.AcceptFriendEvent, AcceptFriendEvent.class);
+        this.registerHandler(Incoming.DeclineFriendEvent, DeclineFriendEvent.class);
+        this.registerHandler(Incoming.SendMsgEvent, SendMsgEvent.class);
+        this.registerHandler(Incoming.GetFriendRequestsEvent, GetFriendRequestsEvent.class);
+        this.registerHandler(Incoming.VisitUserEvent, VisitUserEvent.class);
+        this.registerHandler(Incoming.MessengerInitEvent, MessengerInitEvent.class);
         this.registerHandler(Incoming.FindNewFriendsEvent, FindNewFriendsEvent.class);
-        this.registerHandler(Incoming.SendRoomInviteEvent, InviteFriendsEvent.class);
+        this.registerHandler(Incoming.SendRoomInviteEvent, SendRoomInviteEvent.class);
     }
 
     private void registerUsers() throws Exception {
-        this.registerHandler(Incoming.InfoRetrieveEvent, RequestUserDataEvent.class);
-        this.registerHandler(Incoming.GetCreditsInfoEvent, RequestUserCreditsEvent.class);
-        this.registerHandler(Incoming.ScrGetUserInfoEvent, RequestUserClubEvent.class);
-        this.registerHandler(Incoming.GetSoundSettingsEvent, RequestMeMenuSettingsEvent.class);
-        this.registerHandler(Incoming.GetTalentTrackLevelEvent, RequestUserCitizinShipEvent.class);
-        this.registerHandler(Incoming.GetExtendedProfileEvent, RequestUserProfileEvent.class);
-        this.registerHandler(Incoming.GetRelationshipStatusInfoEvent, RequestProfileFriendsEvent.class);
-        this.registerHandler(Incoming.GetWardrobeEvent, RequestUserWardrobeEvent.class);
-        this.registerHandler(Incoming.SaveWardrobeOutfitEvent, SaveWardrobeEvent.class);
-        this.registerHandler(Incoming.ChangeMottoEvent, SaveMottoEvent.class);
-        this.registerHandler(Incoming.UpdateFigureDataEvent, UserSaveLookEvent.class);
-        this.registerHandler(Incoming.SetActivatedBadgesEvent, UserWearBadgeEvent.class);
-        this.registerHandler(Incoming.GetSelectedBadgesEvent, RequestWearingBadgesEvent.class);
-        this.registerHandler(Incoming.SetSoundSettingsEvent, SaveUserVolumesEvent.class);
-        this.registerHandler(Incoming.SetRoomCameraPreferencesEvent, SaveBlockCameraFollowEvent.class);
-        this.registerHandler(Incoming.SetIgnoreRoomInvitesEvent, SaveIgnoreRoomInvitesEvent.class);
-        this.registerHandler(Incoming.SetChatPreferencesEvent, SavePreferOldChatEvent.class);
-        this.registerHandler(Incoming.AvatarEffectActivatedEvent, ActivateEffectEvent.class);
-        this.registerHandler(Incoming.AvatarEffectSelectedEvent, EnableEffectEvent.class);
-        this.registerHandler(Incoming.EventLogEvent, UserActivityEvent.class);
-        this.registerHandler(Incoming.NewUserExperienceScriptProceedEvent, UserNuxEvent.class);
-        this.registerHandler(Incoming.NewUserExperienceGetGiftsEvent, PickNewUserGiftEvent.class);
-        this.registerHandler(Incoming.CheckUserNameEvent, ChangeNameCheckUsernameEvent.class);
-        this.registerHandler(Incoming.ChangeUserNameEvent, ConfirmChangeNameEvent.class);
-        this.registerHandler(Incoming.SetChatStylePreferenceEvent, ChangeChatBubbleEvent.class);
+        this.registerHandler(Incoming.InfoRetrieveEvent, InfoRetrieveEvent.class);
+        this.registerHandler(Incoming.GetCreditsInfoEvent, GetCreditsInfoEvent.class);
+        this.registerHandler(Incoming.ScrGetUserInfoEvent, ScrGetUserInfoEvent.class);
+        this.registerHandler(Incoming.GetSoundSettingsEvent, GetSoundSettingsEvent.class);
+        this.registerHandler(Incoming.GetTalentTrackLevelEvent, GetTalentTrackLevelEvent.class);
+        this.registerHandler(Incoming.GetExtendedProfileEvent, GetExtendedProfileEvent.class);
+        this.registerHandler(Incoming.GetRelationshipStatusInfoEvent, GetRelationshipStatusInfoEvent.class);
+        this.registerHandler(Incoming.GetWardrobeEvent, GetWardrobeEvent.class);
+        this.registerHandler(Incoming.SaveWardrobeOutfitEvent, SaveWardrobeOutfitEvent.class);
+        this.registerHandler(Incoming.ChangeMottoEvent, ChangeMottoEvent.class);
+        this.registerHandler(Incoming.UpdateFigureDataEvent, UpdateFigureDataEvent.class);
+        this.registerHandler(Incoming.SetActivatedBadgesEvent, SetActivatedBadgesEvent.class);
+        this.registerHandler(Incoming.GetSelectedBadgesEvent, GetSelectedBadgesEvent.class);
+        this.registerHandler(Incoming.SetSoundSettingsEvent, SetSoundSettingsEvent.class);
+        this.registerHandler(Incoming.SetRoomCameraPreferencesEvent, SetRoomCameraPreferencesEvent.class);
+        this.registerHandler(Incoming.SetIgnoreRoomInvitesEvent, SetIgnoreRoomInvitesEvent.class);
+        this.registerHandler(Incoming.SetChatPreferencesEvent, SetChatPreferencesEvent.class);
+        this.registerHandler(Incoming.AvatarEffectActivatedEvent, AvatarEffectActivatedEvent.class);
+        this.registerHandler(Incoming.AvatarEffectSelectedEvent, AvatarEffectSelectedEvent.class);
+        this.registerHandler(Incoming.EventLogEvent, EventLogEvent.class);
+        this.registerHandler(Incoming.NewUserExperienceScriptProceedEvent, NewUserExperienceScriptProceedEvent.class);
+        this.registerHandler(Incoming.NewUserExperienceGetGiftsEvent, NewUserExperienceGetGiftsEvent.class);
+        this.registerHandler(Incoming.CheckUserNameEvent, CheckUserNameEvent.class);
+        this.registerHandler(Incoming.ChangeUserNameEvent, ChangeUserNameEvent.class);
+        this.registerHandler(Incoming.SetChatStylePreferenceEvent, SetChatStylePreferenceEvent.class);
         this.registerHandler(Incoming.UpdateUIFlagsEvent, UpdateUIFlagsEvent.class);
     }
 
     private void registerNavigator() throws Exception {
-        this.registerHandler(Incoming.GetUserFlatCatsEvent, RequestRoomCategoriesEvent.class);
-        this.registerHandler(Incoming.PopularRoomsSearchEvent, RequestPopularRoomsEvent.class);
-        this.registerHandler(Incoming.RoomsWithHighestScoreSearchEvent, RequestHighestScoreRoomsEvent.class);
-        this.registerHandler(Incoming.MyRoomsSearchEvent, RequestMyRoomsEvent.class);
-        this.registerHandler(Incoming.CanCreateRoomEvent, RequestCanCreateRoomEvent.class);
-        this.registerHandler(Incoming.GetUnreadForumsCountEvent, RequestPromotedRoomsEvent.class);
-        this.registerHandler(Incoming.CreateFlatEvent, RequestCreateRoomEvent.class);
-        this.registerHandler(Incoming.GetPopularRoomTagsEvent, RequestTagsEvent.class);
+        this.registerHandler(Incoming.GetUserFlatCatsEvent, GetUserFlatCatsEvent.class);
+        this.registerHandler(Incoming.PopularRoomsSearchEvent, PopularRoomsSearchEvent.class);
+        this.registerHandler(Incoming.RoomsWithHighestScoreSearchEvent, RoomsWithHighestScoreSearchEvent.class);
+        this.registerHandler(Incoming.MyRoomsSearchEvent, MyRoomsSearchEvent.class);
+        this.registerHandler(Incoming.CanCreateRoomEvent, CanCreateRoomEvent.class);
+        this.registerHandler(Incoming.GetUnreadForumsCountEvent, GetUnreadForumsCountEvent.class);
+        this.registerHandler(Incoming.CreateFlatEvent, CreateFlatEvent.class);
+        this.registerHandler(Incoming.GetPopularRoomTagsEvent, GetPopularRoomTagsEvent.class);
         this.registerHandler(Incoming.SearchRoomsByTagEvent, SearchRoomsByTagEvent.class);
-        this.registerHandler(Incoming.RoomTextSearchEvent, SearchRoomsEvent.class);
-        this.registerHandler(Incoming.RoomsWhereMyFriendsAreSearchEvent, SearchRoomsFriendsNowEvent.class);
-        this.registerHandler(Incoming.MyFriendsRoomsSearchEvent, SearchRoomsFriendsOwnEvent.class);
-        this.registerHandler(Incoming.MyRoomRightsSearchEvent, SearchRoomsWithRightsEvent.class);
-        this.registerHandler(Incoming.MyGuildBasesSearchEvent, SearchRoomsInGroupEvent.class);
-        this.registerHandler(Incoming.MyFavouriteRoomsSearchEvent, SearchRoomsMyFavouriteEvent.class);
-        this.registerHandler(Incoming.MyRoomHistorySearchEvent, SearchRoomsVisitedEvent.class);
-        this.registerHandler(Incoming.NewNavigatorInitEvent, RequestNewNavigatorDataEvent.class);
-        this.registerHandler(Incoming.NewNavigatorSearchEvent, RequestNewNavigatorRoomsEvent.class);
-        this.registerHandler(Incoming.ForwardToSomeRoomEvent, NewNavigatorActionEvent.class);
-        this.registerHandler(Incoming.GetUserEventCatsEvent, RequestNavigatorSettingsEvent.class);
-        this.registerHandler(Incoming.SetNewNavigatorWindowPreferencesEvent, SaveWindowSettingsEvent.class);
-        this.registerHandler(Incoming.DeleteRoomEvent, RequestDeleteRoomEvent.class);
-        this.registerHandler(Incoming.NavigatorSetSearchCodeViewModeEvent, NavigatorCategoryListModeEvent.class);
-        this.registerHandler(Incoming.NavigatorAddCollapsedCategoryEvent, NavigatorCollapseCategoryEvent.class);
-        this.registerHandler(Incoming.NavigatorRemoveCollapsedCategoryEvent, NavigatorUncollapseCategoryEvent.class);
-        this.registerHandler(Incoming.NavigatorAddSavedSearchEvent, AddSavedSearchEvent.class);
-        this.registerHandler(Incoming.NavigatorDeleteSavedSearchEvent, DeleteSavedSearchEvent.class);
+        this.registerHandler(Incoming.RoomTextSearchEvent, RoomTextSearchEvent.class);
+        this.registerHandler(Incoming.RoomsWhereMyFriendsAreSearchEvent, RoomsWhereMyFriendsAreSearchEvent.class);
+        this.registerHandler(Incoming.MyFriendsRoomsSearchEvent, MyFriendsRoomsSearchEvent.class);
+        this.registerHandler(Incoming.MyRoomRightsSearchEvent, MyRoomRightsSearchEvent.class);
+        this.registerHandler(Incoming.MyGuildBasesSearchEvent, MyGuildBasesSearchEvent.class);
+        this.registerHandler(Incoming.MyFavouriteRoomsSearchEvent, MyFavouriteRoomsSearchEvent.class);
+        this.registerHandler(Incoming.MyRoomHistorySearchEvent, MyRoomHistorySearchEvent.class);
+        this.registerHandler(Incoming.NewNavigatorInitEvent, NewNavigatorInitEvent.class);
+        this.registerHandler(Incoming.NewNavigatorSearchEvent, NewNavigatorSearchEvent.class);
+        this.registerHandler(Incoming.ForwardToSomeRoomEvent, ForwardToSomeRoomEvent.class);
+        this.registerHandler(Incoming.GetUserEventCatsEvent, GetUserEventCatsEvent.class);
+        this.registerHandler(Incoming.SetNewNavigatorWindowPreferencesEvent, SetNewNavigatorWindowPreferencesEvent.class);
+        this.registerHandler(Incoming.DeleteRoomEvent, DeleteRoomEvent.class);
+        this.registerHandler(Incoming.NavigatorSetSearchCodeViewModeEvent, NavigatorSetSearchCodeViewModeEvent.class);
+        this.registerHandler(Incoming.NavigatorAddCollapsedCategoryEvent, NavigatorAddCollapsedCategoryEvent.class);
+        this.registerHandler(Incoming.NavigatorRemoveCollapsedCategoryEvent, NavigatorRemoveCollapsedCategoryEvent.class);
+        this.registerHandler(Incoming.NavigatorAddSavedSearchEvent, NavigatorAddSavedSearchEvent.class);
+        this.registerHandler(Incoming.NavigatorDeleteSavedSearchEvent, NavigatorDeleteSavedSearchEvent.class);
     }
 
     private void registerHotelview() throws Exception {
-        this.registerHandler(Incoming.QuitEvent, HotelViewEvent.class);
-        this.registerHandler(Incoming.GetBonusRareInfoEvent, HotelViewRequestBonusRareEvent.class);
-        this.registerHandler(Incoming.GetPromoArticlesEvent, RequestNewsListEvent.class);
-        this.registerHandler(Incoming.GetCurrentTimingCodeEvent, HotelViewDataEvent.class);
+        this.registerHandler(Incoming.QuitEvent, QuitEvent.class);
+        this.registerHandler(Incoming.GetBonusRareInfoEvent, GetBonusRareInfoEvent.class);
+        this.registerHandler(Incoming.GetPromoArticlesEvent, GetPromoArticlesEvent.class);
+        this.registerHandler(Incoming.GetCurrentTimingCodeEvent, GetCurrentTimingCodeEvent.class);
         this.registerHandler(Incoming.HotelViewRequestBadgeRewardEvent, HotelViewRequestBadgeRewardEvent.class);
         this.registerHandler(Incoming.HotelViewClaimBadgeRewardEvent, HotelViewClaimBadgeRewardEvent.class);
-        this.registerHandler(Incoming.GetLimitedOfferAppearingNextEvent, HotelViewRequestLTDAvailabilityEvent.class);
+        this.registerHandler(Incoming.GetLimitedOfferAppearingNextEvent, GetLimitedOfferAppearingNextEvent.class);
         this.registerHandler(Incoming.HotelViewRequestSecondsUntilEvent, HotelViewRequestSecondsUntilEvent.class);
     }
 
     private void registerInventory() throws Exception {
-        this.registerHandler(Incoming.GetBadgesEvent, RequestInventoryBadgesEvent.class);
-        this.registerHandler(Incoming.GetBotInventoryEvent, RequestInventoryBotsEvent.class);
-        this.registerHandler(Incoming.RequestFurniInventoryEvent, RequestInventoryItemsEvent.class);
-        this.registerHandler(Incoming.RequestFurniInventoryWhenNotInRoomEvent, RequestInventoryItemsEvent.class);
-        this.registerHandler(Incoming.GetPetInventoryEvent, RequestInventoryPetsEvent.class);
+        this.registerHandler(Incoming.GetBadgesEvent, GetBadgesEvent.class);
+        this.registerHandler(Incoming.GetBotInventoryEvent, GetBotInventoryEvent.class);
+        this.registerHandler(Incoming.RequestFurniInventoryEvent, RequestFurniInventoryWhenNotInRoomEvent.class);
+        this.registerHandler(Incoming.RequestFurniInventoryWhenNotInRoomEvent, RequestFurniInventoryWhenNotInRoomEvent.class);
+        this.registerHandler(Incoming.GetPetInventoryEvent, GetPetInventoryEvent.class);
     }
 
     void registerRooms() throws Exception {
-        this.registerHandler(Incoming.OpenFlatConnectionEvent, RequestRoomLoadEvent.class);
-        this.registerHandler(Incoming.GetFurnitureAliasesEvent, RequestRoomHeightmapEvent.class);
-        this.registerHandler(Incoming.GetRoomEntryDataEvent, RequestRoomHeightmapEvent.class);
-        this.registerHandler(Incoming.RateFlatEvent, RoomVoteEvent.class);
-        this.registerHandler(Incoming.GetGuestRoomEvent, RequestRoomDataEvent.class);
-        this.registerHandler(Incoming.SaveRoomSettingsEvent, RoomSettingsSaveEvent.class);
-        this.registerHandler(Incoming.PlaceObjectEvent, RoomPlaceItemEvent.class);
-        this.registerHandler(Incoming.MoveObjectEvent, RotateMoveItemEvent.class);
+        this.registerHandler(Incoming.OpenFlatConnectionEvent, OpenFlatConnectionEvent.class);
+        this.registerHandler(Incoming.GetFurnitureAliasesEvent, GetRoomEntryDataEvent.class);// should this be seperate event classes?
+        this.registerHandler(Incoming.GetRoomEntryDataEvent, GetRoomEntryDataEvent.class);// should this be seperate event classes?
+        this.registerHandler(Incoming.RateFlatEvent, RateFlatEvent.class);
+        this.registerHandler(Incoming.GetGuestRoomEvent, GetGuestRoomEvent.class);
+        this.registerHandler(Incoming.SaveRoomSettingsEvent, SaveRoomSettingsEvent.class);
+        this.registerHandler(Incoming.PlaceObjectEvent, PlaceObjectEvent.class);
+        this.registerHandler(Incoming.MoveObjectEvent, MoveObjectEvent.class);
         this.registerHandler(Incoming.MoveWallItemEvent, MoveWallItemEvent.class);
-        this.registerHandler(Incoming.PickupObjectEvent, RoomPickupItemEvent.class);
-        this.registerHandler(Incoming.RequestRoomPropertySet, RoomPlacePaintEvent.class);
-        this.registerHandler(Incoming.StartTypingEvent, RoomUserStartTypingEvent.class);
-        this.registerHandler(Incoming.CancelTypingEvent, RoomUserStopTypingEvent.class);
-        this.registerHandler(Incoming.UseFurnitureEvent, ToggleFloorItemEvent.class);
-        this.registerHandler(Incoming.UseWallItemEvent, ToggleWallItemEvent.class);
-        this.registerHandler(Incoming.SetRoomBackgroundColorDataEvent, RoomBackgroundEvent.class);
-        this.registerHandler(Incoming.SetMannequinNameEvent, MannequinSaveNameEvent.class);
-        this.registerHandler(Incoming.SetMannequinFigureEvent, MannequinSaveLookEvent.class);
-        this.registerHandler(Incoming.SetClothingChangeDataEvent, FootballGateSaveLookEvent.class);
-        this.registerHandler(Incoming.SetObjectDataEvent, AdvertisingSaveEvent.class);
-        this.registerHandler(Incoming.GetRoomSettingsEvent, RequestRoomSettingsEvent.class);
-        this.registerHandler(Incoming.RoomDimmerGetPresetsEvent, MoodLightSettingsEvent.class);
-        this.registerHandler(Incoming.RoomDimmerChangeStateEvent, MoodLightTurnOnEvent.class);
-        this.registerHandler(Incoming.DropCarryItemEvent, RoomUserDropHandItemEvent.class);
-        this.registerHandler(Incoming.LookToEvent, RoomUserLookAtPoint.class);
-        this.registerHandler(Incoming.ChatEvent, RoomUserTalkEvent.class);
-        this.registerHandler(Incoming.ShoutEvent, RoomUserShoutEvent.class);
-        this.registerHandler(Incoming.WhisperEvent, RoomUserWhisperEvent.class);
-        this.registerHandler(Incoming.AvatarExpressionEvent, RoomUserActionEvent.class);
-        this.registerHandler(Incoming.ChangePostureEvent, RoomUserSitEvent.class);
-        this.registerHandler(Incoming.DanceEvent, RoomUserDanceEvent.class);
-        this.registerHandler(Incoming.SignEvent, RoomUserSignEvent.class);
-        this.registerHandler(Incoming.MoveAvatarEvent, RoomUserWalkEvent.class);
-        this.registerHandler(Incoming.RespectUserEvent, RoomUserGiveRespectEvent.class);
-        this.registerHandler(Incoming.AssignRightsEvent, RoomUserGiveRightsEvent.class);
-        this.registerHandler(Incoming.RemoveOwnRoomRightsRoomEvent, RoomRemoveRightsEvent.class);
-        this.registerHandler(Incoming.GetFlatControllersEvent, RequestRoomRightsEvent.class);
-        this.registerHandler(Incoming.RemoveAllRightsEvent, RoomRemoveAllRightsEvent.class);
-        this.registerHandler(Incoming.RemoveRightsEvent, RoomUserRemoveRightsEvent.class);
-        this.registerHandler(Incoming.PlaceBotEvent, BotPlaceEvent.class);
-        this.registerHandler(Incoming.RemoveBotFromFlatEvent, BotPickupEvent.class);
-        this.registerHandler(Incoming.CommandBotEvent, BotSaveSettingsEvent.class);
-        this.registerHandler(Incoming.GetBotCommandConfigurationDataEvent, BotSettingsEvent.class);
-        this.registerHandler(Incoming.ThrowDiceEvent, TriggerDiceEvent.class);
-        this.registerHandler(Incoming.DiceOffEvent, CloseDiceEvent.class);
-        this.registerHandler(Incoming.SpinWheelOfFortuneEvent, TriggerColorWheelEvent.class);
-        this.registerHandler(Incoming.CreditFurniRedeemEvent, RedeemItemEvent.class);
-        this.registerHandler(Incoming.PlacePetEvent, PetPlaceEvent.class);
+        this.registerHandler(Incoming.PickupObjectEvent, PickupObjectEvent.class);
+        this.registerHandler(Incoming.RequestRoomPropertySet, RequestRoomPropertySet.class);
+        this.registerHandler(Incoming.StartTypingEvent, StartTypingEvent.class);
+        this.registerHandler(Incoming.CancelTypingEvent, CancelTypingEvent.class);
+        this.registerHandler(Incoming.UseFurnitureEvent, UseFurnitureEvent.class);
+        this.registerHandler(Incoming.UseWallItemEvent, UseWallItemEvent.class);
+        this.registerHandler(Incoming.SetRoomBackgroundColorDataEvent, SetRoomBackgroundColorDataEvent.class);
+        this.registerHandler(Incoming.SetMannequinNameEvent, SetMannequinNameEvent.class);
+        this.registerHandler(Incoming.SetMannequinFigureEvent, SetMannequinFigureEvent.class);
+        this.registerHandler(Incoming.SetClothingChangeDataEvent, SetClothingChangeDataEvent.class);
+        this.registerHandler(Incoming.SetObjectDataEvent, SetObjectDataEvent.class);
+        this.registerHandler(Incoming.GetRoomSettingsEvent, GetRoomSettingsEvent.class);
+        this.registerHandler(Incoming.RoomDimmerGetPresetsEvent, RoomDimmerGetPresetsEvent.class);
+        this.registerHandler(Incoming.RoomDimmerChangeStateEvent, RoomDimmerChangeStateEvent.class);
+        this.registerHandler(Incoming.DropCarryItemEvent, DropCarryItemEvent.class);
+        this.registerHandler(Incoming.LookToEvent, LookToEvent.class);
+        this.registerHandler(Incoming.ChatEvent, ChatEvent.class);
+        this.registerHandler(Incoming.ShoutEvent, ShoutEvent.class);
+        this.registerHandler(Incoming.WhisperEvent, WhisperEvent.class);
+        this.registerHandler(Incoming.AvatarExpressionEvent, AvatarExpressionEvent.class);
+        this.registerHandler(Incoming.ChangePostureEvent, ChangePostureEvent.class);
+        this.registerHandler(Incoming.DanceEvent, DanceEvent.class);
+        this.registerHandler(Incoming.SignEvent, SignEvent.class);
+        this.registerHandler(Incoming.MoveAvatarEvent, MoveAvatarEvent.class);
+        this.registerHandler(Incoming.RespectUserEvent, RespectUserEvent.class);
+        this.registerHandler(Incoming.AssignRightsEvent, AssignRightsEvent.class);
+        this.registerHandler(Incoming.RemoveOwnRoomRightsRoomEvent, RemoveOwnRoomRightsRoomEvent.class);
+        this.registerHandler(Incoming.GetFlatControllersEvent, GetFlatControllersEvent.class);
+        this.registerHandler(Incoming.RemoveAllRightsEvent, RemoveAllRightsEvent.class);
+        this.registerHandler(Incoming.RemoveRightsEvent, RemoveRightsEvent.class);
+        this.registerHandler(Incoming.PlaceBotEvent, PlaceBotEvent.class);
+        this.registerHandler(Incoming.RemoveBotFromFlatEvent, RemoveBotFromFlatEvent.class);
+        this.registerHandler(Incoming.CommandBotEvent, CommandBotEvent.class);
+        this.registerHandler(Incoming.GetBotCommandConfigurationDataEvent, GetBotCommandConfigurationDataEvent.class);
+        this.registerHandler(Incoming.ThrowDiceEvent, ThrowDiceEvent.class);
+        this.registerHandler(Incoming.DiceOffEvent, DiceOffEvent.class);
+        this.registerHandler(Incoming.SpinWheelOfFortuneEvent, SpinWheelOfFortuneEvent.class);
+        this.registerHandler(Incoming.CreditFurniRedeemEvent, CreditFurniRedeemEvent.class);
+        this.registerHandler(Incoming.PlacePetEvent, PlacePetEvent.class);
         this.registerHandler(Incoming.RoomUserKickEvent, RoomUserKickEvent.class);
-        this.registerHandler(Incoming.SetCustomStackingHeightEvent, SetStackHelperHeightEvent.class);
-        this.registerHandler(Incoming.EnterOneWayDoorEvent, TriggerOneWayGateEvent.class);
-        this.registerHandler(Incoming.LetUserInEvent, HandleDoorbellEvent.class);
-        this.registerHandler(Incoming.CustomizeAvatarWithFurniEvent, RedeemClothingEvent.class);
-        this.registerHandler(Incoming.PlacePostItEvent, PostItPlaceEvent.class);
-        this.registerHandler(Incoming.GetItemDataEvent, PostItRequestDataEvent.class);
-        this.registerHandler(Incoming.SetItemDataEvent, PostItSaveDataEvent.class);
-        this.registerHandler(Incoming.RemoveItemEvent, PostItDeleteEvent.class);
-        this.registerHandler(Incoming.RoomDimmerSavePresetEvent, MoodLightSaveSettingsEvent.class);
-        this.registerHandler(Incoming.RentableSpaceRentEvent, RentSpaceEvent.class);
-        this.registerHandler(Incoming.RentableSpaceCancelRentEvent, RentSpaceCancelEvent.class);
-        this.registerHandler(Incoming.UpdateHomeRoomEvent, SetHomeRoomEvent.class);
-        this.registerHandler(Incoming.PassCarryItemEvent, RoomUserGiveHandItemEvent.class);
-        this.registerHandler(Incoming.MuteAllInRoomEvent, RoomMuteEvent.class);
-        this.registerHandler(Incoming.GetCustomRoomFilterEvent, RequestRoomWordFilterEvent.class);
-        this.registerHandler(Incoming.UpdateRoomFilterEvent, RoomWordFilterModifyEvent.class);
-        this.registerHandler(Incoming.SubmitRoomToCompetitionEvent, RoomStaffPickEvent.class);
-        this.registerHandler(Incoming.GetBannedUsersFromRoomEvent, RoomRequestBannedUsersEvent.class);
-        this.registerHandler(Incoming.GetOfficialSongIdEvent, JukeBoxRequestTrackCodeEvent.class);
-        this.registerHandler(Incoming.GetSongInfoEvent, JukeBoxRequestTrackDataEvent.class);
-        this.registerHandler(Incoming.AddJukeboxDiskEvent, JukeBoxAddSoundTrackEvent.class);
-        this.registerHandler(Incoming.RemoveJukeboxDiskEvent, JukeBoxRemoveSoundTrackEvent.class);
-        this.registerHandler(Incoming.GetNowPlayingEvent, JukeBoxRequestPlayListEvent.class);
-        this.registerHandler(Incoming.JukeBoxEventOne, JukeBoxEventOne.class);
-        this.registerHandler(Incoming.GetJukeboxPlayListEvent, JukeBoxEventTwo.class);
-        this.registerHandler(Incoming.AddSpamWallPostItEvent, SavePostItStickyPoleEvent.class);
-        this.registerHandler(Incoming.GetRoomAdPurchaseInfoEvent, RequestPromotionRoomsEvent.class);
-        this.registerHandler(Incoming.PurchaseRoomAdEvent, BuyRoomPromotionEvent.class);
-        this.registerHandler(Incoming.EditEventEvent, UpdateRoomPromotionEvent.class);
-        this.registerHandler(Incoming.IgnoreUserEvent, IgnoreRoomUserEvent.class);
-        this.registerHandler(Incoming.UnignoreUserEvent, UnIgnoreRoomUserEvent.class);
+        this.registerHandler(Incoming.SetCustomStackingHeightEvent, SetCustomStackingHeightEvent.class);
+        this.registerHandler(Incoming.EnterOneWayDoorEvent, EnterOneWayDoorEvent.class);
+        this.registerHandler(Incoming.LetUserInEvent, LetUserInEvent.class);
+        this.registerHandler(Incoming.CustomizeAvatarWithFurniEvent, CustomizeAvatarWithFurniEvent.class);
+        this.registerHandler(Incoming.PlacePostItEvent, PlacePostItEvent.class);
+        this.registerHandler(Incoming.GetItemDataEvent, GetItemDataEvent.class);
+        this.registerHandler(Incoming.SetItemDataEvent, SetItemDataEvent.class);
+        this.registerHandler(Incoming.RemoveItemEvent, RemoveItemEvent.class);
+        this.registerHandler(Incoming.RoomDimmerSavePresetEvent, RoomDimmerSavePresetEvent.class);
+        this.registerHandler(Incoming.RentableSpaceRentEvent, RentableSpaceRentEvent.class);
+        this.registerHandler(Incoming.RentableSpaceCancelRentEvent, RentableSpaceCancelRentEvent.class);
+        this.registerHandler(Incoming.UpdateHomeRoomEvent, UpdateHomeRoomEvent.class);
+        this.registerHandler(Incoming.PassCarryItemEvent, PassCarryItemEvent.class);
+        this.registerHandler(Incoming.MuteAllInRoomEvent, MuteAllInRoomEvent.class);
+        this.registerHandler(Incoming.GetCustomRoomFilterEvent, GetCustomRoomFilterEvent.class);
+        this.registerHandler(Incoming.UpdateRoomFilterEvent, UpdateRoomFilterEvent.class);
+        this.registerHandler(Incoming.SubmitRoomToCompetitionEvent, SubmitRoomToCompetitionEvent.class);
+        this.registerHandler(Incoming.GetBannedUsersFromRoomEvent, GetBannedUsersFromRoomEvent.class);
+        this.registerHandler(Incoming.GetOfficialSongIdEvent, GetOfficialSongIdEvent.class);
+        this.registerHandler(Incoming.GetSongInfoEvent, GetSongInfoEvent.class);
+        this.registerHandler(Incoming.AddJukeboxDiskEvent, AddJukeboxDiskEvent.class);
+        this.registerHandler(Incoming.RemoveJukeboxDiskEvent, RemoveJukeboxDiskEvent.class);
+        this.registerHandler(Incoming.GetNowPlayingEvent, GetNowPlayingEvent.class);
+        this.registerHandler(Incoming.JukeBoxEventOne, JukeBoxEventOne.class); // this doesnt even exist in the swf src for this prod.
+        this.registerHandler(Incoming.GetJukeboxPlayListEvent, GetJukeboxPlayListEvent.class);
+        this.registerHandler(Incoming.AddSpamWallPostItEvent, AddSpamWallPostItEvent.class);
+        this.registerHandler(Incoming.GetRoomAdPurchaseInfoEvent, GetRoomAdPurchaseInfoEvent.class);
+        this.registerHandler(Incoming.PurchaseRoomAdEvent, PurchaseRoomAdEvent.class);
+        this.registerHandler(Incoming.EditEventEvent, EditEventEvent.class);
+        this.registerHandler(Incoming.IgnoreUserEvent, IgnoreUserEvent.class);
+        this.registerHandler(Incoming.UnignoreUserEvent, UnignoreUserEvent.class);
         this.registerHandler(Incoming.RoomUserMuteEvent, RoomUserMuteEvent.class);
-        this.registerHandler(Incoming.BanUserWithDurationEvent, RoomUserBanEvent.class);
-        this.registerHandler(Incoming.UnbanUserFromRoomEvent, UnbanRoomUserEvent.class);
-        this.registerHandler(Incoming.GetUserTagsEvent, RequestRoomUserTagsEvent.class);
-        this.registerHandler(Incoming.GetYoutubeDisplayStatusEvent, YoutubeRequestPlaylists.class);
-        this.registerHandler(Incoming.ControlYoutubeDisplayPlaybackEvent, YoutubeRequestStateChange.class);
-        this.registerHandler(Incoming.SetYoutubeDisplayPlaylistEvent, YoutubeRequestPlaylistChange.class);
-        this.registerHandler(Incoming.AddFavouriteRoomEvent, RoomFavoriteEvent.class);
-        this.registerHandler(Incoming.FriendFurniConfirmLockEvent, LoveLockStartConfirmEvent.class);
-        this.registerHandler(Incoming.DeleteFavouriteRoomEvent, RoomUnFavoriteEvent.class);
-        this.registerHandler(Incoming.SetRandomStateEvent, UseRandomStateItemEvent.class);
+        this.registerHandler(Incoming.BanUserWithDurationEvent, BanUserWithDurationEvent.class);
+        this.registerHandler(Incoming.UnbanUserFromRoomEvent, UnbanUserFromRoomEvent.class);
+        this.registerHandler(Incoming.GetUserTagsEvent, GetUserTagsEvent.class);
+        this.registerHandler(Incoming.GetYoutubeDisplayStatusEvent, GetYoutubeDisplayStatusEvent.class);
+        this.registerHandler(Incoming.ControlYoutubeDisplayPlaybackEvent, ControlYoutubeDisplayPlaybackEvent.class);
+        this.registerHandler(Incoming.SetYoutubeDisplayPlaylistEvent, SetYoutubeDisplayPlaylistEvent.class);
+        this.registerHandler(Incoming.AddFavouriteRoomEvent, AddFavouriteRoomEvent.class);
+        this.registerHandler(Incoming.FriendFurniConfirmLockEvent, FriendFurniConfirmLockEvent.class);
+        this.registerHandler(Incoming.DeleteFavouriteRoomEvent, DeleteFavouriteRoomEvent.class);
+        this.registerHandler(Incoming.SetRandomStateEvent, SetRandomStateEvent.class);
     }
 
     void registerPolls() throws Exception {
-        this.registerHandler(Incoming.PollRejectEvent, CancelPollEvent.class);
-        this.registerHandler(Incoming.PollStartEvent, GetPollDataEvent.class);
+        this.registerHandler(Incoming.PollRejectEvent, PollRejectEvent.class);
+        this.registerHandler(Incoming.PollStartEvent, PollStartEvent.class);
         this.registerHandler(Incoming.AnswerPollEvent, AnswerPollEvent.class);
     }
 
     void registerModTool() throws Exception {
-        this.registerHandler(Incoming.GetModeratorRoomInfoEvent, ModToolRequestRoomInfoEvent.class);
-        this.registerHandler(Incoming.GetRoomChatlogEvent, ModToolRequestRoomChatlogEvent.class);
-        this.registerHandler(Incoming.GetModeratorUserInfoEvent, ModToolRequestUserInfoEvent.class);
-        this.registerHandler(Incoming.PickIssuesEvent, ModToolPickTicketEvent.class);
-        this.registerHandler(Incoming.CloseIssuesEvent, ModToolCloseTicketEvent.class);
-        this.registerHandler(Incoming.ReleaseIssuesEvent, ModToolReleaseTicketEvent.class);
-        this.registerHandler(Incoming.ModMessageEvent, ModToolAlertEvent.class);
+        this.registerHandler(Incoming.GetModeratorRoomInfoEvent, GetModeratorRoomInfoEvent.class);
+        this.registerHandler(Incoming.GetRoomChatlogEvent, GetRoomChatlogEvent.class);
+        this.registerHandler(Incoming.GetModeratorUserInfoEvent, GetModeratorUserInfoEvent.class);
+        this.registerHandler(Incoming.PickIssuesEvent, PickIssuesEvent.class);
+        this.registerHandler(Incoming.CloseIssuesEvent, CloseIssuesEvent.class);
+        this.registerHandler(Incoming.ReleaseIssuesEvent, ReleaseIssuesEvent.class);
+        this.registerHandler(Incoming.ModMessageEvent, ModMessageEvent.class);
         this.registerHandler(Incoming.ModToolWarnEvent, ModToolWarnEvent.class);
-        this.registerHandler(Incoming.ModKickEvent, ModToolKickEvent.class);
-        this.registerHandler(Incoming.ModeratorActionEvent, ModToolRoomAlertEvent.class);
-        this.registerHandler(Incoming.ModerateRoomEvent, ModToolChangeRoomSettingsEvent.class);
-        this.registerHandler(Incoming.GetRoomVisitsEvent, ModToolRequestRoomVisitsEvent.class);
-        this.registerHandler(Incoming.GetCfhChatlogEvent, ModToolRequestIssueChatlogEvent.class);
+        this.registerHandler(Incoming.ModKickEvent, ModKickEvent.class);
+        this.registerHandler(Incoming.ModeratorActionEvent, ModeratorActionEvent.class);
+        this.registerHandler(Incoming.ModerateRoomEvent, ModerateRoomEvent.class);
+        this.registerHandler(Incoming.GetRoomVisitsEvent, GetRoomVisitsEvent.class);
+        this.registerHandler(Incoming.GetCfhChatlogEvent, GetCfhChatlogEvent.class);
         this.registerHandler(Incoming.ModToolRequestRoomUserChatlogEvent, ModToolRequestRoomUserChatlogEvent.class);
-        this.registerHandler(Incoming.GetUserChatlogEvent, ModToolRequestUserChatlogEvent.class);
-        this.registerHandler(Incoming.ModAlertEvent, ModToolSanctionAlertEvent.class);
-        this.registerHandler(Incoming.ModMuteEvent, ModToolSanctionMuteEvent.class);
-        this.registerHandler(Incoming.ModBanEvent, ModToolSanctionBanEvent.class);
-        this.registerHandler(Incoming.ModTradingLockEvent, ModToolSanctionTradeLockEvent.class);
-        this.registerHandler(Incoming.ModToolSanctionEvent, ModToolIssueChangeTopicEvent.class);
-        this.registerHandler(Incoming.CloseIssueDefaultActionEvent, ModToolIssueDefaultSanctionEvent.class);
+        this.registerHandler(Incoming.GetUserChatlogEvent, GetUserChatlogEvent.class);
+        this.registerHandler(Incoming.ModAlertEvent, ModAlertEvent.class);
+        this.registerHandler(Incoming.ModMuteEvent, ModMuteEvent.class);
+        this.registerHandler(Incoming.ModBanEvent, ModBanEvent.class);
+        this.registerHandler(Incoming.ModTradingLockEvent, ModTradingLockEvent.class);
+        this.registerHandler(Incoming.ModToolSanctionEvent, ModToolSanctionEvent.class);
+        this.registerHandler(Incoming.CloseIssueDefaultActionEvent, CloseIssueDefaultActionEvent.class);
 
-        this.registerHandler(Incoming.GetPendingCallsForHelpEvent, RequestReportRoomEvent.class);
-        this.registerHandler(Incoming.GetGuideReportingStatusEvent, RequestReportUserBullyingEvent.class);
-        this.registerHandler(Incoming.ChatReviewSessionCreateEvent, ReportBullyEvent.class);
-        this.registerHandler(Incoming.CallForHelpEvent, ReportEvent.class);
-        this.registerHandler(Incoming.CallForHelpFromIMEvent, ReportFriendPrivateChatEvent.class);
-        this.registerHandler(Incoming.CallForHelpFromForumThreadEvent, ReportThreadEvent.class);
-        this.registerHandler(Incoming.CallForHelpFromForumMessageEvent, ReportCommentEvent.class);
-        this.registerHandler(Incoming.CallForHelpFromPhotoEvent, ReportPhotoEvent.class);
+        this.registerHandler(Incoming.GetPendingCallsForHelpEvent, GetPendingCallsForHelpEvent.class);
+        this.registerHandler(Incoming.GetGuideReportingStatusEvent, GetGuideReportingStatusEvent.class);
+        this.registerHandler(Incoming.ChatReviewSessionCreateEvent, ChatReviewSessionCreateEvent.class);
+        this.registerHandler(Incoming.CallForHelpEvent, CallForHelpEvent.class);
+        this.registerHandler(Incoming.CallForHelpFromIMEvent, CallForHelpFromIMEvent.class);
+        this.registerHandler(Incoming.CallForHelpFromForumThreadEvent, CallForHelpFromForumThreadEvent.class);
+        this.registerHandler(Incoming.CallForHelpFromForumMessageEvent, CallForHelpFromForumMessageEvent.class);
+        this.registerHandler(Incoming.CallForHelpFromPhotoEvent, CallForHelpFromPhotoEvent.class);
     }
 
     void registerTrading() throws Exception {
-        this.registerHandler(Incoming.OpenTradingEvent, TradeStartEvent.class);
-        this.registerHandler(Incoming.AddItemToTradeEvent, TradeOfferItemEvent.class);
-        this.registerHandler(Incoming.AddItemsToTradeEvent, TradeOfferMultipleItemsEvent.class);
-        this.registerHandler(Incoming.RemoveItemFromTradeEvent, TradeCancelOfferItemEvent.class);
-        this.registerHandler(Incoming.AcceptTradingEvent, TradeAcceptEvent.class);
-        this.registerHandler(Incoming.UnacceptTradingEvent, TradeUnAcceptEvent.class);
-        this.registerHandler(Incoming.ConfirmAcceptTradingEvent, TradeConfirmEvent.class);
-        this.registerHandler(Incoming.CloseTradingEvent, TradeCloseEvent.class);
-        this.registerHandler(Incoming.ConfirmDeclineTradingEvent, TradeCancelEvent.class);
+        this.registerHandler(Incoming.OpenTradingEvent, OpenTradingEvent.class);
+        this.registerHandler(Incoming.AddItemToTradeEvent, AddItemToTradeEvent.class);
+        this.registerHandler(Incoming.AddItemsToTradeEvent, AddItemsToTradeEvent.class);
+        this.registerHandler(Incoming.RemoveItemFromTradeEvent, RemoveItemFromTradeEvent.class);
+        this.registerHandler(Incoming.AcceptTradingEvent, AcceptTradingEvent.class);
+        this.registerHandler(Incoming.UnacceptTradingEvent, UnacceptTradingEvent.class);
+        this.registerHandler(Incoming.ConfirmAcceptTradingEvent, ConfirmAcceptTradingEvent.class);
+        this.registerHandler(Incoming.CloseTradingEvent, CloseTradingEvent.class);
+        this.registerHandler(Incoming.ConfirmDeclineTradingEvent, ConfirmDeclineTradingEvent.class);
     }
 
     void registerGuilds() throws Exception {
-        this.registerHandler(Incoming.GetGuildCreationInfoEvent, RequestGuildBuyRoomsEvent.class);
-        this.registerHandler(Incoming.GetGuildEditorDataEvent, RequestGuildPartsEvent.class);
-        this.registerHandler(Incoming.CreateGuildEvent, RequestGuildBuyEvent.class);
-        this.registerHandler(Incoming.GetHabboGroupDetailsEvent, RequestGuildInfoEvent.class);
-        this.registerHandler(Incoming.GetGuildEditInfoEvent, RequestGuildManageEvent.class);
-        this.registerHandler(Incoming.GetGuildMembersEvent, RequestGuildMembersEvent.class);
-        this.registerHandler(Incoming.JoinHabboGroupEvent, RequestGuildJoinEvent.class);
-        this.registerHandler(Incoming.UpdateGuildIdentityEvent, GuildChangeNameDescEvent.class);
-        this.registerHandler(Incoming.UpdateGuildBadgeEvent, GuildChangeBadgeEvent.class);
-        this.registerHandler(Incoming.UpdateGuildColorsEvent, GuildChangeColorsEvent.class);
-        this.registerHandler(Incoming.RemoveAdminRightsFromMemberEvent, GuildRemoveAdminEvent.class);
-        this.registerHandler(Incoming.KickMemberEvent, GuildRemoveMemberEvent.class);
-        this.registerHandler(Incoming.UpdateGuildSettingsEvent, GuildChangeSettingsEvent.class);
-        this.registerHandler(Incoming.ApproveMembershipRequestEvent, GuildAcceptMembershipEvent.class);
-        this.registerHandler(Incoming.RejectMembershipRequestEvent, GuildDeclineMembershipEvent.class);
-        this.registerHandler(Incoming.AddAdminRightsToMemberEvent, GuildSetAdminEvent.class);
-        this.registerHandler(Incoming.SelectFavouriteHabboGroupEvent, GuildSetFavoriteEvent.class);
-        this.registerHandler(Incoming.GetGuildMembershipsEvent, RequestOwnGuildsEvent.class);
-        this.registerHandler(Incoming.GetGuildFurniContextMenuInfoEvent, RequestGuildFurniWidgetEvent.class);
-        this.registerHandler(Incoming.GetMemberGuildItemCountEvent, GuildConfirmRemoveMemberEvent.class);
-        this.registerHandler(Incoming.DeselectFavouriteHabboGroupEvent, GuildRemoveFavoriteEvent.class);
-        this.registerHandler(Incoming.DeactivateGuildEvent, GuildDeleteEvent.class);
-        this.registerHandler(Incoming.GetForumsListEvent, GuildForumListEvent.class);
-        this.registerHandler(Incoming.GetThreadsEvent, GuildForumThreadsEvent.class);
-        this.registerHandler(Incoming.GetForumStatsEvent, GuildForumDataEvent.class);
-        this.registerHandler(Incoming.PostMessageEvent, GuildForumPostThreadEvent.class);
-        this.registerHandler(Incoming.UpdateForumSettingsEvent, GuildForumUpdateSettingsEvent.class);
-        this.registerHandler(Incoming.GetMessagesEvent, GuildForumThreadsMessagesEvent.class);
-        this.registerHandler(Incoming.ModerateMessageEvent, GuildForumModerateMessageEvent.class);
-        this.registerHandler(Incoming.ModerateThreadEvent, GuildForumModerateThreadEvent.class);
-        this.registerHandler(Incoming.UpdateThreadEvent, GuildForumThreadUpdateEvent.class);
-        this.registerHandler(Incoming.GetHabboGroupBadgesEvent, GetHabboGuildBadgesMessageEvent.class);
+        this.registerHandler(Incoming.GetGuildCreationInfoEvent, GetGuildCreationInfoEvent.class);
+        this.registerHandler(Incoming.GetGuildEditorDataEvent, GetGuildEditorDataEvent.class);
+        this.registerHandler(Incoming.CreateGuildEvent, CreateGuildEvent.class);
+        this.registerHandler(Incoming.GetHabboGroupDetailsEvent, GetHabboGroupDetailsEvent.class);
+        this.registerHandler(Incoming.GetGuildEditInfoEvent, GetGuildEditInfoEvent.class);
+        this.registerHandler(Incoming.GetGuildMembersEvent, GetGuildMembersEvent.class);
+        this.registerHandler(Incoming.JoinHabboGroupEvent, JoinHabboGroupEvent.class);
+        this.registerHandler(Incoming.UpdateGuildIdentityEvent, UpdateGuildIdentityEvent.class);
+        this.registerHandler(Incoming.UpdateGuildBadgeEvent, UpdateGuildBadgeEvent.class);
+        this.registerHandler(Incoming.UpdateGuildColorsEvent, UpdateGuildColorsEvent.class);
+        this.registerHandler(Incoming.RemoveAdminRightsFromMemberEvent, RemoveAdminRightsFromMemberEvent.class);
+        this.registerHandler(Incoming.KickMemberEvent, KickMemberEvent.class);
+        this.registerHandler(Incoming.UpdateGuildSettingsEvent, UpdateGuildSettingsEvent.class);
+        this.registerHandler(Incoming.ApproveMembershipRequestEvent, ApproveMembershipRequestEvent.class);
+        this.registerHandler(Incoming.RejectMembershipRequestEvent, RejectMembershipRequestEvent.class);
+        this.registerHandler(Incoming.AddAdminRightsToMemberEvent, AddAdminRightsToMemberEvent.class);
+        this.registerHandler(Incoming.SelectFavouriteHabboGroupEvent, SelectFavouriteHabboGroupEvent.class);
+        this.registerHandler(Incoming.GetGuildMembershipsEvent, GetGuildMembershipsEvent.class);
+        this.registerHandler(Incoming.GetGuildFurniContextMenuInfoEvent, GetGuildFurniContextMenuInfoEvent.class);
+        this.registerHandler(Incoming.GetMemberGuildItemCountEvent, GetMemberGuildItemCountEvent.class);
+        this.registerHandler(Incoming.DeselectFavouriteHabboGroupEvent, DeselectFavouriteHabboGroupEvent.class);
+        this.registerHandler(Incoming.DeactivateGuildEvent, DeactivateGuildEvent.class);
+        this.registerHandler(Incoming.GetForumsListEvent, GetForumsListEvent.class);
+        this.registerHandler(Incoming.GetThreadsEvent, GetThreadsEvent.class);
+        this.registerHandler(Incoming.GetForumStatsEvent, GetForumStatsEvent.class);
+        this.registerHandler(Incoming.PostMessageEvent, PostMessageEvent.class);
+        this.registerHandler(Incoming.UpdateForumSettingsEvent, UpdateForumSettingsEvent.class);
+        this.registerHandler(Incoming.GetMessagesEvent, GetMessagesEvent.class);
+        this.registerHandler(Incoming.ModerateMessageEvent, ModerateMessageEvent.class);
+        this.registerHandler(Incoming.ModerateThreadEvent, ModerateThreadEvent.class);
+        this.registerHandler(Incoming.UpdateThreadEvent, UpdateThreadEvent.class);
+        this.registerHandler(Incoming.GetHabboGroupBadgesEvent, GetHabboGroupBadgesEvent.class);
 
 //        this.registerHandler(Incoming.GuildForumDataEvent,              GuildForumModerateMessageEvent.class);
 //        this.registerHandler(Incoming.GuildForumDataEvent,              GuildForumModerateThreadEvent.class);
@@ -560,88 +560,88 @@ public class PacketManager {
 
     void registerPets() throws Exception {
         this.registerHandler(Incoming.GetPetInfoEvent, GetPetInfoEvent.class);
-        this.registerHandler(Incoming.RemovePetFromFlatEvent, PetPickupEvent.class);
-        this.registerHandler(Incoming.RespectPetEvent, ScratchPetEvent.class);
-        this.registerHandler(Incoming.GetPetCommandsEvent, RequestPetTrainingPanelEvent.class);
-        this.registerHandler(Incoming.CustomizePetWithFurniEvent, PetUseItemEvent.class);
-        this.registerHandler(Incoming.TogglePetRidingPermissionEvent, PetRideSettingsEvent.class);
-        this.registerHandler(Incoming.MountPetEvent, PetRideEvent.class);
-        this.registerHandler(Incoming.RemoveSaddleFromPetEvent, HorseRemoveSaddleEvent.class);
-        this.registerHandler(Incoming.TogglePetBreedingPermissionEvent, ToggleMonsterplantBreedableEvent.class);
-        this.registerHandler(Incoming.CompostPlantEvent, CompostMonsterplantEvent.class);
-        this.registerHandler(Incoming.BreedPetsEvent, BreedMonsterplantsEvent.class);
+        this.registerHandler(Incoming.RemovePetFromFlatEvent, RemovePetFromFlatEvent.class);
+        this.registerHandler(Incoming.RespectPetEvent, RespectPetEvent.class);
+        this.registerHandler(Incoming.GetPetCommandsEvent, GetPetCommandsEvent.class);
+        this.registerHandler(Incoming.CustomizePetWithFurniEvent, CustomizePetWithFurniEvent.class);
+        this.registerHandler(Incoming.TogglePetRidingPermissionEvent, TogglePetRidingPermissionEvent.class);
+        this.registerHandler(Incoming.MountPetEvent, MountPetEvent.class);
+        this.registerHandler(Incoming.RemoveSaddleFromPetEvent, RemoveSaddleFromPetEvent.class);
+        this.registerHandler(Incoming.TogglePetBreedingPermissionEvent, TogglePetBreedingPermissionEvent.class);
+        this.registerHandler(Incoming.CompostPlantEvent, CompostPlantEvent.class);
+        this.registerHandler(Incoming.BreedPetsEvent, BreedPetsEvent.class);
         this.registerHandler(Incoming.MovePetEvent, MovePetEvent.class);
-        this.registerHandler(Incoming.OpenPetPackageEvent, PetPackageNameEvent.class);
-        this.registerHandler(Incoming.CancelPetBreedingEvent, StopBreedingEvent.class);
+        this.registerHandler(Incoming.OpenPetPackageEvent, OpenPetPackageEvent.class);
+        this.registerHandler(Incoming.CancelPetBreedingEvent, CancelPetBreedingEvent.class);
         this.registerHandler(Incoming.ConfirmPetBreedingEvent, ConfirmPetBreedingEvent.class);
     }
 
     void registerWired() throws Exception {
-        this.registerHandler(Incoming.UpdateTriggerEvent, WiredTriggerSaveDataEvent.class);
-        this.registerHandler(Incoming.UpdateActionEvent, WiredEffectSaveDataEvent.class);
-        this.registerHandler(Incoming.UpdateConditionEvent, WiredConditionSaveDataEvent.class);
-        this.registerHandler(Incoming.ApplySnapshotEvent, WiredApplySetConditionsEvent.class);
+        this.registerHandler(Incoming.UpdateTriggerEvent, UpdateTriggerEvent.class);
+        this.registerHandler(Incoming.UpdateActionEvent, UpdateActionEvent.class);
+        this.registerHandler(Incoming.UpdateConditionEvent, UpdateConditionEvent.class);
+        this.registerHandler(Incoming.ApplySnapshotEvent, ApplySnapshotEvent.class);
     }
 
     void registerUnknown() throws Exception {
-        this.registerHandler(Incoming.GetResolutionAchievementsEvent, RequestResolutionEvent.class);
-        this.registerHandler(Incoming.GetTalentTrackEvent, RequestTalentTrackEvent.class);
+        this.registerHandler(Incoming.GetResolutionAchievementsEvent, GetResolutionAchievementsEvent.class);
+        this.registerHandler(Incoming.GetTalentTrackEvent, GetTalentTrackEvent.class);
         this.registerHandler(Incoming.GetBadgePointLimitsEvent, GetBadgePointLimitsEvent.class);
-        this.registerHandler(Incoming.GetCfhStatusEvent, MySanctionStatusEvent.class);
+        this.registerHandler(Incoming.GetCfhStatusEvent, GetCfhStatusEvent.class);
     }
 
     void registerFloorPlanEditor() throws Exception {
-        this.registerHandler(Incoming.UpdateFloorPropertiesEvent, FloorPlanEditorSaveEvent.class);
-        this.registerHandler(Incoming.GetOccupiedTilesEvent, FloorPlanEditorRequestBlockedTilesEvent.class);
-        this.registerHandler(Incoming.GetRoomEntryTileEvent, FloorPlanEditorRequestDoorSettingsEvent.class);
+        this.registerHandler(Incoming.UpdateFloorPropertiesEvent, UpdateFloorPropertiesEvent.class);
+        this.registerHandler(Incoming.GetOccupiedTilesEvent, GetOccupiedTilesEvent.class);
+        this.registerHandler(Incoming.GetRoomEntryTileEvent, GetRoomEntryTileEvent.class);
     }
 
     void registerAchievements() throws Exception {
-        this.registerHandler(Incoming.GetAchievementsEvent, RequestAchievementsEvent.class);
+        this.registerHandler(Incoming.GetAchievementsEvent, GetAchievementsEvent.class);
         this.registerHandler(Incoming.RequestAchievementConfigurationEvent, RequestAchievementConfigurationEvent.class);
     }
 
     void registerGuides() throws Exception {
-        this.registerHandler(Incoming.GuideSessionOnDutyUpdateEvent, RequestGuideToolEvent.class);
-        this.registerHandler(Incoming.GuideSessionCreateEvent, RequestGuideAssistanceEvent.class);
-        this.registerHandler(Incoming.GuideSessionIsTypingEvent, GuideUserTypingEvent.class);
-        this.registerHandler(Incoming.GuideSessionReportEvent, GuideReportHelperEvent.class);
-        this.registerHandler(Incoming.GuideSessionFeedbackEvent, GuideRecommendHelperEvent.class);
-        this.registerHandler(Incoming.GuideSessionMessageEvent, GuideUserMessageEvent.class);
-        this.registerHandler(Incoming.GuideSessionRequesterCancelsEvent, GuideCancelHelpRequestEvent.class);
-        this.registerHandler(Incoming.GuideSessionGuideDecidesEvent, GuideHandleHelpRequestEvent.class);
-        this.registerHandler(Incoming.GuideSessionInviteRequesterEvent, GuideInviteUserEvent.class);
-        this.registerHandler(Incoming.GuideSessionGetRequesterRoomEvent, GuideVisitUserEvent.class);
-        this.registerHandler(Incoming.GuideSessionResolvedEvent, GuideCloseHelpRequestEvent.class);
+        this.registerHandler(Incoming.GuideSessionOnDutyUpdateEvent, GuideSessionOnDutyUpdateEvent.class);
+        this.registerHandler(Incoming.GuideSessionCreateEvent, GuideSessionCreateEvent.class);
+        this.registerHandler(Incoming.GuideSessionIsTypingEvent, GuideSessionIsTypingEvent.class);
+        this.registerHandler(Incoming.GuideSessionReportEvent, GuideSessionReportEvent.class);
+        this.registerHandler(Incoming.GuideSessionFeedbackEvent, GuideSessionFeedbackEvent.class);
+        this.registerHandler(Incoming.GuideSessionMessageEvent, GuideSessionMessageEvent.class);
+        this.registerHandler(Incoming.GuideSessionRequesterCancelsEvent, GuideSessionRequesterCancelsEvent.class);
+        this.registerHandler(Incoming.GuideSessionGuideDecidesEvent, GuideSessionGuideDecidesEvent.class);
+        this.registerHandler(Incoming.GuideSessionInviteRequesterEvent, GuideSessionInviteRequesterEvent.class);
+        this.registerHandler(Incoming.GuideSessionGetRequesterRoomEvent, GuideSessionGetRequesterRoomEvent.class);
+        this.registerHandler(Incoming.GuideSessionResolvedEvent, GuideSessionResolvedEvent.class);
 
-        this.registerHandler(Incoming.ChatReviewGuideDetachedEvent, GuardianNoUpdatesWantedEvent.class);
-        this.registerHandler(Incoming.ChatReviewGuideDecidesOnOfferEvent, GuardianAcceptRequestEvent.class);
-        this.registerHandler(Incoming.ChatReviewGuideVoteEvent, GuardianVoteEvent.class);
+        this.registerHandler(Incoming.ChatReviewGuideDetachedEvent, ChatReviewGuideDetachedEvent.class);
+        this.registerHandler(Incoming.ChatReviewGuideDecidesOnOfferEvent, ChatReviewGuideDecidesOnOfferEvent.class);
+        this.registerHandler(Incoming.ChatReviewGuideVoteEvent, ChatReviewGuideVoteEvent.class);
     }
 
     void registerCrafting() throws Exception {
-        this.registerHandler(Incoming.GetCraftingRecipeEvent, RequestCraftingRecipesEvent.class);
-        this.registerHandler(Incoming.GetCraftableProductsEvent, CraftingAddRecipeEvent.class);
-        this.registerHandler(Incoming.CraftEvent, CraftingCraftItemEvent.class);
-        this.registerHandler(Incoming.CraftSecretEvent, CraftingCraftSecretEvent.class);
-        this.registerHandler(Incoming.GetCraftingRecipesAvailableEvent, RequestCraftingRecipesAvailableEvent.class);
+        this.registerHandler(Incoming.GetCraftingRecipeEvent, GetCraftingRecipeEvent.class);
+        this.registerHandler(Incoming.GetCraftableProductsEvent, GetCraftableProductsEvent.class);
+        this.registerHandler(Incoming.CraftEvent, CraftEvent.class);
+        this.registerHandler(Incoming.CraftSecretEvent, CraftSecretEvent.class);
+        this.registerHandler(Incoming.GetCraftingRecipesAvailableEvent, GetCraftingRecipesAvailableEvent.class);
     }
 
     void registerCamera() throws Exception {
-        this.registerHandler(Incoming.RenderRoomEvent, CameraRoomPictureEvent.class);
+        this.registerHandler(Incoming.RenderRoomEvent, RenderRoomEvent.class);
         this.registerHandler(Incoming.RequestCameraConfigurationEvent, RequestCameraConfigurationEvent.class);
-        this.registerHandler(Incoming.PurchasePhotoEvent, CameraPurchaseEvent.class);
-        this.registerHandler(Incoming.RenderRoomThumbnailEvent, CameraRoomThumbnailEvent.class);
-        this.registerHandler(Incoming.PublishPhotoEvent, CameraPublishToWebEvent.class);
+        this.registerHandler(Incoming.PurchasePhotoEvent, PurchasePhotoEvent.class);
+        this.registerHandler(Incoming.RenderRoomThumbnailEvent, RenderRoomThumbnailEvent.class);
+        this.registerHandler(Incoming.PublishPhotoEvent, PublishPhotoEvent.class);
     }
 
     void registerGameCenter() throws Exception {
-        this.registerHandler(Incoming.GetGameListEvent, GameCenterRequestGamesEvent.class);
-        this.registerHandler(Incoming.GetGameStatusEvent, GameCenterRequestAccountStatusEvent.class);
-        this.registerHandler(Incoming.JoinQueueEvent, GameCenterJoinGameEvent.class);
-        this.registerHandler(Incoming.GetWeeklyGameRewardWinnersEvent, GameCenterLoadGameEvent.class);
-        this.registerHandler(Incoming.GameUnloadedEvent, GameCenterLeaveGameEvent.class);
-        this.registerHandler(Incoming.GetWeeklyGameRewardEvent, GameCenterEvent.class);
-        this.registerHandler(Incoming.Game2GetAccountGameStatusEvent, GameCenterRequestGameStatusEvent.class);
+        this.registerHandler(Incoming.GetGameListEvent, GetGameListEvent.class);
+        this.registerHandler(Incoming.GetGameStatusEvent, GetGameStatusEvent.class);
+        this.registerHandler(Incoming.JoinQueueEvent, JoinQueueEvent.class);
+        this.registerHandler(Incoming.GetWeeklyGameRewardWinnersEvent, GetWeeklyGameRewardWinnersEvent.class);
+        this.registerHandler(Incoming.GameUnloadedEvent, GameUnloadedEvent.class);
+        this.registerHandler(Incoming.GetWeeklyGameRewardEvent, GetWeeklyGameRewardEvent.class);
+        this.registerHandler(Incoming.Game2GetAccountGameStatusEvent, Game2GetAccountGameStatusEvent.class);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/achievements/GetAchievementsEvent.java
similarity index 84%
rename from src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/achievements/GetAchievementsEvent.java
index cf914c6e..23ce046d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/achievements/GetAchievementsEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.achievements;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.achievements.AchievementsComposer;
 
-public class RequestAchievementsEvent extends MessageHandler {
+public class GetAchievementsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new AchievementsComposer(this.client.getHabbo()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorAlertCommandEvent.java b/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorAlertEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorAlertCommandEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorAlertEvent.java
index 071158eb..0a007a36 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorAlertCommandEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorAlertEvent.java
@@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageCo
 import com.eu.habbo.plugin.events.support.SupportUserAlertedEvent;
 import com.eu.habbo.plugin.events.support.SupportUserAlertedReason;
 
-public class AmbassadorAlertCommandEvent extends MessageHandler {
+public class AmbassadorAlertEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (!this.client.getHabbo().hasPermission(Permission.ACC_AMBASSADOR)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorVisitCommandEvent.java b/src/main/java/com/eu/habbo/messages/incoming/ambassadors/FollowFriendEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorVisitCommandEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/ambassadors/FollowFriendEvent.java
index f127a720..e550d1ef 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorVisitCommandEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/ambassadors/FollowFriendEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer;
 
-public class AmbassadorVisitCommandEvent extends MessageHandler {
+public class FollowFriendEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_AMBASSADOR)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/PublishPhotoEvent.java
similarity index 85%
rename from src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/camera/PublishPhotoEvent.java
index ae19f6d7..af447f3d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/camera/PublishPhotoEvent.java
@@ -13,8 +13,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-public class CameraPublishToWebEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CameraPublishToWebEvent.class);
+public class PublishPhotoEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(PublishPhotoEvent.class);
 
     public static int CAMERA_PUBLISH_POINTS = 5;
     public static int CAMERA_PUBLISH_POINTS_TYPE = 0;
@@ -28,8 +28,8 @@ public class CameraPublishToWebEvent extends MessageHandler {
         if (habbo.getHabboInfo().getPhotoJSON().isEmpty()) return;
         if (!habbo.getHabboInfo().getPhotoJSON().contains(habbo.getHabboInfo().getPhotoTimestamp() + "")) return;
 
-        if (habbo.getHabboInfo().getCurrencyAmount(CameraPublishToWebEvent.CAMERA_PUBLISH_POINTS_TYPE) < CameraPublishToWebEvent.CAMERA_PUBLISH_POINTS) {
-            this.client.sendResponse(new NotEnoughBalanceMessageComposer(false, true, CameraPublishToWebEvent.CAMERA_PUBLISH_POINTS));
+        if (habbo.getHabboInfo().getCurrencyAmount(PublishPhotoEvent.CAMERA_PUBLISH_POINTS_TYPE) < PublishPhotoEvent.CAMERA_PUBLISH_POINTS) {
+            this.client.sendResponse(new NotEnoughBalanceMessageComposer(false, true, PublishPhotoEvent.CAMERA_PUBLISH_POINTS));
             return;
         }
 
@@ -50,7 +50,7 @@ public class CameraPublishToWebEvent extends MessageHandler {
                     statement.execute();
 
                     this.client.getHabbo().getHabboInfo().setWebPublishTimestamp(timestamp);
-                    this.client.getHabbo().givePoints(CameraPublishToWebEvent.CAMERA_PUBLISH_POINTS_TYPE, -CameraPublishToWebEvent.CAMERA_PUBLISH_POINTS);
+                    this.client.getHabbo().givePoints(PublishPhotoEvent.CAMERA_PUBLISH_POINTS_TYPE, -PublishPhotoEvent.CAMERA_PUBLISH_POINTS);
 
                     isOk = true;
                 } catch (SQLException e) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/PurchasePhotoEvent.java
similarity index 84%
rename from src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/camera/PurchasePhotoEvent.java
index eab2e111..32acc489 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/camera/PurchasePhotoEvent.java
@@ -10,20 +10,20 @@ import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer;
 import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
 import com.eu.habbo.plugin.events.users.UserPurchasePictureEvent;
 
-public class CameraPurchaseEvent extends MessageHandler {
+public class PurchasePhotoEvent extends MessageHandler {
     public static int CAMERA_PURCHASE_CREDITS = 5;
     public static int CAMERA_PURCHASE_POINTS = 5;
     public static int CAMERA_PURCHASE_POINTS_TYPE = 0;
 
     @Override
     public void handle() throws Exception {
-        if (this.client.getHabbo().getHabboInfo().getCredits() < CameraPurchaseEvent.CAMERA_PURCHASE_CREDITS) {
+        if (this.client.getHabbo().getHabboInfo().getCredits() < PurchasePhotoEvent.CAMERA_PURCHASE_CREDITS) {
             this.client.sendResponse(new NotEnoughBalanceMessageComposer(true, false, 0));
             return;
         }
 
-        if (this.client.getHabbo().getHabboInfo().getCurrencyAmount(CameraPurchaseEvent.CAMERA_PURCHASE_POINTS_TYPE) < CameraPurchaseEvent.CAMERA_PURCHASE_POINTS) {
-            this.client.sendResponse(new NotEnoughBalanceMessageComposer(false, true, CameraPurchaseEvent.CAMERA_PURCHASE_POINTS_TYPE));
+        if (this.client.getHabbo().getHabboInfo().getCurrencyAmount(PurchasePhotoEvent.CAMERA_PURCHASE_POINTS_TYPE) < PurchasePhotoEvent.CAMERA_PURCHASE_POINTS) {
+            this.client.sendResponse(new NotEnoughBalanceMessageComposer(false, true, PurchasePhotoEvent.CAMERA_PURCHASE_POINTS_TYPE));
             return;
         }
 
@@ -48,8 +48,8 @@ public class CameraPurchaseEvent extends MessageHandler {
             this.client.sendResponse(new UnseenItemsComposer(photoItem));
             this.client.sendResponse(new FurniListInvalidateComposer());
 
-            this.client.getHabbo().giveCredits(-CameraPurchaseEvent.CAMERA_PURCHASE_CREDITS);
-            this.client.getHabbo().givePoints(CameraPurchaseEvent.CAMERA_PURCHASE_POINTS_TYPE, -CameraPurchaseEvent.CAMERA_PURCHASE_POINTS);
+            this.client.getHabbo().giveCredits(-PurchasePhotoEvent.CAMERA_PURCHASE_CREDITS);
+            this.client.getHabbo().givePoints(PurchasePhotoEvent.CAMERA_PURCHASE_POINTS_TYPE, -PurchasePhotoEvent.CAMERA_PURCHASE_POINTS);
 
             AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("CameraPhotoCount"));
         }
diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraRoomPictureEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/camera/CameraRoomPictureEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomEvent.java
index 15506037..28b4831f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraRoomPictureEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.networking.camera.CameraClient;
 import com.eu.habbo.networking.camera.messages.outgoing.CameraRenderImageComposer;
 import com.eu.habbo.util.crypto.ZIP;
 
-public class CameraRoomPictureEvent extends MessageHandler {
+public class RenderRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (!this.client.getHabbo().hasPermission("acc_camera")) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraRoomThumbnailEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomThumbnailEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/camera/CameraRoomThumbnailEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomThumbnailEvent.java
index 1f1f244d..04f5f032 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraRoomThumbnailEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomThumbnailEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.networking.camera.CameraClient;
 import com.eu.habbo.networking.camera.messages.outgoing.CameraRenderImageComposer;
 import com.eu.habbo.util.crypto.ZIP;
 
-public class CameraRoomThumbnailEvent extends MessageHandler {
+public class RenderRoomThumbnailEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (!this.client.getHabbo().hasPermission("acc_camera")) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CheckPetNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/ApproveNameEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/CheckPetNameEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/ApproveNameEvent.java
index cea6712f..00ec28b3 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CheckPetNameEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/ApproveNameEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.ApproveNameMessageComposer;
 import org.apache.commons.lang3.StringUtils;
 
-public class CheckPetNameEvent extends MessageHandler {
+public class ApproveNameEvent extends MessageHandler {
     public static int PET_NAME_LENGTH_MINIMUM = Emulator.getConfig().getInt("hotel.pets.name.length.min");
     public static int PET_NAME_LENGTH_MAXIMUM = Emulator.getConfig().getInt("hotel.pets.name.length.max");
 
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubPlaceWallItemEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubPlaceWallItemEvent.java
index bb40e19b..f201dfe1 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubPlaceWallItemEvent.java
@@ -9,9 +9,9 @@ import com.eu.habbo.messages.outgoing.unknown.HabboClubExtendOfferMessageCompose
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CatalogRequestClubDiscountEvent extends MessageHandler {
+public class BuildersClubPlaceWallItemEvent extends MessageHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CatalogRequestClubDiscountEvent.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BuildersClubPlaceWallItemEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogIndexEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubQueryFurniCountEvent.java
similarity index 79%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogIndexEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubQueryFurniCountEvent.java
index 5aa476ff..6aa495dc 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogIndexEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubQueryFurniCountEvent.java
@@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.catalog;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RequestCatalogIndexEvent extends MessageHandler {
+public class BuildersClubQueryFurniCountEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         //this.client.sendResponse(new CatalogPagesListComposer(this.client.getHabbo(), "NORMAL"));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestDiscountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetBundleDiscountRulesetEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/RequestDiscountEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetBundleDiscountRulesetEvent.java
index 782c6900..1686f96d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestDiscountEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetBundleDiscountRulesetEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.BundleDiscountRulesetMessageComposer;
 
-public class RequestDiscountEvent extends MessageHandler {
+public class GetBundleDiscountRulesetEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new BundleDiscountRulesetMessageComposer());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogModeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogIndexEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogModeEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogIndexEvent.java
index cc362a7e..fdee81e7 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogModeEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogIndexEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.BuildersClubFurniCountMessageComposer;
 import com.eu.habbo.messages.outgoing.catalog.CatalogPagesListComposer;
 
-public class RequestCatalogModeEvent extends MessageHandler {
+public class GetCatalogIndexEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
 
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogPageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogPageEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogPageEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogPageEvent.java
index 9f090909..3bf2f430 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogPageEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogPageEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.CatalogPageMessageComposer;
 
-public class RequestCatalogPageEvent extends MessageHandler {
+public class GetCatalogPageEvent extends MessageHandler {
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubGiftsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubGiftInfo.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubGiftsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubGiftInfo.java
index 4017a233..3cdc1aed 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubGiftsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubGiftInfo.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.ClubGiftInfoComposer;
 
-public class RequestClubGiftsEvent extends MessageHandler {
+public class GetClubGiftInfo extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new ClubGiftInfoComposer(
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubOffersEvent.java
similarity index 86%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubOffersEvent.java
index 24dfc02d..915b9d6a 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubOffersEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.HabboClubOffersMessageComposer;
 
-public class RequestClubDataEvent extends MessageHandler {
+public class GetClubOffersEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new HabboClubOffersMessageComposer(this.client.getHabbo(), this.packet.readInt()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestGiftConfigurationEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetGiftWrappingConfigurationEvent.java
similarity index 81%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/RequestGiftConfigurationEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetGiftWrappingConfigurationEvent.java
index eb8a084b..cf526dee 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestGiftConfigurationEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetGiftWrappingConfigurationEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.GiftWrappingConfigurationComposer;
 
-public class RequestGiftConfigurationEvent extends MessageHandler {
+public class GetGiftWrappingConfigurationEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GiftWrappingConfigurationComposer());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestMarketplaceConfigEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetMarketplaceConfigurationEvent.java
similarity index 82%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/RequestMarketplaceConfigEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetMarketplaceConfigurationEvent.java
index a11f4766..121ffda3 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestMarketplaceConfigEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetMarketplaceConfigurationEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigurationComposer;
 
-public class RequestMarketplaceConfigEvent extends MessageHandler {
+public class GetMarketplaceConfigurationEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new MarketplaceConfigurationComposer());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/JukeBoxRequestTrackCodeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetOfficialSongIdEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/JukeBoxRequestTrackCodeEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetOfficialSongIdEvent.java
index a3cbe3eb..14be0679 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/JukeBoxRequestTrackCodeEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetOfficialSongIdEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.items.SoundTrack;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.items.jukebox.OfficialSongIdMessageComposer;
 
-public class JukeBoxRequestTrackCodeEvent extends MessageHandler {
+public class GetOfficialSongIdEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String songName = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogSearchedItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetProductOfferEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogSearchedItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetProductOfferEvent.java
index a32f3bef..67c303f6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogSearchedItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetProductOfferEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.ProductOfferComposer;
 import gnu.trove.iterator.TIntObjectIterator;
 
-public class CatalogSearchedItemEvent extends MessageHandler {
+public class GetProductOfferEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int offerId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestPetBreedsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSellablePetPalettesEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/RequestPetBreedsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetSellablePetPalettesEvent.java
index 31efb5ab..751f6451 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestPetBreedsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSellablePetPalettesEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.SellablePetPalettesMessageComposer;
 
-public class RequestPetBreedsEvent extends MessageHandler {
+public class GetSellablePetPalettesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String petName = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/JukeBoxRequestTrackDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSongInfoEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/JukeBoxRequestTrackDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/GetSongInfoEvent.java
index c9c5cf59..46228451 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/JukeBoxRequestTrackDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSongInfoEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.jukebox.TraxSongInfoMessageCom
 import java.util.ArrayList;
 import java.util.List;
 
-public class JukeBoxRequestTrackDataEvent extends MessageHandler {
+public class GetSongInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int count = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseFromCatalogAsGiftEvent.java
similarity index 99%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseFromCatalogAsGiftEvent.java
index 4f39c9e6..d0661aea 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseFromCatalogAsGiftEvent.java
@@ -35,8 +35,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Calendar;
 
-public class CatalogBuyItemAsGiftEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CatalogBuyItemAsGiftEvent.class);
+public class PurchaseFromCatalogAsGiftEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(PurchaseFromCatalogAsGiftEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseFromCatalogEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseFromCatalogEvent.java
index 7ba872b6..2269e249 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseFromCatalogEvent.java
@@ -26,10 +26,10 @@ import gnu.trove.map.hash.THashMap;
 import gnu.trove.procedure.TObjectProcedure;
 import org.apache.commons.lang3.StringUtils;
 
-import static com.eu.habbo.messages.incoming.catalog.CheckPetNameEvent.PET_NAME_LENGTH_MAXIMUM;
-import static com.eu.habbo.messages.incoming.catalog.CheckPetNameEvent.PET_NAME_LENGTH_MINIMUM;
+import static com.eu.habbo.messages.incoming.catalog.ApproveNameEvent.PET_NAME_LENGTH_MAXIMUM;
+import static com.eu.habbo.messages.incoming.catalog.ApproveNameEvent.PET_NAME_LENGTH_MINIMUM;
 
-public class CatalogBuyItemEvent extends MessageHandler {
+public class PurchaseFromCatalogEvent extends MessageHandler {
 
 
     @Override
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseTargetOfferEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseTargetedOfferEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseTargetOfferEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseTargetedOfferEvent.java
index 3ef97b24..c7666a5d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseTargetOfferEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseTargetedOfferEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.catalog.TargetOffer;
 import com.eu.habbo.habbohotel.users.cache.HabboOfferPurchase;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class PurchaseTargetOfferEvent extends MessageHandler {
+public class PurchaseTargetedOfferEvent extends MessageHandler {
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseVipMembershipExtensionEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseVipMembershipExtensionEvent.java
index d6db94bc..eb5eceb2 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseVipMembershipExtensionEvent.java
@@ -14,9 +14,9 @@ import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CatalogBuyClubDiscountEvent extends MessageHandler {
+public class PurchaseVipMembershipExtensionEvent extends MessageHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CatalogBuyClubDiscountEvent.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PurchaseVipMembershipExtensionEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogSelectClubGiftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/SelectClubGiftEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogSelectClubGiftEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/SelectClubGiftEvent.java
index fbc744a0..82bc662c 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogSelectClubGiftEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/SelectClubGiftEvent.java
@@ -12,9 +12,9 @@ import gnu.trove.set.hash.THashSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CatalogSelectClubGiftEvent extends MessageHandler {
+public class SelectClubGiftEvent extends MessageHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CatalogSelectClubGiftEvent.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SelectClubGiftEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/TargetOfferStateEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/SetTargetedOfferStateEvent.java
similarity index 88%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/TargetOfferStateEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/SetTargetedOfferStateEvent.java
index 9d62582c..6154d478 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/TargetOfferStateEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/SetTargetedOfferStateEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog;
 import com.eu.habbo.habbohotel.users.cache.HabboOfferPurchase;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TargetOfferStateEvent extends MessageHandler {
+public class SetTargetedOfferStateEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int id = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/BuyItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/BuyMarketplaceOfferEvent.java
similarity index 84%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/BuyItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/BuyMarketplaceOfferEvent.java
index b9af0be8..2f801978 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/BuyItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/BuyMarketplaceOfferEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog.marketplace;
 import com.eu.habbo.habbohotel.catalog.marketplace.MarketPlace;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class BuyItemEvent extends MessageHandler {
+public class BuyMarketplaceOfferEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int offerId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/TakeBackItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/CancelMarketplaceOfferEvent.java
similarity index 84%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/TakeBackItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/CancelMarketplaceOfferEvent.java
index 7586afc4..fb40f258 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/TakeBackItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/CancelMarketplaceOfferEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog.marketplace;
 import com.eu.habbo.habbohotel.catalog.marketplace.MarketPlace;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TakeBackItemEvent extends MessageHandler {
+public class CancelMarketplaceOfferEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int offerId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestSellItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceCanMakeOfferEvent.java
similarity index 88%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestSellItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceCanMakeOfferEvent.java
index 01d4e66d..93c043c4 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestSellItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceCanMakeOfferEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.catalog.marketplace.MarketPlace;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCanMakeOfferResult;
 
-public class RequestSellItemEvent extends MessageHandler {
+public class GetMarketplaceCanMakeOfferEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (MarketPlace.MARKETPLACE_ENABLED)
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestItemInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceItemStatsEvent.java
similarity index 86%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestItemInfoEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceItemStatsEvent.java
index dd5e9eb9..208fa341 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestItemInfoEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceItemStatsEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog.marketplace;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceItemStatsComposer;
 
-public class RequestItemInfoEvent extends MessageHandler {
+public class GetMarketplaceItemStatsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestOffersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOffersEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestOffersEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOffersEvent.java
index c091c1be..be8c5714 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestOffersEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOffersEvent.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class RequestOffersEvent extends MessageHandler {
+public class GetMarketplaceOffersEvent extends MessageHandler {
     public final static Map<Integer, ServerMessage> cachedResults = new ConcurrentHashMap<>(0);
 
     @Override
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestOwnItemsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOwnOffersEvent.java
similarity index 84%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestOwnItemsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOwnOffersEvent.java
index d975d0b2..b74c125f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestOwnItemsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOwnOffersEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog.marketplace;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketPlaceOwnOffersComposer;
 
-public class RequestOwnItemsEvent extends MessageHandler {
+public class GetMarketplaceOwnOffersEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new MarketPlaceOwnOffersComposer(this.client.getHabbo()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/MakeOfferEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/MakeOfferEvent.java
index dba2093e..fe30a729 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/MakeOfferEvent.java
@@ -10,8 +10,8 @@ import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceMakeOfferRe
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SellItemEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SellItemEvent.class);
+public class MakeOfferEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MakeOfferEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestCreditsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RedeemMarketplaceOfferCreditsEvent.java
similarity index 79%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestCreditsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RedeemMarketplaceOfferCreditsEvent.java
index b03fda10..27e99514 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestCreditsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RedeemMarketplaceOfferCreditsEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog.marketplace;
 import com.eu.habbo.habbohotel.catalog.marketplace.MarketPlace;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RequestCreditsEvent extends MessageHandler {
+public class RedeemMarketplaceOfferCreditsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         MarketPlace.getCredits(this.client);
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RequestRecyclerLogicEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerPrizesEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RequestRecyclerLogicEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerPrizesEvent.java
index 729240d1..8942709f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RequestRecyclerLogicEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerPrizesEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog.recycler;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.RecyclerPrizesComposer;
 
-public class RequestRecyclerLogicEvent extends MessageHandler {
+public class GetRecyclerPrizesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new RecyclerPrizesComposer());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/ReloadRecyclerEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerStatusEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/ReloadRecyclerEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerStatusEvent.java
index 981461fe..3304e795 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/ReloadRecyclerEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerStatusEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog.recycler;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.RecyclerStatusComposer;
 
-public class ReloadRecyclerEvent extends MessageHandler {
+public class GetRecyclerStatusEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new RecyclerStatusComposer());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/OpenRecycleBoxEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/PresentOpenEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/OpenRecycleBoxEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/PresentOpenEvent.java
index 2f16403c..a6ba8f88 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/OpenRecycleBoxEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/PresentOpenEvent.java
@@ -14,7 +14,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer;
 import com.eu.habbo.messages.outgoing.rooms.users.WhisperMessageComposer;
 import com.eu.habbo.threading.runnables.OpenGift;
 
-public class OpenRecycleBoxEvent extends MessageHandler {
+public class PresentOpenEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleItemsEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleItemsEvent.java
index daa3317c..bf8db8f4 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleItemsEvent.java
@@ -15,7 +15,7 @@ import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
 import com.eu.habbo.threading.runnables.ShutdownEmulator;
 import gnu.trove.set.hash.THashSet;
 
-public class RecycleEvent extends MessageHandler {
+public class RecycleItemsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (ShutdownEmulator.timestamp > 0) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/crafting/CraftEvent.java
index 55c08612..aa482a04 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftEvent.java
@@ -17,7 +17,7 @@ import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.util.Map;
 
-public class CraftingCraftItemEvent extends MessageHandler {
+public class CraftEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int craftingTable = this.packet.readInt();
@@ -61,7 +61,7 @@ public class CraftingCraftItemEvent extends MessageHandler {
                 this.client.sendResponse(new UnseenItemsComposer(rewardItem));
                 AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("Atcg"));
                 toRemove.forEachValue(object -> {
-                    CraftingCraftItemEvent.this.client.sendResponse(new FurniListRemoveComposer(object.getGiftAdjustedId()));
+                    CraftEvent.this.client.sendResponse(new FurniListRemoveComposer(object.getGiftAdjustedId()));
                     return true;
                 });
                 this.client.sendResponse(new FurniListInvalidateComposer());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftSecretEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/crafting/CraftSecretEvent.java
index e0b36d01..b1df8ee4 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftSecretEvent.java
@@ -19,7 +19,7 @@ import gnu.trove.set.hash.THashSet;
 import java.util.Map;
 import java.util.Set;
 
-public class CraftingCraftSecretEvent extends MessageHandler {
+public class CraftSecretEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int altarId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingAddRecipeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftableProductsEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingAddRecipeEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftableProductsEvent.java
index 0993280f..dac5503f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingAddRecipeEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftableProductsEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.LimitedEditionSoldOutComposer;
 import com.eu.habbo.messages.outgoing.crafting.CraftingRecipeComposer;
 
-public class CraftingAddRecipeEvent extends MessageHandler {
+public class GetCraftableProductsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String recipeName = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/RequestCraftingRecipesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipeEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/crafting/RequestCraftingRecipesEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipeEvent.java
index 2b4b30ab..f2a3a7ae 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/crafting/RequestCraftingRecipesEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipeEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.crafting.CraftableProductsComposer;
 
-public class RequestCraftingRecipesEvent extends MessageHandler {
+public class GetCraftingRecipeEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/RequestCraftingRecipesAvailableEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipesAvailableEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/crafting/RequestCraftingRecipesAvailableEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipesAvailableEvent.java
index cb709d1d..3568afab 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/crafting/RequestCraftingRecipesAvailableEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipesAvailableEvent.java
@@ -11,7 +11,7 @@ import gnu.trove.map.hash.THashMap;
 
 import java.util.Map;
 
-public class RequestCraftingRecipesAvailableEvent extends MessageHandler {
+public class GetCraftingRecipesAvailableEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int altarId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/AdventCalendarOpenDayEvent.java b/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorAsStaffEvent.java
similarity index 85%
rename from src/main/java/com/eu/habbo/messages/incoming/events/calendar/AdventCalendarOpenDayEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorAsStaffEvent.java
index 58970271..7922228d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/AdventCalendarOpenDayEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorAsStaffEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.events.calendar;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class AdventCalendarOpenDayEvent extends MessageHandler {
+public class OpenCampaignCalendarDoorAsStaffEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String campaignName = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/AdventCalendarForceOpenEvent.java b/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorEvent.java
similarity index 86%
rename from src/main/java/com/eu/habbo/messages/incoming/events/calendar/AdventCalendarForceOpenEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorEvent.java
index bca8c1de..1cf7505f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/AdventCalendarForceOpenEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.events.calendar;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class AdventCalendarForceOpenEvent extends MessageHandler {
+public class OpenCampaignCalendarDoorEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String campaignName = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestBlockedTilesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetOccupiedTilesEvent.java
similarity index 86%
rename from src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestBlockedTilesEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetOccupiedTilesEvent.java
index 52bf67fd..008e3a9d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestBlockedTilesEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetOccupiedTilesEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.floorplaneditor;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.floorplaneditor.RoomOccupiedTilesMessageComposer;
 
-public class FloorPlanEditorRequestBlockedTilesEvent extends MessageHandler {
+public class GetOccupiedTilesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null)
diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestDoorSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetRoomEntryTileEvent.java
similarity index 89%
rename from src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestDoorSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetRoomEntryTileEvent.java
index a521df4a..e04ae037 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestDoorSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetRoomEntryTileEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.floorplaneditor.RoomEntryTileMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.RoomFloorThicknessUpdatedComposer;
 
-public class FloorPlanEditorRequestDoorSettingsEvent extends MessageHandler {
+public class GetRoomEntryTileEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null)
diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/UpdateFloorPropertiesEvent.java
similarity index 99%
rename from src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/UpdateFloorPropertiesEvent.java
index d20b8fde..ad098356 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/UpdateFloorPropertiesEvent.java
@@ -14,7 +14,7 @@ import gnu.trove.set.hash.THashSet;
 
 import java.util.*;
 
-public class FloorPlanEditorSaveEvent extends MessageHandler {
+public class UpdateFloorPropertiesEvent extends MessageHandler {
     public static int MAXIMUM_FLOORPLAN_WIDTH_LENGTH = 64;
     public static int MAXIMUM_FLOORPLAN_SIZE = 64 * 64;
 
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendRequestEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendEvent.java
index cf5c93e8..beceef58 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendRequestEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendEvent.java
@@ -16,8 +16,8 @@ import java.sql.SQLException;
 
 import static com.eu.habbo.habbohotel.users.HabboManager.getOfflineHabboInfo;
 
-public class AcceptFriendRequestEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(AcceptFriendRequestEvent.class);
+public class AcceptFriendEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AcceptFriendEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/DeclineFriendRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/DeclineFriendEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/DeclineFriendRequestEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/DeclineFriendEvent.java
index 8010cf5f..14113be2 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/DeclineFriendRequestEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/DeclineFriendEvent.java
@@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.friends;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class DeclineFriendRequestEvent extends MessageHandler {
+public class DeclineFriendEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         boolean all = this.packet.readBoolean();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendRequestsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/GetFriendRequestsEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendRequestsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/GetFriendRequestsEvent.java
index 904d699e..5cec718f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendRequestsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/GetFriendRequestsEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.friends;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.friends.FriendRequestsComposer;
 
-public class RequestFriendRequestsEvent extends MessageHandler {
+public class GetFriendRequestsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new FriendRequestsComposer(this.client.getHabbo()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/GetMOTDEvent.java
similarity index 85%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/GetMOTDEvent.java
index c0397261..8e23da8b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/GetMOTDEvent.java
@@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.friends;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RequestFriendsEvent extends MessageHandler {
+public class GetMOTDEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
 
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/SearchUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/HabboSearchEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/SearchUserEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/HabboSearchEvent.java
index 9158b95a..224df864 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/SearchUserEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/HabboSearchEvent.java
@@ -8,7 +8,7 @@ import gnu.trove.set.hash.THashSet;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-public class SearchUserEvent extends MessageHandler {
+public class HabboSearchEvent extends MessageHandler {
     public static ConcurrentHashMap<String, THashSet<MessengerBuddy>> cachedResults = new ConcurrentHashMap<>();
 
     @Override
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/RequestInitFriendsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/MessengerInitEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/RequestInitFriendsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/MessengerInitEvent.java
index 0f098068..d07b2972 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/RequestInitFriendsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/MessengerInitEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.friends.MessengerInitComposer;
 
 import java.util.ArrayList;
 
-public class RequestInitFriendsEvent extends MessageHandler {
+public class MessengerInitEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         ArrayList<ServerMessage> messages = new ArrayList<>();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java
index bb512867..5087b827 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java
@@ -16,8 +16,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 
-public class FriendRequestEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(FriendRequestEvent.class);
+public class RequestFriendEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(RequestFriendEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/FriendPrivateMessageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/SendMsgEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/FriendPrivateMessageEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/SendMsgEvent.java
index 6145e722..6878e48d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/FriendPrivateMessageEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/SendMsgEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.messenger.MessengerBuddy;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.friends.UserFriendChatEvent;
 
-public class FriendPrivateMessageEvent extends MessageHandler {
+public class SendMsgEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/InviteFriendsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/SendRoomInviteEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/InviteFriendsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/SendRoomInviteEvent.java
index a2624748..63dc2969 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/InviteFriendsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/SendRoomInviteEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.friends.RoomInviteComposer;
 
-public class InviteFriendsEvent extends MessageHandler {
+public class SendRoomInviteEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboStats().allowTalk()) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/ChangeRelationEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/SetRelationshipStatusEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/ChangeRelationEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/SetRelationshipStatusEvent.java
index d2790194..e7f901e9 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/ChangeRelationEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/SetRelationshipStatusEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.friends.UpdateFriendComposer;
 import com.eu.habbo.plugin.events.users.friends.UserRelationShipEvent;
 
-public class ChangeRelationEvent extends MessageHandler {
+public class SetRelationshipStatusEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/StalkFriendEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/VisitUserEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/friends/StalkFriendEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/friends/VisitUserEvent.java
index 1c647597..6715a728 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/friends/StalkFriendEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/friends/VisitUserEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.friends.FollowFriendFailedComposer;
 import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.users.WhisperMessageComposer;
 
-public class StalkFriendEvent extends MessageHandler {
+public class VisitUserEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int friendId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestGameStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/Game2GetAccountGameStatusEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestGameStatusEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/gamecenter/Game2GetAccountGameStatusEvent.java
index f2efab02..6ca46ce4 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestGameStatusEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/Game2GetAccountGameStatusEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.gamecenter;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.gamecenter.GameCenterGameComposer;
 
-public class GameCenterRequestGameStatusEvent extends MessageHandler {
+public class Game2GetAccountGameStatusEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GameCenterGameComposer(this.packet.readInt(), GameCenterGameComposer.OK));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterLeaveGameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameUnloadedEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterLeaveGameEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameUnloadedEvent.java
index 68e29746..683faa9c 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterLeaveGameEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameUnloadedEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.gamecenter;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.gamecenter.basejump.UnloadGameMessageComposer;
 
-public class GameCenterLeaveGameEvent extends MessageHandler {
+public class GameUnloadedEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new UnloadGameMessageComposer());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestGamesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameListEvent.java
similarity index 84%
rename from src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestGamesEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameListEvent.java
index cedfabae..5264cdf6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestGamesEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameListEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.gamecenter;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.gamecenter.GameCenterAchievementsConfigurationComposer;
 
-public class GameCenterRequestGamesEvent extends MessageHandler {
+public class GetGameListEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GameCenterAchievementsConfigurationComposer());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestAccountStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameStatusEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestAccountStatusEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameStatusEvent.java
index 07640019..e42f8305 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestAccountStatusEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameStatusEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.gamecenter;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.gamecenter.Game2AccountGameStatusMessageComposer;
 
-public class GameCenterRequestAccountStatusEvent extends MessageHandler {
+public class GetGameStatusEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new Game2AccountGameStatusMessageComposer(this.packet.readInt(), 10));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardEvent.java
similarity index 73%
rename from src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardEvent.java
index 921ac121..4fd651c8 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardEvent.java
@@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.gamecenter;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class GameCenterEvent extends MessageHandler {
+public class GetWeeklyGameRewardEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
     }
diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterLoadGameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardWinnersEvent.java
similarity index 78%
rename from src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterLoadGameEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardWinnersEvent.java
index acfc2e8d..83bd9c88 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterLoadGameEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardWinnersEvent.java
@@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.gamecenter;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class GameCenterLoadGameEvent extends MessageHandler {
+public class GetWeeklyGameRewardWinnersEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int gameId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterJoinGameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/JoinQueueEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterJoinGameEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/gamecenter/JoinQueueEvent.java
index b41ec8b6..a3657ede 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterJoinGameEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/JoinQueueEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.gamecenter.basejump.JoinedQueueMessageComp
 import com.eu.habbo.messages.outgoing.gamecenter.basejump.LoadGameMessageComposer;
 import com.eu.habbo.messages.outgoing.gamecenter.basejump.LoadGameUrlMessageComposer;
 
-public class GameCenterJoinGameEvent extends MessageHandler {
+public class JoinQueueEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int gameId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianAcceptRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDecidesOnOfferEvent.java
similarity index 81%
rename from src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianAcceptRequestEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDecidesOnOfferEvent.java
index 1f48b58d..e1afb371 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianAcceptRequestEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDecidesOnOfferEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guardians;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class GuardianAcceptRequestEvent extends MessageHandler {
+public class ChatReviewGuideDecidesOnOfferEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Emulator.getGameEnvironment().getGuideManager().acceptTicket(this.client.getHabbo(), this.packet.readBoolean());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianNoUpdatesWantedEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDetachedEvent.java
similarity index 78%
rename from src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianNoUpdatesWantedEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDetachedEvent.java
index 8dfecacd..351ebabe 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianNoUpdatesWantedEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDetachedEvent.java
@@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.guardians;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class GuardianNoUpdatesWantedEvent extends MessageHandler {
+public class ChatReviewGuideDetachedEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         //TODO: Add dont care about ticket updates.
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianVoteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideVoteEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianVoteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideVoteEvent.java
index b2675d27..ad61a031 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianVoteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideVoteEvent.java
@@ -7,8 +7,8 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class GuardianVoteEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(GuardianVoteEvent.class);
+public class ChatReviewGuideVoteEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ChatReviewGuideVoteEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideAssistanceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionCreateEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideAssistanceEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionCreateEvent.java
index 2b362b02..3a215913 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideAssistanceEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionCreateEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guides.GuideSessionErrorMessageComposer;
 
-public class RequestGuideAssistanceEvent extends MessageHandler {
+public class GuideSessionCreateEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int type = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideRecommendHelperEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionFeedbackEvent.java
similarity index 89%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/GuideRecommendHelperEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionFeedbackEvent.java
index 9ecf4460..438ce323 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideRecommendHelperEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionFeedbackEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class GuideRecommendHelperEvent extends MessageHandler {
+public class GuideSessionFeedbackEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         boolean recommend = this.packet.readBoolean();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideVisitUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGetRequesterRoomEvent.java
similarity index 89%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/GuideVisitUserEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGetRequesterRoomEvent.java
index 90ff3834..5f8053be 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideVisitUserEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGetRequesterRoomEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guides.GuideSessionRequesterRoomMessageComposer;
 
-public class GuideVisitUserEvent extends MessageHandler {
+public class GuideSessionGetRequesterRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHelper(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideHandleHelpRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGuideDecidesEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/GuideHandleHelpRequestEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGuideDecidesEvent.java
index 9089cafe..be533774 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideHandleHelpRequestEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGuideDecidesEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class GuideHandleHelpRequestEvent extends MessageHandler {
+public class GuideSessionGuideDecidesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHelper(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideInviteUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionInviteRequesterEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/GuideInviteUserEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionInviteRequesterEvent.java
index 82978e44..33a7df16 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideInviteUserEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionInviteRequesterEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guides.GuideSessionInvitedToGuideRoomMessageComposer;
 
-public class GuideInviteUserEvent extends MessageHandler {
+public class GuideSessionInviteRequesterEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHelper(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserTypingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionIsTypingEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserTypingEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionIsTypingEvent.java
index 2446ca44..2383ae8d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserTypingEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionIsTypingEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guides.GuideSessionPartnerIsTypingComposer;
 
-public class GuideUserTypingEvent extends MessageHandler {
+public class GuideSessionIsTypingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         boolean typing = this.packet.readBoolean();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserMessageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionMessageEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserMessageEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionMessageEvent.java
index 0a9d2a5f..47791359 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserMessageEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionMessageEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guides.GuideSessionMessageMessageComposer;
 
-public class GuideUserMessageEvent extends MessageHandler {
+public class GuideSessionMessageEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHabbo(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideToolEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionOnDutyUpdateEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideToolEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionOnDutyUpdateEvent.java
index 77920f4a..1b93d553 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideToolEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionOnDutyUpdateEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guides.GuideOnDutyStatusMessageComposer;
 
-public class RequestGuideToolEvent extends MessageHandler {
+public class GuideSessionOnDutyUpdateEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         boolean onDuty = this.packet.readBoolean();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionReportEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionReportEvent.java
index b1244613..b0eca630 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionReportEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.guides.GuideSessionDetachedMessageComposer
 import com.eu.habbo.messages.outgoing.guides.GuideSessionEndedMessageComposer;
 import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer;
 
-public class GuideReportHelperEvent extends MessageHandler {
+public class GuideSessionReportEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String message = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideCancelHelpRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionRequesterCancelsEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/GuideCancelHelpRequestEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionRequesterCancelsEvent.java
index 172c743a..42f45fab 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideCancelHelpRequestEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionRequesterCancelsEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class GuideCancelHelpRequestEvent extends MessageHandler {
+public class GuideSessionRequesterCancelsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByNoob(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideCloseHelpRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionResolvedEvent.java
similarity index 88%
rename from src/main/java/com/eu/habbo/messages/incoming/guides/GuideCloseHelpRequestEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionResolvedEvent.java
index 84be74d6..58df35c5 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideCloseHelpRequestEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionResolvedEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guides.GuideTour;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class GuideCloseHelpRequestEvent extends MessageHandler {
+public class GuideSessionResolvedEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHabbo(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/AddAdminRightsToMemberEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/AddAdminRightsToMemberEvent.java
index 025eddbd..4df149c4 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/AddAdminRightsToMemberEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.GuildMembershipUpdatedMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildGivenAdminEvent;
 
-public class GuildSetAdminEvent extends MessageHandler {
+public class AddAdminRightsToMemberEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java
index 9efaa3e1..a809fe63 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java
@@ -13,7 +13,7 @@ import com.eu.habbo.messages.outgoing.guilds.HabboGroupDetailsMessageComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildMembershipRejectedMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildAcceptedMembershipEvent;
 
-public class GuildAcceptMembershipEvent extends MessageHandler {
+public class ApproveMembershipRequestEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/CreateGuildEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/CreateGuildEvent.java
index 055f15ef..36c16df6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/CreateGuildEvent.java
@@ -16,8 +16,8 @@ import com.eu.habbo.plugin.events.guilds.GuildPurchasedEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RequestGuildBuyEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RequestGuildBuyEvent.class);
+public class CreateGuildEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateGuildEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeleteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/DeactivateGuildEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeleteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/DeactivateGuildEvent.java
index f77929bb..8b88455d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeleteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/DeactivateGuildEvent.java
@@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer;
 import com.eu.habbo.plugin.events.guilds.GuildDeletedEvent;
 import gnu.trove.set.hash.THashSet;
 
-public class GuildDeleteEvent extends MessageHandler {
+public class DeactivateGuildEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveFavoriteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/DeselectFavouriteHabboGroupEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveFavoriteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/DeselectFavouriteHabboGroupEvent.java
index 062cb327..d74170e4 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveFavoriteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/DeselectFavouriteHabboGroupEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.guilds.FavoriteMembershipUpdateMessageComp
 import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildRemovedFavoriteEvent;
 
-public class GuildRemoveFavoriteEvent extends MessageHandler {
+public class DeselectFavouriteHabboGroupEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildCreationInfoEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyRoomsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildCreationInfoEvent.java
index 2ef52cab..18b90188 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyRoomsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildCreationInfoEvent.java
@@ -8,7 +8,7 @@ import gnu.trove.set.hash.THashSet;
 
 import java.util.List;
 
-public class RequestGuildBuyRoomsEvent extends MessageHandler {
+public class GetGuildCreationInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         List<Room> rooms = Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildManageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditInfoEvent.java
similarity index 88%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildManageEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditInfoEvent.java
index 3ff894c3..b1168544 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildManageEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditInfoEvent.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.GuildEditInfoMessageComposer;
 
-public class RequestGuildManageEvent extends MessageHandler {
+public class GetGuildEditInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(this.packet.readInt());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildPartsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditorDataEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildPartsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditorDataEvent.java
index fd68a874..85b54f69 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildPartsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditorDataEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guilds;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.GuildEditorDataMessageComposer;
 
-public class RequestGuildPartsEvent extends MessageHandler {
+public class GetGuildEditorDataEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuildEditorDataMessageComposer());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildFurniWidgetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildFurniContextMenuInfoEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildFurniWidgetEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildFurniContextMenuInfoEvent.java
index df5166a1..e3596448 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildFurniWidgetEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildFurniContextMenuInfoEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.GuildFurniContextMenuInfoMessageComposer;
 
-public class RequestGuildFurniWidgetEvent extends MessageHandler {
+public class GetGuildFurniContextMenuInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildMembersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembersEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildMembersEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembersEvent.java
index 2423a900..04bbc1c1 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildMembersEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembersEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.GuildMembersComposer;
 
-public class RequestGuildMembersEvent extends MessageHandler {
+public class GetGuildMembersEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int groupId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestOwnGuildsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembershipsEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/RequestOwnGuildsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembershipsEvent.java
index 19622cfc..e494e237 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestOwnGuildsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembershipsEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.GuildMembershipsMessageComposer;
 import gnu.trove.set.hash.THashSet;
 
-public class RequestOwnGuildsEvent extends MessageHandler {
+public class GetGuildMembershipsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         THashSet<Guild> guilds = new THashSet<Guild>();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGuildBadgesMessageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupBadgesEvent.java
similarity index 70%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGuildBadgesMessageEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupBadgesEvent.java
index 8ca7b6ea..a4ac9e39 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGuildBadgesMessageEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupBadgesEvent.java
@@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.guilds;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class GetHabboGuildBadgesMessageEvent extends MessageHandler {
+public class GetHabboGroupBadgesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
 
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupDetailsEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildInfoEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupDetailsEvent.java
index f680227f..585eb1e6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildInfoEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupDetailsEvent.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.HabboGroupDetailsMessageComposer;
 
-public class RequestGuildInfoEvent extends MessageHandler {
+public class GetHabboGroupDetailsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildConfirmRemoveMemberEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildConfirmRemoveMemberEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java
index 05e7ba06..4a5d77a0 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildConfirmRemoveMemberEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java
@@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.GuildMemberFurniCountInHQMessageComposer;
 
-public class GuildConfirmRemoveMemberEvent extends MessageHandler {
+public class GetMemberGuildItemCountEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildJoinEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/JoinHabboGroupEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildJoinEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/JoinHabboGroupEvent.java
index a2a6f1b8..b4e2c3e3 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildJoinEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/JoinHabboGroupEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.guilds.HabboGroupDetailsMessageComposer;
 import com.eu.habbo.messages.outgoing.guilds.HabboGroupJoinFailedMessageComposer;
 
-public class RequestGuildJoinEvent extends MessageHandler {
+public class JoinHabboGroupEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java
index 6978bea6..319d371a 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java
@@ -13,7 +13,7 @@ import com.eu.habbo.messages.outgoing.guilds.HabboGroupDetailsMessageComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildMembershipRejectedMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildRemovedMemberEvent;
 
-public class GuildRemoveMemberEvent extends MessageHandler {
+public class KickMemberEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeclineMembershipEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeclineMembershipEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java
index 17e40c0c..3534f488 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeclineMembershipEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java
@@ -13,7 +13,7 @@ import com.eu.habbo.messages.outgoing.guilds.GuildMembersComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildMembershipRejectedMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildDeclinedMembershipEvent;
 
-public class GuildDeclineMembershipEvent extends MessageHandler {
+public class RejectMembershipRequestEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RemoveAdminRightsFromMemberEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/RemoveAdminRightsFromMemberEvent.java
index 43b8bbb0..613fbfd9 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RemoveAdminRightsFromMemberEvent.java
@@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.guilds.HabboGroupDetailsMessageComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildMembershipUpdatedMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildRemovedAdminEvent;
 
-public class GuildRemoveAdminEvent extends MessageHandler {
+public class RemoveAdminRightsFromMemberEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetFavoriteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/SelectFavouriteHabboGroupEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetFavoriteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/SelectFavouriteHabboGroupEvent.java
index 547cf4a9..7fbd920d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetFavoriteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/SelectFavouriteHabboGroupEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.rooms.users.HabboAddGroupBadgesMessageComp
 import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer;
 import com.eu.habbo.plugin.events.guilds.GuildFavoriteSetEvent;
 
-public class GuildSetFavoriteEvent extends MessageHandler {
+public class SelectFavouriteHabboGroupEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeBadgeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildBadgeEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeBadgeEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildBadgeEvent.java
index 965202d7..9412d3a3 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeBadgeEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildBadgeEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.guilds.GuildChangedBadgeEvent;
 
-public class GuildChangeBadgeEvent extends MessageHandler {
+public class UpdateGuildBadgeEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeColorsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildColorsEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeColorsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildColorsEvent.java
index fee78300..8d5be154 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeColorsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildColorsEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.guilds.GuildChangedColorsEvent;
 
-public class GuildChangeColorsEvent extends MessageHandler {
+public class UpdateGuildColorsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeNameDescEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildIdentityEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeNameDescEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildIdentityEvent.java
index 7942b2cd..63f8572f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeNameDescEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildIdentityEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.guilds.GuildChangedNameEvent;
 
-public class GuildChangeNameDescEvent extends MessageHandler {
+public class UpdateGuildIdentityEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildSettingsEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildSettingsEvent.java
index d21df54b..a29d3a58 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildSettingsEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.guilds.GuildChangedSettingsEvent;
 
-public class GuildChangeSettingsEvent extends MessageHandler {
+public class UpdateGuildSettingsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumStatsEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumStatsEvent.java
index 76c2bb1e..36cf04c0 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumStatsEvent.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.ForumDataMessageComposer;
 
-public class GuildForumDataEvent extends MessageHandler {
+public class GetForumStatsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumListEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumsListEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumListEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumsListEvent.java
index 43db70c6..1500cec3 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumListEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumsListEvent.java
@@ -15,8 +15,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Set;
 
-public class GuildForumListEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(GuildForumListEvent.class);
+public class GetForumsListEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GetForumsListEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsMessagesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetMessagesEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsMessagesEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetMessagesEvent.java
index dc5369b2..0c710c36 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsMessagesEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetMessagesEvent.java
@@ -4,7 +4,6 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.guilds.Guild;
 import com.eu.habbo.habbohotel.guilds.GuildMember;
 import com.eu.habbo.habbohotel.guilds.GuildRank;
-import com.eu.habbo.habbohotel.guilds.GuildState;
 import com.eu.habbo.habbohotel.guilds.forums.ForumThread;
 import com.eu.habbo.habbohotel.guilds.forums.ForumThreadState;
 import com.eu.habbo.habbohotel.permissions.Permission;
@@ -17,7 +16,7 @@ import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 
 
-public class GuildForumThreadsMessagesEvent extends MessageHandler {
+public class GetMessagesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetThreadsEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetThreadsEvent.java
index 4e304384..d7ea6377 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetThreadsEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.guilds.forums.ForumDataMessageComposer;
 import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadsComposer;
 import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
-public class GuildForumThreadsEvent extends MessageHandler {
+public class GetThreadsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateMessageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/ModerateMessageEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateMessageEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/forums/ModerateMessageEvent.java
index 636900c9..b38c92c8 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateMessageEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/ModerateMessageEvent.java
@@ -15,7 +15,7 @@ import com.eu.habbo.messages.outgoing.guilds.forums.UpdateMessageMessageComposer
 import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 
-public class GuildForumModerateMessageEvent extends MessageHandler {
+public class ModerateMessageEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateThreadEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/ModerateThreadEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateThreadEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/forums/ModerateThreadEvent.java
index 9d4e9240..02b07e2d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateThreadEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/ModerateThreadEvent.java
@@ -15,7 +15,7 @@ import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadsComposer;
 import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 
-public class GuildForumModerateThreadEvent extends MessageHandler {
+public class ModerateThreadEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/PostMessageEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/forums/PostMessageEvent.java
index 4b9576b6..a22e6f27 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/PostMessageEvent.java
@@ -13,7 +13,7 @@ import com.eu.habbo.messages.outgoing.guilds.forums.PostThreadMessageComposer;
 import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
 
-public class GuildForumPostThreadEvent extends MessageHandler {
+public class PostMessageEvent extends MessageHandler {
 
     @Override
     public int getRatelimit() {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumUpdateSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/UpdateForumSettingsEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumUpdateSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/forums/UpdateForumSettingsEvent.java
index 75a37bb4..222612bd 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumUpdateSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/UpdateForumSettingsEvent.java
@@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
 import com.eu.habbo.messages.outgoing.guilds.forums.ForumDataMessageComposer;
 import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
-public class GuildForumUpdateSettingsEvent extends MessageHandler {
+public class UpdateForumSettingsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadUpdateEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/UpdateThreadEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadUpdateEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/guilds/forums/UpdateThreadEvent.java
index b07e76c6..ab9c8376 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadUpdateEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/UpdateThreadEvent.java
@@ -14,7 +14,7 @@ import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadsComposer;
 import com.eu.habbo.messages.outgoing.guilds.forums.UpdateThreadMessageComposer;
 import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
 
-public class GuildForumThreadUpdateEvent extends MessageHandler {
+public class UpdateThreadEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int guildId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/ReleaseVersionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/ClientHelloEvent.java
similarity index 82%
rename from src/main/java/com/eu/habbo/messages/incoming/handshake/ReleaseVersionEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/handshake/ClientHelloEvent.java
index e9ea57e1..0f8d6a56 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/handshake/ReleaseVersionEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/ClientHelloEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.messages.NoAuthMessage;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
 @NoAuthMessage
-public class ReleaseVersionEvent extends MessageHandler {
+public class ClientHelloEvent extends MessageHandler {
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/PingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/LatencyPingRequestEvent.java
similarity index 85%
rename from src/main/java/com/eu/habbo/messages/incoming/handshake/PingEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/handshake/LatencyPingRequestEvent.java
index edf946a6..a5c2ac06 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/handshake/PingEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/LatencyPingRequestEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.handshake;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.handshake.LatencyPingResponseMessageComposer;
 
-public class PingEvent extends MessageHandler {
+public class LatencyPingRequestEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new LatencyPingResponseMessageComposer(this.packet.readInt()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java
index f8ef1f65..0ed19b3d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java
@@ -56,8 +56,8 @@ import java.util.Date;
 import static java.time.temporal.ChronoUnit.DAYS;
 
 @NoAuthMessage
-public class SecureLoginEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SecureLoginEvent.class);
+public class SSOTicketEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SSOTicketEvent.class);
 
 
     @Override
@@ -289,9 +289,9 @@ public class SecureLoginEvent extends MessageHandler {
                     final Habbo finalHabbo = habbo;
                     Emulator.getThreading().run(() -> {
                         if (Emulator.getConfig().getBoolean("hotel.welcome.alert.oldstyle")) {
-                            SecureLoginEvent.this.client.sendResponse(new MOTDNotificationComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername()).split("<br/>")));
+                            SSOTicketEvent.this.client.sendResponse(new MOTDNotificationComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername()).split("<br/>")));
                         } else {
-                            SecureLoginEvent.this.client.sendResponse(new HabboBroadcastMessageComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername())));
+                            SSOTicketEvent.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));
                 }
diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/MachineIDEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/UniqueIDEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/handshake/MachineIDEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/handshake/UniqueIDEvent.java
index 88b431d7..e5fd4524 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/handshake/MachineIDEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/UniqueIDEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.handshake.UniqueMachineIDComposer;
 import com.eu.habbo.util.HexUtils;
 
 @NoAuthMessage
-public class MachineIDEvent extends MessageHandler {
+public class UniqueIDEvent extends MessageHandler {
 
     private static final int HASH_LENGTH = 64;
 
diff --git a/src/main/java/com/eu/habbo/messages/incoming/helper/MySanctionStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/helper/GetCfhStatusEvent.java
similarity index 84%
rename from src/main/java/com/eu/habbo/messages/incoming/helper/MySanctionStatusEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/helper/GetCfhStatusEvent.java
index 6dbb4e02..6193d8d6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/helper/MySanctionStatusEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/helper/GetCfhStatusEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.helper;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.SanctionStatusComposer;
 
-public class MySanctionStatusEvent extends MessageHandler {
+public class GetCfhStatusEvent extends MessageHandler {
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/helper/RequestTalentTrackEvent.java b/src/main/java/com/eu/habbo/messages/incoming/helper/GetTalentTrackEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/helper/RequestTalentTrackEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/helper/GetTalentTrackEvent.java
index f4665875..b66c4d23 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/helper/RequestTalentTrackEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/helper/GetTalentTrackEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.achievements.TalentTrackType;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.achievements.talenttrack.TalentTrackMessageComposer;
 
-public class RequestTalentTrackEvent extends MessageHandler {
+public class GetTalentTrackEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (Emulator.getConfig().getBoolean("hotel.talenttrack.enabled")) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestBonusRareEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetBonusRareInfoEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestBonusRareEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/hotelview/GetBonusRareInfoEvent.java
index 75fb1c9d..84eb1e06 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestBonusRareEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetBonusRareInfoEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.hotelview;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.hotelview.BonusRareInfoMessageComposer;
 
-public class HotelViewRequestBonusRareEvent extends MessageHandler {
+public class GetBonusRareInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new BonusRareInfoMessageComposer(this.client.getHabbo()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetCurrentTimingCodeEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/hotelview/GetCurrentTimingCodeEvent.java
index b87b0b3f..fc6c72b0 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetCurrentTimingCodeEvent.java
@@ -5,8 +5,8 @@ import com.eu.habbo.messages.outgoing.hotelview.CurrentTimingCodeMessageComposer
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class HotelViewDataEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(HotelViewDataEvent.class);
+public class GetCurrentTimingCodeEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GetCurrentTimingCodeEvent.class);
 
 
     @Override
diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestLTDAvailabilityEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetLimitedOfferAppearingNextEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestLTDAvailabilityEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/hotelview/GetLimitedOfferAppearingNextEvent.java
index d7f24e04..1470df75 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestLTDAvailabilityEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetLimitedOfferAppearingNextEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.hotelview.LimitedOfferAppearingNextMessageComposer;
 
-public class HotelViewRequestLTDAvailabilityEvent extends MessageHandler {
+public class GetLimitedOfferAppearingNextEvent extends MessageHandler {
     public static boolean ENABLED = false;
     public static int TIMESTAMP;
     public static int ITEM_ID;
diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/RequestNewsListEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetPromoArticlesEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/hotelview/RequestNewsListEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/hotelview/GetPromoArticlesEvent.java
index 363fe182..b742633b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/RequestNewsListEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetPromoArticlesEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.hotelview.CommunityGoalHallOfFameMessageCo
 import com.eu.habbo.messages.outgoing.hotelview.CurrentTimingCodeMessageComposer;
 import com.eu.habbo.messages.outgoing.hotelview.PromoArticlesMessageComposer;
 
-public class RequestNewsListEvent extends MessageHandler {
+public class GetPromoArticlesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new CurrentTimingCodeMessageComposer("2013-05-08 13:0", "gamesmaker"));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/QuitEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/hotelview/QuitEvent.java
index 1bb7d3bb..60637791 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/QuitEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer;
 
-public class HotelViewEvent extends MessageHandler {
+public class QuitEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.getHabbo().getHabboInfo().setLoadingRoom(0);
diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryBadgesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgesEvent.java
similarity index 82%
rename from src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryBadgesEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgesEvent.java
index 7821eaf5..c2b9b1ec 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryBadgesEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgesEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.inventory;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.inventory.BadgesComposer;
 
-public class RequestInventoryBadgesEvent extends MessageHandler {
+public class GetBadgesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new BadgesComposer(this.client.getHabbo()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryBotsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBotInventoryEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryBotsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/inventory/GetBotInventoryEvent.java
index ba60b6cc..20360bfc 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryBotsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBotInventoryEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.inventory;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.inventory.BotInventoryComposer;
 
-public class RequestInventoryBotsEvent extends MessageHandler {
+public class GetBotInventoryEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new BotInventoryComposer(this.client.getHabbo()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryPetsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetPetInventoryEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryPetsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/inventory/GetPetInventoryEvent.java
index be19b49d..e734dcb3 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryPetsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetPetInventoryEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.inventory;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.inventory.PetInventoryComposer;
 
-public class RequestInventoryPetsEvent extends MessageHandler {
+public class GetPetInventoryEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new PetInventoryComposer(this.client.getHabbo()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestFurniInventoryWhenNotInRoomEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/inventory/RequestFurniInventoryWhenNotInRoomEvent.java
index 632374bd..423561f0 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestFurniInventoryWhenNotInRoomEvent.java
@@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.NoSuchElementException;
 
-public class RequestInventoryItemsEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RequestInventoryItemsEvent.class);
+public class RequestFurniInventoryWhenNotInRoomEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(RequestFurniInventoryWhenNotInRoomEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java
similarity index 85%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ReportEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java
index 9e0eac7c..b812da4e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java
@@ -13,7 +13,7 @@ import com.eu.habbo.threading.runnables.InsertModToolIssue;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ReportEvent extends MessageHandler {
+public class CallForHelpEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (!this.client.getHabbo().getHabboStats().allowTalk()) {
@@ -73,12 +73,12 @@ public class ReportEvent extends MessageHandler {
                             Emulator.getThreading().run(() -> {
                                 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 IgnoreResultMessageComposer(reported, IgnoreResultMessageComposer.IGNORED));
+                                        if (CallForHelpEvent.this.client.getHabbo().getHabboStats().ignoreUser(CallForHelpEvent.this.client, reported.getHabboInfo().getId())) {
+                                            CallForHelpEvent.this.client.sendResponse(new IgnoreResultMessageComposer(reported, IgnoreResultMessageComposer.IGNORED));
                                         }
                                     }
 
-                                    ReportEvent.this.client.sendResponse(new IssueCloseNotificationMessageComposer(cfhTopic.reply).compose());
+                                    CallForHelpEvent.this.client.sendResponse(new IssueCloseNotificationMessageComposer(cfhTopic.reply).compose());
                                     Emulator.getGameEnvironment().getModToolManager().closeTicketAsHandled(issue, null);
                                 }
                             }, 30 * 1000);
@@ -100,15 +100,15 @@ public class ReportEvent extends MessageHandler {
                     Emulator.getThreading().run(() -> {
                         if (issue.state == ModToolTicketState.OPEN) {
                             if (cfhTopic.action == CfhActionType.AUTO_IGNORE) {
-                                if (ReportEvent.this.client.getHabbo().getHabboStats().ignoreUser(ReportEvent.this.client, issue.reportedId)) {
+                                if (CallForHelpEvent.this.client.getHabbo().getHabboStats().ignoreUser(CallForHelpEvent.this.client, issue.reportedId)) {
                                     Habbo reported = Emulator.getGameEnvironment().getHabboManager().getHabbo(issue.reportedId);
                                     if (reported != null) {
-                                        ReportEvent.this.client.sendResponse(new IgnoreResultMessageComposer(reported, IgnoreResultMessageComposer.IGNORED));
+                                        CallForHelpEvent.this.client.sendResponse(new IgnoreResultMessageComposer(reported, IgnoreResultMessageComposer.IGNORED));
                                     }
                                 }
                             }
 
-                            ReportEvent.this.client.sendResponse(new IssueCloseNotificationMessageComposer(cfhTopic.reply).compose());
+                            CallForHelpEvent.this.client.sendResponse(new IssueCloseNotificationMessageComposer(cfhTopic.reply).compose());
                             Emulator.getGameEnvironment().getModToolManager().closeTicketAsHandled(issue, null);
                         }
                     }, 30 * 1000);
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportCommentEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromForumMessageEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ReportCommentEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromForumMessageEvent.java
index f91e352d..e2f10afd 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportCommentEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromForumMessageEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer;
 import com.eu.habbo.threading.runnables.InsertModToolIssue;
 
-public class ReportCommentEvent extends MessageHandler {
+public class CallForHelpFromForumMessageEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int groupId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportThreadEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromForumThreadEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ReportThreadEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromForumThreadEvent.java
index 01a47f99..2273090c 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportThreadEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromForumThreadEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer;
 import com.eu.habbo.threading.runnables.InsertModToolIssue;
 
-public class ReportThreadEvent extends MessageHandler {
+public class CallForHelpFromForumThreadEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int groupId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportFriendPrivateChatEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ReportFriendPrivateChatEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java
index 728f7aad..3ae6b09e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportFriendPrivateChatEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java
@@ -13,7 +13,7 @@ import com.eu.habbo.threading.runnables.InsertModToolIssue;
 
 import java.util.ArrayList;
 
-public class ReportFriendPrivateChatEvent extends MessageHandler {
+public class CallForHelpFromIMEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (!this.client.getHabbo().getHabboStats().allowTalk()) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportPhotoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromPhotoEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ReportPhotoEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromPhotoEvent.java
index c47df6ed..dadb4e9c 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportPhotoEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromPhotoEvent.java
@@ -12,7 +12,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer;
 import com.eu.habbo.threading.runnables.InsertModToolIssue;
 
-public class ReportPhotoEvent extends MessageHandler {
+public class CallForHelpFromPhotoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         boolean hasExtradataId = this.packet.readShort() != 0;
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ChatReviewSessionCreateEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ChatReviewSessionCreateEvent.java
index c9c3a069..dd68ace6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ChatReviewSessionCreateEvent.java
@@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.modtool.CallForHelpDisabledNotifyMessageCo
 
 import java.util.ArrayList;
 
-public class ReportBullyEvent extends MessageHandler {
+public class ChatReviewSessionCreateEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboStats().allowTalk()) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolIssueDefaultSanctionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssueDefaultActionEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolIssueDefaultSanctionEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssueDefaultActionEvent.java
index 3a0f770c..b2787605 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolIssueDefaultSanctionEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssueDefaultActionEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ModToolIssueDefaultSanctionEvent extends MessageHandler {
+public class CloseIssueDefaultActionEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolCloseTicketEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssuesEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolCloseTicketEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssuesEvent.java
index 9326623e..67620358 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolCloseTicketEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssuesEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ModToolCloseTicketEvent extends MessageHandler {
+public class CloseIssuesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestIssueChatlogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetCfhChatlogEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestIssueChatlogEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/GetCfhChatlogEvent.java
index e8cd8c6e..fe3698a7 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestIssueChatlogEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetCfhChatlogEvent.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class ModToolRequestIssueChatlogEvent extends MessageHandler {
+public class GetCfhChatlogEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportUserBullyingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetGuideReportingStatusEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportUserBullyingEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/GetGuideReportingStatusEvent.java
index a6594a43..25616c6c 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportUserBullyingEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetGuideReportingStatusEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.modtool.GuideReportingStatusMessageCompose
 
 import java.util.Calendar;
 
-public class RequestReportUserBullyingEvent extends MessageHandler {
+public class GetGuideReportingStatusEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         GuardianTicket ticket = Emulator.getGameEnvironment().getGuideManager().getRecentTicket(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorRoomInfoEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomInfoEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorRoomInfoEvent.java
index eff8d91a..246e3276 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomInfoEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorRoomInfoEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.ModeratorRoomInfoComposer;
 
-public class ModToolRequestRoomInfoEvent extends MessageHandler {
+public class GetModeratorRoomInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestUserInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorUserInfoEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestUserInfoEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorUserInfoEvent.java
index 25f68402..c8eab63a 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestUserInfoEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorUserInfoEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager;
 import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ModToolRequestUserInfoEvent extends MessageHandler {
+public class GetModeratorUserInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetPendingCallsForHelpEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportRoomEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/GetPendingCallsForHelpEvent.java
index 1a73f5b4..11502c7f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportRoomEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetPendingCallsForHelpEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.CallForHelpPendingCallsMessageComposer;
 
-public class RequestReportRoomEvent extends MessageHandler {
+public class GetPendingCallsForHelpEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new CallForHelpPendingCallsMessageComposer(Emulator.getGameEnvironment().getModToolManager().openTicketsForHabbo(this.client.getHabbo())));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomChatlogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomChatlogEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomChatlogEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomChatlogEvent.java
index 6f25a32b..90000c0b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomChatlogEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomChatlogEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.RoomChatlogComposer;
 
-public class ModToolRequestRoomChatlogEvent extends MessageHandler {
+public class GetRoomChatlogEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomVisitsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomVisitsEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomVisitsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomVisitsEvent.java
index 2751fde8..adfd4594 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomVisitsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomVisitsEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.HabboInfo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.RoomVisitsComposer;
 
-public class ModToolRequestRoomVisitsEvent extends MessageHandler {
+public class GetRoomVisitsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestUserChatlogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetUserChatlogEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestUserChatlogEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/GetUserChatlogEvent.java
index 28d2a649..99481ba2 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestUserChatlogEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetUserChatlogEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.users.HabboManager;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.UserChatlogComposer;
 
-public class ModToolRequestUserChatlogEvent extends MessageHandler {
+public class GetUserChatlogEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionAlertEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionAlertEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java
index 42ba731d..9704f8f6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionAlertEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java
@@ -11,7 +11,7 @@ import gnu.trove.map.hash.THashMap;
 
 import java.util.ArrayList;
 
-public class ModToolSanctionAlertEvent extends MessageHandler {
+public class ModAlertEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionBanEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionBanEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java
index c3035034..c8e607a3 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionBanEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java
@@ -10,10 +10,8 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import gnu.trove.map.hash.THashMap;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 
-public class ModToolSanctionBanEvent extends MessageHandler {
+public class ModBanEvent extends MessageHandler {
     public static final int BAN_18_HOURS = 3;
     public static final int BAN_7_DAYS = 4;
     public static final int BAN_30_DAYS_STEP_1 = 5;
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolKickEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModKickEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolKickEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ModKickEvent.java
index 3e1e234e..1412884a 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolKickEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModKickEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.modtool;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ModToolKickEvent extends MessageHandler {
+public class ModKickEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Emulator.getGameEnvironment().getModToolManager().kick(this.client.getHabbo(), Emulator.getGameEnvironment().getHabboManager().getHabbo(this.packet.readInt()), this.packet.readString());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolAlertEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMessageEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolAlertEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ModMessageEvent.java
index 09b4ebb3..2b9c1756 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolAlertEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMessageEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.support.SupportUserAlertedReason;
 
-public class ModToolAlertEvent extends MessageHandler {
+public class ModMessageEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java
index 098c134c..dc6042b4 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java
@@ -13,7 +13,7 @@ import gnu.trove.map.hash.THashMap;
 import java.util.ArrayList;
 import java.util.Date;
 
-public class ModToolSanctionMuteEvent extends MessageHandler {
+public class ModMuteEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolIssueChangeTopicEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolIssueChangeTopicEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionEvent.java
index efa0e853..ae01f3e3 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolIssueChangeTopicEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.threading.runnables.UpdateModToolIssue;
 
-public class ModToolIssueChangeTopicEvent extends MessageHandler {
+public class ModToolSanctionEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionTradeLockEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionTradeLockEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java
index 8a29be29..8f7b79ec 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionTradeLockEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java
@@ -11,7 +11,7 @@ import gnu.trove.map.hash.THashMap;
 
 import java.util.ArrayList;
 
-public class ModToolSanctionTradeLockEvent extends MessageHandler {
+public class ModTradingLockEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolChangeRoomSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModerateRoomEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolChangeRoomSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ModerateRoomEvent.java
index a84022df..c75dd8ff 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolChangeRoomSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModerateRoomEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ModToolChangeRoomSettingsEvent extends MessageHandler {
+public class ModerateRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRoomAlertEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModeratorActionEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRoomAlertEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ModeratorActionEvent.java
index 8631a3e8..1ecdaf55 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRoomAlertEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModeratorActionEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ModToolRoomAlertEvent extends MessageHandler {
+public class ModeratorActionEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolPickTicketEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/PickIssuesEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolPickTicketEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/PickIssuesEvent.java
index b5cd72b2..539a0cba 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolPickTicketEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/PickIssuesEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.modtool.IssueInfoMessageComposer;
 
-public class ModToolPickTicketEvent extends MessageHandler {
+public class PickIssuesEvent extends MessageHandler {
     public static boolean send = false;
 
     @Override
diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolReleaseTicketEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReleaseIssuesEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolReleaseTicketEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/modtool/ReleaseIssuesEvent.java
index e0a155d9..6779cb9a 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolReleaseTicketEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReleaseIssuesEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager;
 import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ModToolReleaseTicketEvent extends MessageHandler {
+public class ReleaseIssuesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCanCreateRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/CanCreateRoomEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCanCreateRoomEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/CanCreateRoomEvent.java
index b2b93714..b354cc34 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCanCreateRoomEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/CanCreateRoomEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.RoomManager;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.CanCreateRoomComposer;
 
-public class RequestCanCreateRoomEvent extends MessageHandler {
+public class CanCreateRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int count = Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo()).size();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/CreateFlatEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/CreateFlatEvent.java
index aef7b3cd..ca8551c8 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/CreateFlatEvent.java
@@ -10,8 +10,8 @@ import com.eu.habbo.messages.outgoing.navigator.FlatCreatedComposer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RequestCreateRoomEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RequestCreateRoomEvent.class);
+public class CreateFlatEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateFlatEvent.class);
 
 
     @Override
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestDeleteRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteRoomEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestDeleteRoomEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteRoomEvent.java
index 28311f13..279fcce2 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestDeleteRoomEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteRoomEvent.java
@@ -20,8 +20,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class RequestDeleteRoomEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RequestDeleteRoomEvent.class);
+public class DeleteRoomEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(DeleteRoomEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/ForwardToSomeRoomEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/ForwardToSomeRoomEvent.java
index f7b375d6..e491fc56 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/ForwardToSomeRoomEvent.java
@@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.users.NavigatorSettingsComposer;
 import java.util.ArrayList;
 import java.util.Collections;
 
-public class NewNavigatorActionEvent extends MessageHandler {
+public class ForwardToSomeRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String data = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestTagsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetPopularRoomTagsEvent.java
similarity index 86%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestTagsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/GetPopularRoomTagsEvent.java
index 96d01a82..f74205b2 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestTagsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetPopularRoomTagsEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.PopularRoomTagsResultComposer;
 
-public class RequestTagsEvent extends MessageHandler {
+public class GetPopularRoomTagsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new PopularRoomTagsResultComposer(Emulator.getGameEnvironment().getRoomManager().getTags()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPromotedRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUnreadForumsCountEvent.java
similarity index 86%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPromotedRoomsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/GetUnreadForumsCountEvent.java
index abe63eda..23aa535d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPromotedRoomsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUnreadForumsCountEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
-public class RequestPromotedRoomsEvent extends MessageHandler {
+public class GetUnreadForumsCountEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsPromoted()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNavigatorSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserEventCatsEvent.java
similarity index 85%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNavigatorSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserEventCatsEvent.java
index dec99ca9..e7df39eb 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNavigatorSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserEventCatsEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.navigator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.NewNavigatorPreferencesComposer;
 
-public class RequestNavigatorSettingsEvent extends MessageHandler {
+public class GetUserEventCatsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
 
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestRoomCategoriesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserFlatCatsEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestRoomCategoriesEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserFlatCatsEvent.java
index 839f9aec..5c105db2 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestRoomCategoriesEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserFlatCatsEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.navigator.UserFlatCatsComposer;
 
 import java.util.List;
 
-public class RequestRoomCategoriesEvent extends MessageHandler {
+public class GetUserFlatCatsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         List<RoomCategory> roomCategoryList = Emulator.getGameEnvironment().getRoomManager().roomCategoriesForHabbo(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsMyFavouriteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFavouriteRoomsSearchEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsMyFavouriteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/MyFavouriteRoomsSearchEvent.java
index 90490e2d..482883d7 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsMyFavouriteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFavouriteRoomsSearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
-public class SearchRoomsMyFavouriteEvent extends MessageHandler {
+public class MyFavouriteRoomsSearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFavourite(this.client.getHabbo())));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsOwnEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFriendsRoomsSearchEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsOwnEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/MyFriendsRoomsSearchEvent.java
index 561ec64d..d477517d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsOwnEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFriendsRoomsSearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
-public class SearchRoomsFriendsOwnEvent extends MessageHandler {
+public class MyFriendsRoomsSearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsOwn(this.client.getHabbo())));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsInGroupEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyGuildBasesSearchEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsInGroupEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/MyGuildBasesSearchEvent.java
index b079a911..23a0d742 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsInGroupEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyGuildBasesSearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
-public class SearchRoomsInGroupEvent extends MessageHandler {
+public class MyGuildBasesSearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsInGroup(this.client.getHabbo())));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsVisitedEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomHistorySearchEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsVisitedEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomHistorySearchEvent.java
index 0f3cc854..bd7c3a04 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsVisitedEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomHistorySearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
-public class SearchRoomsVisitedEvent extends MessageHandler {
+public class MyRoomHistorySearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsVisited(this.client.getHabbo(), false, 25)));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsWithRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomRightsSearchEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsWithRightsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomRightsSearchEvent.java
index edfd4f09..f5ad8489 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsWithRightsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomRightsSearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
-public class SearchRoomsWithRightsEvent extends MessageHandler {
+public class MyRoomRightsSearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithRights(this.client.getHabbo())));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestMyRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomsSearchEvent.java
similarity index 88%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestMyRoomsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomsSearchEvent.java
index 2415cad5..86ccf32e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestMyRoomsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomsSearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
-public class RequestMyRoomsEvent extends MessageHandler {
+public class MyRoomsSearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo())));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorCollapseCategoryEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddCollapsedCategoryEvent.java
similarity index 84%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorCollapseCategoryEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddCollapsedCategoryEvent.java
index 549c2786..3e74b3e8 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorCollapseCategoryEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddCollapsedCategoryEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.navigator;
 import com.eu.habbo.habbohotel.navigation.DisplayMode;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class NavigatorCollapseCategoryEvent extends MessageHandler {
+public class NavigatorAddCollapsedCategoryEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String category = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/AddSavedSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddSavedSearchEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/AddSavedSearchEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddSavedSearchEvent.java
index 4f48fb54..a15b9ff9 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/AddSavedSearchEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddSavedSearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.navigation.NavigatorSavedSearch;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.NavigatorSavedSearchesComposer;
 
-public class AddSavedSearchEvent extends MessageHandler {
+public class NavigatorAddSavedSearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String searchCode = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteSavedSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorDeleteSavedSearchEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteSavedSearchEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorDeleteSavedSearchEvent.java
index cd686f76..e1e7dc83 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteSavedSearchEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorDeleteSavedSearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.navigation.NavigatorSavedSearch;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.NavigatorSavedSearchesComposer;
 
-public class DeleteSavedSearchEvent extends MessageHandler {
+public class NavigatorDeleteSavedSearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int searchId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorUncollapseCategoryEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorRemoveCollapsedCategoryEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorUncollapseCategoryEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorRemoveCollapsedCategoryEvent.java
index 2a2eb7c1..a233270d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorUncollapseCategoryEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorRemoveCollapsedCategoryEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.navigator;
 import com.eu.habbo.habbohotel.navigation.DisplayMode;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class NavigatorUncollapseCategoryEvent extends MessageHandler {
+public class NavigatorRemoveCollapsedCategoryEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String category = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorCategoryListModeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorSetSearchCodeViewModeEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorCategoryListModeEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorSetSearchCodeViewModeEvent.java
index 3b3e6c4a..431ef393 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorCategoryListModeEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorSetSearchCodeViewModeEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.navigation.ListMode;
 import com.eu.habbo.habbohotel.rooms.RoomCategory;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class NavigatorCategoryListModeEvent extends MessageHandler {
+public class NavigatorSetSearchCodeViewModeEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String category = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorInitEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorInitEvent.java
index f53d0baf..5e269f7b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorInitEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.navigator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.*;
 
-public class RequestNewNavigatorDataEvent extends MessageHandler {
+public class NewNavigatorInitEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new NewNavigatorPreferencesComposer(this.client.getHabbo().getHabboStats().navigatorWindowSettings));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorSearchEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorSearchEvent.java
index 797f6d07..fd2b495d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorSearchEvent.java
@@ -13,8 +13,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
-public class RequestNewNavigatorRoomsEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RequestNewNavigatorRoomsEvent.class);
+public class NewNavigatorSearchEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(NewNavigatorSearchEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPopularRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/PopularRoomsSearchEvent.java
similarity index 86%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPopularRoomsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/PopularRoomsSearchEvent.java
index 839c5393..4e5e8f02 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPopularRoomsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/PopularRoomsSearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
-public class RequestPopularRoomsEvent extends MessageHandler {
+public class PopularRoomsSearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getActiveRooms(-1)));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomTextSearchEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/RoomTextSearchEvent.java
index ce83b97a..592d1c0f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomTextSearchEvent.java
@@ -11,7 +11,7 @@ import gnu.trove.map.hash.THashMap;
 
 import java.util.ArrayList;
 
-public class SearchRoomsEvent extends MessageHandler {
+public class RoomTextSearchEvent extends MessageHandler {
     public final static THashMap<Rank, THashMap<String, ServerMessage>> cachedResults = new THashMap<>(4);
 
     @Override
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsNowEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWhereMyFriendsAreSearchEvent.java
similarity index 85%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsNowEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWhereMyFriendsAreSearchEvent.java
index 75c32440..373e5a83 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsNowEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWhereMyFriendsAreSearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
-public class SearchRoomsFriendsNowEvent extends MessageHandler {
+public class RoomsWhereMyFriendsAreSearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsNow(this.client.getHabbo())));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestHighestScoreRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWithHighestScoreSearchEvent.java
similarity index 85%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/RequestHighestScoreRoomsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWithHighestScoreSearchEvent.java
index 0598b9be..a704d284 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestHighestScoreRoomsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWithHighestScoreSearchEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer;
 
-public class RequestHighestScoreRoomsEvent extends MessageHandler {
+public class RoomsWithHighestScoreSearchEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsByScore()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SaveWindowSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SetNewNavigatorWindowPreferencesEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/navigator/SaveWindowSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/navigator/SetNewNavigatorWindowPreferencesEvent.java
index 2910d0c8..08351f7e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SaveWindowSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SetNewNavigatorWindowPreferencesEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.navigator;
 import com.eu.habbo.habbohotel.users.HabboNavigatorWindowSettings;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class SaveWindowSettingsEvent extends MessageHandler {
+public class SetNewNavigatorWindowPreferencesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         HabboNavigatorWindowSettings windowSettings = this.client.getHabbo().getHabboStats().navigatorWindowSettings;
diff --git a/src/main/java/com/eu/habbo/messages/incoming/polls/CancelPollEvent.java b/src/main/java/com/eu/habbo/messages/incoming/polls/PollRejectEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/polls/CancelPollEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/polls/PollRejectEvent.java
index a38b5a03..1860a019 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/polls/CancelPollEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/polls/PollRejectEvent.java
@@ -10,8 +10,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-public class CancelPollEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CancelPollEvent.class);
+public class PollRejectEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(PollRejectEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/polls/GetPollDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/polls/PollStartEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/polls/GetPollDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/polls/PollStartEvent.java
index 08a767c0..218fe106 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/polls/GetPollDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/polls/PollStartEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.polls.Poll;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.polls.PollContentsComposer;
 
-public class GetPollDataEvent extends MessageHandler {
+public class PollStartEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int pollId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomFavoriteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/AddFavouriteRoomEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomFavoriteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/AddFavouriteRoomEvent.java
index d4f1d643..5c1509c1 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomFavoriteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/AddFavouriteRoomEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.FavouriteChangedComposer;
 
-public class RoomFavoriteEvent extends MessageHandler {
+public class AddFavouriteRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int roomId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomUnFavoriteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/DeleteFavouriteRoomEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomUnFavoriteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/DeleteFavouriteRoomEvent.java
index 165fd181..98d815ea 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomUnFavoriteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/DeleteFavouriteRoomEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.FavouriteChangedComposer;
 
-public class RoomUnFavoriteEvent extends MessageHandler {
+public class DeleteFavouriteRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int roomId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRequestBannedUsersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetBannedUsersFromRoomEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRequestBannedUsersEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/GetBannedUsersFromRoomEvent.java
index f1bef514..f0c1cc71 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRequestBannedUsersEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetBannedUsersFromRoomEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.BannedUsersFromRoomComposer;
 
-public class RoomRequestBannedUsersEvent extends MessageHandler {
+public class GetBannedUsersFromRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int roomId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomWordFilterEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetCustomRoomFilterEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomWordFilterEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/GetCustomRoomFilterEvent.java
index 196e429d..fc492806 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomWordFilterEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetCustomRoomFilterEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.RoomFilterSettingsMessageComposer;
 
-public class RequestRoomWordFilterEvent extends MessageHandler {
+public class GetCustomRoomFilterEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.packet.readInt());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetFlatControllersEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomRightsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/GetFlatControllersEvent.java
index 4ec58fb3..91ea8f9e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomRightsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetFlatControllersEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.FlatControllersComposer;
 
-public class RequestRoomRightsEvent extends MessageHandler {
+public class GetFlatControllersEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetGuestRoomEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/GetGuestRoomEvent.java
index e53d3ece..36b43f5e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetGuestRoomEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer;
 
-public class RequestRoomDataEvent extends MessageHandler {
+public class GetGuestRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(this.packet.readInt());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomEntryDataEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomEntryDataEvent.java
index 47603694..030d6bd7 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomEntryDataEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.FloorHeightMapComposer;
 import com.eu.habbo.messages.outgoing.rooms.HeightMapComposer;
 
-public class RequestRoomHeightmapEvent extends MessageHandler {
+public class GetRoomEntryDataEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getLoadingRoom() > 0) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomSettingsEvent.java
similarity index 89%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomSettingsEvent.java
index 78aef72b..c41c660b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomSettingsEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.RoomSettingsDataComposer;
 
-public class RequestRoomSettingsEvent extends MessageHandler {
+public class GetRoomSettingsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int roomId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/HandleDoorbellEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/LetUserInEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/HandleDoorbellEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/LetUserInEvent.java
index 55c6e351..3e5f5ef9 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/HandleDoorbellEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/LetUserInEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.FlatAccessibleMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.FlatAccessDeniedMessageComposer;
 
-public class HandleDoorbellEvent extends MessageHandler {
+public class LetUserInEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null && this.client.getHabbo().getHabboInfo().getCurrentRoom().hasRights(this.client.getHabbo())) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomMuteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/MuteAllInRoomEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomMuteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/MuteAllInRoomEvent.java
index 2260cdbd..b62e762b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomMuteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/MuteAllInRoomEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.MuteAllInRoomComposer;
 
-public class RoomMuteEvent extends MessageHandler {
+public class MuteAllInRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomLoadEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/OpenFlatConnectionEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomLoadEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/OpenFlatConnectionEvent.java
index 93c904be..94903a00 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomLoadEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/OpenFlatConnectionEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RequestRoomLoadEvent extends MessageHandler {
+public class OpenFlatConnectionEvent extends MessageHandler {
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomVoteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RateFlatEvent.java
similarity index 86%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomVoteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/RateFlatEvent.java
index 57e3dc8f..1de3fd66 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomVoteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RateFlatEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RoomVoteEvent extends MessageHandler {
+public class RateFlatEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Emulator.getGameEnvironment().getRoomManager().voteForRoom(this.client.getHabbo(), this.client.getHabbo().getHabboInfo().getCurrentRoom());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveAllRightsEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveAllRightsEvent.java
index 4d8d3237..cb6c4102 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveAllRightsEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.rooms.YouAreControllerMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.users.NoSuchFlatComposer;
 import gnu.trove.procedure.TIntProcedure;
 
-public class RoomRemoveAllRightsEvent extends MessageHandler {
+public class RemoveAllRightsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         final Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveOwnRoomRightsRoomEvent.java
similarity index 84%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveRightsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveOwnRoomRightsRoomEvent.java
index 1e23d538..95153ac5 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveRightsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveOwnRoomRightsRoomEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RoomRemoveRightsEvent extends MessageHandler {
+public class RemoveOwnRoomRightsRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int roomId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomPlacePaintEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomPropertySet.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomPlacePaintEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomPropertySet.java
index ca134197..240312f9 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomPlacePaintEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomPropertySet.java
@@ -9,7 +9,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
 import com.eu.habbo.messages.outgoing.rooms.RoomPropertyMessageComposer;
 
-public class RoomPlacePaintEvent extends MessageHandler {
+public class RequestRoomPropertySet extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null)
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/SaveRoomSettingsEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/SaveRoomSettingsEvent.java
index 014ad95c..5ee705fd 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/SaveRoomSettingsEvent.java
@@ -10,8 +10,8 @@ import com.eu.habbo.messages.outgoing.rooms.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RoomSettingsSaveEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RoomSettingsSaveEvent.class);
+public class SaveRoomSettingsEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SaveRoomSettingsEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomBackgroundEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/SetRoomBackgroundColorDataEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomBackgroundEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/SetRoomBackgroundColorDataEvent.java
index a53c8f1b..d42adbdb 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomBackgroundEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/SetRoomBackgroundColorDataEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.furniture.FurnitureRoomTonerEvent;
 
-public class RoomBackgroundEvent extends MessageHandler {
+public class SetRoomBackgroundColorDataEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomStaffPickEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/SubmitRoomToCompetitionEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomStaffPickEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/SubmitRoomToCompetitionEvent.java
index bc0ccc82..4110cea0 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomStaffPickEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/SubmitRoomToCompetitionEvent.java
@@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer;
 
-public class RoomStaffPickEvent extends MessageHandler {
+public class SubmitRoomToCompetitionEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().hasPermission(Permission.ACC_STAFF_PICK)) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateHomeRoomEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateHomeRoomEvent.java
index 03363403..430c6403 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateHomeRoomEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.users.NavigatorSettingsComposer;
 
-public class SetHomeRoomEvent extends MessageHandler {
+public class UpdateHomeRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int roomId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomWordFilterModifyEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateRoomFilterEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/RoomWordFilterModifyEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateRoomFilterEvent.java
index be680d50..d04570a9 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomWordFilterModifyEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateRoomFilterEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RoomWordFilterModifyEvent extends MessageHandler {
+public class UpdateRoomFilterEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         final int roomId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/CommandBotEvent.java
similarity index 99%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/bots/CommandBotEvent.java
index 42a64b29..f50f4c65 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/CommandBotEvent.java
@@ -18,7 +18,7 @@ import org.jsoup.Jsoup;
 
 import java.util.ArrayList;
 
-public class BotSaveSettingsEvent extends MessageHandler {
+public class CommandBotEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/GetBotCommandConfigurationDataEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/bots/GetBotCommandConfigurationDataEvent.java
index af2e2c08..3e7387ce 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/GetBotCommandConfigurationDataEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.BotCommandConfigurationComposer;
 
-public class BotSettingsEvent extends MessageHandler {
+public class GetBotCommandConfigurationDataEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotPlaceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/PlaceBotEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotPlaceEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/bots/PlaceBotEvent.java
index 4b9e9c95..a15b9aa9 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotPlaceEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/PlaceBotEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.bots.Bot;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class BotPlaceEvent extends MessageHandler {
+public class PlaceBotEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotPickupEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/RemoveBotFromFlatEvent.java
similarity index 88%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotPickupEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/bots/RemoveBotFromFlatEvent.java
index ea04d577..c940c41a 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotPickupEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/RemoveBotFromFlatEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class BotPickupEvent extends MessageHandler {
+public class RemoveBotFromFlatEvent extends MessageHandler {
 
 
     @Override
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SavePostItStickyPoleEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/AddSpamWallPostItEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/SavePostItStickyPoleEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/AddSpamWallPostItEvent.java
index 9f393896..7ce3bdc6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SavePostItStickyPoleEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/AddSpamWallPostItEvent.java
@@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory;
 
 import java.time.LocalDate;
 
-public class SavePostItStickyPoleEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SavePostItStickyPoleEvent.class);
+public class AddSpamWallPostItEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AddSpamWallPostItEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CreditFurniRedeemEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/CreditFurniRedeemEvent.java
index ee38d3ea..14814846 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CreditFurniRedeemEvent.java
@@ -14,8 +14,8 @@ import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RedeemItemEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RedeemItemEvent.class);
+public class CreditFurniRedeemEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreditFurniRedeemEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CustomizeAvatarWithFurniEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/CustomizeAvatarWithFurniEvent.java
index b224efd4..4e48d5de 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CustomizeAvatarWithFurniEvent.java
@@ -19,8 +19,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-public class RedeemClothingEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RedeemClothingEvent.class);
+public class CustomizeAvatarWithFurniEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CustomizeAvatarWithFurniEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CloseDiceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/DiceOffEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/CloseDiceEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/DiceOffEvent.java
index 37ceeed4..1fe01c5e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CloseDiceEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/DiceOffEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.RoomLayout;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class CloseDiceEvent extends MessageHandler {
+public class DiceOffEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/TriggerOneWayGateEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/EnterOneWayDoorEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/TriggerOneWayGateEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/EnterOneWayDoorEvent.java
index 04c9bfd0..024e1a54 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/TriggerOneWayGateEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/EnterOneWayDoorEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionOneWayGate;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TriggerOneWayGateEvent extends MessageHandler {
+public class EnterOneWayDoorEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null)
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItRequestDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/GetItemDataEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItRequestDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/GetItemDataEvent.java
index 704065be..689d77e1 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItRequestDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/GetItemDataEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.items.ItemDataUpdateMessageComposer;
 
-public class PostItRequestDataEvent extends MessageHandler {
+public class GetItemDataEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RotateMoveItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveObjectEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/RotateMoveItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveObjectEvent.java
index 28ba0a0d..2769ce62 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RotateMoveItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveObjectEvent.java
@@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageCo
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
 import com.eu.habbo.messages.outgoing.rooms.items.ObjectUpdateMessageComposer;
 
-public class RotateMoveItemEvent extends MessageHandler {
+public class MoveObjectEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomPickupItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PickupObjectEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomPickupItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/PickupObjectEvent.java
index c3585ecb..4557af6e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomPickupItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PickupObjectEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RoomPickupItemEvent extends MessageHandler {
+public class PickupObjectEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int category = this.packet.readInt(); //10 = floorItem and 20 = wallItem
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomPlaceItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlaceObjectEvent.java
similarity index 99%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomPlaceItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlaceObjectEvent.java
index 56eef7ff..b64b19a7 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomPlaceItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlaceObjectEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageCo
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
 import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
 
-public class RoomPlaceItemEvent extends MessageHandler {
+public class PlaceObjectEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String[] values = this.packet.readString().split(" ");
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItPlaceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlacePostItEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItPlaceEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlacePostItEvent.java
index a2f666dd..9fc605d9 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItPlaceEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlacePostItEvent.java
@@ -13,7 +13,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
 import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.ItemAddMessageComposer;
 
-public class PostItPlaceEvent extends MessageHandler {
+public class PlacePostItEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItDeleteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RemoveItemEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItDeleteEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/RemoveItemEvent.java
index 1a9fb954..fe98c1a1 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItDeleteEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RemoveItemEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.items.ItemRemoveMessageComposer;
 import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
 
-public class PostItDeleteEvent extends MessageHandler {
+public class RemoveItemEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightTurnOnEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerChangeStateEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightTurnOnEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerChangeStateEvent.java
index 4f2e8eb5..d0610ace 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightTurnOnEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerChangeStateEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.RoomRightLevels;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class MoodLightTurnOnEvent extends MessageHandler {
+public class RoomDimmerChangeStateEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerGetPresetsEvent.java
similarity index 88%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerGetPresetsEvent.java
index 9f2ee7b8..ee1f6782 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerGetPresetsEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms.items;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.items.RoomDimmerPresetsComposer;
 
-public class MoodLightSettingsEvent extends MessageHandler {
+public class RoomDimmerGetPresetsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null)
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerSavePresetEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerSavePresetEvent.java
index 111846e9..c1ce005e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerSavePresetEvent.java
@@ -13,7 +13,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.RoomDimmerPresetsComposer;
 import java.util.Arrays;
 import java.util.List;
 
-public class MoodLightSaveSettingsEvent extends MessageHandler {
+public class RoomDimmerSavePresetEvent extends MessageHandler {
     public static List<String> MOODLIGHT_AVAILABLE_COLORS = Arrays.asList("#74F5F5,#0053F7,#E759DE,#EA4532,#F2F851,#82F349,#000000".split(","));
     public static int MIN_BRIGHTNESS = (int) Math.floor(0.3 * 0xFF);
 
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/FootballGateSaveLookEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetClothingChangeDataEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/FootballGateSaveLookEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetClothingChangeDataEvent.java
index aa4d2f30..9a1aac59 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/FootballGateSaveLookEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetClothingChangeDataEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class FootballGateSaveLookEvent extends MessageHandler {
+public class SetClothingChangeDataEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetStackHelperHeightEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetStackHelperHeightEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java
index 5829f69f..55fd0f44 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetStackHelperHeightEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java
@@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.UpdateStackHeightTileHeightComposer;
 import gnu.trove.set.hash.THashSet;
 
-public class SetStackHelperHeightEvent extends MessageHandler {
+public class SetCustomStackingHeightEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItSaveDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetItemDataEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItSaveDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetItemDataEvent.java
index a2bb5524..f6b44696 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItSaveDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetItemDataEvent.java
@@ -11,7 +11,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import java.util.Arrays;
 import java.util.List;
 
-public class PostItSaveDataEvent extends MessageHandler {
+public class SetItemDataEvent extends MessageHandler {
     private static List<String> COLORS = Arrays.asList("9CCEFF", "FF9CFF", "9CFF9C", "FFFF33");
 
     @Override
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinFigureEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinFigureEvent.java
index 6713af89..3ede31d7 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinFigureEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class MannequinSaveLookEvent extends MessageHandler {
+public class SetMannequinFigureEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Habbo habbo = this.client.getHabbo();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinNameEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveNameEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinNameEvent.java
index c5c94204..e44adf96 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveNameEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinNameEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class MannequinSaveNameEvent extends MessageHandler {
+public class SetMannequinNameEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/AdvertisingSaveEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetObjectDataEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/AdvertisingSaveEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetObjectDataEvent.java
index b25f3792..39a57a9c 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/AdvertisingSaveEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetObjectDataEvent.java
@@ -8,9 +8,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import gnu.trove.map.hash.THashMap;
 
-import java.util.Map;
-
-public class AdvertisingSaveEvent extends MessageHandler {
+public class SetObjectDataEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseRandomStateItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetRandomStateEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseRandomStateItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetRandomStateEvent.java
index 85a357ff..ba5280eb 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseRandomStateItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetRandomStateEvent.java
@@ -7,8 +7,8 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UseRandomStateItemEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(UseRandomStateItemEvent.class);
+public class SetRandomStateEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SetRandomStateEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/TriggerColorWheelEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SpinWheelOfFortuneEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/TriggerColorWheelEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/SpinWheelOfFortuneEvent.java
index 58df4ab3..77142088 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/TriggerColorWheelEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SpinWheelOfFortuneEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TriggerColorWheelEvent extends MessageHandler {
+public class SpinWheelOfFortuneEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/TriggerDiceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ThrowDiceEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/TriggerDiceEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/ThrowDiceEvent.java
index bc5c91cb..00c85cde 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/TriggerDiceEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ThrowDiceEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.RoomLayout;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TriggerDiceEvent extends MessageHandler {
+public class ThrowDiceEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseFurnitureEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseFurnitureEvent.java
index 439c4a2d..c64182a6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseFurnitureEvent.java
@@ -17,8 +17,8 @@ import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ToggleFloorItemEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ToggleFloorItemEvent.class);
+public class UseFurnitureEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UseFurnitureEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleWallItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseWallItemEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleWallItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseWallItemEvent.java
index d4020edf..a59b3232 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleWallItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseWallItemEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.Event;
 import com.eu.habbo.plugin.events.furniture.FurnitureToggleEvent;
 
-public class ToggleWallItemEvent extends MessageHandler {
+public class UseWallItemEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxAddSoundTrackEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/AddJukeboxDiskEvent.java
similarity index 89%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxAddSoundTrackEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/AddJukeboxDiskEvent.java
index 4934e1cb..6b02232d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxAddSoundTrackEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/AddJukeboxDiskEvent.java
@@ -1,12 +1,11 @@
 package com.eu.habbo.messages.incoming.rooms.items.jukebox;
 
 import com.eu.habbo.habbohotel.items.interactions.InteractionMusicDisc;
-import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class JukeBoxAddSoundTrackEvent extends MessageHandler {
+public class AddJukeboxDiskEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (!this.client.getHabbo().getHabboInfo().getCurrentRoom().hasRights(this.client.getHabbo())) return;
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetJukeboxPlayListEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetJukeboxPlayListEvent.java
index 20b272f7..3e04eccf 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetJukeboxPlayListEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventoryMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer;
 
-public class JukeBoxRequestPlayListEvent extends MessageHandler {
+public class GetJukeboxPlayListEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetNowPlayingEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetNowPlayingEvent.java
index 081c0cca..6eb7dd21 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetNowPlayingEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventoryMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer;
 
-public class JukeBoxEventTwo extends MessageHandler {
+public class GetNowPlayingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRemoveSoundTrackEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/RemoveJukeboxDiskEvent.java
similarity index 89%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRemoveSoundTrackEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/RemoveJukeboxDiskEvent.java
index 0c631861..d978652d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRemoveSoundTrackEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/RemoveJukeboxDiskEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms.items.jukebox;
 import com.eu.habbo.habbohotel.items.interactions.InteractionMusicDisc;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class JukeBoxRemoveSoundTrackEvent extends MessageHandler {
+public class RemoveJukeboxDiskEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int index = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/LoveLockStartConfirmEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/FriendFurniConfirmLockEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/LoveLockStartConfirmEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/FriendFurniConfirmLockEvent.java
index 1ff84b0f..ef16fc95 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/LoveLockStartConfirmEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/FriendFurniConfirmLockEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.items.lovelock.FriendFurniCancelLockMessageComposer;
 import com.eu.habbo.messages.outgoing.rooms.items.lovelock.FriendFurniOtherLockConfirmedMessageComposer;
 
-public class LoveLockStartConfirmEvent extends MessageHandler {
+public class FriendFurniConfirmLockEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentSpaceCancelEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceCancelRentEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentSpaceCancelEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceCancelRentEvent.java
index bc6bd3d2..381aa794 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentSpaceCancelEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceCancelRentEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RentSpaceCancelEvent extends MessageHandler {
+public class RentableSpaceCancelRentEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentSpaceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceRentEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentSpaceEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceRentEvent.java
index 1df3bd21..059ffefd 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentSpaceEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceRentEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RentSpaceEvent extends MessageHandler {
+public class RentableSpaceRentEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java
index 117e85c6..7af486a2 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java
@@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeControlVideoMes
 import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeDisplayVideoMessageComposer;
 import com.eu.habbo.threading.runnables.YoutubeAdvanceVideo;
 
-public class YoutubeRequestStateChange extends MessageHandler {
+public class ControlYoutubeDisplayPlaybackEvent extends MessageHandler {
     public enum YoutubeState {
         PREVIOUS(0),
         NEXT(1),
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/GetYoutubeDisplayStatusEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/GetYoutubeDisplayStatusEvent.java
index 1632a601..d3be1f19 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/GetYoutubeDisplayStatusEvent.java
@@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 
-public class YoutubeRequestPlaylists extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(YoutubeRequestPlaylists.class);
+public class GetYoutubeDisplayStatusEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GetYoutubeDisplayStatusEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylistChange.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylistChange.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java
index 184a1f1f..5d0c92d5 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylistChange.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java
@@ -13,7 +13,7 @@ import com.eu.habbo.threading.runnables.YoutubeAdvanceVideo;
 
 import java.util.Optional;
 
-public class YoutubeRequestPlaylistChange extends MessageHandler {
+public class SetYoutubeDisplayPlaylistEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/BreedMonsterplantsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/BreedPetsEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/BreedMonsterplantsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/BreedPetsEvent.java
index 9ce44416..c913b24b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/BreedMonsterplantsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/BreedPetsEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.pets.MonsterplantPet;
 import com.eu.habbo.habbohotel.pets.Pet;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class BreedMonsterplantsEvent extends MessageHandler {
+public class BreedPetsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int unknownInt = this.packet.readInt(); //Something state. 2 = accept
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/StopBreedingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CancelPetBreedingEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/StopBreedingEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CancelPetBreedingEvent.java
index 5d19000d..1e663d1f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/StopBreedingEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CancelPetBreedingEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetBreedingNes
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class StopBreedingEvent extends MessageHandler {
+public class CancelPetBreedingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostMonsterplantEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostPlantEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostMonsterplantEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostPlantEvent.java
index 5a7c2dfa..6718fdb1 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostMonsterplantEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostPlantEvent.java
@@ -15,8 +15,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-public class CompostMonsterplantEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CompostMonsterplantEvent.class);
+public class CompostPlantEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CompostPlantEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetUseItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CustomizePetWithFurniEvent.java
similarity index 99%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetUseItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CustomizePetWithFurniEvent.java
index 7a7fe1d1..a0703c3a 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetUseItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CustomizePetWithFurniEvent.java
@@ -15,7 +15,7 @@ import com.eu.habbo.messages.outgoing.rooms.pets.PetFigureUpdateComposer;
 import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer;
 import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
 
-public class PetUseItemEvent extends MessageHandler {
+public class CustomizePetWithFurniEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RequestPetTrainingPanelEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetCommandsEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RequestPetTrainingPanelEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetCommandsEvent.java
index bac9fd20..d3cbad29 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RequestPetTrainingPanelEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetCommandsEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.pets.Pet;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.pets.PetTrainingPanelComposer;
 
-public class RequestPetTrainingPanelEvent extends MessageHandler {
+public class GetPetCommandsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int petId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetRideEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetRideEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java
index fd3a315a..0ccef83f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetRideEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java
@@ -11,7 +11,7 @@ import com.eu.habbo.threading.runnables.RoomUnitRidePet;
 
 import java.util.List;
 
-public class PetRideEvent extends MessageHandler {
+public class MountPetEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int petId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPackageNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/OpenPetPackageEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPackageNameEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/OpenPetPackageEvent.java
index 3b6a7301..b1ae1f62 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPackageNameEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/OpenPetPackageEvent.java
@@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer;
 import com.eu.habbo.messages.outgoing.rooms.pets.PerkAllowancesComposer;
 import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
 
-public class PetPackageNameEvent extends MessageHandler {
+public class OpenPetPackageEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPlaceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PlacePetEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPlaceEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PlacePetEvent.java
index ac75a830..740845d5 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPlaceEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PlacePetEvent.java
@@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.PetPlacingErrorComposer;
 import com.eu.habbo.messages.outgoing.inventory.PetRemovedFromInventoryComposer;
 import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetComposer;
 
-public class PetPlaceEvent extends MessageHandler {
+public class PlacePetEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPickupEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemovePetFromFlatEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPickupEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemovePetFromFlatEvent.java
index d8d393be..b9266e8b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPickupEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemovePetFromFlatEvent.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.inventory.PetAddedToInventoryComposer;
 
-public class PetPickupEvent extends MessageHandler {
+public class RemovePetFromFlatEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int petId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemoveSaddleFromPetEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemoveSaddleFromPetEvent.java
index 9be569fb..cd391176 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemoveSaddleFromPetEvent.java
@@ -18,8 +18,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-public class HorseRemoveSaddleEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(HorseRemoveSaddleEvent.class);
+public class RemoveSaddleFromPetEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSaddleFromPetEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ScratchPetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RespectPetEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ScratchPetEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RespectPetEvent.java
index 501b6901..fd742cc2 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ScratchPetEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RespectPetEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.pets.MonsterplantPet;
 import com.eu.habbo.habbohotel.pets.Pet;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ScratchPetEvent extends MessageHandler {
+public class RespectPetEvent extends MessageHandler {
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ToggleMonsterplantBreedableEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetBreedingPermissionEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ToggleMonsterplantBreedableEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetBreedingPermissionEvent.java
index 3cbc2d0d..970fac77 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ToggleMonsterplantBreedableEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetBreedingPermissionEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.pets.MonsterplantPet;
 import com.eu.habbo.habbohotel.pets.Pet;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ToggleMonsterplantBreedableEvent extends MessageHandler {
+public class TogglePetBreedingPermissionEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int petId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetRideSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetRidingPermissionEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetRideSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetRidingPermissionEvent.java
index f587bced..3d974c42 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetRideSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetRidingPermissionEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.pets.RideablePet;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.pets.PetFigureUpdateComposer;
 
-public class PetRideSettingsEvent extends MessageHandler {
+public class TogglePetRidingPermissionEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int petId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/UpdateRoomPromotionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/EditEventEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/UpdateRoomPromotionEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/EditEventEvent.java
index d72e42b1..52c56ba2 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/UpdateRoomPromotionEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/EditEventEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.promotions.RoomEventComposer;
 
 
-public class UpdateRoomPromotionEvent extends MessageHandler {
+public class EditEventEvent extends MessageHandler {
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/RequestPromotionRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/GetRoomAdPurchaseInfoEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/RequestPromotionRoomsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/GetRoomAdPurchaseInfoEvent.java
index 2146ff92..a7ff11ad 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/RequestPromotionRoomsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/GetRoomAdPurchaseInfoEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.promotions.RoomAdPurchaseInfoCompose
 
 import java.util.List;
 
-public class RequestPromotionRoomsEvent extends MessageHandler {
+public class GetRoomAdPurchaseInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         List<Room> roomsToShow = Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/BuyRoomPromotionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/PurchaseRoomAdEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/BuyRoomPromotionEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/PurchaseRoomAdEvent.java
index ec4425b5..23ef5943 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/BuyRoomPromotionEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/PurchaseRoomAdEvent.java
@@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.catalog.PurchaseOKMessageComposer;
 import com.eu.habbo.messages.outgoing.navigator.UserEventCatsComposer;
 import com.eu.habbo.messages.outgoing.rooms.promotions.RoomEventComposer;
 
-public class BuyRoomPromotionEvent extends MessageHandler {
+public class PurchaseRoomAdEvent extends MessageHandler {
     public static String ROOM_PROMOTION_BADGE = "RADZZ";
 
     @Override
@@ -60,8 +60,8 @@ public class BuyRoomPromotionEvent extends MessageHandler {
                     this.client.sendResponse(new PurchaseOKMessageComposer());
                     room.sendComposer(new RoomEventComposer(room, room.getPromotion()).compose());
 
-                    if (!this.client.getHabbo().getInventory().getBadgesComponent().hasBadge(BuyRoomPromotionEvent.ROOM_PROMOTION_BADGE)) {
-                        this.client.getHabbo().addBadge(BuyRoomPromotionEvent.ROOM_PROMOTION_BADGE);
+                    if (!this.client.getHabbo().getInventory().getBadgesComponent().hasBadge(PurchaseRoomAdEvent.ROOM_PROMOTION_BADGE)) {
+                        this.client.getHabbo().addBadge(PurchaseRoomAdEvent.ROOM_PROMOTION_BADGE);
                     }
                 } else {
                     this.client.sendResponse(new PurchaseErrorMessageComposer(PurchaseErrorMessageComposer.SERVER_ERROR));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserGiveRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AssignRightsEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserGiveRightsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/AssignRightsEvent.java
index 479b0612..e180b63c 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserGiveRightsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AssignRightsEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.UserRightsGivenEvent;
 
-public class RoomUserGiveRightsEvent extends MessageHandler {
+public class AssignRightsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserActionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AvatarExpressionEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserActionEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/AvatarExpressionEvent.java
index c5481421..2fc3fa8a 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserActionEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AvatarExpressionEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.users.ExpressionMessageComposer;
 import com.eu.habbo.plugin.events.users.UserIdleEvent;
 
-public class RoomUserActionEvent extends MessageHandler {
+public class AvatarExpressionEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserBanEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/BanUserWithDurationEvent.java
similarity index 89%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserBanEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/BanUserWithDurationEvent.java
index d806fd39..2bc6a483 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserBanEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/BanUserWithDurationEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.rooms.RoomManager;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RoomUserBanEvent extends MessageHandler {
+public class BanUserWithDurationEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStopTypingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/CancelTypingEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStopTypingEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/CancelTypingEvent.java
index 6b950d00..16a28869 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStopTypingEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/CancelTypingEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms.users;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.users.UserTypingMessageComposer;
 
-public class RoomUserStopTypingEvent extends MessageHandler {
+public class CancelTypingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserSitEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChangePostureEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserSitEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChangePostureEvent.java
index f3c8df7f..e314fe2f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserSitEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChangePostureEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.UserIdleEvent;
 
-public class RoomUserSitEvent extends MessageHandler {
+public class ChangePostureEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserTalkEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChatEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserTalkEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChatEvent.java
index 2201fb4c..f369c4d8 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserTalkEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChatEvent.java
@@ -10,8 +10,8 @@ import com.eu.habbo.plugin.events.users.UserTalkEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RoomUserTalkEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RoomUserTalkEvent.class);
+public class ChatEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ChatEvent.class);
 
 
     @Override
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserDanceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DanceEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserDanceEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/DanceEvent.java
index 4fe075ea..bf678950 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserDanceEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DanceEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.users.DanceMessageComposer;
 import com.eu.habbo.plugin.events.users.UserIdleEvent;
 
-public class RoomUserDanceEvent extends MessageHandler {
+public class DanceEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null)
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserDropHandItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DropCarryItemEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserDropHandItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/DropCarryItemEvent.java
index fe84b534..30833754 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserDropHandItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DropCarryItemEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.users.CarryObjectMessageComposer;
 
-public class RoomUserDropHandItemEvent extends MessageHandler {
+public class DropCarryItemEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RequestRoomUserTagsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/GetUserTagsEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RequestRoomUserTagsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/GetUserTagsEvent.java
index c844188d..33adc870 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RequestRoomUserTagsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/GetUserTagsEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.users.UserTagsMessageComposer;
 
-public class RequestRoomUserTagsEvent extends MessageHandler {
+public class GetUserTagsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int roomUnitId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreRoomUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreUserEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreRoomUserEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreUserEvent.java
index 6042fc9d..892e7702 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreRoomUserEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreUserEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer;
 
-public class IgnoreRoomUserEvent extends MessageHandler {
+public class IgnoreUserEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/LookToEvent.java
similarity index 97%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/LookToEvent.java
index 473b362c..072088c4 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/LookToEvent.java
@@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomUnitStatus;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RoomUserLookAtPoint extends MessageHandler {
+public class LookToEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWalkEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWalkEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java
index 859be049..02ab1de6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWalkEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java
@@ -15,8 +15,8 @@ import gnu.trove.set.hash.THashSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RoomUserWalkEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RoomUserWalkEvent.class);
+public class MoveAvatarEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MoveAvatarEvent.class);
 
     @Override
     public int getRatelimit() {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserGiveHandItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/PassCarryItemEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserGiveHandItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/PassCarryItemEvent.java
index 9342e045..b28aef05 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserGiveHandItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/PassCarryItemEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.threading.runnables.RoomUnitWalkToRoomUnit;
 import java.util.ArrayList;
 import java.util.List;
 
-public class RoomUserGiveHandItemEvent extends MessageHandler {
+public class PassCarryItemEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserRemoveRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RemoveRightsEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserRemoveRightsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/RemoveRightsEvent.java
index cc03c734..7bed545b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserRemoveRightsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RemoveRightsEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RoomUserRemoveRightsEvent extends MessageHandler {
+public class RemoveRightsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int amount = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserGiveRespectEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RespectUserEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserGiveRespectEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/RespectUserEvent.java
index d2a46a40..ef4f2a75 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserGiveRespectEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RespectUserEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.UserRespectedEvent;
 
-public class RoomUserGiveRespectEvent extends MessageHandler {
+public class RespectUserEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserShoutEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ShoutEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserShoutEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/ShoutEvent.java
index 1c0e4fba..db555d07 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserShoutEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ShoutEvent.java
@@ -9,8 +9,8 @@ import com.eu.habbo.plugin.events.users.UserTalkEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RoomUserShoutEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RoomUserShoutEvent.class);
+public class ShoutEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ShoutEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserSignEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/SignEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserSignEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/SignEvent.java
index 3b2aaf93..d46a98a1 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserSignEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/SignEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.UserSignEvent;
 
-public class RoomUserSignEvent extends MessageHandler {
+public class SignEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int signId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStartTypingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/StartTypingEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStartTypingEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/StartTypingEvent.java
index a350b7c8..f32f6197 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStartTypingEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/StartTypingEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms.users;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.users.UserTypingMessageComposer;
 
-public class RoomUserStartTypingEvent extends MessageHandler {
+public class StartTypingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnbanRoomUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnbanUserFromRoomEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnbanRoomUserEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnbanUserFromRoomEvent.java
index a0eebffb..9864cff0 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnbanRoomUserEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnbanUserFromRoomEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class UnbanRoomUserEvent extends MessageHandler {
+public class UnbanUserFromRoomEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnIgnoreRoomUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnignoreUserEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnIgnoreRoomUserEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnignoreUserEvent.java
index 05a8c813..dd86a9f0 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnIgnoreRoomUserEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnignoreUserEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer;
 
-public class UnIgnoreRoomUserEvent extends MessageHandler {
+public class UnignoreUserEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWhisperEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/WhisperEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWhisperEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/rooms/users/WhisperEvent.java
index b153138c..9c582fd4 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWhisperEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/WhisperEvent.java
@@ -9,8 +9,8 @@ import com.eu.habbo.plugin.events.users.UserTalkEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RoomUserWhisperEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RoomUserWhisperEvent.class);
+public class WhisperEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(WhisperEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeAcceptEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/AcceptTradingEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/trading/TradeAcceptEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/trading/AcceptTradingEvent.java
index af4c1373..b7800c08 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeAcceptEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/trading/AcceptTradingEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTrade;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TradeAcceptEvent extends MessageHandler {
+public class AcceptTradingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Habbo habbo = this.client.getHabbo();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeOfferItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemToTradeEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/trading/TradeOfferItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/trading/AddItemToTradeEvent.java
index 85b521d3..65caf47e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeOfferItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemToTradeEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTrade;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TradeOfferItemEvent extends MessageHandler {
+public class AddItemToTradeEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null)
diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeOfferMultipleItemsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemsToTradeEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/trading/TradeOfferMultipleItemsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/trading/AddItemsToTradeEvent.java
index 231a70c1..d11e7a6b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeOfferMultipleItemsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemsToTradeEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import gnu.trove.set.hash.THashSet;
 
-public class TradeOfferMultipleItemsEvent extends MessageHandler {
+public class AddItemsToTradeEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null)
diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeCloseEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/CloseTradingEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/trading/TradeCloseEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/trading/CloseTradingEvent.java
index b6ff3e39..9eada573 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeCloseEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/trading/CloseTradingEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTrade;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TradeCloseEvent extends MessageHandler {
+public class CloseTradingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Habbo habbo = this.client.getHabbo();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeConfirmEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmAcceptTradingEvent.java
similarity index 89%
rename from src/main/java/com/eu/habbo/messages/incoming/trading/TradeConfirmEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmAcceptTradingEvent.java
index 94fa15b7..a7e827e7 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeConfirmEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmAcceptTradingEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTrade;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TradeConfirmEvent extends MessageHandler {
+public class ConfirmAcceptTradingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Habbo habbo = this.client.getHabbo();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeCancelEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmDeclineTradingEvent.java
similarity index 90%
rename from src/main/java/com/eu/habbo/messages/incoming/trading/TradeCancelEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmDeclineTradingEvent.java
index b02656bd..075c22cf 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeCancelEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmDeclineTradingEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTrade;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TradeCancelEvent extends MessageHandler {
+public class ConfirmDeclineTradingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Habbo habbo = this.client.getHabbo();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeStartEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/OpenTradingEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/trading/TradeStartEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/trading/OpenTradingEvent.java
index 21649234..f5697edf 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeStartEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/trading/OpenTradingEvent.java
@@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.trading.TradingOpenFailedComposer;
 
-public class TradeStartEvent extends MessageHandler {
+public class OpenTradingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         if (Emulator.getIntUnixTimestamp() - this.client.getHabbo().getHabboStats().lastTradeTimestamp > 10) {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeCancelOfferItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/RemoveItemFromTradeEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/trading/TradeCancelOfferItemEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/trading/RemoveItemFromTradeEvent.java
index 94ee24a2..67a02791 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeCancelOfferItemEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/trading/RemoveItemFromTradeEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTrade;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TradeCancelOfferItemEvent extends MessageHandler {
+public class RemoveItemFromTradeEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeUnAcceptEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/UnacceptTradingEvent.java
similarity index 89%
rename from src/main/java/com/eu/habbo/messages/incoming/trading/TradeUnAcceptEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/trading/UnacceptTradingEvent.java
index 138c375d..4f8c3acb 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeUnAcceptEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/trading/UnacceptTradingEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTrade;
 import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class TradeUnAcceptEvent extends MessageHandler {
+public class UnacceptTradingEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         Habbo habbo = this.client.getHabbo();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/unknown/RequestResolutionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/unknown/GetResolutionAchievementsEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/unknown/RequestResolutionEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/unknown/GetResolutionAchievementsEvent.java
index 006ac62e..b342197f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/unknown/RequestResolutionEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/unknown/GetResolutionAchievementsEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.unknown;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.events.resolution.AchievementResolutionsMessageComposer;
 
-public class RequestResolutionEvent extends MessageHandler {
+public class GetResolutionAchievementsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ActivateEffectEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectActivatedEvent.java
similarity index 86%
rename from src/main/java/com/eu/habbo/messages/incoming/users/ActivateEffectEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectActivatedEvent.java
index 526da5ff..b02167be 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/ActivateEffectEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectActivatedEvent.java
@@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.users;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ActivateEffectEvent extends MessageHandler {
+public class AvatarEffectActivatedEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int effectId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/EnableEffectEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectSelectedEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/users/EnableEffectEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectSelectedEvent.java
index 29d894f8..07af6e6f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/EnableEffectEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectSelectedEvent.java
@@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.users;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class EnableEffectEvent extends MessageHandler {
+public class AvatarEffectSelectedEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int effectId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ChangeMottoEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/ChangeMottoEvent.java
index dc51defd..c979d77c 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/ChangeMottoEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer;
 import com.eu.habbo.plugin.events.users.UserSavedMottoEvent;
 
-public class SaveMottoEvent extends MessageHandler {
+public class ChangeMottoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String motto = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ChangeUserNameEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/ChangeUserNameEvent.java
index 6f8b77cf..2d62abd4 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/ChangeUserNameEvent.java
@@ -19,8 +19,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ConfirmChangeNameEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ConfirmChangeNameEvent.class);
+public class ChangeUserNameEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ChangeUserNameEvent.class);
 
     public static final List<String> changingUsernames = new ArrayList<>(2);
 
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ChangeNameCheckUsernameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/CheckUserNameEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/users/ChangeNameCheckUsernameEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/CheckUserNameEvent.java
index 86c571d5..8efc04cf 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/ChangeNameCheckUsernameEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/CheckUserNameEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.users.CheckUserNameResultMessageComposer;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ChangeNameCheckUsernameEvent extends MessageHandler {
+public class CheckUserNameEvent extends MessageHandler {
     public static String VALID_CHARACTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_-=!?@:,.";
 
     @Override
@@ -25,7 +25,7 @@ public class ChangeNameCheckUsernameEvent extends MessageHandler {
             errorCode = CheckUserNameResultMessageComposer.TOO_SHORT;
         } else if (name.length() > 15) {
             errorCode = CheckUserNameResultMessageComposer.TOO_LONG;
-        } else if (name.equalsIgnoreCase(this.client.getHabbo().getHabboInfo().getUsername()) || HabboManager.getOfflineHabboInfo(name) != null || ConfirmChangeNameEvent.changingUsernames.contains(name.toLowerCase())) {
+        } else if (name.equalsIgnoreCase(this.client.getHabbo().getHabboInfo().getUsername()) || HabboManager.getOfflineHabboInfo(name) != null || ChangeUserNameEvent.changingUsernames.contains(name.toLowerCase())) {
             errorCode = CheckUserNameResultMessageComposer.TAKEN_WITH_SUGGESTIONS;
             suggestions.add(name + Emulator.getRandom().nextInt(9999));
             suggestions.add(name + Emulator.getRandom().nextInt(9999));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/UserActivityEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/EventLogEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/users/UserActivityEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/EventLogEvent.java
index 4afb28fe..890f55bc 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/UserActivityEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/EventLogEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.achievements.AchievementManager;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class UserActivityEvent extends MessageHandler {
+public class EventLogEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String type = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetCreditsInfoEvent.java
similarity index 88%
rename from src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/GetCreditsInfoEvent.java
index 791ecf88..7c8ad15a 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetCreditsInfoEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer;
 import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer;
 
-public class RequestUserCreditsEvent extends MessageHandler {
+public class GetCreditsInfoEvent extends MessageHandler {
     @Override
     public void handle() {
         this.client.sendResponse(new CreditBalanceComposer(this.client.getHabbo()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserProfileEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetExtendedProfileEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/users/RequestUserProfileEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/GetExtendedProfileEvent.java
index 1fa079c9..715d04af 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserProfileEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetExtendedProfileEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.HabboManager;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer;
 
-public class RequestUserProfileEvent extends MessageHandler {
+public class GetExtendedProfileEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int habboId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestProfileFriendsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetRelationshipStatusInfoEvent.java
similarity index 91%
rename from src/main/java/com/eu/habbo/messages/incoming/users/RequestProfileFriendsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/GetRelationshipStatusInfoEvent.java
index cbe18c8a..1cf6f32e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestProfileFriendsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetRelationshipStatusInfoEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.users.RelationshipStatusInfoComposer;
 
-public class RequestProfileFriendsEvent extends MessageHandler {
+public class GetRelationshipStatusInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestWearingBadgesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetSelectedBadgesEvent.java
similarity index 93%
rename from src/main/java/com/eu/habbo/messages/incoming/users/RequestWearingBadgesEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/GetSelectedBadgesEvent.java
index ade93a20..1c4f370f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestWearingBadgesEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetSelectedBadgesEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.inventory.BadgesComponent;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.users.UserBadgesComposer;
 
-public class RequestWearingBadgesEvent extends MessageHandler {
+public class GetSelectedBadgesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int userId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestMeMenuSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetSoundSettingsEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/users/RequestMeMenuSettingsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/GetSoundSettingsEvent.java
index 354b0269..f16f9af9 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestMeMenuSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetSoundSettingsEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.users;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.users.AccountPreferencesComposer;
 
-public class RequestMeMenuSettingsEvent extends MessageHandler {
+public class GetSoundSettingsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new AccountPreferencesComposer(this.client.getHabbo()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCitizinShipEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetTalentTrackLevelEvent.java
similarity index 83%
rename from src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCitizinShipEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/GetTalentTrackLevelEvent.java
index 4f3155d5..2534e71c 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCitizinShipEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetTalentTrackLevelEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.users;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.users.TalentTrackLevelMessageEvent;
 
-public class RequestUserCitizinShipEvent extends MessageHandler {
+public class GetTalentTrackLevelEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new TalentTrackLevelMessageEvent(this.packet.readString()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserWardrobeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetWardrobeEvent.java
similarity index 85%
rename from src/main/java/com/eu/habbo/messages/incoming/users/RequestUserWardrobeEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/GetWardrobeEvent.java
index 478314bc..8802acce 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserWardrobeEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetWardrobeEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.users;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.users.WardrobeMessageComposer;
 
-public class RequestUserWardrobeEvent extends MessageHandler {
+public class GetWardrobeEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(new WardrobeMessageComposer(this.client.getHabbo().getInventory().getWardrobeComponent()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/InfoRetrieveEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/InfoRetrieveEvent.java
index 968e45bb..add32f4e 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/InfoRetrieveEvent.java
@@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 
-public class RequestUserDataEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RequestUserDataEvent.class);
+public class InfoRetrieveEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(InfoRetrieveEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/PickNewUserGiftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceGetGiftsEvent.java
similarity index 94%
rename from src/main/java/com/eu/habbo/messages/incoming/users/PickNewUserGiftEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceGetGiftsEvent.java
index 979e6ac8..bc83bc9a 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/PickNewUserGiftEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceGetGiftsEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.items.NewUserGift;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.UserPickGiftEvent;
 
-public class PickNewUserGiftEvent extends MessageHandler {
+public class NewUserExperienceGetGiftsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int totalItems = this.packet.readInt(); //total items
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/UserNuxEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceScriptProceedEvent.java
similarity index 95%
rename from src/main/java/com/eu/habbo/messages/incoming/users/UserNuxEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceScriptProceedEvent.java
index dd115c60..e3921e38 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/UserNuxEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceScriptProceedEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer;
 import java.util.HashMap;
 import java.util.Map;
 
-public class UserNuxEvent extends MessageHandler {
+public class NewUserExperienceScriptProceedEvent extends MessageHandler {
     public static Map<Integer, String> keys = new HashMap<Integer, String>() {
         {
             this.put(1, "BOTTOM_BAR_RECEPTION");
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SaveWardrobeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SaveWardrobeOutfitEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/users/SaveWardrobeEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/SaveWardrobeOutfitEvent.java
index 94625424..0f0c84c0 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/SaveWardrobeEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/SaveWardrobeOutfitEvent.java
@@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.inventory.WardrobeComponent;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.UserSavedWardrobeEvent;
 
-public class SaveWardrobeEvent extends MessageHandler {
+public class SaveWardrobeOutfitEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int slotId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestClubCenterEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetKickbackInfoEvent.java
similarity index 85%
rename from src/main/java/com/eu/habbo/messages/incoming/users/RequestClubCenterEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/ScrGetKickbackInfoEvent.java
index 9ff36388..82e4b78f 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestClubCenterEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetKickbackInfoEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.users;
 import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class RequestClubCenterEvent extends MessageHandler {
+public class ScrGetKickbackInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.sendResponse(SubscriptionHabboClub.calculatePayday(this.client.getHabbo().getHabboInfo()));
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserClubEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetUserInfoEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/users/RequestUserClubEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/ScrGetUserInfoEvent.java
index 3c97e0e8..c05c4ad1 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserClubEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetUserInfoEvent.java
@@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.users;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.users.ScrSendUserInfoComposer;
 
-public class RequestUserClubEvent extends MessageHandler {
+public class ScrGetUserInfoEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         String subscriptionType = this.packet.readString();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/UserWearBadgeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetActivatedBadgesEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/users/UserWearBadgeEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/SetActivatedBadgesEvent.java
index 19d75893..f3f2fc95 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/UserWearBadgeEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetActivatedBadgesEvent.java
@@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.users.UserBadgesComposer;
 
 import java.util.ArrayList;
 
-public class UserWearBadgeEvent extends MessageHandler {
+public class SetActivatedBadgesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         BadgesComponent.resetSlots(this.client.getHabbo());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SavePreferOldChatEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetChatPreferencesEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/users/SavePreferOldChatEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/SetChatPreferencesEvent.java
index 6fbc3b2d..330efe55 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/SavePreferOldChatEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetChatPreferencesEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.UserSavedSettingsEvent;
 
-public class SavePreferOldChatEvent extends MessageHandler {
+public class SetChatPreferencesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.getHabbo().getHabboStats().preferOldChat = this.packet.readBoolean();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ChangeChatBubbleEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetChatStylePreferenceEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/users/ChangeChatBubbleEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/SetChatStylePreferenceEvent.java
index 46f6ab53..dee4661d 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/ChangeChatBubbleEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetChatStylePreferenceEvent.java
@@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
 import com.eu.habbo.messages.incoming.MessageHandler;
 
-public class ChangeChatBubbleEvent extends MessageHandler {
+public class SetChatStylePreferenceEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int chatBubble = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SaveIgnoreRoomInvitesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetIgnoreRoomInvitesEvent.java
similarity index 87%
rename from src/main/java/com/eu/habbo/messages/incoming/users/SaveIgnoreRoomInvitesEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/SetIgnoreRoomInvitesEvent.java
index b12024c3..d272b9b5 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/SaveIgnoreRoomInvitesEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetIgnoreRoomInvitesEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.UserSavedSettingsEvent;
 
-public class SaveIgnoreRoomInvitesEvent extends MessageHandler {
+public class SetIgnoreRoomInvitesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.getHabbo().getHabboStats().blockRoomInvites = this.packet.readBoolean();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SaveBlockCameraFollowEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetRoomCameraPreferencesEvent.java
similarity index 86%
rename from src/main/java/com/eu/habbo/messages/incoming/users/SaveBlockCameraFollowEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/SetRoomCameraPreferencesEvent.java
index f1d66340..bc948c70 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/SaveBlockCameraFollowEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetRoomCameraPreferencesEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.UserSavedSettingsEvent;
 
-public class SaveBlockCameraFollowEvent extends MessageHandler {
+public class SetRoomCameraPreferencesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         this.client.getHabbo().getHabboStats().blockCameraFollow = this.packet.readBoolean();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SaveUserVolumesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetSoundSettingsEvent.java
similarity index 92%
rename from src/main/java/com/eu/habbo/messages/incoming/users/SaveUserVolumesEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/SetSoundSettingsEvent.java
index ff50cb9d..4c2108fe 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/SaveUserVolumesEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetSoundSettingsEvent.java
@@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.plugin.events.users.UserSavedSettingsEvent;
 
-public class SaveUserVolumesEvent extends MessageHandler {
+public class SetSoundSettingsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int system = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/UpdateFigureDataEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/users/UpdateFigureDataEvent.java
index 5dbbc736..efc4b558 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/UpdateFigureDataEvent.java
@@ -12,8 +12,8 @@ import com.eu.habbo.plugin.events.users.UserSavedLookEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UserSaveLookEvent extends MessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(UserSaveLookEvent.class);
+public class UpdateFigureDataEvent extends MessageHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateFigureDataEvent.class);
 
     @Override
     public void handle() throws Exception {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredApplySetConditionsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/ApplySnapshotEvent.java
similarity index 98%
rename from src/main/java/com/eu/habbo/messages/incoming/wired/WiredApplySetConditionsEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/wired/ApplySnapshotEvent.java
index 9811e0f8..119456ce 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredApplySetConditionsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/wired/ApplySnapshotEvent.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-public class WiredApplySetConditionsEvent extends MessageHandler {
+public class ApplySnapshotEvent extends MessageHandler {
 
     @Override
     public int getRatelimit() {
diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredEffectSaveDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateActionEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/wired/WiredEffectSaveDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/wired/UpdateActionEvent.java
index 59681136..e0022e8b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredEffectSaveDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateActionEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.generic.alerts.WiredValidationErrorComposer;
 import com.eu.habbo.messages.outgoing.wired.WiredSavedComposer;
 
-public class WiredEffectSaveDataEvent extends MessageHandler {
+public class UpdateActionEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredConditionSaveDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateConditionEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/wired/WiredConditionSaveDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/wired/UpdateConditionEvent.java
index 59a8879b..e81fceb9 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredConditionSaveDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateConditionEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.generic.alerts.WiredValidationErrorComposer;
 import com.eu.habbo.messages.outgoing.wired.WiredSavedComposer;
 
-public class WiredConditionSaveDataEvent extends MessageHandler {
+public class UpdateConditionEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredTriggerSaveDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateTriggerEvent.java
similarity index 96%
rename from src/main/java/com/eu/habbo/messages/incoming/wired/WiredTriggerSaveDataEvent.java
rename to src/main/java/com/eu/habbo/messages/incoming/wired/UpdateTriggerEvent.java
index ac067433..e839d335 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredTriggerSaveDataEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateTriggerEvent.java
@@ -10,7 +10,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.generic.alerts.WiredValidationErrorComposer;
 import com.eu.habbo.messages.outgoing.wired.WiredSavedComposer;
 
-public class WiredTriggerSaveDataEvent extends MessageHandler {
+public class UpdateTriggerEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int itemId = this.packet.readInt();
diff --git a/src/main/java/com/eu/habbo/plugin/PluginManager.java b/src/main/java/com/eu/habbo/plugin/PluginManager.java
index 8557b1b8..b7ed7c78 100644
--- a/src/main/java/com/eu/habbo/plugin/PluginManager.java
+++ b/src/main/java/com/eu/habbo/plugin/PluginManager.java
@@ -28,13 +28,13 @@ import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub;
 import com.eu.habbo.habbohotel.wired.WiredHandler;
 import com.eu.habbo.habbohotel.wired.highscores.WiredHighscoreManager;
 import com.eu.habbo.messages.PacketManager;
-import com.eu.habbo.messages.incoming.camera.CameraPublishToWebEvent;
-import com.eu.habbo.messages.incoming.camera.CameraPurchaseEvent;
-import com.eu.habbo.messages.incoming.catalog.CheckPetNameEvent;
-import com.eu.habbo.messages.incoming.floorplaneditor.FloorPlanEditorSaveEvent;
-import com.eu.habbo.messages.incoming.hotelview.HotelViewRequestLTDAvailabilityEvent;
-import com.eu.habbo.messages.incoming.rooms.promotions.BuyRoomPromotionEvent;
-import com.eu.habbo.messages.incoming.users.ChangeNameCheckUsernameEvent;
+import com.eu.habbo.messages.incoming.camera.PublishPhotoEvent;
+import com.eu.habbo.messages.incoming.camera.PurchasePhotoEvent;
+import com.eu.habbo.messages.incoming.catalog.ApproveNameEvent;
+import com.eu.habbo.messages.incoming.floorplaneditor.UpdateFloorPropertiesEvent;
+import com.eu.habbo.messages.incoming.hotelview.GetLimitedOfferAppearingNextEvent;
+import com.eu.habbo.messages.incoming.rooms.promotions.PurchaseRoomAdEvent;
+import com.eu.habbo.messages.incoming.users.CheckUserNameEvent;
 import com.eu.habbo.messages.outgoing.catalog.BundleDiscountRulesetMessageComposer;
 import com.eu.habbo.messages.outgoing.catalog.GiftWrappingConfigurationComposer;
 import com.eu.habbo.messages.outgoing.navigator.UserEventCatsComposer;
@@ -134,14 +134,14 @@ public class PluginManager {
 
         HabboManager.WELCOME_MESSAGE = Emulator.getConfig().getValue("hotel.welcome.alert.message").replace("<br>", "<br/>").replace("<br />", "<br/>").replace("\\r", "\r").replace("\\n", "\n").replace("\\t", "\t");
         Room.PREFIX_FORMAT = Emulator.getConfig().getValue("room.chat.prefix.format");
-        FloorPlanEditorSaveEvent.MAXIMUM_FLOORPLAN_WIDTH_LENGTH = Emulator.getConfig().getInt("hotel.floorplan.max.widthlength");
-        FloorPlanEditorSaveEvent.MAXIMUM_FLOORPLAN_SIZE = Emulator.getConfig().getInt("hotel.floorplan.max.totalarea");
+        UpdateFloorPropertiesEvent.MAXIMUM_FLOORPLAN_WIDTH_LENGTH = Emulator.getConfig().getInt("hotel.floorplan.max.widthlength");
+        UpdateFloorPropertiesEvent.MAXIMUM_FLOORPLAN_SIZE = Emulator.getConfig().getInt("hotel.floorplan.max.totalarea");
 
-        HotelViewRequestLTDAvailabilityEvent.ENABLED = Emulator.getConfig().getBoolean("hotel.view.ltdcountdown.enabled");
-        HotelViewRequestLTDAvailabilityEvent.TIMESTAMP = Emulator.getConfig().getInt("hotel.view.ltdcountdown.timestamp");
-        HotelViewRequestLTDAvailabilityEvent.ITEM_ID = Emulator.getConfig().getInt("hotel.view.ltdcountdown.itemid");
-        HotelViewRequestLTDAvailabilityEvent.PAGE_ID = Emulator.getConfig().getInt("hotel.view.ltdcountdown.pageid");
-        HotelViewRequestLTDAvailabilityEvent.ITEM_NAME = Emulator.getConfig().getValue("hotel.view.ltdcountdown.itemname");
+        GetLimitedOfferAppearingNextEvent.ENABLED = Emulator.getConfig().getBoolean("hotel.view.ltdcountdown.enabled");
+        GetLimitedOfferAppearingNextEvent.TIMESTAMP = Emulator.getConfig().getInt("hotel.view.ltdcountdown.timestamp");
+        GetLimitedOfferAppearingNextEvent.ITEM_ID = Emulator.getConfig().getInt("hotel.view.ltdcountdown.itemid");
+        GetLimitedOfferAppearingNextEvent.PAGE_ID = Emulator.getConfig().getInt("hotel.view.ltdcountdown.pageid");
+        GetLimitedOfferAppearingNextEvent.ITEM_NAME = Emulator.getConfig().getValue("hotel.view.ltdcountdown.itemname");
         InteractionPostIt.STICKYPOLE_PREFIX_TEXT = Emulator.getConfig().getValue("hotel.room.stickypole.prefix");
         TargetOffer.ACTIVE_TARGET_OFFER_ID = Emulator.getConfig().getInt("hotel.targetoffer.id");
         WordFilter.DEFAULT_REPLACEMENT = Emulator.getConfig().getValue("hotel.wordfilter.replacement");
@@ -150,18 +150,18 @@ public class PluginManager {
         AchievementManager.TALENTTRACK_ENABLED = Emulator.getConfig().getBoolean("hotel.talenttrack.enabled");
         InteractionRoller.NO_RULES = Emulator.getConfig().getBoolean("hotel.room.rollers.norules");
         RoomManager.SHOW_PUBLIC_IN_POPULAR_TAB = Emulator.getConfig().getBoolean("hotel.navigator.populartab.publics");
-        CheckPetNameEvent.PET_NAME_LENGTH_MINIMUM = Emulator.getConfig().getInt("hotel.pets.name.length.min");
-        CheckPetNameEvent.PET_NAME_LENGTH_MAXIMUM = Emulator.getConfig().getInt("hotel.pets.name.length.max");
+        ApproveNameEvent.PET_NAME_LENGTH_MINIMUM = Emulator.getConfig().getInt("hotel.pets.name.length.min");
+        ApproveNameEvent.PET_NAME_LENGTH_MAXIMUM = Emulator.getConfig().getInt("hotel.pets.name.length.max");
 
 
-        ChangeNameCheckUsernameEvent.VALID_CHARACTERS = Emulator.getConfig().getValue("allowed.username.characters", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_-=!?@:,.");
-        CameraPublishToWebEvent.CAMERA_PUBLISH_POINTS = Emulator.getConfig().getInt("camera.price.points.publish", 5);
-        CameraPublishToWebEvent.CAMERA_PUBLISH_POINTS_TYPE = Emulator.getConfig().getInt("camera.price.points.publish.type", 0);
-        CameraPurchaseEvent.CAMERA_PURCHASE_CREDITS = Emulator.getConfig().getInt("camera.price.credits", 5);
-        CameraPurchaseEvent.CAMERA_PURCHASE_POINTS = Emulator.getConfig().getInt("camera.price.points", 5);
-        CameraPurchaseEvent.CAMERA_PURCHASE_POINTS_TYPE = Emulator.getConfig().getInt("camera.price.points.type", 0);
+        CheckUserNameEvent.VALID_CHARACTERS = Emulator.getConfig().getValue("allowed.username.characters", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_-=!?@:,.");
+        PublishPhotoEvent.CAMERA_PUBLISH_POINTS = Emulator.getConfig().getInt("camera.price.points.publish", 5);
+        PublishPhotoEvent.CAMERA_PUBLISH_POINTS_TYPE = Emulator.getConfig().getInt("camera.price.points.publish.type", 0);
+        PurchasePhotoEvent.CAMERA_PURCHASE_CREDITS = Emulator.getConfig().getInt("camera.price.credits", 5);
+        PurchasePhotoEvent.CAMERA_PURCHASE_POINTS = Emulator.getConfig().getInt("camera.price.points", 5);
+        PurchasePhotoEvent.CAMERA_PURCHASE_POINTS_TYPE = Emulator.getConfig().getInt("camera.price.points.type", 0);
 
-        BuyRoomPromotionEvent.ROOM_PROMOTION_BADGE = Emulator.getConfig().getValue("room.promotion.badge", "RADZZ");
+        PurchaseRoomAdEvent.ROOM_PROMOTION_BADGE = Emulator.getConfig().getValue("room.promotion.badge", "RADZZ");
         BotManager.MAXIMUM_BOT_INVENTORY_SIZE = Emulator.getConfig().getInt("hotel.bots.max.inventory");
         PetManager.MAXIMUM_PET_INVENTORY_SIZE = Emulator.getConfig().getInt("hotel.pets.max.inventory");