Core/PacketIO: Renamed a bunch of opcodes based on more research (only those added after 6.0)

100 files changed, 868 insertions, 818 deletions

diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index a42b0ea43c1..e3d01e5d594 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -1339,7 +1339,7 @@ void AuctionHouseObject::BuildListBuckets(WorldPackets::AuctionHouse::AuctionLis
 
 }
 
-void AuctionHouseObject::BuildListBidderItems(WorldPackets::AuctionHouse::AuctionListBidderItemsResult& listBidderItemsResult, Player* player,
+void AuctionHouseObject::BuildListBiddedItems(WorldPackets::AuctionHouse::AuctionListBiddedItemsResult& listBiddedItemsResult, Player* player,
     uint32 /*offset*/, WorldPackets::AuctionHouse::AuctionSortDef const* sorts, std::size_t sortCount) const
 {
     // always full list
@@ -1353,12 +1353,12 @@ void AuctionHouseObject::BuildListBidderItems(WorldPackets::AuctionHouse::Auctio
 
     for (AuctionPosting const* resultAuction : auctions)
     {
-        listBidderItemsResult.Items.emplace_back();
-        WorldPackets::AuctionHouse::AuctionItem& auctionItem = listBidderItemsResult.Items.back();
+        listBiddedItemsResult.Items.emplace_back();
+        WorldPackets::AuctionHouse::AuctionItem& auctionItem = listBiddedItemsResult.Items.back();
         resultAuction->BuildAuctionItem(&auctionItem, true, true, true, false);
     }
 
-    listBidderItemsResult.HasMoreResults = false;
+    listBiddedItemsResult.HasMoreResults = false;
 }
 
 void AuctionHouseObject::BuildListAuctionItems(WorldPackets::AuctionHouse::AuctionListItemsResult& listItemsResult, Player* player, AuctionsBucketKey const& bucketKey,
@@ -1418,7 +1418,7 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPackets::AuctionHouse::Aucti
     listItemsResult.HasMoreResults = builder.HasMoreResults();
 }
 
-void AuctionHouseObject::BuildListOwnerItems(WorldPackets::AuctionHouse::AuctionListOwnerItemsResult& listOwnerItemsResult, Player* player,
+void AuctionHouseObject::BuildListOwnedItems(WorldPackets::AuctionHouse::AuctionListOwnedItemsResult& listOwnedItemsResult, Player* player,
     uint32 /*offset*/, WorldPackets::AuctionHouse::AuctionSortDef const* sorts, std::size_t sortCount)
 {
     // always full list
@@ -1432,12 +1432,12 @@ void AuctionHouseObject::BuildListOwnerItems(WorldPackets::AuctionHouse::Auction
 
     for (AuctionPosting const* resultAuction : auctions)
     {
-        listOwnerItemsResult.Items.emplace_back();
-        WorldPackets::AuctionHouse::AuctionItem& auctionItem = listOwnerItemsResult.Items.back();
+        listOwnedItemsResult.Items.emplace_back();
+        WorldPackets::AuctionHouse::AuctionItem& auctionItem = listOwnedItemsResult.Items.back();
         resultAuction->BuildAuctionItem(&auctionItem, true, true, false, false);
     }
 
-    listOwnerItemsResult.HasMoreResults = false;
+    listOwnedItemsResult.HasMoreResults = false;
 }
 
 /*
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index a55772e1611..2a0816fd21a 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -42,8 +42,8 @@ namespace WorldPackets
         struct AuctionSortDef;
         struct BucketInfo;
         class AuctionListBucketsResult;
-        class AuctionListBidderItemsResult;
-        class AuctionListOwnerItemsResult;
+        class AuctionListBiddedItemsResult;
+        class AuctionListOwnedItemsResult;
         class AuctionListItemsResult;
         class AuctionReplicateResponse;
     }
@@ -302,13 +302,13 @@ public:
     void BuildListBuckets(WorldPackets::AuctionHouse::AuctionListBucketsResult& listBucketsResult, Player* player,
         WorldPackets::AuctionHouse::AuctionBucketKey const* keys, std::size_t keysCount,
         WorldPackets::AuctionHouse::AuctionSortDef const* sorts, std::size_t sortCount);
-    void BuildListBidderItems(WorldPackets::AuctionHouse::AuctionListBidderItemsResult& listBidderItemsResult, Player* player,
+    void BuildListBiddedItems(WorldPackets::AuctionHouse::AuctionListBiddedItemsResult& listBiddedItemsResult, Player* player,
         uint32 offset, WorldPackets::AuctionHouse::AuctionSortDef const* sorts, std::size_t sortCount) const;
     void BuildListAuctionItems(WorldPackets::AuctionHouse::AuctionListItemsResult& listItemsResult, Player* player, AuctionsBucketKey const& bucketKey,
         uint32 offset, WorldPackets::AuctionHouse::AuctionSortDef const* sorts, std::size_t sortCount) const;
     void BuildListAuctionItems(WorldPackets::AuctionHouse::AuctionListItemsResult& listItemsResult, Player* player, uint32 itemId,
         uint32 offset, WorldPackets::AuctionHouse::AuctionSortDef const* sorts, std::size_t sortCount) const;
-    void BuildListOwnerItems(WorldPackets::AuctionHouse::AuctionListOwnerItemsResult& listOwnerItemsResult, Player* player,
+    void BuildListOwnedItems(WorldPackets::AuctionHouse::AuctionListOwnedItemsResult& listOwnedItemsResult, Player* player,
         uint32 offset, WorldPackets::AuctionHouse::AuctionSortDef const* sorts, std::size_t sortCount);
     void BuildReplicate(WorldPackets::AuctionHouse::AuctionReplicateResponse& replicateResponse, Player* player,
         uint32 global, uint32 cursor, uint32 tombstone, uint32 count);
diff --git a/src/server/game/Battlegrounds/Arena.cpp b/src/server/game/Battlegrounds/Arena.cpp
index 847c5959f5f..840a2b5624d 100644
--- a/src/server/game/Battlegrounds/Arena.cpp
+++ b/src/server/game/Battlegrounds/Arena.cpp
@@ -95,7 +95,7 @@ void Arena::HandleKillPlayer(Player* player, Player* killer)
     CheckWinConditions();
 }
 
-void Arena::BuildPvPLogDataPacket(WorldPackets::Battleground::PVPLogData& pvpLogData) const
+void Arena::BuildPvPLogDataPacket(WorldPackets::Battleground::PVPMatchStatistics& pvpLogData) const
 {
     Battleground::BuildPvPLogDataPacket(pvpLogData);
 
diff --git a/src/server/game/Battlegrounds/Arena.h b/src/server/game/Battlegrounds/Arena.h
index 52a03980b01..ad26dd85c08 100644
--- a/src/server/game/Battlegrounds/Arena.h
+++ b/src/server/game/Battlegrounds/Arena.h
@@ -58,7 +58,7 @@ class TC_GAME_API Arena : public Battleground
 
         void HandleKillPlayer(Player* player, Player* killer) override;
 
-        void BuildPvPLogDataPacket(WorldPackets::Battleground::PVPLogData& pvpLogData) const override;
+        void BuildPvPLogDataPacket(WorldPackets::Battleground::PVPMatchStatistics& pvpLogData) const override;
 
     private:
         void RemovePlayerAtLeave(ObjectGuid guid, bool transport, bool sendPacket) override;
diff --git a/src/server/game/Battlegrounds/ArenaScore.cpp b/src/server/game/Battlegrounds/ArenaScore.cpp
index c6e14eb58d6..bff65e182c8 100644
--- a/src/server/game/Battlegrounds/ArenaScore.cpp
+++ b/src/server/game/Battlegrounds/ArenaScore.cpp
@@ -22,7 +22,7 @@ ArenaScore::ArenaScore(ObjectGuid playerGuid, uint32 team) : BattlegroundScore(p
 {
 }
 
-void ArenaScore::BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const
+void ArenaScore::BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const
 {
     BattlegroundScore::BuildPvPLogPlayerDataPacket(playerData);
 
diff --git a/src/server/game/Battlegrounds/ArenaScore.h b/src/server/game/Battlegrounds/ArenaScore.h
index a21140f6960..4d2aa92c0ee 100644
--- a/src/server/game/Battlegrounds/ArenaScore.h
+++ b/src/server/game/Battlegrounds/ArenaScore.h
@@ -27,7 +27,7 @@ struct TC_GAME_API ArenaScore : public BattlegroundScore
     protected:
         ArenaScore(ObjectGuid playerGuid, uint32 team);
 
-        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const override;
+        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const override;
 
         // For Logging purpose
         std::string ToString() const override;
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index 1efed636f87..409c9b4a852 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -730,12 +730,12 @@ void Battleground::EndBattleground(uint32 winner)
     //we must set it this way, because end time is sent in packet!
     SetRemainingTime(TIME_AUTOCLOSE_BATTLEGROUND);
 
-    WorldPackets::Battleground::PVPMatchEnd pvpMatchEnd;
-    pvpMatchEnd.Winner = GetWinner();
-    pvpMatchEnd.Duration = std::max<int32>(0, (GetElapsedTime() - BG_START_DELAY_2M) / IN_MILLISECONDS);
-    pvpMatchEnd.LogData.emplace();
-    BuildPvPLogDataPacket(*pvpMatchEnd.LogData);
-    pvpMatchEnd.Write();
+    WorldPackets::Battleground::PVPMatchComplete pvpMatchComplete;
+    pvpMatchComplete.Winner = GetWinner();
+    pvpMatchComplete.Duration = std::max<int32>(0, (GetElapsedTime() - BG_START_DELAY_2M) / IN_MILLISECONDS);
+    pvpMatchComplete.LogData.emplace();
+    BuildPvPLogDataPacket(*pvpMatchComplete.LogData);
+    pvpMatchComplete.Write();
 
     for (BattlegroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
     {
@@ -830,7 +830,7 @@ void Battleground::EndBattleground(uint32 winner)
 
         BlockMovement(player);
 
-        player->SendDirectMessage(pvpMatchEnd.GetRawPacket());
+        player->SendDirectMessage(pvpMatchComplete.GetRawPacket());
 
         player->UpdateCriteria(CRITERIA_TYPE_COMPLETE_BATTLEGROUND, player->GetMapId());
     }
@@ -1040,20 +1040,20 @@ void Battleground::AddPlayer(Player* player)
     playerJoined.Guid = player->GetGUID();
     SendPacketToTeam(team, playerJoined.Write(), player);
 
-    WorldPackets::Battleground::PVPMatchInit pvpMatchState;
-    pvpMatchState.MapID = GetMapId();
+    WorldPackets::Battleground::PVPMatchInitialize pvpMatchInitialize;
+    pvpMatchInitialize.MapID = GetMapId();
     switch (GetStatus())
     {
         case STATUS_NONE:
         case STATUS_WAIT_QUEUE:
-            pvpMatchState.State = WorldPackets::Battleground::PVPMatchInit::Inactive;
+            pvpMatchInitialize.State = WorldPackets::Battleground::PVPMatchInitialize::Inactive;
             break;
         case STATUS_WAIT_JOIN:
         case STATUS_IN_PROGRESS:
-            pvpMatchState.State = WorldPackets::Battleground::PVPMatchInit::InProgress;
+            pvpMatchInitialize.State = WorldPackets::Battleground::PVPMatchInitialize::InProgress;
             break;
         case STATUS_WAIT_LEAVE:
-            pvpMatchState.State = WorldPackets::Battleground::PVPMatchInit::Complete;
+            pvpMatchInitialize.State = WorldPackets::Battleground::PVPMatchInitialize::Complete;
             break;
         default:
             break;
@@ -1061,15 +1061,15 @@ void Battleground::AddPlayer(Player* player)
 
     if (GetElapsedTime() >= BG_START_DELAY_2M)
     {
-        pvpMatchState.Duration = (GetElapsedTime() - BG_START_DELAY_2M) / IN_MILLISECONDS;
-        pvpMatchState.StartTime = GameTime::GetGameTime() - pvpMatchState.Duration;
+        pvpMatchInitialize.Duration = (GetElapsedTime() - BG_START_DELAY_2M) / IN_MILLISECONDS;
+        pvpMatchInitialize.StartTime = GameTime::GetGameTime() - pvpMatchInitialize.Duration;
     }
-    pvpMatchState.ArenaFaction = player->GetBGTeam() == HORDE ? BG_TEAM_HORDE : BG_TEAM_ALLIANCE;
-    pvpMatchState.BattlemasterListID = GetTypeID();
-    pvpMatchState.Registered = false;
-    pvpMatchState.AffectsRating = isRated();
+    pvpMatchInitialize.ArenaFaction = player->GetBGTeam() == HORDE ? BG_TEAM_HORDE : BG_TEAM_ALLIANCE;
+    pvpMatchInitialize.BattlemasterListID = GetTypeID();
+    pvpMatchInitialize.Registered = false;
+    pvpMatchInitialize.AffectsRating = isRated();
 
-    player->SendDirectMessage(pvpMatchState.Write());
+    player->SendDirectMessage(pvpMatchInitialize.Write());
 
     player->RemoveAurasByType(SPELL_AURA_MOUNTED);
 
@@ -1284,12 +1284,12 @@ bool Battleground::HasFreeSlots() const
     return GetPlayersSize() < GetMaxPlayers();
 }
 
-void Battleground::BuildPvPLogDataPacket(WorldPackets::Battleground::PVPLogData& pvpLogData) const
+void Battleground::BuildPvPLogDataPacket(WorldPackets::Battleground::PVPMatchStatistics& pvpLogData) const
 {
     pvpLogData.Statistics.reserve(GetPlayerScoresSize());
     for (auto const& score : PlayerScores)
     {
-        WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics playerData;
+        WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics playerData;
         score.second->BuildPvPLogPlayerDataPacket(playerData);
 
         if (Player* player = ObjectAccessor::GetPlayer(GetBgMap(), playerData.PlayerGUID))
@@ -1780,9 +1780,9 @@ void Battleground::PlayerAddedToBGCheckIfBGIsRunning(Player* player)
 
     BlockMovement(player);
 
-    WorldPackets::Battleground::PVPLogDataMessage pvpLogData;
-    BuildPvPLogDataPacket(pvpLogData.Data);
-    player->SendDirectMessage(pvpLogData.Write());
+    WorldPackets::Battleground::PVPMatchStatisticsMessage pvpMatchStatistics;
+    BuildPvPLogDataPacket(pvpMatchStatistics.Data);
+    player->SendDirectMessage(pvpMatchStatistics.Write());
 }
 
 uint32 Battleground::GetAlivePlayersCountByTeam(uint32 Team) const
diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
index 43b798a734d..dcd89fff157 100644
--- a/src/server/game/Battlegrounds/Battleground.h
+++ b/src/server/game/Battlegrounds/Battleground.h
@@ -42,7 +42,7 @@ namespace WorldPackets
 {
     namespace Battleground
     {
-        struct PVPLogData;
+        struct PVPMatchStatistics;
         struct BattlegroundPlayerPosition;
     }
 
@@ -401,7 +401,7 @@ class TC_GAME_API Battleground
         Group* GetBgRaid(uint32 TeamID) const { return TeamID == ALLIANCE ? m_BgRaids[TEAM_ALLIANCE] : m_BgRaids[TEAM_HORDE]; }
         void SetBgRaid(uint32 TeamID, Group* bg_raid);
 
-        virtual void BuildPvPLogDataPacket(WorldPackets::Battleground::PVPLogData& pvpLogData) const;
+        virtual void BuildPvPLogDataPacket(WorldPackets::Battleground::PVPMatchStatistics& pvpLogData) const;
         virtual bool UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor = true);
 
         static TeamId GetTeamIndexByTeamId(uint32 Team) { return Team == ALLIANCE ? TEAM_ALLIANCE : TEAM_HORDE; }
diff --git a/src/server/game/Battlegrounds/BattlegroundScore.cpp b/src/server/game/Battlegrounds/BattlegroundScore.cpp
index 4a54a6b82d2..b6508be6bc5 100644
--- a/src/server/game/Battlegrounds/BattlegroundScore.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundScore.cpp
@@ -56,7 +56,7 @@ void BattlegroundScore::UpdateScore(uint32 type, uint32 value)
     }
 }
 
-void BattlegroundScore::BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const
+void BattlegroundScore::BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const
 {
     playerData.PlayerGUID = PlayerGuid;
     playerData.Kills = KillingBlows;
diff --git a/src/server/game/Battlegrounds/BattlegroundScore.h b/src/server/game/Battlegrounds/BattlegroundScore.h
index 85ed92f0fe4..a319a744468 100644
--- a/src/server/game/Battlegrounds/BattlegroundScore.h
+++ b/src/server/game/Battlegrounds/BattlegroundScore.h
@@ -63,7 +63,7 @@ struct BattlegroundScore
 
         virtual void UpdateScore(uint32 type, uint32 value);
 
-        virtual void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const;
+        virtual void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const;
 
         // For Logging purpose
         virtual std::string ToString() const { return ""; }
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
index 830d817b28b..e1d32322c4b 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
@@ -293,7 +293,7 @@ struct BattlegroundABScore final : public BattlegroundScore
             }
         }
 
-        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const override
+        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const override
         {
             BattlegroundScore::BuildPvPLogPlayerDataPacket(playerData);
 
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
index 6a145dc0f38..e8c522885d4 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
@@ -1597,7 +1597,7 @@ struct BattlegroundAVScore final : public BattlegroundScore
             }
         }
 
-        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const override
+        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const override
         {
             BattlegroundScore::BuildPvPLogPlayerDataPacket(playerData);
 
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
index 03864646df2..db709997b20 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
@@ -48,7 +48,7 @@ class BattlegroundBFGScore final : public BattlegroundScore
             }
         }
 
-        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const override
+        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const override
         {
             BattlegroundScore::BuildPvPLogPlayerDataPacket(playerData);
 
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
index 71a3df30dc0..c6e06735579 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
@@ -390,7 +390,7 @@ struct BattlegroundEYScore final : public BattlegroundScore
             }
         }
 
-        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const override
+        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const override
         {
             BattlegroundScore::BuildPvPLogPlayerDataPacket(playerData);
 
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
index 704f19f8781..fb60b87c851 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
@@ -936,7 +936,7 @@ struct BattlegroundICScore final : public BattlegroundScore
             }
         }
 
-        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const override
+        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const override
         {
             BattlegroundScore::BuildPvPLogPlayerDataPacket(playerData);
 
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
index 475239dc459..404b5f0e26b 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
@@ -545,7 +545,7 @@ struct BattlegroundSAScore final : public BattlegroundScore
             }
         }
 
-        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const override
+        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const override
         {
             BattlegroundScore::BuildPvPLogPlayerDataPacket(playerData);
 
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundTP.h b/src/server/game/Battlegrounds/Zones/BattlegroundTP.h
index fbd4ed8d910..9dfc9d51ef7 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundTP.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundTP.h
@@ -48,7 +48,7 @@ class BattlegroundTPScore final : public BattlegroundScore
             }
         }
 
-        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const override
+        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const override
         {
             BattlegroundScore::BuildPvPLogPlayerDataPacket(playerData);
 
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h
index 35e9a18f0e0..3aa02818143 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h
@@ -192,7 +192,7 @@ struct BattlegroundWGScore final : public BattlegroundScore
             }
         }
 
-        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics& playerData) const override
+        void BuildPvPLogPlayerDataPacket(WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics& playerData) const override
         {
             BattlegroundScore::BuildPvPLogPlayerDataPacket(playerData);
 
diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp
index 6820d7ba59e..9565c51399c 100644
--- a/src/server/game/Calendar/CalendarMgr.cpp
+++ b/src/server/game/Calendar/CalendarMgr.cpp
@@ -436,7 +436,7 @@ void CalendarMgr::SendCalendarEventInvite(CalendarInvite const& invite)
 
     uint8 level = player ? player->getLevel() : sCharacterCache->GetCharacterLevelByGuid(invitee);
 
-    WorldPackets::Calendar::SCalendarEventInvite packet;
+    WorldPackets::Calendar::CalendarInviteAdded packet;
     packet.EventID = calendarEvent ? calendarEvent->GetEventId() : 0;
     packet.InviteGuid = invitee;
     packet.InviteID = calendarEvent ? invite.GetInviteId() : 0;
@@ -478,7 +478,7 @@ void CalendarMgr::SendCalendarEventUpdateAlert(CalendarEvent const& calendarEven
 
 void CalendarMgr::SendCalendarEventStatus(CalendarEvent const& calendarEvent, CalendarInvite const& invite)
 {
-    WorldPackets::Calendar::CalendarEventInviteStatus packet;
+    WorldPackets::Calendar::CalendarInviteStatus packet;
     packet.ClearPending = true; // FIXME
     packet.Date = calendarEvent.GetDate();
     packet.EventID = calendarEvent.GetEventId();
@@ -502,7 +502,7 @@ void CalendarMgr::SendCalendarEventRemovedAlert(CalendarEvent const& calendarEve
 
 void CalendarMgr::SendCalendarEventInviteRemove(CalendarEvent const& calendarEvent, CalendarInvite const& invite, uint32 flags)
 {
-    WorldPackets::Calendar::CalendarEventInviteRemoved packet;
+    WorldPackets::Calendar::CalendarInviteRemoved packet;
     packet.ClearPending = true; // FIXME
     packet.EventID = calendarEvent.GetEventId();
     packet.Flags = flags;
@@ -513,7 +513,7 @@ void CalendarMgr::SendCalendarEventInviteRemove(CalendarEvent const& calendarEve
 
 void CalendarMgr::SendCalendarEventModeratorStatusAlert(CalendarEvent const& calendarEvent, CalendarInvite const& invite)
 {
-    WorldPackets::Calendar::CalendarEventInviteModeratorStatus packet;
+    WorldPackets::Calendar::CalendarInviteModeratorStatus packet;
     packet.ClearPending = true; // FIXME
     packet.EventID = calendarEvent.GetEventId();
     packet.InviteGuid = invite.GetInviteeGUID();
@@ -524,7 +524,7 @@ void CalendarMgr::SendCalendarEventModeratorStatusAlert(CalendarEvent const& cal
 
 void CalendarMgr::SendCalendarEventInviteAlert(CalendarEvent const& calendarEvent, CalendarInvite const& invite)
 {
-    WorldPackets::Calendar::CalendarEventInviteAlert packet;
+    WorldPackets::Calendar::CalendarInviteAlert packet;
     packet.Date = calendarEvent.GetDate();
     packet.EventID = calendarEvent.GetEventId();
     packet.EventName = calendarEvent.GetTitle();
@@ -596,7 +596,7 @@ void CalendarMgr::SendCalendarEventInviteRemoveAlert(ObjectGuid guid, CalendarEv
 {
     if (Player* player = ObjectAccessor::FindConnectedPlayer(guid))
     {
-        WorldPackets::Calendar::CalendarEventInviteRemovedAlert packet;
+        WorldPackets::Calendar::CalendarInviteRemovedAlert packet;
         packet.Date = calendarEvent.GetDate();
         packet.EventID = calendarEvent.GetEventId();
         packet.Flags = calendarEvent.GetFlags();
diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
index a0c122f88b8..ef83cd15e35 100644
--- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
+++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
@@ -152,13 +152,13 @@ bool AreaTrigger::Create(uint32 spellMiscId, Unit* caster, Unit* target, SpellIn
 
     if (GetTemplate()->HasFlag(AREATRIGGER_FLAG_HAS_CIRCULAR_MOVEMENT))
     {
-        AreaTriggerCircularMovementInfo cmi = GetMiscTemplate()->CircularMovementInfo;
+        AreaTriggerOrbitInfo cmi = GetMiscTemplate()->OrbitInfo;
         if (target && GetTemplate()->HasFlag(AREATRIGGER_FLAG_HAS_ATTACHED))
             cmi.PathTarget = target->GetGUID();
         else
             cmi.Center = pos;
 
-        InitCircularMovement(cmi, timeToTarget);
+        InitOrbit(cmi, timeToTarget);
     }
     else if (GetMiscTemplate()->HasSplines())
     {
@@ -181,8 +181,8 @@ bool AreaTrigger::Create(uint32 spellMiscId, Unit* caster, Unit* target, SpellIn
     AI_Initialize();
 
     // Relocate areatriggers with circular movement again
-    if (HasCircularMovement())
-        Relocate(CalculateCircularMovementPosition());
+    if (HasOrbit())
+        Relocate(CalculateOrbitPosition());
 
     if (!GetMap()->AddToMap(this))
     {
@@ -216,10 +216,10 @@ void AreaTrigger::Update(uint32 diff)
     WorldObject::Update(diff);
     _timeSinceCreated += diff;
 
-    // "If" order matter here, Circular Movement > Attached > Splines
-    if (HasCircularMovement())
+    // "If" order matter here, Orbit > Attached > Splines
+    if (HasOrbit())
     {
-        UpdateCircularMovementPosition(diff);
+        UpdateOrbitPosition(diff);
     }
     else if (GetTemplate()->HasFlag(AREATRIGGER_FLAG_HAS_ATTACHED))
     {
@@ -675,7 +675,7 @@ bool AreaTrigger::HasSplines() const
     return bool(_spline);
 }
 
-void AreaTrigger::InitCircularMovement(AreaTriggerCircularMovementInfo const& cmi, uint32 timeToTarget)
+void AreaTrigger::InitOrbit(AreaTriggerOrbitInfo const& cmi, uint32 timeToTarget)
 {
     // Circular movement requires either a center position or an attached unit
     ASSERT(cmi.Center.is_initialized() || cmi.PathTarget.is_initialized());
@@ -684,48 +684,48 @@ void AreaTrigger::InitCircularMovement(AreaTriggerCircularMovementInfo const& cm
     SetUpdateFieldValue(m_values.ModifyValue(&AreaTrigger::m_areaTriggerData).ModifyValue(&UF::AreaTriggerData::TimeToTarget), timeToTarget);
     const_cast<UF::AreaTriggerData&>(*m_areaTriggerData).ClearChanged(&UF::AreaTriggerData::TimeToTarget);
 
-    _circularMovementInfo = cmi;
+    _orbitInfo = cmi;
 
-    _circularMovementInfo->TimeToTarget = timeToTarget;
-    _circularMovementInfo->ElapsedTimeForMovement = 0;
+    _orbitInfo->TimeToTarget = timeToTarget;
+    _orbitInfo->ElapsedTimeForMovement = 0;
 
     if (IsInWorld())
     {
         WorldPackets::AreaTrigger::AreaTriggerRePath reshape;
         reshape.TriggerGUID = GetGUID();
-        reshape.AreaTriggerCircularMovement = _circularMovementInfo;
+        reshape.AreaTriggerOrbit = _orbitInfo;
 
         SendMessageToSet(reshape.Write(), true);
     }
 }
 
-bool AreaTrigger::HasCircularMovement() const
+bool AreaTrigger::HasOrbit() const
 {
-    return _circularMovementInfo.is_initialized();
+    return _orbitInfo.is_initialized();
 }
 
-Position const* AreaTrigger::GetCircularMovementCenterPosition() const
+Position const* AreaTrigger::GetOrbitCenterPosition() const
 {
-    if (!_circularMovementInfo.is_initialized())
+    if (!_orbitInfo.is_initialized())
         return nullptr;
 
-    if (_circularMovementInfo->PathTarget.is_initialized())
-        if (WorldObject* center = ObjectAccessor::GetWorldObject(*this, *_circularMovementInfo->PathTarget))
+    if (_orbitInfo->PathTarget.is_initialized())
+        if (WorldObject* center = ObjectAccessor::GetWorldObject(*this, *_orbitInfo->PathTarget))
             return center;
 
-    if (_circularMovementInfo->Center.is_initialized())
-        return &_circularMovementInfo->Center->Pos;
+    if (_orbitInfo->Center.is_initialized())
+        return &_orbitInfo->Center->Pos;
 
     return nullptr;
 }
 
-Position AreaTrigger::CalculateCircularMovementPosition() const
+Position AreaTrigger::CalculateOrbitPosition() const
 {
-    Position const* centerPos = GetCircularMovementCenterPosition();
+    Position const* centerPos = GetOrbitCenterPosition();
     if (!centerPos)
         return GetPosition();
 
-    AreaTriggerCircularMovementInfo const& cmi = *_circularMovementInfo;
+    AreaTriggerOrbitInfo const& cmi = *_orbitInfo;
 
     // AreaTrigger make exactly "Duration / TimeToTarget" loops during his life time
     float pathProgress = float(cmi.ElapsedTimeForMovement) / float(cmi.TimeToTarget);
@@ -756,14 +756,14 @@ Position AreaTrigger::CalculateCircularMovementPosition() const
     return { x, y, z, angle };
 }
 
-void AreaTrigger::UpdateCircularMovementPosition(uint32 /*diff*/)
+void AreaTrigger::UpdateOrbitPosition(uint32 /*diff*/)
 {
-    if (_circularMovementInfo->StartDelay > GetElapsedTimeForMovement())
+    if (_orbitInfo->StartDelay > GetElapsedTimeForMovement())
         return;
 
-    _circularMovementInfo->ElapsedTimeForMovement = GetElapsedTimeForMovement() - _circularMovementInfo->StartDelay;
+    _orbitInfo->ElapsedTimeForMovement = GetElapsedTimeForMovement() - _orbitInfo->StartDelay;
 
-    Position pos = CalculateCircularMovementPosition();
+    Position pos = CalculateOrbitPosition();
 
     GetMap()->AreaTriggerRelocation(this, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation());
 #ifdef TRINITY_DEBUG
diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.h b/src/server/game/Entities/AreaTrigger/AreaTrigger.h
index e2862369a17..b734b51977b 100644
--- a/src/server/game/Entities/AreaTrigger/AreaTrigger.h
+++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.h
@@ -97,9 +97,9 @@ class TC_GAME_API AreaTrigger : public WorldObject, public GridObject<AreaTrigge
         ::Movement::Spline<int32> const& GetSpline() const { return *_spline; }
         uint32 GetElapsedTimeForMovement() const { return GetTimeSinceCreated(); } /// @todo: research the right value, in sniffs both timers are nearly identical
 
-        void InitCircularMovement(AreaTriggerCircularMovementInfo const& cmi, uint32 timeToTarget);
-        bool HasCircularMovement() const;
-        Optional<AreaTriggerCircularMovementInfo> const& GetCircularMovementInfo() const { return _circularMovementInfo; }
+        void InitOrbit(AreaTriggerOrbitInfo const& cmi, uint32 timeToTarget);
+        bool HasOrbit() const;
+        Optional<AreaTriggerOrbitInfo> const& GetCircularMovementInfo() const { return _orbitInfo; }
 
         void UpdateShape();
 
@@ -121,11 +121,11 @@ class TC_GAME_API AreaTrigger : public WorldObject, public GridObject<AreaTrigge
         void UndoActions(Unit* unit);
 
         void UpdatePolygonOrientation();
-        void UpdateCircularMovementPosition(uint32 diff);
+        void UpdateOrbitPosition(uint32 diff);
         void UpdateSplinePosition(uint32 diff);
 
-        Position const* GetCircularMovementCenterPosition() const;
-        Position CalculateCircularMovementPosition() const;
+        Position const* GetOrbitCenterPosition() const;
+        Position CalculateOrbitPosition() const;
 
         void DebugVisualizePosition(); // Debug purpose only
 
@@ -148,7 +148,7 @@ class TC_GAME_API AreaTrigger : public WorldObject, public GridObject<AreaTrigge
         int32 _lastSplineIndex;
         uint32 _movementTime;
 
-        Optional<AreaTriggerCircularMovementInfo> _circularMovementInfo;
+        Optional<AreaTriggerOrbitInfo> _orbitInfo;
 
         AreaTriggerMiscTemplate const* _areaTriggerMiscTemplate;
         GuidUnorderedSet _insideUnits;
diff --git a/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h b/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h
index 40725225bf2..7b8ec39b3f0 100644
--- a/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h
+++ b/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h
@@ -108,7 +108,7 @@ struct AreaTriggerScaleInfo
     } Data;
 };
 
-struct AreaTriggerCircularMovementInfo
+struct AreaTriggerOrbitInfo
 {
     Optional<ObjectGuid> PathTarget;
     Optional<TaggedPosition<Position::XYZ>> Center;
@@ -214,7 +214,7 @@ public:
 
     AreaTriggerScaleInfo OverrideScale;
     AreaTriggerScaleInfo ExtraScale;
-    AreaTriggerCircularMovementInfo CircularMovementInfo;
+    AreaTriggerOrbitInfo OrbitInfo;
 
     AreaTriggerTemplate const* Template;
     std::vector<Position> SplinePoints;
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index e7796aa6fc5..cc6e2bde27b 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -2051,10 +2051,10 @@ void GameObject::Use(Unit* user)
                         return;
                     }
 
-                    WorldPackets::Artifact::ArtifactForgeOpened artifactForgeOpened;
-                    artifactForgeOpened.ArtifactGUID = item->GetGUID();
-                    artifactForgeOpened.ForgeGUID = GetGUID();
-                    player->SendDirectMessage(artifactForgeOpened.Write());
+                    WorldPackets::Artifact::OpenArtifactForge openArtifactForge;
+                    openArtifactForge.ArtifactGUID = item->GetGUID();
+                    openArtifactForge.ForgeGUID = GetGUID();
+                    player->SendDirectMessage(openArtifactForge.Write());
                     break;
                 }
                 case 2: // Heart Forge
@@ -2063,9 +2063,9 @@ void GameObject::Use(Unit* user)
                     if (!item)
                         return;
 
-                    WorldPackets::Azerite::AzeriteEssenceForgeOpened azeriteEssenceForgeOpened;
-                    azeriteEssenceForgeOpened.ForgeGUID = GetGUID();
-                    player->SendDirectMessage(azeriteEssenceForgeOpened.Write());
+                    WorldPackets::Azerite::OpenHeartForge openHeartForge;
+                    openHeartForge.ForgeGUID = GetGUID();
+                    player->SendDirectMessage(openHeartForge.Write());
                     break;
                 }
                 default:
@@ -2079,10 +2079,10 @@ void GameObject::Use(Unit* user)
             if (!player)
                 return;
 
-            WorldPackets::GameObject::GameObjectUIAction gameObjectUIAction;
-            gameObjectUIAction.ObjectGUID = GetGUID();
-            gameObjectUIAction.UILink = GetGOInfo()->UILink.UILinkType;
-            player->SendDirectMessage(gameObjectUIAction.Write());
+            WorldPackets::GameObject::GameObjectUILink gameObjectUILink;
+            gameObjectUILink.ObjectGUID = GetGUID();
+            gameObjectUILink.UILink = GetGOInfo()->UILink.UILinkType;
+            player->SendDirectMessage(gameObjectUILink.Write());
             return;
         }
         default:
@@ -2150,7 +2150,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId, TriggerCastFlags trigge
     // remove immunity flags, to allow spell to target anything
     trigger->SetImmuneToAll(false);
     PhasingHandler::InheritPhaseShift(trigger, this);
-    
+
     if (Unit* owner = GetOwner())
     {
         trigger->SetFaction(owner->GetFaction());
diff --git a/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp b/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp
index 1e655a1c501..7f56bc235bc 100644
--- a/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp
+++ b/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp
@@ -277,7 +277,7 @@ void AzeriteItem::GiveXP(uint64 xp)
         SetState(ITEM_CHANGED, owner);
     }
 
-    WorldPackets::Azerite::AzeriteXpGain xpGain;
+    WorldPackets::Azerite::PlayerAzeriteItemGains xpGain;
     xpGain.ItemGUID = GetGUID();
     xpGain.XP = xp;
     owner->SendDirectMessage(xpGain.Write());
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index 038534dba16..337a0e85923 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -1493,7 +1493,7 @@ bool Item::IsLimitedToAnotherMapOrZone(uint32 cur_mapId, uint32 cur_zoneId) cons
 
 void Item::SendUpdateSockets()
 {
-    WorldPackets::Item::SocketGemsResult socketGems;
+    WorldPackets::Item::SocketGemsSuccess socketGems;
     socketGems.Item = GetGUID();
     GetOwner()->GetSession()->SendPacket(socketGems.Write());
 }
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 53139520892..d52e93b7e18 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -480,7 +480,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, CreateObjectBits flags) const
         bool hasAreaTriggerPolygon  = areaTriggerTemplate->IsPolygon();
         bool hasAreaTriggerCylinder = areaTriggerTemplate->IsCylinder();
         bool hasAreaTriggerSpline   = areaTrigger->HasSplines();
-        bool hasCircularMovement    = areaTrigger->HasCircularMovement();
+        bool hasOrbit               = areaTrigger->HasOrbit();
 
         data->WriteBit(hasAbsoluteOrientation);
         data->WriteBit(hasDynamicShape);
@@ -502,7 +502,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, CreateObjectBits flags) const
         data->WriteBit(hasAreaTriggerPolygon);
         data->WriteBit(hasAreaTriggerCylinder);
         data->WriteBit(hasAreaTriggerSpline);
-        data->WriteBit(hasCircularMovement);
+        data->WriteBit(hasOrbit);
 
         if (hasUnk3)
             data->WriteBit(false);
@@ -581,7 +581,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, CreateObjectBits flags) const
             *data << float(areaTriggerTemplate->CylinderDatas.LocationZOffsetTarget);
         }
 
-        if (hasCircularMovement)
+        if (hasOrbit)
             *data << *areaTrigger->GetCircularMovementInfo();
     }
 
diff --git a/src/server/game/Entities/Player/CollectionMgr.cpp b/src/server/game/Entities/Player/CollectionMgr.cpp
index e1fc18eee9c..a12b017456c 100644
--- a/src/server/game/Entities/Player/CollectionMgr.cpp
+++ b/src/server/game/Entities/Player/CollectionMgr.cpp
@@ -886,22 +886,22 @@ void CollectionMgr::SetAppearanceIsFavorite(uint32 itemModifiedAppearanceId, boo
     else
         return;
 
-    WorldPackets::Transmogrification::TransmogCollectionUpdate transmogCollectionUpdate;
-    transmogCollectionUpdate.IsFullUpdate = false;
-    transmogCollectionUpdate.IsSetFavorite = apply;
-    transmogCollectionUpdate.FavoriteAppearances.push_back(itemModifiedAppearanceId);
+    WorldPackets::Transmogrification::AccountTransmogUpdate accountTransmogUpdate;
+    accountTransmogUpdate.IsFullUpdate = false;
+    accountTransmogUpdate.IsSetFavorite = apply;
+    accountTransmogUpdate.FavoriteAppearances.push_back(itemModifiedAppearanceId);
 
-    _owner->SendPacket(transmogCollectionUpdate.Write());
+    _owner->SendPacket(accountTransmogUpdate.Write());
 }
 
 void CollectionMgr::SendFavoriteAppearances() const
 {
-    WorldPackets::Transmogrification::TransmogCollectionUpdate transmogCollectionUpdate;
-    transmogCollectionUpdate.IsFullUpdate = true;
-    transmogCollectionUpdate.FavoriteAppearances.reserve(_favoriteAppearances.size());
+    WorldPackets::Transmogrification::AccountTransmogUpdate accountTransmogUpdate;
+    accountTransmogUpdate.IsFullUpdate = true;
+    accountTransmogUpdate.FavoriteAppearances.reserve(_favoriteAppearances.size());
     for (auto itr = _favoriteAppearances.begin(); itr != _favoriteAppearances.end(); ++itr)
         if (itr->second != FavoriteAppearanceState::Removed)
-            transmogCollectionUpdate.FavoriteAppearances.push_back(itr->first);
+            accountTransmogUpdate.FavoriteAppearances.push_back(itr->first);
 
-    _owner->SendPacket(transmogCollectionUpdate.Write());
+    _owner->SendPacket(accountTransmogUpdate.Write());
 }
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 179304144a2..c26cfc99d4a 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -10304,7 +10304,7 @@ void Player::SetInventorySlotCount(uint8 slots)
 
             CharacterDatabase.CommitTransaction(trans);
 
-            SendDirectMessage(WorldPackets::Item::CharacterInventoryOverflowWarning().Write());
+            SendDirectMessage(WorldPackets::Item::InventoryFullOverflow().Write());
         }
     }
 
@@ -24078,10 +24078,10 @@ void Player::SendInitialPacketsBeforeAddToMap()
     SendDirectMessage(mountUpdate.Write());
 
     // SMSG_ACCOUNT_TOYS_UPDATE
-    WorldPackets::Toy::AccountToysUpdate toysUpdate;
-    toysUpdate.IsFullUpdate = true;
-    toysUpdate.Toys = &GetSession()->GetCollectionMgr()->GetAccountToys();
-    SendDirectMessage(toysUpdate.Write());
+    WorldPackets::Toy::AccountToyUpdate toyUpdate;
+    toyUpdate.IsFullUpdate = true;
+    toyUpdate.Toys = &GetSession()->GetCollectionMgr()->GetAccountToys();
+    SendDirectMessage(toyUpdate.Write());
 
     // SMSG_ACCOUNT_HEIRLOOM_UPDATE
     WorldPackets::Misc::AccountHeirloomUpdate heirloomUpdate;
diff --git a/src/server/game/Globals/AreaTriggerDataStore.cpp b/src/server/game/Globals/AreaTriggerDataStore.cpp
index 612e411f60f..57caf8b4b51 100644
--- a/src/server/game/Globals/AreaTriggerDataStore.cpp
+++ b/src/server/game/Globals/AreaTriggerDataStore.cpp
@@ -216,17 +216,17 @@ void AreaTriggerDataStore::LoadAreaTriggerTemplates()
                 continue;
             }
 
-            AreaTriggerCircularMovementInfo& circularMovementInfo = atSpellMiscItr->second.CircularMovementInfo;
+            AreaTriggerOrbitInfo& orbitInfo = atSpellMiscItr->second.OrbitInfo;
 
-            circularMovementInfo.StartDelay         = circularMovementInfoFields[1].GetUInt32();
+            orbitInfo.StartDelay                    = circularMovementInfoFields[1].GetUInt32();
 
 #define VALIDATE_AND_SET_FLOAT(Float, Value) \
-            circularMovementInfo.Float = Value; \
-            if (!std::isfinite(circularMovementInfo.Float)) \
+            orbitInfo.Float = Value; \
+            if (!std::isfinite(orbitInfo.Float)) \
             { \
                 TC_LOG_ERROR("sql.sql", "Table `spell_areatrigger_circular` has listed areatrigger (MiscId: %u) with invalid " #Float " (%f), set to 0!", \
-                    spellMiscId, circularMovementInfo.Float); \
-                circularMovementInfo.Float = 0.0f; \
+                    spellMiscId, orbitInfo.Float); \
+                orbitInfo.Float = 0.0f; \
             }
 
             VALIDATE_AND_SET_FLOAT(Radius,          circularMovementInfoFields[2].GetFloat());
@@ -236,8 +236,8 @@ void AreaTriggerDataStore::LoadAreaTriggerTemplates()
 
 #undef VALIDATE_AND_SET_FLOAT
 
-            circularMovementInfo.CounterClockwise   = circularMovementInfoFields[6].GetBool();
-            circularMovementInfo.CanLoop            = circularMovementInfoFields[7].GetBool();
+            orbitInfo.CounterClockwise              = circularMovementInfoFields[6].GetBool();
+            orbitInfo.CanLoop                       = circularMovementInfoFields[7].GetBool();
         }
         while (circularMovementInfos->NextRow());
     }
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 22e9b84252e..10c8bb81608 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -1545,7 +1545,7 @@ void Group::UpdatePlayerOutOfRange(Player* player)
     if (!player || !player->IsInWorld())
         return;
 
-    WorldPackets::Party::PartyMemberState packet;
+    WorldPackets::Party::PartyMemberFullState packet;
     packet.Initialize(player);
 
     Player* member;
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index e4c8c640833..9554f7dc869 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -2637,7 +2637,7 @@ void Guild::BroadcastPacketIfTrackingAchievement(WorldPacket const* packet, uint
 
 void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 maxLevel, uint32 minRank)
 {
-    WorldPackets::Calendar::CalendarEventInitialInvites packet;
+    WorldPackets::Calendar::CalendarCommunityInvite packet;
 
     for (auto itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp
index 49d35cd452f..5da7b1cd186 100644
--- a/src/server/game/Handlers/AuctionHouseHandler.cpp
+++ b/src/server/game/Handlers/AuctionHouseHandler.cpp
@@ -156,6 +156,40 @@ void WorldSession::HandleAuctionConfirmCommoditiesPurchase(WorldPackets::Auction
     }
 }
 
+void WorldSession::HandleAuctionGetCommodityQuote(WorldPackets::AuctionHouse::AuctionGetCommodityQuote& getCommodityQuote)
+{
+    AuctionThrottleResult throttle = sAuctionMgr->CheckThrottle(_player, getCommodityQuote.TaintedBy.is_initialized(), AuctionCommand::PlaceBid);
+    if (throttle.Throttled)
+        return;
+
+    Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(getCommodityQuote.Auctioneer, UNIT_NPC_FLAG_AUCTIONEER, UNIT_NPC_FLAG_2_NONE);
+    if (!creature)
+    {
+        TC_LOG_DEBUG("network", "WORLD: HandleAuctionStartCommoditiesPurchase - %s not found or you can't interact with him.",
+            getCommodityQuote.Auctioneer.ToString().c_str());
+        return;
+    }
+
+    // remove fake death
+    if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
+        GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
+
+    AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->GetFaction());
+
+    WorldPackets::AuctionHouse::AuctionGetCommodityQuoteResult commodityQuoteResult;
+
+    if (CommodityQuote const* quote = auctionHouse->CreateCommodityQuote(_player, getCommodityQuote.ItemID, getCommodityQuote.Quantity))
+    {
+        commodityQuoteResult.TotalPrice = quote->TotalPrice;
+        commodityQuoteResult.Quantity = quote->Quantity;
+        commodityQuoteResult.QuoteDuration = std::chrono::duration_cast<Milliseconds>(quote->ValidTo - GameTime::GetGameTimeSteadyPoint()).count();
+    }
+
+    commodityQuoteResult.DesiredDelay = uint32(throttle.DelayUntilNext.count());
+
+    SendPacket(commodityQuoteResult.Write());
+}
+
 void WorldSession::HandleAuctionHelloOpcode(WorldPackets::AuctionHouse::AuctionHelloRequest& hello)
 {
     Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(hello.Guid, UNIT_NPC_FLAG_AUCTIONEER, UNIT_NPC_FLAG_2_NONE);
@@ -172,16 +206,16 @@ void WorldSession::HandleAuctionHelloOpcode(WorldPackets::AuctionHouse::AuctionH
     SendAuctionHello(hello.Guid, unit);
 }
 
-void WorldSession::HandleAuctionListBidderItems(WorldPackets::AuctionHouse::AuctionListBidderItems& listBidderItems)
+void WorldSession::HandleAuctionListBiddedItems(WorldPackets::AuctionHouse::AuctionListBiddedItems& listBiddedItems)
 {
-    AuctionThrottleResult throttle = sAuctionMgr->CheckThrottle(_player, listBidderItems.TaintedBy.is_initialized());
+    AuctionThrottleResult throttle = sAuctionMgr->CheckThrottle(_player, listBiddedItems.TaintedBy.is_initialized());
     if (throttle.Throttled)
         return;
 
-    Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(listBidderItems.Auctioneer, UNIT_NPC_FLAG_AUCTIONEER, UNIT_NPC_FLAG_2_NONE);
+    Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(listBiddedItems.Auctioneer, UNIT_NPC_FLAG_AUCTIONEER, UNIT_NPC_FLAG_2_NONE);
     if (!creature)
     {
-        TC_LOG_DEBUG("network", "WORLD: HandleAuctionListBidderItems - %s not found or you can't interact with him.", listBidderItems.Auctioneer.ToString().c_str());
+        TC_LOG_DEBUG("network", "WORLD: HandleAuctionListBidderItems - %s not found or you can't interact with him.", listBiddedItems.Auctioneer.ToString().c_str());
         return;
     }
 
@@ -191,10 +225,10 @@ void WorldSession::HandleAuctionListBidderItems(WorldPackets::AuctionHouse::Auct
 
     AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->GetFaction());
 
-    WorldPackets::AuctionHouse::AuctionListBidderItemsResult result;
+    WorldPackets::AuctionHouse::AuctionListBiddedItemsResult result;
 
     Player* player = GetPlayer();
-    auctionHouse->BuildListBidderItems(result, player, listBidderItems.Offset, listBidderItems.Sorts.data(), listBidderItems.Sorts.size());
+    auctionHouse->BuildListBiddedItems(result, player, listBiddedItems.Offset, listBiddedItems.Sorts.data(), listBiddedItems.Sorts.size());
     result.DesiredDelay = uint32(throttle.DelayUntilNext.count());
     SendPacket(result.Write());
 }
@@ -293,16 +327,16 @@ void WorldSession::HandleAuctionListItemsByItemID(WorldPackets::AuctionHouse::Au
 }
 
 //this void sends player info about his auctions
-void WorldSession::HandleAuctionListOwnerItems(WorldPackets::AuctionHouse::AuctionListOwnerItems& listOwnerItems)
+void WorldSession::HandleAuctionListOwnedItems(WorldPackets::AuctionHouse::AuctionListOwnedItems& listOwnedItems)
 {
-    AuctionThrottleResult throttle = sAuctionMgr->CheckThrottle(_player, listOwnerItems.TaintedBy.is_initialized());
+    AuctionThrottleResult throttle = sAuctionMgr->CheckThrottle(_player, listOwnedItems.TaintedBy.is_initialized());
     if (throttle.Throttled)
         return;
 
-    Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(listOwnerItems.Auctioneer, UNIT_NPC_FLAG_AUCTIONEER, UNIT_NPC_FLAG_2_NONE);
+    Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(listOwnedItems.Auctioneer, UNIT_NPC_FLAG_AUCTIONEER, UNIT_NPC_FLAG_2_NONE);
     if (!creature)
     {
-        TC_LOG_DEBUG("network", "WORLD: HandleAuctionListOwnerItems - %s not found or you can't interact with him.", listOwnerItems.Auctioneer.ToString().c_str());
+        TC_LOG_DEBUG("network", "WORLD: HandleAuctionListOwnerItems - %s not found or you can't interact with him.", listOwnedItems.Auctioneer.ToString().c_str());
         return;
     }
 
@@ -312,9 +346,9 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPackets::AuctionHouse::Aucti
 
     AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->GetFaction());
 
-    WorldPackets::AuctionHouse::AuctionListOwnerItemsResult result;
+    WorldPackets::AuctionHouse::AuctionListOwnedItemsResult result;
 
-    auctionHouse->BuildListOwnerItems(result, _player, listOwnerItems.Offset, listOwnerItems.Sorts.data(), listOwnerItems.Sorts.size());
+    auctionHouse->BuildListOwnedItems(result, _player, listOwnedItems.Offset, listOwnedItems.Sorts.data(), listOwnedItems.Sorts.size());
     result.DesiredDelay = uint32(throttle.DelayUntilNext.count());
     SendPacket(result.Write());
 }
@@ -928,40 +962,6 @@ void WorldSession::HandleAuctionSetFavoriteItem(WorldPackets::AuctionHouse::Auct
     CharacterDatabase.CommitTransaction(trans);
 }
 
-void WorldSession::HandleAuctionStartCommoditiesPurchase(WorldPackets::AuctionHouse::AuctionStartCommoditiesPurchase& startCommoditiesPurchase)
-{
-    AuctionThrottleResult throttle = sAuctionMgr->CheckThrottle(_player, startCommoditiesPurchase.TaintedBy.is_initialized(), AuctionCommand::PlaceBid);
-    if (throttle.Throttled)
-        return;
-
-    Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(startCommoditiesPurchase.Auctioneer, UNIT_NPC_FLAG_AUCTIONEER, UNIT_NPC_FLAG_2_NONE);
-    if (!creature)
-    {
-        TC_LOG_DEBUG("network", "WORLD: HandleAuctionStartCommoditiesPurchase - %s not found or you can't interact with him.",
-            startCommoditiesPurchase.Auctioneer.ToString().c_str());
-        return;
-    }
-
-    // remove fake death
-    if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
-        GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
-    AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->GetFaction());
-
-    WorldPackets::AuctionHouse::AuctionCommodityQuote auctionCommodityQuote;
-
-    if (CommodityQuote const* quote = auctionHouse->CreateCommodityQuote(_player, startCommoditiesPurchase.ItemID, startCommoditiesPurchase.Quantity))
-    {
-        auctionCommodityQuote.TotalPrice = quote->TotalPrice;
-        auctionCommodityQuote.Quantity = quote->Quantity;
-        auctionCommodityQuote.QuoteDuration = std::chrono::duration_cast<Milliseconds>(quote->ValidTo - GameTime::GetGameTimeSteadyPoint()).count();
-    }
-
-    auctionCommodityQuote.DesiredDelay = uint32(throttle.DelayUntilNext.count());
-
-    SendPacket(auctionCommodityQuote.Write());
-}
-
 //this void causes that auction window is opened
 void WorldSession::SendAuctionHello(ObjectGuid guid, Creature* unit)
 {
diff --git a/src/server/game/Handlers/AzeriteHandler.cpp b/src/server/game/Handlers/AzeriteHandler.cpp
index ab6675a50f5..f93dbca04b4 100644
--- a/src/server/game/Handlers/AzeriteHandler.cpp
+++ b/src/server/game/Handlers/AzeriteHandler.cpp
@@ -57,7 +57,7 @@ void WorldSession::HandleAzeriteEssenceUnlockMilestone(WorldPackets::Azerite::Az
 
 void WorldSession::HandleAzeriteEssenceActivateEssence(WorldPackets::Azerite::AzeriteEssenceActivateEssence& azeriteEssenceActivateEssence)
 {
-    WorldPackets::Azerite::AzeriteEssenceSelectionResult activateEssenceResult;
+    WorldPackets::Azerite::ActivateEssenceFailed activateEssenceResult;
     activateEssenceResult.AzeriteEssenceID = azeriteEssenceActivateEssence.AzeriteEssenceID;
     Item* item = _player->GetItemByEntry(ITEM_ID_HEART_OF_AZEROTH, ITEM_SEARCH_IN_EQUIPMENT);
     if (!item)
diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
index 0ac44ad961e..56eca9b75b1 100644
--- a/src/server/game/Handlers/BattleGroundHandler.cpp
+++ b/src/server/game/Handlers/BattleGroundHandler.cpp
@@ -239,9 +239,9 @@ void WorldSession::HandlePVPLogDataOpcode(WorldPackets::Battleground::PVPLogData
     if (bg->isArena())
         return;
 
-    WorldPackets::Battleground::PVPLogDataMessage pvpLogData;
-    bg->BuildPvPLogDataPacket(pvpLogData.Data);
-    SendPacket(pvpLogData.Write());
+    WorldPackets::Battleground::PVPMatchStatisticsMessage pvpMatchStatistics;
+    bg->BuildPvPLogDataPacket(pvpMatchStatistics.Data);
+    SendPacket(pvpMatchStatistics.Write());
 }
 
 void WorldSession::HandleBattlefieldListOpcode(WorldPackets::Battleground::BattlefieldListRequest& battlefieldList)
@@ -602,8 +602,8 @@ void WorldSession::HandleReportPvPAFK(WorldPackets::Battleground::ReportPvPPlaye
 
 void WorldSession::HandleRequestRatedBattlefieldInfo(WorldPackets::Battleground::RequestRatedBattlefieldInfo& /*packet*/)
 {
-    WorldPackets::Battleground::RatedBattlefieldInfo ratedBattlefieldInfo;
-    SendPacket(ratedBattlefieldInfo.Write());
+    WorldPackets::Battleground::RatedPvpInfo ratedPvpInfo;
+    SendPacket(ratedPvpInfo.Write());
 }
 
 void WorldSession::HandleGetPVPOptionsEnabled(WorldPackets::Battleground::GetPVPOptionsEnabled& /*getPvPOptionsEnabled*/)
diff --git a/src/server/game/Handlers/BattlenetHandler.cpp b/src/server/game/Handlers/BattlenetHandler.cpp
index abad8cb5c1f..c8c30db4a0d 100644
--- a/src/server/game/Handlers/BattlenetHandler.cpp
+++ b/src/server/game/Handlers/BattlenetHandler.cpp
@@ -20,23 +20,23 @@
 #include "WorldserverServiceDispatcher.h"
 #include "ObjectDefines.h"
 
-void WorldSession::HandleBattlenetRequest(WorldPackets::Battlenet::Request& request)
-{
-    sServiceDispatcher.Dispatch(this, request.Method.GetServiceHash(), request.Method.Token, request.Method.GetMethodId(), std::move(request.Data));
-}
-
-void WorldSession::HandleBattlenetRequestRealmListTicket(WorldPackets::Battlenet::RequestRealmListTicket& requestRealmListTicket)
+void WorldSession::HandleBattlenetChangeRealmTicket(WorldPackets::Battlenet::ChangeRealmTicket& changeRealmTicket)
 {
-    SetRealmListSecret(requestRealmListTicket.Secret);
+    SetRealmListSecret(changeRealmTicket.Secret);
 
-    WorldPackets::Battlenet::RealmListTicket realmListTicket;
-    realmListTicket.Token = requestRealmListTicket.Token;
+    WorldPackets::Battlenet::ChangeRealmTicketResponse realmListTicket;
+    realmListTicket.Token = changeRealmTicket.Token;
     realmListTicket.Allow = true;
     realmListTicket.Ticket << "WorldserverRealmListTicket";
 
     SendPacket(realmListTicket.Write());
 }
 
+void WorldSession::HandleBattlenetRequest(WorldPackets::Battlenet::Request& request)
+{
+    sServiceDispatcher.Dispatch(this, request.Method.GetServiceHash(), request.Method.Token, request.Method.GetMethodId(), std::move(request.Data));
+}
+
 void WorldSession::SendBattlenetResponse(uint32 serviceHash, uint32 methodId, uint32 token, pb::Message const* response)
 {
     WorldPackets::Battlenet::Response bnetResponse;
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index 0a54c0c7d53..9461ebdb276 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -978,13 +978,13 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
 
     // Send PVPSeason
     {
-        WorldPackets::Battleground::PVPSeason season;
-        season.PreviousSeason = sWorld->getIntConfig(CONFIG_ARENA_SEASON_ID) - sWorld->getBoolConfig(CONFIG_ARENA_SEASON_IN_PROGRESS);
+        WorldPackets::Battleground::SeasonInfo seasonInfo;
+        seasonInfo.PreviousSeason = sWorld->getIntConfig(CONFIG_ARENA_SEASON_ID) - sWorld->getBoolConfig(CONFIG_ARENA_SEASON_IN_PROGRESS);
 
         if (sWorld->getBoolConfig(CONFIG_ARENA_SEASON_IN_PROGRESS))
-            season.CurrentSeason = sWorld->getIntConfig(CONFIG_ARENA_SEASON_ID);
+            seasonInfo.CurrentSeason = sWorld->getIntConfig(CONFIG_ARENA_SEASON_ID);
 
-        SendPacket(season.Write());
+        SendPacket(seasonInfo.Write());
     }
 
     // send server info
@@ -1089,7 +1089,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
     stmt->setUInt64(0, pCurrChar->GetGUID().GetCounter());
     GetQueryProcessor().AddCallback(CharacterDatabase.AsyncQuery(stmt)).WithPreparedCallback([this](PreparedQueryResult favoriteAuctionResult)
     {
-        WorldPackets::AuctionHouse::AuctionFavoriteItems favoriteItems;
+        WorldPackets::AuctionHouse::AuctionFavoriteList favoriteItems;
         if (favoriteAuctionResult)
         {
             favoriteItems.Items.reserve(favoriteAuctionResult->GetRowCount());
@@ -2647,12 +2647,12 @@ void WorldSession::SendCharCustomize(ResponseCodes result, WorldPackets::Charact
 {
     if (result == RESPONSE_SUCCESS)
     {
-        WorldPackets::Character::CharCustomizeResponse response(customizeInfo);
+        WorldPackets::Character::CharCustomizeSuccess response(customizeInfo);
         SendPacket(response.Write());
     }
     else
     {
-        WorldPackets::Character::CharCustomizeFailed failed;
+        WorldPackets::Character::CharCustomizeFailure failed;
         failed.Result = uint8(result);
         failed.CharGUID = customizeInfo->CharGUID;
         SendPacket(failed.Write());
diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp
index d5ca7ec9b04..96affd34804 100644
--- a/src/server/game/Handlers/GroupHandler.cpp
+++ b/src/server/game/Handlers/GroupHandler.cpp
@@ -593,7 +593,7 @@ void WorldSession::HandleReadyCheckResponseOpcode(WorldPackets::Party::ReadyChec
 
 void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPackets::Party::RequestPartyMemberStats& packet)
 {
-    WorldPackets::Party::PartyMemberState partyMemberStats;
+    WorldPackets::Party::PartyMemberFullState partyMemberStats;
 
     Player* player = ObjectAccessor::FindConnectedPlayer(packet.TargetGUID);
     if (!player)
diff --git a/src/server/game/Handlers/HotfixHandler.cpp b/src/server/game/Handlers/HotfixHandler.cpp
index 5c78ab66b8d..798b7060f2d 100644
--- a/src/server/game/Handlers/HotfixHandler.cpp
+++ b/src/server/game/Handlers/HotfixHandler.cpp
@@ -64,7 +64,7 @@ void WorldSession::SendAvailableHotfixes()
 void WorldSession::HandleHotfixRequest(WorldPackets::Hotfix::HotfixRequest& hotfixQuery)
 {
     DB2Manager::HotfixContainer const& hotfixes = sDB2Manager.GetHotfixData();
-    WorldPackets::Hotfix::HotfixResponse hotfixQueryResponse;
+    WorldPackets::Hotfix::HotfixConnect hotfixQueryResponse;
     hotfixQueryResponse.Hotfixes.reserve(hotfixQuery.Hotfixes.size());
     for (DB2Manager::HotfixRecord const& hotfixRecord : hotfixQuery.Hotfixes)
     {
@@ -72,7 +72,7 @@ void WorldSession::HandleHotfixRequest(WorldPackets::Hotfix::HotfixRequest& hotf
         {
             DB2StorageBase const* storage = sDB2Manager.GetStorage(hotfixRecord.TableHash);
 
-            WorldPackets::Hotfix::HotfixResponse::HotfixData hotfixData;
+            WorldPackets::Hotfix::HotfixConnect::HotfixData hotfixData;
             hotfixData.Record = hotfixRecord;
             if (storage && storage->HasRecord(uint32(hotfixRecord.RecordID)))
             {
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index b6d32905be5..d2822839f8a 100644
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -1210,21 +1210,21 @@ void WorldSession::HandleSortBags(WorldPackets::Item::SortBags& /*sortBags*/)
 {
     // TODO: Implement sorting
     // Placeholder to prevent completely locking out bags clientside
-    SendPacket(WorldPackets::Item::SortBagsResult().Write());
+    SendPacket(WorldPackets::Item::BagCleanupFinished().Write());
 }
 
 void WorldSession::HandleSortBankBags(WorldPackets::Item::SortBankBags& /*sortBankBags*/)
 {
     // TODO: Implement sorting
     // Placeholder to prevent completely locking out bags clientside
-    SendPacket(WorldPackets::Item::SortBagsResult().Write());
+    SendPacket(WorldPackets::Item::BagCleanupFinished().Write());
 }
 
 void WorldSession::HandleSortReagentBankBags(WorldPackets::Item::SortReagentBankBags& /*sortReagentBankBags*/)
 {
     // TODO: Implement sorting
     // Placeholder to prevent completely locking out bags clientside
-    SendPacket(WorldPackets::Item::SortBagsResult().Write());
+    SendPacket(WorldPackets::Item::BagCleanupFinished().Write());
 }
 
 void WorldSession::HandleRemoveNewItem(WorldPackets::Item::RemoveNewItem& removeNewItem)
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 01ff03ce2c1..8efa6f04708 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -1041,9 +1041,9 @@ void WorldSession::HandleGuildSetFocusedAchievement(WorldPackets::Achievement::G
         guild->GetAchievementMgr().SendAchievementInfo(_player, setFocusedAchievement.AchievementID);
 }
 
-void WorldSession::HandleUITimeRequest(WorldPackets::Misc::UITimeRequest& /*request*/)
+void WorldSession::HandleServerTimeOffsetRequest(WorldPackets::Misc::ServerTimeOffsetRequest& /*request*/)
 {
-    WorldPackets::Misc::UITime response;
+    WorldPackets::Misc::ServerTimeOffset response;
     response.Time = time(nullptr);
     SendPacket(response.Write());
 }
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
index 1963e618157..6bcb4f29a0b 100644
--- a/src/server/game/Handlers/QuestHandler.cpp
+++ b/src/server/game/Handlers/QuestHandler.cpp
@@ -667,7 +667,7 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPackets::Quest::Ques
 
 void WorldSession::HandleRequestWorldQuestUpdate(WorldPackets::Quest::RequestWorldQuestUpdate& /*packet*/)
 {
-    WorldPackets::Quest::WorldQuestUpdate response;
+    WorldPackets::Quest::WorldQuestUpdateResponse response;
 
     /// @todo: 7.x Has to be implemented
     //response.WorldQuestUpdates.push_back(WorldPackets::Quest::WorldQuestUpdateInfo(lastUpdate, questID, timer, variableID, value));
diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp
index 38506654b5e..bf921e4e7e0 100644
--- a/src/server/game/Handlers/SkillHandler.cpp
+++ b/src/server/game/Handlers/SkillHandler.cpp
@@ -28,23 +28,23 @@
 
 void WorldSession::HandleLearnTalentsOpcode(WorldPackets::Talent::LearnTalents& packet)
 {
-    WorldPackets::Talent::LearnTalentsFailed learnTalentsFailed;
+    WorldPackets::Talent::LearnTalentFailed learnTalentFailed;
     bool anythingLearned = false;
     for (uint32 talentId : packet.Talents)
     {
-        if (TalentLearnResult result = _player->LearnTalent(talentId, &learnTalentsFailed.SpellID))
+        if (TalentLearnResult result = _player->LearnTalent(talentId, &learnTalentFailed.SpellID))
         {
-            if (!learnTalentsFailed.Reason)
-                learnTalentsFailed.Reason = result;
+            if (!learnTalentFailed.Reason)
+                learnTalentFailed.Reason = result;
 
-            learnTalentsFailed.Talents.push_back(talentId);
+            learnTalentFailed.Talents.push_back(talentId);
         }
         else
             anythingLearned = true;
     }
 
-    if (learnTalentsFailed.Reason)
-        SendPacket(learnTalentsFailed.Write());
+    if (learnTalentFailed.Reason)
+        SendPacket(learnTalentFailed.Write());
 
     if (anythingLearned)
         _player->SendTalentsInfoData();
@@ -52,23 +52,23 @@ void WorldSession::HandleLearnTalentsOpcode(WorldPackets::Talent::LearnTalents&
 
 void WorldSession::HandleLearnPvpTalentsOpcode(WorldPackets::Talent::LearnPvpTalents& packet)
 {
-    WorldPackets::Talent::LearnPvpTalentsFailed learnPvpTalentsFailed;
+    WorldPackets::Talent::LearnPvpTalentFailed learnPvpTalentFailed;
     bool anythingLearned = false;
     for (WorldPackets::Talent::PvPTalent pvpTalent : packet.Talents)
     {
-        if (TalentLearnResult result = _player->LearnPvpTalent(pvpTalent.PvPTalentID, pvpTalent.Slot, &learnPvpTalentsFailed.SpellID))
+        if (TalentLearnResult result = _player->LearnPvpTalent(pvpTalent.PvPTalentID, pvpTalent.Slot, &learnPvpTalentFailed.SpellID))
         {
-            if (!learnPvpTalentsFailed.Reason)
-                learnPvpTalentsFailed.Reason = result;
+            if (!learnPvpTalentFailed.Reason)
+                learnPvpTalentFailed.Reason = result;
 
-            learnPvpTalentsFailed.Talents.push_back(pvpTalent);
+            learnPvpTalentFailed.Talents.push_back(pvpTalent);
         }
         else
             anythingLearned = true;
     }
 
-    if (learnPvpTalentsFailed.Reason)
-        SendPacket(learnPvpTalentsFailed.Write());
+    if (learnPvpTalentFailed.Reason)
+        SendPacket(learnPvpTalentFailed.Write());
 
     if (anythingLearned)
         _player->SendTalentsInfoData();
diff --git a/src/server/game/Handlers/TokenHandler.cpp b/src/server/game/Handlers/TokenHandler.cpp
index db83ab2dc8e..acd68dad9a3 100644
--- a/src/server/game/Handlers/TokenHandler.cpp
+++ b/src/server/game/Handlers/TokenHandler.cpp
@@ -18,24 +18,24 @@
 #include "TokenPackets.h"
 #include "WorldSession.h"
 
-void WorldSession::HandleUpdateListedAuctionableTokens(WorldPackets::Token::UpdateListedAuctionableTokens& updateListedAuctionableTokens)
+void WorldSession::HandleCommerceTokenGetLog(WorldPackets::Token::CommerceTokenGetLog& commerceTokenGetLog)
 {
-    WorldPackets::Token::UpdateListedAuctionableTokensResponse response;
+    WorldPackets::Token::CommerceTokenGetLogResponse response;
 
     /// @todo: 6.x fix implementation
-    response.UnkInt = updateListedAuctionableTokens.UnkInt;
+    response.UnkInt = commerceTokenGetLog.UnkInt;
     response.Result = TOKEN_RESULT_SUCCESS;
 
     SendPacket(response.Write());
 }
 
-void WorldSession::HandleRequestWowTokenMarketPrice(WorldPackets::Token::RequestWowTokenMarketPrice& requestWowTokenMarketPrice)
+void WorldSession::HandleCommerceTokenGetMarketPrice(WorldPackets::Token::CommerceTokenGetMarketPrice& commerceTokenGetMarketPrice)
 {
-    WorldPackets::Token::WowTokenMarketPriceResponse response;
+    WorldPackets::Token::CommerceTokenGetMarketPriceResponse response;
 
     /// @todo: 6.x fix implementation
     response.CurrentMarketPrice = 300000000;
-    response.UnkInt = requestWowTokenMarketPrice.UnkInt;
+    response.UnkInt = commerceTokenGetMarketPrice.UnkInt;
     response.Result = TOKEN_RESULT_SUCCESS;
     //packet.ReadUInt32("UnkInt32");
 
diff --git a/src/server/game/Handlers/TransmogrificationHandler.cpp b/src/server/game/Handlers/TransmogrificationHandler.cpp
index 0d263d012a5..81a35329e20 100644
--- a/src/server/game/Handlers/TransmogrificationHandler.cpp
+++ b/src/server/game/Handlers/TransmogrificationHandler.cpp
@@ -287,5 +287,5 @@ void WorldSession::HandleTransmogrifyItems(WorldPackets::Transmogrification::Tra
 
 void WorldSession::SendOpenTransmogrifier(ObjectGuid const& guid)
 {
-    SendPacket(WorldPackets::Transmogrification::OpenTransmogrifier(guid).Write());
+    SendPacket(WorldPackets::Transmogrification::TransmogrifyNPC(guid).Write());
 }
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index ae969379cf5..dd82512525e 100644
--- a/src/server/game/Instances/InstanceScript.cpp
+++ b/src/server/game/Instances/InstanceScript.cpp
@@ -756,7 +756,7 @@ void InstanceScript::SendEncounterEnd()
 
 void InstanceScript::SendBossKillCredit(uint32 encounterId)
 {
-    WorldPackets::Instance::BossKillCredit bossKillCreditMessage;
+    WorldPackets::Instance::BossKill bossKillCreditMessage;
     bossKillCreditMessage.DungeonEncounterID = encounterId;
 
     instance->SendToPlayers(bossKillCreditMessage.Write());
diff --git a/src/server/game/Scenarios/Scenario.cpp b/src/server/game/Scenarios/Scenario.cpp
index 48890b40cbe..65720d324e9 100644
--- a/src/server/game/Scenarios/Scenario.cpp
+++ b/src/server/game/Scenarios/Scenario.cpp
@@ -312,7 +312,7 @@ CriteriaList const& Scenario::GetCriteriaByType(CriteriaTypes type, uint32 /*ass
 
 void Scenario::SendBootPlayer(Player* player)
 {
-    WorldPackets::Scenario::ScenarioBoot scenarioBoot;
+    WorldPackets::Scenario::ScenarioVacate scenarioBoot;
     scenarioBoot.ScenarioID = _data->Entry->ID;
     player->SendDirectMessage(scenarioBoot.Write());
 }
diff --git a/src/server/game/Server/Packets/AreaTriggerPackets.cpp b/src/server/game/Server/Packets/AreaTriggerPackets.cpp
index de7d0e7cd92..eb4b454b028 100644
--- a/src/server/game/Server/Packets/AreaTriggerPackets.cpp
+++ b/src/server/game/Server/Packets/AreaTriggerPackets.cpp
@@ -31,7 +31,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::AreaTrigger::AreaTriggerS
     return data;
 }
 
-ByteBuffer& operator<<(ByteBuffer& data, AreaTriggerCircularMovementInfo const& areaTriggerCircularMovement)
+ByteBuffer& operator<<(ByteBuffer& data, AreaTriggerOrbitInfo const& areaTriggerCircularMovement)
 {
     data.WriteBit(areaTriggerCircularMovement.PathTarget.is_initialized());
     data.WriteBit(areaTriggerCircularMovement.Center.is_initialized());
@@ -76,14 +76,14 @@ WorldPacket const* WorldPackets::AreaTrigger::AreaTriggerRePath::Write()
     _worldPacket << TriggerGUID;
 
     _worldPacket.WriteBit(AreaTriggerSpline.is_initialized());
-    _worldPacket.WriteBit(AreaTriggerCircularMovement.is_initialized());
+    _worldPacket.WriteBit(AreaTriggerOrbit.is_initialized());
     _worldPacket.FlushBits();
 
     if (AreaTriggerSpline)
         _worldPacket << *AreaTriggerSpline;
 
-    if (AreaTriggerCircularMovement)
-        _worldPacket << *AreaTriggerCircularMovement;
+    if (AreaTriggerOrbit)
+        _worldPacket << *AreaTriggerOrbit;
 
     return &_worldPacket;
 }
diff --git a/src/server/game/Server/Packets/AreaTriggerPackets.h b/src/server/game/Server/Packets/AreaTriggerPackets.h
index 7c30e95f613..7bb4ec70594 100644
--- a/src/server/game/Server/Packets/AreaTriggerPackets.h
+++ b/src/server/game/Server/Packets/AreaTriggerPackets.h
@@ -73,12 +73,12 @@ namespace WorldPackets
             WorldPacket const* Write() override;
 
             Optional<AreaTriggerSplineInfo> AreaTriggerSpline;
-            Optional<AreaTriggerCircularMovementInfo> AreaTriggerCircularMovement;
+            Optional<AreaTriggerOrbitInfo> AreaTriggerOrbit;
             ObjectGuid TriggerGUID;
         };
     }
 }
 
-ByteBuffer& operator<<(ByteBuffer& data, AreaTriggerCircularMovementInfo const& areaTriggerCircularMovement);
+ByteBuffer& operator<<(ByteBuffer& data, AreaTriggerOrbitInfo const& areaTriggerCircularMovement);
 
 #endif // AreaTriggerPackets_h__
diff --git a/src/server/game/Server/Packets/ArtifactPackets.cpp b/src/server/game/Server/Packets/ArtifactPackets.cpp
index 3f74032c0dd..fad4218fc27 100644
--- a/src/server/game/Server/Packets/ArtifactPackets.cpp
+++ b/src/server/game/Server/Packets/ArtifactPackets.cpp
@@ -46,7 +46,7 @@ void WorldPackets::Artifact::ConfirmArtifactRespec::Read()
     _worldPacket >> NpcGUID;
 }
 
-WorldPacket const* WorldPackets::Artifact::ArtifactForgeOpened::Write()
+WorldPacket const* WorldPackets::Artifact::OpenArtifactForge::Write()
 {
     _worldPacket << ArtifactGUID;
     _worldPacket << ForgeGUID;
@@ -54,7 +54,7 @@ WorldPacket const* WorldPackets::Artifact::ArtifactForgeOpened::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Artifact::ArtifactRespecConfirm::Write()
+WorldPacket const* WorldPackets::Artifact::ArtifactRespecPrompt::Write()
 {
     _worldPacket << ArtifactGUID;
     _worldPacket << NpcGUID;
diff --git a/src/server/game/Server/Packets/ArtifactPackets.h b/src/server/game/Server/Packets/ArtifactPackets.h
index e9544816849..d72b54c8ba8 100644
--- a/src/server/game/Server/Packets/ArtifactPackets.h
+++ b/src/server/game/Server/Packets/ArtifactPackets.h
@@ -67,10 +67,10 @@ namespace WorldPackets
             ObjectGuid NpcGUID;
         };
 
-        class ArtifactForgeOpened final : public ServerPacket
+        class OpenArtifactForge final : public ServerPacket
         {
         public:
-            ArtifactForgeOpened() : ServerPacket(SMSG_ARTIFACT_FORGE_OPENED, 16 + 16) { }
+            OpenArtifactForge() : ServerPacket(SMSG_OPEN_ARTIFACT_FORGE, 16 + 16) { }
 
             WorldPacket const* Write() override;
 
@@ -78,10 +78,10 @@ namespace WorldPackets
             ObjectGuid ForgeGUID;
         };
 
-        class ArtifactRespecConfirm final : public ServerPacket
+        class ArtifactRespecPrompt final : public ServerPacket
         {
         public:
-            ArtifactRespecConfirm() : ServerPacket(SMSG_ARTIFACT_RESPEC_CONFIRM, 16 + 16) { }
+            ArtifactRespecPrompt() : ServerPacket(SMSG_ARTIFACT_RESPEC_PROMPT, 16 + 16) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/AuctionHousePackets.cpp b/src/server/game/Server/Packets/AuctionHousePackets.cpp
index 41cd3912eb6..51b36df9bf4 100644
--- a/src/server/game/Server/Packets/AuctionHousePackets.cpp
+++ b/src/server/game/Server/Packets/AuctionHousePackets.cpp
@@ -321,7 +321,7 @@ void AuctionHelloRequest::Read()
     _worldPacket >> Guid;
 }
 
-void AuctionListBidderItems::Read()
+void AuctionListBiddedItems::Read()
 {
     _worldPacket >> Auctioneer;
     _worldPacket >> Offset;
@@ -401,7 +401,7 @@ void AuctionListItemsByItemID::Read()
         _worldPacket >> *TaintedBy;
 }
 
-void AuctionListOwnerItems::Read()
+void AuctionListOwnedItems::Read()
 {
     _worldPacket >> Auctioneer;
     _worldPacket >> Offset;
@@ -498,7 +498,7 @@ void AuctionSetFavoriteItem::Read()
     _worldPacket >> Item;
 }
 
-void AuctionStartCommoditiesPurchase::Read()
+void AuctionGetCommodityQuote::Read()
 {
     _worldPacket >> Auctioneer;
     _worldPacket >> ItemID;
@@ -534,7 +534,7 @@ WorldPacket const* AuctionCommandResult::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* AuctionCommodityQuote::Write()
+WorldPacket const* AuctionGetCommodityQuoteResult::Write()
 {
     _worldPacket.WriteBit(TotalPrice.is_initialized());
     _worldPacket.WriteBit(Quantity.is_initialized());
@@ -554,7 +554,7 @@ WorldPacket const* AuctionCommodityQuote::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* AuctionFavoriteItems::Write()
+WorldPacket const* AuctionFavoriteList::Write()
 {
     _worldPacket << uint32(DesiredDelay);
     _worldPacket.WriteBits(Items.size(), 7);
@@ -575,7 +575,7 @@ WorldPacket const* AuctionHelloResponse::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* AuctionListBidderItemsResult::Write()
+WorldPacket const* AuctionListBiddedItemsResult::Write()
 {
     _worldPacket << int32(Items.size());
     _worldPacket << uint32(DesiredDelay);
@@ -622,7 +622,7 @@ WorldPacket const* AuctionListItemsResult::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* AuctionListOwnerItemsResult::Write()
+WorldPacket const* AuctionListOwnedItemsResult::Write()
 {
     _worldPacket << int32(Items.size());
     _worldPacket << int32(SoldItems.size());
diff --git a/src/server/game/Server/Packets/AuctionHousePackets.h b/src/server/game/Server/Packets/AuctionHousePackets.h
index c117319f79e..15016ecd2e8 100644
--- a/src/server/game/Server/Packets/AuctionHousePackets.h
+++ b/src/server/game/Server/Packets/AuctionHousePackets.h
@@ -193,10 +193,10 @@ namespace WorldPackets
             ObjectGuid Guid;
         };
 
-        class AuctionListBidderItems final : public ClientPacket
+        class AuctionListBiddedItems final : public ClientPacket
         {
         public:
-            AuctionListBidderItems(WorldPacket&& packet) : ClientPacket(CMSG_AUCTION_LIST_BIDDER_ITEMS, std::move(packet)) { }
+            AuctionListBiddedItems(WorldPacket&& packet) : ClientPacket(CMSG_AUCTION_LIST_BIDDED_ITEMS, std::move(packet)) { }
 
             void Read() override;
 
@@ -250,10 +250,10 @@ namespace WorldPackets
             Array<AuctionSortDef, 2> Sorts;
         };
 
-        class AuctionListOwnerItems final : public ClientPacket
+        class AuctionListOwnedItems final : public ClientPacket
         {
         public:
-            AuctionListOwnerItems(WorldPacket&& packet) : ClientPacket(CMSG_AUCTION_LIST_OWNER_ITEMS, std::move(packet)) { }
+            AuctionListOwnedItems(WorldPacket&& packet) : ClientPacket(CMSG_AUCTION_LIST_OWNED_ITEMS, std::move(packet)) { }
 
             void Read() override;
 
@@ -343,10 +343,10 @@ namespace WorldPackets
             bool IsNotFavorite = true;
         };
 
-        class AuctionStartCommoditiesPurchase final : public ClientPacket
+        class AuctionGetCommodityQuote final : public ClientPacket
         {
         public:
-            AuctionStartCommoditiesPurchase(WorldPacket&& packet) : ClientPacket(CMSG_AUCTION_START_COMMODITIES_PURCHASE, std::move(packet)) { }
+            AuctionGetCommodityQuote(WorldPacket&& packet) : ClientPacket(CMSG_AUCTION_GET_COMMODITY_QUOTE, std::move(packet)) { }
 
             void Read() override;
 
@@ -385,10 +385,10 @@ namespace WorldPackets
             uint32 DesiredDelay  = 0;
         };
 
-        class AuctionCommodityQuote final : public ServerPacket
+        class AuctionGetCommodityQuoteResult final : public ServerPacket
         {
         public:
-            AuctionCommodityQuote() : ServerPacket(SMSG_AUCTION_COMMODITY_QUOTE, 1 + 8 + 4 + 4 + 4 + 4) { }
+            AuctionGetCommodityQuoteResult() : ServerPacket(SMSG_AUCTION_GET_COMMODITY_QUOTE_RESULT, 1 + 8 + 4 + 4 + 4 + 4) { }
 
             WorldPacket const* Write() override;
 
@@ -410,10 +410,10 @@ namespace WorldPackets
             bool OpenForBusiness = true;
         };
 
-        class AuctionListBidderItemsResult final : public ServerPacket
+        class AuctionListBiddedItemsResult final : public ServerPacket
         {
         public:
-            AuctionListBidderItemsResult() : ServerPacket(SMSG_AUCTION_LIST_BIDDER_ITEMS_RESULT, 149) { }
+            AuctionListBiddedItemsResult() : ServerPacket(SMSG_AUCTION_LIST_BIDDED_ITEMS_RESULT, 149) { }
 
             WorldPacket const* Write() override;
 
@@ -437,10 +437,10 @@ namespace WorldPackets
             bool HasMoreResults = false;
         };
 
-        class AuctionFavoriteItems final : public ServerPacket
+        class AuctionFavoriteList final : public ServerPacket
         {
         public:
-            AuctionFavoriteItems() : ServerPacket(SMSG_AUCTION_FAVORITE_ITEMS, 4 + 4 + 20 * 100) { }
+            AuctionFavoriteList() : ServerPacket(SMSG_AUCTION_FAVORITE_LIST, 4 + 4 + 20 * 100) { }
 
             WorldPacket const* Write() override;
 
@@ -464,10 +464,10 @@ namespace WorldPackets
             AuctionBucketKey BucketKey;
         };
 
-        class AuctionListOwnerItemsResult final : public ServerPacket
+        class AuctionListOwnedItemsResult final : public ServerPacket
         {
         public:
-            AuctionListOwnerItemsResult() : ServerPacket(SMSG_AUCTION_LIST_OWNER_ITEMS_RESULT, 149) { }
+            AuctionListOwnedItemsResult() : ServerPacket(SMSG_AUCTION_LIST_OWNED_ITEMS_RESULT, 149) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/AuthenticationPackets.cpp b/src/server/game/Server/Packets/AuthenticationPackets.cpp
index 5b2e9aa28f0..1215296a877 100644
--- a/src/server/game/Server/Packets/AuthenticationPackets.cpp
+++ b/src/server/game/Server/Packets/AuthenticationPackets.cpp
@@ -306,7 +306,7 @@ void WorldPackets::Auth::ConnectToFailed::Read()
 
 uint8 constexpr EnableEncryptionSeed[16] = { 0x90, 0x9C, 0xD0, 0x50, 0x5A, 0x2C, 0x14, 0xDD, 0x5C, 0x2C, 0xC0, 0x64, 0x14, 0xF3, 0xFE, 0xC9 };
 
-WorldPacket const* WorldPackets::Auth::EnableEncryption::Write()
+WorldPacket const* WorldPackets::Auth::EnterEncryptedMode::Write()
 {
     Trinity::Crypto::HMAC_SHA256 hash(EncryptionKey, 16);
     hash.UpdateData(reinterpret_cast<uint8 const*>(&Enabled), 1);
diff --git a/src/server/game/Server/Packets/AuthenticationPackets.h b/src/server/game/Server/Packets/AuthenticationPackets.h
index 9e8305627b7..75b61acda5a 100644
--- a/src/server/game/Server/Packets/AuthenticationPackets.h
+++ b/src/server/game/Server/Packets/AuthenticationPackets.h
@@ -279,10 +279,10 @@ namespace WorldPackets
             void Read() override;
         };
 
-        class EnableEncryption final : public ServerPacket
+        class EnterEncryptedMode final : public ServerPacket
         {
         public:
-            EnableEncryption(uint8 const* encryptionKey, bool enabled) : ServerPacket(SMSG_ENABLE_ENCRYPTION, 256 + 1),
+            EnterEncryptedMode(uint8 const* encryptionKey, bool enabled) : ServerPacket(SMSG_ENTER_ENCRYPTED_MODE, 256 + 1),
                 EncryptionKey(encryptionKey), Enabled(enabled)
             {
             }
diff --git a/src/server/game/Server/Packets/AzeritePackets.cpp b/src/server/game/Server/Packets/AzeritePackets.cpp
index d98d65666e1..3abb123463a 100644
--- a/src/server/game/Server/Packets/AzeritePackets.cpp
+++ b/src/server/game/Server/Packets/AzeritePackets.cpp
@@ -18,7 +18,7 @@
 #include "AzeritePackets.h"
 #include "Util.h"
 
-WorldPacket const* WorldPackets::Azerite::AzeriteXpGain::Write()
+WorldPacket const* WorldPackets::Azerite::PlayerAzeriteItemGains::Write()
 {
     _worldPacket << ItemGUID;
     _worldPacket << uint64(XP);
@@ -26,7 +26,7 @@ WorldPacket const* WorldPackets::Azerite::AzeriteXpGain::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Azerite::AzeriteEssenceForgeOpened::Write()
+WorldPacket const* WorldPackets::Azerite::OpenHeartForge::Write()
 {
     _worldPacket << ForgeGUID;
 
@@ -44,7 +44,7 @@ void WorldPackets::Azerite::AzeriteEssenceActivateEssence::Read()
     _worldPacket >> Slot;
 }
 
-WorldPacket const* WorldPackets::Azerite::AzeriteEssenceSelectionResult::Write()
+WorldPacket const* WorldPackets::Azerite::ActivateEssenceFailed::Write()
 {
     _worldPacket.WriteBits(AsUnderlyingType(Reason), 4);
     _worldPacket.WriteBit(Slot.is_initialized());
@@ -69,7 +69,7 @@ void WorldPackets::Azerite::AzeriteEmpoweredItemSelectPower::Read()
     _worldPacket >> Slot;
 }
 
-WorldPacket const* WorldPackets::Azerite::AzeriteEmpoweredItemEquippedStatusChanged::Write()
+WorldPacket const* WorldPackets::Azerite::PlayerAzeriteItemEquippedStatusChanged::Write()
 {
     _worldPacket.WriteBit(IsHeartEquipped);
     _worldPacket.FlushBits();
@@ -77,7 +77,7 @@ WorldPacket const* WorldPackets::Azerite::AzeriteEmpoweredItemEquippedStatusChan
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Azerite::AzeriteEmpoweredItemRespecOpen::Write()
+WorldPacket const* WorldPackets::Azerite::AzeriteRespecNPC::Write()
 {
     _worldPacket << NpcGUID;
 
diff --git a/src/server/game/Server/Packets/AzeritePackets.h b/src/server/game/Server/Packets/AzeritePackets.h
index 2ac054c9bd9..ea7eeff48fe 100644
--- a/src/server/game/Server/Packets/AzeritePackets.h
+++ b/src/server/game/Server/Packets/AzeritePackets.h
@@ -27,10 +27,10 @@ namespace WorldPackets
 {
     namespace Azerite
     {
-        class AzeriteXpGain final : public ServerPacket
+        class PlayerAzeriteItemGains final : public ServerPacket
         {
         public:
-            AzeriteXpGain() : ServerPacket(SMSG_AZERITE_XP_GAIN, 16 + 8) { }
+            PlayerAzeriteItemGains() : ServerPacket(SMSG_PLAYER_AZERITE_ITEM_GAINS, 16 + 8) { }
 
             WorldPacket const* Write() override;
 
@@ -38,20 +38,20 @@ namespace WorldPackets
             uint64 XP = 0;
         };
 
-        class AzeriteEssenceForgeOpened final : public ServerPacket
+        class OpenHeartForge final : public ServerPacket
         {
         public:
-            AzeriteEssenceForgeOpened() : ServerPacket(SMSG_AZERITE_ESSENCE_FORGE_OPENED, 16) { }
+            OpenHeartForge() : ServerPacket(SMSG_OPEN_HEART_FORGE, 16) { }
 
             WorldPacket const* Write() override;
 
             ObjectGuid ForgeGUID;
         };
 
-        class AzeriteEssenceForgeClose final : public ServerPacket
+        class CloseHeartForge final : public ServerPacket
         {
         public:
-            AzeriteEssenceForgeClose() : ServerPacket(SMSG_AZERITE_ESSENCE_FORGE_CLOSE, 0) { }
+            CloseHeartForge() : ServerPacket(SMSG_CLOSE_HEART_FORGE, 0) { }
 
             WorldPacket const* Write() override { return &_worldPacket; }
         };
@@ -77,10 +77,10 @@ namespace WorldPackets
             uint8 Slot = 0;
         };
 
-        class AzeriteEssenceSelectionResult final : public ServerPacket
+        class ActivateEssenceFailed final : public ServerPacket
         {
         public:
-            AzeriteEssenceSelectionResult() : ServerPacket(SMSG_AZERITE_ESSENCE_SELECTION_RESULT, 0) { }
+            ActivateEssenceFailed() : ServerPacket(SMSG_ACTIVATE_ESSENCE_FAILED, 1 + 4 + 4 + 1) { }
 
             WorldPacket const* Write() override;
 
@@ -113,20 +113,20 @@ namespace WorldPackets
             uint8 Slot = 0;
         };
 
-        class TC_GAME_API AzeriteEmpoweredItemEquippedStatusChanged final : public ServerPacket
+        class TC_GAME_API PlayerAzeriteItemEquippedStatusChanged final : public ServerPacket
         {
         public:
-            AzeriteEmpoweredItemEquippedStatusChanged() : ServerPacket(SMSG_AZERITE_EMPOWERED_ITEM_EQUIPPED_STATUS_CHANGED, 1) { }
+            PlayerAzeriteItemEquippedStatusChanged() : ServerPacket(SMSG_PLAYER_AZERITE_ITEM_EQUIPPED_STATUS_CHANGED, 1) { }
 
             WorldPacket const* Write() override;
 
             bool IsHeartEquipped = false;
         };
 
-        class AzeriteEmpoweredItemRespecOpen final : public ServerPacket
+        class AzeriteRespecNPC final : public ServerPacket
         {
         public:
-            AzeriteEmpoweredItemRespecOpen(ObjectGuid npcGuid) : ServerPacket(SMSG_AZERITE_EMPOWERED_ITEM_RESPEC_OPEN, 1), NpcGUID(npcGuid) { }
+            AzeriteRespecNPC(ObjectGuid npcGuid) : ServerPacket(SMSG_AZERITE_RESPEC_NPC, 1), NpcGUID(npcGuid) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/BattlegroundPackets.cpp b/src/server/game/Server/Packets/BattlegroundPackets.cpp
index c4d1c5de07e..bc925b0ae93 100644
--- a/src/server/game/Server/Packets/BattlegroundPackets.cpp
+++ b/src/server/game/Server/Packets/BattlegroundPackets.cpp
@@ -17,7 +17,7 @@
 
 #include "BattlegroundPackets.h"
 
-WorldPacket const* WorldPackets::Battleground::PVPSeason::Write()
+WorldPacket const* WorldPackets::Battleground::SeasonInfo::Write()
 {
     _worldPacket << int32(MythicPlusSeasonID);
     _worldPacket << int32(CurrentSeason);
@@ -45,7 +45,7 @@ WorldPacket const* WorldPackets::Battleground::AreaSpiritHealerTime::Write()
     return &_worldPacket;
 }
 
-ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData::RatingData const& ratingData)
+ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPMatchStatistics::RatingData const& ratingData)
 {
     for (std::size_t i = 0; i < 2; ++i)
     {
@@ -56,7 +56,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData:
     return data;
 }
 
-ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData::HonorData const& honorData)
+ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPMatchStatistics::HonorData const& honorData)
 {
     data << uint32(honorData.HonorKills);
     data << uint32(honorData.Deaths);
@@ -64,14 +64,14 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData:
     return data;
 }
 
-ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData::PVPMatchPlayerPVPStat const& pvpStat)
+ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerPVPStat const& pvpStat)
 {
     data << int32(pvpStat.PvpStatID);
     data << int32(pvpStat.PvpStatValue);
     return data;
 }
 
-ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics const& playerData)
+ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics const& playerData)
 {
     data << playerData.PlayerGUID;
     data << uint32(playerData.Kills);
@@ -84,7 +84,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData:
     data << int32(playerData.Class);
     data << int32(playerData.CreatureID);
     data << int32(playerData.HonorLevel);
-    for (WorldPackets::Battleground::PVPLogData::PVPMatchPlayerPVPStat const& pvpStat : playerData.Stats)
+    for (WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerPVPStat const& pvpStat : playerData.Stats)
         data << pvpStat;
 
     data.WriteBit(playerData.Faction != 0);
@@ -114,7 +114,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData:
     return data;
 }
 
-ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData const& pvpLogData)
+ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPMatchStatistics const& pvpLogData)
 {
     data.WriteBit(pvpLogData.Ratings.is_initialized());
     data << uint32(pvpLogData.Statistics.size());
@@ -123,15 +123,15 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData
     if (pvpLogData.Ratings.is_initialized())
         data << *pvpLogData.Ratings;
 
-    for (WorldPackets::Battleground::PVPLogData::PVPMatchPlayerStatistics const& player : pvpLogData.Statistics)
+    for (WorldPackets::Battleground::PVPMatchStatistics::PVPMatchPlayerStatistics const& player : pvpLogData.Statistics)
         data << player;
 
     return data;
 }
 
-WorldPacket const* WorldPackets::Battleground::PVPLogDataMessage::Write()
+WorldPacket const* WorldPackets::Battleground::PVPMatchStatisticsMessage::Write()
 {
-    _worldPacket.reserve(Data.Statistics.size() * sizeof(PVPLogData::PVPMatchPlayerStatistics) + sizeof(PVPLogData));
+    _worldPacket.reserve(Data.Statistics.size() * sizeof(PVPMatchStatistics::PVPMatchPlayerStatistics) + sizeof(PVPMatchStatistics));
 
     _worldPacket << Data;
 
@@ -307,7 +307,7 @@ WorldPacket const* WorldPackets::Battleground::DestroyArenaUnit::Write()
     return &_worldPacket;
 }
 
-ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::RatedBattlefieldInfo::BracketInfo const& bracketInfo)
+ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::RatedPvpInfo::BracketInfo const& bracketInfo)
 {
     data << int32(bracketInfo.PersonalRating);
     data << int32(bracketInfo.Ranking);
@@ -328,7 +328,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::RatedBattle
     return data;
 }
 
-WorldPacket const* WorldPackets::Battleground::RatedBattlefieldInfo::Write()
+WorldPacket const* WorldPackets::Battleground::RatedPvpInfo::Write()
 {
     for (BracketInfo const& bracket : Bracket)
         _worldPacket << bracket;
@@ -336,7 +336,7 @@ WorldPacket const* WorldPackets::Battleground::RatedBattlefieldInfo::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Battleground::PVPMatchInit::Write()
+WorldPacket const* WorldPackets::Battleground::PVPMatchInitialize::Write()
 {
     _worldPacket << uint32(MapID);
     _worldPacket << uint8(State);
@@ -351,7 +351,7 @@ WorldPacket const* WorldPackets::Battleground::PVPMatchInit::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Battleground::PVPMatchEnd::Write()
+WorldPacket const* WorldPackets::Battleground::PVPMatchComplete::Write()
 {
     _worldPacket << uint8(Winner);
     _worldPacket << int32(Duration);
diff --git a/src/server/game/Server/Packets/BattlegroundPackets.h b/src/server/game/Server/Packets/BattlegroundPackets.h
index 470c22b87af..dfb19be4108 100644
--- a/src/server/game/Server/Packets/BattlegroundPackets.h
+++ b/src/server/game/Server/Packets/BattlegroundPackets.h
@@ -30,10 +30,10 @@ namespace WorldPackets
 {
     namespace Battleground
     {
-        class PVPSeason final : public ServerPacket
+        class SeasonInfo final : public ServerPacket
         {
         public:
-            PVPSeason() : ServerPacket(SMSG_PVP_SEASON, 4 + 4 + 4 + 4) { }
+            SeasonInfo() : ServerPacket(SMSG_SEASON_INFO, 4 + 4 + 4 + 4) { }
 
             WorldPacket const* Write() override;
 
@@ -90,7 +90,7 @@ namespace WorldPackets
             void Read() override { }
         };
 
-        struct PVPLogData
+        struct PVPMatchStatistics
         {
             struct RatingData
             {
@@ -142,14 +142,14 @@ namespace WorldPackets
             std::array<int8, 2> PlayerCount = { };
         };
 
-        class PVPLogDataMessage final : public ServerPacket
+        class PVPMatchStatisticsMessage final : public ServerPacket
         {
         public:
-            PVPLogDataMessage() : ServerPacket(SMSG_PVP_LOG_DATA, 0) { }
+            PVPMatchStatisticsMessage() : ServerPacket(SMSG_PVP_MATCH_STATISTICS, 0) { }
 
             WorldPacket const* Write() override;
 
-            PVPLogData Data;
+            PVPMatchStatistics Data;
         };
 
         struct BattlefieldStatusHeader
@@ -424,10 +424,10 @@ namespace WorldPackets
             void Read() override { }
         };
 
-        class RatedBattlefieldInfo final : public ServerPacket
+        class RatedPvpInfo final : public ServerPacket
         {
         public:
-            RatedBattlefieldInfo() : ServerPacket(SMSG_RATED_BATTLEFIELD_INFO, 6 * sizeof(BracketInfo)) { }
+            RatedPvpInfo() : ServerPacket(SMSG_RATED_PVP_INFO, 6 * sizeof(BracketInfo)) { }
 
             WorldPacket const* Write() override;
 
@@ -450,10 +450,10 @@ namespace WorldPackets
             } Bracket[6];
         };
 
-        class PVPMatchInit final : public ServerPacket
+        class PVPMatchInitialize final : public ServerPacket
         {
         public:
-            PVPMatchInit() : ServerPacket(SMSG_PVP_MATCH_INIT, 4 + 1 + 4 + 4 + 1 + 4 + 1) { }
+            PVPMatchInitialize() : ServerPacket(SMSG_PVP_MATCH_INITIALIZE, 4 + 1 + 4 + 4 + 1 + 4 + 1) { }
 
             WorldPacket const* Write() override;
 
@@ -474,16 +474,16 @@ namespace WorldPackets
             bool AffectsRating = false;
         };
 
-        class PVPMatchEnd final : public ServerPacket
+        class PVPMatchComplete final : public ServerPacket
         {
         public:
-            PVPMatchEnd() : ServerPacket(SMSG_PVP_MATCH_END) { }
+            PVPMatchComplete() : ServerPacket(SMSG_PVP_MATCH_COMPLETE) { }
 
             WorldPacket const* Write() override;
 
             uint8 Winner = 0;
             int32 Duration = 0;
-            Optional<PVPLogData> LogData;
+            Optional<PVPMatchStatistics> LogData;
         };
     }
 }
diff --git a/src/server/game/Server/Packets/BattlenetPackets.cpp b/src/server/game/Server/Packets/BattlenetPackets.cpp
index 1fa3044b199..f72ab913fd2 100644
--- a/src/server/game/Server/Packets/BattlenetPackets.cpp
+++ b/src/server/game/Server/Packets/BattlenetPackets.cpp
@@ -52,7 +52,7 @@ WorldPacket const* WorldPackets::Battlenet::Response::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Battlenet::SetSessionState::Write()
+WorldPacket const* WorldPackets::Battlenet::ConnectionStatus::Write()
 {
     _worldPacket.WriteBits(State, 2);
     _worldPacket.WriteBit(SuppressNotification);
@@ -61,7 +61,7 @@ WorldPacket const* WorldPackets::Battlenet::SetSessionState::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Battlenet::RealmListTicket::Write()
+WorldPacket const* WorldPackets::Battlenet::ChangeRealmTicketResponse::Write()
 {
     _worldPacket << uint32(Token);
     _worldPacket.WriteBit(Allow);
@@ -83,7 +83,7 @@ void WorldPackets::Battlenet::Request::Read()
     Data.WriteCompleted(protoSize);
 }
 
-void WorldPackets::Battlenet::RequestRealmListTicket::Read()
+void WorldPackets::Battlenet::ChangeRealmTicket::Read()
 {
     _worldPacket >> Token;
     _worldPacket.read(Secret.data(), Secret.size());
diff --git a/src/server/game/Server/Packets/BattlenetPackets.h b/src/server/game/Server/Packets/BattlenetPackets.h
index 332bf1f8522..d12490f73ed 100644
--- a/src/server/game/Server/Packets/BattlenetPackets.h
+++ b/src/server/game/Server/Packets/BattlenetPackets.h
@@ -60,10 +60,10 @@ namespace WorldPackets
             ByteBuffer Data;
         };
 
-        class SetSessionState final : public ServerPacket
+        class ConnectionStatus final : public ServerPacket
         {
         public:
-            SetSessionState() : ServerPacket(SMSG_BATTLENET_SET_SESSION_STATE, 1) { }
+            ConnectionStatus() : ServerPacket(SMSG_BATTLE_NET_CONNECTION_STATUS, 1) { }
 
             WorldPacket const* Write() override;
 
@@ -71,10 +71,10 @@ namespace WorldPackets
             bool SuppressNotification = true;
         };
 
-        class RealmListTicket final : public ServerPacket
+        class ChangeRealmTicketResponse final : public ServerPacket
         {
         public:
-            RealmListTicket() : ServerPacket(SMSG_BATTLENET_REALM_LIST_TICKET) { }
+            ChangeRealmTicketResponse() : ServerPacket(SMSG_CHANGE_REALM_TICKET_RESPONSE) { }
 
             WorldPacket const* Write() override;
 
@@ -94,10 +94,10 @@ namespace WorldPackets
             MessageBuffer Data;
         };
 
-        class RequestRealmListTicket final : public ClientPacket
+        class ChangeRealmTicket final : public ClientPacket
         {
         public:
-            RequestRealmListTicket(WorldPacket&& packet) : ClientPacket(CMSG_BATTLENET_REQUEST_REALM_LIST_TICKET, std::move(packet)) { }
+            ChangeRealmTicket(WorldPacket&& packet) : ClientPacket(CMSG_CHANGE_REALM_TICKET, std::move(packet)) { }
 
             void Read() override;
 
diff --git a/src/server/game/Server/Packets/CalendarPackets.cpp b/src/server/game/Server/Packets/CalendarPackets.cpp
index 35434354f4c..edf98f89652 100644
--- a/src/server/game/Server/Packets/CalendarPackets.cpp
+++ b/src/server/game/Server/Packets/CalendarPackets.cpp
@@ -242,7 +242,7 @@ void WorldPackets::Calendar::CalendarEventModeratorStatus::Read()
     _worldPacket >> Status;
 }
 
-WorldPacket const* WorldPackets::Calendar::SCalendarEventInvite::Write()
+WorldPacket const* WorldPackets::Calendar::CalendarInviteAdded::Write()
 {
     _worldPacket << InviteGuid;
     _worldPacket << uint64(EventID);
@@ -302,7 +302,7 @@ WorldPacket const* WorldPackets::Calendar::CalendarSendEvent::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Calendar::CalendarEventInviteAlert::Write()
+WorldPacket const* WorldPackets::Calendar::CalendarInviteAlert::Write()
 {
     _worldPacket << uint64(EventID);
     _worldPacket.AppendPackedTime(Date);
@@ -325,7 +325,7 @@ WorldPacket const* WorldPackets::Calendar::CalendarEventInviteAlert::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Calendar::CalendarEventInviteStatus::Write()
+WorldPacket const* WorldPackets::Calendar::CalendarInviteStatus::Write()
 {
     _worldPacket << InviteGuid;
     _worldPacket << uint64(EventID);
@@ -340,7 +340,7 @@ WorldPacket const* WorldPackets::Calendar::CalendarEventInviteStatus::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Calendar::CalendarEventInviteRemoved::Write()
+WorldPacket const* WorldPackets::Calendar::CalendarInviteRemoved::Write()
 {
     _worldPacket << InviteGuid;
     _worldPacket << uint64(EventID);
@@ -352,7 +352,7 @@ WorldPacket const* WorldPackets::Calendar::CalendarEventInviteRemoved::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Calendar::CalendarEventInviteModeratorStatus::Write()
+WorldPacket const* WorldPackets::Calendar::CalendarInviteModeratorStatus::Write()
 {
     _worldPacket << InviteGuid;
     _worldPacket << uint64(EventID);
@@ -364,7 +364,7 @@ WorldPacket const* WorldPackets::Calendar::CalendarEventInviteModeratorStatus::W
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Calendar::CalendarEventInviteRemovedAlert::Write()
+WorldPacket const* WorldPackets::Calendar::CalendarInviteRemovedAlert::Write()
 {
     _worldPacket << uint64(EventID);
     _worldPacket.AppendPackedTime(Date);
@@ -457,7 +457,7 @@ WorldPacket const* WorldPackets::Calendar::CalendarRaidLockoutUpdated::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Calendar::CalendarEventInitialInvites::Write()
+WorldPacket const* WorldPackets::Calendar::CalendarCommunityInvite::Write()
 {
     _worldPacket << uint32(Invites.size());
     for (auto const& invite : Invites)
@@ -469,7 +469,7 @@ WorldPacket const* WorldPackets::Calendar::CalendarEventInitialInvites::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Calendar::CalendarEventInviteStatusAlert::Write()
+WorldPacket const* WorldPackets::Calendar::CalendarInviteStatusAlert::Write()
 {
     _worldPacket << uint64(EventID);
     _worldPacket.AppendPackedTime(Date);
@@ -479,7 +479,7 @@ WorldPacket const* WorldPackets::Calendar::CalendarEventInviteStatusAlert::Write
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Calendar::CalendarEventInviteNotesAlert::Write()
+WorldPacket const* WorldPackets::Calendar::CalendarInviteNotesAlert::Write()
 {
     _worldPacket << uint64(EventID);
 
@@ -490,7 +490,7 @@ WorldPacket const* WorldPackets::Calendar::CalendarEventInviteNotesAlert::Write(
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Calendar::CalendarEventInviteNotes::Write()
+WorldPacket const* WorldPackets::Calendar::CalendarInviteNotes::Write()
 {
     _worldPacket << InviteGuid;
     _worldPacket << uint64(EventID);
diff --git a/src/server/game/Server/Packets/CalendarPackets.h b/src/server/game/Server/Packets/CalendarPackets.h
index 6b1686e9cd7..25a21dce6d0 100644
--- a/src/server/game/Server/Packets/CalendarPackets.h
+++ b/src/server/game/Server/Packets/CalendarPackets.h
@@ -142,10 +142,10 @@ namespace WorldPackets
             time_t Date = time_t(0);
         };
 
-        class SCalendarEventInvite final : public ServerPacket
+        class CalendarInviteAdded final : public ServerPacket
         {
         public:
-            SCalendarEventInvite() : ServerPacket(SMSG_CALENDAR_EVENT_INVITE, 43) { }
+            CalendarInviteAdded() : ServerPacket(SMSG_CALENDAR_INVITE_ADDED, 43) { }
 
             WorldPacket const* Write() override;
 
@@ -235,10 +235,10 @@ namespace WorldPackets
             std::vector<CalendarEventInviteInfo> Invites;
         };
 
-        class CalendarEventInviteAlert final : public ServerPacket
+        class CalendarInviteAlert final : public ServerPacket
         {
         public:
-            CalendarEventInviteAlert() : ServerPacket(SMSG_CALENDAR_EVENT_INVITE_ALERT, 80) { }
+            CalendarInviteAlert() : ServerPacket(SMSG_CALENDAR_INVITE_ALERT, 80) { }
 
             WorldPacket const* Write() override;
 
@@ -283,10 +283,10 @@ namespace WorldPackets
             uint8 Status = 0;
         };
 
-        class CalendarEventInviteStatus final : public ServerPacket
+        class CalendarInviteStatus final : public ServerPacket
         {
         public:
-            CalendarEventInviteStatus() : ServerPacket(SMSG_CALENDAR_EVENT_INVITE_STATUS, 41) { }
+            CalendarInviteStatus() : ServerPacket(SMSG_CALENDAR_INVITE_STATUS, 41) { }
 
             WorldPacket const* Write() override;
 
@@ -299,10 +299,10 @@ namespace WorldPackets
             ObjectGuid InviteGuid;
         };
 
-        class CalendarEventInviteRemoved final : public ServerPacket
+        class CalendarInviteRemoved final : public ServerPacket
         {
         public:
-            CalendarEventInviteRemoved() : ServerPacket(SMSG_CALENDAR_EVENT_INVITE_REMOVED, 29) { }
+            CalendarInviteRemoved() : ServerPacket(SMSG_CALENDAR_INVITE_REMOVED, 29) { }
 
             WorldPacket const* Write() override;
 
@@ -312,10 +312,10 @@ namespace WorldPackets
             bool ClearPending = false;
         };
 
-        class CalendarEventInviteModeratorStatus final : public ServerPacket
+        class CalendarInviteModeratorStatus final : public ServerPacket
         {
         public:
-            CalendarEventInviteModeratorStatus() : ServerPacket(SMSG_CALENDAR_EVENT_INVITE_MODERATOR_STATUS, 26) { }
+            CalendarInviteModeratorStatus() : ServerPacket(SMSG_CALENDAR_INVITE_MODERATOR_STATUS, 26) { }
 
             WorldPacket const* Write() override;
 
@@ -325,10 +325,10 @@ namespace WorldPackets
             bool ClearPending = false;
         };
 
-        class CalendarEventInviteRemovedAlert final : public ServerPacket
+        class CalendarInviteRemovedAlert final : public ServerPacket
         {
         public:
-            CalendarEventInviteRemovedAlert() : ServerPacket(SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT, 17) { }
+            CalendarInviteRemovedAlert() : ServerPacket(SMSG_CALENDAR_INVITE_REMOVED_ALERT, 17) { }
 
             WorldPacket const* Write() override;
 
@@ -523,20 +523,20 @@ namespace WorldPackets
             uint8 Level = 100;
         };
 
-        class CalendarEventInitialInvites final : public ServerPacket
+        class CalendarCommunityInvite final : public ServerPacket
         {
         public:
-            CalendarEventInitialInvites() : ServerPacket(SMSG_CALENDAR_EVENT_INITIAL_INVITES, 17) { }
+            CalendarCommunityInvite() : ServerPacket(SMSG_CALENDAR_COMMUNITY_INVITE, 17) { }
 
             WorldPacket const* Write() override;
 
             std::vector<CalendarEventInitialInviteInfo> Invites;
         };
 
-        class CalendarEventInviteStatusAlert final : public ServerPacket
+        class CalendarInviteStatusAlert final : public ServerPacket
         {
         public:
-            CalendarEventInviteStatusAlert() : ServerPacket(SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT, 5) { }
+            CalendarInviteStatusAlert() : ServerPacket(SMSG_CALENDAR_INVITE_STATUS_ALERT, 5) { }
 
             WorldPacket const* Write() override;
 
@@ -546,11 +546,11 @@ namespace WorldPackets
             uint8 Status = 0;
         };
 
-        class CalendarEventInviteNotesAlert final : public ServerPacket
+        class CalendarInviteNotesAlert final : public ServerPacket
         {
         public:
-            CalendarEventInviteNotesAlert() : ServerPacket(SMSG_CALENDAR_EVENT_INVITE_NOTES_ALERT, 9) { }
-            CalendarEventInviteNotesAlert(uint64 eventID, std::string const& notes) : ServerPacket(SMSG_CALENDAR_EVENT_INVITE_NOTES_ALERT, 8 + notes.size()), EventID(eventID), Notes(notes) { }
+            CalendarInviteNotesAlert() : ServerPacket(SMSG_CALENDAR_INVITE_NOTES_ALERT, 9) { }
+            CalendarInviteNotesAlert(uint64 eventID, std::string const& notes) : ServerPacket(SMSG_CALENDAR_INVITE_NOTES_ALERT, 8 + notes.size()), EventID(eventID), Notes(notes) { }
 
             WorldPacket const* Write() override;
 
@@ -558,10 +558,10 @@ namespace WorldPackets
             std::string Notes;
         };
 
-        class CalendarEventInviteNotes final : public ServerPacket
+        class CalendarInviteNotes final : public ServerPacket
         {
         public:
-            CalendarEventInviteNotes() : ServerPacket(SMSG_CALENDAR_EVENT_INVITE_NOTES, 26) { }
+            CalendarInviteNotes() : ServerPacket(SMSG_CALENDAR_INVITE_NOTES, 26) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/CharacterPackets.cpp b/src/server/game/Server/Packets/CharacterPackets.cpp
index a9aaf3d5e06..42d3893ff12 100644
--- a/src/server/game/Server/Packets/CharacterPackets.cpp
+++ b/src/server/game/Server/Packets/CharacterPackets.cpp
@@ -550,8 +550,8 @@ WorldPacket const* WorldPackets::Character::SetFactionVisible::Write()
     return &_worldPacket;
 }
 
-WorldPackets::Character::CharCustomizeResponse::CharCustomizeResponse(WorldPackets::Character::CharCustomizeInfo const* info)
-    : ServerPacket(SMSG_CHAR_CUSTOMIZE, 16 + 1 + 1 + 1 + 1 + 1 + 1 + 1)
+WorldPackets::Character::CharCustomizeSuccess::CharCustomizeSuccess(WorldPackets::Character::CharCustomizeInfo const* info)
+    : ServerPacket(SMSG_CHAR_CUSTOMIZE_SUCCESS, 16 + 1 + 1 + 1 + 1 + 1 + 1 + 1)
 {
     CharGUID = info->CharGUID;
     SexID = info->SexID;
@@ -564,7 +564,7 @@ WorldPackets::Character::CharCustomizeResponse::CharCustomizeResponse(WorldPacke
     CustomDisplay = info->CustomDisplay;
 }
 
-WorldPacket const* WorldPackets::Character::CharCustomizeResponse::Write()
+WorldPacket const* WorldPackets::Character::CharCustomizeSuccess::Write()
 {
     _worldPacket << CharGUID;
     _worldPacket << uint8(SexID);
@@ -581,7 +581,7 @@ WorldPacket const* WorldPackets::Character::CharCustomizeResponse::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Character::CharCustomizeFailed::Write()
+WorldPacket const* WorldPackets::Character::CharCustomizeFailure::Write()
 {
     _worldPacket << uint8(Result);
     _worldPacket << CharGUID;
diff --git a/src/server/game/Server/Packets/CharacterPackets.h b/src/server/game/Server/Packets/CharacterPackets.h
index c28e6e728e0..5880cb43119 100644
--- a/src/server/game/Server/Packets/CharacterPackets.h
+++ b/src/server/game/Server/Packets/CharacterPackets.h
@@ -707,11 +707,11 @@ namespace WorldPackets
             uint32 FactionIndex = 0;
         };
 
-        class CharCustomizeResponse final : public ServerPacket
+        class CharCustomizeSuccess final : public ServerPacket
         {
         public:
-            CharCustomizeResponse() : ServerPacket(SMSG_CHAR_CUSTOMIZE, 16 + 1 + 1 + 1 + 1 + 1 + 1 + 1) { }
-            CharCustomizeResponse(CharCustomizeInfo const* customizeInfo);
+            CharCustomizeSuccess() : ServerPacket(SMSG_CHAR_CUSTOMIZE_SUCCESS, 16 + 1 + 1 + 1 + 1 + 1 + 1 + 1) { }
+            CharCustomizeSuccess(CharCustomizeInfo const* customizeInfo);
 
             WorldPacket const* Write() override;
 
@@ -726,10 +726,10 @@ namespace WorldPackets
             std::array<uint8, PLAYER_CUSTOM_DISPLAY_SIZE> CustomDisplay = { };
         };
 
-        class CharCustomizeFailed final : public ServerPacket
+        class CharCustomizeFailure final : public ServerPacket
         {
         public:
-            CharCustomizeFailed() : ServerPacket(SMSG_CHAR_CUSTOMIZE_FAILED, 1 + 16) { }
+            CharCustomizeFailure() : ServerPacket(SMSG_CHAR_CUSTOMIZE_FAILURE, 1 + 16) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/GameObjectPackets.cpp b/src/server/game/Server/Packets/GameObjectPackets.cpp
index a0cc95dcf68..1eb8ae52ccb 100644
--- a/src/server/game/Server/Packets/GameObjectPackets.cpp
+++ b/src/server/game/Server/Packets/GameObjectPackets.cpp
@@ -70,7 +70,7 @@ WorldPacket const* WorldPackets::GameObject::GameObjectCustomAnim::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::GameObject::GameObjectUIAction::Write()
+WorldPacket const* WorldPackets::GameObject::GameObjectUILink::Write()
 {
     _worldPacket << ObjectGUID;
     _worldPacket << int32(UILink);
diff --git a/src/server/game/Server/Packets/GameObjectPackets.h b/src/server/game/Server/Packets/GameObjectPackets.h
index f0c06328c21..3a96b3bcb70 100644
--- a/src/server/game/Server/Packets/GameObjectPackets.h
+++ b/src/server/game/Server/Packets/GameObjectPackets.h
@@ -121,10 +121,10 @@ namespace WorldPackets
             bool PlayAsDespawn = false;
         };
 
-        class GameObjectUIAction final : public ServerPacket
+        class GameObjectUILink final : public ServerPacket
         {
         public:
-            GameObjectUIAction() : ServerPacket(SMSG_GAME_OBJECT_UI_ACTION, 16 + 4) { }
+            GameObjectUILink() : ServerPacket(SMSG_GAME_OBJECT_UI_LINK, 16 + 4) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/HotfixPackets.cpp b/src/server/game/Server/Packets/HotfixPackets.cpp
index eac6bb07bc0..175dee3d600 100644
--- a/src/server/game/Server/Packets/HotfixPackets.cpp
+++ b/src/server/game/Server/Packets/HotfixPackets.cpp
@@ -85,7 +85,7 @@ void HotfixRequest::Read()
         _worldPacket >> hotfixRecord;
 }
 
-ByteBuffer& operator<<(ByteBuffer& data, HotfixResponse::HotfixData const& hotfixData)
+ByteBuffer& operator<<(ByteBuffer& data, HotfixConnect::HotfixData const& hotfixData)
 {
     data << hotfixData.Record;
     if (hotfixData.Size)
@@ -103,7 +103,7 @@ ByteBuffer& operator<<(ByteBuffer& data, HotfixResponse::HotfixData const& hotfi
     return data;
 }
 
-WorldPacket const* HotfixResponse::Write()
+WorldPacket const* HotfixConnect::Write()
 {
     _worldPacket << uint32(Hotfixes.size());
     for (HotfixData const& hotfix : Hotfixes)
diff --git a/src/server/game/Server/Packets/HotfixPackets.h b/src/server/game/Server/Packets/HotfixPackets.h
index 27275cc5db6..e4e0e2b193f 100644
--- a/src/server/game/Server/Packets/HotfixPackets.h
+++ b/src/server/game/Server/Packets/HotfixPackets.h
@@ -83,7 +83,7 @@ namespace WorldPackets
             std::vector<DB2Manager::HotfixRecord> Hotfixes;
         };
 
-        class HotfixResponse final : public ServerPacket
+        class HotfixConnect final : public ServerPacket
         {
         public:
             struct HotfixData
@@ -92,7 +92,7 @@ namespace WorldPackets
                 Optional<uint32> Size;
             };
 
-            HotfixResponse() : ServerPacket(SMSG_HOTFIX_RESPONSE) { }
+            HotfixConnect() : ServerPacket(SMSG_HOTFIX_CONNECT) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/InstancePackets.cpp b/src/server/game/Server/Packets/InstancePackets.cpp
index 29428e61496..fbbaa61919e 100644
--- a/src/server/game/Server/Packets/InstancePackets.cpp
+++ b/src/server/game/Server/Packets/InstancePackets.cpp
@@ -160,7 +160,7 @@ WorldPacket const* WorldPackets::Instance::InstanceEncounterGainCombatResurrecti
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Instance::BossKillCredit::Write()
+WorldPacket const* WorldPackets::Instance::BossKill::Write()
 {
     _worldPacket << uint32(DungeonEncounterID);
 
diff --git a/src/server/game/Server/Packets/InstancePackets.h b/src/server/game/Server/Packets/InstancePackets.h
index 0381396a51c..96f4780950a 100644
--- a/src/server/game/Server/Packets/InstancePackets.h
+++ b/src/server/game/Server/Packets/InstancePackets.h
@@ -237,10 +237,10 @@ namespace WorldPackets
             uint32 CombatResChargeRecovery = 0;
         };
 
-        class BossKillCredit final : public ServerPacket
+        class BossKill final : public ServerPacket
         {
         public:
-            BossKillCredit() : ServerPacket(SMSG_BOSS_KILL_CREDIT, 4) { }
+            BossKill() : ServerPacket(SMSG_BOSS_KILL, 4) { }
 
             WorldPacket const* Write() override;
             uint32 DungeonEncounterID = 0;
diff --git a/src/server/game/Server/Packets/ItemPackets.cpp b/src/server/game/Server/Packets/ItemPackets.cpp
index db8b6838fde..1952ed9242e 100644
--- a/src/server/game/Server/Packets/ItemPackets.cpp
+++ b/src/server/game/Server/Packets/ItemPackets.cpp
@@ -347,7 +347,7 @@ void WorldPackets::Item::SocketGems::Read()
         _worldPacket >> gemGuid;
 }
 
-WorldPacket const* WorldPackets::Item::SocketGemsResult::Write()
+WorldPacket const* WorldPackets::Item::SocketGemsSuccess::Write()
 {
     _worldPacket << Item;
 
diff --git a/src/server/game/Server/Packets/ItemPackets.h b/src/server/game/Server/Packets/ItemPackets.h
index 24dff10878c..60c291c77a0 100644
--- a/src/server/game/Server/Packets/ItemPackets.h
+++ b/src/server/game/Server/Packets/ItemPackets.h
@@ -473,10 +473,10 @@ namespace WorldPackets
             std::array<ObjectGuid, MAX_ITEM_PROTO_SOCKETS> GemItem = { };
         };
 
-        class SocketGemsResult final : public ServerPacket
+        class SocketGemsSuccess final : public ServerPacket
         {
         public:
-            SocketGemsResult() : ServerPacket(SMSG_SOCKET_GEMS, 16 + 4 * 3 + 4) { }
+            SocketGemsSuccess() : ServerPacket(SMSG_SOCKET_GEMS_SUCCESS, 16 + 4 * 3 + 4) { }
 
             WorldPacket const* Write() override;
 
@@ -507,10 +507,10 @@ namespace WorldPackets
             void Read() override { }
         };
 
-        class SortBagsResult final : public ServerPacket
+        class BagCleanupFinished final : public ServerPacket
         {
         public:
-            SortBagsResult() : ServerPacket(SMSG_SORT_BAGS_RESULT, 0) { }
+            BagCleanupFinished() : ServerPacket(SMSG_BAG_CLEANUP_FINISHED, 0) { }
 
             WorldPacket const* Write() override { return &_worldPacket; }
         };
@@ -525,10 +525,10 @@ namespace WorldPackets
             ObjectGuid ItemGuid;
         };
 
-        class CharacterInventoryOverflowWarning final : public ServerPacket
+        class InventoryFullOverflow final : public ServerPacket
         {
         public:
-            CharacterInventoryOverflowWarning() : ServerPacket(SMSG_CHARACTER_INVENTORY_OVERFLOW_WARNING, 0) { }
+            InventoryFullOverflow() : ServerPacket(SMSG_INVENTORY_FULL_OVERFLOW, 0) { }
 
             WorldPacket const* Write() override { return &_worldPacket; }
         };
diff --git a/src/server/game/Server/Packets/MiscPackets.cpp b/src/server/game/Server/Packets/MiscPackets.cpp
index 159539efbfb..ba96fcd366f 100644
--- a/src/server/game/Server/Packets/MiscPackets.cpp
+++ b/src/server/game/Server/Packets/MiscPackets.cpp
@@ -132,7 +132,7 @@ void WorldPackets::Misc::TimeSyncResponse::Read()
     _worldPacket >> ClientTime;
 }
 
-WorldPacket const* WorldPackets::Misc::UITime::Write()
+WorldPacket const* WorldPackets::Misc::ServerTimeOffset::Write()
 {
     _worldPacket << Time;
 
diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h
index 08ae3be482c..cc91c0bf49e 100644
--- a/src/server/game/Server/Packets/MiscPackets.h
+++ b/src/server/game/Server/Packets/MiscPackets.h
@@ -205,18 +205,18 @@ namespace WorldPackets
             uint32 MovieID = 0;
         };
 
-        class UITimeRequest final : public ClientPacket
+        class ServerTimeOffsetRequest final : public ClientPacket
         {
         public:
-            UITimeRequest(WorldPacket&& packet) : ClientPacket(CMSG_UI_TIME_REQUEST, std::move(packet)) { }
+            ServerTimeOffsetRequest(WorldPacket&& packet) : ClientPacket(CMSG_SERVER_TIME_OFFSET_REQUEST, std::move(packet)) { }
 
             void Read() override { }
         };
 
-        class UITime final : public ServerPacket
+        class ServerTimeOffset final : public ServerPacket
         {
         public:
-            UITime() : ServerPacket(SMSG_UI_TIME, 4) { }
+            ServerTimeOffset() : ServerPacket(SMSG_SERVER_TIME_OFFSET, 4) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/PartyPackets.cpp b/src/server/game/Server/Packets/PartyPackets.cpp
index cee4cf17417..1c58bf9edc3 100644
--- a/src/server/game/Server/Packets/PartyPackets.cpp
+++ b/src/server/game/Server/Packets/PartyPackets.cpp
@@ -227,7 +227,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Party::PartyMemberStats c
     return data;
 }
 
-WorldPacket const* WorldPackets::Party::PartyMemberState::Write()
+WorldPacket const* WorldPackets::Party::PartyMemberFullState::Write()
 {
     _worldPacket.WriteBit(ForEnemy);
 
@@ -542,7 +542,7 @@ WorldPacket const* WorldPackets::Party::RaidMarkersChanged::Write()
     return &_worldPacket;
 }
 
-void WorldPackets::Party::PartyMemberState::Initialize(Player const* player)
+void WorldPackets::Party::PartyMemberFullState::Initialize(Player const* player)
 {
     ForEnemy = false;
 
diff --git a/src/server/game/Server/Packets/PartyPackets.h b/src/server/game/Server/Packets/PartyPackets.h
index 6189dde26de..3dde1e61399 100644
--- a/src/server/game/Server/Packets/PartyPackets.h
+++ b/src/server/game/Server/Packets/PartyPackets.h
@@ -206,10 +206,10 @@ namespace WorldPackets
             int8 PartyType[2];
         };
 
-        class PartyMemberState final : public ServerPacket
+        class PartyMemberFullState final : public ServerPacket
         {
         public:
-            PartyMemberState() : ServerPacket(SMSG_PARTY_MEMBER_STATE, 80) { }
+            PartyMemberFullState() : ServerPacket(SMSG_PARTY_MEMBER_FULL_STATE, 80) { }
 
             WorldPacket const* Write() override;
             void Initialize(Player const* player);
diff --git a/src/server/game/Server/Packets/QuestPackets.cpp b/src/server/game/Server/Packets/QuestPackets.cpp
index e6881ac5cbe..36bb9c3aa17 100644
--- a/src/server/game/Server/Packets/QuestPackets.cpp
+++ b/src/server/game/Server/Packets/QuestPackets.cpp
@@ -594,7 +594,7 @@ WorldPacket const* WorldPackets::Quest::DailyQuestsReset::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Quest::WorldQuestUpdate::Write()
+WorldPacket const* WorldPackets::Quest::WorldQuestUpdateResponse::Write()
 {
     _worldPacket << uint32(WorldQuestUpdates.size());
 
diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h
index 01c0cbc227c..096c77c28cc 100644
--- a/src/server/game/Server/Packets/QuestPackets.h
+++ b/src/server/game/Server/Packets/QuestPackets.h
@@ -635,10 +635,10 @@ namespace WorldPackets
             int32 Value;
         };
 
-        class WorldQuestUpdate final : public ServerPacket
+        class WorldQuestUpdateResponse final : public ServerPacket
         {
         public:
-            WorldQuestUpdate() : ServerPacket(SMSG_WORLD_QUEST_UPDATE, 100) { }
+            WorldQuestUpdateResponse() : ServerPacket(SMSG_WORLD_QUEST_UPDATE_RESPONSE, 100) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/ReferAFriendPackets.cpp b/src/server/game/Server/Packets/ReferAFriendPackets.cpp
index d3007e754fa..b9c0deea93d 100644
--- a/src/server/game/Server/Packets/ReferAFriendPackets.cpp
+++ b/src/server/game/Server/Packets/ReferAFriendPackets.cpp
@@ -17,7 +17,7 @@
 
 #include "ReferAFriendPackets.h"
 
-WorldPacket const* WorldPackets::RaF::ReferAFriendFailure::Write()
+WorldPacket const* WorldPackets::RaF::RecruitAFriendFailure::Write()
 {
     _worldPacket << int32(Reason);
     // Client uses this string only if Reason == ERR_REFER_A_FRIEND_NOT_IN_GROUP || Reason == ERR_REFER_A_FRIEND_SUMMON_OFFLINE_S
diff --git a/src/server/game/Server/Packets/ReferAFriendPackets.h b/src/server/game/Server/Packets/ReferAFriendPackets.h
index 8957babc114..ba72cb433be 100644
--- a/src/server/game/Server/Packets/ReferAFriendPackets.h
+++ b/src/server/game/Server/Packets/ReferAFriendPackets.h
@@ -24,10 +24,10 @@ namespace WorldPackets
 {
     namespace RaF
     {
-        class ReferAFriendFailure final : public ServerPacket
+        class RecruitAFriendFailure final : public ServerPacket
         {
         public:
-            ReferAFriendFailure() : ServerPacket(SMSG_REFER_A_FRIEND_FAILURE, 1 + 4) { }
+            RecruitAFriendFailure() : ServerPacket(SMSG_RECRUIT_A_FRIEND_FAILURE, 1 + 4) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/ScenarioPackets.cpp b/src/server/game/Server/Packets/ScenarioPackets.cpp
index c8b6002e604..cc40dca1135 100644
--- a/src/server/game/Server/Packets/ScenarioPackets.cpp
+++ b/src/server/game/Server/Packets/ScenarioPackets.cpp
@@ -79,7 +79,7 @@ WorldPacket const* WorldPackets::Scenario::ScenarioCompleted::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Scenario::ScenarioBoot::Write()
+WorldPacket const* WorldPackets::Scenario::ScenarioVacate::Write()
 {
     _worldPacket << int32(ScenarioID);
     _worldPacket << int32(Unk1);
diff --git a/src/server/game/Server/Packets/ScenarioPackets.h b/src/server/game/Server/Packets/ScenarioPackets.h
index 15522726252..1322b2922e3 100644
--- a/src/server/game/Server/Packets/ScenarioPackets.h
+++ b/src/server/game/Server/Packets/ScenarioPackets.h
@@ -82,10 +82,10 @@ namespace WorldPackets
             uint32 ScenarioID = 0;
         };
 
-        class ScenarioBoot final : public ServerPacket
+        class ScenarioVacate final : public ServerPacket
         {
         public:
-            ScenarioBoot() : ServerPacket(SMSG_SCENARIO_BOOT, 4 + 4 + 1) { }
+            ScenarioVacate() : ServerPacket(SMSG_SCENARIO_VACATE, 4 + 4 + 1) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/TalentPackets.cpp b/src/server/game/Server/Packets/TalentPackets.cpp
index 06809b51ea8..57aa6c6d430 100644
--- a/src/server/game/Server/Packets/TalentPackets.cpp
+++ b/src/server/game/Server/Packets/TalentPackets.cpp
@@ -74,7 +74,7 @@ void WorldPackets::Talent::ConfirmRespecWipe::Read()
     _worldPacket >> RespecType;
 }
 
-WorldPacket const* WorldPackets::Talent::LearnTalentsFailed::Write()
+WorldPacket const* WorldPackets::Talent::LearnTalentFailed::Write()
 {
     _worldPacket.WriteBits(Reason, 4);
     _worldPacket << int32(SpellID);
@@ -111,7 +111,7 @@ void WorldPackets::Talent::LearnPvpTalents::Read()
         _worldPacket >> Talents[i];
 }
 
-WorldPacket const* WorldPackets::Talent::LearnPvpTalentsFailed::Write()
+WorldPacket const* WorldPackets::Talent::LearnPvpTalentFailed::Write()
 {
     _worldPacket.WriteBits(Reason, 4);
     _worldPacket << int32(SpellID);
diff --git a/src/server/game/Server/Packets/TalentPackets.h b/src/server/game/Server/Packets/TalentPackets.h
index 950f2b2f478..702b26be149 100644
--- a/src/server/game/Server/Packets/TalentPackets.h
+++ b/src/server/game/Server/Packets/TalentPackets.h
@@ -89,10 +89,10 @@ namespace WorldPackets
             uint8 RespecType = 0;
         };
 
-        class LearnTalentsFailed final : public ServerPacket
+        class LearnTalentFailed final : public ServerPacket
         {
         public:
-            LearnTalentsFailed() : ServerPacket(SMSG_LEARN_TALENTS_FAILED, 1 + 4 + 4 + 2 * MAX_TALENT_TIERS) { }
+            LearnTalentFailed() : ServerPacket(SMSG_LEARN_TALENT_FAILED, 1 + 4 + 4 + 2 * MAX_TALENT_TIERS) { }
 
             WorldPacket const* Write() override;
 
@@ -130,10 +130,10 @@ namespace WorldPackets
             Array<PvPTalent, 4> Talents;
         };
 
-        class LearnPvpTalentsFailed final : public ServerPacket
+        class LearnPvpTalentFailed final : public ServerPacket
         {
         public:
-            LearnPvpTalentsFailed() : ServerPacket(SMSG_LEARN_PVP_TALENTS_FAILED, 1 + 4 + 4 + (2 + 1) * MAX_PVP_TALENT_SLOTS) { }
+            LearnPvpTalentFailed() : ServerPacket(SMSG_LEARN_PVP_TALENT_FAILED, 1 + 4 + 4 + (2 + 1) * MAX_PVP_TALENT_SLOTS) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/TokenPackets.cpp b/src/server/game/Server/Packets/TokenPackets.cpp
index 7a6fd823f81..7aec37cc1b4 100644
--- a/src/server/game/Server/Packets/TokenPackets.cpp
+++ b/src/server/game/Server/Packets/TokenPackets.cpp
@@ -17,12 +17,12 @@
 
 #include "TokenPackets.h"
 
-void WorldPackets::Token::UpdateListedAuctionableTokens::Read()
+void WorldPackets::Token::CommerceTokenGetLog::Read()
 {
     _worldPacket >> UnkInt;
 }
 
-WorldPacket const* WorldPackets::Token::UpdateListedAuctionableTokensResponse::Write()
+WorldPacket const* WorldPackets::Token::CommerceTokenGetLogResponse::Write()
 {
     _worldPacket << UnkInt;
     _worldPacket << Result;
@@ -39,12 +39,12 @@ WorldPacket const* WorldPackets::Token::UpdateListedAuctionableTokensResponse::W
     return &_worldPacket;
 }
 
-void WorldPackets::Token::RequestWowTokenMarketPrice::Read()
+void WorldPackets::Token::CommerceTokenGetMarketPrice::Read()
 {
     _worldPacket >> UnkInt;
 }
 
-WorldPacket const* WorldPackets::Token::WowTokenMarketPriceResponse::Write()
+WorldPacket const* WorldPackets::Token::CommerceTokenGetMarketPriceResponse::Write()
 {
     _worldPacket << CurrentMarketPrice;
     _worldPacket << UnkInt;
diff --git a/src/server/game/Server/Packets/TokenPackets.h b/src/server/game/Server/Packets/TokenPackets.h
index f435a97310f..262fbf435c5 100644
--- a/src/server/game/Server/Packets/TokenPackets.h
+++ b/src/server/game/Server/Packets/TokenPackets.h
@@ -24,20 +24,20 @@ namespace WorldPackets
 {
     namespace Token
     {
-        class UpdateListedAuctionableTokens final : public ClientPacket
+        class CommerceTokenGetLog final : public ClientPacket
         {
         public:
-            UpdateListedAuctionableTokens(WorldPacket&& packet) : ClientPacket(CMSG_UPDATE_WOW_TOKEN_AUCTIONABLE_LIST, std::move(packet)) { }
+            CommerceTokenGetLog(WorldPacket&& packet) : ClientPacket(CMSG_COMMERCE_TOKEN_GET_LOG, std::move(packet)) { }
 
             void Read() override;
 
             uint32 UnkInt   = 0;
         };
 
-        class UpdateListedAuctionableTokensResponse final : public ServerPacket
+        class CommerceTokenGetLogResponse final : public ServerPacket
         {
         public:
-            UpdateListedAuctionableTokensResponse() : ServerPacket(SMSG_WOW_TOKEN_UPDATE_AUCTIONABLE_LIST_RESPONSE, 12) { }
+            CommerceTokenGetLogResponse() : ServerPacket(SMSG_COMMERCE_TOKEN_GET_LOG_RESPONSE, 12) { }
 
             WorldPacket const* Write() override;
 
@@ -55,20 +55,20 @@ namespace WorldPackets
             std::vector<AuctionableTokenAuctionable> AuctionableTokenAuctionableList;
         };
 
-        class RequestWowTokenMarketPrice final : public ClientPacket
+        class CommerceTokenGetMarketPrice final : public ClientPacket
         {
         public:
-            RequestWowTokenMarketPrice(WorldPacket&& packet) : ClientPacket(CMSG_REQUEST_WOW_TOKEN_MARKET_PRICE, std::move(packet)) { }
+            CommerceTokenGetMarketPrice(WorldPacket&& packet) : ClientPacket(CMSG_COMMERCE_TOKEN_GET_MARKET_PRICE, std::move(packet)) { }
 
             void Read() override;
 
             uint32 UnkInt = 0;
         };
 
-        class WowTokenMarketPriceResponse final : public ServerPacket
+        class CommerceTokenGetMarketPriceResponse final : public ServerPacket
         {
         public:
-            WowTokenMarketPriceResponse() : ServerPacket(SMSG_WOW_TOKEN_MARKET_PRICE_RESPONSE, 20) { }
+            CommerceTokenGetMarketPriceResponse() : ServerPacket(SMSG_COMMERCE_TOKEN_GET_MARKET_PRICE_RESPONSE, 20) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/ToyPackets.cpp b/src/server/game/Server/Packets/ToyPackets.cpp
index a8b2c34dbb3..0b02338312a 100644
--- a/src/server/game/Server/Packets/ToyPackets.cpp
+++ b/src/server/game/Server/Packets/ToyPackets.cpp
@@ -27,7 +27,7 @@ void WorldPackets::Toy::UseToy::Read()
     _worldPacket >> Cast;
 }
 
-WorldPacket const* WorldPackets::Toy::AccountToysUpdate::Write()
+WorldPacket const* WorldPackets::Toy::AccountToyUpdate::Write()
 {
     _worldPacket.WriteBit(IsFullUpdate);
     _worldPacket.FlushBits();
diff --git a/src/server/game/Server/Packets/ToyPackets.h b/src/server/game/Server/Packets/ToyPackets.h
index ae7a183c41e..8d37934ab3a 100644
--- a/src/server/game/Server/Packets/ToyPackets.h
+++ b/src/server/game/Server/Packets/ToyPackets.h
@@ -45,10 +45,10 @@ namespace WorldPackets
             WorldPackets::Spells::SpellCastRequest Cast;
         };
 
-        class AccountToysUpdate final : public ServerPacket
+        class AccountToyUpdate final : public ServerPacket
         {
         public:
-            AccountToysUpdate() : ServerPacket(SMSG_ACCOUNT_TOYS_UPDATE, 1 + 4 + 1) { }
+            AccountToyUpdate() : ServerPacket(SMSG_ACCOUNT_TOY_UPDATE, 1 + 4 + 1) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/TransmogrificationPackets.cpp b/src/server/game/Server/Packets/TransmogrificationPackets.cpp
index 89c298420e2..a36dac184a6 100644
--- a/src/server/game/Server/Packets/TransmogrificationPackets.cpp
+++ b/src/server/game/Server/Packets/TransmogrificationPackets.cpp
@@ -36,7 +36,7 @@ void WorldPackets::Transmogrification::TransmogrifyItems::Read()
     CurrentSpecOnly = _worldPacket.ReadBit();
 }
 
-WorldPacket const* WorldPackets::Transmogrification::TransmogCollectionUpdate::Write()
+WorldPacket const* WorldPackets::Transmogrification::AccountTransmogUpdate::Write()
 {
     _worldPacket.WriteBit(IsFullUpdate);
     _worldPacket.WriteBit(IsSetFavorite);
@@ -51,7 +51,7 @@ WorldPacket const* WorldPackets::Transmogrification::TransmogCollectionUpdate::W
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::Transmogrification::OpenTransmogrifier::Write()
+WorldPacket const* WorldPackets::Transmogrification::TransmogrifyNPC::Write()
 {
     _worldPacket << Guid;
 
diff --git a/src/server/game/Server/Packets/TransmogrificationPackets.h b/src/server/game/Server/Packets/TransmogrificationPackets.h
index ddcfd86b8cf..09926a52e4f 100644
--- a/src/server/game/Server/Packets/TransmogrificationPackets.h
+++ b/src/server/game/Server/Packets/TransmogrificationPackets.h
@@ -50,10 +50,10 @@ namespace WorldPackets
             bool CurrentSpecOnly = false;
         };
 
-        class TransmogCollectionUpdate final : public ServerPacket
+        class AccountTransmogUpdate final : public ServerPacket
         {
         public:
-            TransmogCollectionUpdate() : ServerPacket(SMSG_TRANSMOG_COLLECTION_UPDATE) { }
+            AccountTransmogUpdate() : ServerPacket(SMSG_ACCOUNT_TRANSMOG_UPDATE) { }
 
             WorldPacket const* Write() override;
 
@@ -63,10 +63,10 @@ namespace WorldPackets
             std::vector<uint32> NewAppearances;
         };
 
-        class OpenTransmogrifier final : public ServerPacket
+        class TransmogrifyNPC final : public ServerPacket
         {
         public:
-            OpenTransmogrifier(ObjectGuid const& guid) : ServerPacket(SMSG_OPEN_TRANSMOGRIFIER, 16), Guid(guid) { }
+            TransmogrifyNPC(ObjectGuid const& guid) : ServerPacket(SMSG_TRANSMOGRIFY_NPC, 16), Guid(guid) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 403b1ec19dc..1cfff7e0cbd 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -150,22 +150,24 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_ARTIFACT_SET_APPEARANCE,                            STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleArtifactSetAppearance);
     DEFINE_HANDLER(CMSG_ATTACK_STOP,                                        STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleAttackStopOpcode);
     DEFINE_HANDLER(CMSG_ATTACK_SWING,                                       STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleAttackSwingOpcode);
+    DEFINE_HANDLER(CMSG_AUCTIONABLE_TOKEN_SELL,                             STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_AUCTIONABLE_TOKEN_SELL_AT_MARKET_PRICE,             STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_AUCTION_BROWSE_QUERY,                               STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionBrowseQuery);
     DEFINE_HANDLER(CMSG_AUCTION_CANCEL_COMMODITIES_PURCHASE,                STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionCancelCommoditiesPurchase);
     DEFINE_HANDLER(CMSG_AUCTION_CONFIRM_COMMODITIES_PURCHASE,               STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionConfirmCommoditiesPurchase);
+    DEFINE_HANDLER(CMSG_AUCTION_GET_COMMODITY_QUOTE,                        STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionGetCommodityQuote);
     DEFINE_HANDLER(CMSG_AUCTION_HELLO_REQUEST,                              STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionHelloOpcode);
-    DEFINE_HANDLER(CMSG_AUCTION_LIST_BIDDER_ITEMS,                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionListBidderItems);
+    DEFINE_HANDLER(CMSG_AUCTION_LIST_BIDDED_ITEMS,                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionListBiddedItems);
     DEFINE_HANDLER(CMSG_AUCTION_LIST_BUCKETS_BY_BUCKET_KEYS,                STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionListBucketsByBucketKeys);
     DEFINE_HANDLER(CMSG_AUCTION_LIST_ITEMS_BY_BUCKET_KEY,                   STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionListItemsByBucketKey);
     DEFINE_HANDLER(CMSG_AUCTION_LIST_ITEMS_BY_ITEM_ID,                      STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionListItemsByItemID);
-    DEFINE_HANDLER(CMSG_AUCTION_LIST_OWNER_ITEMS,                           STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionListOwnerItems);
+    DEFINE_HANDLER(CMSG_AUCTION_LIST_OWNED_ITEMS,                           STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionListOwnedItems);
     DEFINE_HANDLER(CMSG_AUCTION_PLACE_BID,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionPlaceBid);
     DEFINE_HANDLER(CMSG_AUCTION_REMOVE_ITEM,                                STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionRemoveItem);
     DEFINE_HANDLER(CMSG_AUCTION_REPLICATE_ITEMS,                            STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionReplicateItems);
     DEFINE_HANDLER(CMSG_AUCTION_SELL_COMMODITY,                             STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionSellCommodity);
     DEFINE_HANDLER(CMSG_AUCTION_SELL_ITEM,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionSellItem);
     DEFINE_HANDLER(CMSG_AUCTION_SET_FAVORITE_ITEM,                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionSetFavoriteItem);
-    DEFINE_HANDLER(CMSG_AUCTION_START_COMMODITIES_PURCHASE,                 STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionStartCommoditiesPurchase);
     DEFINE_HANDLER(CMSG_AUTH_CONTINUED_SESSION,                             STATUS_NEVER,     PROCESS_INPLACE,      &WorldSession::Handle_EarlyProccess);
     DEFINE_HANDLER(CMSG_AUTH_SESSION,                                       STATUS_NEVER,     PROCESS_INPLACE,      &WorldSession::Handle_EarlyProccess);
     DEFINE_HANDLER(CMSG_AUTOBANK_ITEM,                                      STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleAutoBankItemOpcode);
@@ -190,7 +192,6 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_BATTLEMASTER_JOIN_SKIRMISH,                         STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLENET_CHALLENGE_RESPONSE,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLENET_REQUEST,                                  STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleBattlenetRequest);
-    DEFINE_HANDLER(CMSG_BATTLENET_REQUEST_REALM_LIST_TICKET,                STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleBattlenetRequestRealmListTicket);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_ACK_FAILED_RESPONSE,                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     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);
@@ -200,14 +201,10 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_BATTLE_PAY_OPEN_CHECKOUT,                           STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_QUERY_CLASS_TRIAL_BOOST_RESULT,          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_REQUEST_CHARACTER_BOOST_UNREVOKE,        STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_BATTLE_PAY_REQUEST_CURRENT_VAS_TRANSFER_QUEUES,     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_BATTLE_PAY_REQUEST_VAS_CHARACTER_QUEUE_TIME,        STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_REQUEST_PRICE_INFO,                      STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_START_PURCHASE,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_START_VAS_PURCHASE,                      STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PAY_TRIAL_BOOST_CHARACTER,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_BATTLE_PAY_VALIDATE_BNET_VAS_TRANSFER,              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_BATTLE_PAY_VAS_PURCHASE_COMPLETE,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PET_CLEAR_FANFARE,                           STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_BATTLE_PET_DELETE_PET,                              STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleBattlePetDeletePet);
     DEFINE_HANDLER(CMSG_BATTLE_PET_DELETE_PET_CHEAT,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
@@ -234,8 +231,6 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_BUY_BANK_SLOT,                                      STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleBuyBankSlotOpcode);
     DEFINE_HANDLER(CMSG_BUY_ITEM,                                           STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleBuyItemOpcode);
     DEFINE_HANDLER(CMSG_BUY_REAGENT_BANK,                                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_BUY_WOW_TOKEN_CONFIRM,                              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_BUY_WOW_TOKEN_START,                                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CAGE_BATTLE_PET,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleCageBattlePet);
     DEFINE_HANDLER(CMSG_CALENDAR_ADD_EVENT,                                 STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleCalendarAddEvent);
     DEFINE_HANDLER(CMSG_CALENDAR_COMMUNITY_FILTER,                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleCalendarCommunityFilter);
@@ -264,13 +259,14 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_CANCEL_TEMP_ENCHANTMENT,                            STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleCancelTempEnchantmentOpcode);
     DEFINE_HANDLER(CMSG_CANCEL_TRADE,                                       STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT, PROCESS_THREADUNSAFE, &WorldSession::HandleCancelTradeOpcode);
     DEFINE_HANDLER(CMSG_CAN_DUEL,                                           STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleCanDuel);
-    DEFINE_HANDLER(CMSG_CAN_REDEEM_WOW_TOKEN_FOR_BALANCE,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_CAN_REDEEM_TOKEN_FOR_BALANCE,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CAST_SPELL,                                         STATUS_LOGGEDIN,  PROCESS_THREADSAFE,   &WorldSession::HandleCastSpellOpcode);
     DEFINE_HANDLER(CMSG_CHALLENGE_MODE_REQUEST_LEADERS,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CHALLENGE_MODE_REQUEST_MAP_STATS,                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CHANGE_BAG_SLOT_FLAG,                               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CHANGE_BANK_BAG_SLOT_FLAG,                          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CHANGE_MONUMENT_APPEARANCE,                         STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_CHANGE_REALM_TICKET,                                STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleBattlenetChangeRealmTicket);
     DEFINE_HANDLER(CMSG_CHANGE_SUB_GROUP,                                   STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleChangeSubGroupOpcode);
     DEFINE_HANDLER(CMSG_CHARACTER_RENAME_REQUEST,                           STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleCharRenameOpcode);
     DEFINE_HANDLER(CMSG_CHAR_CUSTOMIZE,                                     STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleCharCustomizeOpcode);
@@ -312,7 +308,6 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_CHAT_REPORT_FILTERED,                               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CHAT_REPORT_IGNORED,                                STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleChatIgnoredOpcode);
     DEFINE_HANDLER(CMSG_CHAT_UNREGISTER_ALL_ADDON_PREFIXES,                 STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleUnregisterAllAddonPrefixesOpcode);
-    DEFINE_HANDLER(CMSG_CHECK_WOW_TOKEN_VETERAN_ELIGIBILITY,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CHOICE_RESPONSE,                                    STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandlePlayerChoiceResponse);
     DEFINE_HANDLER(CMSG_CLEAR_NEW_APPEARANCE,                               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CLEAR_RAID_MARKER,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleClearRaidMarker);
@@ -338,14 +333,22 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_COMMENTATOR_GET_PLAYER_COOLDOWNS,                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_COMMENTATOR_GET_PLAYER_INFO,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_COMMENTATOR_START_WARGAME,                          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_COMMERCE_TOKEN_GET_COUNT,                           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_COMMERCE_TOKEN_GET_LOG,                             STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleCommerceTokenGetLog);
+    DEFINE_HANDLER(CMSG_COMMERCE_TOKEN_GET_MARKET_PRICE,                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleCommerceTokenGetMarketPrice);
     DEFINE_HANDLER(CMSG_COMPLAINT,                                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleComplaint);
     DEFINE_HANDLER(CMSG_COMPLETE_CINEMATIC,                                 STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleCompleteCinematic);
     DEFINE_HANDLER(CMSG_COMPLETE_MOVIE,                                     STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleCompleteMovie);
     DEFINE_HANDLER(CMSG_CONFIRM_ARTIFACT_RESPEC,                            STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleConfirmArtifactRespec);
     DEFINE_HANDLER(CMSG_CONFIRM_RESPEC_WIPE,                                STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleConfirmRespecWipeOpcode);
     DEFINE_HANDLER(CMSG_CONNECT_TO_FAILED,                                  STATUS_NEVER,     PROCESS_INPLACE,      &WorldSession::Handle_EarlyProccess);
+    DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_BUY,                               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_BUY_AT_MARKET_PRICE,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_CAN_VETERAN_BUY,                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_REDEEM,                            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_REDEEM_CONFIRMATION,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CONTRIBUTION_CONTRIBUTE,                            STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_CONTRIBUTION_GET_STATE,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_CONTRIBUTION_LAST_UPDATE_REQUEST,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CONVERSATION_LINE_STARTED,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_CONVERT_RAID,                                       STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleConvertRaidOpcode);
     DEFINE_HANDLER(CMSG_CREATE_CHARACTER,                                   STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleCharCreateOpcode);
@@ -374,10 +377,10 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_DUEL_RESPONSE,                                      STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleDuelResponseOpcode);
     DEFINE_HANDLER(CMSG_EJECT_PASSENGER,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleEjectPassenger);
     DEFINE_HANDLER(CMSG_EMOTE,                                              STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleEmoteOpcode);
-    DEFINE_HANDLER(CMSG_ENABLE_ENCRYPTION_ACK,                              STATUS_NEVER,     PROCESS_INPLACE,      &WorldSession::Handle_EarlyProccess);
     DEFINE_HANDLER(CMSG_ENABLE_NAGLE,                                       STATUS_NEVER,     PROCESS_INPLACE,      &WorldSession::Handle_EarlyProccess);
     DEFINE_HANDLER(CMSG_ENABLE_TAXI_NODE,                                   STATUS_LOGGEDIN,  PROCESS_THREADSAFE,   &WorldSession::HandleEnableTaxiNodeOpcode);
     DEFINE_HANDLER(CMSG_ENGINE_SURVEY,                                      STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_ENTER_ENCRYPTED_MODE_ACK,                           STATUS_NEVER,     PROCESS_INPLACE,      &WorldSession::Handle_EarlyProccess);
     DEFINE_HANDLER(CMSG_ENUM_CHARACTERS,                                    STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleCharEnumOpcode);
     DEFINE_HANDLER(CMSG_ENUM_CHARACTERS_DELETED_BY_CLIENT,                  STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleCharUndeleteEnumOpcode);
     DEFINE_HANDLER(CMSG_FAR_SIGHT,                                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleFarSightOpcode);
@@ -420,6 +423,8 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_GET_REMAINING_GAME_TIME,                            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_GET_TROPHY_LIST,                                    STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_GET_UNDELETE_CHARACTER_COOLDOWN_STATUS,             STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleGetUndeleteCooldownStatus);
+    DEFINE_HANDLER(CMSG_GET_VAS_ACCOUNT_CHARACTER_LIST,                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
+    DEFINE_HANDLER(CMSG_GET_VAS_TRANSFER_TARGET_REALM_LIST,                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_GM_TICKET_ACKNOWLEDGE_SURVEY,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_GM_TICKET_GET_CASE_STATUS,                          STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleGMTicketGetCaseStatusOpcode);
     DEFINE_HANDLER(CMSG_GM_TICKET_GET_SYSTEM_STATUS,                        STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleGMTicketSystemStatusOpcode);
@@ -692,8 +697,6 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_READY_CHECK_RESPONSE,                               STATUS_LOGGEDIN,  PROCESS_INPLACE,      &WorldSession::HandleReadyCheckResponseOpcode);
     DEFINE_HANDLER(CMSG_READ_ITEM,                                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleReadItem);
     DEFINE_HANDLER(CMSG_RECLAIM_CORPSE,                                     STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleReclaimCorpse);
-    DEFINE_HANDLER(CMSG_REDEEM_WOW_TOKEN_CONFIRM,                           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_REDEEM_WOW_TOKEN_START,                             STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_REMOVE_NEW_ITEM,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleRemoveNewItem);
     DEFINE_HANDLER(CMSG_REMOVE_RAF_RECRUIT,                                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_REORDER_CHARACTERS,                                 STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleReorderCharacters);
@@ -735,7 +738,6 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_REQUEST_VEHICLE_PREV_SEAT,                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleRequestVehiclePrevSeat);
     DEFINE_HANDLER(CMSG_REQUEST_VEHICLE_SWITCH_SEAT,                        STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleRequestVehicleSwitchSeat);
     DEFINE_HANDLER(CMSG_REQUEST_WORLD_QUEST_UPDATE,                         STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleRequestWorldQuestUpdate);
-    DEFINE_HANDLER(CMSG_REQUEST_WOW_TOKEN_MARKET_PRICE,                     STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleRequestWowTokenMarketPrice);
     DEFINE_HANDLER(CMSG_RESET_CHALLENGE_MODE,                               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_RESET_CHALLENGE_MODE_CHEAT,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_RESET_INSTANCES,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleResetInstancesOpcode);
@@ -750,11 +752,10 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_SCENE_TRIGGER_EVENT,                                STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleSceneTriggerEvent);
     DEFINE_HANDLER(CMSG_SELF_RES,                                           STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleSelfResOpcode);
     DEFINE_HANDLER(CMSG_SELL_ITEM,                                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleSellItemOpcode);
-    DEFINE_HANDLER(CMSG_SELL_WOW_TOKEN_CONFIRM,                             STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_SELL_WOW_TOKEN_START,                               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_SEND_CONTACT_LIST,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleContactListOpcode);
     DEFINE_HANDLER(CMSG_SEND_MAIL,                                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleSendMail);
     DEFINE_HANDLER(CMSG_SEND_TEXT_EMOTE,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleTextEmoteOpcode);
+    DEFINE_HANDLER(CMSG_SERVER_TIME_OFFSET_REQUEST,                         STATUS_AUTHED,    PROCESS_INPLACE,      &WorldSession::HandleServerTimeOffsetRequest);
     DEFINE_HANDLER(CMSG_SET_ACHIEVEMENTS_HIDDEN,                            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_SET_ACTION_BAR_TOGGLES,                             STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleSetActionBarToggles);
     DEFINE_HANDLER(CMSG_SET_ACTION_BUTTON,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleSetActionButtonOpcode);
@@ -844,7 +845,6 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_TWITTER_CONNECT,                                    STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_TWITTER_DISCONNECT,                                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_TWITTER_POST,                                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_UI_TIME_REQUEST,                                    STATUS_AUTHED,    PROCESS_INPLACE,      &WorldSession::HandleUITimeRequest);
     DEFINE_HANDLER(CMSG_UNACCEPT_TRADE,                                     STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleUnacceptTradeOpcode);
     DEFINE_HANDLER(CMSG_UNDELETE_CHARACTER,                                 STATUS_AUTHED,    PROCESS_THREADUNSAFE, &WorldSession::HandleCharUndeleteOpcode);
     DEFINE_HANDLER(CMSG_UNLEARN_SKILL,                                      STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleUnlearnSkillOpcode);
@@ -857,14 +857,15 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_UPDATE_RAID_TARGET,                                 STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleUpdateRaidTargetOpcode);
     DEFINE_HANDLER(CMSG_UPDATE_SPELL_VISUAL,                                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_UPDATE_VAS_PURCHASE_STATES,                         STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
-    DEFINE_HANDLER(CMSG_UPDATE_WOW_TOKEN_AUCTIONABLE_LIST,                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleUpdateListedAuctionableTokens);
-    DEFINE_HANDLER(CMSG_UPDATE_WOW_TOKEN_COUNT,                             STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_UPGRADE_GARRISON,                                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_USED_FOLLOW,                                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_USE_CRITTER_ITEM,                                   STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleUseCritterItem);
     DEFINE_HANDLER(CMSG_USE_EQUIPMENT_SET,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleUseEquipmentSet);
     DEFINE_HANDLER(CMSG_USE_ITEM,                                           STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleUseItemOpcode);
     DEFINE_HANDLER(CMSG_USE_TOY,                                            STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, &WorldSession::HandleUseToy);
+    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);
     DEFINE_HANDLER(CMSG_VIOLENCE_LEVEL,                                     STATUS_AUTHED,    PROCESS_INPLACE,      &WorldSession::HandleViolenceLevel);
     DEFINE_HANDLER(CMSG_VOICE_CHAT_JOIN_CHANNEL,                            STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
     DEFINE_HANDLER(CMSG_VOICE_CHAT_LOGIN,                                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
@@ -886,51 +887,63 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACCOUNT_DATA_TIMES,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACCOUNT_HEIRLOOM_UPDATE,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACCOUNT_MOUNT_UPDATE,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACCOUNT_TOYS_UPDATE,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACCOUNT_TOY_UPDATE,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACCOUNT_TRANSMOG_SET_FAVORITES_UPDATE,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACCOUNT_TRANSMOG_UPDATE,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACHIEVEMENT_DELETED,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACHIEVEMENT_EARNED,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACTIVATE_ESSENCE_FAILED,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACTIVATE_TAXI_REPLY,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ACTIVE_GLYPHS,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ADDON_LIST_REQUEST,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ADD_BATTLENET_FRIEND_RESPONSE,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ADD_ITEM_PASSIVE,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ADD_LOSS_OF_CONTROL,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ADD_RUNE_POWER,                          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ADJUST_SPLINE_DURATION,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ADVENTURE_MAP_POI_QUERY_RESPONSE,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ADVENTURE_MAP_OPEN_NPC,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AE_LOOT_TARGETS,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AE_LOOT_TARGET_ACK,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AI_REACTION,                             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ALLIED_RACE_DETAILS,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ALL_ACCOUNT_CRITERIA,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ALL_ACHIEVEMENT_DATA,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ALL_GUILD_ACHIEVEMENTS,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_APPLY_MOUNT_EQUIPMENT_RESULT,            STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARCHAEOLOGY_SURVERY_CAST,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_POI_UPDATE,                         STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_POI_UPDATE_RESPONSE,                STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_SPIRIT_HEALER_TIME,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_TRIGGER_DENIED,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_TRIGGER_FORCE_SET_POSITION_AND_FACING, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_TRIGGER_NO_CORPSE,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_TRIGGER_PLAY_VISUAL_EVENT,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_TRIGGER_PLAY_SPELL_VISUAL,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     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_ARENA_CROWD_CONTROL_SPELLS,              STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_TRIGGER_SET_VISUAL_ANIM,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AREA_TRIGGER_UNATTACH,                   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_FORGE_OPENED,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARTIFACT_RESPEC_CONFIRM,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARTIFACT_TRAITS_REFUNDED,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARTIFACT_ENDGAME_POWERS_REFUNDED,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARTIFACT_FORGE_ERROR,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARTIFACT_RESPEC_PROMPT,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ARTIFACT_XP_GAIN,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKER_STATE_UPDATE,                   STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACK_START,                            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACK_STOP,                             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACK_SWING_ERROR,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACK_SWING_LANDED_LOG,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTIONABLE_TOKEN_AUCTION_SOLD,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTIONABLE_TOKEN_SELL_AT_MARKET_PRICE_RESPONSE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTIONABLE_TOKEN_SELL_CONFIRM_REQUIRED, STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_CLOSED_NOTIFICATION,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_COMMAND_RESULT,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_COMMODITY_QUOTE,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_FAVORITE_ITEMS,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_FAVORITE_LIST,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_GET_COMMODITY_QUOTE_RESULT,      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_HELLO_RESPONSE,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_LIST_BIDDER_ITEMS_RESULT,        STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_LIST_BIDDED_ITEMS_RESULT,        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_LIST_BUCKETS_RESULT,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_LIST_ITEMS_RESULT,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_LIST_OWNER_ITEMS_RESULT,         STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_LIST_OWNED_ITEMS_RESULT,         STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_OUTBID_NOTIFICATION,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_OWNER_BID_NOTIFICATION,          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_REPLICATE_RESPONSE,              STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -938,17 +951,13 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AURA_POINTS_DEPLETED,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AURA_UPDATE,                             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUTH_CHALLENGE,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUTH_ERROR,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUTH_FAILED,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUTH_RESPONSE,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AVAILABLE_HOTFIXES,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AZERITE_EMPOWERED_ITEM_EQUIPPED_STATUS_CHANGED, STATUS_NEVER, CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AZERITE_EMPOWERED_ITEM_RESPEC_OPEN,      STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AZERITE_ESSENCE_FORGE_CLOSE,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AZERITE_ESSENCE_FORGE_OPENED,            STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AZERITE_ESSENCE_SELECTION_RESULT,        STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AZERITE_XP_GAIN,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BAN_REASON,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AZERITE_RESPEC_NPC,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BAG_CLEANUP_FINISHED,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BARBER_SHOP_RESULT,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATCH_PRESENCE_SUBSCRIPTION,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_LIST,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_PORT_DENIED,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_STATUS_ACTIVE,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -966,38 +975,27 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLENET_CHALLENGE_ABORT,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLENET_CHALLENGE_START,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLENET_NOTIFICATION,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLENET_REALM_LIST_TICKET,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLENET_RESPONSE,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLENET_SET_SESSION_STATE,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLENET_UPDATE_SESSION_KEY,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_NET_CONNECTION_STATUS,            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_ACK_FAILED,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_BATTLE_PET_DELIVERED,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_BUNDLE_PRICE_UPDATE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_COLLECTION_ITEM_DELIVERED,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     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_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);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_GET_PRODUCT_LIST_RESPONSE,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_GET_PURCHASE_LIST_RESPONSE,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_MOUNT_DELIVERED,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_OPEN_CHECKOUT_RESULT,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_PURCHASE_UPDATE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_START_CHECKOUT,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_START_DISTRIBUTION_ASSIGN_TO_TARGET_RESPONSE, STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_START_PURCHASE_RESPONSE,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_SUBSCRIPTION_CHANGED,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_TOY_DELIVERED,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_BNET_TRANSFER_VALIDATION_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_BOOST_CONSUMED,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_CHARACTER_LIST,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_CHARACTER_QUEUE_STATUS,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VALIDATE_PURCHASE_RESPONSE,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_GUILD_FOLLOW_INFO,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_GUILD_MASTER_LIST,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_PURCHASE_COMPLETE,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_PURCHASE_LIST,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_PURCHASE_STARTED,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_REALM_LIST,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_VAS_TRANSFER_QUEUE_STATUS,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PETS_HEALED,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_CAGE_DATE_ERROR,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_DELETED,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1006,9 +1004,9 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_JOURNAL_LOCK_ACQUIRED,        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_JOURNAL_LOCK_DENIED,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_LICENSE_CHANGED,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_MAX_COUNT_CHANGED,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_RESTORED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_REVOKED,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_SET_MAX_PETS,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_TRAP_LEVEL,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_UPDATES,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BINDER_CONFIRM,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1019,28 +1017,29 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BLACK_MARKET_REQUEST_ITEMS_RESULT,       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BLACK_MARKET_WON,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BONUS_ROLL_EMPTY,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BONUS_ROLL_FAILED,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BOSS_KILL_CREDIT,                        STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BOSS_KILL,                               STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BREAK_TARGET,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BROADCAST_ACHIEVEMENT,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BROADCAST_SUMMON_CAST,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BROADCAST_SUMMON_RESPONSE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BUY_FAILED,                              STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BUY_SUCCEEDED,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CACHE_INFO,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CACHE_VERSION,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_CLEAR_PENDING_ACTION,           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_COMMAND_RESULT,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_INITIAL_INVITES,          STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_INVITE,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_INVITE_ALERT,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_INVITE_MODERATOR_STATUS,  STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_INVITE_NOTES,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_INVITE_NOTES_ALERT,       STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_INVITE_REMOVED,           STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT,     STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_INVITE_STATUS,            STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT,      STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_COMMUNITY_INVITE,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_REMOVED_ALERT,            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_EVENT_UPDATED_ALERT,            STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_INVITE_ADDED,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_INVITE_ALERT,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_INVITE_MODERATOR_STATUS,        STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_INVITE_NOTES,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_INVITE_NOTES_ALERT,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_INVITE_REMOVED,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_INVITE_REMOVED_ALERT,           STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_INVITE_STATUS,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_INVITE_STATUS_ALERT,            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_RAID_LOCKOUT_ADDED,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_RAID_LOCKOUT_REMOVED,           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CALENDAR_RAID_LOCKOUT_UPDATED,           STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1055,36 +1054,31 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CANCEL_SPELL_VISUAL,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CANCEL_SPELL_VISUAL_KIT,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CAN_DUEL_RESULT,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CAN_REDEEM_TOKEN_FOR_BALANCE_RESPONSE,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CAPTURE_POINT_REMOVED,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CAST_FAILED,                             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CATEGORY_COOLDOWN,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_AFFIXES,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_ALL_MAP_STATS,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_COMPLETE,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_NEW_PLAYER_RECORD,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_NEW_PLAYER_SEASON_RECORD, STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_REQUEST_LEADERS_RESULT,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_REWARDS,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_RESET,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_START,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_UPDATE_DEATH_COUNT,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHANGE_PLAYER_DIFFICULTY_RESULT,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHANGE_REALM_TICKET_RESPONSE,            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHANNEL_LIST,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHANNEL_NOTIFY,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHANNEL_NOTIFY_JOINED,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHANNEL_NOTIFY_LEFT,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_CLASS_TRIAL_CREATE,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_INVENTORY_OVERFLOW_WARNING,    STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_ITEM_FIXUP,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_CHECK_UPGRADE_RESULT,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_LOGIN_FAILED,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_OBJECT_TEST_RESPONSE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_RENAME_RESULT,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_UPGRADE_ABORTED,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_UPGRADE_COMPLETE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_UPGRADE_QUEUED,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_UPGRADE_SPELL_TIER_SET,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_UPGRADE_MANUAL_UNREVOKE_RESULT,STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_UPGRADE_STARTED,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHARACTER_UPGRADE_UNREVOKE_RESULT,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHAR_CUSTOMIZE,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHAR_CUSTOMIZE_FAILED,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHAR_CUSTOMIZE_FAILURE,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHAR_CUSTOMIZE_SUCCESS,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHAR_FACTION_CHANGE_RESULT,              STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHAT,                                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHAT_AUTO_RESPONDED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1099,30 +1093,44 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHAT_SERVER_MESSAGE,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHEAT_IGNORE_DIMISHING_RETURNS,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHECK_WARGAME_ENTRY,                     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_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);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLEAR_LOSS_OF_CONTROL,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLEAR_RESURRECT,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLEAR_SPELL_CHARGES,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLEAR_TARGET,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_APPLICANTS_LIST,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_APPLICATIONS,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_APPLICATIONS_CHANGED,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_CLUBS_DATA,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_CLUBS_LIST,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_COMMAND_RESULT,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLOSE_ARTIFACT_FORGE,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLOSE_HEART_FORGE,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_ERROR_MESSAGE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_GET_CLUB_POSTING_IDS_RESPONSE, STATUS_UNHANDLED,  CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_LOOKUP_CLUB_POSTINGS_LIST,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_RESPONSE_CHARACTER_APPLICATION_LIST, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_RESPONSE_POST_RECRUITMENT_MESSAGE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CLUB_FINDER_UPDATE_APPLICATIONS,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_COIN_REMOVED,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMBAT_EVENT_FAILED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMMENTATOR_MAP_INFO,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMMENTATOR_PLAYER_INFO,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMMENTATOR_STATE_CHANGED,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMMERCE_TOKEN_GET_COUNT_RESPONSE,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMMERCE_TOKEN_GET_LOG_RESPONSE,         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMMERCE_TOKEN_GET_MARKET_PRICE_RESPONSE,STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMMERCE_TOKEN_UPDATE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMPLAINT_RESULT,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMPLETE_SHIPMENT_RESPONSE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONFIRM_PARTY_INVITE,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONNECT_TO,                              STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONQUEST_FORMULA_CONSTANTS,              STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONSOLE_WRITE,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONTRIBUTION_COLLECTOR_STATE,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONSUMABLE_TOKEN_BUY_AT_MARKET_PRICE_RESPONSE, STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONSUMABLE_TOKEN_BUY_CHOICE_REQUIRED,    STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONSUMABLE_TOKEN_CAN_VETERAN_BUY_RESPONSE, STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONSUMABLE_TOKEN_REDEEM_CONFIRM_REQUIRED,STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONSUMABLE_TOKEN_REDEEM_RESPONSE,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONTRIBUTION_LAST_UPDATE_RESPONSE,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONTACT_LIST,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONTROL_UPDATE,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_COOLDOWN_CHEAT,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1140,11 +1148,13 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DAMAGE_CALC_LOG,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DB_REPLY,                                STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DEATH_RELEASE_LOC,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_DEBUG_MENU_MANAGER_FULL_UPDATE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DEFENSE_MESSAGE,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DELETE_CHAR,                             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DESTROY_ARENA_UNIT,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DESTRUCTIBLE_BUILDING_DAMAGE,            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DIFFERENT_INSTANCE_FROM_PARTY,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISCONNECT_REASON,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISENCHANT_CREDIT,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISMOUNT,                                STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISMOUNT_RESULT,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1154,31 +1164,33 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_PROMOTION,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_QUEST_POPUP,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_TOAST,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_WORLD_TEXT,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DONT_AUTO_PUSH_SPELLS_TO_ACTION_BAR,     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DROP_NEW_CONNECTION,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_DUEL_ARRANGED,                           STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DUEL_COMPLETE,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DUEL_COUNTDOWN,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DUEL_IN_BOUNDS,                          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_DUEL_OPPONENT_SELECTED,                  STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DUEL_OUT_OF_BOUNDS,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DUEL_REQUESTED,                          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DUEL_WINNER,                             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DURABILITY_DAMAGE_DEATH,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_EMOTE,                                   STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENABLE_BARBER_SHOP,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENABLE_ENCRYPTION,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENCHANTMENT_LOG,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENCOUNTER_END,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENCOUNTER_START,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENTITLEMENTS,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENTITLEMENT_NOTIFICATION,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_END_LIGHTNING_STORM,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENTER_ENCRYPTED_MODE,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENUM_CHARACTERS_RESULT,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENUM_VAS_PURCHASE_STATES_RESPONSE,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ENVIRONMENTAL_DAMAGE_LOG,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_EQUIPMENT_SET_ID,                        STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_EXPECTED_SPAM_RECORDS,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_EXPLORATION_EXPERIENCE,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FACTION_BONUS_INFO,                      STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FAILED_PLAYER_CONDITION,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_FAILED_QUEST_TURN_IN,                    STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FEATURE_SYSTEM_STATUS,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FEATURE_SYSTEM_STATUS_GLUE_SCREEN,       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FEIGN_DEATH_RESISTED,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1189,16 +1201,15 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FORCE_ANIM,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FORCE_OBJECT_RELINK,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FRIEND_STATUS,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_EVENT_DEBUG_INITIALIZE,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_ACTIVATE_ANIM_KIT,           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_BASE,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_CUSTOM_ANIM,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_DESPAWN,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_MULTI_TRANSITION,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_PLAY_SPELL_VISUAL,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_PLAY_SPELL_VISUAL_KIT,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_RESET_STATE,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_SET_STATE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_UI_ACTION,                   STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_SET_STATE_LOCAL,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_UI_LINK,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_SPEED_SET,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_TIME_SET,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_TIME_UPDATE,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1220,7 +1231,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_FOLLOWER_CHANGED_STATUS,        STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_FOLLOWER_CHANGED_XP,            STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_IS_UPGRADEABLE_RESULT,          STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_LANDING_PAGE_SHIPMENT_INFO,     STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_LEARN_BLUEPRINT_RESULT,         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_LEARN_SPECIALIZATION_RESULT,    STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_LIST_FOLLOWERS_CHEAT_RESULT,    STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
@@ -1251,12 +1261,18 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_UNLEARN_BLUEPRINT_RESULT,       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_UPGRADE_RESULT,                 STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GENERATE_RANDOM_CHARACTER_NAME_RESULT,   STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GENERATE_SSO_TOKEN_RESPONSE,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_ACCOUNT_CHARACTER_LIST_RESULT,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_DISPLAYED_TROPHY_LIST_RESPONSE,      STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_GARRISON_INFO_RESULT,                STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_LANDING_PAGE_SHIPMENTS_RESPONSE,     STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_REMAINING_GAME_TIME_RESPONSE,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_SELECTED_TROPHY_ID_RESPONSE,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_SHIPMENTS_OF_TYPE_RESPONSE,          STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_SHIPMENT_INFO_RESPONSE,              STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_TROPHY_LIST_RESPONSE,                STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_VAS_ACCOUNT_CHARACTER_LIST_RESULT,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_VAS_TRANSFER_TARGET_REALM_LIST_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GM_PLAYER_INFO,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GM_REQUEST_PLAYER_INFO,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GM_TICKET_CASE_STATUS,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1267,9 +1283,9 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GOSSIP_POI,                              STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GOSSIP_TEXT_UPDATE,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_ACTION_THROTTLED,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_AUTO_KICK,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_DECLINE,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_DESTROYED,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_INVITE_CONFIRMATION,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_NEW_LEADER,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_UNINVITE,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_ACHIEVEMENT_DELETED,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1327,10 +1343,8 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_SEND_RANK_CHANGE,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_HEALTH_UPDATE,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_HIGHEST_THREAT_UPDATE,                   STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_HOTFIX_CONNECT,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_HOTFIX_MESSAGE,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_HOTFIX_RESPONSE,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INCOMING_SUMMON_COMPLETED,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INCOMING_SUMMON_PENDING,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INITIALIZE_FACTIONS,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INITIAL_SETUP,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INIT_WORLD_STATES,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1345,10 +1359,10 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_OBJECTIVE_START,      STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_OBJECTIVE_UPDATE,     STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_PHASE_SHIFT_CHANGED,  STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_SET_ALLOWING_RELEASE, STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_SET_SUPPRESSING_RELEASE, STATUS_UNHANDLED, CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_START,                STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_TIMER_START,          STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_UPDATE_ALLOW_RELEASE_IN_PROGRESS, STATUS_UNHANDLED, CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_UPDATE_SUPPRESS_RELEASE, STATUS_UNHANDLED, CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_GROUP_SIZE_CHANGED,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_INFO,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_RESET,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1358,25 +1372,26 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVALIDATE_PLAYER,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVALID_PROMOTION_CODE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVENTORY_CHANGE_FAILURE,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ISLAND_AZERITE_XP_GAIN,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ISLAND_COMPLETED,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ISLAND_OPEN_QUEUE_NPC,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVENTORY_FIXUP_COMPLETE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVENTORY_FULL_OVERFLOW,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ISLANDS_MISSION_NPC,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ISLAND_AZERITE_GAIN,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ISLAND_COMPLETE,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_IS_QUEST_COMPLETE_RESPONSE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_CHANGED,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     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_OPEN,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_INTERACTION_RESULT,                 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);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_TIME_UPDATE,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_KICK_REASON,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LEARNED_SPELLS,                          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LEARN_PVP_TALENTS_FAILED,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LEARN_TALENTS_FAILED,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LEARN_PVP_TALENT_FAILED,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LEARN_TALENT_FAILED,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LEGACY_LOOT_RULES,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LEVEL_LINKING_RESULT,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LEVEL_UPDATE,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LEVEL_UP_INFO,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_BOOT_PLAYER,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_DISABLED,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1385,7 +1400,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_LIST_APPLICANT_LIST_UPDATE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_LIST_APPLICATION_STATUS_UPDATE,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_LIST_APPLY_TO_GROUP_RESULT,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_LIST_INIT_AUTO_DELIST,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_LIST_JOIN_RESULT,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_LIST_SEARCH_RESULTS,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_LIST_SEARCH_RESULTS_UPDATE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1412,14 +1426,11 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_COMMAND_RESULT,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_POST,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_RECRUITS,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIGHTNING_STORM_END,                     STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIGHTNING_STORM_START,                   STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIVE_REGION_ACCOUNT_RESTORE_RESULT,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIVE_REGION_CHARACTER_COPY_RESULT,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIVE_REGION_GET_ACCOUNT_CHARACTER_LIST_RESULT, STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOAD_CUF_PROFILES,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOAD_EQUIPMENT_SET,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOAD_SELECTED_TROPHY_RESULT,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGIN_SET_TIME_SPEED,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGIN_VERIFY_WORLD,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGOUT_CANCEL_ACK,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1427,7 +1438,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGOUT_RESPONSE,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOG_XP_GAIN,                             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_ALL_PASSED,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_LEGACY_RULES_IN_EFFECT,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_LIST,                               STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_MONEY_NOTIFY,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_RELEASE,                            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1442,8 +1452,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MAIL_LIST_RESULT,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MAIL_QUERY_NEXT_TIME_RESULT,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MAP_OBJECTIVES_INIT,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MAP_OBJECTIVE_ADD,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MAP_OBJECTIVE_REMOVE,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MAP_OBJ_EVENTS,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MASTER_LOOT_CANDIDATE_LIST,              STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MESSAGE_BOX,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1451,13 +1459,10 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MIRROR_IMAGE_COMPONENTED_DATA,           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MIRROR_IMAGE_CREATURE_DATA,              STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MISSILE_CANCEL,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MODIFY_CHARGE_RECOVERY_SPEED,            STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MODIFY_COOLDOWN,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MODIFY_COOLDOWN_RECOVERY_SPEED,          STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MODIFY_PARTY_RANGE,                      STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOTD,                                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOUNT_EQUIPMENT_APPLY_RESULT,            STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOUNT_RESULT,                            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVEMENT_ENFORCEMENT_ALERT,              STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_APPLY_MOVEMENT_FORCE,               STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_DISABLE_COLLISION,                  STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_DISABLE_DOUBLE_JUMP,                STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1542,6 +1547,11 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UPDATE_TELEPORT,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UPDATE_TURN_RATE,                   STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UPDATE_WALK_SPEED,                  STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MYTHIC_PLUS_ALL_MAP_STATS,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MYTHIC_PLUS_CURRENT_AFFIXES,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MYTHIC_PLUS_NEW_SEASON_RECORD,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MYTHIC_PLUS_NEW_WEEK_RECORD,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MYTHIC_PLUS_WEEKLY_REWARD_RESPONSE,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_NEUTRAL_PLAYER_FACTION_SELECT_RESULT,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_NEW_TAXI_PATH,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_NEW_WORLD,                               STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1552,19 +1562,20 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_OFFER_PETITION_ERROR,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA,    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ON_MONSTER_MOVE,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_ALLIED_RACE_DETAILS_GIVER,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_ARTIFACT_FORGE,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_CONTAINER,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_HEART_FORGE,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_LFG_DUNGEON_FINDER,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_SHIPMENT_NPC_FROM_GOSSIP,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_SHIPMENT_NPC_RESULT,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_TRANSMOGRIFIER,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_OVERRIDE_LIGHT,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PAGE_TEXT,                               STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_COMMAND_RESULT,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_INVITE,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_KILL_LOG,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_MEMBER_STATE,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_MEMBER_STATE_UPDATE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_MEMBER_FULL_STATE,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    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_PAUSE_MIRROR_TIMER,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PENDING_RAID_LOCK,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1599,6 +1610,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_LEARNED_SPELLS,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_MODE,                                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_NAME_INVALID,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_NEWLY_TAMED,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_SLOT_UPDATED,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_SPELLS_MESSAGE,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_STABLE_LIST,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1607,10 +1619,17 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_UNLEARNED_SPELLS,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PHASE_SHIFT_CHANGE,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYED_TIME,                             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_AZERITE_ITEM_EQUIPPED_STATUS_CHANGED, STATUS_NEVER, CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_AZERITE_ITEM_GAINS,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_BONUS_ROLL_FAILED,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_BOUND,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_CONDITION_RESULT,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_IS_ADVENTURE_MAP_POI_VALID,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_SAVE_GUILD_EMBLEM,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_SKINNED,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_TABARD_VENDOR_ACTIVATE,           STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_TUTORIAL_HIGHLIGHT_SPELL,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAYER_TUTORIAL_UNHIGHLIGHT_SPELL,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_MUSIC,                              STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_OBJECT_SOUND,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_ONE_SHOT_ANIM_KIT,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1623,17 +1642,18 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_TIME_WARNING,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PONG,                                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_POWER_UPDATE,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PRELOAD_CHILD_MAP,                       STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PREPOPULATE_NAME_CACHE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PRE_RESSURECT,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PRINT_NOTIFICATION,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PROC_RESIST,                             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PUSH_SPELL_TO_ACTION_BAR,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_CREDIT,                              STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_LOG_DATA,                            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_MATCH_END,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_MATCH_INIT,                          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_MATCH_COMPLETE,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_MATCH_INITIALIZE,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_MATCH_START,                         STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_MATCH_STATISTICS,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_OPTIONS_ENABLED,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_SEASON,                              STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_BATTLE_PET_NAME_RESPONSE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_COMMUNITY_NAME_RESPONSE,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_CREATURE_RESPONSE,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1648,7 +1668,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_PLAYER_NAME_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_TIME_RESPONSE,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_TREASURE_PICKER_RESPONSE,          STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_COMPLETION_NPC_RESPONSE,           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_CONFIRM_ACCEPT,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_FORCE_REMOVED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1661,15 +1680,15 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_GIVER_REQUEST_ITEMS,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_GIVER_STATUS,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_GIVER_STATUS_MULTIPLE,             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_GIVER_QUEST_TURN_IN_FAILURE,       STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_LINES_FOR_MAP_RESPONSE,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_LOG_FULL,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_POI_CHANGED,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_POI_QUERY_RESPONSE,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_PUSH_RESULT,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_SESSION_MEMBER_CONFIRM,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_SESSION_MEMBER_START_RESPONSE,     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_SESSION_NOTIFICATION,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_SESSION_INFO_RESPONSE,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_SESSION_READY_CHECK,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_SESSION_READY_CHECK_RESPONSE,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_SESSION_RESULT,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_SPAWN_TRACKING_UPDATE,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_ADD_CREDIT,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_ADD_CREDIT_SIMPLE,          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1678,34 +1697,33 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_COMPLETE_BY_SPELL,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_FAILED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_FAILED_TIMER,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUICK_JOIN_CONFIRM_REQUEST_INVITE,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEUE_SUMMARY_UPDATE,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAF_ACCOUNT_INFO,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAF_ACTIVITY,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAF_INFO_UPDATE,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAF_ACTIVITY_STATE_CHANGED,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAID_DIFFICULTY_SET,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAID_GROUP_ONLY,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAID_INSTANCE_MESSAGE,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAID_MARKERS_CHANGED,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RANDOM_ROLL,                             STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RATED_BATTLEFIELD_INFO,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RATED_PVP_INFO,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_READY_CHECK_COMPLETED,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_READY_CHECK_RESPONSE,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_READY_CHECK_STARTED,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_READ_ITEM_RESULT_FAILED,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_READ_ITEM_RESULT_OK,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_REALM_LOOKUP_INFORMATION,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_REALM_LOOKUP_INFO,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REALM_QUERY_RESPONSE,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_REFER_A_FRIEND_FAILURE,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_REATTACH_RESURRECT,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RECRUIT_A_FRIEND_FAILURE,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REFRESH_COMPONENT,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REFRESH_SPELL_HISTORY,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REMOVE_ITEM_PASSIVE,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REMOVE_LOSS_OF_CONTROL,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REPLACE_TROPHY_RESPONSE,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REPORT_PVP_PLAYER_AFK_RESULT,            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_REQUEST_ADDON_LIST,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REQUEST_CEMETERY_LIST_RESPONSE,          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_REQUEST_PVP_BRAWL_INFO_RESPONSE,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REQUEST_PVP_REWARDS_RESPONSE,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_REQUEST_SCHEDULED_PVP_INFO_RESPONSE,     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESEARCH_COMPLETE,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESET_COMPRESSION_CONTEXT,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESET_FAILED_NOTIFY,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1713,24 +1731,26 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESET_WEEKLY_CURRENCY,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESPEC_WIPE_CONFIRM,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESPOND_INSPECT_ACHIEVEMENTS,            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESTRICTED_ACCOUNT_WARNING,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESUME_CAST,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESUME_CAST_BAR,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESUME_COMMS,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESUME_TOKEN,                            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESURRECT_CLEAR_DATA,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESURRECT_REQUEST,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESYNC_RUNES,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RETURN_APPLICANT_LIST,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RETURN_RECRUITING_CLUBS,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ROLE_CHANGED_INFORM,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ROLE_CHOSEN,                             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ROLE_POLL_INFORM,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RUNE_REGEN_DEBUG,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENARIO_BOOT,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENARIO_COMPLETED,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENARIO_POIS,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENARIO_PROGRESS_UPDATE,                STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENARIO_SET_SHOULD_SHOW_CRITERIA,       STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENARIO_SPELL_UPDATE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENARIO_SHOW_CRITERIA,                  STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENARIO_STATE,                          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENARIO_UI_UPDATE,                      STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENARIO_VACATE,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_EVENT,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_FINAL_ROUND,     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_FINISHED,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1739,6 +1759,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_REPLACEMENTS_MADE, STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_ROUND_RESULT,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCRIPT_CAST,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SEASON_INFO,                             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SELL_RESPONSE,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SEND_ITEM_PASSIVES,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SEND_KNOWN_SPELLS,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1749,11 +1770,13 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SEND_UNLEARN_SPELLS,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SERVER_FIRST_ACHIEVEMENTS,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SERVER_TIME,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SERVER_TIME_OFFSET,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SETUP_CURRENCY,                          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SETUP_RESEARCH_HISTORY,                  STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_AI_ANIM_KIT,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_ALL_TASK_PROGRESS,                   STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_ANIM_TIER,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_CHR_UPGRADE_TIER,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_CURRENCY,                            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_DF_FAST_LAUNCH_RESULT,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_DUNGEON_DIFFICULTY,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1773,20 +1796,18 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT,        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_PLAY_HOVER_ANIM,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_PROFICIENCY,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_QUEST_REPLAY_COOLDOWN_OVERRIDE,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_SPELL_CHARGES,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     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_SHOW_ADVENTURE_MAP,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_BANK,                               STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_MAILBOX,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_NEUTRAL_PLAYER_FACTION_SELECT_UI,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_TAXI_NODES,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_TRADE_SKILL_RESPONSE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SOCKET_GEMS,                             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SOCKET_GEMS_FAILURE,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SORT_BAGS_RESULT,                        STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPECIALIZATION_CHANGED,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SOCKET_GEMS_FAILURE,                     STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SOCKET_GEMS_SUCCESS,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPECIAL_MOUNT_ANIM,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPEC_INVOLUNTARILY_CHANGED,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_ABSORB_LOG,                        STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
@@ -1813,10 +1834,12 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_PERIODIC_AURA_LOG,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_PREPARE,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_START,                             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_VISUAL_LOAD_SCREEN,                STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPIRIT_HEALER_CONFIRM,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_STAND_STATE_UPDATE,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_START_ELAPSED_TIMER,                     STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_START_ELAPSED_TIMERS,                    STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_START_LIGHTNING_STORM,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_START_LOOT_ROLL,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_START_MIRROR_TIMER,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_START_TIMER,                             STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1830,6 +1853,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUPERCEDED_SPELLS,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUSPEND_COMMS,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUSPEND_TOKEN,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SYNC_WOW_ENTITLEMENTS,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TALENTS_INVOLUNTARILY_RESET,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TAXI_NODE_STATUS,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TEXT_EMOTE,                              STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1849,28 +1873,33 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRAINER_LIST,                            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRANSFER_ABORTED,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRANSFER_PENDING,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRANSMOG_COLLECTION_UPDATE,              STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRANSMOG_SET_COLLECTION_UPDATE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRANSMOGRIFY_NPC,                        STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_TREASURE_PICKER_RESPONSE,                STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRIGGER_CINEMATIC,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRIGGER_MOVIE,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TURN_IN_PETITION_RESULT,                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TUTORIAL_FLAGS,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_TUTORIAL_HIGHLIGHT_SPELL,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_TUTORIAL_UNHIGHLIGHT_SPELL,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TWITTER_STATUS,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_UI_TIME,                                 STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_UI_HEALING_RANGE_MODIFIED,               STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_UI_ITEM_INTERACTION_NPC,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UNDELETE_CHARACTER_RESPONSE,             STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UNDELETE_COOLDOWN_STATUS_RESPONSE,       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UNLEARNED_SPELLS,                        STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_UNLOAD_CHILD_MAP,                        STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_ACCOUNT_DATA,                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_ACTION_BUTTONS,                   STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_BNET_SESSION_KEY,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_CAPTURE_POINT,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_CELESTIAL_BODY,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_CHARACTER_FLAGS,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_CHARGE_CATEGORY_COOLDOWN,         STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_COOLDOWN,                         STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_EXPANSION_LEVEL,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_GAME_TIME_STATE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_INSTANCE_OWNERSHIP,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_LAST_INSTANCE,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_OBJECT,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_PRIMARY_SPEC,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_TALENT_DATA,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_TASK_PROGRESS,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_WEEKLY_SPELL_USAGE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1879,8 +1908,15 @@ 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_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);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_VAS_PURCHASE_COMPLETE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_VAS_PURCHASE_STATE_UPDATE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_VENDOR_INVENTORY,                        STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_VIGNETTE_UPDATE,                         STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_VOICE_CHANNEL_INFO_RESPONSE,             STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_VOICE_LOGIN_RESPONSE,                    STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_VOID_ITEM_SWAP_RESPONSE,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_VOID_STORAGE_CONTENTS,                   STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_VOID_STORAGE_FAILED,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1888,31 +1924,20 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_VOID_TRANSFER_RESULT,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_WAIT_QUEUE_FINISH,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_WAIT_QUEUE_UPDATE,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WARDEN_DATA,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WARFRONT_COMPLETED,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WARDEN3_DATA,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WARDEN3_DISABLED,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WARDEN3_ENABLED,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WARFRONT_COMPLETE,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_WARGAME_REQUEST_SUCCESSFULLY_SENT_TO_OPPONENT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_WEATHER,                                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_WEEKLY_SPELL_USAGE,                      STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_WHO,                                     STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_WHO_IS,                                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WORLD_MAP_INTERACTION,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WORLD_QUEST_UPDATE,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WILL_BE_KICKED_FOR_ADDED_SUBSCRIPTION_TIME, STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WORLD_MAP_OPEN_NPC,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WORLD_QUEST_UPDATE_RESPONSE,             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_WORLD_SERVER_INFO,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WORLD_TEXT,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_AUCTION_SOLD,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_BUY_REQUEST_CONFIRMATION,      STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_BUY_RESULT_CONFIRMATION,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_CAN_REDEEM_FOR_BALANCE_RESULT, STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_CAN_VETERAN_BUY_RESULT,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_DISTRIBUTION_GLUE_UPDATE,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_DISTRIBUTION_UPDATE,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_MARKET_PRICE_RESPONSE,         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_REDEEM_GAME_TIME_UPDATED,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_REDEEM_REQUEST_CONFIRMATION,   STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_REDEEM_RESULT,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_SELL_REQUEST_CONFIRMATION,     STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_SELL_RESULT_CONFIRMATION,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_TOKEN_UPDATE_AUCTIONABLE_LIST_RESPONSE, STATUS_NEVER,     CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_WOW_ENTITLEMENT_NOTIFICATION,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_XP_GAIN_ABORTED,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_XP_GAIN_ENABLED,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ZONE_UNDER_ATTACK,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index d690d45febb..8f161e2989b 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -65,22 +65,24 @@ enum OpcodeClient : uint16
     CMSG_ASSIGN_EQUIPMENT_SET_SPEC                    = 0x320B,
     CMSG_ATTACK_STOP                                  = 0x3259,
     CMSG_ATTACK_SWING                                 = 0x3258,
+    CMSG_AUCTIONABLE_TOKEN_SELL                       = 0x36E6,
+    CMSG_AUCTIONABLE_TOKEN_SELL_AT_MARKET_PRICE       = 0x36E7,
     CMSG_AUCTION_BROWSE_QUERY                         = 0x34D0,
     CMSG_AUCTION_CANCEL_COMMODITIES_PURCHASE          = 0x34D8,
     CMSG_AUCTION_CONFIRM_COMMODITIES_PURCHASE         = 0x34D7,
+    CMSG_AUCTION_GET_COMMODITY_QUOTE                  = 0x34D6,
     CMSG_AUCTION_HELLO_REQUEST                        = 0x34CB,
-    CMSG_AUCTION_LIST_BIDDER_ITEMS                    = 0x34D4,
+    CMSG_AUCTION_LIST_BIDDED_ITEMS                    = 0x34D4,
     CMSG_AUCTION_LIST_BUCKETS_BY_BUCKET_KEYS          = 0x34D5,
     CMSG_AUCTION_LIST_ITEMS_BY_BUCKET_KEY             = 0x34D1,
     CMSG_AUCTION_LIST_ITEMS_BY_ITEM_ID                = 0x34D2,
-    CMSG_AUCTION_LIST_OWNER_ITEMS                     = 0x34D3,
+    CMSG_AUCTION_LIST_OWNED_ITEMS                     = 0x34D3,
     CMSG_AUCTION_PLACE_BID                            = 0x34CF,
     CMSG_AUCTION_REMOVE_ITEM                          = 0x34CD,
     CMSG_AUCTION_REPLICATE_ITEMS                      = 0x34CE,
     CMSG_AUCTION_SELL_COMMODITY                       = 0x34D9,
     CMSG_AUCTION_SELL_ITEM                            = 0x34CC,
     CMSG_AUCTION_SET_FAVORITE_ITEM                    = 0x3732,
-    CMSG_AUCTION_START_COMMODITIES_PURCHASE           = 0x34D6,
     CMSG_AUTH_CONTINUED_SESSION                       = 0x3766,
     CMSG_AUTH_SESSION                                 = 0x3765,
     CMSG_AUTOBANK_ITEM                                = 0x3996,
@@ -105,7 +107,6 @@ enum OpcodeClient : uint16
     CMSG_BATTLEMASTER_JOIN_SKIRMISH                   = 0x352A,
     CMSG_BATTLENET_CHALLENGE_RESPONSE                 = 0x36D1,
     CMSG_BATTLENET_REQUEST                            = 0x36F5,
-    CMSG_BATTLENET_REQUEST_REALM_LIST_TICKET          = 0x36FA,
     CMSG_BATTLE_PAY_ACK_FAILED_RESPONSE               = 0x36CB,
     CMSG_BATTLE_PAY_CANCEL_OPEN_CHECKOUT              = 0x3712,
     CMSG_BATTLE_PAY_CONFIRM_PURCHASE_RESPONSE         = 0x36CA,
@@ -115,14 +116,10 @@ enum OpcodeClient : uint16
     CMSG_BATTLE_PAY_OPEN_CHECKOUT                     = 0x370C,
     CMSG_BATTLE_PAY_QUERY_CLASS_TRIAL_BOOST_RESULT    = 0x36C4,
     CMSG_BATTLE_PAY_REQUEST_CHARACTER_BOOST_UNREVOKE  = 0x36C2,
-    CMSG_BATTLE_PAY_REQUEST_CURRENT_VAS_TRANSFER_QUEUES = 0x3709,
     CMSG_BATTLE_PAY_REQUEST_PRICE_INFO                = 0x3708,
-    CMSG_BATTLE_PAY_REQUEST_VAS_CHARACTER_QUEUE_TIME  = 0x370A,
-    CMSG_BATTLE_PAY_START_PURCHASE                    = 0x36F1,
+    CMSG_BATTLE_PAY_START_PURCHASE                    = 0x36C9,
     CMSG_BATTLE_PAY_START_VAS_PURCHASE                = 0x36F2,
     CMSG_BATTLE_PAY_TRIAL_BOOST_CHARACTER             = 0x36C3,
-    CMSG_BATTLE_PAY_VALIDATE_BNET_VAS_TRANSFER        = 0x370B,
-    CMSG_BATTLE_PAY_VAS_PURCHASE_COMPLETE             = 0x36F0,
     CMSG_BATTLE_PET_CLEAR_FANFARE                     = 0x312C,
     CMSG_BATTLE_PET_DELETE_PET                        = 0x3623,
     CMSG_BATTLE_PET_DELETE_PET_CHEAT                  = 0x3624,
@@ -146,8 +143,6 @@ enum OpcodeClient : uint16
     CMSG_BUY_BANK_SLOT                                = 0x34B4,
     CMSG_BUY_ITEM                                     = 0x34A3,
     CMSG_BUY_REAGENT_BANK                             = 0x34B5,
-    CMSG_BUY_WOW_TOKEN_CONFIRM                        = 0x36EA,
-    CMSG_BUY_WOW_TOKEN_START                          = 0x36E9,
     CMSG_CAGE_BATTLE_PET                              = 0x31F2,
     CMSG_CALENDAR_ADD_EVENT                           = 0x367D,
     CMSG_CALENDAR_COMMUNITY_FILTER                    = 0x3671,
@@ -176,13 +171,14 @@ enum OpcodeClient : uint16
     CMSG_CANCEL_TEMP_ENCHANTMENT                      = 0x34FA,
     CMSG_CANCEL_TRADE                                 = 0x315C,
     CMSG_CAN_DUEL                                     = 0x3662,
-    CMSG_CAN_REDEEM_WOW_TOKEN_FOR_BALANCE             = 0x3707,
+    CMSG_CAN_REDEEM_TOKEN_FOR_BALANCE                 = 0x3707,
     CMSG_CAST_SPELL                                   = 0x329F,
     CMSG_CHALLENGE_MODE_REQUEST_LEADERS               = 0x3090,
     CMSG_CHALLENGE_MODE_REQUEST_MAP_STATS             = 0x308F,
     CMSG_CHANGE_BAG_SLOT_FLAG                         = 0x3328,
     CMSG_CHANGE_BANK_BAG_SLOT_FLAG                    = 0x3329,
     CMSG_CHANGE_MONUMENT_APPEARANCE                   = 0x330A,
+    CMSG_CHANGE_REALM_TICKET                          = 0x36FA,
     CMSG_CHANGE_SUB_GROUP                             = 0x364C,
     CMSG_CHARACTER_RENAME_REQUEST                     = 0x36BF,
     CMSG_CHAR_CUSTOMIZE                               = 0x3690,
@@ -224,7 +220,6 @@ enum OpcodeClient : uint16
     CMSG_CHAT_REPORT_FILTERED                         = 0x37CC,
     CMSG_CHAT_REPORT_IGNORED                          = 0x37CB,
     CMSG_CHAT_UNREGISTER_ALL_ADDON_PREFIXES           = 0x37CE,
-    CMSG_CHECK_WOW_TOKEN_VETERAN_ELIGIBILITY          = 0x36E8,
     CMSG_CHOICE_RESPONSE                              = 0x32A4,
     CMSG_CLEAR_NEW_APPEARANCE                         = 0x312F,
     CMSG_CLEAR_RAID_MARKER                            = 0x31A5,
@@ -250,14 +245,22 @@ enum OpcodeClient : uint16
     CMSG_COMMENTATOR_GET_PLAYER_COOLDOWNS             = 0x35F3,
     CMSG_COMMENTATOR_GET_PLAYER_INFO                  = 0x35F2,
     CMSG_COMMENTATOR_START_WARGAME                    = 0x35EF,
+    CMSG_COMMERCE_TOKEN_GET_COUNT                     = 0x36E4,
+    CMSG_COMMERCE_TOKEN_GET_LOG                       = 0x36EE,
+    CMSG_COMMERCE_TOKEN_GET_MARKET_PRICE              = 0x36E5,
     CMSG_COMPLAINT                                    = 0x366C,
     CMSG_COMPLETE_CINEMATIC                           = 0x354F,
     CMSG_COMPLETE_MOVIE                               = 0x34E5,
     CMSG_CONFIRM_ARTIFACT_RESPEC                      = 0x31AA,
     CMSG_CONFIRM_RESPEC_WIPE                          = 0x320D,
     CMSG_CONNECT_TO_FAILED                            = 0x35D4,
+    CMSG_CONSUMABLE_TOKEN_BUY                         = 0x36E9,
+    CMSG_CONSUMABLE_TOKEN_BUY_AT_MARKET_PRICE         = 0x36EA,
+    CMSG_CONSUMABLE_TOKEN_CAN_VETERAN_BUY             = 0x36E8,
+    CMSG_CONSUMABLE_TOKEN_REDEEM                      = 0x36EC,
+    CMSG_CONSUMABLE_TOKEN_REDEEM_CONFIRMATION         = 0x36ED,
     CMSG_CONTRIBUTION_CONTRIBUTE                      = 0x355F,
-    CMSG_CONTRIBUTION_GET_STATE                       = 0x3560,
+    CMSG_CONTRIBUTION_LAST_UPDATE_REQUEST             = 0x3560,
     CMSG_CONVERSATION_LINE_STARTED                    = 0x3550,
     CMSG_CONVERT_RAID                                 = 0x364E,
     CMSG_CREATE_CHARACTER                             = 0x3643,
@@ -286,10 +289,10 @@ enum OpcodeClient : uint16
     CMSG_DUEL_RESPONSE                                = 0x34EA,
     CMSG_EJECT_PASSENGER                              = 0x323F,
     CMSG_EMOTE                                        = 0x354B,
-    CMSG_ENABLE_ENCRYPTION_ACK                        = 0x3767,
     CMSG_ENABLE_NAGLE                                 = 0x376B,
     CMSG_ENABLE_TAXI_NODE                             = 0x34A9,
     CMSG_ENGINE_SURVEY                                = 0x36E2,
+    CMSG_ENTER_ENCRYPTED_MODE_ACK                     = 0x3767,
     CMSG_ENUM_CHARACTERS                              = 0x35E8,
     CMSG_ENUM_CHARACTERS_DELETED_BY_CLIENT            = 0x36DC,
     CMSG_FAR_SIGHT                                    = 0x34F0,
@@ -332,6 +335,8 @@ enum OpcodeClient : uint16
     CMSG_GET_REMAINING_GAME_TIME                      = 0x36EB,
     CMSG_GET_TROPHY_LIST                              = 0x3307,
     CMSG_GET_UNDELETE_CHARACTER_COOLDOWN_STATUS       = 0x36DE,
+    CMSG_GET_VAS_ACCOUNT_CHARACTER_LIST               = 0x36F0,
+    CMSG_GET_VAS_TRANSFER_TARGET_REALM_LIST           = 0x36F1,
     CMSG_GM_TICKET_ACKNOWLEDGE_SURVEY                 = 0x3694,
     CMSG_GM_TICKET_GET_CASE_STATUS                    = 0x3693,
     CMSG_GM_TICKET_GET_SYSTEM_STATUS                  = 0x3692,
@@ -605,8 +610,6 @@ enum OpcodeClient : uint16
     CMSG_READY_CHECK_RESPONSE                         = 0x3634,
     CMSG_READ_ITEM                                    = 0x3327,
     CMSG_RECLAIM_CORPSE                               = 0x34E3,
-    CMSG_REDEEM_WOW_TOKEN_CONFIRM                     = 0x36ED,
-    CMSG_REDEEM_WOW_TOKEN_START                       = 0x36EC,
     CMSG_REMOVE_NEW_ITEM                              = 0x334F,
     CMSG_REMOVE_RAF_RECRUIT                           = 0x3724,
     CMSG_REORDER_CHARACTERS                           = 0x35E9,
@@ -648,7 +651,6 @@ enum OpcodeClient : uint16
     CMSG_REQUEST_VEHICLE_PREV_SEAT                    = 0x323B,
     CMSG_REQUEST_VEHICLE_SWITCH_SEAT                  = 0x323D,
     CMSG_REQUEST_WORLD_QUEST_UPDATE                   = 0x334D,
-    CMSG_REQUEST_WOW_TOKEN_MARKET_PRICE               = 0x36E5,
     CMSG_RESET_CHALLENGE_MODE                         = 0x3205,
     CMSG_RESET_CHALLENGE_MODE_CHEAT                   = 0x3206,
     CMSG_RESET_INSTANCES                              = 0x3668,
@@ -663,11 +665,10 @@ enum OpcodeClient : uint16
     CMSG_SCENE_TRIGGER_EVENT                          = 0x3223,
     CMSG_SELF_RES                                     = 0x353B,
     CMSG_SELL_ITEM                                    = 0x34A2,
-    CMSG_SELL_WOW_TOKEN_CONFIRM                       = 0x36E7,
-    CMSG_SELL_WOW_TOKEN_START                         = 0x36E6,
     CMSG_SEND_CONTACT_LIST                            = 0x36CD,
     CMSG_SEND_MAIL                                    = 0x35FA,
     CMSG_SEND_TEXT_EMOTE                              = 0x3488,
+    CMSG_SERVER_TIME_OFFSET_REQUEST                   = 0x369C,
     CMSG_SET_ACHIEVEMENTS_HIDDEN                      = 0x3228,
     CMSG_SET_ACTION_BAR_TOGGLES                       = 0x353C,
     CMSG_SET_ACTION_BUTTON                            = 0x3635,
@@ -757,7 +758,6 @@ enum OpcodeClient : uint16
     CMSG_TWITTER_CONNECT                              = 0x3127,
     CMSG_TWITTER_DISCONNECT                           = 0x312B,
     CMSG_TWITTER_POST                                 = 0x3332,
-    CMSG_UI_TIME_REQUEST                              = 0x369C,
     CMSG_UNACCEPT_TRADE                               = 0x315B,
     CMSG_UNDELETE_CHARACTER                           = 0x36DD,
     CMSG_UNLEARN_SKILL                                = 0x34ED,
@@ -770,14 +770,15 @@ enum OpcodeClient : uint16
     CMSG_UPDATE_RAID_TARGET                           = 0x3650,
     CMSG_UPDATE_SPELL_VISUAL                          = 0x32A0,
     CMSG_UPDATE_VAS_PURCHASE_STATES                   = 0x36F3,
-    CMSG_UPDATE_WOW_TOKEN_AUCTIONABLE_LIST            = 0x36EE,
-    CMSG_UPDATE_WOW_TOKEN_COUNT                       = 0x36E4,
     CMSG_UPGRADE_GARRISON                             = 0x32C0,
     CMSG_USED_FOLLOW                                  = 0x3186,
     CMSG_USE_CRITTER_ITEM                             = 0x3244,
     CMSG_USE_EQUIPMENT_SET                            = 0x3995,
     CMSG_USE_ITEM                                     = 0x329B,
     CMSG_USE_TOY                                      = 0x329D,
+    CMSG_VAS_CHECK_TRANSFER_OK                        = 0x370B,
+    CMSG_VAS_GET_QUEUE_MINUTES                        = 0x370A,
+    CMSG_VAS_GET_SERVICE_STATUS                       = 0x3709,
     CMSG_VIOLENCE_LEVEL                               = 0x3184,
     CMSG_VOICE_CHAT_JOIN_CHANNEL                      = 0x370F,
     CMSG_VOICE_CHAT_LOGIN                             = 0x370E,
@@ -799,51 +800,63 @@ enum OpcodeServer : uint16
     SMSG_ACCOUNT_CRITERIA_UPDATE                      = 0x28C5,
     SMSG_ACCOUNT_DATA_TIMES                           = 0x274F,
     SMSG_ACCOUNT_MOUNT_UPDATE                         = 0x25C4,
-    SMSG_ACCOUNT_TOYS_UPDATE                          = 0x25C5,
+    SMSG_ACCOUNT_TOY_UPDATE                           = 0x25C5,
+    SMSG_ACCOUNT_TRANSMOG_SET_FAVORITES_UPDATE        = 0x25C8,
+    SMSG_ACCOUNT_TRANSMOG_UPDATE                      = 0x25C7,
     SMSG_ACHIEVEMENT_DELETED                          = 0x2727,
     SMSG_ACHIEVEMENT_EARNED                           = 0x2663,
+    SMSG_ACTIVATE_ESSENCE_FAILED                      = 0x2872,
     SMSG_ACTIVATE_TAXI_REPLY                          = 0x26AC,
     SMSG_ACTIVE_GLYPHS                                = 0x2C53,
+    SMSG_ADDON_LIST_REQUEST                           = 0x2662,
     SMSG_ADD_BATTLENET_FRIEND_RESPONSE                = 0x265D,
     SMSG_ADD_ITEM_PASSIVE                             = 0x25C0,
     SMSG_ADD_LOSS_OF_CONTROL                          = 0x269C,
     SMSG_ADD_RUNE_POWER                               = 0x26EB,
     SMSG_ADJUST_SPLINE_DURATION                       = 0x25E9,
-    SMSG_ADVENTURE_MAP_POI_QUERY_RESPONSE             = 0x2842,
+    SMSG_ADVENTURE_MAP_OPEN_NPC                       = 0x2838,
     SMSG_AE_LOOT_TARGETS                              = 0x262F,
     SMSG_AE_LOOT_TARGET_ACK                           = 0x2630,
     SMSG_AI_REACTION                                  = 0x26E8,
+    SMSG_ALLIED_RACE_DETAILS                          = 0x283E,
     SMSG_ALL_ACCOUNT_CRITERIA                         = 0x2571,
     SMSG_ALL_ACHIEVEMENT_DATA                         = 0x2570,
     SMSG_ALL_GUILD_ACHIEVEMENTS                       = 0x29B8,
+    SMSG_APPLY_MOUNT_EQUIPMENT_RESULT                 = 0x28B5,
     SMSG_ARCHAEOLOGY_SURVERY_CAST                     = 0x2588,
-    SMSG_AREA_POI_UPDATE                              = 0x284F,
+    SMSG_AREA_POI_UPDATE_RESPONSE                     = 0x284F,
     SMSG_AREA_SPIRIT_HEALER_TIME                      = 0x2786,
     SMSG_AREA_TRIGGER_DENIED                          = 0x26A3,
+    SMSG_AREA_TRIGGER_FORCE_SET_POSITION_AND_FACING   = 0x2642,
     SMSG_AREA_TRIGGER_NO_CORPSE                       = 0x275B,
-    SMSG_AREA_TRIGGER_PLAY_VISUAL_EVENT               = 0x2641,
+    SMSG_AREA_TRIGGER_PLAY_SPELL_VISUAL               = 0x2641,
     SMSG_AREA_TRIGGER_RE_PATH                         = 0x263F,
     SMSG_AREA_TRIGGER_RE_SHAPE                        = 0x2644,
-    SMSG_ARENA_CROWD_CONTROL_SPELLS                   = 0x2652,
+    SMSG_AREA_TRIGGER_SET_VISUAL_ANIM                 = 0x2640,
+    SMSG_AREA_TRIGGER_UNATTACH                        = 0x2643,
+    SMSG_ARENA_CROWD_CONTROL_SPELL_RESULT             = 0x2652,
     SMSG_ARENA_PREP_OPPONENT_SPECIALIZATIONS          = 0x2668,
-    SMSG_ARTIFACT_FORGE_OPENED                        = 0x27E8,
-    SMSG_ARTIFACT_RESPEC_CONFIRM                      = 0x27EB,
-    SMSG_ARTIFACT_TRAITS_REFUNDED                     = 0x27EC,
+    SMSG_ARTIFACT_ENDGAME_POWERS_REFUNDED             = 0x27EC,
+    SMSG_ARTIFACT_FORGE_ERROR                         = 0x27EA,
+    SMSG_ARTIFACT_RESPEC_PROMPT                       = 0x27EB,
     SMSG_ARTIFACT_XP_GAIN                             = 0x2830,
     SMSG_ATTACKER_STATE_UPDATE                        = 0x27D5,
     SMSG_ATTACK_START                                 = 0x2670,
     SMSG_ATTACK_STOP                                  = 0x2671,
     SMSG_ATTACK_SWING_ERROR                           = 0x2739,
     SMSG_ATTACK_SWING_LANDED_LOG                      = 0x273A,
+    SMSG_AUCTIONABLE_TOKEN_AUCTION_SOLD               = 0x281E,
+    SMSG_AUCTIONABLE_TOKEN_SELL_AT_MARKET_PRICE_RESPONSE = 0x281D,
+    SMSG_AUCTIONABLE_TOKEN_SELL_CONFIRM_REQUIRED      = 0x281C,
     SMSG_AUCTION_CLOSED_NOTIFICATION                  = 0x2731,
     SMSG_AUCTION_COMMAND_RESULT                       = 0x272E,
-    SMSG_AUCTION_COMMODITY_QUOTE                      = 0x28C3,
-    SMSG_AUCTION_FAVORITE_ITEMS                       = 0x28CC,
+    SMSG_AUCTION_FAVORITE_LIST                        = 0x28CC,
+    SMSG_AUCTION_GET_COMMODITY_QUOTE_RESULT           = 0x28C3,
     SMSG_AUCTION_HELLO_RESPONSE                       = 0x272C,
-    SMSG_AUCTION_LIST_BIDDER_ITEMS_RESULT             = 0x28C2,
+    SMSG_AUCTION_LIST_BIDDED_ITEMS_RESULT             = 0x28C2,
     SMSG_AUCTION_LIST_BUCKETS_RESULT                  = 0x28BF,
     SMSG_AUCTION_LIST_ITEMS_RESULT                    = 0x28C0,
-    SMSG_AUCTION_LIST_OWNER_ITEMS_RESULT              = 0x28C1,
+    SMSG_AUCTION_LIST_OWNED_ITEMS_RESULT              = 0x28C1,
     SMSG_AUCTION_OUTBID_NOTIFICATION                  = 0x2730,
     SMSG_AUCTION_OWNER_BID_NOTIFICATION               = 0x2732,
     SMSG_AUCTION_REPLICATE_RESPONSE                   = 0x272D,
@@ -851,17 +864,13 @@ enum OpcodeServer : uint16
     SMSG_AURA_POINTS_DEPLETED                         = 0x2C23,
     SMSG_AURA_UPDATE                                  = 0x2C22,
     SMSG_AUTH_CHALLENGE                               = 0x3048,
-    SMSG_AUTH_ERROR                                   = 0x256C,
+    SMSG_AUTH_FAILED                                  = 0x256C,
     SMSG_AUTH_RESPONSE                                = 0x256D,
     SMSG_AVAILABLE_HOTFIXES                           = 0x25A3,
-    SMSG_AZERITE_EMPOWERED_ITEM_EQUIPPED_STATUS_CHANGED = 0x2871,
-    SMSG_AZERITE_EMPOWERED_ITEM_RESPEC_OPEN           = 0x283B,
-    SMSG_AZERITE_ESSENCE_FORGE_CLOSE                  = 0x2874,
-    SMSG_AZERITE_ESSENCE_FORGE_OPENED                 = 0x2873,
-    SMSG_AZERITE_ESSENCE_SELECTION_RESULT             = 0x2872,
-    SMSG_AZERITE_XP_GAIN                              = 0x2870,
-    SMSG_BAN_REASON                                   = 0x26B8,
+    SMSG_AZERITE_RESPEC_NPC                           = 0x283B,
+    SMSG_BAG_CLEANUP_FINISHED                         = 0x2826,
     SMSG_BARBER_SHOP_RESULT                           = 0x26F1,
+    SMSG_BATCH_PRESENCE_SUBSCRIPTION                  = 0x28A4,
     SMSG_BATTLEFIELD_LIST                             = 0x2596,
     SMSG_BATTLEFIELD_PORT_DENIED                      = 0x259C,
     SMSG_BATTLEFIELD_STATUS_ACTIVE                    = 0x2592,
@@ -879,38 +888,27 @@ enum OpcodeServer : uint16
     SMSG_BATTLENET_CHALLENGE_ABORT                    = 0x27D4,
     SMSG_BATTLENET_CHALLENGE_START                    = 0x27D3,
     SMSG_BATTLENET_NOTIFICATION                       = 0x284A,
-    SMSG_BATTLENET_REALM_LIST_TICKET                  = 0x284C,
     SMSG_BATTLENET_RESPONSE                           = 0x2849,
-    SMSG_BATTLENET_SET_SESSION_STATE                  = 0x284B,
-    SMSG_BATTLENET_UPDATE_SESSION_KEY                 = 0x286A,
+    SMSG_BATTLE_NET_CONNECTION_STATUS                 = 0x284B,
     SMSG_BATTLE_PAY_ACK_FAILED                        = 0x27CE,
     SMSG_BATTLE_PAY_BATTLE_PET_DELIVERED              = 0x27C2,
-    SMSG_BATTLE_PAY_BUNDLE_PRICE_UPDATE               = 0x285D,
+    SMSG_BATTLE_PAY_COLLECTION_ITEM_DELIVERED         = 0x27C3,
     SMSG_BATTLE_PAY_CONFIRM_PURCHASE                  = 0x27CD,
     SMSG_BATTLE_PAY_DELIVERY_ENDED                    = 0x27C0,
     SMSG_BATTLE_PAY_DELIVERY_STARTED                  = 0x27BF,
+    SMSG_BATTLE_PAY_DISTRIBUTION_UNREVOKED            = 0x27BD,
     SMSG_BATTLE_PAY_DISTRIBUTION_UPDATE               = 0x27BE,
     SMSG_BATTLE_PAY_GET_DISTRIBUTION_LIST_RESPONSE    = 0x27BC,
     SMSG_BATTLE_PAY_GET_PRODUCT_LIST_RESPONSE         = 0x27BA,
     SMSG_BATTLE_PAY_GET_PURCHASE_LIST_RESPONSE        = 0x27BB,
     SMSG_BATTLE_PAY_MOUNT_DELIVERED                   = 0x27C1,
-    SMSG_BATTLE_PAY_OPEN_CHECKOUT_RESULT              = 0x2863,
     SMSG_BATTLE_PAY_PURCHASE_UPDATE                   = 0x27CC,
+    SMSG_BATTLE_PAY_START_CHECKOUT                    = 0x2869,
     SMSG_BATTLE_PAY_START_DISTRIBUTION_ASSIGN_TO_TARGET_RESPONSE = 0x27CA,
     SMSG_BATTLE_PAY_START_PURCHASE_RESPONSE           = 0x27C9,
-    SMSG_BATTLE_PAY_SUBSCRIPTION_CHANGED              = 0x286C,
-    SMSG_BATTLE_PAY_TOY_DELIVERED                     = 0x27C3,
-    SMSG_BATTLE_PAY_VAS_BNET_TRANSFER_VALIDATION_RESULT = 0x2861,
-    SMSG_BATTLE_PAY_VAS_BOOST_CONSUMED                = 0x27BD,
-    SMSG_BATTLE_PAY_VAS_CHARACTER_LIST                = 0x2833,
-    SMSG_BATTLE_PAY_VAS_CHARACTER_QUEUE_STATUS        = 0x285F,
+    SMSG_BATTLE_PAY_VALIDATE_PURCHASE_RESPONSE        = 0x285D,
     SMSG_BATTLE_PAY_VAS_GUILD_FOLLOW_INFO             = 0x29E7,
     SMSG_BATTLE_PAY_VAS_GUILD_MASTER_LIST             = 0x29E6,
-    SMSG_BATTLE_PAY_VAS_PURCHASE_COMPLETE             = 0x2836,
-    SMSG_BATTLE_PAY_VAS_PURCHASE_LIST                 = 0x2837,
-    SMSG_BATTLE_PAY_VAS_PURCHASE_STARTED              = 0x2835,
-    SMSG_BATTLE_PAY_VAS_REALM_LIST                    = 0x2834,
-    SMSG_BATTLE_PAY_VAS_TRANSFER_QUEUE_STATUS         = 0x285E,
     SMSG_BATTLE_PETS_HEALED                           = 0x260B,
     SMSG_BATTLE_PET_CAGE_DATE_ERROR                   = 0x26A6,
     SMSG_BATTLE_PET_DELETED                           = 0x2608,
@@ -919,9 +917,9 @@ enum OpcodeServer : uint16
     SMSG_BATTLE_PET_JOURNAL_LOCK_ACQUIRED             = 0x2605,
     SMSG_BATTLE_PET_JOURNAL_LOCK_DENIED               = 0x2606,
     SMSG_BATTLE_PET_LICENSE_CHANGED                   = 0x260C,
-    SMSG_BATTLE_PET_MAX_COUNT_CHANGED                 = 0x2603,
     SMSG_BATTLE_PET_RESTORED                          = 0x260A,
     SMSG_BATTLE_PET_REVOKED                           = 0x2609,
+    SMSG_BATTLE_PET_SET_MAX_PETS                      = 0x2603,
     SMSG_BATTLE_PET_TRAP_LEVEL                        = 0x2602,
     SMSG_BATTLE_PET_UPDATES                           = 0x2601,
     SMSG_BINDER_CONFIRM                               = 0x273F,
@@ -932,28 +930,29 @@ enum OpcodeServer : uint16
     SMSG_BLACK_MARKET_REQUEST_ITEMS_RESULT            = 0x2647,
     SMSG_BLACK_MARKET_WON                             = 0x264A,
     SMSG_BONUS_ROLL_EMPTY                             = 0x2665,
-    SMSG_BONUS_ROLL_FAILED                            = 0x2877,
-    SMSG_BOSS_KILL_CREDIT                             = 0x27C8,
+    SMSG_BOSS_KILL                                    = 0x27C8,
     SMSG_BREAK_TARGET                                 = 0x266F,
     SMSG_BROADCAST_ACHIEVEMENT                        = 0x2BBC,
+    SMSG_BROADCAST_SUMMON_CAST                        = 0x28A8,
+    SMSG_BROADCAST_SUMMON_RESPONSE                    = 0x28A9,
     SMSG_BUY_FAILED                                   = 0x26FA,
     SMSG_BUY_SUCCEEDED                                = 0x26F9,
     SMSG_CACHE_INFO                                   = 0x2749,
     SMSG_CACHE_VERSION                                = 0x2748,
     SMSG_CALENDAR_CLEAR_PENDING_ACTION                = 0x26CC,
     SMSG_CALENDAR_COMMAND_RESULT                      = 0x26CD,
-    SMSG_CALENDAR_EVENT_INITIAL_INVITES               = 0x26BC,
-    SMSG_CALENDAR_EVENT_INVITE                        = 0x26BD,
-    SMSG_CALENDAR_EVENT_INVITE_ALERT                  = 0x26C1,
-    SMSG_CALENDAR_EVENT_INVITE_MODERATOR_STATUS       = 0x26C0,
-    SMSG_CALENDAR_EVENT_INVITE_NOTES                  = 0x26C6,
-    SMSG_CALENDAR_EVENT_INVITE_NOTES_ALERT            = 0x26C7,
-    SMSG_CALENDAR_EVENT_INVITE_REMOVED                = 0x26BE,
-    SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT          = 0x26C3,
-    SMSG_CALENDAR_EVENT_INVITE_STATUS                 = 0x26BF,
-    SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT           = 0x26C2,
+    SMSG_CALENDAR_COMMUNITY_INVITE                    = 0x26BC,
     SMSG_CALENDAR_EVENT_REMOVED_ALERT                 = 0x26C4,
     SMSG_CALENDAR_EVENT_UPDATED_ALERT                 = 0x26C5,
+    SMSG_CALENDAR_INVITE_ADDED                        = 0x26BD,
+    SMSG_CALENDAR_INVITE_ALERT                        = 0x26C1,
+    SMSG_CALENDAR_INVITE_MODERATOR_STATUS             = 0x26C0,
+    SMSG_CALENDAR_INVITE_NOTES                        = 0x26C6,
+    SMSG_CALENDAR_INVITE_NOTES_ALERT                  = 0x26C7,
+    SMSG_CALENDAR_INVITE_REMOVED                      = 0x26BE,
+    SMSG_CALENDAR_INVITE_REMOVED_ALERT                = 0x26C3,
+    SMSG_CALENDAR_INVITE_STATUS                       = 0x26BF,
+    SMSG_CALENDAR_INVITE_STATUS_ALERT                 = 0x26C2,
     SMSG_CALENDAR_RAID_LOCKOUT_ADDED                  = 0x26C8,
     SMSG_CALENDAR_RAID_LOCKOUT_REMOVED                = 0x26C9,
     SMSG_CALENDAR_RAID_LOCKOUT_UPDATED                = 0x26CA,
@@ -968,36 +967,31 @@ enum OpcodeServer : uint16
     SMSG_CANCEL_SPELL_VISUAL                          = 0x2C44,
     SMSG_CANCEL_SPELL_VISUAL_KIT                      = 0x2C48,
     SMSG_CAN_DUEL_RESULT                              = 0x267A,
+    SMSG_CAN_REDEEM_TOKEN_FOR_BALANCE_RESPONSE        = 0x285C,
+    SMSG_CAPTURE_POINT_REMOVED                        = 0x2599,
     SMSG_CAST_FAILED                                  = 0x2C56,
     SMSG_CATEGORY_COOLDOWN                            = 0x2C16,
-    SMSG_CHALLENGE_MODE_AFFIXES                       = 0x2625,
-    SMSG_CHALLENGE_MODE_ALL_MAP_STATS                 = 0x2624,
     SMSG_CHALLENGE_MODE_COMPLETE                      = 0x2622,
-    SMSG_CHALLENGE_MODE_NEW_PLAYER_RECORD             = 0x2628,
-    SMSG_CHALLENGE_MODE_NEW_PLAYER_SEASON_RECORD      = 0x2629,
     SMSG_CHALLENGE_MODE_REQUEST_LEADERS_RESULT        = 0x2626,
     SMSG_CHALLENGE_MODE_RESET                         = 0x2621,
-    SMSG_CHALLENGE_MODE_REWARDS                       = 0x2623,
     SMSG_CHALLENGE_MODE_START                         = 0x261F,
     SMSG_CHALLENGE_MODE_UPDATE_DEATH_COUNT            = 0x2620,
     SMSG_CHANGE_PLAYER_DIFFICULTY_RESULT              = 0x273B,
+    SMSG_CHANGE_REALM_TICKET_RESPONSE                 = 0x284C,
     SMSG_CHANNEL_LIST                                 = 0x2BC3,
     SMSG_CHANNEL_NOTIFY                               = 0x2BC0,
     SMSG_CHANNEL_NOTIFY_JOINED                        = 0x2BC1,
     SMSG_CHANNEL_NOTIFY_LEFT                          = 0x2BC2,
-    SMSG_CHARACTER_CLASS_TRIAL_CREATE                 = 0x2806,
-    SMSG_CHARACTER_INVENTORY_OVERFLOW_WARNING         = 0x286B,
-    SMSG_CHARACTER_ITEM_FIXUP                         = 0x285A,
+    SMSG_CHARACTER_CHECK_UPGRADE_RESULT               = 0x2806,
     SMSG_CHARACTER_LOGIN_FAILED                       = 0x274A,
     SMSG_CHARACTER_OBJECT_TEST_RESPONSE               = 0x27D2,
     SMSG_CHARACTER_RENAME_RESULT                      = 0x27AC,
-    SMSG_CHARACTER_UPGRADE_COMPLETE                   = 0x2805,
-    SMSG_CHARACTER_UPGRADE_QUEUED                     = 0x2804,
-    SMSG_CHARACTER_UPGRADE_SPELL_TIER_SET             = 0x25F6,
+    SMSG_CHARACTER_UPGRADE_ABORTED                    = 0x2805,
+    SMSG_CHARACTER_UPGRADE_COMPLETE                   = 0x2804,
+    SMSG_CHARACTER_UPGRADE_MANUAL_UNREVOKE_RESULT     = 0x2807,
     SMSG_CHARACTER_UPGRADE_STARTED                    = 0x2803,
-    SMSG_CHARACTER_UPGRADE_UNREVOKE_RESULT            = 0x2807,
-    SMSG_CHAR_CUSTOMIZE                               = 0x2722,
-    SMSG_CHAR_CUSTOMIZE_FAILED                        = 0x2721,
+    SMSG_CHAR_CUSTOMIZE_FAILURE                       = 0x2721,
+    SMSG_CHAR_CUSTOMIZE_SUCCESS                       = 0x2722,
     SMSG_CHAR_FACTION_CHANGE_RESULT                   = 0x27F0,
     SMSG_CHAT                                         = 0x2BAD,
     SMSG_CHAT_AUTO_RESPONDED                          = 0x2BB8,
@@ -1012,31 +1006,45 @@ enum OpcodeServer : uint16
     SMSG_CHAT_SERVER_MESSAGE                          = 0x2BC4,
     SMSG_CHEAT_IGNORE_DIMISHING_RETURNS               = 0x2C12,
     SMSG_CHECK_WARGAME_ENTRY                          = 0x25A0,
+    SMSG_CLAIM_RAF_REWARD_RESPONSE                    = 0x28B9,
     SMSG_CLEAR_ALL_SPELL_CHARGES                      = 0x2C27,
     SMSG_CLEAR_BOSS_EMOTES                            = 0x25CE,
     SMSG_CLEAR_COOLDOWN                               = 0x26ED,
     SMSG_CLEAR_COOLDOWNS                              = 0x2C26,
     SMSG_CLEAR_LOSS_OF_CONTROL                        = 0x269E,
+    SMSG_CLEAR_RESURRECT                              = 0x2580,
     SMSG_CLEAR_SPELL_CHARGES                          = 0x2C28,
     SMSG_CLEAR_TARGET                                 = 0x26E4,
-    SMSG_CLUB_FINDER_APPLICANTS_LIST                  = 0x28AE,
-    SMSG_CLUB_FINDER_APPLICATIONS                     = 0x28AF,
-    SMSG_CLUB_FINDER_APPLICATIONS_CHANGED             = 0x28B0,
-    SMSG_CLUB_FINDER_CLUBS_DATA                       = 0x28B2,
-    SMSG_CLUB_FINDER_CLUBS_LIST                       = 0x28AD,
-    SMSG_CLUB_FINDER_COMMAND_RESULT                   = 0x28B1,
+    SMSG_CLOSE_ARTIFACT_FORGE                         = 0x27E9,
+    SMSG_CLOSE_HEART_FORGE                            = 0x2874,
+    SMSG_CLUB_FINDER_ERROR_MESSAGE                    = 0x28B1,
+    SMSG_CLUB_FINDER_GET_CLUB_POSTING_IDS_RESPONSE    = 0x28B4,
+    SMSG_CLUB_FINDER_LOOKUP_CLUB_POSTINGS_LIST        = 0x28B2,
+    SMSG_CLUB_FINDER_RESPONSE_CHARACTER_APPLICATION_LIST = 0x28AF,
+    SMSG_CLUB_FINDER_RESPONSE_POST_RECRUITMENT_MESSAGE = 0x28B3,
+    SMSG_CLUB_FINDER_UPDATE_APPLICATIONS              = 0x28B0,
     SMSG_COIN_REMOVED                                 = 0x262E,
     SMSG_COMBAT_EVENT_FAILED                          = 0x2672,
     SMSG_COMMENTATOR_MAP_INFO                         = 0x274C,
     SMSG_COMMENTATOR_PLAYER_INFO                      = 0x274D,
     SMSG_COMMENTATOR_STATE_CHANGED                    = 0x274B,
+    SMSG_COMMERCE_TOKEN_GET_COUNT_RESPONSE            = 0x2819,
+    SMSG_COMMERCE_TOKEN_GET_LOG_RESPONSE              = 0x2825,
+    SMSG_COMMERCE_TOKEN_GET_MARKET_PRICE_RESPONSE     = 0x281B,
+    SMSG_COMMERCE_TOKEN_UPDATE                        = 0x281A,
     SMSG_COMPLAINT_RESULT                             = 0x26DB,
     SMSG_COMPLETE_SHIPMENT_RESPONSE                   = 0x27E4,
+    SMSG_CONFIRM_PARTY_INVITE                         = 0x285B,
     SMSG_CONNECT_TO                                   = 0x304D,
     SMSG_CONQUEST_FORMULA_CONSTANTS                   = 0x27CF,
     SMSG_CONSOLE_WRITE                                = 0x2655,
+    SMSG_CONSUMABLE_TOKEN_BUY_AT_MARKET_PRICE_RESPONSE = 0x2821,
+    SMSG_CONSUMABLE_TOKEN_BUY_CHOICE_REQUIRED         = 0x2820,
+    SMSG_CONSUMABLE_TOKEN_CAN_VETERAN_BUY_RESPONSE    = 0x281F,
+    SMSG_CONSUMABLE_TOKEN_REDEEM_CONFIRM_REQUIRED     = 0x2823,
+    SMSG_CONSUMABLE_TOKEN_REDEEM_RESPONSE             = 0x2824,
     SMSG_CONTACT_LIST                                 = 0x27D0,
-    SMSG_CONTRIBUTION_COLLECTOR_STATE                 = 0x2862,
+    SMSG_CONTRIBUTION_LAST_UPDATE_RESPONSE            = 0x2862,
     SMSG_CONTROL_UPDATE                               = 0x2667,
     SMSG_COOLDOWN_CHEAT                               = 0x277F,
     SMSG_COOLDOWN_EVENT                               = 0x26EC,
@@ -1053,11 +1061,13 @@ enum OpcodeServer : uint16
     SMSG_DAMAGE_CALC_LOG                              = 0x280E,
     SMSG_DB_REPLY                                     = 0x25A2,
     SMSG_DEATH_RELEASE_LOC                            = 0x2710,
+    SMSG_DEBUG_MENU_MANAGER_FULL_UPDATE               = 0x2680,
     SMSG_DEFENSE_MESSAGE                              = 0x2BB6,
     SMSG_DELETE_CHAR                                  = 0x2745,
     SMSG_DESTROY_ARENA_UNIT                           = 0x2788,
     SMSG_DESTRUCTIBLE_BUILDING_DAMAGE                 = 0x2738,
     SMSG_DIFFERENT_INSTANCE_FROM_PARTY                = 0x258C,
+    SMSG_DISCONNECT_REASON                            = 0x2832,
     SMSG_DISENCHANT_CREDIT                            = 0x25BD,
     SMSG_DISMOUNT                                     = 0x26E3,
     SMSG_DISMOUNT_RESULT                              = 0x257C,
@@ -1067,31 +1077,33 @@ enum OpcodeServer : uint16
     SMSG_DISPLAY_PROMOTION                            = 0x266B,
     SMSG_DISPLAY_QUEST_POPUP                          = 0x2A9D,
     SMSG_DISPLAY_TOAST                                = 0x263B,
+    SMSG_DISPLAY_WORLD_TEXT                           = 0x2831,
     SMSG_DONT_AUTO_PUSH_SPELLS_TO_ACTION_BAR          = 0x25F8,
     SMSG_DROP_NEW_CONNECTION                          = 0x304C,
+    SMSG_DUEL_ARRANGED                                = 0x2674,
     SMSG_DUEL_COMPLETE                                = 0x2678,
     SMSG_DUEL_COUNTDOWN                               = 0x2677,
     SMSG_DUEL_IN_BOUNDS                               = 0x2676,
-    SMSG_DUEL_OPPONENT_SELECTED                       = 0x2674,
     SMSG_DUEL_OUT_OF_BOUNDS                           = 0x2675,
     SMSG_DUEL_REQUESTED                               = 0x2673,
     SMSG_DUEL_WINNER                                  = 0x2679,
     SMSG_DURABILITY_DAMAGE_DEATH                      = 0x278D,
     SMSG_EMOTE                                        = 0x280F,
     SMSG_ENABLE_BARBER_SHOP                           = 0x26F0,
-    SMSG_ENABLE_ENCRYPTION                            = 0x3049,
     SMSG_ENCHANTMENT_LOG                              = 0x2758,
     SMSG_ENCOUNTER_END                                = 0x27C7,
     SMSG_ENCOUNTER_START                              = 0x27C6,
-    SMSG_ENTITLEMENTS                                 = 0x28C8,
-    SMSG_ENTITLEMENT_NOTIFICATION                     = 0x28C9,
+    SMSG_END_LIGHTNING_STORM                          = 0x26D7,
+    SMSG_ENTER_ENCRYPTED_MODE                         = 0x3049,
     SMSG_ENUM_CHARACTERS_RESULT                       = 0x2584,
+    SMSG_ENUM_VAS_PURCHASE_STATES_RESPONSE            = 0x2837,
     SMSG_ENVIRONMENTAL_DAMAGE_LOG                     = 0x2C21,
     SMSG_EQUIPMENT_SET_ID                             = 0x26E5,
     SMSG_EXPECTED_SPAM_RECORDS                        = 0x2BB1,
     SMSG_EXPLORATION_EXPERIENCE                       = 0x27A9,
     SMSG_FACTION_BONUS_INFO                           = 0x276A,
     SMSG_FAILED_PLAYER_CONDITION                      = 0x25E3,
+    SMSG_FAILED_QUEST_TURN_IN                         = 0x2858,
     SMSG_FEATURE_SYSTEM_STATUS                        = 0x25D2,
     SMSG_FEATURE_SYSTEM_STATUS_GLUE_SCREEN            = 0x25D3,
     SMSG_FEIGN_DEATH_RESISTED                         = 0x278B,
@@ -1102,16 +1114,15 @@ enum OpcodeServer : uint16
     SMSG_FORCE_ANIM                                   = 0x2798,
     SMSG_FORCE_OBJECT_RELINK                          = 0x266A,
     SMSG_FRIEND_STATUS                                = 0x27D1,
-    SMSG_GAME_EVENT_DEBUG_INITIALIZE                  = 0x2680,
     SMSG_GAME_OBJECT_ACTIVATE_ANIM_KIT                = 0x25D7,
+    SMSG_GAME_OBJECT_BASE                             = 0x2875,
     SMSG_GAME_OBJECT_CUSTOM_ANIM                      = 0x25D8,
     SMSG_GAME_OBJECT_DESPAWN                          = 0x25D9,
-    SMSG_GAME_OBJECT_MULTI_TRANSITION                 = 0x2875,
     SMSG_GAME_OBJECT_PLAY_SPELL_VISUAL                = 0x2C4B,
     SMSG_GAME_OBJECT_PLAY_SPELL_VISUAL_KIT            = 0x2C4A,
     SMSG_GAME_OBJECT_RESET_STATE                      = 0x2762,
-    SMSG_GAME_OBJECT_SET_STATE                        = 0x2848,
-    SMSG_GAME_OBJECT_UI_ACTION                        = 0x275F,
+    SMSG_GAME_OBJECT_SET_STATE_LOCAL                  = 0x2848,
+    SMSG_GAME_OBJECT_UI_LINK                          = 0x275F,
     SMSG_GAME_SPEED_SET                               = 0x26B0,
     SMSG_GAME_TIME_SET                                = 0x2751,
     SMSG_GAME_TIME_UPDATE                             = 0x2750,
@@ -1133,7 +1144,6 @@ enum OpcodeServer : uint16
     SMSG_GARRISON_FOLLOWER_CHANGED_STATUS             = 0x2915,
     SMSG_GARRISON_FOLLOWER_CHANGED_XP                 = 0x2912,
     SMSG_GARRISON_IS_UPGRADEABLE_RESULT               = 0x2929,
-    SMSG_GARRISON_LANDING_PAGE_SHIPMENT_INFO          = 0x27E6,
     SMSG_GARRISON_LEARN_BLUEPRINT_RESULT              = 0x28F7,
     SMSG_GARRISON_LEARN_SPECIALIZATION_RESULT         = 0x28F5,
     SMSG_GARRISON_LIST_FOLLOWERS_CHEAT_RESULT         = 0x2905,
@@ -1164,12 +1174,18 @@ enum OpcodeServer : uint16
     SMSG_GARRISON_UNLEARN_BLUEPRINT_RESULT            = 0x28F8,
     SMSG_GARRISON_UPGRADE_RESULT                      = 0x28FD,
     SMSG_GENERATE_RANDOM_CHARACTER_NAME_RESULT        = 0x2585,
+    SMSG_GENERATE_SSO_TOKEN_RESPONSE                  = 0x2863,
     SMSG_GET_ACCOUNT_CHARACTER_LIST_RESULT            = 0x27AA,
     SMSG_GET_DISPLAYED_TROPHY_LIST_RESPONSE           = 0x2928,
     SMSG_GET_GARRISON_INFO_RESULT                     = 0x28F0,
+    SMSG_GET_LANDING_PAGE_SHIPMENTS_RESPONSE          = 0x27E6,
+    SMSG_GET_REMAINING_GAME_TIME_RESPONSE             = 0x2822,
+    SMSG_GET_SELECTED_TROPHY_ID_RESPONSE              = 0x280B,
     SMSG_GET_SHIPMENTS_OF_TYPE_RESPONSE               = 0x27E5,
     SMSG_GET_SHIPMENT_INFO_RESPONSE                   = 0x27E1,
     SMSG_GET_TROPHY_LIST_RESPONSE                     = 0x280A,
+    SMSG_GET_VAS_ACCOUNT_CHARACTER_LIST_RESULT        = 0x2833,
+    SMSG_GET_VAS_TRANSFER_TARGET_REALM_LIST_RESULT    = 0x2834,
     SMSG_GM_PLAYER_INFO                               = 0x277E,
     SMSG_GM_REQUEST_PLAYER_INFO                       = 0x25EF,
     SMSG_GM_TICKET_CASE_STATUS                        = 0x26D2,
@@ -1180,9 +1196,9 @@ enum OpcodeServer : uint16
     SMSG_GOSSIP_POI                                   = 0x27DE,
     SMSG_GOSSIP_TEXT_UPDATE                           = 0x2A98,
     SMSG_GROUP_ACTION_THROTTLED                       = 0x259E,
+    SMSG_GROUP_AUTO_KICK                              = 0x27DC,
     SMSG_GROUP_DECLINE                                = 0x27D9,
     SMSG_GROUP_DESTROYED                              = 0x27DB,
-    SMSG_GROUP_INVITE_CONFIRMATION                    = 0x285B,
     SMSG_GROUP_NEW_LEADER                             = 0x264D,
     SMSG_GROUP_UNINVITE                               = 0x27DA,
     SMSG_GUILD_ACHIEVEMENT_DELETED                    = 0x29C5,
@@ -1240,10 +1256,8 @@ enum OpcodeServer : uint16
     SMSG_GUILD_SEND_RANK_CHANGE                       = 0x29B9,
     SMSG_HEALTH_UPDATE                                = 0x2706,
     SMSG_HIGHEST_THREAT_UPDATE                        = 0x2717,
+    SMSG_HOTFIX_CONNECT                               = 0x25A5,
     SMSG_HOTFIX_MESSAGE                               = 0x25A4,
-    SMSG_HOTFIX_RESPONSE                              = 0x25A5,
-    SMSG_INCOMING_SUMMON_COMPLETED                    = 0x28A9,
-    SMSG_INCOMING_SUMMON_PENDING                      = 0x28A8,
     SMSG_INITIALIZE_FACTIONS                          = 0x2769,
     SMSG_INITIAL_SETUP                                = 0x2581,
     SMSG_INIT_WORLD_STATES                            = 0x278E,
@@ -1258,10 +1272,10 @@ enum OpcodeServer : uint16
     SMSG_INSTANCE_ENCOUNTER_OBJECTIVE_START           = 0x27F8,
     SMSG_INSTANCE_ENCOUNTER_OBJECTIVE_UPDATE          = 0x27FD,
     SMSG_INSTANCE_ENCOUNTER_PHASE_SHIFT_CHANGED       = 0x2801,
-    SMSG_INSTANCE_ENCOUNTER_SET_ALLOWING_RELEASE      = 0x27FC,
-    SMSG_INSTANCE_ENCOUNTER_SET_SUPPRESSING_RELEASE   = 0x27FB,
     SMSG_INSTANCE_ENCOUNTER_START                     = 0x27FA,
     SMSG_INSTANCE_ENCOUNTER_TIMER_START               = 0x27F7,
+    SMSG_INSTANCE_ENCOUNTER_UPDATE_ALLOW_RELEASE_IN_PROGRESS = 0x27FC,
+    SMSG_INSTANCE_ENCOUNTER_UPDATE_SUPPRESS_RELEASE   = 0x27FB,
     SMSG_INSTANCE_GROUP_SIZE_CHANGED                  = 0x273C,
     SMSG_INSTANCE_INFO                                = 0x2654,
     SMSG_INSTANCE_RESET                               = 0x26B5,
@@ -1271,25 +1285,26 @@ enum OpcodeServer : uint16
     SMSG_INVALIDATE_PLAYER                            = 0x26DA,
     SMSG_INVALID_PROMOTION_CODE                       = 0x2799,
     SMSG_INVENTORY_CHANGE_FAILURE                     = 0x2767,
-    SMSG_ISLAND_AZERITE_XP_GAIN                       = 0x27A6,
-    SMSG_ISLAND_COMPLETED                             = 0x27A7,
-    SMSG_ISLAND_OPEN_QUEUE_NPC                        = 0x283D,
+    SMSG_INVENTORY_FIXUP_COMPLETE                     = 0x285A,
+    SMSG_INVENTORY_FULL_OVERFLOW                      = 0x286B,
+    SMSG_ISLANDS_MISSION_NPC                          = 0x283D,
+    SMSG_ISLAND_AZERITE_GAIN                          = 0x27A6,
+    SMSG_ISLAND_COMPLETE                              = 0x27A7,
     SMSG_IS_QUEST_COMPLETE_RESPONSE                   = 0x2A83,
     SMSG_ITEM_CHANGED                                 = 0x2729,
     SMSG_ITEM_COOLDOWN                                = 0x280D,
     SMSG_ITEM_ENCHANT_TIME_UPDATE                     = 0x279B,
     SMSG_ITEM_EXPIRE_PURCHASE_REFUND                  = 0x25B3,
-    SMSG_ITEM_INTERACTION_OPEN                        = 0x283C,
-    SMSG_ITEM_INTERACTION_RESULT                      = 0x28CE,
+    SMSG_ITEM_INTERACTION_COMPLETE                    = 0x28CE,
     SMSG_ITEM_PURCHASE_REFUND_RESULT                  = 0x25B1,
     SMSG_ITEM_PUSH_RESULT                             = 0x263A,
     SMSG_ITEM_TIME_UPDATE                             = 0x279A,
-    SMSG_KICK_REASON                                  = 0x2832,
+    SMSG_KICK_REASON                                  = 0x26B8,
     SMSG_LEARNED_SPELLS                               = 0x2C4D,
-    SMSG_LEARN_PVP_TALENTS_FAILED                     = 0x25EB,
-    SMSG_LEARN_TALENTS_FAILED                         = 0x25EA,
+    SMSG_LEARN_PVP_TALENT_FAILED                      = 0x25EB,
+    SMSG_LEARN_TALENT_FAILED                          = 0x25EA,
+    SMSG_LEGACY_LOOT_RULES                            = 0x2876,
     SMSG_LEVEL_LINKING_RESULT                         = 0x28B7,
-    SMSG_LEVEL_UPDATE                                 = 0x2589,
     SMSG_LEVEL_UP_INFO                                = 0x2728,
     SMSG_LFG_BOOT_PLAYER                              = 0x2A35,
     SMSG_LFG_DISABLED                                 = 0x2A33,
@@ -1298,7 +1313,6 @@ enum OpcodeServer : uint16
     SMSG_LFG_LIST_APPLICANT_LIST_UPDATE               = 0x2A2B,
     SMSG_LFG_LIST_APPLICATION_STATUS_UPDATE           = 0x2A28,
     SMSG_LFG_LIST_APPLY_TO_GROUP_RESULT               = 0x2A29,
-    SMSG_LFG_LIST_INIT_AUTO_DELIST                    = 0x28CF,
     SMSG_LFG_LIST_JOIN_RESULT                         = 0x2A1D,
     SMSG_LFG_LIST_SEARCH_RESULTS                      = 0x2A1E,
     SMSG_LFG_LIST_SEARCH_RESULTS_UPDATE               = 0x2A2C,
@@ -1325,14 +1339,11 @@ enum OpcodeServer : uint16
     SMSG_LF_GUILD_COMMAND_RESULT                      = 0x29D0,
     SMSG_LF_GUILD_POST                                = 0x29CD,
     SMSG_LF_GUILD_RECRUITS                            = 0x29CF,
-    SMSG_LIGHTNING_STORM_END                          = 0x26D7,
-    SMSG_LIGHTNING_STORM_START                        = 0x26D6,
     SMSG_LIVE_REGION_ACCOUNT_RESTORE_RESULT           = 0x27B8,
     SMSG_LIVE_REGION_CHARACTER_COPY_RESULT            = 0x27B6,
     SMSG_LIVE_REGION_GET_ACCOUNT_CHARACTER_LIST_RESULT = 0x27AB,
     SMSG_LOAD_CUF_PROFILES                            = 0x25CF,
     SMSG_LOAD_EQUIPMENT_SET                           = 0x2753,
-    SMSG_LOAD_SELECTED_TROPHY_RESULT                  = 0x280B,
     SMSG_LOGIN_SET_TIME_SPEED                         = 0x2752,
     SMSG_LOGIN_VERIFY_WORLD                           = 0x25AE,
     SMSG_LOGOUT_CANCEL_ACK                            = 0x26B4,
@@ -1340,7 +1351,6 @@ enum OpcodeServer : uint16
     SMSG_LOGOUT_RESPONSE                              = 0x26B2,
     SMSG_LOG_XP_GAIN                                  = 0x2724,
     SMSG_LOOT_ALL_PASSED                              = 0x2638,
-    SMSG_LOOT_LEGACY_RULES_IN_EFFECT                  = 0x2876,
     SMSG_LOOT_LIST                                    = 0x2787,
     SMSG_LOOT_MONEY_NOTIFY                            = 0x2633,
     SMSG_LOOT_RELEASE                                 = 0x2632,
@@ -1355,8 +1365,6 @@ enum OpcodeServer : uint16
     SMSG_MAIL_LIST_RESULT                             = 0x279C,
     SMSG_MAIL_QUERY_NEXT_TIME_RESULT                  = 0x279D,
     SMSG_MAP_OBJECTIVES_INIT                          = 0x27A5,
-    SMSG_MAP_OBJECTIVE_ADD                            = 0x2598,
-    SMSG_MAP_OBJECTIVE_REMOVE                         = 0x2599,
     SMSG_MAP_OBJ_EVENTS                               = 0x25DA,
     SMSG_MASTER_LOOT_CANDIDATE_LIST                   = 0x2636,
     SMSG_MESSAGE_BOX                                  = 0x2576,
@@ -1364,13 +1372,10 @@ enum OpcodeServer : uint16
     SMSG_MIRROR_IMAGE_COMPONENTED_DATA                = 0x2C14,
     SMSG_MIRROR_IMAGE_CREATURE_DATA                   = 0x2C13,
     SMSG_MISSILE_CANCEL                               = 0x25DB,
-    SMSG_MODIFY_CHARGE_RECOVERY_SPEED                 = 0x27AF,
     SMSG_MODIFY_COOLDOWN                              = 0x27AD,
-    SMSG_MODIFY_COOLDOWN_RECOVERY_SPEED               = 0x27AE,
-    SMSG_MODIFY_PARTY_RANGE                           = 0x278A,
     SMSG_MOTD                                         = 0x2BAF,
-    SMSG_MOUNT_EQUIPMENT_APPLY_RESULT                 = 0x28B5,
     SMSG_MOUNT_RESULT                                 = 0x257B,
+    SMSG_MOVEMENT_ENFORCEMENT_ALERT                   = 0x28A5,
     SMSG_MOVE_APPLY_MOVEMENT_FORCE                    = 0x2DE1,
     SMSG_MOVE_DISABLE_COLLISION                       = 0x2DDD,
     SMSG_MOVE_DISABLE_DOUBLE_JUMP                     = 0x2DCB,
@@ -1455,6 +1460,11 @@ enum OpcodeServer : uint16
     SMSG_MOVE_UPDATE_TELEPORT                         = 0x2DAF,
     SMSG_MOVE_UPDATE_TURN_RATE                        = 0x2DAB,
     SMSG_MOVE_UPDATE_WALK_SPEED                       = 0x2DA6,
+    SMSG_MYTHIC_PLUS_ALL_MAP_STATS                    = 0x2624,
+    SMSG_MYTHIC_PLUS_CURRENT_AFFIXES                  = 0x2625,
+    SMSG_MYTHIC_PLUS_NEW_SEASON_RECORD                = 0x2629,
+    SMSG_MYTHIC_PLUS_NEW_WEEK_RECORD                  = 0x2628,
+    SMSG_MYTHIC_PLUS_WEEKLY_REWARD_RESPONSE           = 0x2623,
     SMSG_NEUTRAL_PLAYER_FACTION_SELECT_RESULT         = 0x25F3,
     SMSG_NEW_TAXI_PATH                                = 0x26AD,
     SMSG_NEW_WORLD                                    = 0x25AD,
@@ -1465,19 +1475,20 @@ enum OpcodeServer : uint16
     SMSG_OFFER_PETITION_ERROR                         = 0x26E9,
     SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA         = 0x2725,
     SMSG_ON_MONSTER_MOVE                              = 0x2DA2,
-    SMSG_OPEN_ALLIED_RACE_DETAILS_GIVER               = 0x283E,
+    SMSG_OPEN_ARTIFACT_FORGE                          = 0x27E8,
     SMSG_OPEN_CONTAINER                               = 0x2768,
+    SMSG_OPEN_HEART_FORGE                             = 0x2873,
     SMSG_OPEN_LFG_DUNGEON_FINDER                      = 0x2A31,
     SMSG_OPEN_SHIPMENT_NPC_FROM_GOSSIP                = 0x27E0,
     SMSG_OPEN_SHIPMENT_NPC_RESULT                     = 0x27E2,
-    SMSG_OPEN_TRANSMOGRIFIER                          = 0x283A,
     SMSG_OVERRIDE_LIGHT                               = 0x26EF,
     SMSG_PAGE_TEXT                                    = 0x275E,
     SMSG_PARTY_COMMAND_RESULT                         = 0x27DD,
     SMSG_PARTY_INVITE                                 = 0x25D0,
     SMSG_PARTY_KILL_LOG                               = 0x27A1,
-    SMSG_PARTY_MEMBER_STATE                           = 0x279F,
-    SMSG_PARTY_MEMBER_STATE_UPDATE                    = 0x279E,
+    SMSG_PARTY_MEMBER_FULL_STATE                      = 0x279F,
+    SMSG_PARTY_MEMBER_PARTIAL_STATE                   = 0x279E,
+    SMSG_PARTY_NOTIFY_LFG_LEADER_CHANGE               = 0x28CF,
     SMSG_PARTY_UPDATE                                 = 0x260D,
     SMSG_PAUSE_MIRROR_TIMER                           = 0x2755,
     SMSG_PENDING_RAID_LOCK                            = 0x2736,
@@ -1512,6 +1523,7 @@ enum OpcodeServer : uint16
     SMSG_PET_LEARNED_SPELLS                           = 0x2C4F,
     SMSG_PET_MODE                                     = 0x258B,
     SMSG_PET_NAME_INVALID                             = 0x26F7,
+    SMSG_PET_NEWLY_TAMED                              = 0x2589,
     SMSG_PET_SLOT_UPDATED                             = 0x258A,
     SMSG_PET_SPELLS_MESSAGE                           = 0x2C25,
     SMSG_PET_STABLE_LIST                              = 0x25AB,
@@ -1520,10 +1532,17 @@ enum OpcodeServer : uint16
     SMSG_PET_UNLEARNED_SPELLS                         = 0x2C50,
     SMSG_PHASE_SHIFT_CHANGE                           = 0x2578,
     SMSG_PLAYED_TIME                                  = 0x2713,
+    SMSG_PLAYER_AZERITE_ITEM_EQUIPPED_STATUS_CHANGED  = 0x2871,
+    SMSG_PLAYER_AZERITE_ITEM_GAINS                    = 0x2870,
+    SMSG_PLAYER_BONUS_ROLL_FAILED                     = 0x2877,
     SMSG_PLAYER_BOUND                                 = 0x257E,
+    SMSG_PLAYER_CONDITION_RESULT                      = 0x2843,
+    SMSG_PLAYER_IS_ADVENTURE_MAP_POI_VALID            = 0x2842,
     SMSG_PLAYER_SAVE_GUILD_EMBLEM                     = 0x29F9,
     SMSG_PLAYER_SKINNED                               = 0x278C,
     SMSG_PLAYER_TABARD_VENDOR_ACTIVATE                = 0x27A0,
+    SMSG_PLAYER_TUTORIAL_HIGHLIGHT_SPELL              = 0x2847,
+    SMSG_PLAYER_TUTORIAL_UNHIGHLIGHT_SPELL            = 0x2846,
     SMSG_PLAY_MUSIC                                   = 0x27B2,
     SMSG_PLAY_OBJECT_SOUND                            = 0x27B3,
     SMSG_PLAY_ONE_SHOT_ANIM_KIT                       = 0x2776,
@@ -1536,17 +1555,18 @@ enum OpcodeServer : uint16
     SMSG_PLAY_TIME_WARNING                            = 0x2740,
     SMSG_PONG                                         = 0x304E,
     SMSG_POWER_UPDATE                                 = 0x2707,
+    SMSG_PRELOAD_CHILD_MAP                            = 0x2579,
+    SMSG_PREPOPULATE_NAME_CACHE                       = 0x28AA,
     SMSG_PRE_RESSURECT                                = 0x27B0,
     SMSG_PRINT_NOTIFICATION                           = 0x25E2,
     SMSG_PROC_RESIST                                  = 0x27A2,
     SMSG_PUSH_SPELL_TO_ACTION_BAR                     = 0x2C51,
     SMSG_PVP_CREDIT                                   = 0x271F,
-    SMSG_PVP_LOG_DATA                                 = 0x25B4,
-    SMSG_PVP_MATCH_END                                = 0x28A7,
-    SMSG_PVP_MATCH_INIT                               = 0x28AC,
+    SMSG_PVP_MATCH_COMPLETE                           = 0x28A7,
+    SMSG_PVP_MATCH_INITIALIZE                         = 0x28AC,
     SMSG_PVP_MATCH_START                              = 0x28A6,
+    SMSG_PVP_MATCH_STATISTICS                         = 0x25B4,
     SMSG_PVP_OPTIONS_ENABLED                          = 0x25B7,
-    SMSG_PVP_SEASON                                   = 0x25D4,
     SMSG_QUERY_BATTLE_PET_NAME_RESPONSE               = 0x270E,
     SMSG_QUERY_COMMUNITY_NAME_RESPONSE                = 0x270A,
     SMSG_QUERY_CREATURE_RESPONSE                      = 0x2704,
@@ -1561,7 +1581,6 @@ enum OpcodeServer : uint16
     SMSG_QUERY_PLAYER_NAME_RESPONSE                   = 0x2709,
     SMSG_QUERY_QUEST_INFO_RESPONSE                    = 0x2A95,
     SMSG_QUERY_TIME_RESPONSE                          = 0x2723,
-    SMSG_QUERY_TREASURE_PICKER_RESPONSE               = 0x284D,
     SMSG_QUEST_COMPLETION_NPC_RESPONSE                = 0x2A81,
     SMSG_QUEST_CONFIRM_ACCEPT                         = 0x2A8E,
     SMSG_QUEST_FORCE_REMOVED                          = 0x2A9B,
@@ -1571,7 +1590,6 @@ enum OpcodeServer : uint16
     SMSG_QUEST_GIVER_QUEST_DETAILS                    = 0x2A91,
     SMSG_QUEST_GIVER_QUEST_FAILED                     = 0x2A85,
     SMSG_QUEST_GIVER_QUEST_LIST_MESSAGE               = 0x2A99,
-    SMSG_QUEST_GIVER_QUEST_TURN_IN_FAILURE            = 0x2858,
     SMSG_QUEST_GIVER_REQUEST_ITEMS                    = 0x2A92,
     SMSG_QUEST_GIVER_STATUS                           = 0x2A9A,
     SMSG_QUEST_GIVER_STATUS_MULTIPLE                  = 0x2A90,
@@ -1580,9 +1598,10 @@ enum OpcodeServer : uint16
     SMSG_QUEST_POI_CHANGED                            = 0x2A9F,
     SMSG_QUEST_POI_QUERY_RESPONSE                     = 0x2A9C,
     SMSG_QUEST_PUSH_RESULT                            = 0x2A8F,
-    SMSG_QUEST_SESSION_MEMBER_CONFIRM                 = 0x28BB,
-    SMSG_QUEST_SESSION_MEMBER_START_RESPONSE          = 0x28BC,
-    SMSG_QUEST_SESSION_NOTIFICATION                   = 0x28BA,
+    SMSG_QUEST_SESSION_INFO_RESPONSE                  = 0x28CA,
+    SMSG_QUEST_SESSION_READY_CHECK                    = 0x28BB,
+    SMSG_QUEST_SESSION_READY_CHECK_RESPONSE           = 0x28BC,
+    SMSG_QUEST_SESSION_RESULT                         = 0x28BA,
     SMSG_QUEST_SPAWN_TRACKING_UPDATE                  = 0x2A9E,
     SMSG_QUEST_UPDATE_ADD_CREDIT                      = 0x2A8B,
     SMSG_QUEST_UPDATE_ADD_CREDIT_SIMPLE               = 0x2A8C,
@@ -1591,34 +1610,33 @@ enum OpcodeServer : uint16
     SMSG_QUEST_UPDATE_COMPLETE_BY_SPELL               = 0x2A87,
     SMSG_QUEST_UPDATE_FAILED                          = 0x2A89,
     SMSG_QUEST_UPDATE_FAILED_TIMER                    = 0x2A8A,
-    SMSG_QUICK_JOIN_CONFIRM_REQUEST_INVITE            = 0x28CA,
+    SMSG_QUEUE_SUMMARY_UPDATE                         = 0x2859,
     SMSG_RAF_ACCOUNT_INFO                             = 0x28B8,
-    SMSG_RAF_ACTIVITY                                 = 0x28C6,
-    SMSG_RAF_INFO_UPDATE                              = 0x28B9,
+    SMSG_RAF_ACTIVITY_STATE_CHANGED                   = 0x28C6,
     SMSG_RAID_DIFFICULTY_SET                          = 0x27F1,
     SMSG_RAID_GROUP_ONLY                              = 0x27F3,
     SMSG_RAID_INSTANCE_MESSAGE                        = 0x2BB4,
     SMSG_RAID_MARKERS_CHANGED                         = 0x25BA,
     SMSG_RANDOM_ROLL                                  = 0x2650,
-    SMSG_RATED_BATTLEFIELD_INFO                       = 0x25A8,
+    SMSG_RATED_PVP_INFO                               = 0x25A8,
     SMSG_READY_CHECK_COMPLETED                        = 0x2610,
     SMSG_READY_CHECK_RESPONSE                         = 0x260F,
     SMSG_READY_CHECK_STARTED                          = 0x260E,
     SMSG_READ_ITEM_RESULT_FAILED                      = 0x27ED,
     SMSG_READ_ITEM_RESULT_OK                          = 0x27E7,
-    SMSG_REALM_LOOKUP_INFORMATION                     = 0x2812,
+    SMSG_REALM_LOOKUP_INFO                            = 0x2812,
     SMSG_REALM_QUERY_RESPONSE                         = 0x26EE,
-    SMSG_REFER_A_FRIEND_FAILURE                       = 0x26F4,
+    SMSG_REATTACH_RESURRECT                           = 0x2792,
+    SMSG_RECRUIT_A_FRIEND_FAILURE                     = 0x26F4,
     SMSG_REFRESH_COMPONENT                            = 0x267C,
     SMSG_REFRESH_SPELL_HISTORY                        = 0x2C2C,
     SMSG_REMOVE_ITEM_PASSIVE                          = 0x25C1,
     SMSG_REMOVE_LOSS_OF_CONTROL                       = 0x269D,
     SMSG_REPLACE_TROPHY_RESPONSE                      = 0x2809,
     SMSG_REPORT_PVP_PLAYER_AFK_RESULT                 = 0x26E2,
-    SMSG_REQUEST_ADDON_LIST                           = 0x2662,
     SMSG_REQUEST_CEMETERY_LIST_RESPONSE               = 0x259F,
-    SMSG_REQUEST_PVP_BRAWL_INFO_RESPONSE              = 0x25D6,
     SMSG_REQUEST_PVP_REWARDS_RESPONSE                 = 0x25D5,
+    SMSG_REQUEST_SCHEDULED_PVP_INFO_RESPONSE          = 0x25D6,
     SMSG_RESEARCH_COMPLETE                            = 0x2587,
     SMSG_RESET_COMPRESSION_CONTEXT                    = 0x304F,
     SMSG_RESET_FAILED_NOTIFY                          = 0x26EA,
@@ -1626,24 +1644,26 @@ enum OpcodeServer : uint16
     SMSG_RESET_WEEKLY_CURRENCY                        = 0x2575,
     SMSG_RESPEC_WIPE_CONFIRM                          = 0x262A,
     SMSG_RESPOND_INSPECT_ACHIEVEMENTS                 = 0x2572,
+    SMSG_RESTRICTED_ACCOUNT_WARNING                   = 0x25CC,
     SMSG_RESUME_CAST                                  = 0x2C3B,
     SMSG_RESUME_CAST_BAR                              = 0x2C3E,
     SMSG_RESUME_COMMS                                 = 0x304B,
     SMSG_RESUME_TOKEN                                 = 0x25BF,
-    SMSG_RESURRECT_CLEAR_DATA                         = 0x2580,
     SMSG_RESURRECT_REQUEST                            = 0x257F,
     SMSG_RESYNC_RUNES                                 = 0x2743,
+    SMSG_RETURN_APPLICANT_LIST                        = 0x28AE,
+    SMSG_RETURN_RECRUITING_CLUBS                      = 0x28AD,
     SMSG_ROLE_CHANGED_INFORM                          = 0x258E,
     SMSG_ROLE_CHOSEN                                  = 0x2A39,
     SMSG_ROLE_POLL_INFORM                             = 0x258F,
     SMSG_RUNE_REGEN_DEBUG                             = 0x25C9,
-    SMSG_SCENARIO_BOOT                                = 0x27EE,
     SMSG_SCENARIO_COMPLETED                           = 0x282F,
     SMSG_SCENARIO_POIS                                = 0x2653,
     SMSG_SCENARIO_PROGRESS_UPDATE                     = 0x264C,
-    SMSG_SCENARIO_SET_SHOULD_SHOW_CRITERIA            = 0x2841,
-    SMSG_SCENARIO_SPELL_UPDATE                        = 0x2840,
+    SMSG_SCENARIO_SHOW_CRITERIA                       = 0x2841,
     SMSG_SCENARIO_STATE                               = 0x264B,
+    SMSG_SCENARIO_UI_UPDATE                           = 0x2840,
+    SMSG_SCENARIO_VACATE                              = 0x27EE,
     SMSG_SCENE_OBJECT_EVENT                           = 0x25F9,
     SMSG_SCENE_OBJECT_PET_BATTLE_FINAL_ROUND          = 0x25FE,
     SMSG_SCENE_OBJECT_PET_BATTLE_FINISHED             = 0x25FF,
@@ -1652,6 +1672,7 @@ enum OpcodeServer : uint16
     SMSG_SCENE_OBJECT_PET_BATTLE_REPLACEMENTS_MADE    = 0x25FD,
     SMSG_SCENE_OBJECT_PET_BATTLE_ROUND_RESULT         = 0x25FC,
     SMSG_SCRIPT_CAST                                  = 0x2C55,
+    SMSG_SEASON_INFO                                  = 0x25D4,
     SMSG_SELL_RESPONSE                                = 0x26F8,
     SMSG_SEND_ITEM_PASSIVES                           = 0x25C2,
     SMSG_SEND_KNOWN_SPELLS                            = 0x2C2A,
@@ -1662,11 +1683,13 @@ enum OpcodeServer : uint16
     SMSG_SEND_UNLEARN_SPELLS                          = 0x2C2E,
     SMSG_SERVER_FIRST_ACHIEVEMENTS                    = 0x266D,
     SMSG_SERVER_TIME                                  = 0x26B1,
+    SMSG_SERVER_TIME_OFFSET                           = 0x2759,
     SMSG_SETUP_CURRENCY                               = 0x2573,
     SMSG_SETUP_RESEARCH_HISTORY                       = 0x2586,
     SMSG_SET_AI_ANIM_KIT                              = 0x2775,
     SMSG_SET_ALL_TASK_PROGRESS                        = 0x27D7,
     SMSG_SET_ANIM_TIER                                = 0x2779,
+    SMSG_SET_CHR_UPGRADE_TIER                         = 0x25F6,
     SMSG_SET_CURRENCY                                 = 0x2574,
     SMSG_SET_DF_FAST_LAUNCH_RESULT                    = 0x2A2E,
     SMSG_SET_DUNGEON_DIFFICULTY                       = 0x26D3,
@@ -1686,20 +1709,18 @@ enum OpcodeServer : uint16
     SMSG_SET_PLAYER_DECLINED_NAMES_RESULT             = 0x2712,
     SMSG_SET_PLAY_HOVER_ANIM                          = 0x25CD,
     SMSG_SET_PROFICIENCY                              = 0x277A,
+    SMSG_SET_QUEST_REPLAY_COOLDOWN_OVERRIDE           = 0x28BE,
     SMSG_SET_SPELL_CHARGES                            = 0x2C29,
     SMSG_SET_TASK_COMPLETE                            = 0x27D8,
     SMSG_SET_TIME_ZONE_INFORMATION                    = 0x26A5,
     SMSG_SET_VEHICLE_REC_ID                           = 0x2735,
-    SMSG_SHOW_ADVENTURE_MAP                           = 0x2838,
     SMSG_SHOW_BANK                                    = 0x26AE,
     SMSG_SHOW_MAILBOX                                 = 0x27EF,
     SMSG_SHOW_NEUTRAL_PLAYER_FACTION_SELECT_UI        = 0x25F2,
     SMSG_SHOW_TAXI_NODES                              = 0x2700,
     SMSG_SHOW_TRADE_SKILL_RESPONSE                    = 0x27B9,
-    SMSG_SOCKET_GEMS                                  = 0x276C,
     SMSG_SOCKET_GEMS_FAILURE                          = 0x276D,
-    SMSG_SORT_BAGS_RESULT                             = 0x2826,
-    SMSG_SPECIALIZATION_CHANGED                       = 0x25EE,
+    SMSG_SOCKET_GEMS_SUCCESS                          = 0x276C,
     SMSG_SPECIAL_MOUNT_ANIM                           = 0x26CE,
     SMSG_SPEC_INVOLUNTARILY_CHANGED                   = 0x275D,
     SMSG_SPELL_ABSORB_LOG                             = 0x2C1F,
@@ -1726,10 +1747,12 @@ enum OpcodeServer : uint16
     SMSG_SPELL_PERIODIC_AURA_LOG                      = 0x2C1B,
     SMSG_SPELL_PREPARE                                = 0x2C38,
     SMSG_SPELL_START                                  = 0x2C3A,
+    SMSG_SPELL_VISUAL_LOAD_SCREEN                     = 0x25E5,
     SMSG_SPIRIT_HEALER_CONFIRM                        = 0x275A,
     SMSG_STAND_STATE_UPDATE                           = 0x2760,
     SMSG_START_ELAPSED_TIMER                          = 0x261C,
     SMSG_START_ELAPSED_TIMERS                         = 0x261E,
+    SMSG_START_LIGHTNING_STORM                        = 0x26D6,
     SMSG_START_LOOT_ROLL                              = 0x2634,
     SMSG_START_MIRROR_TIMER                           = 0x2754,
     SMSG_START_TIMER                                  = 0x25BC,
@@ -1743,6 +1766,7 @@ enum OpcodeServer : uint16
     SMSG_SUPERCEDED_SPELLS                            = 0x2C4C,
     SMSG_SUSPEND_COMMS                                = 0x304A,
     SMSG_SUSPEND_TOKEN                                = 0x25BE,
+    SMSG_SYNC_WOW_ENTITLEMENTS                        = 0x28C8,
     SMSG_TALENTS_INVOLUNTARILY_RESET                  = 0x275C,
     SMSG_TAXI_NODE_STATUS                             = 0x26AB,
     SMSG_TEXT_EMOTE                                   = 0x26A9,
@@ -1762,28 +1786,33 @@ enum OpcodeServer : uint16
     SMSG_TRAINER_LIST                                 = 0x271D,
     SMSG_TRANSFER_ABORTED                             = 0x2746,
     SMSG_TRANSFER_PENDING                             = 0x25E6,
-    SMSG_TRANSMOG_COLLECTION_UPDATE                   = 0x25C7,
-    SMSG_TRANSMOG_SET_COLLECTION_UPDATE               = 0x25C8,
+    SMSG_TRANSMOGRIFY_NPC                             = 0x283A,
+    SMSG_TREASURE_PICKER_RESPONSE                     = 0x284D,
     SMSG_TRIGGER_CINEMATIC                            = 0x2810,
     SMSG_TRIGGER_MOVIE                                = 0x26FE,
     SMSG_TURN_IN_PETITION_RESULT                      = 0x2795,
     SMSG_TUTORIAL_FLAGS                               = 0x2802,
-    SMSG_TUTORIAL_HIGHLIGHT_SPELL                     = 0x2847,
-    SMSG_TUTORIAL_UNHIGHLIGHT_SPELL                   = 0x2846,
     SMSG_TWITTER_STATUS                               = 0x2FFD,
-    SMSG_UI_TIME                                      = 0x2759,
+    SMSG_UI_HEALING_RANGE_MODIFIED                    = 0x278A,
+    SMSG_UI_ITEM_INTERACTION_NPC                      = 0x283C,
     SMSG_UNDELETE_CHARACTER_RESPONSE                  = 0x2813,
     SMSG_UNDELETE_COOLDOWN_STATUS_RESPONSE            = 0x2814,
     SMSG_UNLEARNED_SPELLS                             = 0x2C4E,
+    SMSG_UNLOAD_CHILD_MAP                             = 0x257A,
     SMSG_UPDATE_ACCOUNT_DATA                          = 0x274E,
     SMSG_UPDATE_ACTION_BUTTONS                        = 0x25F7,
+    SMSG_UPDATE_BNET_SESSION_KEY                      = 0x286A,
+    SMSG_UPDATE_CAPTURE_POINT                         = 0x2598,
     SMSG_UPDATE_CELESTIAL_BODY                        = 0x2866,
     SMSG_UPDATE_CHARACTER_FLAGS                       = 0x2808,
+    SMSG_UPDATE_CHARGE_CATEGORY_COOLDOWN              = 0x27AF,
+    SMSG_UPDATE_COOLDOWN                              = 0x27AE,
     SMSG_UPDATE_EXPANSION_LEVEL                       = 0x2666,
     SMSG_UPDATE_GAME_TIME_STATE                       = 0x286D,
     SMSG_UPDATE_INSTANCE_OWNERSHIP                    = 0x26D8,
     SMSG_UPDATE_LAST_INSTANCE                         = 0x26B7,
     SMSG_UPDATE_OBJECT                                = 0x2811,
+    SMSG_UPDATE_PRIMARY_SPEC                          = 0x25EE,
     SMSG_UPDATE_TALENT_DATA                           = 0x25ED,
     SMSG_UPDATE_TASK_PROGRESS                         = 0x27D6,
     SMSG_UPDATE_WEEKLY_SPELL_USAGE                    = 0x2C19,
@@ -1792,8 +1821,15 @@ enum OpcodeServer : uint16
     SMSG_USERLIST_REMOVE                              = 0x2BBA,
     SMSG_USERLIST_UPDATE                              = 0x2BBB,
     SMSG_USE_EQUIPMENT_SET_RESULT                     = 0x2796,
+    SMSG_VAS_CHECK_TRANSFER_OK_RESPONSE               = 0x2861,
+    SMSG_VAS_GET_QUEUE_MINUTES_RESPONSE               = 0x285F,
+    SMSG_VAS_GET_SERVICE_STATUS_RESPONSE              = 0x285E,
+    SMSG_VAS_PURCHASE_COMPLETE                        = 0x2836,
+    SMSG_VAS_PURCHASE_STATE_UPDATE                    = 0x2835,
     SMSG_VENDOR_INVENTORY                             = 0x25CB,
     SMSG_VIGNETTE_UPDATE                              = 0x27B7,
+    SMSG_VOICE_CHANNEL_INFO_RESPONSE                  = 0x2865,
+    SMSG_VOICE_LOGIN_RESPONSE                         = 0x2864,
     SMSG_VOID_ITEM_SWAP_RESPONSE                      = 0x25E0,
     SMSG_VOID_STORAGE_CONTENTS                        = 0x25DD,
     SMSG_VOID_STORAGE_FAILED                          = 0x25DC,
@@ -1801,31 +1837,20 @@ enum OpcodeServer : uint16
     SMSG_VOID_TRANSFER_RESULT                         = 0x25DF,
     SMSG_WAIT_QUEUE_FINISH                            = 0x256F,
     SMSG_WAIT_QUEUE_UPDATE                            = 0x256E,
-    SMSG_WARDEN_DATA                                  = 0x2577,
-    SMSG_WARFRONT_COMPLETED                           = 0x27A8,
+    SMSG_WARDEN3_DATA                                 = 0x2577,
+    SMSG_WARDEN3_DISABLED                             = 0x2868,
+    SMSG_WARDEN3_ENABLED                              = 0x2867,
+    SMSG_WARFRONT_COMPLETE                            = 0x27A8,
     SMSG_WARGAME_REQUEST_SUCCESSFULLY_SENT_TO_OPPONENT = 0x25B5,
     SMSG_WEATHER                                      = 0x26D5,
     SMSG_WEEKLY_SPELL_USAGE                           = 0x2C18,
     SMSG_WHO                                          = 0x2BAE,
     SMSG_WHO_IS                                       = 0x26D4,
-    SMSG_WORLD_MAP_INTERACTION                        = 0x2839,
-    SMSG_WORLD_QUEST_UPDATE                           = 0x284E,
+    SMSG_WILL_BE_KICKED_FOR_ADDED_SUBSCRIPTION_TIME   = 0x286C,
+    SMSG_WORLD_MAP_OPEN_NPC                           = 0x2839,
+    SMSG_WORLD_QUEST_UPDATE_RESPONSE                  = 0x284E,
     SMSG_WORLD_SERVER_INFO                            = 0x25C3,
-    SMSG_WORLD_TEXT                                   = 0x2831,
-    SMSG_WOW_TOKEN_AUCTION_SOLD                       = 0x281E,
-    SMSG_WOW_TOKEN_BUY_REQUEST_CONFIRMATION           = 0x2820,
-    SMSG_WOW_TOKEN_BUY_RESULT_CONFIRMATION            = 0x2821,
-    SMSG_WOW_TOKEN_CAN_REDEEM_FOR_BALANCE_RESULT      = 0x285C,
-    SMSG_WOW_TOKEN_CAN_VETERAN_BUY_RESULT             = 0x281F,
-    SMSG_WOW_TOKEN_DISTRIBUTION_GLUE_UPDATE           = 0x2819,
-    SMSG_WOW_TOKEN_DISTRIBUTION_UPDATE                = 0x281A,
-    SMSG_WOW_TOKEN_MARKET_PRICE_RESPONSE              = 0x281B,
-    SMSG_WOW_TOKEN_REDEEM_GAME_TIME_UPDATED           = 0x2822,
-    SMSG_WOW_TOKEN_REDEEM_REQUEST_CONFIRMATION        = 0x2823,
-    SMSG_WOW_TOKEN_REDEEM_RESULT                      = 0x2824,
-    SMSG_WOW_TOKEN_SELL_REQUEST_CONFIRMATION          = 0x281C,
-    SMSG_WOW_TOKEN_SELL_RESULT_CONFIRMATION           = 0x281D,
-    SMSG_WOW_TOKEN_UPDATE_AUCTIONABLE_LIST_RESPONSE   = 0x2825,
+    SMSG_WOW_ENTITLEMENT_NOTIFICATION                 = 0x28C9,
     SMSG_XP_GAIN_ABORTED                              = 0x25E1,
     SMSG_XP_GAIN_ENABLED                              = 0x27F2,
     SMSG_ZONE_UNDER_ATTACK                            = 0x2BB5,
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index 15a3b354d42..d909511a100 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -1091,7 +1091,7 @@ void WorldSession::InitializeSessionCallback(LoginDatabaseQueryHolder* realmHold
         } while (characterCountsResult->NextRow());
     }
 
-    WorldPackets::Battlenet::SetSessionState bnetConnected;
+    WorldPackets::Battlenet::ConnectionStatus bnetConnected;
     bnetConnected.State = 1;
     SendPacket(bnetConnected.Write());
 
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 34c698f2a7f..2e08b3b77fd 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -101,19 +101,19 @@ namespace WorldPackets
         class AuctionBrowseQuery;
         class AuctionCancelCommoditiesPurchase;
         class AuctionConfirmCommoditiesPurchase;
+        class AuctionGetCommodityQuote;
         class AuctionHelloRequest;
-        class AuctionListBidderItems;
+        class AuctionListBiddedItems;
         class AuctionListBucketsByBucketKeys;
         class AuctionListItemsByBucketKey;
         class AuctionListItemsByItemID;
-        class AuctionListOwnerItems;
+        class AuctionListOwnedItems;
         class AuctionPlaceBid;
         class AuctionRemoveItem;
         class AuctionReplicateItems;
         class AuctionSellCommodity;
         class AuctionSellItem;
         class AuctionSetFavoriteItem;
-        class AuctionStartCommoditiesPurchase;
     }
 
     namespace Auth
@@ -163,8 +163,8 @@ namespace WorldPackets
 
     namespace Battlenet
     {
+        class ChangeRealmTicket;
         class Request;
-        class RequestRealmListTicket;
     }
 
     namespace BattlePet
@@ -467,7 +467,7 @@ namespace WorldPackets
         class RequestCemeteryList;
         class ResurrectResponse;
         class StandStateChange;
-        class UITimeRequest;
+        class ServerTimeOffsetRequest;
         class RandomRollClient;
         class ObjectUpdateFailed;
         class ObjectUpdateRescued;
@@ -522,7 +522,7 @@ namespace WorldPackets
         class PartyUninvite;
         class GroupDecline;
         class RequestPartyMemberStats;
-        class PartyMemberState;
+        class PartyMemberFullState;
         class SetPartyLeader;
         class SetPartyAssignment;
         class SetRole;
@@ -630,7 +630,7 @@ namespace WorldPackets
 
     namespace Toy
     {
-        class AccountToysUpdate;
+        class AccountToyUpdate;
         class AddToy;
         class UseToy;
         class ToyClearFanfare;
@@ -711,8 +711,8 @@ namespace WorldPackets
 
     namespace Token
     {
-        class UpdateListedAuctionableTokens;
-        class RequestWowTokenMarketPrice;
+        class CommerceTokenGetLog;
+        class CommerceTokenGetMarketPrice;
     }
 
     namespace Totem
@@ -1386,19 +1386,19 @@ class TC_GAME_API WorldSession
         void HandleAuctionBrowseQuery(WorldPackets::AuctionHouse::AuctionBrowseQuery& browseQuery);
         void HandleAuctionCancelCommoditiesPurchase(WorldPackets::AuctionHouse::AuctionCancelCommoditiesPurchase& cancelCommoditiesPurchase);
         void HandleAuctionConfirmCommoditiesPurchase(WorldPackets::AuctionHouse::AuctionConfirmCommoditiesPurchase& confirmCommoditiesPurchase);
+        void HandleAuctionGetCommodityQuote(WorldPackets::AuctionHouse::AuctionGetCommodityQuote& startCommoditiesPurchase);
         void HandleAuctionHelloOpcode(WorldPackets::AuctionHouse::AuctionHelloRequest& hello);
-        void HandleAuctionListBidderItems(WorldPackets::AuctionHouse::AuctionListBidderItems& listBidderItems);
+        void HandleAuctionListBiddedItems(WorldPackets::AuctionHouse::AuctionListBiddedItems& listBiddedItems);
         void HandleAuctionListBucketsByBucketKeys(WorldPackets::AuctionHouse::AuctionListBucketsByBucketKeys& listBucketsByBucketKeys);
         void HandleAuctionListItemsByBucketKey(WorldPackets::AuctionHouse::AuctionListItemsByBucketKey& listItemsByBucketKey);
         void HandleAuctionListItemsByItemID(WorldPackets::AuctionHouse::AuctionListItemsByItemID& listItemsByItemID);
-        void HandleAuctionListOwnerItems(WorldPackets::AuctionHouse::AuctionListOwnerItems& listOwnerItems);
+        void HandleAuctionListOwnedItems(WorldPackets::AuctionHouse::AuctionListOwnedItems& listOwnedItems);
         void HandleAuctionPlaceBid(WorldPackets::AuctionHouse::AuctionPlaceBid& placeBid);
         void HandleAuctionRemoveItem(WorldPackets::AuctionHouse::AuctionRemoveItem& removeItem);
         void HandleAuctionReplicateItems(WorldPackets::AuctionHouse::AuctionReplicateItems& replicateItems);
         void HandleAuctionSellCommodity(WorldPackets::AuctionHouse::AuctionSellCommodity& sellCommodity);
         void HandleAuctionSellItem(WorldPackets::AuctionHouse::AuctionSellItem& sellItem);
         void HandleAuctionSetFavoriteItem(WorldPackets::AuctionHouse::AuctionSetFavoriteItem& setFavoriteItem);
-        void HandleAuctionStartCommoditiesPurchase(WorldPackets::AuctionHouse::AuctionStartCommoditiesPurchase& startCommoditiesPurchase);
 
         // Bank
         void HandleAutoBankItemOpcode(WorldPackets::Bank::AutoBankItem& packet);
@@ -1666,7 +1666,7 @@ class TC_GAME_API WorldSession
         void HandleEquipmentSetSave(WorldPackets::EquipmentSet::SaveEquipmentSet& saveEquipmentSet);
         void HandleDeleteEquipmentSet(WorldPackets::EquipmentSet::DeleteEquipmentSet& deleteEquipmentSet);
         void HandleUseEquipmentSet(WorldPackets::EquipmentSet::UseEquipmentSet& useEquipmentSet);
-        void HandleUITimeRequest(WorldPackets::Misc::UITimeRequest& /*request*/);
+        void HandleServerTimeOffsetRequest(WorldPackets::Misc::ServerTimeOffsetRequest& /*request*/);
         void HandleQueryQuestCompletionNPCs(WorldPackets::Query::QueryQuestCompletionNPCs& queryQuestCompletionNPCs);
         void HandleQuestPOIQuery(WorldPackets::Query::QuestPOIQuery& questPoiQuery);
         void HandleViolenceLevel(WorldPackets::Misc::ViolenceLevel& violenceLevel);
@@ -1688,8 +1688,8 @@ class TC_GAME_API WorldSession
         void HandleScenePlaybackCanceled(WorldPackets::Scenes::ScenePlaybackCanceled& scenePlaybackCanceled);
 
         // Token
-        void HandleUpdateListedAuctionableTokens(WorldPackets::Token::UpdateListedAuctionableTokens& updateListedAuctionableTokens);
-        void HandleRequestWowTokenMarketPrice(WorldPackets::Token::RequestWowTokenMarketPrice& requestWowTokenMarketPrice);
+        void HandleCommerceTokenGetLog(WorldPackets::Token::CommerceTokenGetLog& updateListedAuctionableTokens);
+        void HandleCommerceTokenGetMarketPrice(WorldPackets::Token::CommerceTokenGetMarketPrice& requestWowTokenMarketPrice);
 
         // Compact Unit Frames (4.x)
         void HandleSaveCUFProfiles(WorldPackets::Misc::SaveCUFProfiles& packet);
@@ -1715,8 +1715,8 @@ class TC_GAME_API WorldSession
         void HandleWardenData(WorldPackets::Warden::WardenData& packet);
 
         // Battlenet
+        void HandleBattlenetChangeRealmTicket(WorldPackets::Battlenet::ChangeRealmTicket& changeRealmTicket);
         void HandleBattlenetRequest(WorldPackets::Battlenet::Request& request);
-        void HandleBattlenetRequestRealmListTicket(WorldPackets::Battlenet::RequestRealmListTicket& requestRealmListTicket);
 
         void SendBattlenetResponse(uint32 serviceHash, uint32 methodId, uint32 token, pb::Message const* response);
         void SendBattlenetResponse(uint32 serviceHash, uint32 methodId, uint32 token, uint32 status);
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index 82675ded4d5..0b0eeda6b86 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -449,9 +449,9 @@ WorldSocket::ReadDataHandlerResult WorldSocket::ReadDataHandler()
             HandleConnectToFailed(connectToFailed);
             break;
         }
-        case CMSG_ENABLE_ENCRYPTION_ACK:
+        case CMSG_ENTER_ENCRYPTED_MODE_ACK:
             LogOpcodeText(opcode, sessionGuard);
-            HandleEnableEncryptionAck();
+            HandleEnterEncryptedModeAck();
             break;
         default:
         {
@@ -858,7 +858,7 @@ void WorldSocket::LoadSessionPermissionsCallback(PreparedQueryResult result)
     // RBAC must be loaded before adding session to check for skip queue permission
     _worldSession->GetRBACData()->LoadFromDBCallback(result);
 
-    SendPacketAndLogOpcode(*WorldPackets::Auth::EnableEncryption(_encryptKey.data(), true).Write());
+    SendPacketAndLogOpcode(*WorldPackets::Auth::EnterEncryptedMode(_encryptKey.data(), true).Write());
 }
 
 void WorldSocket::HandleAuthContinuedSession(std::shared_ptr<WorldPackets::Auth::AuthContinuedSession> authSession)
@@ -921,7 +921,7 @@ void WorldSocket::HandleAuthContinuedSessionCallback(std::shared_ptr<WorldPacket
     // only first 16 bytes of the hmac are used
     memcpy(_encryptKey.data(), encryptKeyGen.GetDigest().data(), 16);
 
-    SendPacketAndLogOpcode(*WorldPackets::Auth::EnableEncryption(_encryptKey.data(), true).Write());
+    SendPacketAndLogOpcode(*WorldPackets::Auth::EnterEncryptedMode(_encryptKey.data(), true).Write());
     AsyncRead();
 }
 
@@ -963,7 +963,7 @@ void WorldSocket::HandleConnectToFailed(WorldPackets::Auth::ConnectToFailed& con
     }
 }
 
-void WorldSocket::HandleEnableEncryptionAck()
+void WorldSocket::HandleEnterEncryptedModeAck()
 {
     _authCrypt.Init(_encryptKey);
     if (_type == CONNECTION_TYPE_REALM)
diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
index 1c9ec52d62b..da7890d4b07 100644
--- a/src/server/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
@@ -126,7 +126,7 @@ private:
     void LoadSessionPermissionsCallback(PreparedQueryResult result);
     void HandleConnectToFailed(WorldPackets::Auth::ConnectToFailed& connectToFailed);
     bool HandlePing(WorldPackets::Auth::Ping& ping);
-    void HandleEnableEncryptionAck();
+    void HandleEnterEncryptedModeAck();
 
     ConnectionType _type;
     uint64 _key;
diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp
index 7e44537215a..1de40a1fd83 100644
--- a/src/server/game/Warden/Warden.cpp
+++ b/src/server/game/Warden/Warden.cpp
@@ -66,7 +66,7 @@ void Warden::SendModuleToClient()
         pos += burstSize;
 
         EncryptData((uint8*)&packet, burstSize + 3);
-        WorldPacket pkt1(SMSG_WARDEN_DATA, burstSize + 3);
+        WorldPacket pkt1(SMSG_WARDEN3_DATA, burstSize + 3);
         pkt1.append((uint8*)&packet, burstSize + 3);
         _session->SendPacket(&pkt1);
     }
@@ -87,7 +87,7 @@ void Warden::RequestModule()
     // Encrypt with warden RC4 key.
     EncryptData((uint8*)&request, sizeof(WardenModuleUse));
 
-    WorldPacket pkt(SMSG_WARDEN_DATA, sizeof(WardenModuleUse));
+    WorldPacket pkt(SMSG_WARDEN3_DATA, sizeof(WardenModuleUse));
     pkt.append((uint8*)&request, sizeof(WardenModuleUse));
     _session->SendPacket(&pkt);
 }
diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp
index 7e4e9ab2a0e..f73b451597b 100644
--- a/src/server/game/Warden/WardenMac.cpp
+++ b/src/server/game/Warden/WardenMac.cpp
@@ -105,7 +105,7 @@ void WardenMac::RequestHash()
     // Encrypt with warden RC4 key.
     EncryptData((uint8*)&Request, sizeof(WardenHashRequest));
 
-    WorldPacket pkt(SMSG_WARDEN_DATA, sizeof(WardenHashRequest));
+    WorldPacket pkt(SMSG_WARDEN3_DATA, sizeof(WardenHashRequest));
     pkt.append((uint8*)&Request, sizeof(WardenHashRequest));
     _session->SendPacket(&pkt);
 }
@@ -204,7 +204,7 @@ void WardenMac::RequestData()
     // Encrypt with warden RC4 key.
     EncryptData(buff.contents(), buff.size());
 
-    WorldPacket pkt(SMSG_WARDEN_DATA, buff.size());
+    WorldPacket pkt(SMSG_WARDEN3_DATA, buff.size());
     pkt.append(buff);
     _session->SendPacket(&pkt);
 
diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp
index 41921aeb4e5..ede77f47eaf 100644
--- a/src/server/game/Warden/WardenWin.cpp
+++ b/src/server/game/Warden/WardenWin.cpp
@@ -126,7 +126,7 @@ void WardenWin::InitializeModule()
     // Encrypt with warden RC4 key.
     EncryptData((uint8*)&Request, sizeof(WardenInitModuleRequest));
 
-    WorldPacket pkt(SMSG_WARDEN_DATA, sizeof(WardenInitModuleRequest));
+    WorldPacket pkt(SMSG_WARDEN3_DATA, sizeof(WardenInitModuleRequest));
     pkt.append((uint8*)&Request, sizeof(WardenInitModuleRequest));
     _session->SendPacket(&pkt);
 }
@@ -143,7 +143,7 @@ void WardenWin::RequestHash()
     // Encrypt with warden RC4 key.
     EncryptData((uint8*)&Request, sizeof(WardenHashRequest));
 
-    WorldPacket pkt(SMSG_WARDEN_DATA, sizeof(WardenHashRequest));
+    WorldPacket pkt(SMSG_WARDEN3_DATA, sizeof(WardenHashRequest));
     pkt.append((uint8*)&Request, sizeof(WardenHashRequest));
     _session->SendPacket(&pkt);
 }
@@ -310,7 +310,7 @@ void WardenWin::RequestData()
     // Encrypt with warden RC4 key
     EncryptData(buff.contents(), buff.size());
 
-    WorldPacket pkt(SMSG_WARDEN_DATA, buff.size());
+    WorldPacket pkt(SMSG_WARDEN3_DATA, buff.size());
     pkt.append(buff);
     _session->SendPacket(&pkt);
 
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index 61e551a055b..1ad97453c49 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -3961,7 +3961,7 @@ class spell_item_heart_of_azeroth : public AuraScript
         {
             target->ApplyAllAzeriteEmpoweredItemMods(equipped);
 
-            WorldPackets::Azerite::AzeriteEmpoweredItemEquippedStatusChanged statusChanged;
+            WorldPackets::Azerite::PlayerAzeriteItemEquippedStatusChanged statusChanged;
             statusChanged.IsHeartEquipped = equipped;
             target->SendDirectMessage(statusChanged.Write());
         }