Core/PacketIO: Rename some new opcodes

8 files changed, 28 insertions, 28 deletions

diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp
index e1ccf312e74..b7456b71887 100644
--- a/src/server/game/DungeonFinding/LFGScripts.cpp
+++ b/src/server/game/DungeonFinding/LFGScripts.cpp
@@ -93,7 +93,7 @@ void LFGPlayerScript::OnMapChanged(Player* player)
             return;
         }
 
-        WorldPackets::Query::QueryPlayerNameResponse response;
+        WorldPackets::Query::QueryPlayerNamesResponse response;
         for (Group::MemberSlot const& memberSlot : group->GetMemberSlots())
             player->GetSession()->BuildNameQueryData(memberSlot.guid, response.Players.emplace_back());
 
diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp
index 5627305c2f3..1628cdc0850 100644
--- a/src/server/game/Handlers/QueryHandler.cpp
+++ b/src/server/game/Handlers/QueryHandler.cpp
@@ -45,10 +45,10 @@ void WorldSession::BuildNameQueryData(ObjectGuid guid, WorldPackets::Query::Name
         lookupData.Result = RESPONSE_FAILURE; // name unknown
 }
 
-void WorldSession::HandleNameQueryOpcode(WorldPackets::Query::QueryPlayerName& packet)
+void WorldSession::HandleQueryPlayerNames(WorldPackets::Query::QueryPlayerNames& queryPlayerNames)
 {
-    WorldPackets::Query::QueryPlayerNameResponse response;
-    for (ObjectGuid guid : packet.Players)
+    WorldPackets::Query::QueryPlayerNamesResponse response;
+    for (ObjectGuid guid : queryPlayerNames.Players)
         BuildNameQueryData(guid, response.Players.emplace_back());
 
     SendPacket(response.Write());
diff --git a/src/server/game/Server/Packets/QueryPackets.cpp b/src/server/game/Server/Packets/QueryPackets.cpp
index 360fa5d1bf6..fc9868efc82 100644
--- a/src/server/game/Server/Packets/QueryPackets.cpp
+++ b/src/server/game/Server/Packets/QueryPackets.cpp
@@ -100,7 +100,7 @@ WorldPacket const* WorldPackets::Query::QueryCreatureResponse::Write()
     return &_worldPacket;
 }
 
-void WorldPackets::Query::QueryPlayerName::Read()
+void WorldPackets::Query::QueryPlayerNames::Read()
 {
     Players.resize(_worldPacket.read<uint32>());
     for (ObjectGuid& player : Players)
@@ -219,7 +219,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Query::NameCacheLookupRes
     return data;
 }
 
-WorldPacket const* WorldPackets::Query::QueryPlayerNameResponse::Write()
+WorldPacket const* WorldPackets::Query::QueryPlayerNamesResponse::Write()
 {
     _worldPacket << uint32(Players.size());
     for (NameCacheLookupResult const& lookupResult : Players)
diff --git a/src/server/game/Server/Packets/QueryPackets.h b/src/server/game/Server/Packets/QueryPackets.h
index b429c9f1052..0d2c540cc12 100644
--- a/src/server/game/Server/Packets/QueryPackets.h
+++ b/src/server/game/Server/Packets/QueryPackets.h
@@ -104,14 +104,14 @@ namespace WorldPackets
             Optional<uint32> NativeRealmAddress; ///< original realm (?) (identifier made from the Index, BattleGroup and Region)
         };
 
-        class QueryPlayerName final : public ClientPacket
+        class QueryPlayerNames final : public ClientPacket
         {
         public:
-            QueryPlayerName(WorldPacket&& packet) : ClientPacket(CMSG_QUERY_PLAYER_NAME, std::move(packet)) { }
+            QueryPlayerNames(WorldPacket&& packet) : ClientPacket(CMSG_QUERY_PLAYER_NAMES, std::move(packet)) { }
 
             void Read() override;
 
-            Array<ObjectGuid, 500> Players;
+            Array<ObjectGuid, 50> Players;
         };
 
         struct PlayerGuidLookupData
@@ -148,10 +148,10 @@ namespace WorldPackets
             Optional<NameCacheUnused920> Unused920;
         };
 
-        class QueryPlayerNameResponse final : public ServerPacket
+        class QueryPlayerNamesResponse final : public ServerPacket
         {
         public:
-            QueryPlayerNameResponse() : ServerPacket(SMSG_QUERY_PLAYER_NAME_RESPONSE, 60) { }
+            QueryPlayerNamesResponse() : ServerPacket(SMSG_QUERY_PLAYER_NAMES_RESPONSE, 60) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index b4ba0e48e93..939309c5bfc 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -203,6 +203,7 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_BATTLE_PAY_CANCEL_OPEN_CHECKOUT,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_CONFIRM_PURCHASE_RESPONSE,               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_TO_TARGET,           STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_VAS,                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_GET_PRODUCT_LIST,                        STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_GET_PURCHASE_LIST,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_OPEN_CHECKOUT,                           STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
@@ -686,7 +687,7 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_QUERY_PAGE_TEXT,                                    STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleQueryPageText);
     DEFINE_HANDLER(CMSG_QUERY_PETITION,                                     STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleQueryPetition);
     DEFINE_HANDLER(CMSG_QUERY_PET_NAME,                                     STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleQueryPetName);
-    DEFINE_HANDLER(CMSG_QUERY_PLAYER_NAME,                                  STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleNameQueryOpcode);
+    DEFINE_HANDLER(CMSG_QUERY_PLAYER_NAMES,                                 STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleQueryPlayerNames);
     DEFINE_HANDLER(CMSG_QUERY_PLAYER_NAMES_FOR_COMMUNITY,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_QUERY_PLAYER_NAME_BY_COMMUNITY_ID,                  STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_QUERY_QUEST_COMPLETION_NPCS,                        STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleQueryQuestCompletionNPCs);
@@ -905,7 +906,6 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_USE_EQUIPMENT_SET,                                  STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleUseEquipmentSet);
     DEFINE_HANDLER(CMSG_USE_ITEM,                                           STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleUseItemOpcode);
     DEFINE_HANDLER(CMSG_USE_TOY,                                            STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleUseToy);
-    DEFINE_HANDLER(CMSG_VAS_ASSIGN_DISTRIBUTION,                            STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_VAS_CHECK_TRANSFER_OK,                              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_VAS_GET_QUEUE_MINUTES,                              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_VAS_GET_SERVICE_STATUS,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
@@ -973,6 +973,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_TRIGGER_RE_PATH,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_TRIGGER_RE_SHAPE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_TRIGGER_UNATTACH,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARENA_CLEAR_OPPONENTS,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARENA_CROWD_CONTROL_SPELL_RESULT,        STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARENA_PREP_OPPONENT_SPECIALIZATIONS,     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARTIFACT_ENDGAME_POWERS_REFUNDED,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1036,6 +1037,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_CONFIRM_PURCHASE,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_DELIVERY_ENDED,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_DELIVERY_STARTED,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_VAS_RESPONSE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_DISTRIBUTION_UNREVOKED,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_DISTRIBUTION_UPDATE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_GET_DISTRIBUTION_LIST_RESPONSE, STATUS_UNHANDLED,  CONNECTION_TYPE_REALM);
@@ -1151,7 +1153,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHROMIE_TIME_SELECT_EXPANSION_SUCCESS,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLAIM_RAF_REWARD_RESPONSE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLEAR_ALL_SPELL_CHARGES,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLEAR_ARENA_UNIT,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLEAR_BOSS_EMOTES,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLEAR_COOLDOWN,                          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLEAR_COOLDOWNS,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1475,7 +1476,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_COOLDOWN,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_ENCHANT_TIME_UPDATE,                STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_EXPIRE_PURCHASE_REFUND,             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_INTERACTION_CHARGE_INFO_UPDATED,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_INTERACTION_COMPLETE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_PURCHASE_REFUND_RESULT,             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_PUSH_RESULT,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1676,7 +1676,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_MEMBER_PARTIAL_STATE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_NOTIFY_LFG_LEADER_CHANGE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_UPDATE,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PASSED_TIME_EVENTS,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PAST_TIME_EVENTS,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PAUSE_MIRROR_TIMER,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PENDING_RAID_LOCK,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_ALREADY_SIGNED,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1771,7 +1771,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_PETITION_RESPONSE,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_PET_NAME_RESPONSE,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_PLAYER_NAME_BY_COMMUNITY_ID_RESPONSE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_PLAYER_NAME_RESPONSE,              STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_PLAYER_NAMES_RESPONSE,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_QUEST_INFO_RESPONSE,               STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_REALM_GUILD_MASTER_INFO_RESPONSE,  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_TIME_RESPONSE,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1910,6 +1910,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_TASK_COMPLETE,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_TIME_ZONE_INFORMATION,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_VEHICLE_REC_ID,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHADOWLANDS_CAPACITANCE_UPDATE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHIPMENT_FACTION_UPDATE_RESULT,          STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_BANK,                               STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_MAILBOX,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -2023,7 +2024,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_USERLIST_REMOVE,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_USERLIST_UPDATE,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_USE_EQUIPMENT_SET_RESULT,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_VAS_ASSIGN_DISTRIBUTION_RESPONSE,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_VAS_CHECK_TRANSFER_OK_RESPONSE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_VAS_GET_QUEUE_MINUTES_RESPONSE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_VAS_GET_SERVICE_STATUS_RESPONSE,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 9ea2c9fa15e..cce436e0793 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -117,6 +117,7 @@ enum OpcodeClient : uint16
     CMSG_BATTLE_PAY_CANCEL_OPEN_CHECKOUT              = 0x3710,
     CMSG_BATTLE_PAY_CONFIRM_PURCHASE_RESPONSE         = 0x36C9,
     CMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_TO_TARGET     = 0x36C0,
+    CMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_VAS           = 0x3736,
     CMSG_BATTLE_PAY_GET_PRODUCT_LIST                  = 0x36B8,
     CMSG_BATTLE_PAY_GET_PURCHASE_LIST                 = 0x36B9,
     CMSG_BATTLE_PAY_OPEN_CHECKOUT                     = 0x3709,
@@ -600,7 +601,7 @@ enum OpcodeClient : uint16
     CMSG_QUERY_PAGE_TEXT                              = 0x3282,
     CMSG_QUERY_PETITION                               = 0x3286,
     CMSG_QUERY_PET_NAME                               = 0x3283,
-    CMSG_QUERY_PLAYER_NAME                            = 0x3772,
+    CMSG_QUERY_PLAYER_NAMES                           = 0x3772,
     CMSG_QUERY_PLAYER_NAMES_FOR_COMMUNITY             = 0x3770,
     CMSG_QUERY_PLAYER_NAME_BY_COMMUNITY_ID            = 0x376F,
     CMSG_QUERY_QUEST_COMPLETION_NPCS                  = 0x3175,
@@ -819,7 +820,6 @@ enum OpcodeClient : uint16
     CMSG_USE_EQUIPMENT_SET                            = 0x3995,
     CMSG_USE_ITEM                                     = 0x32A7,
     CMSG_USE_TOY                                      = 0x32AA,
-    CMSG_VAS_ASSIGN_DISTRIBUTION                      = 0x3736,
     CMSG_VAS_CHECK_TRANSFER_OK                        = 0x3708,
     CMSG_VAS_GET_QUEUE_MINUTES                        = 0x3707,
     CMSG_VAS_GET_SERVICE_STATUS                       = 0x3706,
@@ -883,6 +883,7 @@ enum OpcodeServer : uint16
     SMSG_AREA_TRIGGER_RE_PATH                         = 0x28FD,
     SMSG_AREA_TRIGGER_RE_SHAPE                        = 0x2901,
     SMSG_AREA_TRIGGER_UNATTACH                        = 0x2900,
+    SMSG_ARENA_CLEAR_OPPONENTS                        = 0x2640,
     SMSG_ARENA_CROWD_CONTROL_SPELL_RESULT             = 0x2629,
     SMSG_ARENA_PREP_OPPONENT_SPECIALIZATIONS          = 0x263F,
     SMSG_ARTIFACT_ENDGAME_POWERS_REFUNDED             = 0x2795,
@@ -946,6 +947,7 @@ enum OpcodeServer : uint16
     SMSG_BATTLE_PAY_CONFIRM_PURCHASE                  = 0x2775,
     SMSG_BATTLE_PAY_DELIVERY_ENDED                    = 0x2769,
     SMSG_BATTLE_PAY_DELIVERY_STARTED                  = 0x2768,
+    SMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_VAS_RESPONSE  = 0x288A,
     SMSG_BATTLE_PAY_DISTRIBUTION_UNREVOKED            = 0x2766,
     SMSG_BATTLE_PAY_DISTRIBUTION_UPDATE               = 0x2767,
     SMSG_BATTLE_PAY_GET_DISTRIBUTION_LIST_RESPONSE    = 0x2765,
@@ -1061,7 +1063,6 @@ enum OpcodeServer : uint16
     SMSG_CHROMIE_TIME_SELECT_EXPANSION_SUCCESS        = 0x2875,
     SMSG_CLAIM_RAF_REWARD_RESPONSE                    = 0x285C,
     SMSG_CLEAR_ALL_SPELL_CHARGES                      = 0x2C27,
-    SMSG_CLEAR_ARENA_UNIT                             = 0x2640,
     SMSG_CLEAR_BOSS_EMOTES                            = 0x25B7,
     SMSG_CLEAR_COOLDOWN                               = 0x26B0,
     SMSG_CLEAR_COOLDOWNS                              = 0x2C26,
@@ -1385,7 +1386,6 @@ enum OpcodeServer : uint16
     SMSG_ITEM_COOLDOWN                                = 0x27B5,
     SMSG_ITEM_ENCHANT_TIME_UPDATE                     = 0x2747,
     SMSG_ITEM_EXPIRE_PURCHASE_REFUND                  = 0x259E,
-    SMSG_ITEM_INTERACTION_CHARGE_INFO_UPDATED         = 0x288B,
     SMSG_ITEM_INTERACTION_COMPLETE                    = 0x2874,
     SMSG_ITEM_PURCHASE_REFUND_RESULT                  = 0x259C,
     SMSG_ITEM_PUSH_RESULT                             = 0x261A,
@@ -1586,7 +1586,7 @@ enum OpcodeServer : uint16
     SMSG_PARTY_MEMBER_PARTIAL_STATE                   = 0x274A,
     SMSG_PARTY_NOTIFY_LFG_LEADER_CHANGE               = 0x287A,
     SMSG_PARTY_UPDATE                                 = 0x25EE,
-    SMSG_PASSED_TIME_EVENTS                           = 0x25BE,
+    SMSG_PAST_TIME_EVENTS                             = 0x25BE,
     SMSG_PAUSE_MIRROR_TIMER                           = 0x2703,
     SMSG_PENDING_RAID_LOCK                            = 0x26EB,
     SMSG_PETITION_ALREADY_SIGNED                      = 0x25A1,
@@ -1680,8 +1680,8 @@ enum OpcodeServer : uint16
     SMSG_QUERY_PAGE_TEXT_RESPONSE                     = 0x2917,
     SMSG_QUERY_PETITION_RESPONSE                      = 0x291B,
     SMSG_QUERY_PET_NAME_RESPONSE                      = 0x2919,
+    SMSG_QUERY_PLAYER_NAMES_RESPONSE                  = 0x301B,
     SMSG_QUERY_PLAYER_NAME_BY_COMMUNITY_ID_RESPONSE   = 0x3002,
-    SMSG_QUERY_PLAYER_NAME_RESPONSE                   = 0x301B,
     SMSG_QUERY_QUEST_INFO_RESPONSE                    = 0x2A96,
     SMSG_QUERY_REALM_GUILD_MASTER_INFO_RESPONSE       = 0x29E6,
     SMSG_QUERY_TIME_RESPONSE                          = 0x26D8,
@@ -1820,6 +1820,7 @@ enum OpcodeServer : uint16
     SMSG_SET_TASK_COMPLETE                            = 0x277F,
     SMSG_SET_TIME_ZONE_INFORMATION                    = 0x266E,
     SMSG_SET_VEHICLE_REC_ID                           = 0x26EA,
+    SMSG_SHADOWLANDS_CAPACITANCE_UPDATE               = 0x288B,
     SMSG_SHIPMENT_FACTION_UPDATE_RESULT               = 0x2998,
     SMSG_SHOW_BANK                                    = 0x2676,
     SMSG_SHOW_MAILBOX                                 = 0x2798,
@@ -1933,7 +1934,6 @@ enum OpcodeServer : uint16
     SMSG_USERLIST_REMOVE                              = 0x2BBA,
     SMSG_USERLIST_UPDATE                              = 0x2BBB,
     SMSG_USE_EQUIPMENT_SET_RESULT                     = 0x2741,
-    SMSG_VAS_ASSIGN_DISTRIBUTION_RESPONSE             = 0x288A,
     SMSG_VAS_CHECK_TRANSFER_OK_RESPONSE               = 0x2809,
     SMSG_VAS_GET_QUEUE_MINUTES_RESPONSE               = 0x2807,
     SMSG_VAS_GET_SERVICE_STATUS_RESPONSE              = 0x2806,
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index 802e0cc7e7e..faf2bf76513 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -1297,7 +1297,7 @@ uint32 WorldSession::DosProtection::GetMaxPacketCounterAllowed(uint16 opcode) co
         // CPU usage sending 2000 packets/second on a 3.70 GHz 4 cores on Win x64
         //                                              [% CPU mysqld]   [%CPU worldserver RelWithDebInfo]
         case CMSG_PLAYER_LOGIN:                         //   0               0.5
-        case CMSG_QUERY_PLAYER_NAME:                    //   0               1
+        case CMSG_QUERY_PLAYER_NAMES:                   //   0               1
         case CMSG_QUERY_PET_NAME:                       //   0               1
         case CMSG_QUERY_NPC_TEXT:                       //   0               1
         case CMSG_ATTACK_STOP:                          //   0               1
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 0c97b79ed05..d68adab0d19 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -623,7 +623,7 @@ namespace WorldPackets
     {
         class QueryCreature;
         struct NameCacheLookupResult;
-        class QueryPlayerName;
+        class QueryPlayerNames;
         class QueryPageText;
         class QueryNPCText;
         class QueryGameObject;
@@ -1296,7 +1296,7 @@ class TC_GAME_API WorldSession
         void HandleGameObjectUseOpcode(WorldPackets::GameObject::GameObjUse& packet);
         void HandleGameobjectReportUse(WorldPackets::GameObject::GameObjReportUse& packet);
 
-        void HandleNameQueryOpcode(WorldPackets::Query::QueryPlayerName& packet);
+        void HandleQueryPlayerNames(WorldPackets::Query::QueryPlayerNames& queryPlayerNames);
         void HandleQueryTimeOpcode(WorldPackets::Query::QueryTime& queryTime);
         void HandleCreatureQuery(WorldPackets::Query::QueryCreature& packet);
         void HandleGameObjectQueryOpcode(WorldPackets::Query::QueryGameObject& packet);