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

44 files changed, 191 insertions, 191 deletions

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;