diff --git a/src/server/game/AI/NpcBots/bot_GridNotifiers.h b/src/server/game/AI/NpcBots/bot_GridNotifiers.h
index 34630110580047..fdda7032899993 100644
--- a/src/server/game/AI/NpcBots/bot_GridNotifiers.h
+++ b/src/server/game/AI/NpcBots/bot_GridNotifiers.h
@@ -1203,7 +1203,7 @@ class NearbyObjectBySkillCheck
         }
         else if (Creature const* cre = ob->ToCreature())
         {
-            if (cre->IsVisible() && cre->getDeathState() == CORPSE && cre->HasUnitFlag(UNIT_FLAG_SKINNABLE) && cre->loot.isLooted() &&
+            if (cre->IsVisible() && cre->getDeathState() == DeathState::Corpse && cre->HasUnitFlag(UNIT_FLAG_SKINNABLE) && cre->loot.isLooted() &&
                 cre->isTappedBy(_checker->ToPlayer()) && CheckSkill(cre->GetCreatureTemplate()->GetRequiredLootSkill()))
             {
                 if (int32(cre->GetLevel() < 20 ? (cre->GetLevel() - 10) * 10 : cre->GetLevel() * 5) <= int32(MaxSkillForLevel(_checker->ToUnit()->GetLevel())))
@@ -1259,7 +1259,7 @@ class NearbyLootableCreatureCheck
     {
         if (Creature const* cre = unit->ToCreature())
             if (_checker->IsWithinDistInMap(cre, _range))
-                return cre->IsVisible() && cre->getDeathState() == CORPSE &&
+                return cre->IsVisible() && cre->getDeathState() == DeathState::Corpse &&
                     cre->HasDynamicFlag(UNIT_DYNFLAG_LOOTABLE) &&
                     _checker->ToPlayer()->isAllowedToLoot(cre);
         return false;
diff --git a/src/server/game/AI/NpcBots/bot_ai.h b/src/server/game/AI/NpcBots/bot_ai.h
index bf8ec14f7f683a..b4d8518dd462f0 100644
--- a/src/server/game/AI/NpcBots/bot_ai.h
+++ b/src/server/game/AI/NpcBots/bot_ai.h
@@ -21,9 +21,10 @@ class TeleportFinishEvent;
 class AwaitStateRemovalEvent;
 
 enum CombatRating : uint8;
-enum EnchantmentSlot : uint16;
+enum EnchantmentSlot : uint8;
 enum GossipOptionIcon : uint8;
 enum MeleeHitOutcome : uint8;
+enum WeaponAttackType : uint8;
 
 struct CleanDamage;
 struct CalcDamageInfo;
diff --git a/src/server/game/AI/NpcBots/botmgr.cpp b/src/server/game/AI/NpcBots/botmgr.cpp
index 57adb4383f0c93..28f48d896f2e9b 100644
--- a/src/server/game/AI/NpcBots/botmgr.cpp
+++ b/src/server/game/AI/NpcBots/botmgr.cpp
@@ -1113,7 +1113,7 @@ void BotMgr::_reviveBot(Creature* bot, WorldLocation* dest)
     bot->ResetPlayerDamageReq();
     bot->SetPvP(bot->GetBotOwner()->IsPvP());
     bot->Motion_Initialize();
-    bot->setDeathState(ALIVE);
+    bot->setDeathState(DeathState::Alive);
     //bot->GetBotAI()->Reset();
     bot->GetBotAI()->SetShouldUpdateStats();
 
@@ -1937,7 +1937,7 @@ void BotMgr::KillBot(Creature* bot)
 
     if (bot->IsInWorld() && bot->IsAlive())
     {
-        bot->setDeathState(JUST_DIED);
+        bot->setDeathState(DeathState::JustDied);
         bot->GetBotAI()->JustDied(bot);
         //bot->Kill(bot);
     }
diff --git a/src/server/game/AI/NpcBots/bpet_archmage.cpp b/src/server/game/AI/NpcBots/bpet_archmage.cpp
index 2585a116bd6279..696ac3142667d8 100644
--- a/src/server/game/AI/NpcBots/bpet_archmage.cpp
+++ b/src/server/game/AI/NpcBots/bpet_archmage.cpp
@@ -52,7 +52,7 @@ class archmage_pet_bot : public CreatureScript
             if ((liveTimer += diff) >= uint32(IAmFree() ? (1 * HOUR * IN_MILLISECONDS) : ELEMENTAL_DURATION))
             {
                 canUpdate = false;
-                me->setDeathState(JUST_DIED);
+                me->setDeathState(DeathState::JustDied);
                 return;
             }
 
diff --git a/src/server/game/AI/NpcBots/bpet_dark_ranger.cpp b/src/server/game/AI/NpcBots/bpet_dark_ranger.cpp
index f0795ef21f5418..d0f60cc91dce39 100644
--- a/src/server/game/AI/NpcBots/bpet_dark_ranger.cpp
+++ b/src/server/game/AI/NpcBots/bpet_dark_ranger.cpp
@@ -72,7 +72,7 @@ class dark_ranger_pet_bot : public CreatureScript
             if ((liveTimer += diff) >= MINION_DURATION)
             {
                 canUpdate = false;
-                me->setDeathState(JUST_DIED);
+                me->setDeathState(DeathState::JustDied);
                 return;
             }
 
diff --git a/src/server/game/AI/NpcBots/bpet_dreadlord.cpp b/src/server/game/AI/NpcBots/bpet_dreadlord.cpp
index 5462c0817ec883..ba4b4ebe288813 100644
--- a/src/server/game/AI/NpcBots/bpet_dreadlord.cpp
+++ b/src/server/game/AI/NpcBots/bpet_dreadlord.cpp
@@ -62,7 +62,7 @@ class dreadlord_pet_bot : public CreatureScript
             if ((liveTimer += diff) >= INFERNAL_DURATION)
             {
                 canUpdate = false;
-                me->setDeathState(JUST_DIED);
+                me->setDeathState(DeathState::JustDied);
                 return;
             }
 
diff --git a/src/server/game/AI/NpcBots/bpet_necromancer.cpp b/src/server/game/AI/NpcBots/bpet_necromancer.cpp
index 2e6a3fee5b0afc..ce17f8248dd838 100644
--- a/src/server/game/AI/NpcBots/bpet_necromancer.cpp
+++ b/src/server/game/AI/NpcBots/bpet_necromancer.cpp
@@ -58,7 +58,7 @@ class necromancer_pet_bot : public CreatureScript
             if ((liveTimer += diff) >= MINION_DURATION * (IAmFree() ? 5u : 1u))
             {
                 canUpdate = false;
-                me->setDeathState(JUST_DIED);
+                me->setDeathState(DeathState::JustDied);
                 return;
             }