diff --git a/src/game/Battlegrounds/BattlegroundMgr.h b/src/game/Battlegrounds/BattlegroundMgr.h
index 25a7e92c1..d59129a41 100644
--- a/src/game/Battlegrounds/BattlegroundMgr.h
+++ b/src/game/Battlegrounds/BattlegroundMgr.h
@@ -29,8 +29,6 @@
 typedef std::map<uint32, Battleground*> BattlegroundContainer;
 typedef UNORDERED_MAP<uint32, BattlegroundTypeId> BattleMastersMap;
 
-#define WS_ARENA_DISTRIBUTION_TIME 20001 // Custom worldstate
-
 struct CreateBattlegroundData
 {
     BattlegroundTypeId bgTypeId;
diff --git a/src/game/World/World.h b/src/game/World/World.h
index ee631e71f..d3ca219cd 100644
--- a/src/game/World/World.h
+++ b/src/game/World/World.h
@@ -461,10 +461,11 @@ enum RealmZone
 
 enum WorldStates
 {
+    WS_ARENA_DISTRIBUTION_TIME  = 20001,                     // Next arena distribution time
     WS_WEEKLY_QUEST_RESET_TIME  = 20002,                     // Next weekly reset time
     WS_BG_DAILY_RESET_TIME      = 20003,                     // Next daily BG reset time
     WS_CLEANING_FLAGS           = 20004,                     // Cleaning Flags
-    WS_DAILY_QUEST_RESET_TIME   = 20005,                     // pussywizard
+    WS_DAILY_QUEST_RESET_TIME   = 20005,                     // Next daily reset time
     WS_GUILD_DAILY_RESET_TIME   = 20006,                     // Next guild cap reset time
     WS_MONTHLY_QUEST_RESET_TIME = 20007,                     // Next monthly reset time
 };