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

Note: Have fun :P

sql/updates/world/2013_07_04_02_world_misc.sql

@@ -0,0 +1,4 @@
+UPDATE `creature_template` SET `ScriptName` = REPLACE(`ScriptName`, 'mob_', 'npc_') WHERE `ScriptName` LIKE 'mob\_%';
+UPDATE `creature_template` SET `ScriptName` = REPLACE(`ScriptName`, 'mobs_', 'npc_') WHERE `ScriptName` LIKE 'mobs\_%';
+UPDATE `spell_script_names` SET `ScriptName`='spell_trash_npc_glacial_strike' WHERE `ScriptName`='spell_trash_mob_glacial_strike';
+

src/server/game/Scripting/ScriptLoader.cpp

@@ -335,7 +335,7 @@ void AddSC_boss_sartura();
 void AddSC_boss_skeram();
 void AddSC_boss_twinemperors();
 void AddSC_boss_ouro();
-void AddSC_mob_anubisath_sentinel();
+void AddSC_npc_anubisath_sentinel();
 void AddSC_instance_temple_of_ahnqiraj();
 void AddSC_wailing_caverns();                //Wailing caverns
 void AddSC_instance_wailing_caverns();
@@ -983,7 +983,7 @@ void AddKalimdorScripts()
     AddSC_boss_skeram();
     AddSC_boss_twinemperors();
     AddSC_boss_ouro();
-    AddSC_mob_anubisath_sentinel();
+    AddSC_npc_anubisath_sentinel();
     AddSC_instance_temple_of_ahnqiraj();
     AddSC_wailing_caverns();                //Wailing caverns
     AddSC_instance_wailing_caverns();

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();
 }

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;
 };

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();

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();
 }

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();
 }

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();

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();

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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();
 }

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);

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();
 }

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

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();
 }
 

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();
 }

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();
 }
 

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();
 }
 
 

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();

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();
 }
 

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();
 }
 

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();
 }
 

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();
 }

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();
 }

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();
 }

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();
 }

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());

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();

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;
         }

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();
 }

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp

@@ -172,19 +172,19 @@ public:
 
 };
 
-class mob_towering_infernal : public CreatureScript
+class npc_towering_infernal : public CreatureScript
 {
 public:
-    mob_towering_infernal() : CreatureScript("mob_towering_infernal") { }
+    npc_towering_infernal() : CreatureScript("npc_towering_infernal") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_towering_infernalAI (creature);
+        return new npc_towering_infernalAI (creature);
     }
 
-    struct mob_towering_infernalAI : public ScriptedAI
+    struct npc_towering_infernalAI : public ScriptedAI
     {
-        mob_towering_infernalAI(Creature* creature) : ScriptedAI(creature)
+        npc_towering_infernalAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
             if (instance)
@@ -257,5 +257,5 @@ public:
 void AddSC_boss_anetheron()
 {
     new boss_anetheron();
-    new mob_towering_infernal();
+    new npc_towering_infernal();
 }

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp

@@ -76,19 +76,19 @@ enum Summons
 
 Position const NordrassilLoc = {5503.713f, -3523.436f, 1608.781f, 0.0f};
 
-class mob_ancient_wisp : public CreatureScript
+class npc_ancient_wisp : public CreatureScript
 {
 public:
-    mob_ancient_wisp() : CreatureScript("mob_ancient_wisp") { }
+    npc_ancient_wisp() : CreatureScript("npc_ancient_wisp") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_ancient_wispAI(creature);
+        return new npc_ancient_wispAI(creature);
     }
 
-    struct mob_ancient_wispAI : public ScriptedAI
+    struct npc_ancient_wispAI : public ScriptedAI
     {
-        mob_ancient_wispAI(Creature* creature) : ScriptedAI(creature)
+        npc_ancient_wispAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
             ArchimondeGUID = 0;
@@ -134,19 +134,19 @@ public:
 
 /* This script is merely a placeholder for the Doomfire that triggers Doomfire spell. It will
    MoveChase the Doomfire Spirit always, until despawn (AttackStart is called upon it's spawn) */
-class mob_doomfire : public CreatureScript
+class npc_doomfire : public CreatureScript
 {
 public:
-    mob_doomfire() : CreatureScript("mob_doomfire") { }
+    npc_doomfire() : CreatureScript("npc_doomfire") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_doomfireAI(creature);
+        return new npc_doomfireAI(creature);
     }
 
-    struct mob_doomfireAI : public ScriptedAI
+    struct npc_doomfireAI : public ScriptedAI
     {
-        mob_doomfireAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_doomfireAI(Creature* creature) : ScriptedAI(creature) {}
 
         void Reset() { }
 
@@ -162,19 +162,19 @@ public:
 
 /* This is the script for the Doomfire Spirit Mob. This mob simply follow players or
    travels in random directions if target cannot be found. */
-class mob_doomfire_targetting : public CreatureScript
+class npc_doomfire_targetting : public CreatureScript
 {
 public:
-    mob_doomfire_targetting() : CreatureScript("mob_doomfire_targetting") { }
+    npc_doomfire_targetting() : CreatureScript("npc_doomfire_targetting") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_doomfire_targettingAI(creature);
+        return new npc_doomfire_targettingAI(creature);
     }
 
-    struct mob_doomfire_targettingAI : public ScriptedAI
+    struct npc_doomfire_targettingAI : public ScriptedAI
     {
-        mob_doomfire_targettingAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_doomfire_targettingAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint64 TargetGUID;
         uint32 ChangeTargetTimer;
@@ -643,7 +643,7 @@ public:
 void AddSC_boss_archimonde()
 {
     new boss_archimonde();
-    new mob_doomfire();
-    new mob_doomfire_targetting();
-    new mob_ancient_wisp();
+    new npc_doomfire();
+    new npc_doomfire_targetting();
+    new npc_ancient_wisp();
 }

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp

@@ -179,19 +179,19 @@ public:
 
 };
 
-class mob_lesser_doomguard : public CreatureScript
+class npc_lesser_doomguard : public CreatureScript
 {
 public:
-    mob_lesser_doomguard() : CreatureScript("mob_lesser_doomguard") { }
+    npc_lesser_doomguard() : CreatureScript("npc_lesser_doomguard") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_lesser_doomguardAI (creature);
+        return new npc_lesser_doomguardAI (creature);
     }
 
-    struct mob_lesser_doomguardAI : public hyjal_trashAI
+    struct npc_lesser_doomguardAI : public hyjal_trashAI
     {
-        mob_lesser_doomguardAI(Creature* creature) : hyjal_trashAI(creature)
+        npc_lesser_doomguardAI(Creature* creature) : hyjal_trashAI(creature)
         {
             instance = creature->GetInstanceScript();
             if (instance)
@@ -276,5 +276,5 @@ public:
 void AddSC_boss_azgalor()
 {
     new boss_azgalor();
-    new mob_lesser_doomguard();
+    new npc_lesser_doomguard();
 }

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp

@@ -408,14 +408,14 @@ void hyjal_trashAI::JustDied(Unit* /*killer*/)
         me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);//no loot
 }
 
-class mob_giant_infernal : public CreatureScript
+class npc_giant_infernal : public CreatureScript
 {
 public:
-    mob_giant_infernal() : CreatureScript("mob_giant_infernal") { }
+    npc_giant_infernal() : CreatureScript("npc_giant_infernal") { }
 
-    struct mob_giant_infernalAI : public hyjal_trashAI
+    struct npc_giant_infernalAI : public hyjal_trashAI
     {
-        mob_giant_infernalAI(Creature* creature) : hyjal_trashAI(creature)
+        npc_giant_infernalAI(Creature* creature) : hyjal_trashAI(creature)
         {
             instance = creature->GetInstanceScript();
             meteor = false;//call once!
@@ -537,23 +537,23 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_giant_infernalAI(creature);
+        return new npc_giant_infernalAI(creature);
     }
 };
 
-class mob_abomination : public CreatureScript
+class npc_abomination : public CreatureScript
 {
 public:
-    mob_abomination() : CreatureScript("mob_abomination") { }
+    npc_abomination() : CreatureScript("npc_abomination") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_abominationAI(creature);
+        return new npc_abominationAI(creature);
     }
 
-    struct mob_abominationAI : public hyjal_trashAI
+    struct npc_abominationAI : public hyjal_trashAI
     {
-        mob_abominationAI(Creature* creature) : hyjal_trashAI(creature)
+        npc_abominationAI(Creature* creature) : hyjal_trashAI(creature)
         {
             instance = creature->GetInstanceScript();
             go = false;
@@ -639,19 +639,19 @@ public:
 
 };
 
-class mob_ghoul : public CreatureScript
+class npc_ghoul : public CreatureScript
 {
 public:
-    mob_ghoul() : CreatureScript("mob_ghoul") { }
+    npc_ghoul() : CreatureScript("npc_ghoul") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_ghoulAI(creature);
+        return new npc_ghoulAI(creature);
     }
 
-    struct mob_ghoulAI : public hyjal_trashAI
+    struct npc_ghoulAI : public hyjal_trashAI
     {
-        mob_ghoulAI(Creature* creature) : hyjal_trashAI(creature)
+        npc_ghoulAI(Creature* creature) : hyjal_trashAI(creature)
         {
             instance = creature->GetInstanceScript();
             go = false;
@@ -741,19 +741,19 @@ public:
 
 };
 
-class mob_necromancer : public CreatureScript
+class npc_necromancer : public CreatureScript
 {
 public:
-    mob_necromancer() : CreatureScript("mob_necromancer") { }
+    npc_necromancer() : CreatureScript("npc_necromancer") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_necromancerAI(creature);
+        return new npc_necromancerAI(creature);
     }
 
-    struct mob_necromancerAI : public hyjal_trashAI
+    struct npc_necromancerAI : public hyjal_trashAI
     {
-        mob_necromancerAI(Creature* creature) : hyjal_trashAI(creature), summons(me)
+        npc_necromancerAI(Creature* creature) : hyjal_trashAI(creature), summons(me)
         {
             instance = creature->GetInstanceScript();
             go = false;
@@ -868,19 +868,19 @@ public:
 
 };
 
-class mob_banshee : public CreatureScript
+class npc_banshee : public CreatureScript
 {
 public:
-    mob_banshee() : CreatureScript("mob_banshee") { }
+    npc_banshee() : CreatureScript("npc_banshee") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_bansheeAI(creature);
+        return new npc_bansheeAI(creature);
     }
 
-    struct mob_bansheeAI : public hyjal_trashAI
+    struct npc_bansheeAI : public hyjal_trashAI
     {
-        mob_bansheeAI(Creature* creature) : hyjal_trashAI(creature)
+        npc_bansheeAI(Creature* creature) : hyjal_trashAI(creature)
         {
             instance = creature->GetInstanceScript();
             go = false;
@@ -971,19 +971,19 @@ public:
 
 };
 
-class mob_crypt_fiend : public CreatureScript
+class npc_crypt_fiend : public CreatureScript
 {
 public:
-    mob_crypt_fiend() : CreatureScript("mob_crypt_fiend") { }
+    npc_crypt_fiend() : CreatureScript("npc_crypt_fiend") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_crypt_fiendAI(creature);
+        return new npc_crypt_fiendAI(creature);
     }
 
-    struct mob_crypt_fiendAI : public hyjal_trashAI
+    struct npc_crypt_fiendAI : public hyjal_trashAI
     {
-        mob_crypt_fiendAI(Creature* creature) : hyjal_trashAI(creature)
+        npc_crypt_fiendAI(Creature* creature) : hyjal_trashAI(creature)
         {
             instance = creature->GetInstanceScript();
             go = false;
@@ -1061,19 +1061,19 @@ public:
 
 };
 
-class mob_fel_stalker : public CreatureScript
+class npc_fel_stalker : public CreatureScript
 {
 public:
-    mob_fel_stalker() : CreatureScript("mob_fel_stalker") { }
+    npc_fel_stalker() : CreatureScript("npc_fel_stalker") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_fel_stalkerAI(creature);
+        return new npc_fel_stalkerAI(creature);
     }
 
-    struct mob_fel_stalkerAI : public hyjal_trashAI
+    struct npc_fel_stalkerAI : public hyjal_trashAI
     {
-        mob_fel_stalkerAI(Creature* creature) : hyjal_trashAI(creature)
+        npc_fel_stalkerAI(Creature* creature) : hyjal_trashAI(creature)
         {
             instance = creature->GetInstanceScript();
             go = false;
@@ -1151,19 +1151,19 @@ public:
 
 };
 
-class mob_frost_wyrm : public CreatureScript
+class npc_frost_wyrm : public CreatureScript
 {
 public:
-    mob_frost_wyrm() : CreatureScript("mob_frost_wyrm") { }
+    npc_frost_wyrm() : CreatureScript("npc_frost_wyrm") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_frost_wyrmAI(creature);
+        return new npc_frost_wyrmAI(creature);
     }
 
-    struct mob_frost_wyrmAI : public hyjal_trashAI
+    struct npc_frost_wyrmAI : public hyjal_trashAI
     {
-        mob_frost_wyrmAI(Creature* creature) : hyjal_trashAI(creature)
+        npc_frost_wyrmAI(Creature* creature) : hyjal_trashAI(creature)
         {
             instance = creature->GetInstanceScript();
             go = false;
@@ -1263,19 +1263,19 @@ public:
 
 };
 
-class mob_gargoyle : public CreatureScript
+class npc_gargoyle : public CreatureScript
 {
 public:
-    mob_gargoyle() : CreatureScript("mob_gargoyle") { }
+    npc_gargoyle() : CreatureScript("npc_gargoyle") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_gargoyleAI(creature);
+        return new npc_gargoyleAI(creature);
     }
 
-    struct mob_gargoyleAI : public hyjal_trashAI
+    struct npc_gargoyleAI : public hyjal_trashAI
     {
-        mob_gargoyleAI(Creature* creature) : hyjal_trashAI(creature)
+        npc_gargoyleAI(Creature* creature) : hyjal_trashAI(creature)
         {
             instance = creature->GetInstanceScript();
             go = false;
@@ -1467,14 +1467,14 @@ public:
 
 void AddSC_hyjal_trash()
 {
-    new mob_giant_infernal();
-    new mob_abomination();
-    new mob_ghoul();
-    new mob_necromancer();
-    new mob_banshee();
-    new mob_crypt_fiend();
-    new mob_fel_stalker();
-    new mob_frost_wyrm();
-    new mob_gargoyle();
+    new npc_giant_infernal();
+    new npc_abomination();
+    new npc_ghoul();
+    new npc_necromancer();
+    new npc_banshee();
+    new npc_crypt_fiend();
+    new npc_fel_stalker();
+    new npc_frost_wyrm();
+    new npc_gargoyle();
     new alliance_rifleman();
 }

src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp

@@ -140,23 +140,23 @@ enum ThrallOldHillsbrad
     ENTRY_ARMORER               = 18764,
     ENTRY_SCARLOC               = 17862,
 
-    MOB_ENTRY_RIFLE             = 17820,
-    MOB_ENTRY_WARDEN            = 17833,
-    MOB_ENTRY_VETERAN           = 17860,
-    MOB_ENTRY_WATCHMAN          = 17814,
-    MOB_ENTRY_SENTRY            = 17815,
+    NPC_RIFLE                   = 17820,
+    NPC_WARDEN                  = 17833,
+    NPC_VETERAN                 = 17860,
+    NPC_WATCHMAN                = 17814,
+    NPC_SENTRY                  = 17815,
 
-    MOB_ENTRY_BARN_GUARDSMAN    = 18092,
-    MOB_ENTRY_BARN_PROTECTOR    = 18093,
-    MOB_ENTRY_BARN_LOOKOUT      = 18094,
+    NPC_BARN_GUARDSMAN          = 18092,
+    NPC_BARN_PROTECTOR          = 18093,
+    NPC_BARN_LOOKOUT            = 18094,
 
-    MOB_ENTRY_CHURCH_GUARDSMAN  = 23175,
-    MOB_ENTRY_CHURCH_PROTECTOR  = 23179,
-    MOB_ENTRY_CHURCH_LOOKOUT    = 23177,
+    NPC_CHURCH_GUARDSMAN        = 23175,
+    NPC_CHURCH_PROTECTOR        = 23179,
+    NPC_CHURCH_LOOKOUT          = 23177,
 
-    MOB_ENTRY_INN_GUARDSMAN     = 23176,
-    MOB_ENTRY_INN_PROTECTOR     = 23180,
-    MOB_ENTRY_INN_LOOKOUT       = 23178,
+    NPC_INN_GUARDSMAN           = 23176,
+    NPC_INN_PROTECTOR           = 23180,
+    NPC_INN_LOOKOUT             = 23178,
 
     SKARLOC_MOUNT               = 18798,
     SKARLOC_MOUNT_MODEL         = 18223,
@@ -316,22 +316,22 @@ public:
                     SetRun();
                     break;
                 case 15:
-                    me->SummonCreature(MOB_ENTRY_RIFLE, 2200.28f, 137.37f, 87.93f, 5.07f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_WARDEN, 2197.44f, 131.83f, 87.93f, 0.78f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_VETERAN, 2203.62f, 135.40f, 87.93f, 3.70f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_VETERAN, 2200.75f, 130.13f, 87.93f, 1.48f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_RIFLE, 2200.28f, 137.37f, 87.93f, 5.07f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_WARDEN, 2197.44f, 131.83f, 87.93f, 0.78f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_VETERAN, 2203.62f, 135.40f, 87.93f, 3.70f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_VETERAN, 2200.75f, 130.13f, 87.93f, 1.48f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
                     break;
                 case 21:
-                    me->SummonCreature(MOB_ENTRY_RIFLE, 2135.80f, 154.01f, 67.45f, 4.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_WARDEN, 2144.36f, 151.87f, 67.74f, 4.46f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_VETERAN, 2142.12f, 154.41f, 67.12f, 4.56f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_VETERAN, 2138.08f, 155.38f, 67.24f, 4.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_RIFLE, 2135.80f, 154.01f, 67.45f, 4.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_WARDEN, 2144.36f, 151.87f, 67.74f, 4.46f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_VETERAN, 2142.12f, 154.41f, 67.12f, 4.56f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_VETERAN, 2138.08f, 155.38f, 67.24f, 4.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
                     break;
                 case 25:
-                    me->SummonCreature(MOB_ENTRY_RIFLE, 2102.98f, 192.17f, 65.24f, 6.02f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_WARDEN, 2108.48f, 198.75f, 65.18f, 5.15f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_VETERAN, 2106.11f, 197.29f, 65.18f, 5.63f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_VETERAN, 2104.18f, 194.82f, 65.18f, 5.75f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_RIFLE, 2102.98f, 192.17f, 65.24f, 6.02f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_WARDEN, 2108.48f, 198.75f, 65.18f, 5.15f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_VETERAN, 2106.11f, 197.29f, 65.18f, 5.63f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_VETERAN, 2104.18f, 194.82f, 65.18f, 5.75f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
                     break;
                 case 29:
                     Talk(SAY_TH_SKARLOC_MEET);
@@ -350,9 +350,9 @@ public:
                     break;
                 case 37:
                     //possibly regular patrollers? If so, remove this and let database handle them
-                    me->SummonCreature(MOB_ENTRY_WATCHMAN, 2124.26f, 522.16f, 56.87f, 3.99f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_WATCHMAN, 2121.69f, 525.37f, 57.11f, 4.01f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_SENTRY, 2124.65f, 524.55f, 56.63f, 3.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_WATCHMAN, 2124.26f, 522.16f, 56.87f, 3.99f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_WATCHMAN, 2121.69f, 525.37f, 57.11f, 4.01f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_SENTRY, 2124.65f, 524.55f, 56.63f, 3.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
                     break;
                 case 59:
                     me->SummonCreature(SKARLOC_MOUNT, 2488.64f, 625.77f, 58.26f, 4.71f, TEMPSUMMON_TIMED_DESPAWN, 10000);
@@ -372,10 +372,10 @@ public:
                     SetRun(false);
                     break;
                 case 68:
-                    me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR, 2500.22f, 692.60f, 55.50f, 2.84f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT, 2500.13f, 696.55f, 55.51f, 3.38f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN, 2500.55f, 693.64f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN, 2500.94f, 695.81f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_BARN_PROTECTOR, 2500.22f, 692.60f, 55.50f, 2.84f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_BARN_LOOKOUT, 2500.13f, 696.55f, 55.51f, 3.38f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_BARN_GUARDSMAN, 2500.55f, 693.64f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_BARN_GUARDSMAN, 2500.94f, 695.81f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
                     break;
                 case 71:
                     SetRun();
@@ -384,10 +384,10 @@ public:
                     SetRun(false);
                     break;
                 case 83:
-                    me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR, 2627.33f, 646.82f, 56.03f, 4.28f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000);
-                    me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT, 2624.14f, 648.03f, 56.03f, 4.50f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000);
-                    me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2625.32f, 649.60f, 56.03f, 4.38f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000);
-                    me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2627.22f, 649.00f, 56.03f, 4.34f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000);
+                    me->SummonCreature(NPC_CHURCH_PROTECTOR, 2627.33f, 646.82f, 56.03f, 4.28f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000);
+                    me->SummonCreature(NPC_CHURCH_LOOKOUT, 2624.14f, 648.03f, 56.03f, 4.50f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000);
+                    me->SummonCreature(NPC_CHURCH_GUARDSMAN, 2625.32f, 649.60f, 56.03f, 4.38f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000);
+                    me->SummonCreature(NPC_CHURCH_GUARDSMAN, 2627.22f, 649.00f, 56.03f, 4.34f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000);
                     break;
                 case 84:
                     Talk(SAY_TH_CHURCH_END);
@@ -398,10 +398,10 @@ public:
                     SetRun(false);
                     break;
                 case 93:
-                    me->SummonCreature(MOB_ENTRY_INN_PROTECTOR, 2652.71f, 660.31f, 61.93f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_INN_LOOKOUT, 2648.96f, 662.59f, 61.93f, 0.79f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2657.36f, 662.34f, 61.93f, 2.68f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                    me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2656.39f, 659.77f, 61.93f, 2.61f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_INN_PROTECTOR, 2652.71f, 660.31f, 61.93f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_INN_LOOKOUT, 2648.96f, 662.59f, 61.93f, 0.79f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_INN_GUARDSMAN, 2657.36f, 662.34f, 61.93f, 2.68f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
+                    me->SummonCreature(NPC_INN_GUARDSMAN, 2656.39f, 659.77f, 61.93f, 2.61f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
                     break;
                 case 94:
                     if (uint64 TarethaGUID = instance->GetData64(DATA_TARETHA))
@@ -508,9 +508,9 @@ public:
              switch (summoned->GetEntry())
              {
             /// @todo make Scarloc start into event instead, and not start attack directly
-             case MOB_ENTRY_BARN_GUARDSMAN:
-             case MOB_ENTRY_BARN_PROTECTOR:
-             case MOB_ENTRY_BARN_LOOKOUT:
+             case NPC_BARN_GUARDSMAN:
+             case NPC_BARN_PROTECTOR:
+             case NPC_BARN_LOOKOUT:
              case SKARLOC_MOUNT:
              case EROZION_ENTRY:
                  break;

src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp

@@ -239,6 +239,7 @@ public:
                 DoFindNewTubber();
         }
 
+
         bool IsMovementActive;
         uint64 TargetTubberGUID;
     };
@@ -255,7 +256,7 @@ class spell_snufflenose_command : public SpellScriptLoader
 
             bool Load()
             {
-                return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER;
+                return GetCaster()->GetTypeId() == TYPEID_PLAYER;
             }
 
             void HandleAfterCast()
@@ -279,7 +280,7 @@ class spell_snufflenose_command : public SpellScriptLoader
 
 void AddSC_razorfen_kraul()
 {
-    new spell_snufflenose_command();
-    new npc_willix();
     new npc_snufflenose_gopher();
+    new npc_willix();
+    new spell_snufflenose_command();
 }

src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp

@@ -210,7 +210,7 @@ public:
                 instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED);
 
             //to avoid having a following void zone
-            Creature* pPortal= me->FindNearestCreature(MOB_CTHUN_PORTAL, 10);
+            Creature* pPortal= me->FindNearestCreature(NPC_CTHUN_PORTAL, 10);
             if (pPortal)
                 pPortal->SetReactState(REACT_PASSIVE);
         }
@@ -224,7 +224,7 @@ public:
 
         void SpawnEyeTentacle(float x, float y)
         {
-            if (Creature* Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500))
+            if (Creature* Spawned = DoSpawnCreature(NPC_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500))
                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     if (Spawned->AI())
                         Spawned->AI()->AttackStart(target);
@@ -289,7 +289,7 @@ public:
                             Creature* Spawned = NULL;
 
                             //Spawn claw tentacle on the random target
-                            Spawned = me->SummonCreature(MOB_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500);
+                            Spawned = me->SummonCreature(NPC_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500);
 
                             if (Spawned && Spawned->AI())
                                 Spawned->AI()->AttackStart(target);
@@ -393,7 +393,7 @@ public:
 
                 //Dead phase
                 case PHASE_CTHUN_DONE:
-                    Creature* pPortal= me->FindNearestCreature(MOB_CTHUN_PORTAL, 10);
+                    Creature* pPortal= me->FindNearestCreature(NPC_CTHUN_PORTAL, 10);
                     if (pPortal)
                         pPortal->DespawnOrUnsummon();
 
@@ -540,7 +540,7 @@ public:
         void SpawnEyeTentacle(float x, float y)
         {
             Creature* Spawned;
-            Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500);
+            Spawned = DoSpawnCreature(NPC_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500);
             if (Spawned && Spawned->AI())
                 if (Unit* target = SelectRandomNotStomach())
                     Spawned->AI()->AttackStart(target);
@@ -674,7 +674,7 @@ public:
                         //Spawn flesh tentacle
                         for (uint8 i = 0; i < 2; i++)
                         {
-                            Creature* spawned = me->SummonCreature(MOB_FLESH_TENTACLE, FleshTentaclePos[i], TEMPSUMMON_CORPSE_DESPAWN);
+                            Creature* spawned = me->SummonCreature(NPC_FLESH_TENTACLE, FleshTentaclePos[i], TEMPSUMMON_CORPSE_DESPAWN);
                             if (!spawned)
                                 ++FleshTentaclesKilled;
                         }
@@ -804,7 +804,7 @@ public:
                         if (Unit* target = SelectRandomNotStomach())
                         {
                             //Spawn claw tentacle on the random target
-                            if (Creature* spawned = me->SummonCreature(MOB_GIANT_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500))
+                            if (Creature* spawned = me->SummonCreature(NPC_GIANT_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500))
                                 if (spawned->AI())
                                     spawned->AI()->AttackStart(target);
                         }
@@ -819,7 +819,7 @@ public:
                         if (Unit* target = SelectRandomNotStomach())
                         {
                             //Spawn claw tentacle on the random target
-                            if (Creature* spawned = me->SummonCreature(MOB_GIANT_EYE_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500))
+                            if (Creature* spawned = me->SummonCreature(NPC_GIANT_EYE_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500))
                                 if (spawned->AI())
                                     spawned->AI()->AttackStart(target);
                         }
@@ -847,7 +847,7 @@ public:
                         //Spawn flesh tentacle
                         for (uint8 i = 0; i < 2; i++)
                         {
-                            Creature* spawned = me->SummonCreature(MOB_FLESH_TENTACLE, FleshTentaclePos[i], TEMPSUMMON_CORPSE_DESPAWN);
+                            Creature* spawned = me->SummonCreature(NPC_FLESH_TENTACLE, FleshTentaclePos[i], TEMPSUMMON_CORPSE_DESPAWN);
                             if (!spawned)
                                 ++FleshTentaclesKilled;
                         }
@@ -908,10 +908,10 @@ public:
 
 };
 
-class mob_eye_tentacle : public CreatureScript
+class npc_eye_tentacle : public CreatureScript
 {
 public:
-    mob_eye_tentacle() : CreatureScript("mob_eye_tentacle") { }
+    npc_eye_tentacle() : CreatureScript("npc_eye_tentacle") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
@@ -922,7 +922,7 @@ public:
     {
         eye_tentacleAI(Creature* creature) : ScriptedAI(creature)
         {
-            if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
+            if (Creature* pPortal = me->SummonCreature(NPC_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
             {
                 pPortal->SetReactState(REACT_PASSIVE);
                 Portal = pPortal->GetGUID();
@@ -983,10 +983,10 @@ public:
 
 };
 
-class mob_claw_tentacle : public CreatureScript
+class npc_claw_tentacle : public CreatureScript
 {
 public:
-    mob_claw_tentacle() : CreatureScript("mob_claw_tentacle") { }
+    npc_claw_tentacle() : CreatureScript("npc_claw_tentacle") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
@@ -999,7 +999,7 @@ public:
         {
             SetCombatMovement(false);
 
-            if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
+            if (Creature* pPortal = me->SummonCreature(NPC_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
             {
                 pPortal->SetReactState(REACT_PASSIVE);
                 Portal = pPortal->GetGUID();
@@ -1057,7 +1057,7 @@ public:
                     if (!target->HasAura(SPELL_DIGESTIVE_ACID))
                     {
                         me->SetPosition(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0);
-                        if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
+                        if (Creature* pPortal = me->SummonCreature(NPC_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
                         {
                             pPortal->SetReactState(REACT_PASSIVE);
                             Portal = pPortal->GetGUID();
@@ -1093,10 +1093,10 @@ public:
 
 };
 
-class mob_giant_claw_tentacle : public CreatureScript
+class npc_giant_claw_tentacle : public CreatureScript
 {
 public:
-    mob_giant_claw_tentacle() : CreatureScript("mob_giant_claw_tentacle") { }
+    npc_giant_claw_tentacle() : CreatureScript("npc_giant_claw_tentacle") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
@@ -1109,7 +1109,7 @@ public:
         {
             SetCombatMovement(false);
 
-            if (Creature* pPortal = me->SummonCreature(MOB_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
+            if (Creature* pPortal = me->SummonCreature(NPC_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
             {
                 pPortal->SetReactState(REACT_PASSIVE);
                 Portal = pPortal->GetGUID();
@@ -1169,7 +1169,7 @@ public:
                     if (!target->HasAura(SPELL_DIGESTIVE_ACID))
                     {
                         me->SetPosition(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0);
-                        if (Creature* pPortal = me->SummonCreature(MOB_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
+                        if (Creature* pPortal = me->SummonCreature(NPC_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
                         {
                             pPortal->SetReactState(REACT_PASSIVE);
                             Portal = pPortal->GetGUID();
@@ -1212,10 +1212,10 @@ public:
 
 };
 
-class mob_giant_eye_tentacle : public CreatureScript
+class npc_giant_eye_tentacle : public CreatureScript
 {
 public:
-    mob_giant_eye_tentacle() : CreatureScript("mob_giant_eye_tentacle") { }
+    npc_giant_eye_tentacle() : CreatureScript("npc_giant_eye_tentacle") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
@@ -1228,7 +1228,7 @@ public:
         {
             SetCombatMovement(false);
 
-            if (Creature* pPortal = me->SummonCreature(MOB_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
+            if (Creature* pPortal = me->SummonCreature(NPC_GIANT_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
             {
                 pPortal->SetReactState(REACT_PASSIVE);
                 Portal = pPortal->GetGUID();
@@ -1276,10 +1276,10 @@ public:
 
 };
 
-class mob_giant_flesh_tentacle : public CreatureScript
+class npc_giant_flesh_tentacle : public CreatureScript
 {
 public:
-    mob_giant_flesh_tentacle() : CreatureScript("mob_giant_flesh_tentacle") { }
+    npc_giant_flesh_tentacle() : CreatureScript("npc_giant_flesh_tentacle") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
@@ -1310,9 +1310,9 @@ void AddSC_boss_cthun()
 {
     new boss_eye_of_cthun();
     new boss_cthun();
-    new mob_eye_tentacle();
-    new mob_claw_tentacle();
-    new mob_giant_claw_tentacle();
-    new mob_giant_eye_tentacle();
-    new mob_giant_flesh_tentacle();
+    new npc_eye_tentacle();
+    new npc_claw_tentacle();
+    new npc_giant_claw_tentacle();
+    new npc_giant_eye_tentacle();
+    new npc_giant_flesh_tentacle();
 }

src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp

@@ -184,19 +184,19 @@ public:
 
 };
 
-class mob_sartura_royal_guard : public CreatureScript
+class npc_sartura_royal_guard : public CreatureScript
 {
 public:
-    mob_sartura_royal_guard() : CreatureScript("mob_sartura_royal_guard") { }
+    npc_sartura_royal_guard() : CreatureScript("npc_sartura_royal_guard") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_sartura_royal_guardAI (creature);
+        return new npc_sartura_royal_guardAI (creature);
     }
 
-    struct mob_sartura_royal_guardAI : public ScriptedAI
+    struct npc_sartura_royal_guardAI : public ScriptedAI
     {
-        mob_sartura_royal_guardAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_sartura_royal_guardAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 WhirlWind_Timer;
         uint32 WhirlWindRandom_Timer;
@@ -302,5 +302,5 @@ public:
 void AddSC_boss_sartura()
 {
     new boss_sartura();
-    new mob_sartura_royal_guard();
+    new npc_sartura_royal_guard();
 }

src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp

@@ -17,7 +17,7 @@
  */
 
 /* ScriptData
-SDName: mob_anubisath_sentinel
+SDName: npc_anubisath_sentinel
 SD%Complete: 95
 SDComment: Shadow storm is not properly implemented in core it should only target ppl outside of melee range.
 SDCategory: Temple of Ahn'Qiraj
@@ -56,10 +56,10 @@ EndScriptData */
 #define SPELL_STORM_BUFF        2148
 #define SPELL_STORM             26546
 
-class mob_anubisath_sentinel : public CreatureScript
+class npc_anubisath_sentinel : public CreatureScript
 {
 public:
-    mob_anubisath_sentinel() : CreatureScript("mob_anubisath_sentinel") { }
+    npc_anubisath_sentinel() : CreatureScript("npc_anubisath_sentinel") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
@@ -259,7 +259,7 @@ public:
     };
 };
 
-void AddSC_mob_anubisath_sentinel()
+void AddSC_npc_anubisath_sentinel()
 {
-    new mob_anubisath_sentinel();
+    new npc_anubisath_sentinel();
 }

src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h

@@ -40,15 +40,15 @@ enum DataTypes
 enum Creatures
 {
     BOSS_EYE_OF_CTHUN       = 15589,
-    MOB_CTHUN_PORTAL        = 15896,
-    MOB_CLAW_TENTACLE       = 15725,
-    MOB_EYE_TENTACLE        = 15726,
-    MOB_SMALL_PORTAL        = 15904,
-    MOB_BODY_OF_CTHUN       = 15809,
-    MOB_GIANT_CLAW_TENTACLE = 15728,
-    MOB_GIANT_EYE_TENTACLE  = 15334,
-    MOB_FLESH_TENTACLE      = 15802,
-    MOB_GIANT_PORTAL        = 15910,
+    NPC_CTHUN_PORTAL        = 15896,
+    NPC_CLAW_TENTACLE       = 15725,
+    NPC_EYE_TENTACLE        = 15726,
+    NPC_SMALL_PORTAL        = 15904,
+    NPC_BODY_OF_CTHUN       = 15809,
+    NPC_GIANT_CLAW_TENTACLE = 15728,
+    NPC_GIANT_EYE_TENTACLE  = 15334,
+    NPC_FLESH_TENTACLE      = 15802,
+    NPC_GIANT_PORTAL        = 15910,
 
     NPC_VISCIDUS            = 15299,
     NPC_GLOB_OF_VISCIDUS    = 15667,

src/server/scripts/Kalimdor/zone_azshara.cpp

@@ -24,10 +24,10 @@ SDCategory: Azshara
 EndScriptData */
 
 /* ContentData
-mobs_spitelashes
+npc_spitelashes
 npc_loramus_thalipedes
-mob_rizzle_sprysprocket
-mob_depth_charge
+npc_rizzle_sprysprocket
+npc_depth_charge
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -38,22 +38,22 @@ EndContentData */
 #include "WorldSession.h"
 
 /*######
-## mobs_spitelashes
+## npc_spitelashes
 ######*/
 
-class mobs_spitelashes : public CreatureScript
+class npc_spitelashes : public CreatureScript
 {
 public:
-    mobs_spitelashes() : CreatureScript("mobs_spitelashes") { }
+    npc_spitelashes() : CreatureScript("npc_spitelashes") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mobs_spitelashesAI (creature);
+        return new npc_spitelashesAI (creature);
     }
 
-    struct mobs_spitelashesAI : public ScriptedAI
+    struct npc_spitelashesAI : public ScriptedAI
     {
-        mobs_spitelashesAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_spitelashesAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 morphtimer;
         bool spellhit;
@@ -190,14 +190,14 @@ public:
 };
 
 /*####
-# mob_rizzle_sprysprocket
+# npc_rizzle_sprysprocket
 ####*/
 
 enum RizzleSprysprocketData
 {
     QUEST_CHASING_THE_MOONSTONE     = 10994,
 
-    MOB_DEPTH_CHARGE                = 23025,
+    NPC_DEPTH_CHARGE                = 23025,
 
     SPELL_RIZZLE_BLACKJACK          = 39865,
     SPELL_RIZZLE_ESCAPE             = 39871,
@@ -276,10 +276,10 @@ Position const WPs[58] =
     {1873.57f, -3695.32f, 33.9118f, 3.44f}
 };
 
-class mob_rizzle_sprysprocket : public CreatureScript
+class npc_rizzle_sprysprocket : public CreatureScript
 {
 public:
-    mob_rizzle_sprysprocket() : CreatureScript("mob_rizzle_sprysprocket") { }
+    npc_rizzle_sprysprocket() : CreatureScript("npc_rizzle_sprysprocket") { }
 
     bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
     {
@@ -288,8 +288,8 @@ public:
         {
             player->CLOSE_GOSSIP_MENU();
             creature->CastSpell(player, SPELL_GIVE_SOUTHFURY_MOONSTONE, true);
-            CAST_AI(mob_rizzle_sprysprocket::mob_rizzle_sprysprocketAI, creature->AI())->MustDieTimer = 3000;
-            CAST_AI(mob_rizzle_sprysprocket::mob_rizzle_sprysprocketAI, creature->AI())->MustDie = true;
+            CAST_AI(npc_rizzle_sprysprocket::npc_rizzle_sprysprocketAI, creature->AI())->MustDieTimer = 3000;
+            CAST_AI(npc_rizzle_sprysprocket::npc_rizzle_sprysprocketAI, creature->AI())->MustDie = true;
         }
         return true;
     }
@@ -305,12 +305,12 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_rizzle_sprysprocketAI (creature);
+        return new npc_rizzle_sprysprocketAI (creature);
     }
 
-    struct mob_rizzle_sprysprocketAI : public ScriptedAI
+    struct npc_rizzle_sprysprocketAI : public ScriptedAI
     {
-        mob_rizzle_sprysprocketAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_rizzle_sprysprocketAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 SpellEscapeTimer;
         uint32 TeleportTimer;
@@ -472,21 +472,21 @@ public:
 };
 
 /*####
-# mob_depth_charge
+# npc_depth_charge
 ####*/
-class mob_depth_charge : public CreatureScript
+class npc_depth_charge : public CreatureScript
 {
 public:
-    mob_depth_charge() : CreatureScript("mob_depth_charge") { }
+    npc_depth_charge() : CreatureScript("npc_depth_charge") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_depth_chargeAI (creature);
+        return new npc_depth_chargeAI (creature);
     }
 
-    struct mob_depth_chargeAI : public ScriptedAI
+    struct npc_depth_chargeAI : public ScriptedAI
     {
-        mob_depth_chargeAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_depth_chargeAI(Creature* creature) : ScriptedAI(creature) {}
 
         bool WeMustDie;
         uint32 WeMustDieTimer;
@@ -533,8 +533,8 @@ public:
 
 void AddSC_azshara()
 {
-    new mobs_spitelashes();
+    new npc_spitelashes();
     new npc_loramus_thalipedes();
-    new mob_rizzle_sprysprocket();
-    new mob_depth_charge();
+    new npc_rizzle_sprysprocket();
+    new npc_depth_charge();
 }

src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp

@@ -422,7 +422,7 @@ enum Geezle
 
     EMOTE_SPARK     = 7,
 
-    MOB_SPARK       = 17243,
+    NPC_SPARK       = 17243,
     GO_NAGA_FLAG    = 181694
 };
 
@@ -462,7 +462,7 @@ public:
         {
             Step = 0;
             EventStarted = true;
-            if (Creature* Spark = me->SummonCreature(MOB_SPARK, SparkPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000))
+            if (Creature* Spark = me->SummonCreature(NPC_SPARK, SparkPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000))
             {
                 SparkGUID = Spark->GetGUID();
                 Spark->setActive(true);
@@ -534,7 +534,7 @@ public:
 
             for (std::list<Player*>::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                 if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY) == QUEST_STATUS_INCOMPLETE && (*itr)->HasAura(SPELL_TREE_DISGUISE))
-                    (*itr)->KilledMonsterCredit(MOB_SPARK, 0);
+                    (*itr)->KilledMonsterCredit(NPC_SPARK, 0);
         }
 
         void DespawnNagaFlag(bool despawn)

src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp

@@ -24,7 +24,7 @@ SDCategory: Bloodmyst Isle
 EndScriptData */
 
 /* ContentData
-mob_webbed_creature
+npc_webbed_creature
 npc_captured_sunhawk_agent
 EndContentData */
 
@@ -34,25 +34,25 @@ EndContentData */
 #include "Player.h"
 
 /*######
-## mob_webbed_creature
+## npc_webbed_creature
 ######*/
 
 //possible creatures to be spawned
 uint32 const possibleSpawns[32] = {17322, 17661, 17496, 17522, 17340, 17352, 17333, 17524, 17654, 17348, 17339, 17345, 17359, 17353, 17336, 17550, 17330, 17701, 17321, 17680, 17325, 17320, 17683, 17342, 17715, 17334, 17341, 17338, 17337, 17346, 17344, 17327};
 
-class mob_webbed_creature : public CreatureScript
+class npc_webbed_creature : public CreatureScript
 {
 public:
-    mob_webbed_creature() : CreatureScript("mob_webbed_creature") { }
+    npc_webbed_creature() : CreatureScript("npc_webbed_creature") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_webbed_creatureAI (creature);
+        return new npc_webbed_creatureAI (creature);
     }
 
-    struct mob_webbed_creatureAI : public ScriptedAI
+    struct npc_webbed_creatureAI : public ScriptedAI
     {
-        mob_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) {}
 
         void Reset() {}
 
@@ -205,7 +205,7 @@ public:
 
 void AddSC_bloodmyst_isle()
 {
-    new mob_webbed_creature();
+    new npc_webbed_creature();
     new npc_captured_sunhawk_agent();
     new npc_princess_stillpine();
     new go_princess_stillpines_cage();

src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp

@@ -24,7 +24,7 @@ SDCategory: Dustwallow Marsh
 EndScriptData */
 
 /* ContentData
-mobs_risen_husk_spirit
+npc_risen_husk_spirit
 npc_lady_jaina_proudmoore
 npc_nat_pagle
 npc_private_hendel
@@ -40,7 +40,7 @@ EndContentData */
 #include "WorldSession.h"
 
 /*######
-## mobs_risen_husk_spirit
+## npc_risen_husk_spirit
 ######*/
 
 enum HauntingWitchHill
@@ -65,14 +65,14 @@ enum HauntingWitchHill
     EVENT_INTANGIBLE_PRESENCE           = 2,
 };
 
-class mobs_risen_husk_spirit : public CreatureScript
+class npc_risen_husk_spirit : public CreatureScript
 {
     public:
-        mobs_risen_husk_spirit() : CreatureScript("mobs_risen_husk_spirit") { }
+        npc_risen_husk_spirit() : CreatureScript("npc_risen_husk_spirit") { }
 
-        struct mobs_risen_husk_spiritAI : public ScriptedAI
+        struct npc_risen_husk_spiritAI : public ScriptedAI
         {
-            mobs_risen_husk_spiritAI(Creature* creature) : ScriptedAI(creature) { }
+            npc_risen_husk_spiritAI(Creature* creature) : ScriptedAI(creature) { }
 
             void Reset()
             {
@@ -128,7 +128,7 @@ class mobs_risen_husk_spirit : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mobs_risen_husk_spiritAI (creature);
+            return new npc_risen_husk_spiritAI (creature);
         }
 };
 
@@ -766,7 +766,7 @@ public:
 
 void AddSC_dustwallow_marsh()
 {
-    new mobs_risen_husk_spirit();
+    new npc_risen_husk_spirit();
     new npc_lady_jaina_proudmoore();
     new npc_nat_pagle();
     new npc_private_hendel();

src/server/scripts/Kalimdor/zone_silithus.cpp

@@ -287,7 +287,7 @@ enum EternalBoard
 
 /* ContentData
 A Pawn on the Eternal Board - creatures, gameobjects and defines
-mob_qiraj_war_spawn : Adds that are summoned in the Qiraj gates battle.
+npc_qiraj_war_spawn : Adds that are summoned in the Qiraj gates battle.
 npc_anachronos_the_ancient : Creature that controls the event.
 npc_anachronos_quest_trigger: controls the spawning of the BG War mobs.
 go_crystalline_tear : GameObject that begins the event and hands out quest
@@ -809,22 +809,22 @@ public:
 };
 
 /*######
-# mob_qiraj_war_spawn
+# npc_qiraj_war_spawn
 ######*/
 
-class mob_qiraj_war_spawn : public CreatureScript
+class npc_qiraj_war_spawn : public CreatureScript
 {
 public:
-    mob_qiraj_war_spawn() : CreatureScript("mob_qiraj_war_spawn") { }
+    npc_qiraj_war_spawn() : CreatureScript("npc_qiraj_war_spawn") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_qiraj_war_spawnAI(creature);
+        return new npc_qiraj_war_spawnAI(creature);
     }
 
-    struct mob_qiraj_war_spawnAI : public ScriptedAI
+    struct npc_qiraj_war_spawnAI : public ScriptedAI
     {
-        mob_qiraj_war_spawnAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_qiraj_war_spawnAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint64 MobGUID;
         uint64 PlayerGUID;
@@ -987,7 +987,7 @@ public:
 
                     if (WaveCount < 5) //1-4 Wave
                     {
-                        if (mob_qiraj_war_spawn::mob_qiraj_war_spawnAI* spawnAI = CAST_AI(mob_qiraj_war_spawn::mob_qiraj_war_spawnAI, spawn->AI()))
+                        if (npc_qiraj_war_spawn::npc_qiraj_war_spawnAI* spawnAI = CAST_AI(npc_qiraj_war_spawn::npc_qiraj_war_spawnAI, spawn->AI()))
                         {
                             spawnAI->MobGUID = me->GetGUID();
                             spawnAI->PlayerGUID = PlayerGUID;
@@ -1070,7 +1070,7 @@ public:
 
 };
 
-void mob_qiraj_war_spawn::mob_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/)
+void npc_qiraj_war_spawn::npc_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/)
 {
     me->RemoveCorpse();
 
@@ -1508,7 +1508,7 @@ void AddSC_silithus()
     new go_crystalline_tear();
     new npc_anachronos_quest_trigger();
     new npc_anachronos_the_ancient();
-    new mob_qiraj_war_spawn();
+    new npc_qiraj_war_spawn();
     new npc_highlord_demitrian();
     new npcs_rutgar_and_frankal();
     new go_wind_stone();

src/server/scripts/Kalimdor/zone_tanaris.cpp

@@ -24,7 +24,7 @@ SDCategory: Tanaris
 EndScriptData */
 
 /* ContentData
-mob_aquementas
+npc_aquementas
 npc_custodian_of_time
 npc_marin_noggenfogger
 npc_steward_of_time
@@ -42,7 +42,7 @@ EndContentData */
 #include "WorldSession.h"
 
 /*######
-## mob_aquementas
+## npc_aquementas
 ######*/
 
 enum Aquementas
@@ -53,19 +53,19 @@ enum Aquementas
     SPELL_FROST_SHOCK   = 15089
 };
 
-class mob_aquementas : public CreatureScript
+class npc_aquementas : public CreatureScript
 {
 public:
-    mob_aquementas() : CreatureScript("mob_aquementas") { }
+    npc_aquementas() : CreatureScript("npc_aquementas") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_aquementasAI (creature);
+        return new npc_aquementasAI (creature);
     }
 
-    struct mob_aquementasAI : public ScriptedAI
+    struct npc_aquementasAI : public ScriptedAI
     {
-        mob_aquementasAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_aquementasAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 SendItemTimer;
         uint32 SwitchFactionTimer;
@@ -677,7 +677,7 @@ public:
 
 void AddSC_tanaris()
 {
-    new mob_aquementas();
+    new npc_aquementas();
     new npc_custodian_of_time();
     new npc_marin_noggenfogger();
     new npc_steward_of_time();

src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp

@@ -177,14 +177,14 @@ public:
     }
 };
 
-class mob_amanitar_mushrooms : public CreatureScript
+class npc_amanitar_mushrooms : public CreatureScript
 {
 public:
-    mob_amanitar_mushrooms() : CreatureScript("mob_amanitar_mushrooms") { }
+    npc_amanitar_mushrooms() : CreatureScript("npc_amanitar_mushrooms") { }
 
-    struct mob_amanitar_mushroomsAI : public ScriptedAI
+    struct npc_amanitar_mushroomsAI : public ScriptedAI
     {
-        mob_amanitar_mushroomsAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_amanitar_mushroomsAI(Creature* creature) : ScriptedAI(creature) {}
 
         EventMap events;
 
@@ -242,12 +242,12 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_amanitar_mushroomsAI(creature);
+        return new npc_amanitar_mushroomsAI(creature);
     }
 };
 
 void AddSC_boss_amanitar()
 {
     new boss_amanitar();
-    new mob_amanitar_mushrooms();
+    new npc_amanitar_mushrooms();
 }

src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp

@@ -193,14 +193,14 @@ class boss_elder_nadox : public CreatureScript
         }
 };
 
-class mob_ahnkahar_nerubian : public CreatureScript
+class npc_ahnkahar_nerubian : public CreatureScript
 {
     public:
-        mob_ahnkahar_nerubian() : CreatureScript("mob_ahnkahar_nerubian") { }
+        npc_ahnkahar_nerubian() : CreatureScript("npc_ahnkahar_nerubian") { }
 
-        struct mob_ahnkahar_nerubianAI : public ScriptedAI
+        struct npc_ahnkahar_nerubianAI : public ScriptedAI
         {
-            mob_ahnkahar_nerubianAI(Creature* creature) : ScriptedAI(creature) { }
+            npc_ahnkahar_nerubianAI(Creature* creature) : ScriptedAI(creature) { }
 
             EventMap events;
 
@@ -244,19 +244,19 @@ class mob_ahnkahar_nerubian : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_ahnkahar_nerubianAI(creature);
+            return new npc_ahnkahar_nerubianAI(creature);
         }
 };
 
 //HACK: No, AI. Replace with proper db content?
-class mob_nadox_eggs : public CreatureScript
+class npc_nadox_eggs : public CreatureScript
 {
 public:
-    mob_nadox_eggs() : CreatureScript("mob_nadox_eggs") { }
+    npc_nadox_eggs() : CreatureScript("npc_nadox_eggs") { }
 
-    struct mob_nadox_eggsAI : public ScriptedAI
+    struct npc_nadox_eggsAI : public ScriptedAI
     {
-        mob_nadox_eggsAI(Creature* creature) : ScriptedAI(creature)
+        npc_nadox_eggsAI(Creature* creature) : ScriptedAI(creature)
         {
             creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
             creature->UpdateAllStats();
@@ -271,7 +271,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_nadox_eggsAI(creature);
+        return new npc_nadox_eggsAI(creature);
     }
 };
 
@@ -335,8 +335,8 @@ public:
 void AddSC_boss_elder_nadox()
 {
     new boss_elder_nadox();
-    new mob_ahnkahar_nerubian();
-    new mob_nadox_eggs();
+    new npc_ahnkahar_nerubian();
+    new npc_nadox_eggs();
     new spell_elder_nadox_guardian();
     new achievement_respect_your_elders();
 }

src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp

@@ -43,7 +43,7 @@ enum Spells
 
 enum Creatures
 {
-    MOB_TWISTED_VISAGE                            = 30625
+    NPC_TWISTED_VISAGE                            = 30625
 };
 
 
@@ -127,7 +127,7 @@ public:
                     if (!player || !player->IsAlive())
                         continue;
                     // Summon clone
-                    if (Unit* summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0))
+                    if (Unit* summon = me->SummonCreature(NPC_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0))
                     {
                         // clone
                         player->CastSpell(summon, SPELL_CLONE_PLAYER, true);

src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp

@@ -342,14 +342,14 @@ public:
     }
 };
 
-class mob_jedoga_initiand : public CreatureScript
+class npc_jedoga_initiand : public CreatureScript
 {
 public:
-    mob_jedoga_initiand() : CreatureScript("mob_jedoga_initiand") { }
+    npc_jedoga_initiand() : CreatureScript("npc_jedoga_initiand") { }
 
-    struct mob_jedoga_initiandAI : public ScriptedAI
+    struct npc_jedoga_initiandAI : public ScriptedAI
     {
-        mob_jedoga_initiandAI(Creature* creature) : ScriptedAI(creature)
+        npc_jedoga_initiandAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -505,7 +505,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_jedoga_initiandAI(creature);
+        return new npc_jedoga_initiandAI(creature);
     }
 };
 
@@ -617,7 +617,7 @@ class achievement_volunteer_work : public AchievementCriteriaScript
 void AddSC_boss_jedoga_shadowseeker()
 {
     new boss_jedoga_shadowseeker();
-    new mob_jedoga_initiand();
+    new npc_jedoga_initiand();
     new npc_jedogas_aufseher_trigger();
     new achievement_volunteer_work();
 }

src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp

@@ -334,14 +334,14 @@ public:
     }
 };
 
-class mob_taldaram_flamesphere : public CreatureScript
+class npc_taldaram_flamesphere : public CreatureScript
 {
 public:
-    mob_taldaram_flamesphere() : CreatureScript("mob_taldaram_flamesphere") { }
+    npc_taldaram_flamesphere() : CreatureScript("npc_taldaram_flamesphere") { }
 
-    struct mob_taldaram_flamesphereAI : public ScriptedAI
+    struct npc_taldaram_flamesphereAI : public ScriptedAI
     {
-        mob_taldaram_flamesphereAI(Creature* creature) : ScriptedAI(creature)
+        npc_taldaram_flamesphereAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -381,7 +381,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_taldaram_flamesphereAI(creature);
+        return new npc_taldaram_flamesphereAI(creature);
     }
 };
 
@@ -425,6 +425,6 @@ public:
 void AddSC_boss_taldaram()
 {
     new boss_taldaram();
-    new mob_taldaram_flamesphere();
+    new npc_taldaram_flamesphere();
     new prince_taldaram_sphere();
 }

src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp

@@ -54,9 +54,9 @@ enum Spells
 
 enum Mobs
 {
-    MOB_SKITTERING_SWARMER                        = 28735,
-    MOB_SKITTERING_SWARMER_CONTROLLER             = 32593,
-    MOB_SKITTERING_INFECTIOR                      = 28736
+    NPC_SKITTERING_SWARMER                        = 28735,
+    NPC_SKITTERING_SWARMER_CONTROLLER             = 32593,
+    NPC_SKITTERING_INFECTIOR                      = 28736
 };
 
 enum Yells
@@ -120,22 +120,22 @@ public:
 
         void Summon()
         {
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
-                me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_INFECTIOR, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_INFECTIOR, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_INFECTIOR, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
+                me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS);
         }
 
         void UpdateAI(uint32 diff)

src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp

@@ -976,19 +976,19 @@ struct dummy_dragonAI : public ScriptedAI
 ## Mob Tenebron
 ######*/
 
-class mob_tenebron : public CreatureScript
+class npc_tenebron : public CreatureScript
 {
 public:
-    mob_tenebron() : CreatureScript("mob_tenebron") { }
+    npc_tenebron() : CreatureScript("npc_tenebron") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_tenebronAI(creature);
+        return new npc_tenebronAI(creature);
     }
 
-    struct mob_tenebronAI : public dummy_dragonAI
+    struct npc_tenebronAI : public dummy_dragonAI
     {
-        mob_tenebronAI(Creature* creature) : dummy_dragonAI(creature) {}
+        npc_tenebronAI(Creature* creature) : dummy_dragonAI(creature) {}
 
         uint32 m_uiShadowBreathTimer;
         uint32 m_uiShadowFissureTimer;
@@ -1065,19 +1065,19 @@ public:
 ## Mob Shadron
 ######*/
 
-class mob_shadron : public CreatureScript
+class npc_shadron : public CreatureScript
 {
 public:
-    mob_shadron() : CreatureScript("mob_shadron") { }
+    npc_shadron() : CreatureScript("npc_shadron") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_shadronAI(creature);
+        return new npc_shadronAI(creature);
     }
 
-    struct mob_shadronAI : public dummy_dragonAI
+    struct npc_shadronAI : public dummy_dragonAI
     {
-        mob_shadronAI(Creature* creature) : dummy_dragonAI(creature) {}
+        npc_shadronAI(Creature* creature) : dummy_dragonAI(creature) {}
 
         uint32 m_uiShadowBreathTimer;
         uint32 m_uiShadowFissureTimer;
@@ -1169,19 +1169,19 @@ public:
 ## Mob Vesperon
 ######*/
 
-class mob_vesperon : public CreatureScript
+class npc_vesperon : public CreatureScript
 {
 public:
-    mob_vesperon() : CreatureScript("mob_vesperon") { }
+    npc_vesperon() : CreatureScript("npc_vesperon") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_vesperonAI(creature);
+        return new npc_vesperonAI(creature);
     }
 
-    struct mob_vesperonAI : public dummy_dragonAI
+    struct npc_vesperonAI : public dummy_dragonAI
     {
-        mob_vesperonAI(Creature* creature) : dummy_dragonAI(creature) {}
+        npc_vesperonAI(Creature* creature) : dummy_dragonAI(creature) {}
 
         uint32 m_uiShadowBreathTimer;
         uint32 m_uiShadowFissureTimer;
@@ -1264,19 +1264,19 @@ public:
 ## Mob Acolyte of Shadron
 ######*/
 
-class mob_acolyte_of_shadron : public CreatureScript
+class npc_acolyte_of_shadron : public CreatureScript
 {
 public:
-    mob_acolyte_of_shadron() : CreatureScript("mob_acolyte_of_shadron") { }
+    npc_acolyte_of_shadron() : CreatureScript("npc_acolyte_of_shadron") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_acolyte_of_shadronAI(creature);
+        return new npc_acolyte_of_shadronAI(creature);
     }
 
-    struct mob_acolyte_of_shadronAI : public ScriptedAI
+    struct npc_acolyte_of_shadronAI : public ScriptedAI
     {
-        mob_acolyte_of_shadronAI(Creature* creature) : ScriptedAI(creature)
+        npc_acolyte_of_shadronAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -1315,7 +1315,7 @@ public:
                 Creature* Shadron = instance->instance->GetCreature(instance->GetData64(DATA_SHADRON));
                 if (Shadron)
                 {
-                    (CAST_AI(mob_shadron::mob_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false;
+                    (CAST_AI(npc_shadron::npc_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false;
                 }
 
                 Creature* pDebuffTarget = NULL;
@@ -1374,19 +1374,19 @@ public:
 ## Mob Acolyte of Vesperon
 ######*/
 
-class mob_acolyte_of_vesperon : public CreatureScript
+class npc_acolyte_of_vesperon : public CreatureScript
 {
 public:
-    mob_acolyte_of_vesperon() : CreatureScript("mob_acolyte_of_vesperon") { }
+    npc_acolyte_of_vesperon() : CreatureScript("npc_acolyte_of_vesperon") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_acolyte_of_vesperonAI(creature);
+        return new npc_acolyte_of_vesperonAI(creature);
     }
 
-    struct mob_acolyte_of_vesperonAI : public ScriptedAI
+    struct npc_acolyte_of_vesperonAI : public ScriptedAI
     {
-        mob_acolyte_of_vesperonAI(Creature* creature) : ScriptedAI(creature)
+        npc_acolyte_of_vesperonAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -1413,7 +1413,7 @@ public:
             {
                 Creature* pVesperon = instance->instance->GetCreature(instance->GetData64(DATA_VESPERON));
                 if (pVesperon)
-                    (CAST_AI(mob_vesperon::mob_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false;
+                    (CAST_AI(npc_vesperon::npc_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false;
 
                 if (pVesperon && pVesperon->IsAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP))
                     pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP);
@@ -1469,19 +1469,19 @@ public:
 ## Mob Twilight Eggs
 ######*/
 
-class mob_twilight_eggs : public CreatureScript
+class npc_twilight_eggs : public CreatureScript
 {
 public:
-    mob_twilight_eggs() : CreatureScript("mob_twilight_eggs") { }
+    npc_twilight_eggs() : CreatureScript("npc_twilight_eggs") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_twilight_eggsAI(creature);
+        return new npc_twilight_eggsAI(creature);
     }
 
-    struct mob_twilight_eggsAI : public ScriptedAI
+    struct npc_twilight_eggsAI : public ScriptedAI
     {
-        mob_twilight_eggsAI(Creature* creature) : ScriptedAI(creature)
+        npc_twilight_eggsAI(Creature* creature) : ScriptedAI(creature)
         {
             SetCombatMovement(false);
             instance = creature->GetInstanceScript();
@@ -1524,7 +1524,7 @@ public:
             {
                 Creature* Tenebron = instance->instance->GetCreature(instance->GetData64(DATA_TENEBRON));
                 if (Tenebron)
-                    (CAST_AI(mob_tenebron::mob_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false;
+                    (CAST_AI(npc_tenebron::npc_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false;
                 SpawnWhelps();
             }
             else
@@ -1641,19 +1641,19 @@ public:
 ## Mob Twilight Whelps
 ######*/
 
-class mob_twilight_whelp : public CreatureScript
+class npc_twilight_whelp : public CreatureScript
 {
 public:
-    mob_twilight_whelp() : CreatureScript("mob_twilight_whelp") { }
+    npc_twilight_whelp() : CreatureScript("npc_twilight_whelp") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_twilight_whelpAI(creature);
+        return new npc_twilight_whelpAI(creature);
     }
 
-    struct mob_twilight_whelpAI : public ScriptedAI
+    struct npc_twilight_whelpAI : public ScriptedAI
     {
-        mob_twilight_whelpAI(Creature* creature) : ScriptedAI(creature)
+        npc_twilight_whelpAI(Creature* creature) : ScriptedAI(creature)
         {
             Reset();
         }
@@ -1751,15 +1751,15 @@ class achievement_twilight_zone : public AchievementCriteriaScript
 void AddSC_boss_sartharion()
 {
     new boss_sartharion();
-    new mob_vesperon();
-    new mob_shadron();
-    new mob_tenebron();
-    new mob_acolyte_of_shadron();
-    new mob_acolyte_of_vesperon();
-    new mob_twilight_eggs();
+    new npc_vesperon();
+    new npc_shadron();
+    new npc_tenebron();
+    new npc_acolyte_of_shadron();
+    new npc_acolyte_of_vesperon();
+    new npc_twilight_eggs();
     new npc_flame_tsunami();
     new npc_twilight_fissure();
-    new mob_twilight_whelp();
+    new npc_twilight_whelp();
     new achievement_twilight_assist();
     new achievement_twilight_duo();
     new achievement_twilight_zone();

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp

@@ -428,14 +428,14 @@ class boss_anubarak_trial : public CreatureScript
         };
 };
 
-class mob_swarm_scarab : public CreatureScript
+class npc_swarm_scarab : public CreatureScript
 {
     public:
-        mob_swarm_scarab() : CreatureScript("mob_swarm_scarab") { }
+        npc_swarm_scarab() : CreatureScript("npc_swarm_scarab") { }
 
-        struct mob_swarm_scarabAI : public ScriptedAI
+        struct npc_swarm_scarabAI : public ScriptedAI
         {
-            mob_swarm_scarabAI(Creature* creature) : ScriptedAI(creature)
+            npc_swarm_scarabAI(Creature* creature) : ScriptedAI(creature)
             {
                 _instance = creature->GetInstanceScript();
             }
@@ -496,18 +496,18 @@ class mob_swarm_scarab : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_swarm_scarabAI(creature);
+            return new npc_swarm_scarabAI(creature);
         };
 };
 
-class mob_nerubian_burrower : public CreatureScript
+class npc_nerubian_burrower : public CreatureScript
 {
     public:
-        mob_nerubian_burrower() : CreatureScript("mob_nerubian_burrower") { }
+        npc_nerubian_burrower() : CreatureScript("npc_nerubian_burrower") { }
 
-        struct mob_nerubian_burrowerAI : public ScriptedAI
+        struct npc_nerubian_burrowerAI : public ScriptedAI
         {
-            mob_nerubian_burrowerAI(Creature* creature) : ScriptedAI(creature)
+            npc_nerubian_burrowerAI(Creature* creature) : ScriptedAI(creature)
             {
                 _instance = creature->GetInstanceScript();
             }
@@ -585,18 +585,18 @@ class mob_nerubian_burrower : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_nerubian_burrowerAI(creature);
+            return new npc_nerubian_burrowerAI(creature);
         };
 };
 
-class mob_frost_sphere : public CreatureScript
+class npc_frost_sphere : public CreatureScript
 {
     public:
-        mob_frost_sphere() : CreatureScript("mob_frost_sphere") { }
+        npc_frost_sphere() : CreatureScript("npc_frost_sphere") { }
 
-        struct mob_frost_sphereAI : public ScriptedAI
+        struct npc_frost_sphereAI : public ScriptedAI
         {
-            mob_frost_sphereAI(Creature* creature) : ScriptedAI(creature)
+            npc_frost_sphereAI(Creature* creature) : ScriptedAI(creature)
             {
             }
 
@@ -658,18 +658,18 @@ class mob_frost_sphere : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_frost_sphereAI(creature);
+            return new npc_frost_sphereAI(creature);
         };
 };
 
-class mob_anubarak_spike : public CreatureScript
+class npc_anubarak_spike : public CreatureScript
 {
     public:
-        mob_anubarak_spike() : CreatureScript("mob_anubarak_spike") { }
+        npc_anubarak_spike() : CreatureScript("npc_anubarak_spike") { }
 
-        struct mob_anubarak_spikeAI : public ScriptedAI
+        struct npc_anubarak_spikeAI : public ScriptedAI
         {
-            mob_anubarak_spikeAI(Creature* creature) : ScriptedAI(creature)
+            npc_anubarak_spikeAI(Creature* creature) : ScriptedAI(creature)
             {
             }
 
@@ -805,7 +805,7 @@ class mob_anubarak_spike : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_anubarak_spikeAI(creature);
+            return new npc_anubarak_spikeAI(creature);
         };
 };
 
@@ -886,10 +886,10 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader
 void AddSC_boss_anubarak_trial()
 {
     new boss_anubarak_trial();
-    new mob_swarm_scarab();
-    new mob_nerubian_burrower();
-    new mob_anubarak_spike();
-    new mob_frost_sphere();
+    new npc_swarm_scarab();
+    new npc_nerubian_burrower();
+    new npc_anubarak_spike();
+    new npc_frost_sphere();
 
     new spell_impale();
     new spell_anubarak_leeching_swarm();

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp

@@ -750,14 +750,14 @@ struct boss_faction_championsAI : public BossAI
 /********************************************************************
                             HEALERS
 ********************************************************************/
-class mob_toc_druid : public CreatureScript
+class npc_toc_druid : public CreatureScript
 {
     public:
-        mob_toc_druid() : CreatureScript("mob_toc_druid") { }
+        npc_toc_druid() : CreatureScript("npc_toc_druid") { }
 
-        struct mob_toc_druidAI : public boss_faction_championsAI
+        struct npc_toc_druidAI : public boss_faction_championsAI
         {
-            mob_toc_druidAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {}
+            npc_toc_druidAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {}
 
             void Reset()
             {
@@ -839,18 +839,18 @@ class mob_toc_druid : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_druidAI (creature);
+            return new npc_toc_druidAI (creature);
         }
 };
 
-class mob_toc_shaman : public CreatureScript
+class npc_toc_shaman : public CreatureScript
 {
     public:
-        mob_toc_shaman() : CreatureScript("mob_toc_shaman") { }
+        npc_toc_shaman() : CreatureScript("npc_toc_shaman") { }
 
-        struct mob_toc_shamanAI : public boss_faction_championsAI
+        struct npc_toc_shamanAI : public boss_faction_championsAI
         {
-            mob_toc_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {}
+            npc_toc_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {}
 
             void Reset()
             {
@@ -932,18 +932,18 @@ class mob_toc_shaman : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_shamanAI (creature);
+            return new npc_toc_shamanAI (creature);
         }
 };
 
-class mob_toc_paladin : public CreatureScript
+class npc_toc_paladin : public CreatureScript
 {
     public:
-        mob_toc_paladin() : CreatureScript("mob_toc_paladin") { }
+        npc_toc_paladin() : CreatureScript("npc_toc_paladin") { }
 
-        struct mob_toc_paladinAI : public boss_faction_championsAI
+        struct npc_toc_paladinAI : public boss_faction_championsAI
         {
-            mob_toc_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {}
+            npc_toc_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {}
 
             void Reset()
             {
@@ -1036,18 +1036,18 @@ class mob_toc_paladin : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_paladinAI (creature);
+            return new npc_toc_paladinAI (creature);
         }
 };
 
-class mob_toc_priest : public CreatureScript
+class npc_toc_priest : public CreatureScript
 {
     public:
-        mob_toc_priest() : CreatureScript("mob_toc_priest") { }
+        npc_toc_priest() : CreatureScript("npc_toc_priest") { }
 
-        struct mob_toc_priestAI : public boss_faction_championsAI
+        struct npc_toc_priestAI : public boss_faction_championsAI
         {
-            mob_toc_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {}
+            npc_toc_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {}
 
             void Reset()
             {
@@ -1121,21 +1121,21 @@ class mob_toc_priest : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_priestAI (creature);
+            return new npc_toc_priestAI (creature);
         }
 };
 
 /********************************************************************
                             RANGED
 ********************************************************************/
-class mob_toc_shadow_priest : public CreatureScript
+class npc_toc_shadow_priest : public CreatureScript
 {
     public:
-        mob_toc_shadow_priest() : CreatureScript("mob_toc_shadow_priest") { }
+        npc_toc_shadow_priest() : CreatureScript("npc_toc_shadow_priest") { }
 
-        struct mob_toc_shadow_priestAI : public boss_faction_championsAI
+        struct npc_toc_shadow_priestAI : public boss_faction_championsAI
         {
-            mob_toc_shadow_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {}
+            npc_toc_shadow_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {}
 
             void Reset()
             {
@@ -1219,18 +1219,18 @@ class mob_toc_shadow_priest : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_shadow_priestAI (creature);
+            return new npc_toc_shadow_priestAI (creature);
         }
 };
 
-class mob_toc_warlock : public CreatureScript
+class npc_toc_warlock : public CreatureScript
 {
     public:
-        mob_toc_warlock() : CreatureScript("mob_toc_warlock") { }
+        npc_toc_warlock() : CreatureScript("npc_toc_warlock") { }
 
-        struct mob_toc_warlockAI : public boss_faction_championsAI
+        struct npc_toc_warlockAI : public boss_faction_championsAI
         {
-            mob_toc_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {}
+            npc_toc_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {}
 
             void Reset()
             {
@@ -1310,18 +1310,18 @@ class mob_toc_warlock : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_warlockAI (creature);
+            return new npc_toc_warlockAI (creature);
         }
 };
 
-class mob_toc_mage : public CreatureScript
+class npc_toc_mage : public CreatureScript
 {
     public:
-        mob_toc_mage() : CreatureScript("mob_toc_mage") { }
+        npc_toc_mage() : CreatureScript("npc_toc_mage") { }
 
-        struct mob_toc_mageAI : public boss_faction_championsAI
+        struct npc_toc_mageAI : public boss_faction_championsAI
         {
-            mob_toc_mageAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {}
+            npc_toc_mageAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {}
 
             void Reset()
             {
@@ -1404,18 +1404,18 @@ class mob_toc_mage : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_mageAI (creature);
+            return new npc_toc_mageAI (creature);
         }
 };
 
-class mob_toc_hunter : public CreatureScript
+class npc_toc_hunter : public CreatureScript
 {
     public:
-        mob_toc_hunter() : CreatureScript("mob_toc_hunter") { }
+        npc_toc_hunter() : CreatureScript("npc_toc_hunter") { }
 
-        struct mob_toc_hunterAI : public boss_faction_championsAI
+        struct npc_toc_hunterAI : public boss_faction_championsAI
         {
-            mob_toc_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {}
+            npc_toc_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {}
 
             void Reset()
             {
@@ -1506,18 +1506,18 @@ class mob_toc_hunter : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_hunterAI (creature);
+            return new npc_toc_hunterAI (creature);
         }
 };
 
-class mob_toc_boomkin : public CreatureScript
+class npc_toc_boomkin : public CreatureScript
 {
     public:
-        mob_toc_boomkin() : CreatureScript("mob_toc_boomkin") { }
+        npc_toc_boomkin() : CreatureScript("npc_toc_boomkin") { }
 
-        struct mob_toc_boomkinAI : public boss_faction_championsAI
+        struct npc_toc_boomkinAI : public boss_faction_championsAI
         {
-            mob_toc_boomkinAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {}
+            npc_toc_boomkinAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {}
 
             void Reset()
             {
@@ -1598,21 +1598,21 @@ class mob_toc_boomkin : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_boomkinAI (creature);
+            return new npc_toc_boomkinAI (creature);
         }
 };
 
 /********************************************************************
                             MELEE
 ********************************************************************/
-class mob_toc_warrior : public CreatureScript
+class npc_toc_warrior : public CreatureScript
 {
     public:
-        mob_toc_warrior() : CreatureScript("mob_toc_warrior") { }
+        npc_toc_warrior() : CreatureScript("npc_toc_warrior") { }
 
-        struct mob_toc_warriorAI : public boss_faction_championsAI
+        struct npc_toc_warriorAI : public boss_faction_championsAI
         {
-            mob_toc_warriorAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {}
+            npc_toc_warriorAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {}
 
             void Reset()
             {
@@ -1702,18 +1702,18 @@ class mob_toc_warrior : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_warriorAI (creature);
+            return new npc_toc_warriorAI (creature);
         }
 };
 
-class mob_toc_dk : public CreatureScript
+class npc_toc_dk : public CreatureScript
 {
     public:
-        mob_toc_dk() : CreatureScript("mob_toc_dk") { }
+        npc_toc_dk() : CreatureScript("npc_toc_dk") { }
 
-        struct mob_toc_dkAI : public boss_faction_championsAI
+        struct npc_toc_dkAI : public boss_faction_championsAI
         {
-            mob_toc_dkAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {}
+            npc_toc_dkAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {}
 
             void Reset()
             {
@@ -1798,18 +1798,18 @@ class mob_toc_dk : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_dkAI (creature);
+            return new npc_toc_dkAI (creature);
         }
 };
 
-class mob_toc_rogue : public CreatureScript
+class npc_toc_rogue : public CreatureScript
 {
     public:
-        mob_toc_rogue() : CreatureScript("mob_toc_rogue") { }
+        npc_toc_rogue() : CreatureScript("npc_toc_rogue") { }
 
-        struct mob_toc_rogueAI : public boss_faction_championsAI
+        struct npc_toc_rogueAI : public boss_faction_championsAI
         {
-            mob_toc_rogueAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {}
+            npc_toc_rogueAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {}
 
             void Reset()
             {
@@ -1903,18 +1903,18 @@ class mob_toc_rogue : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_rogueAI (creature);
+            return new npc_toc_rogueAI (creature);
         }
 };
 
-class mob_toc_enh_shaman : public CreatureScript
+class npc_toc_enh_shaman : public CreatureScript
 {
     public:
-        mob_toc_enh_shaman() : CreatureScript("mob_toc_enh_shaman") { }
+        npc_toc_enh_shaman() : CreatureScript("npc_toc_enh_shaman") { }
 
-        struct mob_toc_enh_shamanAI : public boss_faction_championsAI
+        struct npc_toc_enh_shamanAI : public boss_faction_championsAI
         {
-            mob_toc_enh_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {}
+            npc_toc_enh_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {}
 
             void Reset()
             {
@@ -2029,18 +2029,18 @@ class mob_toc_enh_shaman : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_enh_shamanAI (creature);
+            return new npc_toc_enh_shamanAI (creature);
         }
 };
 
-class mob_toc_retro_paladin : public CreatureScript
+class npc_toc_retro_paladin : public CreatureScript
 {
     public:
-        mob_toc_retro_paladin() : CreatureScript("mob_toc_retro_paladin") { }
+        npc_toc_retro_paladin() : CreatureScript("npc_toc_retro_paladin") { }
 
-        struct mob_toc_retro_paladinAI : public boss_faction_championsAI
+        struct npc_toc_retro_paladinAI : public boss_faction_championsAI
         {
-            mob_toc_retro_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {}
+            npc_toc_retro_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {}
 
             void Reset()
             {
@@ -2135,18 +2135,18 @@ class mob_toc_retro_paladin : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_retro_paladinAI (creature);
+            return new npc_toc_retro_paladinAI (creature);
         }
 };
 
-class mob_toc_pet_warlock : public CreatureScript
+class npc_toc_pet_warlock : public CreatureScript
 {
     public:
-        mob_toc_pet_warlock() : CreatureScript("mob_toc_pet_warlock") { }
+        npc_toc_pet_warlock() : CreatureScript("npc_toc_pet_warlock") { }
 
-        struct mob_toc_pet_warlockAI : public boss_faction_championsAI
+        struct npc_toc_pet_warlockAI : public boss_faction_championsAI
         {
-            mob_toc_pet_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {}
+            npc_toc_pet_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {}
 
             void Reset()
             {
@@ -2187,18 +2187,18 @@ class mob_toc_pet_warlock : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_pet_warlockAI (creature);
+            return new npc_toc_pet_warlockAI (creature);
         }
 };
 
-class mob_toc_pet_hunter : public CreatureScript
+class npc_toc_pet_hunter : public CreatureScript
 {
     public:
-        mob_toc_pet_hunter() : CreatureScript("mob_toc_pet_hunter") { }
+        npc_toc_pet_hunter() : CreatureScript("npc_toc_pet_hunter") { }
 
-        struct mob_toc_pet_hunterAI : public boss_faction_championsAI
+        struct npc_toc_pet_hunterAI : public boss_faction_championsAI
         {
-            mob_toc_pet_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {}
+            npc_toc_pet_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {}
 
             void Reset()
             {
@@ -2227,7 +2227,7 @@ class mob_toc_pet_hunter : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_toc_pet_hunterAI (creature);
+            return new npc_toc_pet_hunterAI (creature);
         }
 };
 
@@ -2388,22 +2388,22 @@ class spell_toc_heroism : public SpellScriptLoader
 void AddSC_boss_faction_champions()
 {
     new boss_toc_champion_controller();
-    new mob_toc_druid();
-    new mob_toc_shaman();
-    new mob_toc_paladin();
-    new mob_toc_priest();
-    new mob_toc_shadow_priest();
-    new mob_toc_mage();
-    new mob_toc_warlock();
-    new mob_toc_hunter();
-    new mob_toc_boomkin();
-    new mob_toc_warrior();
-    new mob_toc_dk();
-    new mob_toc_rogue();
-    new mob_toc_enh_shaman();
-    new mob_toc_retro_paladin();
-    new mob_toc_pet_warlock();
-    new mob_toc_pet_hunter();
+    new npc_toc_druid();
+    new npc_toc_shaman();
+    new npc_toc_paladin();
+    new npc_toc_priest();
+    new npc_toc_shadow_priest();
+    new npc_toc_mage();
+    new npc_toc_warlock();
+    new npc_toc_hunter();
+    new npc_toc_boomkin();
+    new npc_toc_warrior();
+    new npc_toc_dk();
+    new npc_toc_rogue();
+    new npc_toc_enh_shaman();
+    new npc_toc_retro_paladin();
+    new npc_toc_pet_warlock();
+    new npc_toc_pet_hunter();
 
     new spell_faction_champion_warl_unstable_affliction();
     new spell_faction_champion_death_grip();

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp

@@ -218,14 +218,14 @@ class boss_jaraxxus : public CreatureScript
         }
 };
 
-class mob_legion_flame : public CreatureScript
+class npc_legion_flame : public CreatureScript
 {
     public:
-        mob_legion_flame() : CreatureScript("mob_legion_flame") { }
+        npc_legion_flame() : CreatureScript("npc_legion_flame") { }
 
-        struct mob_legion_flameAI : public ScriptedAI
+        struct npc_legion_flameAI : public ScriptedAI
         {
-            mob_legion_flameAI(Creature* creature) : ScriptedAI(creature)
+            npc_legion_flameAI(Creature* creature) : ScriptedAI(creature)
             {
                 SetCombatMovement(false);
                 _instance = creature->GetInstanceScript();
@@ -250,18 +250,18 @@ class mob_legion_flame : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_legion_flameAI(creature);
+            return new npc_legion_flameAI(creature);
         }
 };
 
-class mob_infernal_volcano : public CreatureScript
+class npc_infernal_volcano : public CreatureScript
 {
     public:
-        mob_infernal_volcano() : CreatureScript("mob_infernal_volcano") { }
+        npc_infernal_volcano() : CreatureScript("npc_infernal_volcano") { }
 
-        struct mob_infernal_volcanoAI : public ScriptedAI
+        struct npc_infernal_volcanoAI : public ScriptedAI
         {
-            mob_infernal_volcanoAI(Creature* creature) : ScriptedAI(creature), _summons(me)
+            npc_infernal_volcanoAI(Creature* creature) : ScriptedAI(creature), _summons(me)
             {
                 SetCombatMovement(false);
             }
@@ -304,18 +304,18 @@ class mob_infernal_volcano : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_infernal_volcanoAI(creature);
+            return new npc_infernal_volcanoAI(creature);
         }
 };
 
-class mob_fel_infernal : public CreatureScript
+class npc_fel_infernal : public CreatureScript
 {
     public:
-        mob_fel_infernal() : CreatureScript("mob_fel_infernal") { }
+        npc_fel_infernal() : CreatureScript("npc_fel_infernal") { }
 
-        struct mob_fel_infernalAI : public ScriptedAI
+        struct npc_fel_infernalAI : public ScriptedAI
         {
-            mob_fel_infernalAI(Creature* creature) : ScriptedAI(creature)
+            npc_fel_infernalAI(Creature* creature) : ScriptedAI(creature)
             {
                 _instance = creature->GetInstanceScript();
             }
@@ -355,18 +355,18 @@ class mob_fel_infernal : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_fel_infernalAI(creature);
+            return new npc_fel_infernalAI(creature);
         }
 };
 
-class mob_nether_portal : public CreatureScript
+class npc_nether_portal : public CreatureScript
 {
     public:
-        mob_nether_portal() : CreatureScript("mob_nether_portal") { }
+        npc_nether_portal() : CreatureScript("npc_nether_portal") { }
 
-        struct mob_nether_portalAI : public ScriptedAI
+        struct npc_nether_portalAI : public ScriptedAI
         {
-            mob_nether_portalAI(Creature* creature) : ScriptedAI(creature), _summons(me)
+            npc_nether_portalAI(Creature* creature) : ScriptedAI(creature), _summons(me)
             {
             }
 
@@ -408,18 +408,18 @@ class mob_nether_portal : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_nether_portalAI(creature);
+            return new npc_nether_portalAI(creature);
         }
 };
 
-class mob_mistress_of_pain : public CreatureScript
+class npc_mistress_of_pain : public CreatureScript
 {
     public:
-        mob_mistress_of_pain() : CreatureScript("mob_mistress_of_pain") { }
+        npc_mistress_of_pain() : CreatureScript("npc_mistress_of_pain") { }
 
-        struct mob_mistress_of_painAI : public ScriptedAI
+        struct npc_mistress_of_painAI : public ScriptedAI
         {
-            mob_mistress_of_painAI(Creature* creature) : ScriptedAI(creature)
+            npc_mistress_of_painAI(Creature* creature) : ScriptedAI(creature)
             {
                 _instance = creature->GetInstanceScript();
                 if (_instance)
@@ -488,7 +488,7 @@ class mob_mistress_of_pain : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_mistress_of_painAI(creature);
+            return new npc_mistress_of_painAI(creature);
         }
 };
 
@@ -592,11 +592,11 @@ class spell_mistress_kiss_area : public SpellScriptLoader
 void AddSC_boss_jaraxxus()
 {
     new boss_jaraxxus();
-    new mob_legion_flame();
-    new mob_infernal_volcano();
-    new mob_fel_infernal();
-    new mob_nether_portal();
-    new mob_mistress_of_pain();
+    new npc_legion_flame();
+    new npc_infernal_volcano();
+    new npc_fel_infernal();
+    new npc_nether_portal();
+    new npc_mistress_of_pain();
 
     new spell_mistress_kiss();
     new spell_mistress_kiss_area();

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp

@@ -288,14 +288,14 @@ class boss_gormok : public CreatureScript
         }
 };
 
-class mob_snobold_vassal : public CreatureScript
+class npc_snobold_vassal : public CreatureScript
 {
     public:
-        mob_snobold_vassal() : CreatureScript("mob_snobold_vassal") { }
+        npc_snobold_vassal() : CreatureScript("npc_snobold_vassal") { }
 
-        struct mob_snobold_vassalAI : public ScriptedAI
+        struct npc_snobold_vassalAI : public ScriptedAI
         {
-            mob_snobold_vassalAI(Creature* creature) : ScriptedAI(creature)
+            npc_snobold_vassalAI(Creature* creature) : ScriptedAI(creature)
             {
                 _instance = creature->GetInstanceScript();
                 if (_instance)
@@ -457,7 +457,7 @@ class mob_snobold_vassal : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_snobold_vassalAI(creature);
+            return new npc_snobold_vassalAI(creature);
         }
 };
 
@@ -786,14 +786,14 @@ class boss_dreadscale : public CreatureScript
         }
 };
 
-class mob_slime_pool : public CreatureScript
+class npc_slime_pool : public CreatureScript
 {
     public:
-        mob_slime_pool() : CreatureScript("mob_slime_pool") { }
+        npc_slime_pool() : CreatureScript("npc_slime_pool") { }
 
-        struct mob_slime_poolAI : public ScriptedAI
+        struct npc_slime_poolAI : public ScriptedAI
         {
-            mob_slime_poolAI(Creature* creature) : ScriptedAI(creature)
+            npc_slime_poolAI(Creature* creature) : ScriptedAI(creature)
             {
                 _instance = creature->GetInstanceScript();
             }
@@ -823,7 +823,7 @@ class mob_slime_pool : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_slime_poolAI(creature);
+            return new npc_slime_poolAI(creature);
         }
 };
 
@@ -1147,13 +1147,13 @@ class boss_icehowl : public CreatureScript
 void AddSC_boss_northrend_beasts()
 {
     new boss_gormok();
-    new mob_snobold_vassal();
+    new npc_snobold_vassal();
     new npc_firebomb();
     new spell_gormok_fire_bomb();
 
     new boss_acidmaw();
     new boss_dreadscale();
-    new mob_slime_pool();
+    new npc_slime_pool();
 
     new boss_icehowl();
 }

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp

@@ -490,14 +490,14 @@ class boss_eydis : public CreatureScript
         }
 };
 
-class mob_essence_of_twin : public CreatureScript
+class npc_essence_of_twin : public CreatureScript
 {
     public:
-        mob_essence_of_twin() : CreatureScript("mob_essence_of_twin") { }
+        npc_essence_of_twin() : CreatureScript("npc_essence_of_twin") { }
 
-        struct mob_essence_of_twinAI : public ScriptedAI
+        struct npc_essence_of_twinAI : public ScriptedAI
         {
-            mob_essence_of_twinAI(Creature* creature) : ScriptedAI(creature) { }
+            npc_essence_of_twinAI(Creature* creature) : ScriptedAI(creature) { }
 
             uint32 GetData(uint32 data) const
             {
@@ -520,7 +520,7 @@ class mob_essence_of_twin : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_essence_of_twinAI(creature);
+            return new npc_essence_of_twinAI(creature);
         };
 
         bool OnGossipHello(Player* player, Creature* creature)
@@ -532,9 +532,9 @@ class mob_essence_of_twin : public CreatureScript
         }
 };
 
-struct mob_unleashed_ballAI : public ScriptedAI
+struct npc_unleashed_ballAI : public ScriptedAI
 {
-    mob_unleashed_ballAI(Creature* creature) : ScriptedAI(creature)
+    npc_unleashed_ballAI(Creature* creature) : ScriptedAI(creature)
     {
     }
 
@@ -585,14 +585,14 @@ struct mob_unleashed_ballAI : public ScriptedAI
         uint32 RangeCheckTimer;
 };
 
-class mob_unleashed_dark : public CreatureScript
+class npc_unleashed_dark : public CreatureScript
 {
     public:
-        mob_unleashed_dark() : CreatureScript("mob_unleashed_dark") { }
+        npc_unleashed_dark() : CreatureScript("npc_unleashed_dark") { }
 
-        struct mob_unleashed_darkAI : public mob_unleashed_ballAI
+        struct npc_unleashed_darkAI : public npc_unleashed_ballAI
         {
-            mob_unleashed_darkAI(Creature* creature) : mob_unleashed_ballAI(creature) {}
+            npc_unleashed_darkAI(Creature* creature) : npc_unleashed_ballAI(creature) {}
 
             void UpdateAI(uint32 diff)
             {
@@ -613,18 +613,18 @@ class mob_unleashed_dark : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_unleashed_darkAI(creature);
+            return new npc_unleashed_darkAI(creature);
         }
 };
 
-class mob_unleashed_light : public CreatureScript
+class npc_unleashed_light : public CreatureScript
 {
     public:
-        mob_unleashed_light() : CreatureScript("mob_unleashed_light") { }
+        npc_unleashed_light() : CreatureScript("npc_unleashed_light") { }
 
-        struct mob_unleashed_lightAI : public mob_unleashed_ballAI
+        struct npc_unleashed_lightAI : public npc_unleashed_ballAI
         {
-            mob_unleashed_lightAI(Creature* creature) : mob_unleashed_ballAI(creature) {}
+            npc_unleashed_lightAI(Creature* creature) : npc_unleashed_ballAI(creature) {}
 
             void UpdateAI(uint32 diff)
             {
@@ -645,18 +645,18 @@ class mob_unleashed_light : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_unleashed_lightAI(creature);
+            return new npc_unleashed_lightAI(creature);
         }
 };
 
-class mob_bullet_controller : public CreatureScript
+class npc_bullet_controller : public CreatureScript
 {
     public:
-        mob_bullet_controller() : CreatureScript("mob_bullet_controller") { }
+        npc_bullet_controller() : CreatureScript("npc_bullet_controller") { }
 
-        struct mob_bullet_controllerAI : public ScriptedAI
+        struct npc_bullet_controllerAI : public ScriptedAI
         {
-            mob_bullet_controllerAI(Creature* creature) : ScriptedAI(creature)
+            npc_bullet_controllerAI(Creature* creature) : ScriptedAI(creature)
             {
                 SetCombatMovement(false);
             }
@@ -674,7 +674,7 @@ class mob_bullet_controller : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_bullet_controllerAI(creature);
+            return new npc_bullet_controllerAI(creature);
         }
 };
 
@@ -881,10 +881,10 @@ void AddSC_boss_twin_valkyr()
 {
     new boss_fjola();
     new boss_eydis();
-    new mob_unleashed_light();
-    new mob_unleashed_dark();
-    new mob_essence_of_twin();
-    new mob_bullet_controller();
+    new npc_unleashed_light();
+    new npc_unleashed_dark();
+    new npc_essence_of_twin();
+    new npc_bullet_controller();
 
     new spell_powering_up();
     new spell_valkyr_essences();

src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp

@@ -192,14 +192,14 @@ class boss_bronjahm : public CreatureScript
         }
 };
 
-class mob_corrupted_soul_fragment : public CreatureScript
+class npc_corrupted_soul_fragment : public CreatureScript
 {
     public:
-        mob_corrupted_soul_fragment() : CreatureScript("mob_corrupted_soul_fragment") { }
+        npc_corrupted_soul_fragment() : CreatureScript("npc_corrupted_soul_fragment") { }
 
-        struct mob_corrupted_soul_fragmentAI : public ScriptedAI
+        struct npc_corrupted_soul_fragmentAI : public ScriptedAI
         {
-            mob_corrupted_soul_fragmentAI(Creature* creature) : ScriptedAI(creature)
+            npc_corrupted_soul_fragmentAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = me->GetInstanceScript();
             }
@@ -231,7 +231,7 @@ class mob_corrupted_soul_fragment : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_corrupted_soul_fragmentAI(creature);
+            return new npc_corrupted_soul_fragmentAI(creature);
         }
 };
 
@@ -409,7 +409,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader
 void AddSC_boss_bronjahm()
 {
     new boss_bronjahm();
-    new mob_corrupted_soul_fragment();
+    new npc_corrupted_soul_fragment();
     new spell_bronjahm_magic_bane();
     new spell_bronjahm_consume_soul();
     new spell_bronjahm_soulstorm_channel();

src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp

@@ -38,14 +38,14 @@ enum eEvents
     EVENT_TACTICAL_BLINK        = 2,
 };
 
-class mob_ymirjar_flamebearer : public CreatureScript
+class npc_ymirjar_flamebearer : public CreatureScript
 {
     public:
-        mob_ymirjar_flamebearer() : CreatureScript("mob_ymirjar_flamebearer") { }
+        npc_ymirjar_flamebearer() : CreatureScript("npc_ymirjar_flamebearer") { }
 
-        struct mob_ymirjar_flamebearerAI: public ScriptedAI
+        struct npc_ymirjar_flamebearerAI: public ScriptedAI
         {
-            mob_ymirjar_flamebearerAI(Creature* creature) : ScriptedAI(creature)
+            npc_ymirjar_flamebearerAI(Creature* creature) : ScriptedAI(creature)
             {
             }
 
@@ -99,18 +99,18 @@ class mob_ymirjar_flamebearer : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_ymirjar_flamebearerAI(creature);
+            return new npc_ymirjar_flamebearerAI(creature);
         }
 };
 
-class mob_iceborn_protodrake : public CreatureScript
+class npc_iceborn_protodrake : public CreatureScript
 {
     public:
-        mob_iceborn_protodrake() : CreatureScript("mob_iceborn_protodrake") { }
+        npc_iceborn_protodrake() : CreatureScript("npc_iceborn_protodrake") { }
 
-        struct mob_iceborn_protodrakeAI: public ScriptedAI
+        struct npc_iceborn_protodrakeAI: public ScriptedAI
         {
-            mob_iceborn_protodrakeAI(Creature* creature) : ScriptedAI(creature), _vehicle(creature->GetVehicleKit())
+            npc_iceborn_protodrakeAI(Creature* creature) : ScriptedAI(creature), _vehicle(creature->GetVehicleKit())
             {
                 ASSERT(_vehicle);
             }
@@ -148,18 +148,18 @@ class mob_iceborn_protodrake : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_iceborn_protodrakeAI(creature);
+            return new npc_iceborn_protodrakeAI(creature);
         }
 };
 
-class mob_geist_ambusher : public CreatureScript
+class npc_geist_ambusher : public CreatureScript
 {
     public:
-        mob_geist_ambusher() : CreatureScript("mob_geist_ambusher") { }
+        npc_geist_ambusher() : CreatureScript("npc_geist_ambusher") { }
 
-        struct mob_geist_ambusherAI: public ScriptedAI
+        struct npc_geist_ambusherAI: public ScriptedAI
         {
-            mob_geist_ambusherAI(Creature* creature) : ScriptedAI(creature)
+            npc_geist_ambusherAI(Creature* creature) : ScriptedAI(creature)
             {
             }
 
@@ -201,18 +201,18 @@ class mob_geist_ambusher : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_geist_ambusherAI(creature);
+            return new npc_geist_ambusherAI(creature);
         }
 };
 
-class spell_trash_mob_glacial_strike : public SpellScriptLoader
+class spell_trash_npc_glacial_strike : public SpellScriptLoader
 {
     public:
-        spell_trash_mob_glacial_strike() : SpellScriptLoader("spell_trash_mob_glacial_strike") { }
+        spell_trash_npc_glacial_strike() : SpellScriptLoader("spell_trash_npc_glacial_strike") { }
 
-        class spell_trash_mob_glacial_strike_AuraScript : public AuraScript
+        class spell_trash_npc_glacial_strike_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_trash_mob_glacial_strike_AuraScript);
+            PrepareAuraScript(spell_trash_npc_glacial_strike_AuraScript);
 
             void PeriodicTick(AuraEffect const* /*aurEff*/)
             {
@@ -225,20 +225,20 @@ class spell_trash_mob_glacial_strike : public SpellScriptLoader
 
             void Register()
             {
-                OnEffectPeriodic += AuraEffectPeriodicFn(spell_trash_mob_glacial_strike_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE_PERCENT);
+                OnEffectPeriodic += AuraEffectPeriodicFn(spell_trash_npc_glacial_strike_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE_PERCENT);
             }
         };
 
         AuraScript* GetAuraScript() const
         {
-            return new spell_trash_mob_glacial_strike_AuraScript();
+            return new spell_trash_npc_glacial_strike_AuraScript();
         }
 };
 
 void AddSC_pit_of_saron()
 {
-    new mob_ymirjar_flamebearer();
-    new mob_iceborn_protodrake();
-    new mob_geist_ambusher();
-    new spell_trash_mob_glacial_strike();
+    new npc_ymirjar_flamebearer();
+    new npc_iceborn_protodrake();
+    new npc_geist_ambusher();
+    new spell_trash_npc_glacial_strike();
 }

src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp

@@ -210,19 +210,19 @@ public:
 
 };
 
-class mob_slad_ran_constrictor : public CreatureScript
+class npc_slad_ran_constrictor : public CreatureScript
 {
 public:
-    mob_slad_ran_constrictor() : CreatureScript("mob_slad_ran_constrictor") { }
+    npc_slad_ran_constrictor() : CreatureScript("npc_slad_ran_constrictor") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_slad_ran_constrictorAI (creature);
+        return new npc_slad_ran_constrictorAI (creature);
     }
 
-    struct mob_slad_ran_constrictorAI : public ScriptedAI
+    struct npc_slad_ran_constrictorAI : public ScriptedAI
     {
-        mob_slad_ran_constrictorAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_slad_ran_constrictorAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 uiGripOfSladRanTimer;
 
@@ -263,19 +263,19 @@ public:
 
 };
 
-class mob_slad_ran_viper : public CreatureScript
+class npc_slad_ran_viper : public CreatureScript
 {
 public:
-    mob_slad_ran_viper() : CreatureScript("mob_slad_ran_viper") { }
+    npc_slad_ran_viper() : CreatureScript("npc_slad_ran_viper") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_slad_ran_viperAI (creature);
+        return new npc_slad_ran_viperAI (creature);
     }
 
-    struct mob_slad_ran_viperAI : public ScriptedAI
+    struct npc_slad_ran_viperAI : public ScriptedAI
     {
-        mob_slad_ran_viperAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_slad_ran_viperAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 uiVenomousBiteTimer;
 
@@ -322,7 +322,7 @@ class achievement_snakes_whyd_it_have_to_be_snakes : public AchievementCriteriaS
 void AddSC_boss_slad_ran()
 {
     new boss_slad_ran();
-    new mob_slad_ran_constrictor();
-    new mob_slad_ran_viper();
+    new npc_slad_ran_constrictor();
+    new npc_slad_ran_viper();
     new achievement_snakes_whyd_it_have_to_be_snakes();
 }

src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp

@@ -25,7 +25,7 @@ enum Anubrekhan
     SAY_GREET           = 1,
     SAY_SLAY            = 2,
 
-    MOB_CRYPT_GUARD     = 16573
+    NPC_CRYPT_GUARD     = 16573
 };
 
 const Position GuardSummonPos = {3333.72f, -3476.30f, 287.1f, 6.2801f};
@@ -85,11 +85,11 @@ public:
                 // otherwise, after a wipe, they respawn where boss was at wipe moment.
                 pos = me->GetHomePosition();
                 pos.m_positionY -= 10.0f;
-                me->SummonCreature(MOB_CRYPT_GUARD, pos, TEMPSUMMON_CORPSE_DESPAWN);
+                me->SummonCreature(NPC_CRYPT_GUARD, pos, TEMPSUMMON_CORPSE_DESPAWN);
 
                 pos = me->GetHomePosition();
                 pos.m_positionY += 10.0f;
-                me->SummonCreature(MOB_CRYPT_GUARD, pos, TEMPSUMMON_CORPSE_DESPAWN);
+                me->SummonCreature(NPC_CRYPT_GUARD, pos, TEMPSUMMON_CORPSE_DESPAWN);
             }
         }
 
@@ -138,7 +138,7 @@ public:
             BossAI::SummonedCreatureDespawn(summon);
 
             // check if it is an actual killed guard
-            if (!me->IsAlive() || summon->IsAlive() || summon->GetEntry() != MOB_CRYPT_GUARD)
+            if (!me->IsAlive() || summon->IsAlive() || summon->GetEntry() != NPC_CRYPT_GUARD)
                 return;
 
             summon->CastSpell(summon, SPELL_SUMMON_CORPSE_SCARABS_MOB, true, NULL, NULL, me->GetGUID());
@@ -166,12 +166,12 @@ public:
                     case EVENT_LOCUST:
                         /// @todo Add Text
                         DoCast(me, RAID_MODE(SPELL_LOCUST_SWARM_10, SPELL_LOCUST_SWARM_25));
-                        DoSummon(MOB_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN);
+                        DoSummon(NPC_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN);
                         events.ScheduleEvent(EVENT_LOCUST, 90000);
                         break;
                     case EVENT_SPAWN_GUARDIAN_NORMAL:
                         /// @todo Add Text
-                        DoSummon(MOB_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN);
+                        DoSummon(NPC_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN);
                         break;
                     case EVENT_BERSERK:
                         DoCast(me, SPELL_BERSERK, true);

src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp

@@ -179,14 +179,14 @@ class boss_faerlina : public CreatureScript
         }
 };
 
-class mob_faerlina_add : public CreatureScript
+class npc_faerlina_add : public CreatureScript
 {
     public:
-        mob_faerlina_add() : CreatureScript("mob_faerlina_add") { }
+        npc_faerlina_add() : CreatureScript("npc_faerlina_add") { }
 
-        struct mob_faerlina_addAI : public ScriptedAI
+        struct npc_faerlina_addAI : public ScriptedAI
         {
-            mob_faerlina_addAI(Creature* creature) : ScriptedAI(creature),
+            npc_faerlina_addAI(Creature* creature) : ScriptedAI(creature),
                 _instance(creature->GetInstanceScript())
             {
             }
@@ -212,7 +212,7 @@ class mob_faerlina_add : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_faerlina_addAI(creature);
+            return new npc_faerlina_addAI(creature);
         }
 };
 
@@ -230,6 +230,6 @@ class achievement_momma_said_knock_you_out : public AchievementCriteriaScript
 void AddSC_boss_faerlina()
 {
     new boss_faerlina();
-    new mob_faerlina_add();
+    new npc_faerlina_add();
     new achievement_momma_said_knock_you_out();
 }

src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp

@@ -62,7 +62,7 @@ const Position WaypointPositions[12] =
     {2517.8f, -2896.6f, 241.28f, 2.315f},
 };
 
-const uint32 MOB_HORSEMEN[]     =   {16064, 16065, 30549, 16063};
+const uint32 NPC_HORSEMEN[]     =   {16064, 16065, 30549, 16063};
 const uint32 SPELL_MARK[]       =   {28832, 28833, 28834, 28835};
 #define SPELL_PRIMARY(i)            RAID_MODE(SPELL_PRIMARY_N[i], SPELL_PRIMARY_H[i])
 const uint32 SPELL_PRIMARY_N[]  =   {28884, 28863, 28882, 28883};
@@ -98,7 +98,7 @@ public:
         {
             id = Horsemen(0);
             for (uint8 i = 0; i < 4; ++i)
-                if (me->GetEntry() == MOB_HORSEMEN[i])
+                if (me->GetEntry() == NPC_HORSEMEN[i])
                     id = Horsemen(i);
             caster = (id == HORSEMEN_LADY || id == HORSEMEN_SIR);
             encounterActionReset = false;

src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp

@@ -25,7 +25,7 @@
 #define SPELL_BERSERK           26662
 #define SPELL_INFECTED_WOUND    29306
 
-#define MOB_ZOMBIE  16360
+#define NPC_ZOMBIE  16360
 
 const Position PosSummon[3] =
 {
@@ -66,7 +66,7 @@ public:
 
         void MoveInLineOfSight(Unit* who)
         {
-            if (who->GetEntry() == MOB_ZOMBIE && me->IsWithinDistInMap(who, 7))
+            if (who->GetEntry() == NPC_ZOMBIE && me->IsWithinDistInMap(who, 7))
             {
                 SetGazeOn(who);
                 /// @todo use a script text
@@ -88,7 +88,7 @@ public:
 
         void JustSummoned(Creature* summon)
         {
-            if (summon->GetEntry() == MOB_ZOMBIE)
+            if (summon->GetEntry() == NPC_ZOMBIE)
                 summon->AI()->AttackStart(me);
             summons.Summon(summon);
         }
@@ -124,13 +124,13 @@ public:
                         break;
                     case EVENT_SUMMON:
                         for (int32 i = 0; i < RAID_MODE(1, 2); ++i)
-                            DoSummon(MOB_ZOMBIE, PosSummon[rand() % RAID_MODE(1, 3)]);
+                            DoSummon(NPC_ZOMBIE, PosSummon[rand() % RAID_MODE(1, 3)]);
                         events.ScheduleEvent(EVENT_SUMMON, 10000);
                         break;
                 }
             }
 
-            if (me->GetVictim() && me->GetVictim()->GetEntry() == MOB_ZOMBIE)
+            if (me->GetVictim() && me->GetVictim()->GetEntry() == NPC_ZOMBIE)
             {
                 if (me->IsWithinMeleeRange(me->GetVictim()))
                 {

src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp

@@ -48,13 +48,13 @@ enum Spells
 
 enum Creatures
 {
-    MOB_LIVE_TRAINEE    = 16124,
-    MOB_LIVE_KNIGHT     = 16125,
-    MOB_LIVE_RIDER      = 16126,
-    MOB_DEAD_TRAINEE    = 16127,
-    MOB_DEAD_KNIGHT     = 16148,
-    MOB_DEAD_RIDER      = 16150,
-    MOB_DEAD_HORSE      = 16149
+    NPC_LIVE_TRAINEE    = 16124,
+    NPC_LIVE_KNIGHT     = 16125,
+    NPC_LIVE_RIDER      = 16126,
+    NPC_DEAD_TRAINEE    = 16127,
+    NPC_DEAD_KNIGHT     = 16148,
+    NPC_DEAD_RIDER      = 16150,
+    NPC_DEAD_HORSE      = 16149
 };
 
 struct Waves { uint32 entry, time, mode; };
@@ -63,37 +63,37 @@ struct Waves { uint32 entry, time, mode; };
 // but this is handled in DoGothikSummon function
 const Waves waves[] =
 {
-    {MOB_LIVE_TRAINEE, 20000, 1},
-    {MOB_LIVE_TRAINEE, 20000, 1},
-    {MOB_LIVE_TRAINEE, 10000, 1},
-    {MOB_LIVE_KNIGHT, 10000, 1},
-    {MOB_LIVE_TRAINEE, 15000, 1},
-    {MOB_LIVE_KNIGHT, 5000, 1},
-    {MOB_LIVE_TRAINEE, 20000, 1},
-    {MOB_LIVE_TRAINEE, 0, 1},
-    {MOB_LIVE_KNIGHT, 10000, 1},
-    {MOB_LIVE_TRAINEE, 10000, 2},
-    {MOB_LIVE_RIDER, 10000, 0},
-    {MOB_LIVE_RIDER, 5000, 2},
-    {MOB_LIVE_TRAINEE, 5000, 0},
-    {MOB_LIVE_TRAINEE, 15000, 2},
-    {MOB_LIVE_KNIGHT, 15000, 0},
-    {MOB_LIVE_TRAINEE, 0, 0},
-    {MOB_LIVE_RIDER, 10000, 1},
-    {MOB_LIVE_KNIGHT, 10000, 1},
-    {MOB_LIVE_TRAINEE, 10000, 0},
-    {MOB_LIVE_RIDER, 10000, 2},
-    {MOB_LIVE_TRAINEE, 0, 2},
-    {MOB_LIVE_RIDER, 5000, 1},
-    {MOB_LIVE_TRAINEE, 0, 2},
-    {MOB_LIVE_KNIGHT, 5000, 1},
-    {MOB_LIVE_RIDER, 0, 2},
-    {MOB_LIVE_TRAINEE, 20000, 1},
-    {MOB_LIVE_RIDER, 0, 1},
-    {MOB_LIVE_KNIGHT, 0, 1},
-    {MOB_LIVE_TRAINEE, 25000, 2},
-    {MOB_LIVE_TRAINEE, 15000, 0},
-    {MOB_LIVE_TRAINEE, 25000, 0},
+    {NPC_LIVE_TRAINEE, 20000, 1},
+    {NPC_LIVE_TRAINEE, 20000, 1},
+    {NPC_LIVE_TRAINEE, 10000, 1},
+    {NPC_LIVE_KNIGHT, 10000, 1},
+    {NPC_LIVE_TRAINEE, 15000, 1},
+    {NPC_LIVE_KNIGHT, 5000, 1},
+    {NPC_LIVE_TRAINEE, 20000, 1},
+    {NPC_LIVE_TRAINEE, 0, 1},
+    {NPC_LIVE_KNIGHT, 10000, 1},
+    {NPC_LIVE_TRAINEE, 10000, 2},
+    {NPC_LIVE_RIDER, 10000, 0},
+    {NPC_LIVE_RIDER, 5000, 2},
+    {NPC_LIVE_TRAINEE, 5000, 0},
+    {NPC_LIVE_TRAINEE, 15000, 2},
+    {NPC_LIVE_KNIGHT, 15000, 0},
+    {NPC_LIVE_TRAINEE, 0, 0},
+    {NPC_LIVE_RIDER, 10000, 1},
+    {NPC_LIVE_KNIGHT, 10000, 1},
+    {NPC_LIVE_TRAINEE, 10000, 0},
+    {NPC_LIVE_RIDER, 10000, 2},
+    {NPC_LIVE_TRAINEE, 0, 2},
+    {NPC_LIVE_RIDER, 5000, 1},
+    {NPC_LIVE_TRAINEE, 0, 2},
+    {NPC_LIVE_KNIGHT, 5000, 1},
+    {NPC_LIVE_RIDER, 0, 2},
+    {NPC_LIVE_TRAINEE, 20000, 1},
+    {NPC_LIVE_RIDER, 0, 1},
+    {NPC_LIVE_KNIGHT, 0, 1},
+    {NPC_LIVE_TRAINEE, 25000, 2},
+    {NPC_LIVE_TRAINEE, 15000, 0},
+    {NPC_LIVE_TRAINEE, 25000, 0},
     {0, 0, 1},
 };
 
@@ -258,28 +258,28 @@ class boss_gothik : public CreatureScript
                 {
                     switch (entry)
                     {
-                        case MOB_LIVE_TRAINEE:
+                        case NPC_LIVE_TRAINEE:
                         {
                             if (Creature* liveTrigger = Unit::GetCreature(*me, LiveTriggerGUID[0]))
-                                DoSummon(MOB_LIVE_TRAINEE, liveTrigger, 1);
+                                DoSummon(NPC_LIVE_TRAINEE, liveTrigger, 1);
                             if (Creature* liveTrigger1 = Unit::GetCreature(*me, LiveTriggerGUID[1]))
-                                DoSummon(MOB_LIVE_TRAINEE, liveTrigger1, 1);
+                                DoSummon(NPC_LIVE_TRAINEE, liveTrigger1, 1);
                             if (Creature* liveTrigger2 = Unit::GetCreature(*me, LiveTriggerGUID[2]))
-                                DoSummon(MOB_LIVE_TRAINEE, liveTrigger2, 1);
+                                DoSummon(NPC_LIVE_TRAINEE, liveTrigger2, 1);
                             break;
                         }
-                        case MOB_LIVE_KNIGHT:
+                        case NPC_LIVE_KNIGHT:
                         {
                             if (Creature* liveTrigger3 = Unit::GetCreature(*me, LiveTriggerGUID[3]))
-                                DoSummon(MOB_LIVE_KNIGHT, liveTrigger3, 1);
+                                DoSummon(NPC_LIVE_KNIGHT, liveTrigger3, 1);
                             if (Creature* liveTrigger5 = Unit::GetCreature(*me, LiveTriggerGUID[5]))
-                                DoSummon(MOB_LIVE_KNIGHT, liveTrigger5, 1);
+                                DoSummon(NPC_LIVE_KNIGHT, liveTrigger5, 1);
                             break;
                         }
-                        case MOB_LIVE_RIDER:
+                        case NPC_LIVE_RIDER:
                         {
                             if (Creature* liveTrigger4 = Unit::GetCreature(*me, LiveTriggerGUID[4]))
-                                DoSummon(MOB_LIVE_RIDER, liveTrigger4, 1);
+                                DoSummon(NPC_LIVE_RIDER, liveTrigger4, 1);
                             break;
                         }
                     }
@@ -288,24 +288,24 @@ class boss_gothik : public CreatureScript
                 {
                     switch (entry)
                     {
-                        case MOB_LIVE_TRAINEE:
+                        case NPC_LIVE_TRAINEE:
                         {
                             if (Creature* liveTrigger = Unit::GetCreature(*me, LiveTriggerGUID[4]))
-                                DoSummon(MOB_LIVE_TRAINEE, liveTrigger, 1);
+                                DoSummon(NPC_LIVE_TRAINEE, liveTrigger, 1);
                             if (Creature* liveTrigger2 = Unit::GetCreature(*me, LiveTriggerGUID[4]))
-                                DoSummon(MOB_LIVE_TRAINEE, liveTrigger2, 1);
+                                DoSummon(NPC_LIVE_TRAINEE, liveTrigger2, 1);
                             break;
                         }
-                        case MOB_LIVE_KNIGHT:
+                        case NPC_LIVE_KNIGHT:
                         {
                             if (Creature* liveTrigger5 = Unit::GetCreature(*me, LiveTriggerGUID[4]))
-                                DoSummon(MOB_LIVE_KNIGHT, liveTrigger5, 1);
+                                DoSummon(NPC_LIVE_KNIGHT, liveTrigger5, 1);
                             break;
                         }
-                        case MOB_LIVE_RIDER:
+                        case NPC_LIVE_RIDER:
                         {
                             if (Creature* liveTrigger4 = Unit::GetCreature(*me, LiveTriggerGUID[4]))
-                                DoSummon(MOB_LIVE_RIDER, liveTrigger4, 1);
+                                DoSummon(NPC_LIVE_RIDER, liveTrigger4, 1);
                             break;
                         }
                     }
@@ -381,14 +381,14 @@ class boss_gothik : public CreatureScript
                 switch (spell->Id)
                 {
                     case SPELL_INFORM_DEAD_TRAINEE:
-                        DoSummon(MOB_DEAD_TRAINEE, target, 0);
+                        DoSummon(NPC_DEAD_TRAINEE, target, 0);
                         break;
                     case SPELL_INFORM_DEAD_KNIGHT:
-                        DoSummon(MOB_DEAD_KNIGHT, target, 0);
+                        DoSummon(NPC_DEAD_KNIGHT, target, 0);
                         break;
                     case SPELL_INFORM_DEAD_RIDER:
-                        DoSummon(MOB_DEAD_RIDER, target, 1.0f);
-                        DoSummon(MOB_DEAD_HORSE, target, 1.0f);
+                        DoSummon(NPC_DEAD_RIDER, target, 1.0f);
+                        DoSummon(NPC_DEAD_HORSE, target, 1.0f);
                         break;
                 }
             }
@@ -504,14 +504,14 @@ class boss_gothik : public CreatureScript
         }
 };
 
-class mob_gothik_minion : public CreatureScript
+class npc_gothik_minion : public CreatureScript
 {
     public:
-        mob_gothik_minion() : CreatureScript("mob_gothik_minion") { }
+        npc_gothik_minion() : CreatureScript("npc_gothik_minion") { }
 
-        struct mob_gothik_minionAI : public CombatAI
+        struct npc_gothik_minionAI : public CombatAI
         {
-            mob_gothik_minionAI(Creature* creature) : CombatAI(creature)
+            npc_gothik_minionAI(Creature* creature) : CombatAI(creature)
             {
                 liveSide = IN_LIVE_SIDE(me);
             }
@@ -588,7 +588,7 @@ class mob_gothik_minion : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_gothik_minionAI(creature);
+            return new npc_gothik_minionAI(creature);
         }
 };
 
@@ -621,6 +621,6 @@ class spell_gothik_shadow_bolt_volley : public SpellScriptLoader
 void AddSC_boss_gothik()
 {
     new boss_gothik();
-    new mob_gothik_minion();
+    new npc_gothik_minion();
     new spell_gothik_shadow_bolt_volley();
 }

src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp

@@ -41,7 +41,7 @@ enum Events
 
 enum CreatureId
 {
-    MOB_FALLOUT_SLIME           = 16290
+    NPC_FALLOUT_SLIME           = 16290
 };
 
 class boss_grobbulus : public CreatureScript
@@ -74,7 +74,7 @@ public:
         {
             if (spell->Id == uint32(SPELL_SLIME_SPRAY))
             {
-                if (TempSummon* slime = me->SummonCreature(MOB_FALLOUT_SLIME, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0))
+                if (TempSummon* slime = me->SummonCreature(NPC_FALLOUT_SLIME, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0))
                     DoZoneInCombat(slime);
             }
         }

src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp

@@ -35,8 +35,8 @@ enum Spells
 
 enum Creatures
 {
-    MOB_WEB_WRAP                = 16486,
-    MOB_SPIDERLING              = 17055,
+    NPC_WEB_WRAP                = 16486,
+    NPC_SPIDERLING              = 17055,
 };
 
 #define MAX_POS_WRAP            3
@@ -111,7 +111,7 @@ public:
                                 target->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25));
                                 uint8 pos = rand()%MAX_POS_WRAP;
                                 target->GetMotionMaster()->MoveJump(PosWrap[pos].GetPositionX(), PosWrap[pos].GetPositionY(), PosWrap[pos].GetPositionZ(), 20, 20);
-                                if (Creature* wrap = DoSummon(MOB_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN))
+                                if (Creature* wrap = DoSummon(NPC_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN))
                                     wrap->AI()->SetGUID(target->GetGUID());
                             }
                         }
@@ -137,7 +137,7 @@ public:
                         /// @todo Add missing text
                         uint8 amount = urand(8, 10);
                         for (uint8 i = 0; i < amount; ++i)
-                            DoSummon(MOB_SPIDERLING, me, 0, TEMPSUMMON_CORPSE_DESPAWN);
+                            DoSummon(NPC_SPIDERLING, me, 0, TEMPSUMMON_CORPSE_DESPAWN);
                         events.ScheduleEvent(EVENT_SUMMON, 40000);
                         break;
                 }
@@ -149,19 +149,19 @@ public:
 
 };
 
-class mob_webwrap : public CreatureScript
+class npc_webwrap : public CreatureScript
 {
 public:
-    mob_webwrap() : CreatureScript("mob_webwrap") { }
+    npc_webwrap() : CreatureScript("npc_webwrap") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_webwrapAI (creature);
+        return new npc_webwrapAI (creature);
     }
 
-    struct mob_webwrapAI : public NullCreatureAI
+    struct npc_webwrapAI : public NullCreatureAI
     {
-        mob_webwrapAI(Creature* creature) : NullCreatureAI(creature), victimGUID(0) {}
+        npc_webwrapAI(Creature* creature) : NullCreatureAI(creature), victimGUID(0) {}
 
         uint64 victimGUID;
 
@@ -186,5 +186,5 @@ public:
 void AddSC_boss_maexxna()
 {
     new boss_maexxna();
-    new mob_webwrap();
+    new npc_webwrap();
 }

src/server/scripts/Northrend/Naxxramas/boss_noth.cpp

@@ -32,9 +32,9 @@ enum Noth
     SPELL_CRIPPLE                   = 29212, // 25-man: 54814
     SPELL_TELEPORT                  = 29216,
 
-    MOB_WARRIOR                     = 16984,
-    MOB_CHAMPION                    = 16983,
-    MOB_GUARDIAN                    = 16981
+    NPC_WARRIOR                     = 16984,
+    NPC_CHAMPION                    = 16983,
+    NPC_GUARDIAN                    = 16981
 };
 
 #define SPELL_BLINK                     RAND(29208, 29209, 29210, 29211)
@@ -162,7 +162,7 @@ public:
                         return;
                     case EVENT_WARRIOR:
                         Talk(SAY_SUMMON);
-                        SummonUndead(MOB_WARRIOR, RAID_MODE(2, 3));
+                        SummonUndead(NPC_WARRIOR, RAID_MODE(2, 3));
                         events.ScheduleEvent(EVENT_WARRIOR, 30000);
                         return;
                     case EVENT_BLINK:
@@ -185,12 +185,12 @@ public:
                         Talk(SAY_SUMMON);
                         switch (balconyCount)
                         {
-                            case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break;
-                            case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1, 2));
-                                    SummonUndead(MOB_GUARDIAN, RAID_MODE(1, 2)); break;
-                            case 2: SummonUndead(MOB_GUARDIAN, RAID_MODE(2, 4)); break;
-                            default:SummonUndead(MOB_CHAMPION, RAID_MODE(5, 10));
-                                    SummonUndead(MOB_GUARDIAN, RAID_MODE(5, 10));break;
+                            case 0: SummonUndead(NPC_CHAMPION, RAID_MODE(2, 4)); break;
+                            case 1: SummonUndead(NPC_CHAMPION, RAID_MODE(1, 2));
+                                    SummonUndead(NPC_GUARDIAN, RAID_MODE(1, 2)); break;
+                            case 2: SummonUndead(NPC_GUARDIAN, RAID_MODE(2, 4)); break;
+                            default:SummonUndead(NPC_CHAMPION, RAID_MODE(5, 10));
+                                    SummonUndead(NPC_GUARDIAN, RAID_MODE(5, 10));break;
                         }
                         ++waveCount;
                         events.ScheduleEvent(waveCount < 2 ? EVENT_WAVE : EVENT_GROUND, urand(30000, 45000));

src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp

@@ -278,19 +278,19 @@ public:
 
 };
 
-class mob_stalagg : public CreatureScript
+class npc_stalagg : public CreatureScript
 {
 public:
-    mob_stalagg() : CreatureScript("mob_stalagg") { }
+    npc_stalagg() : CreatureScript("npc_stalagg") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_stalaggAI(creature);
+        return new npc_stalaggAI(creature);
     }
 
-    struct mob_stalaggAI : public ScriptedAI
+    struct npc_stalaggAI : public ScriptedAI
     {
-        mob_stalaggAI(Creature* creature) : ScriptedAI(creature)
+        npc_stalaggAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -372,19 +372,19 @@ public:
 
 };
 
-class mob_feugen : public CreatureScript
+class npc_feugen : public CreatureScript
 {
 public:
-    mob_feugen() : CreatureScript("mob_feugen") { }
+    npc_feugen() : CreatureScript("npc_feugen") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_feugenAI(creature);
+        return new npc_feugenAI(creature);
     }
 
-    struct mob_feugenAI : public ScriptedAI
+    struct npc_feugenAI : public ScriptedAI
     {
-        mob_feugenAI(Creature* creature) : ScriptedAI(creature)
+        npc_feugenAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -568,8 +568,8 @@ class achievement_polarity_switch : public AchievementCriteriaScript
 void AddSC_boss_thaddius()
 {
     new boss_thaddius();
-    new mob_stalagg();
-    new mob_feugen();
+    new npc_stalagg();
+    new npc_feugen();
     new spell_thaddius_pos_neg_charge();
     new spell_thaddius_polarity_shift();
     new achievement_polarity_switch();

src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp

@@ -32,8 +32,8 @@ enum Spells
 
 enum Adds
 {
-    MOB_CRAZED_MANA_WRAITH                        = 26746,
-    MOB_CHAOTIC_RIFT                              = 26918
+    NPC_CRAZED_MANA_WRAITH                        = 26746,
+    NPC_CHAOTIC_RIFT                              = 26918
 };
 
 enum Yells
@@ -120,7 +120,7 @@ class boss_anomalus : public CreatureScript
 
             void SummonedCreatureDies(Creature* summoned, Unit* /*who*/)
             {
-                if (summoned->GetEntry() == MOB_CHAOTIC_RIFT)
+                if (summoned->GetEntry() == NPC_CHAOTIC_RIFT)
                     chaosTheory = false;
             }
 
@@ -157,7 +157,7 @@ class boss_anomalus : public CreatureScript
                     Phase = 1;
                     Talk(SAY_SHIELD);
                     DoCast(me, SPELL_RIFT_SHIELD);
-                    if (Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000))
+                    if (Creature* Rift = me->SummonCreature(NPC_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000))
                     {
                         //DoCast(Rift, SPELL_CHARGE_RIFT);
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
@@ -186,14 +186,14 @@ class boss_anomalus : public CreatureScript
         }
 };
 
-class mob_chaotic_rift : public CreatureScript
+class npc_chaotic_rift : public CreatureScript
 {
     public:
-        mob_chaotic_rift() : CreatureScript("mob_chaotic_rift") { }
+        npc_chaotic_rift() : CreatureScript("npc_chaotic_rift") { }
 
-        struct mob_chaotic_riftAI : public ScriptedAI
+        struct npc_chaotic_riftAI : public ScriptedAI
         {
-            mob_chaotic_riftAI(Creature* creature) : ScriptedAI(creature)
+            npc_chaotic_riftAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = me->GetInstanceScript();
                 SetCombatMovement(false);
@@ -234,7 +234,7 @@ class mob_chaotic_rift : public CreatureScript
 
                 if (uiSummonCrazedManaWraithTimer <= diff)
                 {
-                    if (Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX() + 1, me->GetPositionY() + 1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000))
+                    if (Creature* Wraith = me->SummonCreature(NPC_CRAZED_MANA_WRAITH, me->GetPositionX() + 1, me->GetPositionY() + 1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000))
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                             Wraith->AI()->AttackStart(target);
                     Creature* Anomalus = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ANOMALUS));
@@ -250,7 +250,7 @@ class mob_chaotic_rift : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_chaotic_riftAI(creature);
+            return new npc_chaotic_riftAI(creature);
         }
 };
 
@@ -277,6 +277,6 @@ class achievement_chaos_theory : public AchievementCriteriaScript
 void AddSC_boss_anomalus()
 {
     new boss_anomalus();
-    new mob_chaotic_rift();
+    new npc_chaotic_rift();
     new achievement_chaos_theory();
 }

src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp

@@ -36,9 +36,9 @@ enum Spells
 
 enum Creatures
 {
-    MOB_FIRE_MAGUS                                = 26928,
-    MOB_FROST_MAGUS                               = 26930,
-    MOB_ARCANE_MAGUS                              = 26929
+    NPC_FIRE_MAGUS                                = 26928,
+    NPC_FROST_MAGUS                               = 26930,
+    NPC_ARCANE_MAGUS                              = 26929
 };
 
 enum Yells
@@ -168,17 +168,17 @@ public:
             {
                 switch (entry)
                 {
-                    case MOB_FIRE_MAGUS:
+                    case NPC_FIRE_MAGUS:
                     {
                         Summoned->CastSpell(Summoned, SPELL_FIRE_MAGUS_VISUAL, false);
                         break;
                     }
-                    case MOB_FROST_MAGUS:
+                    case NPC_FROST_MAGUS:
                     {
                         Summoned->CastSpell(Summoned, SPELL_FROST_MAGUS_VISUAL, false);
                         break;
                     }
-                    case MOB_ARCANE_MAGUS:
+                    case NPC_ARCANE_MAGUS:
                     {
                         Summoned->CastSpell(Summoned, SPELL_ARCANE_MAGUS_VISUAL, false);
                         break;
@@ -263,9 +263,9 @@ public:
                 me->RemoveAllAuras();
                 me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS);
-                uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS);
-                uiArcaneMagusGUID = SplitPersonality(MOB_ARCANE_MAGUS);
+                uiFireMagusGUID = SplitPersonality(NPC_FIRE_MAGUS);
+                uiFrostMagusGUID = SplitPersonality(NPC_FROST_MAGUS);
+                uiArcaneMagusGUID = SplitPersonality(NPC_ARCANE_MAGUS);
                 bFireMagusDead = false;
                 bFrostMagusDead = false;
                 bArcaneMagusDead = false;
@@ -280,9 +280,9 @@ public:
                 me->RemoveAllAuras();
                 me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS);
-                uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS);
-                uiArcaneMagusGUID = SplitPersonality(MOB_ARCANE_MAGUS);
+                uiFireMagusGUID = SplitPersonality(NPC_FIRE_MAGUS);
+                uiFrostMagusGUID = SplitPersonality(NPC_FROST_MAGUS);
+                uiArcaneMagusGUID = SplitPersonality(NPC_ARCANE_MAGUS);
                 bFireMagusDead = false;
                 bFrostMagusDead = false;
                 bArcaneMagusDead = false;

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp

@@ -369,22 +369,22 @@ public:
 };
 
 /*######
-## mob_stormforged_lieutenant
+## npc_stormforged_lieutenant
 ######*/
 
-class mob_stormforged_lieutenant : public CreatureScript
+class npc_stormforged_lieutenant : public CreatureScript
 {
 public:
-    mob_stormforged_lieutenant() : CreatureScript("mob_stormforged_lieutenant") { }
+    npc_stormforged_lieutenant() : CreatureScript("npc_stormforged_lieutenant") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_stormforged_lieutenantAI(creature);
+        return new npc_stormforged_lieutenantAI(creature);
     }
 
-    struct mob_stormforged_lieutenantAI : public ScriptedAI
+    struct npc_stormforged_lieutenantAI : public ScriptedAI
     {
-        mob_stormforged_lieutenantAI(Creature* creature) : ScriptedAI(creature)
+        npc_stormforged_lieutenantAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -450,5 +450,5 @@ public:
 void AddSC_boss_bjarngrim()
 {
     new boss_bjarngrim();
-    new mob_stormforged_lieutenant();
+    new npc_stormforged_lieutenant();
 }

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp

@@ -291,22 +291,22 @@ public:
 };
 
 /*######
-## mob_spark_of_ionar
+## npc_spark_of_ionar
 ######*/
 
-class mob_spark_of_ionar : public CreatureScript
+class npc_spark_of_ionar : public CreatureScript
 {
 public:
-    mob_spark_of_ionar() : CreatureScript("mob_spark_of_ionar") { }
+    npc_spark_of_ionar() : CreatureScript("npc_spark_of_ionar") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_spark_of_ionarAI(creature);
+        return new npc_spark_of_ionarAI(creature);
     }
 
-    struct mob_spark_of_ionarAI : public ScriptedAI
+    struct npc_spark_of_ionarAI : public ScriptedAI
     {
-        mob_spark_of_ionarAI(Creature* creature) : ScriptedAI(creature)
+        npc_spark_of_ionarAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -379,5 +379,5 @@ public:
 void AddSC_boss_ionar()
 {
     new boss_ionar();
-    new mob_spark_of_ionar();
+    new npc_spark_of_ionar();
 }

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp

@@ -356,21 +356,21 @@ public:
 };
 
 /*######
-## mob_molten_golem
+## npc_molten_golem
 ######*/
-class mob_molten_golem : public CreatureScript
+class npc_molten_golem : public CreatureScript
 {
 public:
-    mob_molten_golem() : CreatureScript("mob_molten_golem") { }
+    npc_molten_golem() : CreatureScript("npc_molten_golem") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_molten_golemAI(creature);
+        return new npc_molten_golemAI(creature);
     }
 
-    struct mob_molten_golemAI : public ScriptedAI
+    struct npc_molten_golemAI : public ScriptedAI
     {
-        mob_molten_golemAI(Creature* creature) : ScriptedAI(creature) { }
+        npc_molten_golemAI(Creature* creature) : ScriptedAI(creature) { }
 
         bool m_bIsFrozen;
 
@@ -468,6 +468,6 @@ class achievement_shatter_resistant : public AchievementCriteriaScript
 void AddSC_boss_volkhan()
 {
     new boss_volkhan();
-    new mob_molten_golem();
+    new npc_molten_golem();
     new achievement_shatter_resistant();
 }

src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp

@@ -247,19 +247,19 @@ public:
 
 };
 
-class mob_malformed_ooze : public CreatureScript
+class npc_malformed_ooze : public CreatureScript
 {
 public:
-    mob_malformed_ooze() : CreatureScript("mob_malformed_ooze") { }
+    npc_malformed_ooze() : CreatureScript("npc_malformed_ooze") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_malformed_oozeAI(creature);
+        return new npc_malformed_oozeAI(creature);
     }
 
-    struct mob_malformed_oozeAI : public ScriptedAI
+    struct npc_malformed_oozeAI : public ScriptedAI
     {
-        mob_malformed_oozeAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_malformed_oozeAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 uiMergeTimer;
 
@@ -290,19 +290,19 @@ public:
 
 };
 
-class mob_iron_sludge : public CreatureScript
+class npc_iron_sludge : public CreatureScript
 {
 public:
-    mob_iron_sludge() : CreatureScript("mob_iron_sludge") { }
+    npc_iron_sludge() : CreatureScript("npc_iron_sludge") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_iron_sludgeAI(creature);
+        return new npc_iron_sludgeAI(creature);
     }
 
-    struct mob_iron_sludgeAI : public ScriptedAI
+    struct npc_iron_sludgeAI : public ScriptedAI
     {
-        mob_iron_sludgeAI(Creature* creature) : ScriptedAI(creature)
+        npc_iron_sludgeAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -342,7 +342,7 @@ class achievement_abuse_the_ooze : public AchievementCriteriaScript
 void AddSC_boss_sjonnir()
 {
     new boss_sjonnir();
-    new mob_malformed_ooze();
-    new mob_iron_sludge();
+    new npc_malformed_ooze();
+    new npc_iron_sludge();
     new achievement_abuse_the_ooze();
 }

src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp

@@ -127,19 +127,19 @@ static Position SpawnLocations[]=
     {960.748f, 382.944f, 208.374f, 0.0f},
 };
 
-class mob_tribuna_controller : public CreatureScript
+class npc_tribuna_controller : public CreatureScript
 {
 public:
-    mob_tribuna_controller() : CreatureScript("mob_tribuna_controller") { }
+    npc_tribuna_controller() : CreatureScript("npc_tribuna_controller") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_tribuna_controllerAI(creature);
+        return new npc_tribuna_controllerAI(creature);
     }
 
-    struct mob_tribuna_controllerAI : public ScriptedAI
+    struct npc_tribuna_controllerAI : public ScriptedAI
     {
-        mob_tribuna_controllerAI(Creature* creature) : ScriptedAI(creature)
+        npc_tribuna_controllerAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
             SetCombatMovement(false);
@@ -352,7 +352,7 @@ public:
                     {
                         if (!creature->IsAlive())
                             creature->Respawn();
-                        CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, creature->AI())->UpdateFacesList();
+                        CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, creature->AI())->UpdateFacesList();
                         uiControllerGUID = creature->GetGUID();
                     }
                     break;
@@ -475,7 +475,7 @@ public:
                         if (instance)
                             instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), true);
                         if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
-                            CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bKaddrakActivated = true;
+                            CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, temp->AI())->bKaddrakActivated = true;
                         JumpToNextStep(5000);
                         break;
                     case 9:
@@ -499,7 +499,7 @@ public:
                         if (instance)
                             instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), true);
                         if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
-                            CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bMarnakActivated = true;
+                            CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, temp->AI())->bMarnakActivated = true;
                         JumpToNextStep(10000);
                         break;
                     case 13:
@@ -531,7 +531,7 @@ public:
                         if (instance)
                             instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), true);
                         if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
-                            CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bAbedneumActivated = true;
+                            CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, temp->AI())->bAbedneumActivated = true;
                         JumpToNextStep(5000);
                         break;
                     case 19:
@@ -755,6 +755,6 @@ class achievement_brann_spankin_new : public AchievementCriteriaScript
 void AddSC_halls_of_stone()
 {
     new npc_brann_hos();
-    new mob_tribuna_controller();
+    new npc_tribuna_controller();
     new achievement_brann_spankin_new();
 }

src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp

@@ -446,14 +446,14 @@ class boss_xt002 : public CreatureScript
  *
  *///----------------------------------------------------
 
-class mob_xt002_heart : public CreatureScript
+class npc_xt002_heart : public CreatureScript
 {
     public:
-        mob_xt002_heart() : CreatureScript("mob_xt002_heart") { }
+        npc_xt002_heart() : CreatureScript("npc_xt002_heart") { }
 
-        struct mob_xt002_heartAI : public ScriptedAI
+        struct npc_xt002_heartAI : public ScriptedAI
         {
-            mob_xt002_heartAI(Creature* creature) : ScriptedAI(creature),
+            npc_xt002_heartAI(Creature* creature) : ScriptedAI(creature),
                 _instance(creature->GetInstanceScript())
             {
                 SetCombatMovement(false);
@@ -477,7 +477,7 @@ class mob_xt002_heart : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_xt002_heartAI(creature);
+            return new npc_xt002_heartAI(creature);
         }
 };
 
@@ -486,19 +486,19 @@ class mob_xt002_heart : public CreatureScript
  *        XS-013 SCRAPBOT
  *
  *///----------------------------------------------------
-class mob_scrapbot : public CreatureScript
+class npc_scrapbot : public CreatureScript
 {
     public:
-        mob_scrapbot() : CreatureScript("mob_scrapbot") { }
+        npc_scrapbot() : CreatureScript("npc_scrapbot") { }
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_scrapbotAI(creature);
+            return new npc_scrapbotAI(creature);
         }
 
-        struct mob_scrapbotAI : public ScriptedAI
+        struct npc_scrapbotAI : public ScriptedAI
         {
-            mob_scrapbotAI(Creature* creature) : ScriptedAI(creature)
+            npc_scrapbotAI(Creature* creature) : ScriptedAI(creature)
             {
                 _instance = me->GetInstanceScript();
             }
@@ -543,19 +543,19 @@ class mob_scrapbot : public CreatureScript
  *        XM-024 PUMMELLER
  *
  *///----------------------------------------------------
-class mob_pummeller : public CreatureScript
+class npc_pummeller : public CreatureScript
 {
     public:
-        mob_pummeller() : CreatureScript("mob_pummeller") { }
+        npc_pummeller() : CreatureScript("npc_pummeller") { }
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_pummellerAI(creature);
+            return new npc_pummellerAI(creature);
         }
 
-        struct mob_pummellerAI : public ScriptedAI
+        struct npc_pummellerAI : public ScriptedAI
         {
-            mob_pummellerAI(Creature* creature) : ScriptedAI(creature)
+            npc_pummellerAI(Creature* creature) : ScriptedAI(creature)
             {
                 _instance = creature->GetInstanceScript();
             }
@@ -645,19 +645,19 @@ class BoomEvent : public BasicEvent
         Creature* _me;
 };
 
-class mob_boombot : public CreatureScript
+class npc_boombot : public CreatureScript
 {
     public:
-        mob_boombot() : CreatureScript("mob_boombot") { }
+        npc_boombot() : CreatureScript("npc_boombot") { }
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_boombotAI(creature);
+            return new npc_boombotAI(creature);
         }
 
-        struct mob_boombotAI : public ScriptedAI
+        struct npc_boombotAI : public ScriptedAI
         {
-            mob_boombotAI(Creature* creature) : ScriptedAI(creature)
+            npc_boombotAI(Creature* creature) : ScriptedAI(creature)
             {
                 _instance = creature->GetInstanceScript();
             }
@@ -724,19 +724,19 @@ class mob_boombot : public CreatureScript
  *        LIFE SPARK
  *
  *///----------------------------------------------------
-class mob_life_spark : public CreatureScript
+class npc_life_spark : public CreatureScript
 {
     public:
-        mob_life_spark() : CreatureScript("mob_life_spark") { }
+        npc_life_spark() : CreatureScript("npc_life_spark") { }
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_life_sparkAI(creature);
+            return new npc_life_sparkAI(creature);
         }
 
-        struct mob_life_sparkAI : public ScriptedAI
+        struct npc_life_sparkAI : public ScriptedAI
         {
-            mob_life_sparkAI(Creature* creature) : ScriptedAI(creature)
+            npc_life_sparkAI(Creature* creature) : ScriptedAI(creature)
             {
             }
 
@@ -1093,12 +1093,12 @@ class achievement_nerf_gravity_bombs : public AchievementCriteriaScript
 
 void AddSC_boss_xt002()
 {
-    new mob_xt002_heart();
-    new mob_scrapbot();
-    new mob_pummeller();
-    new mob_boombot();
+    new npc_xt002_heart();
+    new npc_scrapbot();
+    new npc_pummeller();
+    new npc_boombot();
 
-    new mob_life_spark();
+    new npc_life_spark();
     new boss_xt002();
 
     new spell_xt002_searing_light_spawn_life_spark();

src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp

@@ -40,9 +40,9 @@ enum Yells
 
 enum Creatures
 {
-    MOB_INGVAR_HUMAN                            = 23954,
-    MOB_ANNHYLDE_THE_CALLER                     = 24068,
-    MOB_INGVAR_UNDEAD                           = 23980,
+    NPC_INGVAR_HUMAN                            = 23954,
+    NPC_ANNHYLDE_THE_CALLER                     = 24068,
+    NPC_INGVAR_UNDEAD                           = 23980,
 };
 
 enum Events
@@ -113,7 +113,7 @@ public:
         void Reset()
         {
             if (bIsUndead)
-                me->UpdateEntry(MOB_INGVAR_HUMAN);
+                me->UpdateEntry(NPC_INGVAR_HUMAN);
 
             bIsUndead = false;
 
@@ -160,7 +160,7 @@ public:
         void StartZombiePhase()
         {
             bIsUndead = true;
-            me->UpdateEntry(MOB_INGVAR_UNDEAD);
+            me->UpdateEntry(NPC_INGVAR_UNDEAD);
             events.ScheduleEvent(EVENT_JUST_TRANSFORMED, 2 * IN_MILLISECONDS, 0, PHASE_EVENT);
 
             Talk(YELL_AGGRO_2);
@@ -183,8 +183,8 @@ public:
 
             if (instance)
             {
-                // Ingvar has MOB_INGVAR_UNDEAD id in this moment, so we have to update encounter state for his original id
-                instance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, MOB_INGVAR_HUMAN, me);
+                // Ingvar has NPC_INGVAR_UNDEAD id in this moment, so we have to update encounter state for his original id
+                instance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, NPC_INGVAR_HUMAN, me);
                 instance->SetData(DATA_INGVAR_EVENT, DONE);
             }
         }
@@ -286,19 +286,19 @@ enum eSpells
     SPELL_INGVAR_TRANSFORM                      = 42796
 };
 
-class mob_annhylde_the_caller : public CreatureScript
+class npc_annhylde_the_caller : public CreatureScript
 {
 public:
-    mob_annhylde_the_caller() : CreatureScript("mob_annhylde_the_caller") { }
+    npc_annhylde_the_caller() : CreatureScript("npc_annhylde_the_caller") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_annhylde_the_callerAI (creature);
+        return new npc_annhylde_the_callerAI (creature);
     }
 
-    struct mob_annhylde_the_callerAI : public ScriptedAI
+    struct npc_annhylde_the_callerAI : public ScriptedAI
     {
-        mob_annhylde_the_callerAI(Creature* creature) : ScriptedAI(creature)
+        npc_annhylde_the_callerAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -398,19 +398,19 @@ enum eShadowAxe
     POINT_TARGET                                = 28
 };
 
-class mob_ingvar_throw_dummy : public CreatureScript
+class npc_ingvar_throw_dummy : public CreatureScript
 {
 public:
-    mob_ingvar_throw_dummy() : CreatureScript("mob_ingvar_throw_dummy") { }
+    npc_ingvar_throw_dummy() : CreatureScript("npc_ingvar_throw_dummy") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_ingvar_throw_dummyAI (creature);
+        return new npc_ingvar_throw_dummyAI (creature);
     }
 
-    struct mob_ingvar_throw_dummyAI : public ScriptedAI
+    struct npc_ingvar_throw_dummyAI : public ScriptedAI
     {
-        mob_ingvar_throw_dummyAI(Creature* creature) : ScriptedAI(creature)
+        npc_ingvar_throw_dummyAI(Creature* creature) : ScriptedAI(creature)
         {
         }
 
@@ -449,6 +449,6 @@ public:
 void AddSC_boss_ingvar_the_plunderer()
 {
     new boss_ingvar_the_plunderer();
-    new mob_annhylde_the_caller();
-    new mob_ingvar_throw_dummy();
+    new npc_annhylde_the_caller();
+    new npc_ingvar_throw_dummy();
 }

src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp

@@ -43,20 +43,20 @@ enum eEnums
     YELL_DALRONN_SKA_DIEDFIRST                  = 4,
 
 //Spells of Skarvald and his Ghost
-    MOB_SKARVALD_THE_CONSTRUCTOR                = 24200,
+    NPC_SKARVALD_THE_CONSTRUCTOR                = 24200,
     SPELL_CHARGE                                = 43651,
     SPELL_STONE_STRIKE                          = 48583,
     SPELL_SUMMON_SKARVALD_GHOST                 = 48613,
     SPELL_ENRAGE                                = 48193,
-    MOB_SKARVALD_GHOST                          = 27390,
+    NPC_SKARVALD_GHOST                          = 27390,
 //Spells of Dalronn and his Ghost
-    MOB_DALRONN_THE_CONTROLLER                  = 24201,
+    NPC_DALRONN_THE_CONTROLLER                  = 24201,
     SPELL_SHADOW_BOLT                           = 43649,
     H_SPELL_SHADOW_BOLT                         = 59575,
     H_SPELL_SUMMON_SKELETONS                    = 52611,
     SPELL_DEBILITATE                            = 43650,
     SPELL_SUMMON_DALRONN_GHOST                  = 48612,
-    MOB_DALRONN_GHOST                           = 27389
+    NPC_DALRONN_GHOST                           = 27389
 };
 
 class SkarvaldChargePredicate
@@ -108,7 +108,7 @@ public:
             Check_Timer = 5000;
             Enraged = false;
 
-            ghost = (me->GetEntry() == MOB_SKARVALD_GHOST);
+            ghost = (me->GetEntry() == NPC_SKARVALD_GHOST);
             if (!ghost && instance)
             {
                 Unit* dalronn = Unit::GetUnit(*me, instance->GetData64(DATA_DALRONN));
@@ -161,7 +161,7 @@ public:
 
                         me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
                         //DoCast(me, SPELL_SUMMON_SKARVALD_GHOST, true);
-                        Creature* temp = me->SummonCreature(MOB_SKARVALD_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000);
+                        Creature* temp = me->SummonCreature(NPC_SKARVALD_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000);
                         if (temp)
                         {
                             temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -275,7 +275,7 @@ public:
             Skarvald_isDead = false;
             AggroYell_Timer = 0;
 
-            ghost = me->GetEntry() == MOB_DALRONN_GHOST;
+            ghost = me->GetEntry() == NPC_DALRONN_GHOST;
             if (!ghost && instance)
             {
                 Unit* skarvald = Unit::GetUnit(*me, instance->GetData64(DATA_SKARVALD));
@@ -321,7 +321,7 @@ public:
 
                         me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
                         //DoCast(me, SPELL_SUMMON_DALRONN_GHOST, true);
-                        Creature* temp = me->SummonCreature(MOB_DALRONN_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000);
+                        Creature* temp = me->SummonCreature(NPC_DALRONN_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000);
                         if (temp)
                         {
                             temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);

src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp

@@ -55,7 +55,7 @@ enum Yells
 
 enum Creatures
 {
-    MOB_STASIS_CONTROLLER                       = 26688
+    NPC_STASIS_CONTROLLER                       = 26688
 };
 
 struct Locations
@@ -133,19 +133,19 @@ public:
             {
                 instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED);
 
-                Creature* temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FRENZIED_WORGEN));
+                Creature* temp = Unit::GetCreature((*me), instance->GetData64(DATA_NPC_FRENZIED_WORGEN));
                 if (temp && !temp->IsAlive())
                     temp->Respawn();
 
-                temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FEROCIOUS_RHINO));
+                temp = Unit::GetCreature((*me), instance->GetData64(DATA_NPC_FEROCIOUS_RHINO));
                 if (temp && !temp->IsAlive())
                     temp->Respawn();
 
-                temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR));
+                temp = Unit::GetCreature((*me), instance->GetData64(DATA_NPC_MASSIVE_JORMUNGAR));
                 if (temp && !temp->IsAlive())
                     temp->Respawn();
 
-                temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG));
+                temp = Unit::GetCreature((*me), instance->GetData64(DATA_NPC_RAVENOUS_FURBOLG));
                 if (temp && !temp->IsAlive())
                     temp->Respawn();
 
@@ -189,7 +189,7 @@ public:
             if (!UpdateVictim())
                 return;
 
-            Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0);
+            Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_ORB) : 0);
             if (temp && temp->IsAlive())
                 temp->DisappearAndDie();
 
@@ -220,7 +220,7 @@ public:
           //Talk(SAY_DEATH);
             if (instance)
                 instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE);
-            Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0);
+            Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_ORB) : 0);
             if (temp && temp->IsAlive())
                 temp->DisappearAndDie();
         }
@@ -235,7 +235,7 @@ public:
             if (currentPhase == PHASE_NONE)
             {
                 instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS);
-                me->SummonCreature(MOB_STASIS_CONTROLLER, moveLocs[5].x, moveLocs[5].y, moveLocs[5].z, 0, TEMPSUMMON_CORPSE_DESPAWN);
+                me->SummonCreature(NPC_STASIS_CONTROLLER, moveLocs[5].x, moveLocs[5].y, moveLocs[5].z, 0, TEMPSUMMON_CORPSE_DESPAWN);
             }
             Phase move = PHASE_NONE;
             if (AddCount >= DUNGEON_MODE(2, 4))
@@ -243,7 +243,7 @@ public:
             else
                 move = Sequence[AddCount++];
             //send orb to summon spot
-            Creature* pOrb = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0);
+            Creature* pOrb = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_ORB) : 0);
             if (pOrb && pOrb->IsAlive())
             {
                 if (currentPhase == PHASE_NONE)
@@ -272,19 +272,19 @@ enum RavenousSpells
     SPELL_TERRIFYING_ROAR                       = 48144
 };
 
-class mob_ravenous_furbolg : public CreatureScript
+class npc_ravenous_furbolg : public CreatureScript
 {
 public:
-    mob_ravenous_furbolg() : CreatureScript("mob_ravenous_furbolg") { }
+    npc_ravenous_furbolg() : CreatureScript("npc_ravenous_furbolg") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_ravenous_furbolgAI (creature);
+        return new npc_ravenous_furbolgAI (creature);
     }
 
-    struct mob_ravenous_furbolgAI : public ScriptedAI
+    struct npc_ravenous_furbolgAI : public ScriptedAI
     {
-        mob_ravenous_furbolgAI(Creature* creature) : ScriptedAI(creature)
+        npc_ravenous_furbolgAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -385,19 +385,19 @@ enum FrenziedSpells
     SPELL_ENRAGE_2                              = 48142
 };
 
-class mob_frenzied_worgen : public CreatureScript
+class npc_frenzied_worgen : public CreatureScript
 {
 public:
-    mob_frenzied_worgen() : CreatureScript("mob_frenzied_worgen") { }
+    npc_frenzied_worgen() : CreatureScript("npc_frenzied_worgen") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_frenzied_worgenAI (creature);
+        return new npc_frenzied_worgenAI (creature);
     }
 
-    struct mob_frenzied_worgenAI : public ScriptedAI
+    struct npc_frenzied_worgenAI : public ScriptedAI
     {
-        mob_frenzied_worgenAI(Creature* creature) : ScriptedAI(creature)
+        npc_frenzied_worgenAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -501,19 +501,19 @@ enum FerociousSpells
     SPELL_STOMP                                 = 48131
 };
 
-class mob_ferocious_rhino : public CreatureScript
+class npc_ferocious_rhino : public CreatureScript
 {
 public:
-    mob_ferocious_rhino() : CreatureScript("mob_ferocious_rhino") { }
+    npc_ferocious_rhino() : CreatureScript("npc_ferocious_rhino") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_ferocious_rhinoAI (creature);
+        return new npc_ferocious_rhinoAI (creature);
     }
 
-    struct mob_ferocious_rhinoAI : public ScriptedAI
+    struct npc_ferocious_rhinoAI : public ScriptedAI
     {
-        mob_ferocious_rhinoAI(Creature* creature) : ScriptedAI(creature)
+        npc_ferocious_rhinoAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -621,19 +621,19 @@ enum MassiveAdds
   CREATURE_JORMUNGAR_WORM                     = 27228
 };
 
-class mob_massive_jormungar : public CreatureScript
+class npc_massive_jormungar : public CreatureScript
 {
 public:
-    mob_massive_jormungar() : CreatureScript("mob_massive_jormungar") { }
+    npc_massive_jormungar() : CreatureScript("npc_massive_jormungar") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_massive_jormungarAI (creature);
+        return new npc_massive_jormungarAI (creature);
     }
 
-    struct mob_massive_jormungarAI : public ScriptedAI
+    struct npc_massive_jormungarAI : public ScriptedAI
     {
-        mob_massive_jormungarAI(Creature* creature) : ScriptedAI(creature)
+        npc_massive_jormungarAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -727,19 +727,19 @@ public:
 
 };
 
-class mob_palehoof_orb : public CreatureScript
+class npc_palehoof_orb : public CreatureScript
 {
 public:
-    mob_palehoof_orb() : CreatureScript("mob_palehoof_orb") { }
+    npc_palehoof_orb() : CreatureScript("npc_palehoof_orb") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_palehoof_orbAI (creature);
+        return new npc_palehoof_orbAI (creature);
     }
 
-    struct mob_palehoof_orbAI : public ScriptedAI
+    struct npc_palehoof_orbAI : public ScriptedAI
     {
-        mob_palehoof_orbAI(Creature* creature) : ScriptedAI(creature)
+        npc_palehoof_orbAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -770,10 +770,10 @@ public:
                    Creature* pNext = NULL;
                    switch (currentPhase)
                    {
-                        case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break;
-                        case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break;
-                        case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break;
-                        case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break;
+                        case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_FRENZIED_WORGEN) : 0); break;
+                        case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_RAVENOUS_FURBOLG) : 0); break;
+                        case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_MASSIVE_JORMUNGAR) : 0); break;
+                        case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_FEROCIOUS_RHINO) : 0); break;
                         case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break;
                         default: break;
                    }
@@ -801,10 +801,10 @@ public:
             Creature* pNext = NULL;
             switch (id)
             {
-                case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break;
-                case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break;
-                case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break;
-                case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break;
+                case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_FRENZIED_WORGEN) : 0); break;
+                case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_RAVENOUS_FURBOLG) : 0); break;
+                case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_MASSIVE_JORMUNGAR) : 0); break;
+                case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_NPC_FEROCIOUS_RHINO) : 0); break;
                 case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break;
                 default: break;
             }
@@ -842,10 +842,10 @@ public:
 void AddSC_boss_palehoof()
 {
     new boss_palehoof();
-    new mob_ravenous_furbolg();
-    new mob_frenzied_worgen();
-    new mob_ferocious_rhino();
-    new mob_massive_jormungar();
-    new mob_palehoof_orb();
+    new npc_ravenous_furbolg();
+    new npc_frenzied_worgen();
+    new npc_ferocious_rhino();
+    new npc_massive_jormungar();
+    new npc_palehoof_orb();
     new go_palehoof_sphere();
 }

src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp

@@ -112,12 +112,12 @@ public:
                 case BOSS_GORTOK_PALEHOOF:    uiGortokPalehoof = creature->GetGUID();    break;
                 case BOSS_SKADI_RUTHLESS:     uiSkadiTheRuthless = creature->GetGUID();  break;
                 case BOSS_KING_YMIRON:        uiKingYmiron = creature->GetGUID();        break;
-                case MOB_FRENZIED_WORGEN:     uiFrenziedWorgen = creature->GetGUID();    break;
-                case MOB_RAVENOUS_FURBOLG:    uiRavenousFurbolg = creature->GetGUID();   break;
-                case MOB_MASSIVE_JORMUNGAR:   uiMassiveJormungar = creature->GetGUID();  break;
-                case MOB_FEROCIOUS_RHINO:     uiFerociousRhino = creature->GetGUID();    break;
-                case MOB_SVALA:               uiSvala = creature->GetGUID();             break;
-                case MOB_PALEHOOF_ORB:        uiPalehoofOrb = creature->GetGUID();       break;
+                case NPC_FRENZIED_WORGEN:     uiFrenziedWorgen = creature->GetGUID();    break;
+                case NPC_RAVENOUS_FURBOLG:    uiRavenousFurbolg = creature->GetGUID();   break;
+                case NPC_MASSIVE_JORMUNGAR:   uiMassiveJormungar = creature->GetGUID();  break;
+                case NPC_FEROCIOUS_RHINO:     uiFerociousRhino = creature->GetGUID();    break;
+                case NPC_SVALA:               uiSvala = creature->GetGUID();             break;
+                case NPC_PALEHOOF_ORB:        uiPalehoofOrb = creature->GetGUID();       break;
             }
         }
 
@@ -200,11 +200,11 @@ public:
                 case DATA_GORTOK_PALEHOOF:        return uiGortokPalehoof;
                 case DATA_SKADI_THE_RUTHLESS:     return uiSkadiTheRuthless;
                 case DATA_KING_YMIRON:            return uiKingYmiron;
-                case DATA_MOB_FRENZIED_WORGEN:    return uiFrenziedWorgen;
-                case DATA_MOB_RAVENOUS_FURBOLG:   return uiRavenousFurbolg;
-                case DATA_MOB_MASSIVE_JORMUNGAR:  return uiMassiveJormungar;
-                case DATA_MOB_FEROCIOUS_RHINO:    return uiFerociousRhino;
-                case DATA_MOB_ORB:                return uiPalehoofOrb;
+                case DATA_NPC_FRENZIED_WORGEN:    return uiFrenziedWorgen;
+                case DATA_NPC_RAVENOUS_FURBOLG:   return uiRavenousFurbolg;
+                case DATA_NPC_MASSIVE_JORMUNGAR:  return uiMassiveJormungar;
+                case DATA_NPC_FEROCIOUS_RHINO:    return uiFerociousRhino;
+                case DATA_NPC_ORB:                return uiPalehoofOrb;
                 case DATA_SVALA:                  return uiSvala;
                 case DATA_GORTOK_PALEHOOF_SPHERE: return uiGortokPalehoofSphere;
                 case DATA_SACRIFICED_PLAYER:      return uiSacrificedPlayer;

src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h

@@ -31,13 +31,13 @@ enum Data64
     DATA_SVALA_SORROWGRAVE,
     DATA_GORTOK_PALEHOOF,
     DATA_SKADI_THE_RUTHLESS,
-    DATA_MOB_GRAUF,
+    DATA_NPC_GRAUF,
     DATA_KING_YMIRON,
-    DATA_MOB_FRENZIED_WORGEN,
-    DATA_MOB_RAVENOUS_FURBOLG,
-    DATA_MOB_MASSIVE_JORMUNGAR,
-    DATA_MOB_FEROCIOUS_RHINO,
-    DATA_MOB_ORB,
+    DATA_NPC_FRENZIED_WORGEN,
+    DATA_NPC_RAVENOUS_FURBOLG,
+    DATA_NPC_MASSIVE_JORMUNGAR,
+    DATA_NPC_FEROCIOUS_RHINO,
+    DATA_NPC_ORB,
     DATA_GORTOK_PALEHOOF_SPHERE,
     DATA_SACRIFICED_PLAYER
 };
@@ -48,12 +48,12 @@ enum eCreatures
     BOSS_GORTOK_PALEHOOF     = 26687,
     BOSS_SKADI_RUTHLESS      = 26693,
     BOSS_KING_YMIRON         = 26861,
-    MOB_FRENZIED_WORGEN      = 26683,
-    MOB_RAVENOUS_FURBOLG     = 26684,
-    MOB_MASSIVE_JORMUNGAR    = 26685,
-    MOB_FEROCIOUS_RHINO      = 26686,
-    MOB_SVALA                = 29281,
-    MOB_PALEHOOF_ORB         = 26688
+    NPC_FRENZIED_WORGEN      = 26683,
+    NPC_RAVENOUS_FURBOLG     = 26684,
+    NPC_MASSIVE_JORMUNGAR    = 26685,
+    NPC_FEROCIOUS_RHINO      = 26686,
+    NPC_SVALA                = 29281,
+    NPC_PALEHOOF_ORB         = 26688
 };
 
 #endif

src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp

@@ -130,14 +130,14 @@ class boss_archavon : public CreatureScript
 /*######
 ##  Mob Archavon Warder
 ######*/
-class mob_archavon_warder : public CreatureScript
+class npc_archavon_warder : public CreatureScript
 {
     public:
-        mob_archavon_warder() : CreatureScript("mob_archavon_warder") { }
+        npc_archavon_warder() : CreatureScript("npc_archavon_warder") { }
 
-        struct mob_archavon_warderAI : public ScriptedAI //npc 32353
+        struct npc_archavon_warderAI : public ScriptedAI //npc 32353
         {
-            mob_archavon_warderAI(Creature* creature) : ScriptedAI(creature)
+            npc_archavon_warderAI(Creature* creature) : ScriptedAI(creature)
             {
             }
 
@@ -194,12 +194,12 @@ class mob_archavon_warder : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_archavon_warderAI(creature);
+            return new npc_archavon_warderAI(creature);
         }
 };
 
 void AddSC_boss_archavon()
 {
     new boss_archavon();
-    new mob_archavon_warder();
+    new npc_archavon_warder();
 }

src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp

@@ -52,7 +52,7 @@ enum Events
 };
 
 //Creatures
-#define MOB_TEMPEST_MINION          33998
+#define NPC_TEMPEST_MINION          33998
 
 #define MAX_TEMPEST_MINIONS         4
 
@@ -83,7 +83,7 @@ class boss_emalon : public CreatureScript
                 _Reset();
 
                 for (uint8 i = 0; i < MAX_TEMPEST_MINIONS; ++i)
-                    me->SummonCreature(MOB_TEMPEST_MINION, TempestMinions[i], TEMPSUMMON_CORPSE_DESPAWN, 0);
+                    me->SummonCreature(NPC_TEMPEST_MINION, TempestMinions[i], TEMPSUMMON_CORPSE_DESPAWN, 0);
             }
 
             void JustSummoned(Creature* summoned)
@@ -173,14 +173,14 @@ class boss_emalon : public CreatureScript
 /*######
 ##  Tempest Minion
 ######*/
-class mob_tempest_minion : public CreatureScript
+class npc_tempest_minion : public CreatureScript
 {
     public:
-        mob_tempest_minion() : CreatureScript("mob_tempest_minion") { }
+        npc_tempest_minion() : CreatureScript("npc_tempest_minion") { }
 
-        struct mob_tempest_minionAI : public ScriptedAI
+        struct npc_tempest_minionAI : public ScriptedAI
         {
-            mob_tempest_minionAI(Creature* creature) : ScriptedAI(creature)
+            npc_tempest_minionAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -197,7 +197,7 @@ class mob_tempest_minion : public CreatureScript
                 {
                     if (emalon->IsAlive())
                     {
-                        emalon->SummonCreature(MOB_TEMPEST_MINION, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                        emalon->SummonCreature(NPC_TEMPEST_MINION, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
                         Talk(EMOTE_MINION_RESPAWN);
                     }
                 }
@@ -266,12 +266,12 @@ class mob_tempest_minion : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_tempest_minionAI(creature);
+            return new npc_tempest_minionAI(creature);
         }
 };
 
 void AddSC_boss_emalon()
 {
     new boss_emalon();
-    new mob_tempest_minion();
+    new npc_tempest_minion();
 }

src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp

@@ -125,14 +125,14 @@ class boss_koralon : public CreatureScript
 /*######
 ##  Mob Flame Warder
 ######*/
-class mob_flame_warder : public CreatureScript
+class npc_flame_warder : public CreatureScript
 {
     public:
-        mob_flame_warder() : CreatureScript("mob_flame_warder") { }
+        npc_flame_warder() : CreatureScript("npc_flame_warder") { }
 
-        struct mob_flame_warderAI : public ScriptedAI
+        struct npc_flame_warderAI : public ScriptedAI
         {
-            mob_flame_warderAI(Creature* creature) : ScriptedAI(creature)
+            npc_flame_warderAI(Creature* creature) : ScriptedAI(creature)
             {
             }
 
@@ -186,12 +186,12 @@ class mob_flame_warder : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_flame_warderAI(creature);
+            return new npc_flame_warderAI(creature);
         }
 };
 
 void AddSC_boss_koralon()
 {
     new boss_koralon();
-    new mob_flame_warder();
+    new npc_flame_warder();
 }

src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp

@@ -50,7 +50,7 @@ enum Events
 };
 
 // Mob Frozen Orb
-#define MOB_FROZEN_ORB 38456    // 1 in 10 mode and 3 in 25 mode
+#define NPC_FROZEN_ORB 38456    // 1 in 10 mode and 3 in 25 mode
 
 class boss_toravon : public CreatureScript
 {
@@ -119,14 +119,14 @@ class boss_toravon : public CreatureScript
 /*######
 ##  Mob Frost Warder
 ######*/
-class mob_frost_warder : public CreatureScript
+class npc_frost_warder : public CreatureScript
 {
     public:
-        mob_frost_warder() : CreatureScript("mob_frost_warder") { }
+        npc_frost_warder() : CreatureScript("npc_frost_warder") { }
 
-        struct mob_frost_warderAI : public ScriptedAI
+        struct npc_frost_warderAI : public ScriptedAI
         {
-            mob_frost_warderAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_frost_warderAI(Creature* creature) : ScriptedAI(creature) {}
 
             void Reset()
             {
@@ -167,21 +167,21 @@ class mob_frost_warder : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_frost_warderAI(creature);
+            return new npc_frost_warderAI(creature);
         }
 };
 
 /*######
 ##  Mob Frozen Orb
 ######*/
-class mob_frozen_orb : public CreatureScript
+class npc_frozen_orb : public CreatureScript
 {
 public:
-    mob_frozen_orb() : CreatureScript("mob_frozen_orb") { }
+    npc_frozen_orb() : CreatureScript("npc_frozen_orb") { }
 
-    struct mob_frozen_orbAI : public ScriptedAI
+    struct npc_frozen_orbAI : public ScriptedAI
     {
-        mob_frozen_orbAI(Creature* creature) : ScriptedAI(creature)
+        npc_frozen_orbAI(Creature* creature) : ScriptedAI(creature)
         {
         }
 
@@ -222,21 +222,21 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_frozen_orbAI(creature);
+        return new npc_frozen_orbAI(creature);
     }
 };
 
 /*######
 ##  Mob Frozen Orb Stalker
 ######*/
-class mob_frozen_orb_stalker : public CreatureScript
+class npc_frozen_orb_stalker : public CreatureScript
 {
     public:
-        mob_frozen_orb_stalker() : CreatureScript("mob_frozen_orb_stalker") { }
+        npc_frozen_orb_stalker() : CreatureScript("npc_frozen_orb_stalker") { }
 
-        struct mob_frozen_orb_stalkerAI : public ScriptedAI
+        struct npc_frozen_orb_stalkerAI : public ScriptedAI
         {
-            mob_frozen_orb_stalkerAI(Creature* creature) : ScriptedAI(creature)
+            npc_frozen_orb_stalkerAI(Creature* creature) : ScriptedAI(creature)
             {
                 creature->SetVisible(false);
                 creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_DISABLE_MOVE);
@@ -275,14 +275,14 @@ class mob_frozen_orb_stalker : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_frozen_orb_stalkerAI(creature);
+            return new npc_frozen_orb_stalkerAI(creature);
         }
 };
 
 void AddSC_boss_toravon()
 {
     new boss_toravon();
-    new mob_frost_warder();
-    new mob_frozen_orb();
-    new mob_frozen_orb_stalker();
+    new npc_frost_warder();
+    new npc_frozen_orb();
+    new npc_frozen_orb_stalker();
 }