diff --git a/src/nitro/communication/NitroMessages.ts b/src/nitro/communication/NitroMessages.ts
index ba2f7d14..db0f8af5 100644
--- a/src/nitro/communication/NitroMessages.ts
+++ b/src/nitro/communication/NitroMessages.ts
@@ -260,10 +260,10 @@ import { GetCraftingRecipeComposer } from './messages/outgoing/crafting/GetCraft
 import { GetCraftingRecipesAvailableComposer } from './messages/outgoing/crafting/GetCraftingRecipesAvailableComposer';
 import { DesktopViewComposer } from './messages/outgoing/desktop/DesktopViewComposer';
 import { FriendFurniConfirmLockMessageComposer } from './messages/outgoing/friendfurni/FriendFurniConfirmLockMessageComposer';
-import { AcceptFriendComposer } from './messages/outgoing/friendlist/AcceptFriendComposer';
-import { DeclineFriendComposer } from './messages/outgoing/friendlist/DeclineFriendComposer';
-import { FindNewFriendsComposer } from './messages/outgoing/friendlist/FindNewFriendsComposer';
-import { FollowFriendComposer } from './messages/outgoing/friendlist/FollowFriendComposer';
+import { AcceptFriendMessageComposer } from './messages/outgoing/friendlist/AcceptFriendMessageComposer';
+import { DeclineFriendMessageComposer } from './messages/outgoing/friendlist/DeclineFriendMessageComposer';
+import { FindNewFriendsMessageComposer } from './messages/outgoing/friendlist/FindNewFriendsMessageComposer';
+import { FollowFriendMessageComposer } from './messages/outgoing/friendlist/FollowFriendMessageComposer';
 import { FriendListUpdateComposer } from './messages/outgoing/friendlist/FriendListUpdateComposer';
 import { GetFriendRequestsComposer } from './messages/outgoing/friendlist/GetFriendRequestsComposer';
 import { HabboSearchComposer } from './messages/outgoing/friendlist/HabboSearchComposer';
@@ -959,6 +959,22 @@ export class NitroMessages implements IMessageConfiguration
         // FRIENDFURNI
         this._composers.set(OutgoingHeader.FRIEND_FURNI_CONFIRM_LOCK, FriendFurniConfirmLockMessageComposer);
 
+        // FRIENDLIST
+        this._composers.set(OutgoingHeader.ACCEPT_FRIEND, AcceptFriendMessageComposer);
+        this._composers.set(OutgoingHeader.DECLINE_FRIEND, DeclineFriendMessageComposer);
+        this._composers.set(OutgoingHeader.FIND_NEW_FRIENDS, FindNewFriendsMessageComposer);
+        this._composers.set(OutgoingHeader.FOLLOW_FRIEND, FollowFriendMessageComposer);
+        this._composers.set(OutgoingHeader.FRIEND_LIST_UPDATE, FriendListUpdateComposer);
+        this._composers.set(OutgoingHeader.GET_FRIEND_REQUESTS, GetFriendRequestsComposer);
+        this._composers.set(OutgoingHeader.HABBO_SEARCH, HabboSearchComposer);
+        this._composers.set(OutgoingHeader.MESSENGER_INIT, MessengerInitComposer);
+        this._composers.set(OutgoingHeader.REMOVE_FRIEND, RemoveFriendComposer);
+        this._composers.set(OutgoingHeader.REQUEST_FRIEND, RequestFriendComposer);
+        this._composers.set(OutgoingHeader.MESSENGER_CHAT, SendMessageComposer);
+        this._composers.set(OutgoingHeader.SEND_ROOM_INVITE, SendRoomInviteComposer);
+        this._composers.set(OutgoingHeader.SET_RELATIONSHIP_STATUS, SetRelationshipStatusComposer);
+        this._composers.set(OutgoingHeader.VISIT_USER, VisitUserComposer);
+
         // CLIENT
         this._composers.set(OutgoingHeader.CLIENT_PONG, ClientPongComposer);
         this._composers.set(OutgoingHeader.RELEASE_VERSION, ClientReleaseVersionComposer);
@@ -966,22 +982,6 @@ export class NitroMessages implements IMessageConfiguration
         // DESKTOP
         this._composers.set(OutgoingHeader.DESKTOP_VIEW, DesktopViewComposer);
 
-        // FRIENDLIST
-        this._composers.set(OutgoingHeader.MESSENGER_ACCEPT, AcceptFriendComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_DECLINE, DeclineFriendComposer);
-        this._composers.set(OutgoingHeader.FIND_FRIENDS, FindNewFriendsComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_FOLLOW, FollowFriendComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_UPDATES, FriendListUpdateComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_REQUESTS, GetFriendRequestsComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_SEARCH, HabboSearchComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_INIT, MessengerInitComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_REMOVE, RemoveFriendComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_REQUEST, RequestFriendComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_CHAT, SendMessageComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_ROOM_INVITE, SendRoomInviteComposer);
-        this._composers.set(OutgoingHeader.MESSENGER_RELATIONSHIPS_UPDATE, SetRelationshipStatusComposer);
-        this._composers.set(OutgoingHeader.USER_VISIT, VisitUserComposer);
-
         // GROUP
         this._composers.set(OutgoingHeader.GROUP_INFO, GroupInformationComposer);
         this._composers.set(OutgoingHeader.GROUP_REQUEST, GroupJoinComposer);
diff --git a/src/nitro/communication/messages/outgoing/OutgoingHeader.ts b/src/nitro/communication/messages/outgoing/OutgoingHeader.ts
index f490d6f3..a2d5b968 100644
--- a/src/nitro/communication/messages/outgoing/OutgoingHeader.ts
+++ b/src/nitro/communication/messages/outgoing/OutgoingHeader.ts
@@ -24,7 +24,7 @@ export class OutgoingHeader
     public static DESKTOP_VIEW                   = 105;
     public static GET_BUNDLE_DISCOUNT_RULESET    = 223;
     public static EVENT_TRACKER                  = 3457;
-    public static FIND_FRIENDS                   = 516;
+    public static FIND_NEW_FRIENDS               = 516;
     public static FURNITURE_ALIASES              = 3898;
     public static FURNITURE_FLOOR_UPDATE         = 248;
     public static FURNITURE_MULTISTATE           = 99;
@@ -76,20 +76,20 @@ export class OutgoingHeader
     public static ITEM_WALL_CLICK                = 210;
     public static ITEM_WALL_UPDATE               = 168;
     public static MARKETPLACE_CONFIG             = 2597;
-    public static MESSENGER_ACCEPT               = 137;
+    public static ACCEPT_FRIEND                  = 137;
     public static MESSENGER_CHAT                 = 3567;
-    public static MESSENGER_DECLINE              = 2890;
-    public static MESSENGER_FOLLOW               = 3997;
+    public static DECLINE_FRIEND                 = 2890;
+    public static FOLLOW_FRIEND                  = 3997;
     public static MESSENGER_FRIENDS              = 1523;
     public static MESSENGER_INIT                 = 2781;
     public static MESSENGER_RELATIONSHIPS        = 2138;
-    public static MESSENGER_RELATIONSHIPS_UPDATE = 3768;
-    public static MESSENGER_REMOVE               = 1689;
-    public static MESSENGER_REQUEST              = 3157;
-    public static MESSENGER_REQUESTS             = 2448;
-    public static MESSENGER_ROOM_INVITE          = 1276;
-    public static MESSENGER_SEARCH               = 1210;
-    public static MESSENGER_UPDATES              = 1419;
+    public static SET_RELATIONSHIP_STATUS        = 3768;
+    public static REMOVE_FRIEND                  = 1689;
+    public static REQUEST_FRIEND                 = 3157;
+    public static GET_FRIEND_REQUESTS            = 2448;
+    public static SEND_ROOM_INVITE               = 1276;
+    public static HABBO_SEARCH                   = 1210;
+    public static FRIEND_LIST_UPDATE             = 1419;
     public static MOD_TOOL_USER_INFO             = 3295;
     public static NAVIGATOR_CATEGORIES           = 3027;
     public static NAVIGATOR_INIT                 = 2110;
@@ -187,7 +187,7 @@ export class OutgoingHeader
     public static GET_WARDROBE                   = 2742;
     public static SAVE_WARDROBE_OUTFIT           = 800;
     public static USER_TAGS                      = 17;
-    public static USER_VISIT                     = 2970;
+    public static VISIT_USER                     = 2970;
     public static WIRED_ACTION_SAVE              = 2281;
     public static WIRED_APPLY_SNAPSHOT           = 3373;
     public static WIRED_CONDITION_SAVE           = 3203;
diff --git a/src/nitro/communication/messages/outgoing/friendlist/AcceptFriendComposer.ts b/src/nitro/communication/messages/outgoing/friendlist/AcceptFriendMessageComposer.ts
similarity index 61%
rename from src/nitro/communication/messages/outgoing/friendlist/AcceptFriendComposer.ts
rename to src/nitro/communication/messages/outgoing/friendlist/AcceptFriendMessageComposer.ts
index dee8bd7a..e8611e21 100644
--- a/src/nitro/communication/messages/outgoing/friendlist/AcceptFriendComposer.ts
+++ b/src/nitro/communication/messages/outgoing/friendlist/AcceptFriendMessageComposer.ts
@@ -1,8 +1,8 @@
 import { IMessageComposer } from '../../../../../core/communication/messages/IMessageComposer';
 
-export class AcceptFriendComposer implements IMessageComposer<ConstructorParameters<typeof AcceptFriendComposer>>
+export class AcceptFriendMessageComposer implements IMessageComposer<ConstructorParameters<typeof AcceptFriendMessageComposer>>
 {
-    private _data: ConstructorParameters<typeof AcceptFriendComposer>;
+    private _data: ConstructorParameters<typeof AcceptFriendMessageComposer>;
 
     constructor(...userIds: number[])
     {
@@ -18,4 +18,4 @@ export class AcceptFriendComposer implements IMessageComposer<ConstructorParamet
     {
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/communication/messages/outgoing/friendlist/DeclineFriendComposer.ts b/src/nitro/communication/messages/outgoing/friendlist/DeclineFriendMessageComposer.ts
similarity index 62%
rename from src/nitro/communication/messages/outgoing/friendlist/DeclineFriendComposer.ts
rename to src/nitro/communication/messages/outgoing/friendlist/DeclineFriendMessageComposer.ts
index 4ecd6dad..b3d67d7c 100644
--- a/src/nitro/communication/messages/outgoing/friendlist/DeclineFriendComposer.ts
+++ b/src/nitro/communication/messages/outgoing/friendlist/DeclineFriendMessageComposer.ts
@@ -1,8 +1,8 @@
 import { IMessageComposer } from '../../../../../core/communication/messages/IMessageComposer';
 
-export class DeclineFriendComposer implements IMessageComposer<ConstructorParameters<typeof DeclineFriendComposer>>
+export class DeclineFriendMessageComposer implements IMessageComposer<ConstructorParameters<typeof DeclineFriendMessageComposer>>
 {
-    private _data: ConstructorParameters<typeof DeclineFriendComposer>;
+    private _data: ConstructorParameters<typeof DeclineFriendMessageComposer>;
 
     constructor(removeAll: boolean, ...userIds: number[])
     {
@@ -18,4 +18,4 @@ export class DeclineFriendComposer implements IMessageComposer<ConstructorParame
     {
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/communication/messages/outgoing/friendlist/FindNewFriendsComposer.ts b/src/nitro/communication/messages/outgoing/friendlist/FindNewFriendsMessageComposer.ts
similarity index 56%
rename from src/nitro/communication/messages/outgoing/friendlist/FindNewFriendsComposer.ts
rename to src/nitro/communication/messages/outgoing/friendlist/FindNewFriendsMessageComposer.ts
index 936ce7b5..3a74e907 100644
--- a/src/nitro/communication/messages/outgoing/friendlist/FindNewFriendsComposer.ts
+++ b/src/nitro/communication/messages/outgoing/friendlist/FindNewFriendsMessageComposer.ts
@@ -1,8 +1,8 @@
 import { IMessageComposer } from '../../../../../core/communication/messages/IMessageComposer';
 
-export class FindNewFriendsComposer implements IMessageComposer<ConstructorParameters<typeof FindNewFriendsComposer>>
+export class FindNewFriendsMessageComposer implements IMessageComposer<ConstructorParameters<typeof FindNewFriendsMessageComposer>>
 {
-    private _data: ConstructorParameters<typeof FindNewFriendsComposer>;
+    private _data: ConstructorParameters<typeof FindNewFriendsMessageComposer>;
 
     constructor()
     {
@@ -18,4 +18,4 @@ export class FindNewFriendsComposer implements IMessageComposer<ConstructorParam
     {
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/communication/messages/outgoing/friendlist/FollowFriendComposer.ts b/src/nitro/communication/messages/outgoing/friendlist/FollowFriendMessageComposer.ts
similarity index 59%
rename from src/nitro/communication/messages/outgoing/friendlist/FollowFriendComposer.ts
rename to src/nitro/communication/messages/outgoing/friendlist/FollowFriendMessageComposer.ts
index f4e96cda..0185cc6d 100644
--- a/src/nitro/communication/messages/outgoing/friendlist/FollowFriendComposer.ts
+++ b/src/nitro/communication/messages/outgoing/friendlist/FollowFriendMessageComposer.ts
@@ -1,8 +1,8 @@
 import { IMessageComposer } from '../../../../../core/communication/messages/IMessageComposer';
 
-export class FollowFriendComposer implements IMessageComposer<ConstructorParameters<typeof FollowFriendComposer>>
+export class FollowFriendMessageComposer implements IMessageComposer<ConstructorParameters<typeof FollowFriendMessageComposer>>
 {
-    private _data: ConstructorParameters<typeof FollowFriendComposer>;
+    private _data: ConstructorParameters<typeof FollowFriendMessageComposer>;
 
     constructor(userId: number)
     {
@@ -18,4 +18,4 @@ export class FollowFriendComposer implements IMessageComposer<ConstructorParamet
     {
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/communication/messages/outgoing/friendlist/index.ts b/src/nitro/communication/messages/outgoing/friendlist/index.ts
index 40ae6312..501c3c9d 100644
--- a/src/nitro/communication/messages/outgoing/friendlist/index.ts
+++ b/src/nitro/communication/messages/outgoing/friendlist/index.ts
@@ -1,7 +1,7 @@
-export * from './AcceptFriendComposer';
-export * from './DeclineFriendComposer';
-export * from './FindNewFriendsComposer';
-export * from './FollowFriendComposer';
+export * from './AcceptFriendMessageComposer';
+export * from './DeclineFriendMessageComposer';
+export * from './FindNewFriendsMessageComposer';
+export * from './FollowFriendMessageComposer';
 export * from './FriendListUpdateComposer';
 export * from './GetFriendRequestsComposer';
 export * from './HabboSearchComposer';