diff --git a/Source/Framework/Constants/Network/Opcodes.cs b/Source/Framework/Constants/Network/Opcodes.cs
index d020ed38b..6a893819e 100644
--- a/Source/Framework/Constants/Network/Opcodes.cs
+++ b/Source/Framework/Constants/Network/Opcodes.cs
@@ -92,6 +92,7 @@ namespace Framework.Constants
         BattlePayCancelOpenCheckout = 0x3710,
         BattlePayConfirmPurchaseResponse = 0x36c9,
         BattlePayDistributionAssignToTarget = 0x36c0,
+        BattlePayDistributionAssignVas = 0x3736,
         BattlePayGetProductList = 0x36b8,
         BattlePayGetPurchaseList = 0x36b9,
         BattlePayOpenCheckout = 0x3709,
@@ -575,7 +576,7 @@ namespace Framework.Constants
         QueryPageText = 0x3282,
         QueryPetition = 0x3286,
         QueryPetName = 0x3283,
-        QueryPlayerName = 0x3772,
+        QueryPlayerNames = 0x3772,
         QueryPlayerNamesForCommunity = 0x3770,
         QueryPlayerNameByCommunityId = 0x376f,
         QueryQuestCompletionNpcs = 0x3175,
@@ -794,7 +795,6 @@ namespace Framework.Constants
         UseEquipmentSet = 0x3995,
         UseItem = 0x32a7,
         UseToy = 0x32aa,
-        VasAssignDistribution = 0x3736,
         VasCheckTransferOk = 0x3708,
         VasGetQueueMinutes = 0x3707,
         VasGetServiceStatus = 0x3706,
@@ -857,6 +857,7 @@ namespace Framework.Constants
         AreaTriggerRePath = 0x28fd,
         AreaTriggerReShape = 0x2901,
         AreaTriggerUnattach = 0x2900,
+        ArenaClearOpponents = 0x2640,
         ArenaCrowdControlSpellResult = 0x2629,
         ArenaPrepOpponentSpecializations = 0x263f,
         ArtifactEndgamePowersRefunded = 0x2795,
@@ -920,6 +921,7 @@ namespace Framework.Constants
         BattlePayConfirmPurchase = 0x2775,
         BattlePayDeliveryEnded = 0x2769,
         BattlePayDeliveryStarted = 0x2768,
+        BattlePayDistributionAssignVasResponse = 0x288A,
         BattlePayDistributionUnrevoked = 0x2766,
         BattlePayDistributionUpdate = 0x2767,
         BattlePayGetDistributionListResponse = 0x2765,
@@ -1035,7 +1037,6 @@ namespace Framework.Constants
         ChromieTimeSelectExpansionSuccess = 0x2875,
         ClaimRafRewardResponse = 0x285c,
         ClearAllSpellCharges = 0x2c27,
-        ClearArenaUnit = 0x2640,
         ClearBossEmotes = 0x25b7,
         ClearCooldown = 0x26b0,
         ClearCooldowns = 0x2c26,
@@ -1359,7 +1360,6 @@ namespace Framework.Constants
         ItemCooldown = 0x27b5,
         ItemEnchantTimeUpdate = 0x2747,
         ItemExpirePurchaseRefund = 0x259e,
-        ItemInteractionChargeInfoUpdated = 0x288b,
         ItemInteractionComplete = 0x2874,
         ItemPurchaseRefundResult = 0x259c,
         ItemPushResult = 0x261a,
@@ -1560,7 +1560,7 @@ namespace Framework.Constants
         PartyMemberPartialState = 0x274a,
         PartyNotifyLfgLeaderChange = 0x287a,
         PartyUpdate = 0x25ee,
-        PassedTimeEvents = 0x25be,
+        PastTimeEvents = 0x25be,
         PauseMirrorTimer = 0x2703,
         PendingRaidLock = 0x26eb,
         PetitionAlreadySigned = 0x25a1,
@@ -1654,8 +1654,8 @@ namespace Framework.Constants
         QueryPageTextResponse = 0x2917,
         QueryPetitionResponse = 0x291b,
         QueryPetNameResponse = 0x2919,
+        QueryPlayerNamesResponse = 0x301b,
         QueryPlayerNameByCommunityIdResponse = 0x3002,
-        QueryPlayerNameResponse = 0x301b,
         QueryQuestInfoResponse = 0x2a96,
         QueryRealmGuildMasterInfoResponse = 0x29e6,
         QueryTimeResponse = 0x26d8,
@@ -1794,6 +1794,7 @@ namespace Framework.Constants
         SetTaskComplete = 0x277f,
         SetTimeZoneInformation = 0x266e,
         SetVehicleRecId = 0x26ea,
+        ShadowlandsCapacitanceUpdate = 0x288B,
         ShipmentFactionUpdateResult = 0x2998,
         ShowBank = 0x2676,
         ShowMailbox = 0x2798,
@@ -1907,7 +1908,6 @@ namespace Framework.Constants
         UserlistRemove = 0x2bba,
         UserlistUpdate = 0x2bbb,
         UseEquipmentSetResult = 0x2741,
-        VasAssignDistributionResponse = 0x288a,
         VasCheckTransferOkResponse = 0x2809,
         VasGetQueueMinutesResponse = 0x2807,
         VasGetServiceStatusResponse = 0x2806,
diff --git a/Source/Game/DungeonFinding/LFGScripts.cs b/Source/Game/DungeonFinding/LFGScripts.cs
index 94f6a3246..9c7f7778c 100644
--- a/Source/Game/DungeonFinding/LFGScripts.cs
+++ b/Source/Game/DungeonFinding/LFGScripts.cs
@@ -85,7 +85,7 @@ namespace Game.DungeonFinding
                     return;
                 }
 
-                QueryPlayerNameResponse response = new();
+                QueryPlayerNamesResponse response = new();
                 foreach (MemberSlot memberSlot in group.GetMemberSlots())
                 {
                     player.GetSession().BuildNameQueryData(memberSlot.guid, out NameCacheLookupResult nameCacheLookupResult);
diff --git a/Source/Game/Handlers/QueryHandler.cs b/Source/Game/Handlers/QueryHandler.cs
index 8780bbaec..48d72af51 100644
--- a/Source/Game/Handlers/QueryHandler.cs
+++ b/Source/Game/Handlers/QueryHandler.cs
@@ -30,10 +30,10 @@ namespace Game
 {
     public partial class WorldSession
     {
-        [WorldPacketHandler(ClientOpcodes.QueryPlayerName, Processing = PacketProcessing.Inplace)]
-        void HandleNameQueryRequest(QueryPlayerName queryPlayerName)
+        [WorldPacketHandler(ClientOpcodes.QueryPlayerNames, Processing = PacketProcessing.Inplace)]
+        void HandleQueryPlayerNames(QueryPlayerNames queryPlayerName)
         {
-            QueryPlayerNameResponse response = new();
+            QueryPlayerNamesResponse response = new();
             foreach (ObjectGuid guid in queryPlayerName.Players)
             {
                 BuildNameQueryData(guid, out NameCacheLookupResult nameCacheLookupResult);
diff --git a/Source/Game/Networking/Packets/QueryPackets.cs b/Source/Game/Networking/Packets/QueryPackets.cs
index e7e6aa5f1..a880aa742 100644
--- a/Source/Game/Networking/Packets/QueryPackets.cs
+++ b/Source/Game/Networking/Packets/QueryPackets.cs
@@ -27,9 +27,9 @@ using System.Numerics;
 
 namespace Game.Networking.Packets
 {
-    public class QueryPlayerName : ClientPacket
+    public class QueryPlayerNames : ClientPacket
     {
-        public QueryPlayerName(WorldPacket packet) : base(packet) { }
+        public QueryPlayerNames(WorldPacket packet) : base(packet) { }
 
         public override void Read()
         {
@@ -41,11 +41,11 @@ namespace Game.Networking.Packets
         public ObjectGuid[] Players;
     }
 
-    public class QueryPlayerNameResponse : ServerPacket
+    public class QueryPlayerNamesResponse : ServerPacket
     {
         public List<NameCacheLookupResult> Players = new();
 
-        public QueryPlayerNameResponse() : base(ServerOpcodes.QueryPlayerNameResponse) { }
+        public QueryPlayerNamesResponse() : base(ServerOpcodes.QueryPlayerNamesResponse) { }
 
         public override void Write()
         {