Scripts/Misc: Rename creatures with mob_ / mobs_ in npc_

Note: Have fun :P

41 files changed, 462 insertions, 462 deletions

diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
index 5f05f21b1de..081e717254d 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
@@ -77,14 +77,14 @@ SpellPair const _auraPairs[MAX_SPELL_PAIRS] =
     { NPC_ICEBLOOD_WARMASTER,       SPELL_ICEBLOOD_WARMASTER }
 };
 
-class mob_av_marshal_or_warmaster : public CreatureScript
+class npc_av_marshal_or_warmaster : public CreatureScript
 {
     public:
-        mob_av_marshal_or_warmaster() : CreatureScript("mob_av_marshal_or_warmaster") { }
+        npc_av_marshal_or_warmaster() : CreatureScript("npc_av_marshal_or_warmaster") { }
 
-        struct mob_av_marshal_or_warmasterAI : public ScriptedAI
+        struct npc_av_marshal_or_warmasterAI : public ScriptedAI
         {
-            mob_av_marshal_or_warmasterAI(Creature* creature) : ScriptedAI(creature) { }
+            npc_av_marshal_or_warmasterAI(Creature* creature) : ScriptedAI(creature) { }
 
             void Reset()
             {
@@ -172,11 +172,11 @@ class mob_av_marshal_or_warmaster : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_av_marshal_or_warmasterAI(creature);
+            return new npc_av_marshal_or_warmasterAI(creature);
         }
 };
 
 void AddSC_alterac_valley()
 {
-    new mob_av_marshal_or_warmaster();
+    new npc_av_marshal_or_warmaster();
 }
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index d5eafbb17a6..c8de8e163d8 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -43,14 +43,14 @@ enum WaterElementalSpells
     SPELL_WATERBOLT                               = 46983
 };
 
-class mob_water_elemental : public CreatureScript
+class npc_water_elemental : public CreatureScript
 {
 public:
-    mob_water_elemental() : CreatureScript("mob_water_elemental") { }
+    npc_water_elemental() : CreatureScript("npc_water_elemental") { }
 
-    struct mob_water_elementalAI : public ScriptedAI
+    struct npc_water_elementalAI : public ScriptedAI
     {
-        mob_water_elementalAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_water_elementalAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 waterBoltTimer;
         uint64 balindaGUID;
@@ -88,7 +88,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_water_elementalAI(creature);
+        return new npc_water_elementalAI(creature);
     }
 };
 
@@ -134,7 +134,7 @@ public:
 
         void JustSummoned(Creature* summoned)
         {
-            CAST_AI(mob_water_elemental::mob_water_elementalAI, summoned->AI())->balindaGUID = me->GetGUID();
+            CAST_AI(npc_water_elemental::npc_water_elementalAI, summoned->AI())->balindaGUID = me->GetGUID();
             summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true));
             summoned->setFaction(me->getFaction());
             summons.Summon(summoned);
@@ -205,5 +205,5 @@ public:
 void AddSC_boss_balinda()
 {
     new boss_balinda;
-    new mob_water_elemental;
+    new npc_water_elemental;
 };
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
index cded76874c7..8fe2778451b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -54,7 +54,7 @@ enum eGrimstone
     NPC_THELDREN                                           = 16059,
 
     //4 or 6 in total? 1+2+1 / 2+2+2 / 3+3. Depending on this, code should be changed.
-    MAX_MOB_AMOUNT                                         = 4
+    MAX_NPC_AMOUNT                                         = 4
 };
 
 uint32 RingMob[]=
@@ -152,7 +152,7 @@ public:
             MobCount = 0;
             MobDeath_Timer = 0;
 
-            for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
+            for (uint8 i = 0; i < MAX_NPC_AMOUNT; ++i)
                 RingMobGUID[i] = 0;
 
             RingBossGUID = 0;
@@ -168,7 +168,7 @@ public:
 
             ++MobCount;
 
-            if (MobCount == MAX_MOB_AMOUNT)
+            if (MobCount == MAX_NPC_AMOUNT)
                 MobDeath_Timer = 2500;
         }
 
@@ -246,7 +246,7 @@ public:
                         return;
                     }
 
-                    for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
+                    for (uint8 i = 0; i < MAX_NPC_AMOUNT; ++i)
                     {
                         Creature* mob = Unit::GetCreature(*me, RingMobGUID[i]);
                         if (mob && !mob->IsAlive() && mob->isDead())
@@ -339,7 +339,7 @@ public:
     };
 };
 
-// mob_phalanx
+// npc_phalanx
 enum PhalanxSpells
 {
     SPELL_THUNDERCLAP                   = 8732,
@@ -347,19 +347,19 @@ enum PhalanxSpells
     SPELL_MIGHTYBLOW                    = 14099
 };
 
-class mob_phalanx : public CreatureScript
+class npc_phalanx : public CreatureScript
 {
 public:
-    mob_phalanx() : CreatureScript("mob_phalanx") { }
+    npc_phalanx() : CreatureScript("npc_phalanx") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_phalanxAI (creature);
+        return new npc_phalanxAI (creature);
     }
 
-    struct mob_phalanxAI : public ScriptedAI
+    struct npc_phalanxAI : public ScriptedAI
     {
-        mob_phalanxAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_phalanxAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 ThunderClap_Timer;
         uint32 FireballVolley_Timer;
@@ -680,7 +680,7 @@ public:
 #define SAY_WINDSOR_4_3             "Good work! We're almost there, $N. This way."
 #define SAY_WINDSOR_6               "This is it, $N. My stuff should be in that room. Cover me, I'm going in!"
 #define SAY_WINDSOR_9               "Ah, there it is!"
-#define MOB_ENTRY_REGINALD_WINDSOR  9682
+#define NPC_REGINALD_WINDSOR        9682
 
 /*
 Player* playerStart;
@@ -778,7 +778,7 @@ public:
                     me->SetVisible(false);
                     me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                     me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-                    me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    me->SummonCreature(NPC_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0);
                     instance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED);
                     break;
             }
@@ -859,8 +859,8 @@ public:
 #define SAY_REGINALD_WINDSOR_14_2   "Excellent work, $N. Let's find the exit. I think I know the way. Follow me!"
 #define SAY_REGINALD_WINDSOR_20_1   "We made it!"
 #define SAY_REGINALD_WINDSOR_20_2   "Meet me at Maxwell's encampment. We'll go over the next stages of the plan there and figure out a way to decode my tablets without the decryption ring."
-#define MOB_ENTRY_SHILL_DINGER      9678
-#define MOB_ENTRY_CREST_KILLER      9680
+#define NPC_SHILL_DINGER            9678
+#define NPC_CREST_KILLER            9680
 
 /*
 int wp = 0;
@@ -1328,7 +1328,7 @@ void AddSC_blackrock_depths()
     new go_shadowforge_brazier();
     new at_ring_of_law();
     new npc_grimstone();
-    new mob_phalanx();
+    new npc_phalanx();
     new npc_kharan_mighthammer();
     new npc_lokhtos_darkbargainer();
     new npc_rocknot();
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index 998406e6d8c..c4cded87665 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -508,10 +508,10 @@ public:
     };
 };
 
-class mob_aran_elemental : public CreatureScript
+class npc_aran_elemental : public CreatureScript
 {
 public:
-    mob_aran_elemental() : CreatureScript("mob_aran_elemental") { }
+    npc_aran_elemental() : CreatureScript("npc_aran_elemental") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
@@ -548,5 +548,5 @@ public:
 void AddSC_boss_shade_of_aran()
 {
     new boss_shade_of_aran();
-    new mob_aran_elemental();
+    new npc_aran_elemental();
 }
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
index ea2793a1463..df291c161b2 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -59,19 +59,19 @@ enum TerestianIllhoof
 };
 
 
-class mob_kilrek : public CreatureScript
+class npc_kilrek : public CreatureScript
 {
 public:
-    mob_kilrek() : CreatureScript("mob_kilrek") { }
+    npc_kilrek() : CreatureScript("npc_kilrek") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_kilrekAI (creature);
+        return new npc_kilrekAI (creature);
     }
 
-    struct mob_kilrekAI : public ScriptedAI
+    struct npc_kilrekAI : public ScriptedAI
     {
-        mob_kilrekAI(Creature* creature) : ScriptedAI(creature)
+        npc_kilrekAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -130,19 +130,19 @@ public:
     };
 };
 
-class mob_demon_chain : public CreatureScript
+class npc_demon_chain : public CreatureScript
 {
 public:
-    mob_demon_chain() : CreatureScript("mob_demon_chain") { }
+    npc_demon_chain() : CreatureScript("npc_demon_chain") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_demon_chainAI(creature);
+        return new npc_demon_chainAI(creature);
     }
 
-    struct mob_demon_chainAI : public ScriptedAI
+    struct npc_demon_chainAI : public ScriptedAI
     {
-        mob_demon_chainAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_demon_chainAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint64 SacrificeGUID;
 
@@ -167,19 +167,19 @@ public:
     };
 };
 
-class mob_fiendish_portal : public CreatureScript
+class npc_fiendish_portal : public CreatureScript
 {
 public:
-    mob_fiendish_portal() : CreatureScript("mob_fiendish_portal") { }
+    npc_fiendish_portal() : CreatureScript("npc_fiendish_portal") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_fiendish_portalAI (creature);
+        return new npc_fiendish_portalAI (creature);
     }
 
-    struct mob_fiendish_portalAI : public PassiveAI
+    struct npc_fiendish_portalAI : public PassiveAI
     {
-        mob_fiendish_portalAI(Creature* creature) : PassiveAI(creature), summons(me){}
+        npc_fiendish_portalAI(Creature* creature) : PassiveAI(creature), summons(me){}
 
         SummonList summons;
 
@@ -203,19 +203,19 @@ public:
 
 #define SPELL_FIREBOLT  30050   // Blasts a target for 181-209 Fire damage.
 
-class mob_fiendish_imp : public CreatureScript
+class npc_fiendish_imp : public CreatureScript
 {
 public:
-    mob_fiendish_imp() : CreatureScript("mob_fiendish_imp") { }
+    npc_fiendish_imp() : CreatureScript("npc_fiendish_imp") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_fiendish_impAI (creature);
+        return new npc_fiendish_impAI (creature);
     }
 
-    struct mob_fiendish_impAI : public ScriptedAI
+    struct npc_fiendish_impAI : public ScriptedAI
     {
-        mob_fiendish_impAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_fiendish_impAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 FireboltTimer;
 
@@ -285,7 +285,7 @@ public:
                 {
                     if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[i]))
                     {
-                        CAST_AI(mob_fiendish_portal::mob_fiendish_portalAI, pPortal->AI())->DespawnAllImp();
+                        CAST_AI(npc_fiendish_portal::npc_fiendish_portalAI, pPortal->AI())->DespawnAllImp();
                         pPortal->DespawnOrUnsummon();
                     }
 
@@ -377,7 +377,7 @@ public:
 
                     if (Creature* Chains = me->FindNearestCreature(CREATURE_DEMONCHAINS, 5000))
                     {
-                        CAST_AI(mob_demon_chain::mob_demon_chainAI, Chains->AI())->SacrificeGUID = target->GetGUID();
+                        CAST_AI(npc_demon_chain::npc_demon_chainAI, Chains->AI())->SacrificeGUID = target->GetGUID();
                         Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true);
                         Talk(SAY_SACRIFICE);
                         SacrificeTimer = 30000;
@@ -424,8 +424,8 @@ public:
 void AddSC_boss_terestian_illhoof()
 {
     new boss_terestian_illhoof();
-    new mob_fiendish_imp();
-    new mob_fiendish_portal();
-    new mob_kilrek();
-    new mob_demon_chain();
+    new npc_fiendish_imp();
+    new npc_fiendish_portal();
+    new npc_kilrek();
+    new npc_demon_chain();
 }
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index c23c282f7e6..17546c66e26 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -225,19 +225,19 @@ public:
     };
 };
 
-class mob_tito : public CreatureScript
+class npc_tito : public CreatureScript
 {
 public:
-    mob_tito() : CreatureScript("mob_tito") { }
+    npc_tito() : CreatureScript("npc_tito") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_titoAI(creature);
+        return new npc_titoAI(creature);
     }
 
-    struct mob_titoAI : public ScriptedAI
+    struct npc_titoAI : public ScriptedAI
     {
-        mob_titoAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_titoAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint64 DorotheeGUID;
         uint32 YipTimer;
@@ -284,7 +284,7 @@ void boss_dorothee::boss_dorotheeAI::SummonTito()
     if (Creature* pTito = me->SummonCreature(CREATURE_TITO, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
     {
         Talk(SAY_DOROTHEE_SUMMON);
-        CAST_AI(mob_tito::mob_titoAI, pTito->AI())->DorotheeGUID = me->GetGUID();
+        CAST_AI(npc_tito::npc_titoAI, pTito->AI())->DorotheeGUID = me->GetGUID();
         pTito->AI()->AttackStart(me->GetVictim());
         SummonedTito = true;
         TitoDied = false;
@@ -708,19 +708,19 @@ public:
     };
 };
 
-class mob_cyclone : public CreatureScript
+class npc_cyclone : public CreatureScript
 {
 public:
-    mob_cyclone() : CreatureScript("mob_cyclone") { }
+    npc_cyclone() : CreatureScript("npc_cyclone") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_cycloneAI(creature);
+        return new npc_cycloneAI(creature);
     }
 
-    struct mob_cycloneAI : public ScriptedAI
+    struct npc_cycloneAI : public ScriptedAI
     {
-        mob_cycloneAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_cycloneAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 MoveTimer;
 
@@ -1520,8 +1520,8 @@ void AddSC_bosses_opera()
     new boss_tinhead();
     new boss_roar();
     new boss_crone();
-    new mob_tito();
-    new mob_cyclone();
+    new npc_tito();
+    new npc_cyclone();
     new npc_grandmother();
     new boss_bigbadwolf();
     new boss_julianne();
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index 796eb22ae67..3c78c2daa7c 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -453,7 +453,7 @@ public:
 #define SAY_DIALOG_ARCANAGOS_8      "What have you done, wizard? This cannot be! I'm burning from... within!"
 #define SAY_DIALOG_MEDIVH_9         "He should not have angered me. I must go... recover my strength now..."
 
-#define MOB_ARCANAGOS               17652
+#define NPC_ARCANAGOS               17652
 #define SPELL_FIRE_BALL             30967
 #define SPELL_UBER_FIREBALL         30971
 #define SPELL_CONFLAGRATION_BLAST   30977
@@ -523,7 +523,7 @@ public:
         {
             Step = 1;
             EventStarted = true;
-            Creature* Arcanagos = me->SummonCreature(MOB_ARCANAGOS, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+            Creature* Arcanagos = me->SummonCreature(NPC_ARCANAGOS, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
             if (!Arcanagos)
                 return;
             ArcanagosGUID = Arcanagos->GetGUID();
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index dcb7acac7d6..619bc4e921c 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -432,19 +432,19 @@ public:
     };
 };
 
-class mob_felkael_flamestrike : public CreatureScript
+class npc_felkael_flamestrike : public CreatureScript
 {
 public:
-    mob_felkael_flamestrike() : CreatureScript("mob_felkael_flamestrike") { }
+    npc_felkael_flamestrike() : CreatureScript("npc_felkael_flamestrike") { }
 
     CreatureAI* GetAI(Creature* c) const
     {
-        return new mob_felkael_flamestrikeAI(c);
+        return new npc_felkael_flamestrikeAI(c);
     }
 
-    struct mob_felkael_flamestrikeAI : public ScriptedAI
+    struct npc_felkael_flamestrikeAI : public ScriptedAI
     {
-        mob_felkael_flamestrikeAI(Creature* creature) : ScriptedAI(creature)
+        npc_felkael_flamestrikeAI(Creature* creature) : ScriptedAI(creature)
         {
         }
 
@@ -473,19 +473,19 @@ public:
     };
 };
 
-class mob_felkael_phoenix : public CreatureScript
+class npc_felkael_phoenix : public CreatureScript
 {
 public:
-    mob_felkael_phoenix() : CreatureScript("mob_felkael_phoenix") { }
+    npc_felkael_phoenix() : CreatureScript("npc_felkael_phoenix") { }
 
     CreatureAI* GetAI(Creature* c) const
     {
-        return new mob_felkael_phoenixAI(c);
+        return new npc_felkael_phoenixAI(c);
     }
 
-    struct mob_felkael_phoenixAI : public ScriptedAI
+    struct npc_felkael_phoenixAI : public ScriptedAI
     {
-        mob_felkael_phoenixAI(Creature* creature) : ScriptedAI(creature)
+        npc_felkael_phoenixAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -586,19 +586,19 @@ public:
     };
 };
 
-class mob_felkael_phoenix_egg : public CreatureScript
+class npc_felkael_phoenix_egg : public CreatureScript
 {
 public:
-    mob_felkael_phoenix_egg() : CreatureScript("mob_felkael_phoenix_egg") { }
+    npc_felkael_phoenix_egg() : CreatureScript("npc_felkael_phoenix_egg") { }
 
     CreatureAI* GetAI(Creature* c) const
     {
-        return new mob_felkael_phoenix_eggAI(c);
+        return new npc_felkael_phoenix_eggAI(c);
     }
 
-    struct mob_felkael_phoenix_eggAI : public ScriptedAI
+    struct npc_felkael_phoenix_eggAI : public ScriptedAI
     {
-        mob_felkael_phoenix_eggAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_felkael_phoenix_eggAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 HatchTimer;
 
@@ -621,19 +621,19 @@ public:
     };
 };
 
-class mob_arcane_sphere : public CreatureScript
+class npc_arcane_sphere : public CreatureScript
 {
 public:
-    mob_arcane_sphere() : CreatureScript("mob_arcane_sphere") { }
+    npc_arcane_sphere() : CreatureScript("npc_arcane_sphere") { }
 
     CreatureAI* GetAI(Creature* c) const
     {
-        return new mob_arcane_sphereAI(c);
+        return new npc_arcane_sphereAI(c);
     }
 
-    struct mob_arcane_sphereAI : public ScriptedAI
+    struct npc_arcane_sphereAI : public ScriptedAI
     {
-        mob_arcane_sphereAI(Creature* creature) : ScriptedAI(creature) { Reset(); }
+        npc_arcane_sphereAI(Creature* creature) : ScriptedAI(creature) { Reset(); }
 
         uint32 DespawnTimer;
         uint32 ChangeTargetTimer;
@@ -680,8 +680,8 @@ public:
 void AddSC_boss_felblood_kaelthas()
 {
     new boss_felblood_kaelthas();
-    new mob_arcane_sphere();
-    new mob_felkael_phoenix();
-    new mob_felkael_phoenix_egg();
-    new mob_felkael_flamestrike();
+    new npc_arcane_sphere();
+    new npc_felkael_phoenix();
+    new npc_felkael_phoenix_egg();
+    new npc_felkael_flamestrike();
 }
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index 56361e2fd54..687cc9d393c 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -1293,14 +1293,14 @@ public:
 };
 
 /*
-class mob_high_explosive_sheep : public CreatureScript
+class npc_high_explosive_sheep : public CreatureScript
 {
 public:
-    mob_high_explosive_sheep() : CreatureScript("mob_high_explosive_sheep") { }
+    npc_high_explosive_sheep() : CreatureScript("npc_high_explosive_sheep") { }
 
     //CreatureAI* GetAI(Creature* creature) const
     //{
-    //    return new mob_high_explosive_sheepAI (creature);
+    //    return new npc_high_explosive_sheepAI (creature);
     //};
 };
 */
@@ -1316,5 +1316,5 @@ void AddSC_boss_priestess_delrissa()
     new boss_garaxxas();
     new boss_apoko();
     new boss_zelfan();
-    // new mob_high_explosive_sheep();
+    // new npc_high_explosive_sheep();
 }
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index e42582814fd..969a9abcbbf 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -320,19 +320,19 @@ public:
     };
 };
 
-class mob_fel_crystal : public CreatureScript
+class npc_fel_crystal : public CreatureScript
 {
 public:
-    mob_fel_crystal() : CreatureScript("mob_fel_crystal") { }
+    npc_fel_crystal() : CreatureScript("npc_fel_crystal") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_fel_crystalAI (creature);
+        return new npc_fel_crystalAI (creature);
     };
 
-    struct mob_fel_crystalAI : public ScriptedAI
+    struct npc_fel_crystalAI : public ScriptedAI
     {
-        mob_fel_crystalAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_fel_crystalAI(Creature* creature) : ScriptedAI(creature) {}
 
         void Reset() {}
         void EnterCombat(Unit* /*who*/) {}
@@ -368,5 +368,5 @@ public:
 void AddSC_boss_selin_fireheart()
 {
     new boss_selin_fireheart();
-    new mob_fel_crystal();
+    new npc_fel_crystal();
 }
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index 0872e5b9935..d9de112992b 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -196,19 +196,19 @@ public:
     };
 };
 
-class mob_pure_energy : public CreatureScript
+class npc_pure_energy : public CreatureScript
 {
 public:
-    mob_pure_energy() : CreatureScript("mob_pure_energy") { }
+    npc_pure_energy() : CreatureScript("npc_pure_energy") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_pure_energyAI (creature);
+        return new npc_pure_energyAI (creature);
     };
 
-    struct mob_pure_energyAI : public ScriptedAI
+    struct npc_pure_energyAI : public ScriptedAI
     {
-        mob_pure_energyAI(Creature* creature) : ScriptedAI(creature)
+        npc_pure_energyAI(Creature* creature) : ScriptedAI(creature)
         {
             me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
         }
@@ -233,5 +233,5 @@ public:
 void AddSC_boss_vexallus()
 {
     new boss_vexallus();
-    new mob_pure_energy();
+    new npc_pure_energy();
 }
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
index aa563bf3180..562af075b98 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
@@ -101,14 +101,14 @@ class boss_garr : public CreatureScript
         }
 };
 
-class mob_firesworn : public CreatureScript
+class npc_firesworn : public CreatureScript
 {
     public:
-        mob_firesworn() : CreatureScript("mob_firesworn") { }
+        npc_firesworn() : CreatureScript("npc_firesworn") { }
 
-        struct mob_fireswornAI : public ScriptedAI
+        struct npc_fireswornAI : public ScriptedAI
         {
-            mob_fireswornAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_fireswornAI(Creature* creature) : ScriptedAI(creature) {}
 
             uint32 immolateTimer;
 
@@ -149,12 +149,12 @@ class mob_firesworn : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_fireswornAI(creature);
+            return new npc_fireswornAI(creature);
         }
 };
 
 void AddSC_boss_garr()
 {
     new boss_garr();
-    new mob_firesworn();
+    new npc_firesworn();
 }
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
index 8ddc7dc01bd..7e798aa815e 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
@@ -122,14 +122,14 @@ class boss_golemagg : public CreatureScript
         }
 };
 
-class mob_core_rager : public CreatureScript
+class npc_core_rager : public CreatureScript
 {
     public:
-        mob_core_rager() : CreatureScript("mob_core_rager") { }
+        npc_core_rager() : CreatureScript("npc_core_rager") { }
 
-        struct mob_core_ragerAI : public ScriptedAI
+        struct npc_core_ragerAI : public ScriptedAI
         {
-            mob_core_ragerAI(Creature* creature) : ScriptedAI(creature)
+            npc_core_ragerAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -179,12 +179,12 @@ class mob_core_rager : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_core_ragerAI(creature);
+            return new npc_core_ragerAI(creature);
         }
 };
 
 void AddSC_boss_golemagg()
 {
     new boss_golemagg();
-    new mob_core_rager();
+    new npc_core_rager();
 }
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
index 5e3ff1d4921..c67272ac068 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
@@ -310,14 +310,14 @@ class boss_ragnaros : public CreatureScript
         }
 };
 
-class mob_son_of_flame : public CreatureScript
+class npc_son_of_flame : public CreatureScript
 {
     public:
-        mob_son_of_flame() : CreatureScript("mob_SonOfFlame") { }
+        npc_son_of_flame() : CreatureScript("npc_SonOfFlame") { }
 
-        struct mob_son_of_flameAI : public ScriptedAI //didnt work correctly in EAI for me...
+        struct npc_son_of_flameAI : public ScriptedAI //didnt work correctly in EAI for me...
         {
-            mob_son_of_flameAI(Creature* creature) : ScriptedAI(creature)
+            npc_son_of_flameAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = me->GetInstanceScript();
             }
@@ -342,12 +342,12 @@ class mob_son_of_flame : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_son_of_flameAI(creature);
+            return new npc_son_of_flameAI(creature);
         }
 };
 
 void AddSC_boss_ragnaros()
 {
     new boss_ragnaros();
-    new mob_son_of_flame();
+    new npc_son_of_flame();
 }
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
index b4c2372a015..0a2ddb9c43d 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
@@ -133,14 +133,14 @@ class boss_sulfuron : public CreatureScript
         }
 };
 
-class mob_flamewaker_priest : public CreatureScript
+class npc_flamewaker_priest : public CreatureScript
 {
     public:
-        mob_flamewaker_priest() : CreatureScript("mob_flamewaker_priest") { }
+        npc_flamewaker_priest() : CreatureScript("npc_flamewaker_priest") { }
 
-        struct mob_flamewaker_priestAI : public ScriptedAI
+        struct npc_flamewaker_priestAI : public ScriptedAI
         {
-            mob_flamewaker_priestAI(Creature* creature) : ScriptedAI(creature)
+            npc_flamewaker_priestAI(Creature* creature) : ScriptedAI(creature)
             {
             }
 
@@ -205,12 +205,12 @@ class mob_flamewaker_priest : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_flamewaker_priestAI(creature);
+            return new npc_flamewaker_priestAI(creature);
         }
 };
 
 void AddSC_boss_sulfuron()
 {
     new boss_sulfuron();
-    new mob_flamewaker_priest();
+    new npc_flamewaker_priest();
 }
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index a9374481b77..024ef01ce6d 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -363,19 +363,19 @@ enum ScarletCourierEnum
     NPC_SCARLET_COURIER                = 29076
 };
 
-class mob_scarlet_courier : public CreatureScript
+class npc_scarlet_courier : public CreatureScript
 {
 public:
-    mob_scarlet_courier() : CreatureScript("mob_scarlet_courier") { }
+    npc_scarlet_courier() : CreatureScript("npc_scarlet_courier") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_scarlet_courierAI (creature);
+        return new npc_scarlet_courierAI (creature);
     }
 
-    struct mob_scarlet_courierAI : public ScriptedAI
+    struct npc_scarlet_courierAI : public ScriptedAI
     {
-        mob_scarlet_courierAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_scarlet_courierAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 uiStage;
         uint32 uiStage_timer;
@@ -455,19 +455,19 @@ enum valroth
     SPELL_SUMMON_VALROTH_REMAINS      = 52929
 };
 
-class mob_high_inquisitor_valroth : public CreatureScript
+class npc_high_inquisitor_valroth : public CreatureScript
 {
 public:
-    mob_high_inquisitor_valroth() : CreatureScript("mob_high_inquisitor_valroth") { }
+    npc_high_inquisitor_valroth() : CreatureScript("npc_high_inquisitor_valroth") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_high_inquisitor_valrothAI (creature);
+        return new npc_high_inquisitor_valrothAI (creature);
     }
 
-    struct mob_high_inquisitor_valrothAI : public ScriptedAI
+    struct npc_high_inquisitor_valrothAI : public ScriptedAI
     {
-        mob_high_inquisitor_valrothAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_high_inquisitor_valrothAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 uiRenew_timer;
         uint32 uiInquisitor_Penance_timer;
@@ -1013,8 +1013,8 @@ public:
 void AddSC_the_scarlet_enclave_c2()
 {
     new npc_crusade_persuaded();
-    new mob_scarlet_courier();
+    new npc_scarlet_courier();
     new npc_koltira_deathweaver();
-    new mob_high_inquisitor_valroth();
+    new npc_high_inquisitor_valroth();
     new npc_a_special_surprise();
 }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index fd382e1933f..4334242641c 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -141,19 +141,19 @@ static char const* Text[]=
 
 #define EMOTE_LAUGHS    "Headless Horseman laughs"  // needs assigned to db.
 
-class mob_wisp_invis : public CreatureScript
+class npc_wisp_invis : public CreatureScript
 {
 public:
-    mob_wisp_invis() : CreatureScript("mob_wisp_invis") { }
+    npc_wisp_invis() : CreatureScript("npc_wisp_invis") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_wisp_invisAI (creature);
+        return new npc_wisp_invisAI (creature);
     }
 
-    struct mob_wisp_invisAI : public ScriptedAI
+    struct npc_wisp_invisAI : public ScriptedAI
     {
-        mob_wisp_invisAI(Creature* creature) : ScriptedAI(creature)
+        npc_wisp_invisAI(Creature* creature) : ScriptedAI(creature)
         {
             Creaturetype = delay = spell = spell2 = 0;
         }
@@ -220,19 +220,19 @@ public:
     };
 };
 
-class mob_head : public CreatureScript
+class npc_head : public CreatureScript
 {
 public:
-    mob_head() : CreatureScript("mob_head") { }
+    npc_head() : CreatureScript("npc_head") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_headAI (creature);
+        return new npc_headAI (creature);
     }
 
-    struct mob_headAI : public ScriptedAI
+    struct npc_headAI : public ScriptedAI
     {
-        mob_headAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_headAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint64 bodyGUID;
 
@@ -468,7 +468,7 @@ public:
                 case 1:
                 {
                     if (Creature* smoke = me->SummonCreature(HELPER, Spawn[1].x, Spawn[1].y, Spawn[1].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000))
-                        CAST_AI(mob_wisp_invis::mob_wisp_invisAI, smoke->AI())->SetType(3);
+                        CAST_AI(npc_wisp_invis::npc_wisp_invisAI, smoke->AI())->SetType(3);
                     DoCast(me, SPELL_RHYME_BIG);
                     break;
                 }
@@ -520,7 +520,7 @@ public:
                     SaySound(SAY_PLAYER_DEATH);
                 //maybe possible when player dies from conflagration
                 else if (Creature* Head = Unit::GetCreature((*me), headGUID))
-                    CAST_AI(mob_head::mob_headAI, Head->AI())->SaySound(SAY_PLAYER_DEATH);
+                    CAST_AI(npc_head::npc_headAI, Head->AI())->SaySound(SAY_PLAYER_DEATH);
             }
         }
 
@@ -572,7 +572,7 @@ public:
             if (Creature* flame = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000))
                 flame->CastSpell(flame, SPELL_BODY_FLAME, false);
             if (Creature* wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000))
-                CAST_AI(mob_wisp_invis::mob_wisp_invisAI, wisp->AI())->SetType(4);
+                CAST_AI(npc_wisp_invis::npc_wisp_invisAI, wisp->AI())->SetType(4);
             if (instance)
                 instance->SetData(DATA_HORSEMAN_EVENT, DONE);
 
@@ -693,7 +693,7 @@ public:
                         if (burn <= diff)
                         {
                             if (Creature* flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000))
-                                CAST_AI(mob_wisp_invis::mob_wisp_invisAI, flame->AI())->SetType(2);
+                                CAST_AI(npc_wisp_invis::npc_wisp_invisAI, flame->AI())->SetType(2);
                             burned = true;
                         }
                         else burn -= diff;
@@ -752,8 +752,8 @@ public:
                         Creature* Head = Unit::GetCreature((*me), headGUID);
                         if (Head && Head->IsAlive())
                         {
-                            CAST_AI(mob_head::mob_headAI, Head->AI())->Phase = Phase;
-                            CAST_AI(mob_head::mob_headAI, Head->AI())->Disappear();
+                            CAST_AI(npc_head::npc_headAI, Head->AI())->Phase = Phase;
+                            CAST_AI(npc_head::npc_headAI, Head->AI())->Disappear();
                         }
                         return;
                     }
@@ -778,19 +778,19 @@ public:
     };
 };
 
-class mob_pulsing_pumpkin : public CreatureScript
+class npc_pulsing_pumpkin : public CreatureScript
 {
 public:
-    mob_pulsing_pumpkin() : CreatureScript("mob_pulsing_pumpkin") { }
+    npc_pulsing_pumpkin() : CreatureScript("npc_pulsing_pumpkin") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_pulsing_pumpkinAI (creature);
+        return new npc_pulsing_pumpkinAI (creature);
     }
 
-    struct mob_pulsing_pumpkinAI : public ScriptedAI
+    struct npc_pulsing_pumpkinAI : public ScriptedAI
     {
-        mob_pulsing_pumpkinAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_pulsing_pumpkinAI(Creature* creature) : ScriptedAI(creature) {}
 
         bool sprouted;
         uint64 debuffGUID;
@@ -806,7 +806,7 @@ public:
             {
                 debuff->SetDisplayId(me->GetDisplayId());
                 debuff->CastSpell(debuff, SPELL_PUMPKIN_AURA_GREEN, false);
-                CAST_AI(mob_wisp_invis::mob_wisp_invisAI, debuff->AI())->SetType(1);
+                CAST_AI(npc_wisp_invis::npc_wisp_invisAI, debuff->AI())->SetType(1);
                 debuffGUID = debuff->GetGUID();
             }
             sprouted = false;
@@ -899,7 +899,7 @@ public:
     }
 };
 
-void mob_head::mob_headAI::Disappear()
+void npc_head::npc_headAI::Disappear()
 {
     if (withbody)
         return;
@@ -925,8 +925,8 @@ void mob_head::mob_headAI::Disappear()
 void AddSC_boss_headless_horseman()
 {
     new boss_headless_horseman();
-    new mob_head();
-    new mob_pulsing_pumpkin();
-    new mob_wisp_invis();
+    new npc_head();
+    new npc_pulsing_pumpkin();
+    new npc_wisp_invis();
     new go_loosely_turned_soil();
 }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index 491cbf6ea11..ff0bc877686 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -129,19 +129,19 @@ public:
     };
 };
 
-class mob_scarlet_trainee : public CreatureScript
+class npc_scarlet_trainee : public CreatureScript
 {
 public:
-    mob_scarlet_trainee() : CreatureScript("mob_scarlet_trainee") { }
+    npc_scarlet_trainee() : CreatureScript("npc_scarlet_trainee") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_scarlet_traineeAI(creature);
+        return new npc_scarlet_traineeAI(creature);
     }
 
-    struct mob_scarlet_traineeAI : public npc_escortAI
+    struct npc_scarlet_traineeAI : public npc_escortAI
     {
-        mob_scarlet_traineeAI(Creature* creature) : npc_escortAI(creature)
+        npc_scarlet_traineeAI(Creature* creature) : npc_escortAI(creature)
         {
             Start_Timer = urand(1000, 6000);
         }
@@ -171,5 +171,5 @@ public:
 void AddSC_boss_herod()
 {
     new boss_herod();
-    new mob_scarlet_trainee();
+    new npc_scarlet_trainee();
 }
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
index 7a46483a897..d233b09bed2 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -154,19 +154,19 @@ public:
 
 // Illusion of Jandice Barov Script
 
-class mob_illusionofjandicebarov : public CreatureScript
+class npc_illusionofjandicebarov : public CreatureScript
 {
 public:
-    mob_illusionofjandicebarov() : CreatureScript("mob_illusionofjandicebarov") { }
+    npc_illusionofjandicebarov() : CreatureScript("npc_illusionofjandicebarov") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_illusionofjandicebarovAI (creature);
+        return new npc_illusionofjandicebarovAI (creature);
     }
 
-    struct mob_illusionofjandicebarovAI : public ScriptedAI
+    struct npc_illusionofjandicebarovAI : public ScriptedAI
     {
-        mob_illusionofjandicebarovAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_illusionofjandicebarovAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 Cleave_Timer;
 
@@ -205,5 +205,5 @@ public:
 void AddSC_boss_jandicebarov()
 {
     new boss_jandice_barov();
-    new mob_illusionofjandicebarov();
+    new npc_illusionofjandicebarov();
 }
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 396efc4bc7e..a8b981dc44f 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -25,9 +25,9 @@ EndScriptData */
 
 /* ContentData
 go_gauntlet_gate
-mob_freed_soul
-mob_restless_soul
-mobs_spectral_ghostly_citizen
+npc_freed_soul
+npc_restless_soul
+npc_spectral_ghostly_citizen
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -81,26 +81,26 @@ public:
 };
 
 /*######
-## mob_freed_soul
+## npc_freed_soul
 ######*/
 enum FreedSoul
 {
     SAY_ZAPPED = 0
 };
 
-class mob_freed_soul : public CreatureScript
+class npc_freed_soul : public CreatureScript
 {
 public:
-    mob_freed_soul() : CreatureScript("mob_freed_soul") { }
+    npc_freed_soul() : CreatureScript("npc_freed_soul") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_freed_soulAI (creature);
+        return new npc_freed_soulAI (creature);
     }
 
-    struct mob_freed_soulAI : public ScriptedAI
+    struct npc_freed_soulAI : public ScriptedAI
     {
-        mob_freed_soulAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_freed_soulAI(Creature* creature) : ScriptedAI(creature) {}
 
         void Reset()
         {
@@ -113,7 +113,7 @@ public:
 };
 
 /*######
-## mob_restless_soul
+## npc_restless_soul
 ######*/
 
 #define SPELL_EGAN_BLASTER  17368
@@ -122,19 +122,19 @@ public:
 #define ENTRY_RESTLESS      11122
 #define ENTRY_FREED         11136
 
-class mob_restless_soul : public CreatureScript
+class npc_restless_soul : public CreatureScript
 {
 public:
-    mob_restless_soul() : CreatureScript("mob_restless_soul") { }
+    npc_restless_soul() : CreatureScript("npc_restless_soul") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_restless_soulAI (creature);
+        return new npc_restless_soulAI (creature);
     }
 
-    struct mob_restless_soulAI : public ScriptedAI
+    struct npc_restless_soulAI : public ScriptedAI
     {
-        mob_restless_soulAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_restless_soulAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint64 Tagger;
         uint32 Die_Timer;
@@ -195,7 +195,7 @@ public:
 };
 
 /*######
-## mobs_spectral_ghostly_citizen
+## npc_spectral_ghostly_citizen
 ######*/
 
 enum eGhostlyCitizenSpells
@@ -204,19 +204,19 @@ enum eGhostlyCitizenSpells
     SPELL_SLAP              = 6754
 };
 
-class mobs_spectral_ghostly_citizen : public CreatureScript
+class npc_spectral_ghostly_citizen : public CreatureScript
 {
 public:
-    mobs_spectral_ghostly_citizen() : CreatureScript("mobs_spectral_ghostly_citizen") { }
+    npc_spectral_ghostly_citizen() : CreatureScript("npc_spectral_ghostly_citizen") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mobs_spectral_ghostly_citizenAI (creature);
+        return new npc_spectral_ghostly_citizenAI (creature);
     }
 
-    struct mobs_spectral_ghostly_citizenAI : public ScriptedAI
+    struct npc_spectral_ghostly_citizenAI : public ScriptedAI
     {
-        mobs_spectral_ghostly_citizenAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_spectral_ghostly_citizenAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 Die_Timer;
         bool Tagged;
@@ -294,7 +294,7 @@ public:
 void AddSC_stratholme()
 {
     new go_gauntlet_gate();
-    new mob_freed_soul();
-    new mob_restless_soul();
-    new mobs_spectral_ghostly_citizen();
+    new npc_freed_soul();
+    new npc_restless_soul();
+    new npc_spectral_ghostly_citizen();
 }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
index b9aef826738..31f93d70e00 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
@@ -294,7 +294,7 @@ public:
                 for (uint8 i = 0; i<3; ++i)
                 {
                     target = SelectTarget(SELECT_TARGET_RANDOM, 0);
-                    temp = DoSpawnCreature(MOB_SHADOW_IMAGE, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 10000);
+                    temp = DoSpawnCreature(NPC_SHADOW_IMAGE, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 10000);
                     if (temp && target)
                     {
                         temp->AddThreat(target, 1000000);//don't change target(healers)
@@ -661,19 +661,19 @@ public:
     };
 };
 
-class mob_shadow_image : public CreatureScript
+class npc_shadow_image : public CreatureScript
 {
 public:
-    mob_shadow_image() : CreatureScript("mob_shadow_image") { }
+    npc_shadow_image() : CreatureScript("npc_shadow_image") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_shadow_imageAI (creature);
+        return new npc_shadow_imageAI (creature);
     };
 
-    struct mob_shadow_imageAI : public ScriptedAI
+    struct npc_shadow_imageAI : public ScriptedAI
     {
-        mob_shadow_imageAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_shadow_imageAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 ShadowfuryTimer;
         uint32 KillTimer;
@@ -745,5 +745,5 @@ void AddSC_boss_eredar_twins()
 {
     new boss_sacrolash();
     new boss_alythess();
-    new mob_shadow_image();
+    new npc_shadow_image();
 }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
index 7db85b79d20..e7bc4d18a95 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -145,7 +145,7 @@ public:
             me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
             me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10);
 
-            DespawnSummons(MOB_VAPOR_TRAIL);
+            DespawnSummons(NPC_VAPOR_TRAIL);
             me->setActive(false);
 
             if (instance)
@@ -208,7 +208,7 @@ public:
             {
                 float x, y, z;
                 caster->GetPosition(x, y, z);
-                if (Unit* summon = me->SummonCreature(MOB_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000))
+                if (Unit* summon = me->SummonCreature(NPC_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000))
                 {
                     summon->SetMaxHealth(caster->GetMaxHealth());
                     summon->SetHealth(caster->GetMaxHealth());
@@ -221,7 +221,7 @@ public:
 
         void JustSummoned(Creature* summon)
         {
-            if (summon->GetEntry() == MOB_DEAD)
+            if (summon->GetEntry() == NPC_DEAD)
             {
                 summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM));
                 DoZoneInCombat(summon);
@@ -296,7 +296,7 @@ public:
                     return;
                 }
 
-                Creature* Vapor = me->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000);
+                Creature* Vapor = me->SummonCreature(NPC_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000);
                 if (Vapor)
                 {
                     Vapor->AI()->AttackStart(target);
@@ -310,7 +310,7 @@ public:
             }
             case 3:
             {
-                DespawnSummons(MOB_VAPOR_TRAIL);
+                DespawnSummons(NPC_VAPOR_TRAIL);
                 //DoCast(me, SPELL_VAPOR_SELECT); need core support
 
                 Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
@@ -324,7 +324,7 @@ public:
                 }
 
                 //target->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support
-                Creature* pVapor = me->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000);
+                Creature* pVapor = me->SummonCreature(NPC_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000);
                 if (pVapor)
                 {
                     if (pVapor->AI())
@@ -338,7 +338,7 @@ public:
                 break;
             }
             case 4:
-                DespawnSummons(MOB_VAPOR_TRAIL);
+                DespawnSummons(NPC_VAPOR_TRAIL);
                 events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1);
                 break;
             case 5:
@@ -469,7 +469,7 @@ public:
                             float x, y, z;
                             me->GetPosition(x, y, z);
                             me->UpdateGroundPositionZ(x, y, z);
-                            if (Creature* Fog = me->SummonCreature(MOB_VAPOR_TRAIL, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 10000))
+                            if (Creature* Fog = me->SummonCreature(NPC_VAPOR_TRAIL, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 10000))
                             {
                                 Fog->RemoveAurasDueToSpell(SPELL_TRAIL_TRIGGER);
                                 Fog->CastSpell(Fog, SPELL_FOG_TRIGGER, true);
@@ -499,10 +499,10 @@ public:
 
             for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i)
             {
-                if (entry == MOB_VAPOR_TRAIL && phase == PHASE_FLIGHT)
+                if (entry == NPC_VAPOR_TRAIL && phase == PHASE_FLIGHT)
                 {
                     (*i)->GetPosition(x, y, z);
-                    me->SummonCreature(MOB_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
                 }
                 (*i)->SetVisible(false);
                 (*i)->setDeathState(JUST_DIED);
@@ -513,19 +513,19 @@ public:
     };
 };
 
-class mob_felmyst_vapor : public CreatureScript
+class npc_felmyst_vapor : public CreatureScript
 {
 public:
-    mob_felmyst_vapor() : CreatureScript("mob_felmyst_vapor") { }
+    npc_felmyst_vapor() : CreatureScript("npc_felmyst_vapor") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_felmyst_vaporAI(creature);
+        return new npc_felmyst_vaporAI(creature);
     }
 
-    struct mob_felmyst_vaporAI : public ScriptedAI
+    struct npc_felmyst_vaporAI : public ScriptedAI
     {
-        mob_felmyst_vaporAI(Creature* creature) : ScriptedAI(creature)
+        npc_felmyst_vaporAI(Creature* creature) : ScriptedAI(creature)
         {
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             me->SetSpeed(MOVE_RUN, 0.8f);
@@ -545,19 +545,19 @@ public:
     };
 };
 
-class mob_felmyst_trail : public CreatureScript
+class npc_felmyst_trail : public CreatureScript
 {
 public:
-    mob_felmyst_trail() : CreatureScript("mob_felmyst_trail") { }
+    npc_felmyst_trail() : CreatureScript("npc_felmyst_trail") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_felmyst_trailAI(creature);
+        return new npc_felmyst_trailAI(creature);
     }
 
-    struct mob_felmyst_trailAI : public ScriptedAI
+    struct npc_felmyst_trailAI : public ScriptedAI
     {
-        mob_felmyst_trailAI(Creature* creature) : ScriptedAI(creature)
+        npc_felmyst_trailAI(Creature* creature) : ScriptedAI(creature)
         {
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             DoCast(me, SPELL_TRAIL_TRIGGER, true);
@@ -575,6 +575,6 @@ public:
 void AddSC_boss_felmyst()
 {
     new boss_felmyst();
-    new mob_felmyst_vapor();
-    new mob_felmyst_trail();
+    new npc_felmyst_vapor();
+    new npc_felmyst_trail();
 }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index c24e5864fae..cce84e3714a 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -627,7 +627,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            if (Creature* Kalec = me->SummonCreature(MOB_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0))
+            if (Creature* Kalec = me->SummonCreature(NPC_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0))
             {
                 KalecGUID = Kalec->GetGUID();
                 me->CombatStart(Kalec);
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index c0d7bb19b9d..9f4e8edc8cc 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -382,19 +382,19 @@ public:
 };
 
 //AI for Kil'jaeden Event Controller
-class mob_kiljaeden_controller : public CreatureScript
+class npc_kiljaeden_controller : public CreatureScript
 {
 public:
-    mob_kiljaeden_controller() : CreatureScript("mob_kiljaeden_controller") { }
+    npc_kiljaeden_controller() : CreatureScript("npc_kiljaeden_controller") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_kiljaeden_controllerAI (creature);
+        return new npc_kiljaeden_controllerAI (creature);
     }
 
-    struct mob_kiljaeden_controllerAI : public ScriptedAI
+    struct npc_kiljaeden_controllerAI : public ScriptedAI
     {
-        mob_kiljaeden_controllerAI(Creature* creature) : ScriptedAI(creature), summons(me)
+        npc_kiljaeden_controllerAI(Creature* creature) : ScriptedAI(creature), summons(me)
         {
             instance = creature->GetInstanceScript();
 
@@ -627,7 +627,7 @@ public:
             if (instance)
             {
                 if (Creature* pControl = Unit::GetCreature(*me, instance->GetData64(DATA_KILJAEDEN_CONTROLLER)))
-                    CAST_AI(mob_kiljaeden_controller::mob_kiljaeden_controllerAI, pControl->AI())->Reset();
+                    CAST_AI(npc_kiljaeden_controller::npc_kiljaeden_controllerAI, pControl->AI())->Reset();
             }
         }
 
@@ -894,19 +894,19 @@ public:
 };
 
 //AI for Hand of the Deceiver
-class mob_hand_of_the_deceiver : public CreatureScript
+class npc_hand_of_the_deceiver : public CreatureScript
 {
 public:
-    mob_hand_of_the_deceiver() : CreatureScript("mob_hand_of_the_deceiver") { }
+    npc_hand_of_the_deceiver() : CreatureScript("npc_hand_of_the_deceiver") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_hand_of_the_deceiverAI (creature);
+        return new npc_hand_of_the_deceiverAI (creature);
     }
 
-    struct mob_hand_of_the_deceiverAI : public ScriptedAI
+    struct npc_hand_of_the_deceiverAI : public ScriptedAI
     {
-        mob_hand_of_the_deceiverAI(Creature* creature) : ScriptedAI(creature)
+        npc_hand_of_the_deceiverAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -948,7 +948,7 @@ public:
                 return;
 
             if (Creature* pControl = Unit::GetCreature(*me, instance->GetData64(DATA_KILJAEDEN_CONTROLLER)))
-                ++(CAST_AI(mob_kiljaeden_controller::mob_kiljaeden_controllerAI, pControl->AI())->deceiverDeathCount);
+                ++(CAST_AI(npc_kiljaeden_controller::npc_kiljaeden_controllerAI, pControl->AI())->deceiverDeathCount);
         }
 
         void UpdateAI(uint32 diff)
@@ -994,19 +994,19 @@ public:
 };
 
 //AI for Felfire Portal
-class mob_felfire_portal : public CreatureScript
+class npc_felfire_portal : public CreatureScript
 {
 public:
-    mob_felfire_portal() : CreatureScript("mob_felfire_portal") { }
+    npc_felfire_portal() : CreatureScript("npc_felfire_portal") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_felfire_portalAI (creature);
+        return new npc_felfire_portalAI (creature);
     }
 
-    struct mob_felfire_portalAI : public ScriptedAI
+    struct npc_felfire_portalAI : public ScriptedAI
     {
-        mob_felfire_portalAI(Creature* creature) : ScriptedAI(creature)
+        npc_felfire_portalAI(Creature* creature) : ScriptedAI(creature)
         {
             SetCombatMovement(false);
         }
@@ -1041,19 +1041,19 @@ public:
 };
 
 //AI for Felfire Fiend
-class mob_volatile_felfire_fiend : public CreatureScript
+class npc_volatile_felfire_fiend : public CreatureScript
 {
 public:
-    mob_volatile_felfire_fiend() : CreatureScript("mob_volatile_felfire_fiend") { }
+    npc_volatile_felfire_fiend() : CreatureScript("npc_volatile_felfire_fiend") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_volatile_felfire_fiendAI (creature);
+        return new npc_volatile_felfire_fiendAI (creature);
     }
 
-    struct mob_volatile_felfire_fiendAI : public ScriptedAI
+    struct npc_volatile_felfire_fiendAI : public ScriptedAI
     {
-        mob_volatile_felfire_fiendAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_volatile_felfire_fiendAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 uiExplodeTimer;
 
@@ -1098,19 +1098,19 @@ public:
 };
 
 //AI for Armageddon target
-class mob_armageddon : public CreatureScript
+class npc_armageddon : public CreatureScript
 {
 public:
-    mob_armageddon() : CreatureScript("mob_armageddon") { }
+    npc_armageddon() : CreatureScript("npc_armageddon") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_armageddonAI (creature);
+        return new npc_armageddonAI (creature);
     }
 
-    struct mob_armageddonAI : public ScriptedAI
+    struct npc_armageddonAI : public ScriptedAI
     {
-        mob_armageddonAI(Creature* creature) : ScriptedAI(creature)
+        npc_armageddonAI(Creature* creature) : ScriptedAI(creature)
         {
             SetCombatMovement(false);
         }
@@ -1155,19 +1155,19 @@ public:
 };
 
 //AI for Shield Orbs
-class mob_shield_orb : public CreatureScript
+class npc_shield_orb : public CreatureScript
 {
 public:
-    mob_shield_orb() : CreatureScript("mob_shield_orb") { }
+    npc_shield_orb() : CreatureScript("npc_shield_orb") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_shield_orbAI (creature);
+        return new npc_shield_orbAI (creature);
     }
 
-    struct mob_shield_orbAI : public ScriptedAI
+    struct npc_shield_orbAI : public ScriptedAI
     {
-        mob_shield_orbAI(Creature* creature) : ScriptedAI(creature)
+        npc_shield_orbAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -1242,19 +1242,19 @@ public:
 };
 
 //AI for Sinister Reflection
-class mob_sinster_reflection : public CreatureScript
+class npc_sinster_reflection : public CreatureScript
 {
 public:
-    mob_sinster_reflection() : CreatureScript("mob_sinster_reflection") { }
+    npc_sinster_reflection() : CreatureScript("npc_sinster_reflection") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_sinster_reflectionAI (creature);
+        return new npc_sinster_reflectionAI (creature);
     }
 
-    struct mob_sinster_reflectionAI : public ScriptedAI
+    struct npc_sinster_reflectionAI : public ScriptedAI
     {
-        mob_sinster_reflectionAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_sinster_reflectionAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint8 victimClass;
         uint32 uiTimer[3];
@@ -1416,11 +1416,11 @@ void AddSC_boss_kiljaeden()
     new go_orb_of_the_blue_flight();
     new boss_kalecgos_kj();
     new boss_kiljaeden();
-    new mob_kiljaeden_controller();
-    new mob_hand_of_the_deceiver();
-    new mob_felfire_portal();
-    new mob_volatile_felfire_fiend();
-    new mob_armageddon();
-    new mob_shield_orb();
-    new mob_sinster_reflection();
+    new npc_kiljaeden_controller();
+    new npc_hand_of_the_deceiver();
+    new npc_felfire_portal();
+    new npc_volatile_felfire_fiend();
+    new npc_armageddon();
+    new npc_shield_orb();
+    new npc_sinster_reflection();
 }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
index 2efffc816c0..343720dbdb1 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
@@ -62,20 +62,20 @@ enum Creatures
 {
     BOSS_MURU                                     = 25741,
     BOSS_ENTROPIUS                                = 25840,
-    MOB_KALECGOS                                  = 24850,
-    MOB_KALEC                                     = 24891,
-    MOB_SATHROVARR                                = 24892,
+    NPC_KALECGOS                                  = 24850,
+    NPC_KALEC                                     = 24891,
+    NPC_SATHROVARR                                = 24892,
 
-    MOB_DEAD                                      = 25268,
-    MOB_FLIGHT_LEFT                               = 25357,
-    MOB_FLIGHT_RIGHT                              = 25358,
-    MOB_DEATH_CLOUD                               = 25703,
-    MOB_VAPOR                                     = 25265,
-    MOB_VAPOR_TRAIL                               = 25267,
+    NPC_DEAD                                      = 25268,
+    NPC_FLIGHT_LEFT                               = 25357,
+    NPC_FLIGHT_RIGHT                              = 25358,
+    NPC_DEATH_CLOUD                               = 25703,
+    NPC_VAPOR                                     = 25265,
+    NPC_VAPOR_TRAIL                               = 25267,
 
-    MOB_GRAND_WARLOCK_ALYTHESS                    = 25166,
-    MOB_SHADOW_IMAGE                              = 25214,
-    MOB_LADY_SACROLASH                            = 25165,
+    NPC_GRAND_WARLOCK_ALYTHESS                    = 25166,
+    NPC_SHADOW_IMAGE                              = 25214,
+    NPC_LADY_SACROLASH                            = 25165,
 
     CREATURE_ANVEENA                              = 26046, // Embodiment of the Sunwell
     CREATURE_KALECGOS                             = 25319, // Helps the raid throughout the fight
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
index f7f2dbfa6f7..ed7332510fc 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
@@ -211,24 +211,24 @@ class boss_archaedas : public CreatureScript
 };
 
 /* ScriptData
-SDName: mob_archaedas_minions
+SDName: npc_archaedas_minions
 SD%Complete: 100
 SDComment: These mobs are initially frozen until Archaedas awakens them
 one at a time.
 EndScriptData */
 
-class mob_archaedas_minions : public CreatureScript
+class npc_archaedas_minions : public CreatureScript
 {
     public:
 
-        mob_archaedas_minions()
-            : CreatureScript("mob_archaedas_minions")
+        npc_archaedas_minions()
+            : CreatureScript("npc_archaedas_minions")
         {
         }
 
-        struct mob_archaedas_minionsAI : public ScriptedAI
+        struct npc_archaedas_minionsAI : public ScriptedAI
         {
-            mob_archaedas_minionsAI(Creature* creature) : ScriptedAI(creature)
+            npc_archaedas_minionsAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = me->GetInstanceScript();
             }
@@ -303,29 +303,29 @@ class mob_archaedas_minions : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_archaedas_minionsAI(creature);
+            return new npc_archaedas_minionsAI(creature);
         }
 };
 
 /* ScriptData
-SDName: mob_stonekeepers
+SDName: npc_stonekeepers
 SD%Complete: 100
 SDComment: After activating the altar of the keepers, the stone keepers will
 wake up one by one.
 EndScriptData */
 
-class mob_stonekeepers : public CreatureScript
+class npc_stonekeepers : public CreatureScript
 {
     public:
 
-        mob_stonekeepers()
-            : CreatureScript("mob_stonekeepers")
+        npc_stonekeepers()
+            : CreatureScript("npc_stonekeepers")
         {
         }
 
-        struct mob_stonekeepersAI : public ScriptedAI
+        struct npc_stonekeepersAI : public ScriptedAI
         {
-            mob_stonekeepersAI(Creature* creature) : ScriptedAI(creature)
+            npc_stonekeepersAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = me->GetInstanceScript();
             }
@@ -366,7 +366,7 @@ class mob_stonekeepers : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_stonekeepersAI(creature);
+            return new npc_stonekeepersAI(creature);
         }
 };
 
@@ -404,8 +404,8 @@ class go_altar_of_archaedas : public GameObjectScript
 void AddSC_boss_archaedas()
 {
     new boss_archaedas();
-    new mob_archaedas_minions();
-    new mob_stonekeepers();
+    new npc_archaedas_minions();
+    new npc_stonekeepers();
     new go_altar_of_archaedas();
 }
 
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
index 3a84c79afdc..5f9577e12fa 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
@@ -24,7 +24,7 @@ SDCategory: Uldaman
 EndScriptData */
 
 /* ContentData
-mob_jadespine_basilisk
+npc_jadespine_basilisk
 go_keystone_chamber
 at_map_chamber
 EndContentData */
@@ -35,7 +35,7 @@ EndContentData */
 #include "Player.h"
 
 /*######
-## mob_jadespine_basilisk
+## npc_jadespine_basilisk
 ######*/
 
 enum eSpells
@@ -43,18 +43,18 @@ enum eSpells
     SPELL_CRYSTALLINE_SLUMBER   = 3636,
 };
 
-class mob_jadespine_basilisk : public CreatureScript
+class npc_jadespine_basilisk : public CreatureScript
 {
     public:
 
-        mob_jadespine_basilisk()
-            : CreatureScript("mob_jadespine_basilisk")
+        npc_jadespine_basilisk()
+            : CreatureScript("npc_jadespine_basilisk")
         {
         }
 
-        struct mob_jadespine_basiliskAI : public ScriptedAI
+        struct npc_jadespine_basiliskAI : public ScriptedAI
         {
-            mob_jadespine_basiliskAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_jadespine_basiliskAI(Creature* creature) : ScriptedAI(creature) {}
 
             uint32 uiCslumberTimer;
 
@@ -98,7 +98,7 @@ class mob_jadespine_basilisk : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_jadespine_basiliskAI(creature);
+            return new npc_jadespine_basiliskAI(creature);
         }
 };
 
@@ -146,7 +146,7 @@ class AreaTrigger_at_map_chamber : public AreaTriggerScript
 
 void AddSC_uldaman()
 {
-    new mob_jadespine_basilisk();
+    new npc_jadespine_basilisk();
     new go_keystone_chamber();
     new AreaTrigger_at_map_chamber();
 }
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index 1edc669e548..d4769d48efe 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -60,7 +60,7 @@ enum Says
 
 enum Misc
 {
-    MOB_SOARING_EAGLE           = 24858,
+    NPC_SOARING_EAGLE           = 24858,
     SE_LOC_X_MAX                = 400,
     SE_LOC_X_MIN                = 335,
     SE_LOC_Y_MAX                = 1435,
@@ -325,7 +325,7 @@ class boss_akilzon : public CreatureScript
                                         if (z > 95)
                                             z = 95.0f - urand(0, 5);
                                     }
-                                    Creature* creature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                                    Creature* creature = me->SummonCreature(NPC_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
                                     if (creature)
                                     {
                                         creature->AddThreat(me->GetVictim(), 1.0f);
@@ -363,14 +363,14 @@ class boss_akilzon : public CreatureScript
         }
 };
 
-class mob_akilzon_eagle : public CreatureScript
+class npc_akilzon_eagle : public CreatureScript
 {
     public:
-        mob_akilzon_eagle() : CreatureScript("mob_akilzon_eagle") { }
+        npc_akilzon_eagle() : CreatureScript("npc_akilzon_eagle") { }
 
-        struct mob_akilzon_eagleAI : public ScriptedAI
+        struct npc_akilzon_eagleAI : public ScriptedAI
         {
-            mob_akilzon_eagleAI(Creature* creature) : ScriptedAI(creature) { }
+            npc_akilzon_eagleAI(Creature* creature) : ScriptedAI(creature) { }
 
             uint32 EagleSwoop_Timer;
             bool arrived;
@@ -440,13 +440,13 @@ class mob_akilzon_eagle : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_akilzon_eagleAI(creature);
+            return new npc_akilzon_eagleAI(creature);
         }
 };
 
 void AddSC_boss_akilzon()
 {
     new boss_akilzon();
-    new mob_akilzon_eagle();
+    new npc_akilzon_eagle();
 }
 
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index 142bc46a1f1..dd75b80488b 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -348,18 +348,18 @@ class boss_halazzi : public CreatureScript
 };
 
 // Spirits Lynx AI
-class mob_halazzi_lynx : public CreatureScript
+class npc_halazzi_lynx : public CreatureScript
 {
     public:
 
-        mob_halazzi_lynx()
-            : CreatureScript("mob_halazzi_lynx")
+        npc_halazzi_lynx()
+            : CreatureScript("npc_halazzi_lynx")
         {
         }
 
-        struct mob_halazzi_lynxAI : public ScriptedAI
+        struct npc_halazzi_lynxAI : public ScriptedAI
         {
-            mob_halazzi_lynxAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_halazzi_lynxAI(Creature* creature) : ScriptedAI(creature) {}
 
             uint32 FrenzyTimer;
             uint32 shredder_timer;
@@ -408,14 +408,14 @@ class mob_halazzi_lynx : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_halazzi_lynxAI(creature);
+            return new npc_halazzi_lynxAI(creature);
         }
 };
 
 void AddSC_boss_halazzi()
 {
     new boss_halazzi();
-    new mob_halazzi_lynx();
+    new npc_halazzi_lynx();
 }
 
 
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
index 5b5d1ce4bb1..5965cadf814 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -46,7 +46,7 @@ EndScriptData */
 #define SPELL_DRAIN_POWER       44131
 #define SPELL_SIPHON_SOUL       43501
 
-#define MOB_TEMP_TRIGGER        23920
+#define NPC_TEMP_TRIGGER        23920
 
 //Defines for various powers he uses after using soul drain
 
@@ -402,7 +402,7 @@ class boss_hexlord_malacrass : public CreatureScript
                 if (SiphonSoul_Timer <= diff)
                 {
                     Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true);
-                    Unit* trigger = DoSpawnCreature(MOB_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
+                    Unit* trigger = DoSpawnCreature(NPC_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
                     if (!target || !trigger)
                     {
                         EnterEvadeMode();
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 267e58e9d4c..3b8e3d5fdb2 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -57,10 +57,10 @@ enum eEnums
     SPELL_FIRE_BOMB_DAMAGE      = 42630,
 
 // --Summons
-    MOB_AMANI_HATCHER           = 23818,
-    MOB_HATCHLING               = 23598,   // 42493
-    MOB_EGG                     = 23817,
-    MOB_FIRE_BOMB               = 23920,
+    NPC_AMANI_HATCHER           = 23818,
+    NPC_HATCHLING               = 23598,   // 42493
+    NPC_EGG                     = 23817,
+    NPC_FIRE_BOMB               = 23920,
 
 // -- Hatcher Spells
     SPELL_HATCH_EGG             = 42471,   // 43734
@@ -205,9 +205,9 @@ class boss_janalai : public CreatureScript
                     for (uint8 j = 0; j < WallNum; j++)
                     {
                         if (WallNum == 3)
-                            wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0], FireWallCoords[i][1]+5*(j-1), FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000);
+                            wall = me->SummonCreature(NPC_FIRE_BOMB, FireWallCoords[i][0], FireWallCoords[i][1]+5*(j-1), FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000);
                         else
-                            wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0]-2+4*j, FireWallCoords[i][1], FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000);
+                            wall = me->SummonCreature(NPC_FIRE_BOMB, FireWallCoords[i][0]-2+4*j, FireWallCoords[i][1], FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000);
                         if (wall) wall->CastSpell(wall, SPELL_FIRE_WALL, true);
                     }
                 }
@@ -221,7 +221,7 @@ class boss_janalai : public CreatureScript
                     dx = float(irand(-area_dx/2, area_dx/2));
                     dy = float(irand(-area_dy/2, area_dy/2));
 
-                    Creature* bomb = DoSpawnCreature(MOB_FIRE_BOMB, dx, dy, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000);
+                    Creature* bomb = DoSpawnCreature(NPC_FIRE_BOMB, dx, dy, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000);
                     if (bomb)
                         FireBombGUIDs[i] = bomb->GetGUID();
                 }
@@ -239,7 +239,7 @@ class boss_janalai : public CreatureScript
                     Cell cell(pair);
                     cell.SetNoCreate();
 
-                    Trinity::AllCreaturesOfEntryInRange check(me, MOB_EGG, 100);
+                    Trinity::AllCreaturesOfEntryInRange check(me, NPC_EGG, 100);
                     Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, templist, check);
 
                     TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> cSearcher(searcher);
@@ -272,7 +272,7 @@ class boss_janalai : public CreatureScript
                     Cell cell(pair);
                     cell.SetNoCreate();
 
-                    Trinity::AllCreaturesOfEntryInRange check(me, MOB_FIRE_BOMB, 100);
+                    Trinity::AllCreaturesOfEntryInRange check(me, NPC_FIRE_BOMB, 100);
                     Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, templist, check);
 
                     TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> cSearcher(searcher);
@@ -407,8 +407,8 @@ class boss_janalai : public CreatureScript
                         if (HatchAllEggs(0))
                         {
                             Talk(SAY_SUMMON_HATCHER);
-                            me->SummonCreature(MOB_AMANI_HATCHER, hatcherway[0][0][0], hatcherway[0][0][1], hatcherway[0][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
-                            me->SummonCreature(MOB_AMANI_HATCHER, hatcherway[1][0][0], hatcherway[1][0][1], hatcherway[1][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                            me->SummonCreature(NPC_AMANI_HATCHER, hatcherway[0][0][0], hatcherway[0][0][1], hatcherway[0][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                            me->SummonCreature(NPC_AMANI_HATCHER, hatcherway[1][0][0], hatcherway[1][0][1], hatcherway[1][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
                             HatcherTimer = 90000;
                         }
                         else
@@ -441,18 +441,18 @@ class boss_janalai : public CreatureScript
         }
 };
 
-class mob_janalai_firebomb : public CreatureScript
+class npc_janalai_firebomb : public CreatureScript
 {
     public:
 
-        mob_janalai_firebomb()
-            : CreatureScript("mob_janalai_firebomb")
+        npc_janalai_firebomb()
+            : CreatureScript("npc_janalai_firebomb")
         {
         }
 
-        struct mob_janalai_firebombAI : public ScriptedAI
+        struct npc_janalai_firebombAI : public ScriptedAI
         {
-            mob_janalai_firebombAI(Creature* creature) : ScriptedAI(creature){}
+            npc_janalai_firebombAI(Creature* creature) : ScriptedAI(creature){}
 
             void Reset() {}
 
@@ -473,22 +473,22 @@ class mob_janalai_firebomb : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_janalai_firebombAI(creature);
+            return new npc_janalai_firebombAI(creature);
         }
 };
 
-class mob_janalai_hatcher : public CreatureScript
+class npc_janalai_hatcher : public CreatureScript
 {
     public:
 
-        mob_janalai_hatcher()
-            : CreatureScript("mob_janalai_hatcher")
+        npc_janalai_hatcher()
+            : CreatureScript("npc_janalai_hatcher")
         {
         }
 
-        struct mob_janalai_hatcherAI : public ScriptedAI
+        struct npc_janalai_hatcherAI : public ScriptedAI
         {
-            mob_janalai_hatcherAI(Creature* creature) : ScriptedAI(creature)
+            npc_janalai_hatcherAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -605,22 +605,22 @@ class mob_janalai_hatcher : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_janalai_hatcherAI(creature);
+            return new npc_janalai_hatcherAI(creature);
         }
 };
 
-class mob_janalai_hatchling : public CreatureScript
+class npc_janalai_hatchling : public CreatureScript
 {
     public:
 
-        mob_janalai_hatchling()
-            : CreatureScript("mob_janalai_hatchling")
+        npc_janalai_hatchling()
+            : CreatureScript("npc_janalai_hatchling")
         {
         }
 
-        struct mob_janalai_hatchlingAI : public ScriptedAI
+        struct npc_janalai_hatchlingAI : public ScriptedAI
         {
-            mob_janalai_hatchlingAI(Creature* creature) : ScriptedAI(creature)
+            npc_janalai_hatchlingAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -664,23 +664,23 @@ class mob_janalai_hatchling : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_janalai_hatchlingAI(creature);
+            return new npc_janalai_hatchlingAI(creature);
         }
 };
 
-class mob_janalai_egg : public CreatureScript
+class npc_janalai_egg : public CreatureScript
 {
 public:
-    mob_janalai_egg(): CreatureScript("mob_janalai_egg") {}
+    npc_janalai_egg(): CreatureScript("npc_janalai_egg") {}
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_janalai_eggAI(creature);
+        return new npc_janalai_eggAI(creature);
     }
 
-    struct mob_janalai_eggAI : public ScriptedAI
+    struct npc_janalai_eggAI : public ScriptedAI
     {
-        mob_janalai_eggAI(Creature* creature) : ScriptedAI(creature){}
+        npc_janalai_eggAI(Creature* creature) : ScriptedAI(creature){}
 
         void Reset() {}
 
@@ -700,9 +700,9 @@ public:
 void AddSC_boss_janalai()
 {
     new boss_janalai();
-    new mob_janalai_firebomb();
-    new mob_janalai_hatcher();
-    new mob_janalai_hatchling();
-    new mob_janalai_egg();
+    new npc_janalai_firebomb();
+    new npc_janalai_hatcher();
+    new npc_janalai_hatchling();
+    new npc_janalai_egg();
 }
 
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
index 77f45754745..49df46df95c 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -559,18 +559,18 @@ class boss_zuljin : public CreatureScript
         }
 };
 
-class mob_zuljin_vortex : public CreatureScript
+class npc_zuljin_vortex : public CreatureScript
 {
     public:
 
-        mob_zuljin_vortex()
-            : CreatureScript("mob_zuljin_vortex")
+        npc_zuljin_vortex()
+            : CreatureScript("npc_zuljin_vortex")
         {
         }
 
-        struct mob_zuljin_vortexAI : public ScriptedAI
+        struct npc_zuljin_vortexAI : public ScriptedAI
         {
-            mob_zuljin_vortexAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_zuljin_vortexAI(Creature* creature) : ScriptedAI(creature) {}
 
             void Reset() {}
 
@@ -592,13 +592,13 @@ class mob_zuljin_vortex : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_zuljin_vortexAI(creature);
+            return new npc_zuljin_vortexAI(creature);
         }
 };
 
 void AddSC_boss_zuljin()
 {
     new boss_zuljin();
-    new mob_zuljin_vortex();
+    new npc_zuljin_vortex();
 }
 
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
index c52157b5303..2fb4e9eb4b3 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
@@ -218,18 +218,18 @@ class boss_jeklik : public CreatureScript //jeklik
 };
 
 //Flying Bat
-class mob_batrider : public CreatureScript
+class npc_batrider : public CreatureScript
 {
     public:
 
-        mob_batrider()
-            : CreatureScript("mob_batrider")
+        npc_batrider()
+            : CreatureScript("npc_batrider")
         {
         }
 
-        struct mob_batriderAI : public ScriptedAI
+        struct npc_batriderAI : public ScriptedAI
         {
-            mob_batriderAI(Creature* creature) : ScriptedAI(creature)
+            npc_batriderAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -286,13 +286,13 @@ class mob_batrider : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_batriderAI(creature);
+            return new npc_batriderAI(creature);
         }
 };
 
 void AddSC_boss_jeklik()
 {
     new boss_jeklik();
-    new mob_batrider();
+    new npc_batrider();
 }
 
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
index 0a61d20577f..9f22bfdcbd8 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
@@ -183,18 +183,18 @@ class boss_jindo : public CreatureScript
 };
 
 //Healing Ward
-class mob_healing_ward : public CreatureScript
+class npc_healing_ward : public CreatureScript
 {
     public:
 
-        mob_healing_ward()
-            : CreatureScript("mob_healing_ward")
+        npc_healing_ward()
+            : CreatureScript("npc_healing_ward")
         {
         }
 
-        struct mob_healing_wardAI : public ScriptedAI
+        struct npc_healing_wardAI : public ScriptedAI
         {
-            mob_healing_wardAI(Creature* creature) : ScriptedAI(creature)
+            npc_healing_wardAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -232,23 +232,23 @@ class mob_healing_ward : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_healing_wardAI(creature);
+            return new npc_healing_wardAI(creature);
         }
 };
 
 //Shade of Jindo
-class mob_shade_of_jindo : public CreatureScript
+class npc_shade_of_jindo : public CreatureScript
 {
     public:
 
-        mob_shade_of_jindo()
-            : CreatureScript("mob_shade_of_jindo")
+        npc_shade_of_jindo()
+            : CreatureScript("npc_shade_of_jindo")
         {
         }
 
-        struct mob_shade_of_jindoAI : public ScriptedAI
+        struct npc_shade_of_jindoAI : public ScriptedAI
         {
-            mob_shade_of_jindoAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_shade_of_jindoAI(Creature* creature) : ScriptedAI(creature) {}
 
             uint32 ShadowShock_Timer;
 
@@ -276,13 +276,13 @@ class mob_shade_of_jindo : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_shade_of_jindoAI(creature);
+            return new npc_shade_of_jindoAI(creature);
         }
 };
 
 void AddSC_boss_jindo()
 {
     new boss_jindo();
-    new mob_healing_ward();
-    new mob_shade_of_jindo();
+    new npc_healing_ward();
+    new npc_shade_of_jindo();
 }
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 0d96787166c..bb27c6f7630 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -291,13 +291,13 @@ enum OhganSpells
     SPELL_SUNDERARMOR         = 24317
 };
 
-class mob_ohgan : public CreatureScript
+class npc_ohgan : public CreatureScript
 {
-    public: mob_ohgan() : CreatureScript("mob_ohgan") {}
+    public: npc_ohgan() : CreatureScript("npc_ohgan") {}
 
-        struct mob_ohganAI : public ScriptedAI
+        struct npc_ohganAI : public ScriptedAI
         {
-            mob_ohganAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript()) { }
+            npc_ohganAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript()) { }
 
             void Reset()
             {
@@ -333,7 +333,7 @@ class mob_ohgan : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return GetZulGurubAI<mob_ohganAI>(creature);
+            return GetZulGurubAI<npc_ohganAI>(creature);
         }
 };
 
@@ -343,13 +343,13 @@ enum VilebranchSpells
     SPELL_CLEAVE              = 15284
 };
 
-class mob_vilebranch_speaker : public CreatureScript
+class npc_vilebranch_speaker : public CreatureScript
 {
-    public: mob_vilebranch_speaker() : CreatureScript("mob_vilebranch_speaker") {}
+    public: npc_vilebranch_speaker() : CreatureScript("npc_vilebranch_speaker") {}
 
-        struct mob_vilebranch_speakerAI : public ScriptedAI
+        struct npc_vilebranch_speakerAI : public ScriptedAI
         {
-            mob_vilebranch_speakerAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript()) { }
+            npc_vilebranch_speakerAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript()) { }
 
             void Reset()
             {
@@ -393,7 +393,7 @@ class mob_vilebranch_speaker : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_vilebranch_speakerAI(creature);
+            return new npc_vilebranch_speakerAI(creature);
         }
 };
 
@@ -429,7 +429,7 @@ class spell_threatening_gaze : public SpellScriptLoader
 void AddSC_boss_mandokir()
 {
     new boss_mandokir();
-    new mob_ohgan();
-    new mob_vilebranch_speaker();
+    new npc_ohgan();
+    new npc_vilebranch_speaker();
     new spell_threatening_gaze();
 }
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
index 7f9f681eea3..3fd46bd644e 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
@@ -217,13 +217,13 @@ class boss_marli : public CreatureScript
 };
 
 // Spawn of Marli
-class mob_spawn_of_marli : public CreatureScript
+class npc_spawn_of_marli : public CreatureScript
 {
-    public: mob_spawn_of_marli() : CreatureScript("mob_spawn_of_marli") {}
+    public: npc_spawn_of_marli() : CreatureScript("npc_spawn_of_marli") {}
 
-        struct mob_spawn_of_marliAI : public ScriptedAI
+        struct npc_spawn_of_marliAI : public ScriptedAI
         {
-            mob_spawn_of_marliAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_spawn_of_marliAI(Creature* creature) : ScriptedAI(creature) {}
 
             uint32 LevelUp_Timer;
 
@@ -255,12 +255,12 @@ class mob_spawn_of_marli : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_spawn_of_marliAI(creature);
+            return new npc_spawn_of_marliAI(creature);
         }
 };
 
 void AddSC_boss_marli()
 {
     new boss_marli();
-    new mob_spawn_of_marli();
+    new npc_spawn_of_marli();
 }
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
index 592c53d7025..60d553d4a8e 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -256,13 +256,13 @@ class boss_thekal : public CreatureScript
 };
 
 //Zealot Lor'Khan
-class mob_zealot_lorkhan : public CreatureScript
+class npc_zealot_lorkhan : public CreatureScript
 {
-    public: mob_zealot_lorkhan() : CreatureScript("mob_zealot_lorkhan") {}
+    public: npc_zealot_lorkhan() : CreatureScript("npc_zealot_lorkhan") {}
 
-        struct mob_zealot_lorkhanAI : public ScriptedAI
+        struct npc_zealot_lorkhanAI : public ScriptedAI
         {
-            mob_zealot_lorkhanAI(Creature* creature) : ScriptedAI(creature)
+            npc_zealot_lorkhanAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -406,23 +406,23 @@ class mob_zealot_lorkhan : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_zealot_lorkhanAI(creature);
+            return new npc_zealot_lorkhanAI(creature);
         }
 };
 
 //Zealot Zath
-class mob_zealot_zath : public CreatureScript
+class npc_zealot_zath : public CreatureScript
 {
     public:
 
-        mob_zealot_zath()
-            : CreatureScript("mob_zealot_zath")
+        npc_zealot_zath()
+            : CreatureScript("npc_zealot_zath")
         {
         }
 
-        struct mob_zealot_zathAI : public ScriptedAI
+        struct npc_zealot_zathAI : public ScriptedAI
         {
-            mob_zealot_zathAI(Creature* creature) : ScriptedAI(creature)
+            npc_zealot_zathAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -559,13 +559,13 @@ class mob_zealot_zath : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_zealot_zathAI(creature);
+            return new npc_zealot_zathAI(creature);
         }
 };
 
 void AddSC_boss_thekal()
 {
     new boss_thekal();
-    new mob_zealot_lorkhan();
-    new mob_zealot_zath();
+    new npc_zealot_lorkhan();
+    new npc_zealot_zath();
 }
diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
index 74344f28a9b..872ea60ddf0 100644
--- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
@@ -50,7 +50,7 @@ enum eEnums
     SAY_PROGRESS_9      = 9,
 
     QUEST_SUNKEN_TREASURE   = 665,
-    MOB_VENGEFUL_SURGE      = 2776
+    NPC_VENGEFUL_SURGE      = 2776
 };
 
 class npc_professor_phizzlethorpe : public CreatureScript
@@ -84,8 +84,8 @@ class npc_professor_phizzlethorpe : public CreatureScript
                         Talk(EMOTE_PROGRESS_4);
                         break;
                     case 9:
-                        me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
-                        me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                        me->SummonCreature(NPC_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                        me->SummonCreature(NPC_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
                         break;
                     case 10:
                         Talk(SAY_PROGRESS_5, player->GetGUID());
diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
index 4e04307d154..0a68ade7e6b 100644
--- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
@@ -24,7 +24,7 @@ SDCategory: Eastern Plaguelands
 EndScriptData */
 
 /* ContentData
-mobs_ghoul_flayer
+npc_ghoul_flayer
 npc_augustus_the_touched
 npc_darrowshire_spirit
 npc_tirion_fordring
@@ -36,14 +36,14 @@ EndContentData */
 #include "Player.h"
 #include "WorldSession.h"
 
-class mobs_ghoul_flayer : public CreatureScript
+class npc_ghoul_flayer : public CreatureScript
 {
 public:
-    mobs_ghoul_flayer() : CreatureScript("mobs_ghoul_flayer") { }
+    npc_ghoul_flayer() : CreatureScript("npc_ghoul_flayer") { }
 
-    struct mobs_ghoul_flayerAI : public ScriptedAI
+    struct npc_ghoul_flayerAI : public ScriptedAI
     {
-        mobs_ghoul_flayerAI(Creature* creature) : ScriptedAI(creature) { }
+        npc_ghoul_flayerAI(Creature* creature) : ScriptedAI(creature) { }
 
         void Reset() {}
 
@@ -58,7 +58,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mobs_ghoul_flayerAI (creature);
+        return new npc_ghoul_flayerAI (creature);
     }
 };
 
@@ -185,7 +185,7 @@ public:
 
 void AddSC_eastern_plaguelands()
 {
-    new mobs_ghoul_flayer();
+    new npc_ghoul_flayer();
     new npc_augustus_the_touched();
     new npc_darrowshire_spirit();
     new npc_tirion_fordring();
diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
index c148d485e1a..be0f4b47fed 100644
--- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
@@ -435,8 +435,8 @@ public:
 ######*/
 
 #define QUEST_UNEXPECTED_RESULT 8488
-#define MOB_GHARZUL     15958
-#define MOB_ANGERSHADE  15656
+#define NPC_GHARZUL     15958
+#define NPC_ANGERSHADE  15656
 
 class npc_apprentice_mirveda : public CreatureScript
 {
@@ -504,9 +504,9 @@ public:
 
             if (Summon)
             {
-                me->SummonCreature(MOB_GHARZUL, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
-                me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
-                me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
+                me->SummonCreature(NPC_GHARZUL, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
+                me->SummonCreature(NPC_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
+                me->SummonCreature(NPC_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
                 Summon = false;
             }
         }
@@ -519,7 +519,7 @@ public:
 
 enum InfusedCrystal
 {
-    MOB_ENRAGED_WRAITH          = 17086,
+    NPC_ENRAGED_WRAITH          = 17086,
     EMOTE                       = 0,
     QUEST_POWERING_OUR_DEFENSES = 8490
 };
@@ -618,9 +618,9 @@ public:
                 uint32 ran1 = rand()%8;
                 uint32 ran2 = rand()%8;
                 uint32 ran3 = rand()%8;
-                me->SummonCreature(MOB_ENRAGED_WRAITH, SpawnLocations[ran1].x, SpawnLocations[ran1].y, SpawnLocations[ran1].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000);
-                me->SummonCreature(MOB_ENRAGED_WRAITH, SpawnLocations[ran2].x, SpawnLocations[ran2].y, SpawnLocations[ran2].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000);
-                me->SummonCreature(MOB_ENRAGED_WRAITH, SpawnLocations[ran3].x, SpawnLocations[ran3].y, SpawnLocations[ran3].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000);
+                me->SummonCreature(NPC_ENRAGED_WRAITH, SpawnLocations[ran1].x, SpawnLocations[ran1].y, SpawnLocations[ran1].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000);
+                me->SummonCreature(NPC_ENRAGED_WRAITH, SpawnLocations[ran2].x, SpawnLocations[ran2].y, SpawnLocations[ran2].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000);
+                me->SummonCreature(NPC_ENRAGED_WRAITH, SpawnLocations[ran3].x, SpawnLocations[ran3].y, SpawnLocations[ran3].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000);
                 WaveTimer = 30000;
             } else WaveTimer -= diff;
         }
diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
index 5a67f0d053a..45b651872ac 100644
--- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
@@ -24,7 +24,7 @@ SDCategory: Stranglethorn Vale
 EndScriptData */
 
 /* ContentData
-mob_yenniku
+npc_yenniku
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -33,22 +33,22 @@ EndContentData */
 #include "SpellInfo.h"
 
 /*######
-## mob_yenniku
+## npc_yenniku
 ######*/
 
-class mob_yenniku : public CreatureScript
+class npc_yenniku : public CreatureScript
 {
 public:
-    mob_yenniku() : CreatureScript("mob_yenniku") { }
+    npc_yenniku() : CreatureScript("npc_yenniku") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_yennikuAI (creature);
+        return new npc_yennikuAI (creature);
     }
 
-    struct mob_yennikuAI : public ScriptedAI
+    struct npc_yennikuAI : public ScriptedAI
     {
-        mob_yennikuAI(Creature* creature) : ScriptedAI(creature)
+        npc_yennikuAI(Creature* creature) : ScriptedAI(creature)
         {
             bReset = false;
         }
@@ -126,5 +126,5 @@ public:
 
 void AddSC_stranglethorn_vale()
 {
-    new mob_yenniku();
+    new npc_yenniku();
 }