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

Note: Have fun :P

35 files changed, 463 insertions, 463 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
index fce20a0fcdf..ea7f4c668ab 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -24,9 +24,9 @@ SDCategory: Auchindoun, Auchenai Crypts
 EndScriptData */
 
 /* ContentData
-mob_stolen_soul
+npc_stolen_soul
 boss_exarch_maladaar
-mob_avatar_of_martyred
+npc_avatar_of_martyred
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -42,19 +42,19 @@ EndContentData */
 #define SPELL_FREEZING_TRAP     37368
 #define SPELL_HAMMER_OF_JUSTICE 37369
 
-class mob_stolen_soul : public CreatureScript
+class npc_stolen_soul : public CreatureScript
 {
 public:
-    mob_stolen_soul() : CreatureScript("mob_stolen_soul") { }
+    npc_stolen_soul() : CreatureScript("npc_stolen_soul") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_stolen_soulAI (creature);
+        return new npc_stolen_soulAI (creature);
     }
 
-    struct mob_stolen_soulAI : public ScriptedAI
+    struct npc_stolen_soulAI : public ScriptedAI
     {
-        mob_stolen_soulAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_stolen_soulAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint8 myClass;
         uint32 Class_Timer;
@@ -213,7 +213,7 @@ public:
                 if (Unit* target = Unit::GetUnit(*me, soulholder))
                 {
 
-                CAST_AI(mob_stolen_soul::mob_stolen_soulAI, summoned->AI())->SetMyClass(soulclass);
+                CAST_AI(npc_stolen_soul::npc_stolen_soulAI, summoned->AI())->SetMyClass(soulclass);
                  summoned->AI()->AttackStart(target);
                 }
             }
@@ -297,19 +297,19 @@ public:
 #define SPELL_AV_MORTAL_STRIKE          16856
 #define SPELL_AV_SUNDER_ARMOR           16145
 
-class mob_avatar_of_martyred : public CreatureScript
+class npc_avatar_of_martyred : public CreatureScript
 {
 public:
-    mob_avatar_of_martyred() : CreatureScript("mob_avatar_of_martyred") { }
+    npc_avatar_of_martyred() : CreatureScript("npc_avatar_of_martyred") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_avatar_of_martyredAI (creature);
+        return new npc_avatar_of_martyredAI (creature);
     }
 
-    struct mob_avatar_of_martyredAI : public ScriptedAI
+    struct npc_avatar_of_martyredAI : public ScriptedAI
     {
-        mob_avatar_of_martyredAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_avatar_of_martyredAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 Mortal_Strike_timer;
 
@@ -342,6 +342,6 @@ public:
 void AddSC_boss_exarch_maladaar()
 {
     new boss_exarch_maladaar();
-    new mob_avatar_of_martyred();
-    new mob_stolen_soul();
+    new npc_avatar_of_martyred();
+    new npc_stolen_soul();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
index 844882e6d1b..a599bdf74cb 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -157,19 +157,19 @@ public:
 
 };
 
-class mob_focus_fire : public CreatureScript
+class npc_focus_fire : public CreatureScript
 {
 public:
-    mob_focus_fire() : CreatureScript("mob_focus_fire") { }
+    npc_focus_fire() : CreatureScript("npc_focus_fire") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_focus_fireAI (creature);
+        return new npc_focus_fireAI (creature);
     }
 
-    struct mob_focus_fireAI : public ScriptedAI
+    struct npc_focus_fireAI : public ScriptedAI
     {
-        mob_focus_fireAI(Creature* creature) : ScriptedAI(creature)
+        npc_focus_fireAI(Creature* creature) : ScriptedAI(creature)
         {
         }
 
@@ -211,5 +211,5 @@ public:
 void AddSC_boss_shirrak_the_dead_watcher()
 {
     new boss_shirrak_the_dead_watcher();
-    new mob_focus_fire();
+    new npc_focus_fire();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index 5870cd51b4d..41a94c84888 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 
 /* ContentData
 boss_nexusprince_shaffar
-mob_ethereal_beacon
+npc_ethereal_beacon
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -219,19 +219,19 @@ enum eEnums
     SPELL_ETHEREAL_APPRENTICE       = 32372                 // Summon 18430
 };
 
-class mob_ethereal_beacon : public CreatureScript
+class npc_ethereal_beacon : public CreatureScript
 {
 public:
-    mob_ethereal_beacon() : CreatureScript("mob_ethereal_beacon") { }
+    npc_ethereal_beacon() : CreatureScript("npc_ethereal_beacon") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_ethereal_beaconAI (creature);
+        return new npc_ethereal_beaconAI (creature);
     }
 
-    struct mob_ethereal_beaconAI : public ScriptedAI
+    struct npc_ethereal_beaconAI : public ScriptedAI
     {
-        mob_ethereal_beaconAI(Creature* creature) : ScriptedAI(creature)
+        npc_ethereal_beaconAI(Creature* creature) : ScriptedAI(creature)
         {
         }
 
@@ -311,19 +311,19 @@ enum eEthereal
     SPELL_ETHEREAL_APPRENTICE_FROSTBOLT         = 32370
 };
 
-class mob_ethereal_apprentice : public CreatureScript
+class npc_ethereal_apprentice : public CreatureScript
 {
 public:
-    mob_ethereal_apprentice() : CreatureScript("mob_ethereal_apprentice") { }
+    npc_ethereal_apprentice() : CreatureScript("npc_ethereal_apprentice") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_ethereal_apprenticeAI (creature);
+        return new npc_ethereal_apprenticeAI (creature);
     }
 
-    struct mob_ethereal_apprenticeAI : public ScriptedAI
+    struct npc_ethereal_apprenticeAI : public ScriptedAI
     {
-        mob_ethereal_apprenticeAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_ethereal_apprenticeAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 Cast_Timer;
 
@@ -360,6 +360,6 @@ public:
 void AddSC_boss_nexusprince_shaffar()
 {
     new boss_nexusprince_shaffar();
-    new mob_ethereal_beacon();
-    new mob_ethereal_apprentice();
+    new npc_ethereal_beacon();
+    new npc_ethereal_apprentice();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
index 371c94035ac..22dcc7d996c 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
@@ -197,14 +197,14 @@ public:
 };
 
 /* ELEMENTALS */
-class mob_syth_fire : public CreatureScript
+class npc_syth_fire : public CreatureScript
 {
 public:
-    mob_syth_fire() : CreatureScript("mob_syth_fire") { }
+    npc_syth_fire() : CreatureScript("npc_syth_fire") { }
 
-    struct mob_syth_fireAI : public ScriptedAI
+    struct npc_syth_fireAI : public ScriptedAI
     {
-        mob_syth_fireAI(Creature* creature) : ScriptedAI(creature)
+        npc_syth_fireAI(Creature* creature) : ScriptedAI(creature)
         {
         }
 
@@ -247,23 +247,23 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_syth_fireAI (creature);
+        return new npc_syth_fireAI (creature);
     }
 };
 
-class mob_syth_arcane : public CreatureScript
+class npc_syth_arcane : public CreatureScript
 {
 public:
-    mob_syth_arcane() : CreatureScript("mob_syth_arcane") { }
+    npc_syth_arcane() : CreatureScript("npc_syth_arcane") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_syth_arcaneAI (creature);
+        return new npc_syth_arcaneAI (creature);
     }
 
-    struct mob_syth_arcaneAI : public ScriptedAI
+    struct npc_syth_arcaneAI : public ScriptedAI
     {
-        mob_syth_arcaneAI(Creature* creature) : ScriptedAI(creature)
+        npc_syth_arcaneAI(Creature* creature) : ScriptedAI(creature)
         {
         }
 
@@ -305,19 +305,19 @@ public:
     };
 };
 
-class mob_syth_frost : public CreatureScript
+class npc_syth_frost : public CreatureScript
 {
 public:
-    mob_syth_frost() : CreatureScript("mob_syth_frost") { }
+    npc_syth_frost() : CreatureScript("npc_syth_frost") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_syth_frostAI (creature);
+        return new npc_syth_frostAI (creature);
     }
 
-    struct mob_syth_frostAI : public ScriptedAI
+    struct npc_syth_frostAI : public ScriptedAI
     {
-        mob_syth_frostAI(Creature* creature) : ScriptedAI(creature)
+        npc_syth_frostAI(Creature* creature) : ScriptedAI(creature)
         {
         }
 
@@ -360,19 +360,19 @@ public:
 
 };
 
-class mob_syth_shadow : public CreatureScript
+class npc_syth_shadow : public CreatureScript
 {
 public:
-    mob_syth_shadow() : CreatureScript("mob_syth_shadow") { }
+    npc_syth_shadow() : CreatureScript("npc_syth_shadow") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_syth_shadowAI (creature);
+        return new npc_syth_shadowAI (creature);
     }
 
-    struct mob_syth_shadowAI : public ScriptedAI
+    struct npc_syth_shadowAI : public ScriptedAI
     {
-        mob_syth_shadowAI(Creature* creature) : ScriptedAI(creature)
+        npc_syth_shadowAI(Creature* creature) : ScriptedAI(creature)
         {
         }
 
@@ -418,8 +418,8 @@ public:
 void AddSC_boss_darkweaver_syth()
 {
     new boss_darkweaver_syth();
-    new mob_syth_fire();
-    new mob_syth_arcane();
-    new mob_syth_frost();
-    new mob_syth_shadow();
+    new npc_syth_fire();
+    new npc_syth_arcane();
+    new npc_syth_frost();
+    new npc_syth_shadow();
 }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 3563dab6378..22322625775 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -374,10 +374,10 @@ static const Animation DemonTransformation[10]=
     {0, SPELL_DEMON_TRANSFORM_3, 0, 0, 0, 8, true}
 };
 
-class mob_flame_of_azzinoth : public CreatureScript
+class npc_flame_of_azzinoth : public CreatureScript
 {
 public:
-    mob_flame_of_azzinoth() : CreatureScript("mob_flame_of_azzinoth") { }
+    npc_flame_of_azzinoth() : CreatureScript("npc_flame_of_azzinoth") { }
 
     struct flame_of_azzinothAI : public ScriptedAI
     {
@@ -751,7 +751,7 @@ public:
                         Flame->setFaction(me->getFaction()); // Just in case the database has it as a different faction
                         Flame->SetMeleeDamageSchool(SPELL_SCHOOL_FIRE);
                         FlameGUID[i] = Flame->GetGUID(); // Record GUID in order to check if they're dead later on to move to the next phase
-                        CAST_AI(mob_flame_of_azzinoth::flame_of_azzinothAI, Flame->AI())->SetGlaiveGUID(GlaiveGUID[i]);
+                        CAST_AI(npc_flame_of_azzinoth::flame_of_azzinothAI, Flame->AI())->SetGlaiveGUID(GlaiveGUID[i]);
                         Glaive->CastSpell(Flame, SPELL_AZZINOTH_CHANNEL, false); // Glaives do some random Beam type channel on it.
                     }
                 }
@@ -1976,10 +1976,10 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence()
     ++TalkCount;
 }
 
-class mob_cage_trap_trigger : public CreatureScript
+class npc_cage_trap_trigger : public CreatureScript
 {
 public:
-    mob_cage_trap_trigger() : CreatureScript("mob_cage_trap_trigger") { }
+    npc_cage_trap_trigger() : CreatureScript("npc_cage_trap_trigger") { }
 
     struct cage_trap_triggerAI : public ScriptedAI
     {
@@ -2067,16 +2067,16 @@ public:
 
         // Grid search for nearest live Creature of entry 23304 within 10 yards
         if (Creature* pTrigger = go->FindNearestCreature(23304, 10.0f))
-            CAST_AI(mob_cage_trap_trigger::cage_trap_triggerAI, pTrigger->AI())->Active = true;
+            CAST_AI(npc_cage_trap_trigger::cage_trap_triggerAI, pTrigger->AI())->Active = true;
         go->SetGoState(GO_STATE_ACTIVE);
         return true;
     }
 };
 
-class mob_shadow_demon : public CreatureScript
+class npc_shadow_demon : public CreatureScript
 {
 public:
-    mob_shadow_demon() : CreatureScript("mob_shadow_demon") { }
+    npc_shadow_demon() : CreatureScript("npc_shadow_demon") { }
 
     struct shadow_demonAI : public ScriptedAI
     {
@@ -2129,10 +2129,10 @@ public:
     }
 };
 
-class mob_blade_of_azzinoth : public CreatureScript
+class npc_blade_of_azzinoth : public CreatureScript
 {
 public:
-    mob_blade_of_azzinoth() : CreatureScript("mob_blade_of_azzinoth") { }
+    npc_blade_of_azzinoth() : CreatureScript("npc_blade_of_azzinoth") { }
 
     struct blade_of_azzinothAI : public NullCreatureAI
     {
@@ -2151,15 +2151,15 @@ public:
     }
 };
 
-class mob_parasitic_shadowfiend : public CreatureScript
+class npc_parasitic_shadowfiend : public CreatureScript
 {
 public:
-    mob_parasitic_shadowfiend() : CreatureScript("mob_parasitic_shadowfiend") { }
+    npc_parasitic_shadowfiend() : CreatureScript("npc_parasitic_shadowfiend") { }
 
     // Shadowfiends interact with Illidan, setting more targets in Illidan's hashmap
-    struct mob_parasitic_shadowfiendAI : public ScriptedAI
+    struct npc_parasitic_shadowfiendAI : public ScriptedAI
     {
-        mob_parasitic_shadowfiendAI(Creature* creature) : ScriptedAI(creature)
+        npc_parasitic_shadowfiendAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -2232,7 +2232,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_parasitic_shadowfiendAI (creature);
+        return new npc_parasitic_shadowfiendAI (creature);
     }
 };
 
@@ -2241,10 +2241,10 @@ void AddSC_boss_illidan()
     new boss_illidan_stormrage();
     new npc_akama_illidan();
     new boss_maiev_shadowsong();
-    new mob_flame_of_azzinoth();
-    new mob_blade_of_azzinoth();
+    new npc_flame_of_azzinoth();
+    new npc_blade_of_azzinoth();
     new gameobject_cage_trap();
-    new mob_cage_trap_trigger();
-    new mob_shadow_demon();
-    new mob_parasitic_shadowfiend();
+    new npc_cage_trap_trigger();
+    new npc_shadow_demon();
+    new npc_parasitic_shadowfiend();
 }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index cf937ee0cd1..0c1994d0c2e 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -115,19 +115,19 @@ static Location BrokenWP[]=
 
 const uint32 spawnEntries[4]= { 23523, 23318, 23524 };
 
-class mob_ashtongue_channeler : public CreatureScript
+class npc_ashtongue_channeler : public CreatureScript
 {
 public:
-    mob_ashtongue_channeler() : CreatureScript("mob_ashtongue_channeler") { }
+    npc_ashtongue_channeler() : CreatureScript("npc_ashtongue_channeler") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_ashtongue_channelerAI (creature);
+        return new npc_ashtongue_channelerAI (creature);
     }
 
-    struct mob_ashtongue_channelerAI : public ScriptedAI
+    struct npc_ashtongue_channelerAI : public ScriptedAI
     {
-        mob_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature)
+        npc_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature)
         {
             ShadeGUID = 0;
         }
@@ -144,19 +144,19 @@ public:
 
 };
 
-class mob_ashtongue_sorcerer : public CreatureScript
+class npc_ashtongue_sorcerer : public CreatureScript
 {
 public:
-    mob_ashtongue_sorcerer() : CreatureScript("mob_ashtongue_sorcerer") { }
+    npc_ashtongue_sorcerer() : CreatureScript("npc_ashtongue_sorcerer") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_ashtongue_sorcererAI (creature);
+        return new npc_ashtongue_sorcererAI (creature);
     }
 
-    struct mob_ashtongue_sorcererAI : public ScriptedAI
+    struct npc_ashtongue_sorcererAI : public ScriptedAI
     {
-        mob_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature)
+        npc_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature)
         {
             ShadeGUID = 0;
         }
@@ -366,7 +366,7 @@ public:
                 Creature* Sorcerer = me->SummonCreature(CREATURE_SORCERER, X, Y, Z_SPAWN, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
                 if (Sorcerer)
                 {
-                    CAST_AI(mob_ashtongue_sorcerer::mob_ashtongue_sorcererAI, Sorcerer->AI())->ShadeGUID = me->GetGUID();
+                    CAST_AI(npc_ashtongue_sorcerer::npc_ashtongue_sorcererAI, Sorcerer->AI())->ShadeGUID = me->GetGUID();
                     Sorcerer->SetWalk(false);
                     Sorcerer->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
                     Sorcerer->SetTarget(me->GetGUID());
@@ -400,7 +400,7 @@ public:
             {
                 for (std::list<Creature*>::const_iterator itr = ChannelerList.begin(); itr != ChannelerList.end(); ++itr)
                 {
-                    CAST_AI(mob_ashtongue_channeler::mob_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID();
+                    CAST_AI(npc_ashtongue_channeler::npc_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID();
                     Channelers.push_back((*itr)->GetGUID());
                     TC_LOG_DEBUG(LOG_FILTER_TSCR, "Shade of Akama Grid Search found channeler " UI64FMTD ". Adding to list", (*itr)->GetGUID());
                 }
@@ -533,7 +533,7 @@ public:
 
 };
 
-void mob_ashtongue_channeler::mob_ashtongue_channelerAI::JustDied(Unit* /*killer*/)
+void npc_ashtongue_channeler::npc_ashtongue_channelerAI::JustDied(Unit* /*killer*/)
 {
     Creature* Shade = (Unit::GetCreature((*me), ShadeGUID));
     if (Shade && Shade->IsAlive())
@@ -541,7 +541,7 @@ void mob_ashtongue_channeler::mob_ashtongue_channelerAI::JustDied(Unit* /*killer
     else TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama.");
 }
 
-void mob_ashtongue_sorcerer::mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/)
+void npc_ashtongue_sorcerer::npc_ashtongue_sorcererAI::JustDied(Unit* /*killer*/)
 {
     Creature* Shade = (Unit::GetCreature((*me), ShadeGUID));
     if (Shade && Shade->IsAlive())
@@ -899,7 +899,7 @@ public:
 void AddSC_boss_shade_of_akama()
 {
     new boss_shade_of_akama();
-    new mob_ashtongue_channeler();
-    new mob_ashtongue_sorcerer();
+    new npc_ashtongue_channeler();
+    new npc_ashtongue_sorcerer();
     new npc_akama_shade();
 }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 0310f9237cd..14a31e85e24 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -51,19 +51,19 @@ enum DoomBlossom
     CREATURE_SHADOWY_CONSTRUCT      = 23111
 };
 
-class mob_doom_blossom : public CreatureScript
+class npc_doom_blossom : public CreatureScript
 {
 public:
-    mob_doom_blossom() : CreatureScript("mob_doom_blossom") { }
+    npc_doom_blossom() : CreatureScript("npc_doom_blossom") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_doom_blossomAI(creature);
+        return new npc_doom_blossomAI(creature);
     }
 
-    struct mob_doom_blossomAI : public ScriptedAI
+    struct npc_doom_blossomAI : public ScriptedAI
     {
-        mob_doom_blossomAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_doom_blossomAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 CheckTeronTimer;
         uint32 ShadowBoltTimer;
@@ -119,19 +119,19 @@ public:
     };
 };
 
-class mob_shadowy_construct : public CreatureScript
+class npc_shadowy_construct : public CreatureScript
 {
 public:
-    mob_shadowy_construct() : CreatureScript("mob_shadowy_construct") { }
+    npc_shadowy_construct() : CreatureScript("npc_shadowy_construct") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_shadowy_constructAI(creature);
+        return new npc_shadowy_constructAI(creature);
     }
 
-    struct mob_shadowy_constructAI : public ScriptedAI
+    struct npc_shadowy_constructAI : public ScriptedAI
     {
-        mob_shadowy_constructAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_shadowy_constructAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint64 GhostGUID;
         uint64 TeronGUID;
@@ -366,7 +366,7 @@ public:
                     {
                         Construct->CastSpell(Construct, SPELL_PASSIVE_SHADOWFORM, true);
                         SetThreatList(Construct);               // Use same function as Doom Blossom to set Threat List.
-                        CAST_AI(mob_shadowy_construct::mob_shadowy_constructAI, Construct->AI())->GhostGUID = GhostGUID;
+                        CAST_AI(npc_shadowy_construct::npc_shadowy_constructAI, Construct->AI())->GhostGUID = GhostGUID;
                         Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1);
                         if (!target)                             // someone's trying to solo.
                             target = me->GetVictim();
@@ -444,7 +444,7 @@ public:
                         DoomBlossom->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         DoomBlossom->setFaction(me->getFaction());
                         DoomBlossom->AddThreat(target, 1.0f);
-                        CAST_AI(mob_doom_blossom::mob_doom_blossomAI, DoomBlossom->AI())->SetTeronGUID(me->GetGUID());
+                        CAST_AI(npc_doom_blossom::npc_doom_blossomAI, DoomBlossom->AI())->SetTeronGUID(me->GetGUID());
                         target->CombatStart(DoomBlossom);
                         SetThreatList(DoomBlossom);
                         SummonDoomBlossomTimer = 35000;
@@ -512,7 +512,7 @@ public:
 
 void AddSC_boss_teron_gorefiend()
 {
-    new mob_doom_blossom();
-    new mob_shadowy_construct();
+    new npc_doom_blossom();
+    new npc_shadowy_construct();
     new boss_teron_gorefiend();
 }
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index b75296a59e3..bbf75b2df5c 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -115,19 +115,19 @@ static CouncilYells CouncilEnrage[]=
     {1, 0},                                          // Zerevor
 };
 
-class mob_blood_elf_council_voice_trigger : public CreatureScript
+class npc_blood_elf_council_voice_trigger : public CreatureScript
 {
 public:
-    mob_blood_elf_council_voice_trigger() : CreatureScript("mob_blood_elf_council_voice_trigger") { }
+    npc_blood_elf_council_voice_trigger() : CreatureScript("npc_blood_elf_council_voice_trigger") { }
 
     CreatureAI* GetAI(Creature* c) const
     {
-        return new mob_blood_elf_council_voice_triggerAI(c);
+        return new npc_blood_elf_council_voice_triggerAI(c);
     }
 
-    struct mob_blood_elf_council_voice_triggerAI : public ScriptedAI
+    struct npc_blood_elf_council_voice_triggerAI : public ScriptedAI
     {
-        mob_blood_elf_council_voice_triggerAI(Creature* creature) : ScriptedAI(creature)
+        npc_blood_elf_council_voice_triggerAI(Creature* creature) : ScriptedAI(creature)
         {
             for (uint8 i = 0; i < 4; ++i)
                 Council[i] = 0;
@@ -210,19 +210,19 @@ public:
 
 };
 
-class mob_illidari_council : public CreatureScript
+class npc_illidari_council : public CreatureScript
 {
 public:
-    mob_illidari_council() : CreatureScript("mob_illidari_council") { }
+    npc_illidari_council() : CreatureScript("npc_illidari_council") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_illidari_councilAI (creature);
+        return new npc_illidari_councilAI (creature);
     }
 
-    struct mob_illidari_councilAI : public ScriptedAI
+    struct npc_illidari_councilAI : public ScriptedAI
     {
-        mob_illidari_councilAI(Creature* creature) : ScriptedAI(creature)
+        npc_illidari_councilAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
             for (uint8 i = 0; i < 4; ++i)
@@ -295,8 +295,8 @@ public:
                 // Start the event for the Voice Trigger
                 if (Creature* VoiceTrigger = (Unit::GetCreature(*me, instance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE))))
                 {
-                    CAST_AI(mob_blood_elf_council_voice_trigger::mob_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->LoadCouncilGUIDs();
-                    CAST_AI(mob_blood_elf_council_voice_trigger::mob_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->EventStarted = true;
+                    CAST_AI(npc_blood_elf_council_voice_trigger::npc_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->LoadCouncilGUIDs();
+                    CAST_AI(npc_blood_elf_council_voice_trigger::npc_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->EventStarted = true;
                 }
 
                 for (uint8 i = 0; i < 4; ++i)
@@ -403,7 +403,7 @@ struct boss_illidari_councilAI : public ScriptedAI
         {
             Creature* Controller = (Unit::GetCreature(*me, instance->GetData64(DATA_ILLIDARICOUNCIL)));
             if (Controller)
-                CAST_AI(mob_illidari_council::mob_illidari_councilAI, Controller->AI())->StartEvent(who);
+                CAST_AI(npc_illidari_council::npc_illidari_councilAI, Controller->AI())->StartEvent(who);
         }
         else
         {
@@ -929,8 +929,8 @@ public:
 
 void AddSC_boss_illidari_council()
 {
-    new mob_illidari_council();
-    new mob_blood_elf_council_voice_trigger();
+    new npc_illidari_council();
+    new npc_blood_elf_council_voice_trigger();
     new boss_gathios_the_shatterer();
     new boss_lady_malande();
     new boss_veras_darkshadow();
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 8aa8d939a6d..7e168f8bf90 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -543,19 +543,19 @@ public:
 
 // Enchanted Elemental
 // If one of them reaches Vashj he will increase her damage done by 5%.
-class mob_enchanted_elemental : public CreatureScript
+class npc_enchanted_elemental : public CreatureScript
 {
 public:
-    mob_enchanted_elemental() : CreatureScript("mob_enchanted_elemental") { }
+    npc_enchanted_elemental() : CreatureScript("npc_enchanted_elemental") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_enchanted_elementalAI (creature);
+        return new npc_enchanted_elementalAI (creature);
     }
 
-    struct mob_enchanted_elementalAI : public ScriptedAI
+    struct npc_enchanted_elementalAI : public ScriptedAI
     {
-        mob_enchanted_elementalAI(Creature* creature) : ScriptedAI(creature)
+        npc_enchanted_elementalAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -637,19 +637,19 @@ public:
 
 // Tainted Elemental
 // This mob has 7, 900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3, 000 nature damage and placing a posion doing 2, 000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental
-class mob_tainted_elemental : public CreatureScript
+class npc_tainted_elemental : public CreatureScript
 {
 public:
-    mob_tainted_elemental() : CreatureScript("mob_tainted_elemental") { }
+    npc_tainted_elemental() : CreatureScript("npc_tainted_elemental") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_tainted_elementalAI (creature);
+        return new npc_tainted_elementalAI (creature);
     }
 
-    struct mob_tainted_elementalAI : public ScriptedAI
+    struct npc_tainted_elementalAI : public ScriptedAI
     {
-        mob_tainted_elementalAI(Creature* creature) : ScriptedAI(creature)
+        npc_tainted_elementalAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -706,19 +706,19 @@ public:
 
 //Toxic Sporebat
 //Toxic Spores: Used in Phase 3 by the Spore Bats, it creates a contaminated green patch of ground, dealing about 2775-3225 nature damage every second to anyone who stands in it.
-class mob_toxic_sporebat : public CreatureScript
+class npc_toxic_sporebat : public CreatureScript
 {
 public:
-    mob_toxic_sporebat() : CreatureScript("mob_toxic_sporebat") { }
+    npc_toxic_sporebat() : CreatureScript("npc_toxic_sporebat") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_toxic_sporebatAI (creature);
+        return new npc_toxic_sporebatAI (creature);
     }
 
-    struct mob_toxic_sporebatAI : public ScriptedAI
+    struct npc_toxic_sporebatAI : public ScriptedAI
     {
-        mob_toxic_sporebatAI(Creature* creature) : ScriptedAI(creature)
+        npc_toxic_sporebatAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
             EnterEvadeMode();
@@ -804,19 +804,19 @@ public:
 
 };
 
-class mob_shield_generator_channel : public CreatureScript
+class npc_shield_generator_channel : public CreatureScript
 {
 public:
-    mob_shield_generator_channel() : CreatureScript("mob_shield_generator_channel") { }
+    npc_shield_generator_channel() : CreatureScript("npc_shield_generator_channel") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_shield_generator_channelAI (creature);
+        return new npc_shield_generator_channelAI (creature);
     }
 
-    struct mob_shield_generator_channelAI : public ScriptedAI
+    struct npc_shield_generator_channelAI : public ScriptedAI
     {
-        mob_shield_generator_channelAI(Creature* creature) : ScriptedAI(creature)
+        npc_shield_generator_channelAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -937,9 +937,9 @@ public:
 void AddSC_boss_lady_vashj()
 {
     new boss_lady_vashj();
-    new mob_enchanted_elemental();
-    new mob_tainted_elemental();
-    new mob_toxic_sporebat();
-    new mob_shield_generator_channel();
+    new npc_enchanted_elemental();
+    new npc_tainted_elemental();
+    new npc_toxic_sporebat();
+    new npc_shield_generator_channel();
     new item_tainted_core();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index 02a86e1ab6d..733ccf64101 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -56,7 +56,7 @@ enum LeotherasTheBlind
     MODEL_DEMON             = 20125,
     MODEL_NIGHTELF          = 20514,
     DEMON_FORM              = 21875,
-    MOB_SPELLBINDER         = 21806,
+    NPC_SPELLBINDER         = 21806,
     INNER_DEMON_VICTIM      = 1,
 
     SAY_AGGRO               = 0,
@@ -69,19 +69,19 @@ enum LeotherasTheBlind
     SAY_DEATH               = 7
 };
 
-class mob_inner_demon : public CreatureScript
+class npc_inner_demon : public CreatureScript
 {
 public:
-    mob_inner_demon() : CreatureScript("mob_inner_demon") { }
+    npc_inner_demon() : CreatureScript("npc_inner_demon") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_inner_demonAI (creature);
+        return new npc_inner_demonAI (creature);
     }
 
-    struct mob_inner_demonAI : public ScriptedAI
+    struct npc_inner_demonAI : public ScriptedAI
     {
-        mob_inner_demonAI(Creature* creature) : ScriptedAI(creature)
+        npc_inner_demonAI(Creature* creature) : ScriptedAI(creature)
         {
             victimGUID = 0;
         }
@@ -259,7 +259,7 @@ public:
                 if (i == 0) {nx += 10; ny -= 5; o=2.5f;}
                 if (i == 1) {nx -= 8; ny -= 7; o=0.9f;}
                 if (i == 2) {nx -= 3; ny += 9; o=5.0f;}
-                Creature* binder = me->SummonCreature(MOB_SPELLBINDER, nx, ny, z, o, TEMPSUMMON_DEAD_DESPAWN, 0);
+                Creature* binder = me->SummonCreature(NPC_SPELLBINDER, nx, ny, z, o, TEMPSUMMON_DEAD_DESPAWN, 0);
                 if (binder)
                     SpellBinderGUID[i] = binder->GetGUID();
             }
@@ -669,19 +669,19 @@ public:
     };
 };
 
-class mob_greyheart_spellbinder : public CreatureScript
+class npc_greyheart_spellbinder : public CreatureScript
 {
 public:
-    mob_greyheart_spellbinder() : CreatureScript("mob_greyheart_spellbinder") { }
+    npc_greyheart_spellbinder() : CreatureScript("npc_greyheart_spellbinder") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_greyheart_spellbinderAI (creature);
+        return new npc_greyheart_spellbinderAI (creature);
     }
 
-    struct mob_greyheart_spellbinderAI : public ScriptedAI
+    struct npc_greyheart_spellbinderAI : public ScriptedAI
     {
-        mob_greyheart_spellbinderAI(Creature* creature) : ScriptedAI(creature)
+        npc_greyheart_spellbinderAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
             leotherasGUID = 0;
@@ -808,6 +808,6 @@ void AddSC_boss_leotheras_the_blind()
 {
     new boss_leotheras_the_blind();
     new boss_leotheras_the_blind_demonform();
-    new mob_greyheart_spellbinder();
-    new mob_inner_demon();
+    new npc_greyheart_spellbinder();
+    new npc_inner_demon();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index 3f42379dd62..da8e75e8f31 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -43,8 +43,8 @@ EndScriptData */
 
 #define SPOUT_DIST  100
 
-#define MOB_COILFANG_GUARDIAN 21873
-#define MOB_COILFANG_AMBUSHER 21865
+#define NPC_COILFANG_GUARDIAN 21873
+#define NPC_COILFANG_AMBUSHER 21865
 
 //Ambusher spells
 #define SPELL_SPREAD_SHOT   37790
@@ -350,7 +350,7 @@ public:
                     me->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
                     // spawn adds
                     for (uint8 i = 0; i < 9; ++i)
-                        if (Creature* summoned = me->SummonCreature(i < 6 ? MOB_COILFANG_AMBUSHER : MOB_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0))
+                        if (Creature* summoned = me->SummonCreature(i < 6 ? NPC_COILFANG_AMBUSHER : NPC_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0))
                             Summons.Summon(summoned);
                     Spawned = true;
                 }
@@ -359,19 +359,19 @@ public:
      };
 };
 
-class mob_coilfang_ambusher : public CreatureScript
+class npc_coilfang_ambusher : public CreatureScript
 {
 public:
-    mob_coilfang_ambusher() : CreatureScript("mob_coilfang_ambusher") { }
+    npc_coilfang_ambusher() : CreatureScript("npc_coilfang_ambusher") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_coilfang_ambusherAI (creature);
+        return new npc_coilfang_ambusherAI (creature);
     }
 
-    struct mob_coilfang_ambusherAI : public ScriptedAI
+    struct npc_coilfang_ambusherAI : public ScriptedAI
     {
-        mob_coilfang_ambusherAI(Creature* creature) : ScriptedAI(creature)
+        npc_coilfang_ambusherAI(Creature* creature) : ScriptedAI(creature)
         {
             SetCombatMovement(false);
         }
@@ -444,6 +444,6 @@ class go_strange_pool : public GameObjectScript
 void AddSC_boss_the_lurker_below()
 {
     new boss_the_lurker_below();
-    new mob_coilfang_ambusher();
+    new npc_coilfang_ambusher();
     new go_strange_pool();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index 877e1113962..ec949345928 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -280,19 +280,19 @@ public:
 //Water Globule AI
 #define SPELL_GLOBULE_EXPLOSION 37871
 
-class mob_water_globule : public CreatureScript
+class npc_water_globule : public CreatureScript
 {
 public:
-    mob_water_globule() : CreatureScript("mob_water_globule") { }
+    npc_water_globule() : CreatureScript("npc_water_globule") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_water_globuleAI (creature);
+        return new npc_water_globuleAI (creature);
     }
 
-    struct mob_water_globuleAI : public ScriptedAI
+    struct npc_water_globuleAI : public ScriptedAI
     {
-        mob_water_globuleAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_water_globuleAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 Check_Timer;
 
@@ -348,5 +348,5 @@ public:
 void AddSC_boss_morogrim_tidewalker()
 {
     new boss_morogrim_tidewalker();
-    new mob_water_globule();
+    new npc_water_globule();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index 27134a3a740..de12e35ec19 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -31,9 +31,9 @@ EndScriptData */
 
 #define MAX_ENCOUNTER 6
 #define SPELL_SCALDINGWATER 37284
-#define MOB_COILFANG_FRENZY 21508
-#define TRASHMOB_COILFANG_PRIESTESS 21220  //6*2
-#define TRASHMOB_COILFANG_SHATTERER 21301  //6*3
+#define NPC_COILFANG_FRENZY 21508
+#define TRASHNPC_COILFANG_PRIESTESS 21220  //6*2
+#define TRASHNPC_COILFANG_SHATTERER 21301  //6*3
 
 #define MIN_KILLS 30
 
@@ -153,7 +153,7 @@ class instance_serpent_shrine : public InstanceMapScript
                                     //spawn frenzy
                                     if (DoSpawnFrenzy)
                                     {
-                                        if (Creature* frenzy = player->SummonCreature(MOB_COILFANG_FRENZY, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000))
+                                        if (Creature* frenzy = player->SummonCreature(NPC_COILFANG_FRENZY, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000))
                                         {
                                             frenzy->Attack(player, false);
                                             frenzy->SetSwim(true);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index c9d394f6f2d..9a7ca994291 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 
 /* ContentData
 boss_hydromancer_thespia
-mob_coilfang_waterelemental
+npc_coilfang_waterelemental
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -147,19 +147,19 @@ public:
 
 };
 
-class mob_coilfang_waterelemental : public CreatureScript
+class npc_coilfang_waterelemental : public CreatureScript
 {
 public:
-    mob_coilfang_waterelemental() : CreatureScript("mob_coilfang_waterelemental") { }
+    npc_coilfang_waterelemental() : CreatureScript("npc_coilfang_waterelemental") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_coilfang_waterelementalAI (creature);
+        return new npc_coilfang_waterelementalAI (creature);
     }
 
-    struct mob_coilfang_waterelementalAI : public ScriptedAI
+    struct npc_coilfang_waterelementalAI : public ScriptedAI
     {
-        mob_coilfang_waterelementalAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_coilfang_waterelementalAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 WaterBoltVolley_Timer;
 
@@ -190,5 +190,5 @@ public:
 void AddSC_boss_hydromancer_thespia()
 {
     new boss_hydromancer_thespia();
-    new mob_coilfang_waterelemental();
+    new npc_coilfang_waterelemental();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
index 5d8d44ee70c..31af3e5a8d8 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 
 /* ContentData
 boss_mekgineer_steamrigger
-mob_steamrigger_mechanic
+npc_steamrigger_mechanic
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -190,19 +190,19 @@ public:
 #define MAX_REPAIR_RANGE            (13.0f)                 //we should be at least at this range for repair
 #define MIN_REPAIR_RANGE            (7.0f)                  //we can stop movement at this range to repair but not required
 
-class mob_steamrigger_mechanic : public CreatureScript
+class npc_steamrigger_mechanic : public CreatureScript
 {
 public:
-    mob_steamrigger_mechanic() : CreatureScript("mob_steamrigger_mechanic") { }
+    npc_steamrigger_mechanic() : CreatureScript("npc_steamrigger_mechanic") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_steamrigger_mechanicAI (creature);
+        return new npc_steamrigger_mechanicAI (creature);
     }
 
-    struct mob_steamrigger_mechanicAI : public ScriptedAI
+    struct npc_steamrigger_mechanicAI : public ScriptedAI
     {
-        mob_steamrigger_mechanicAI(Creature* creature) : ScriptedAI(creature)
+        npc_steamrigger_mechanicAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -264,5 +264,5 @@ public:
 void AddSC_boss_mekgineer_steamrigger()
 {
     new boss_mekgineer_steamrigger();
-    new mob_steamrigger_mechanic();
+    new npc_steamrigger_mechanic();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
index 914539b27c9..d8cbcc8b49d 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -44,19 +44,19 @@ enum NagaDistiller
     SPELL_WARLORDS_RAGE_PROC    = 36453
 };
 
-class mob_naga_distiller : public CreatureScript
+class npc_naga_distiller : public CreatureScript
 {
 public:
-    mob_naga_distiller() : CreatureScript("mob_naga_distiller") { }
+    npc_naga_distiller() : CreatureScript("npc_naga_distiller") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_naga_distillerAI (creature);
+        return new npc_naga_distillerAI (creature);
     }
 
-    struct mob_naga_distillerAI : public ScriptedAI
+    struct npc_naga_distillerAI : public ScriptedAI
     {
-        mob_naga_distillerAI(Creature* creature) : ScriptedAI(creature)
+        npc_naga_distillerAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
         }
@@ -178,7 +178,7 @@ public:
                 {
                     Talk(SAY_REGEN);
                     DoCast(me, SPELL_WARLORDS_RAGE);
-                    CAST_AI(mob_naga_distiller::mob_naga_distillerAI, distiller->AI())->StartRageGen(me);
+                    CAST_AI(npc_naga_distiller::npc_naga_distillerAI, distiller->AI())->StartRageGen(me);
                 }
                 Rage_Timer = 3000+rand()%15000;
             } else Rage_Timer -= diff;
@@ -207,6 +207,6 @@ public:
 
 void AddSC_boss_warlord_kalithresh()
 {
-    new mob_naga_distiller();
+    new npc_naga_distiller();
     new boss_warlord_kalithresh();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
index 7e2c13483bd..f1bb841fa85 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
@@ -104,19 +104,19 @@ public:
 #define SPELL_PUTRID_MUSHROOM   31690
 #define SPELL_GROW              31698
 
-class mob_underbog_mushroom : public CreatureScript
+class npc_underbog_mushroom : public CreatureScript
 {
 public:
-    mob_underbog_mushroom() : CreatureScript("mob_underbog_mushroom") { }
+    npc_underbog_mushroom() : CreatureScript("npc_underbog_mushroom") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_underbog_mushroomAI (creature);
+        return new npc_underbog_mushroomAI (creature);
     }
 
-    struct mob_underbog_mushroomAI : public ScriptedAI
+    struct npc_underbog_mushroomAI : public ScriptedAI
     {
-        mob_underbog_mushroomAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_underbog_mushroomAI(Creature* creature) : ScriptedAI(creature) {}
 
         bool Stop;
         uint32 Grow_Timer;
@@ -162,5 +162,5 @@ public:
 void AddSC_boss_hungarfen()
 {
     new boss_hungarfen();
-    new mob_underbog_mushroom();
+    new npc_underbog_mushroom();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index f491c5d4c9a..31e66c380d2 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 
 /* ContentData
 boss_kelidan_the_breaker
-mob_shadowmoon_channeler
+npc_shadowmoon_channeler
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -280,7 +280,7 @@ class boss_kelidan_the_breaker : public CreatureScript
 };
 
 /*######
-## mob_shadowmoon_channeler
+## npc_shadowmoon_channeler
 ######*/
 
 enum eShadowmoon
@@ -292,15 +292,15 @@ enum eShadowmoon
     SPELL_CHANNELING        = 39123
 };
 
-class mob_shadowmoon_channeler : public CreatureScript
+class npc_shadowmoon_channeler : public CreatureScript
 {
     public:
 
-        mob_shadowmoon_channeler() : CreatureScript("mob_shadowmoon_channeler") {}
+        npc_shadowmoon_channeler() : CreatureScript("npc_shadowmoon_channeler") {}
 
-        struct mob_shadowmoon_channelerAI : public ScriptedAI
+        struct npc_shadowmoon_channelerAI : public ScriptedAI
         {
-            mob_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature){}
+            npc_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature){}
 
             uint32 ShadowBolt_Timer;
             uint32 MarkOfShadow_Timer;
@@ -373,13 +373,13 @@ class mob_shadowmoon_channeler : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_shadowmoon_channelerAI(creature);
+            return new npc_shadowmoon_channelerAI(creature);
         }
 };
 
 void AddSC_boss_kelidan_the_breaker()
 {
     new boss_kelidan_the_breaker();
-    new mob_shadowmoon_channeler();
+    new npc_shadowmoon_channeler();
 }
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 033d8e4c85e..cee8a2e840e 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -460,17 +460,17 @@ class boss_vazruden_the_herald : public CreatureScript
         }
 };
 
-class mob_hellfire_sentry : public CreatureScript
+class npc_hellfire_sentry : public CreatureScript
 {
     public:
 
-        mob_hellfire_sentry()
-            : CreatureScript("mob_hellfire_sentry")
+        npc_hellfire_sentry()
+            : CreatureScript("npc_hellfire_sentry")
         {
         }
-        struct mob_hellfire_sentryAI : public ScriptedAI
+        struct npc_hellfire_sentryAI : public ScriptedAI
         {
-            mob_hellfire_sentryAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_hellfire_sentryAI(Creature* creature) : ScriptedAI(creature) {}
 
             uint32 KidneyShot_Timer;
 
@@ -506,7 +506,7 @@ class mob_hellfire_sentry : public CreatureScript
         };
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_hellfire_sentryAI(creature);
+            return new npc_hellfire_sentryAI(creature);
         }
 };
 void AddSC_boss_vazruden_the_herald()
@@ -514,6 +514,6 @@ void AddSC_boss_vazruden_the_herald()
     new boss_vazruden_the_herald();
     new boss_vazruden();
     new boss_nazan();
-    new mob_hellfire_sentry();
+    new npc_hellfire_sentry();
 }
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 21b77525ea3..8ad34033e5c 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -49,10 +49,10 @@ enum eEmotes
 
 enum eCreatures
 {
-    MOB_MAGTHERIDON    = 17257,
-    MOB_ROOM           = 17516,
-    MOB_CHANNELLER     = 17256,
-    MOB_ABYSSAL        = 17454,
+    NPC_MAGTHERIDON    = 17257,
+    NPC_ROOM           = 17516,
+    NPC_CHANNELLER     = 17256,
+    NPC_ABYSSAL        = 17454,
 };
 
 enum eSpells
@@ -87,18 +87,18 @@ enum eSpells
 
 typedef std::map<uint64, uint64> CubeMap;
 
-class mob_abyssal : public CreatureScript
+class npc_abyssal : public CreatureScript
 {
     public:
 
-        mob_abyssal()
-            : CreatureScript("mob_abyssal")
+        npc_abyssal()
+            : CreatureScript("npc_abyssal")
         {
         }
 
-        struct mob_abyssalAI : public ScriptedAI
+        struct npc_abyssalAI : public ScriptedAI
         {
-            mob_abyssalAI(Creature* creature) : ScriptedAI(creature)
+            npc_abyssalAI(Creature* creature) : ScriptedAI(creature)
             {
                 trigger = 0;
                 Despawn_Timer = 60000;
@@ -189,7 +189,7 @@ class mob_abyssal : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_abyssalAI(creature);
+            return new npc_abyssalAI(creature);
         }
 };
 
@@ -405,10 +405,10 @@ class boss_magtheridon : public CreatureScript
                     {
                         float x, y, z;
                         target->GetPosition(x, y, z);
-                        Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                        Creature* summon = me->SummonCreature(NPC_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
                         if (summon)
                         {
-                            CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(2);
+                            CAST_AI(npc_abyssal::npc_abyssalAI, summon->AI())->SetTrigger(2);
                             DoCast(summon, SPELL_BLAZE_TARGET, true);
                             summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         }
@@ -439,9 +439,9 @@ class boss_magtheridon : public CreatureScript
                         {
                             float x, y, z;
                             target->GetPosition(x, y, z);
-                            Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                            Creature* summon = me->SummonCreature(NPC_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
                             if (summon)
-                                CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(1);
+                                CAST_AI(npc_abyssal::npc_abyssalAI, summon->AI())->SetTrigger(1);
                         }
                         Debris_Timer = 10000;
                     }
@@ -459,18 +459,18 @@ class boss_magtheridon : public CreatureScript
         }
 };
 
-class mob_hellfire_channeler : public CreatureScript
+class npc_hellfire_channeler : public CreatureScript
 {
     public:
 
-        mob_hellfire_channeler()
-            : CreatureScript("mob_hellfire_channeler")
+        npc_hellfire_channeler()
+            : CreatureScript("npc_hellfire_channeler")
         {
         }
 
-        struct mob_hellfire_channelerAI : public ScriptedAI
+        struct npc_hellfire_channelerAI : public ScriptedAI
         {
-            mob_hellfire_channelerAI(Creature* creature) : ScriptedAI(creature)
+            npc_hellfire_channelerAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -574,7 +574,7 @@ class mob_hellfire_channeler : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_hellfire_channelerAI(creature);
+            return new npc_hellfire_channelerAI(creature);
         }
 };
 
@@ -614,8 +614,8 @@ public:
 void AddSC_boss_magtheridon()
 {
     new boss_magtheridon();
-    new mob_hellfire_channeler();
-    new mob_abyssal();
+    new npc_hellfire_channeler();
+    new npc_abyssal();
     new go_manticron_cube();
 }
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index f53748d0aa4..b3408ed6c49 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -25,8 +25,8 @@ EndScriptData */
 
 /* ContentData
 boss_grand_warlock_nethekurse
-mob_fel_orc_convert
-mob_lesser_shadow_fissure
+npc_fel_orc_convert
+npc_lesser_shadow_fissure
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -285,18 +285,18 @@ class boss_grand_warlock_nethekurse : public CreatureScript
         }
 };
 
-class mob_fel_orc_convert : public CreatureScript
+class npc_fel_orc_convert : public CreatureScript
 {
     public:
 
-        mob_fel_orc_convert()
-            : CreatureScript("mob_fel_orc_convert")
+        npc_fel_orc_convert()
+            : CreatureScript("npc_fel_orc_convert")
         {
         }
 
-        struct mob_fel_orc_convertAI : public ScriptedAI
+        struct npc_fel_orc_convertAI : public ScriptedAI
         {
-            mob_fel_orc_convertAI(Creature* creature) : ScriptedAI(creature)
+            npc_fel_orc_convertAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -363,23 +363,23 @@ class mob_fel_orc_convert : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_fel_orc_convertAI(creature);
+            return new npc_fel_orc_convertAI(creature);
         }
 };
 
 //NOTE: this Creature are also summoned by other spells, for different creatures
-class mob_lesser_shadow_fissure : public CreatureScript
+class npc_lesser_shadow_fissure : public CreatureScript
 {
     public:
 
-        mob_lesser_shadow_fissure()
-            : CreatureScript("mob_lesser_shadow_fissure")
+        npc_lesser_shadow_fissure()
+            : CreatureScript("npc_lesser_shadow_fissure")
         {
         }
 
-        struct mob_lesser_shadow_fissureAI : public ScriptedAI
+        struct npc_lesser_shadow_fissureAI : public ScriptedAI
         {
-            mob_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) {}
 
             void Reset() { }
             void MoveInLineOfSight(Unit* /*who*/) {}
@@ -389,14 +389,14 @@ class mob_lesser_shadow_fissure : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_lesser_shadow_fissureAI (creature);
+            return new npc_lesser_shadow_fissureAI (creature);
         }
 };
 
 void AddSC_boss_grand_warlock_nethekurse()
 {
     new boss_grand_warlock_nethekurse();
-    new mob_fel_orc_convert();
-    new mob_lesser_shadow_fissure();
+    new npc_fel_orc_convert();
+    new npc_lesser_shadow_fissure();
 }
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index 89a585e415f..82ee361b657 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -24,7 +24,7 @@ SDCategory: Hellfire Citadel, Shattered Halls
 EndScriptData */
 
 /* ContentData
-mob_omrogg_heads
+npc_omrogg_heads
 boss_warbringer_omrogg
 EndContentData */
 
@@ -102,18 +102,18 @@ static Yell KillingDelay[]=
     {11, NPC_LEFT_HEAD},
 };
 
-class mob_omrogg_heads : public CreatureScript
+class npc_omrogg_heads : public CreatureScript
 {
     public:
 
-        mob_omrogg_heads()
-            : CreatureScript("mob_omrogg_heads")
+        npc_omrogg_heads()
+            : CreatureScript("npc_omrogg_heads")
         {
         }
 
-        struct mob_omrogg_headsAI : public ScriptedAI
+        struct npc_omrogg_headsAI : public ScriptedAI
         {
-            mob_omrogg_headsAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_omrogg_headsAI(Creature* creature) : ScriptedAI(creature) {}
 
             bool DeathYell;
             uint32 Death_Timer;
@@ -146,7 +146,7 @@ class mob_omrogg_heads : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_omrogg_headsAI(creature);
+            return new npc_omrogg_headsAI(creature);
         }
 };
 
@@ -306,7 +306,7 @@ class boss_warbringer_omrogg : public CreatureScript
 
                 pLeftHead->AI()->Talk(YELL_DIE_L);
 
-                CAST_AI(mob_omrogg_heads::mob_omrogg_headsAI, pRightHead->ToCreature()->AI())->DoDeathYell();
+                CAST_AI(npc_omrogg_heads::npc_omrogg_headsAI, pRightHead->ToCreature()->AI())->DoDeathYell();
 
                 if (instance)
                     instance->SetData(TYPE_OMROGG, DONE);
@@ -423,6 +423,6 @@ class boss_warbringer_omrogg : public CreatureScript
 void AddSC_boss_warbringer_omrogg()
 {
     new boss_warbringer_omrogg();
-    new mob_omrogg_heads();
+    new npc_omrogg_heads();
 }
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index c8fa8948e5a..882cc3a0d3f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -45,10 +45,10 @@ enum eSpells
 
 enum eCreatures
 {
-    MOB_SHATTERED_ASSASSIN         = 17695,
-    MOB_HEARTHEN_GUARD             = 17621,
-    MOB_SHARPSHOOTER_GUARD         = 17622,
-    MOB_REAVER_GUARD               = 17623,
+    NPC_SHATTERED_ASSASSIN         = 17695,
+    NPC_HEARTHEN_GUARD             = 17621,
+    NPC_SHARPSHOOTER_GUARD         = 17622,
+    NPC_REAVER_GUARD               = 17623,
 };
 
 #define TARGET_NUM                      5
@@ -115,13 +115,13 @@ class boss_warchief_kargath_bladefist : public CreatureScript
             {
                 switch (summoned->GetEntry())
                 {
-                    case MOB_HEARTHEN_GUARD:
-                    case MOB_SHARPSHOOTER_GUARD:
-                    case MOB_REAVER_GUARD:
+                    case NPC_HEARTHEN_GUARD:
+                    case NPC_SHARPSHOOTER_GUARD:
+                    case NPC_REAVER_GUARD:
                         summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0));
                         adds.push_back(summoned->GetGUID());
                         break;
-                    case MOB_SHATTERED_ASSASSIN:
+                    case NPC_SHATTERED_ASSASSIN:
                         assassins.push_back(summoned->GetGUID());
                         break;
                 }
@@ -188,10 +188,10 @@ class boss_warchief_kargath_bladefist : public CreatureScript
             }
             void SpawnAssassin()
             {
-                me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]+8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
-                me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]-8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
-                me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]+8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
-                me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+                me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]+8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+                me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]-8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+                me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]+8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+                me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
             }
 
             void UpdateAI(uint32 diff)
@@ -279,13 +279,13 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                             switch (urand(0, 2))
                             {
                                 case 0:
-                                    me->SummonCreature(MOB_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+                                    me->SummonCreature(NPC_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
                                     break;
                                 case 1:
-                                    me->SummonCreature(MOB_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+                                    me->SummonCreature(NPC_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
                                     break;
                                 case 2:
-                                    me->SummonCreature(MOB_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+                                    me->SummonCreature(NPC_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
                                     break;
                             }
                         }
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 62863edc2d7..7de32c4bfbd 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -458,18 +458,18 @@ class boss_alar : public CreatureScript
         }
 };
 
-class mob_ember_of_alar : public CreatureScript
+class npc_ember_of_alar : public CreatureScript
 {
     public:
 
-        mob_ember_of_alar()
-            : CreatureScript("mob_ember_of_alar")
+        npc_ember_of_alar()
+            : CreatureScript("npc_ember_of_alar")
         {
         }
 
-        struct mob_ember_of_alarAI : public ScriptedAI
+        struct npc_ember_of_alarAI : public ScriptedAI
         {
-            mob_ember_of_alarAI(Creature* creature) : ScriptedAI(creature)
+            npc_ember_of_alarAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
                 creature->SetDisableGravity(true);
@@ -533,22 +533,22 @@ class mob_ember_of_alar : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_ember_of_alarAI(creature);
+            return new npc_ember_of_alarAI(creature);
         }
 };
 
-class mob_flame_patch_alar : public CreatureScript
+class npc_flame_patch_alar : public CreatureScript
 {
     public:
 
-        mob_flame_patch_alar()
-            : CreatureScript("mob_flame_patch_alar")
+        npc_flame_patch_alar()
+            : CreatureScript("npc_flame_patch_alar")
         {
         }
 
-        struct mob_flame_patch_alarAI : public ScriptedAI
+        struct npc_flame_patch_alarAI : public ScriptedAI
         {
-            mob_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) {}
             void Reset() {}
             void EnterCombat(Unit* /*who*/) {}
             void AttackStart(Unit* /*who*/) {}
@@ -558,14 +558,14 @@ class mob_flame_patch_alar : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_flame_patch_alarAI(creature);
+            return new npc_flame_patch_alarAI(creature);
         }
 };
 
 void AddSC_boss_alar()
 {
     new boss_alar();
-    new mob_ember_of_alar();
-    new mob_flame_patch_alar();
+    new npc_ember_of_alar();
+    new npc_flame_patch_alar();
 }
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index a18b34f7867..a7f19aad871 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -410,18 +410,18 @@ class boss_high_astromancer_solarian : public CreatureScript
         }
 };
 
-class mob_solarium_priest : public CreatureScript
+class npc_solarium_priest : public CreatureScript
 {
     public:
 
-        mob_solarium_priest()
-            : CreatureScript("mob_solarium_priest")
+        npc_solarium_priest()
+            : CreatureScript("npc_solarium_priest")
         {
         }
 
-        struct mob_solarium_priestAI : public ScriptedAI
+        struct npc_solarium_priestAI : public ScriptedAI
         {
-            mob_solarium_priestAI(Creature* creature) : ScriptedAI(creature)
+            npc_solarium_priestAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -493,7 +493,7 @@ class mob_solarium_priest : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_solarium_priestAI(creature);
+            return new npc_solarium_priestAI(creature);
         }
 };
 
@@ -538,7 +538,7 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader
 void AddSC_boss_high_astromancer_solarian()
 {
     new boss_high_astromancer_solarian();
-    new mob_solarium_priest();
+    new npc_solarium_priest();
     new spell_astromancer_wrath_of_the_astromancer();
 }
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index d52c67bc2d6..a5923d86ff8 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -1396,17 +1396,17 @@ class boss_master_engineer_telonicus : public CreatureScript
 };
 
 //Flame Strike AI
-class mob_kael_flamestrike : public CreatureScript
+class npc_kael_flamestrike : public CreatureScript
 {
     public:
 
-        mob_kael_flamestrike()
-            : CreatureScript("mob_kael_flamestrike")
+        npc_kael_flamestrike()
+            : CreatureScript("npc_kael_flamestrike")
         {
         }
-        struct mob_kael_flamestrikeAI : public ScriptedAI
+        struct npc_kael_flamestrikeAI : public ScriptedAI
         {
-            mob_kael_flamestrikeAI(Creature* creature) : ScriptedAI(creature)
+            npc_kael_flamestrikeAI(Creature* creature) : ScriptedAI(creature)
             {
                 SetCombatMovement(false);
             }
@@ -1458,22 +1458,22 @@ class mob_kael_flamestrike : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_kael_flamestrikeAI(creature);
+            return new npc_kael_flamestrikeAI(creature);
         }
 };
 
 //Phoenix AI
-class mob_phoenix_tk : public CreatureScript
+class npc_phoenix_tk : public CreatureScript
 {
     public:
 
-        mob_phoenix_tk()
-            : CreatureScript("mob_phoenix_tk")
+        npc_phoenix_tk()
+            : CreatureScript("npc_phoenix_tk")
         {
         }
-        struct mob_phoenix_tkAI : public ScriptedAI
+        struct npc_phoenix_tkAI : public ScriptedAI
         {
-            mob_phoenix_tkAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_phoenix_tkAI(Creature* creature) : ScriptedAI(creature) {}
 
             uint32 Cycle_Timer;
 
@@ -1512,22 +1512,22 @@ class mob_phoenix_tk : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_phoenix_tkAI(creature);
+            return new npc_phoenix_tkAI(creature);
         }
 };
 
 //Phoenix Egg AI
-class mob_phoenix_egg_tk : public CreatureScript
+class npc_phoenix_egg_tk : public CreatureScript
 {
     public:
 
-        mob_phoenix_egg_tk()
-            : CreatureScript("mob_phoenix_egg_tk")
+        npc_phoenix_egg_tk()
+            : CreatureScript("npc_phoenix_egg_tk")
         {
         }
-        struct mob_phoenix_egg_tkAI : public ScriptedAI
+        struct npc_phoenix_egg_tkAI : public ScriptedAI
         {
-            mob_phoenix_egg_tkAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_phoenix_egg_tkAI(Creature* creature) : ScriptedAI(creature) {}
 
             uint32 Rebirth_Timer;
 
@@ -1573,7 +1573,7 @@ class mob_phoenix_egg_tk : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_phoenix_egg_tkAI(creature);
+            return new npc_phoenix_egg_tkAI(creature);
         }
 };
 
@@ -1584,7 +1584,7 @@ void AddSC_boss_kaelthas()
     new boss_lord_sanguinar();
     new boss_grand_astromancer_capernian();
     new boss_master_engineer_telonicus();
-    new mob_kael_flamestrike();
-    new mob_phoenix_tk();
-    new mob_phoenix_egg_tk();
+    new npc_kael_flamestrike();
+    new npc_phoenix_tk();
+    new npc_phoenix_egg_tk();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
index c843f09beb9..3fb42ced19f 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
@@ -24,7 +24,7 @@ SDCategory: Tempest Keep, The Eye
 EndScriptData */
 
 /* ContentData
-mob_crystalcore_devastator
+npc_crystalcore_devastator
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -37,17 +37,17 @@ enum eSpells
     SPELL_KNOCKAWAY        = 22893,
 };
 
-class mob_crystalcore_devastator : public CreatureScript
+class npc_crystalcore_devastator : public CreatureScript
 {
     public:
 
-        mob_crystalcore_devastator()
-            : CreatureScript("mob_crystalcore_devastator")
+        npc_crystalcore_devastator()
+            : CreatureScript("npc_crystalcore_devastator")
         {
         }
-        struct mob_crystalcore_devastatorAI : public ScriptedAI
+        struct npc_crystalcore_devastatorAI : public ScriptedAI
         {
-            mob_crystalcore_devastatorAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_crystalcore_devastatorAI(Creature* creature) : ScriptedAI(creature) {}
 
             uint32 Knockaway_Timer;
             uint32 Countercharge_Timer;
@@ -102,11 +102,11 @@ class mob_crystalcore_devastator : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_crystalcore_devastatorAI(creature);
+            return new npc_crystalcore_devastatorAI(creature);
         }
 };
 void AddSC_the_eye()
 {
-    new mob_crystalcore_devastator();
+    new npc_crystalcore_devastator();
 }
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index 1a4916f491a..fbafe03fddb 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -142,14 +142,14 @@ class boss_nethermancer_sepethrea : public CreatureScript
         }
 };
 
-class mob_ragin_flames : public CreatureScript
+class npc_ragin_flames : public CreatureScript
 {
     public:
-        mob_ragin_flames() : CreatureScript("mob_ragin_flames") { }
+        npc_ragin_flames() : CreatureScript("npc_ragin_flames") { }
 
-            struct mob_ragin_flamesAI : public ScriptedAI
+            struct npc_ragin_flamesAI : public ScriptedAI
             {
-                mob_ragin_flamesAI(Creature* creature) : ScriptedAI(creature)
+                npc_ragin_flamesAI(Creature* creature) : ScriptedAI(creature)
                 {
                     instance = creature->GetInstanceScript();
                 }
@@ -223,12 +223,12 @@ class mob_ragin_flames : public CreatureScript
             };
             CreatureAI* GetAI(Creature* creature) const
             {
-                return new mob_ragin_flamesAI(creature);
+                return new npc_ragin_flamesAI(creature);
             }
 };
 
 void AddSC_boss_nethermancer_sepethrea()
 {
     new boss_nethermancer_sepethrea();
-    new mob_ragin_flames();
+    new npc_ragin_flames();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index 67fadf34caa..adcfff10684 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -164,15 +164,15 @@ class boss_pathaleon_the_calculator : public CreatureScript
         }
 };
 
-class mob_nether_wraith : public CreatureScript
+class npc_nether_wraith : public CreatureScript
 {
     public:
 
-        mob_nether_wraith() : CreatureScript("mob_nether_wraith") { }
+        npc_nether_wraith() : CreatureScript("npc_nether_wraith") { }
 
-        struct mob_nether_wraithAI : public ScriptedAI
+        struct npc_nether_wraithAI : public ScriptedAI
         {
-            mob_nether_wraithAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_nether_wraithAI(Creature* creature) : ScriptedAI(creature) {}
 
             uint32 ArcaneMissiles_Timer;
             uint32 Detonation_Timer;
@@ -232,13 +232,13 @@ class mob_nether_wraith : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_nether_wraithAI (creature);
+            return new npc_nether_wraithAI (creature);
         }
 };
 
 void AddSC_boss_pathaleon_the_calculator()
 {
     new boss_pathaleon_the_calculator();
-    new mob_nether_wraith();
+    new npc_nether_wraith();
 }
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 56e7dbe2a1f..43af42b1e72 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -26,7 +26,7 @@ EndScriptData */
 /* ContentData
 npc_millhouse_manastorm
 npc_warden_mellichar
-mob_zerekethvoidzone
+npc_zerekethvoidzone
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -521,7 +521,7 @@ class npc_warden_mellichar : public CreatureScript
 };
 
 /*#####
-# mob_zerekethvoidzone (this script probably not needed in future -> `creature_template_addon`.`auras`='36120 0')
+# npc_zerekethvoidzone (this script probably not needed in future -> `creature_template_addon`.`auras`='36120 0')
 #####*/
 
 enum ZerekethSpell
@@ -529,16 +529,16 @@ enum ZerekethSpell
     SPELL_VOID_ZONE_DAMAGE = 36120,
 };
 
-class mob_zerekethvoidzone : public CreatureScript
+class npc_zerekethvoidzone : public CreatureScript
 {
     public:
 
-        mob_zerekethvoidzone() : CreatureScript("mob_zerekethvoidzone")
+        npc_zerekethvoidzone() : CreatureScript("npc_zerekethvoidzone")
         {
         }
-        struct mob_zerekethvoidzoneAI : public ScriptedAI
+        struct npc_zerekethvoidzoneAI : public ScriptedAI
         {
-            mob_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) {}
+            npc_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) {}
 
             void Reset()
             {
@@ -554,7 +554,7 @@ class mob_zerekethvoidzone : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_zerekethvoidzoneAI(creature);
+            return new npc_zerekethvoidzoneAI(creature);
         }
 };
 
@@ -562,5 +562,5 @@ void AddSC_arcatraz()
 {
     new npc_millhouse_manastorm();
     new npc_warden_mellichar();
-    new mob_zerekethvoidzone();
+    new npc_zerekethvoidzone();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index 8f959334c5e..09ca90570b0 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -61,19 +61,19 @@ float treant_pos[6][3] =
 };
 
 /*#####
-# mob_treant (Sapling)
+# npc_treant (Sapling)
 #####*/
-class mob_warp_splinter_treant : public CreatureScript
+class npc_warp_splinter_treant : public CreatureScript
 {
     public:
 
-        mob_warp_splinter_treant()
-            : CreatureScript("mob_warp_splinter_treant")
+        npc_warp_splinter_treant()
+            : CreatureScript("npc_warp_splinter_treant")
         {
         }
-        struct mob_warp_splinter_treantAI  : public ScriptedAI
+        struct npc_warp_splinter_treantAI  : public ScriptedAI
         {
-            mob_warp_splinter_treantAI (Creature* creature) : ScriptedAI(creature)
+            npc_warp_splinter_treantAI (Creature* creature) : ScriptedAI(creature)
             {
                 WarpGuid = 0;
             }
@@ -120,7 +120,7 @@ class mob_warp_splinter_treant : public CreatureScript
         };
         CreatureAI* GetAI(Creature* creature) const
         {
-            return new mob_warp_splinter_treantAI(creature);
+            return new npc_warp_splinter_treantAI(creature);
         }
 };
 
@@ -185,7 +185,7 @@ class boss_warp_splinter : public CreatureScript
                     float O = - me->GetAngle(X, Y);
 
                     if (Creature* pTreant = me->SummonCreature(CREATURE_TREANT, treant_pos[i][0], treant_pos[i][1], treant_pos[i][2], O, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000))
-                        CAST_AI(mob_warp_splinter_treant::mob_warp_splinter_treantAI, pTreant->AI())->WarpGuid = me->GetGUID();
+                        CAST_AI(npc_warp_splinter_treant::npc_warp_splinter_treantAI, pTreant->AI())->WarpGuid = me->GetGUID();
                 }
                 Talk(SAY_SUMMON);
             }
@@ -235,6 +235,6 @@ class boss_warp_splinter : public CreatureScript
 void AddSC_boss_warp_splinter()
 {
     new boss_warp_splinter();
-    new mob_warp_splinter_treant();
+    new npc_warp_splinter_treant();
 }
 
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index 3bf6840b6f4..8ecf26b028a 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -24,8 +24,8 @@ SDCategory: Blade's Edge Mountains
 EndScriptData */
 
 /* ContentData
-mobs_bladespire_ogre
-mobs_nether_drake
+npc_bladespire_ogre
+npc_nether_drake
 npc_daranelle
 npc_overseer_nuaar
 npc_saikkal_the_elder
@@ -51,23 +51,23 @@ bool     obelisk_one, obelisk_two, obelisk_three, obelisk_four, obelisk_five;
 #define LEGION_OBELISK_FIVE          185198
 
 /*######
-## mobs_bladespire_ogre
+## npc_bladespire_ogre
 ######*/
 
 /// @todo add support for quest 10512 + Creature abilities
-class mobs_bladespire_ogre : public CreatureScript
+class npc_bladespire_ogre : public CreatureScript
 {
 public:
-    mobs_bladespire_ogre() : CreatureScript("mobs_bladespire_ogre") { }
+    npc_bladespire_ogre() : CreatureScript("npc_bladespire_ogre") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mobs_bladespire_ogreAI (creature);
+        return new npc_bladespire_ogreAI (creature);
     }
 
-    struct mobs_bladespire_ogreAI : public ScriptedAI
+    struct npc_bladespire_ogreAI : public ScriptedAI
     {
-        mobs_bladespire_ogreAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_bladespire_ogreAI(Creature* creature) : ScriptedAI(creature) {}
 
         void Reset() { }
 
@@ -82,7 +82,7 @@ public:
 };
 
 /*######
-## mobs_nether_drake
+## npc_nether_drake
 ######*/
 
 enum eNetherdrake
@@ -107,19 +107,19 @@ enum eNetherdrake
     SPELL_INTANGIBLE_PRESENCE   = 36513
 };
 
-class mobs_nether_drake : public CreatureScript
+class npc_nether_drake : public CreatureScript
 {
 public:
-    mobs_nether_drake() : CreatureScript("mobs_nether_drake") { }
+    npc_nether_drake() : CreatureScript("npc_nether_drake") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mobs_nether_drakeAI (creature);
+        return new npc_nether_drakeAI (creature);
     }
 
-    struct mobs_nether_drakeAI : public ScriptedAI
+    struct npc_nether_drakeAI : public ScriptedAI
     {
-        mobs_nether_drakeAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_nether_drakeAI(Creature* creature) : ScriptedAI(creature) {}
 
         bool IsNihil;
         uint32 NihilSpeech_Timer;
@@ -1142,8 +1142,8 @@ class go_apexis_relic : public GameObjectScript
 
 void AddSC_blades_edge_mountains()
 {
-    new mobs_bladespire_ogre();
-    new mobs_nether_drake();
+    new npc_bladespire_ogre();
+    new npc_nether_drake();
     new npc_daranelle();
     new npc_overseer_nuaar();
     new npc_saikkal_the_elder();
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index dc0dacc6f95..f8be2a43bf8 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -714,7 +714,7 @@ public:
 };
 
 /*######
-## mob_phase_hunter
+## npc_phase_hunter
 ######*/
 
 enum ePhaseHunterData
@@ -734,19 +734,19 @@ enum ePhaseHunterData
     SPELL_DE_MATERIALIZE            = 34814,
 };
 
-class mob_phase_hunter : public CreatureScript
+class npc_phase_hunter : public CreatureScript
 {
 public:
-    mob_phase_hunter() : CreatureScript("mob_phase_hunter") { }
+    npc_phase_hunter() : CreatureScript("npc_phase_hunter") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_phase_hunterAI (creature);
+        return new npc_phase_hunterAI (creature);
     }
 
-    struct mob_phase_hunterAI : public ScriptedAI
+    struct npc_phase_hunterAI : public ScriptedAI
     {
-        mob_phase_hunterAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_phase_hunterAI(Creature* creature) : ScriptedAI(creature) {}
 
         bool Weak;
         bool Materialize;
@@ -1070,7 +1070,7 @@ void AddSC_netherstorm()
     new npc_commander_dawnforge();
     new at_commander_dawnforge();
     new npc_professor_dabiri();
-    new mob_phase_hunter();
+    new npc_phase_hunter();
     new npc_bessy();
     new npc_maxx_a_million_escort();
     new go_captain_tyralius_prison();
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index ff89c065c98..a51940a9143 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -24,8 +24,8 @@ SDCategory: Shadowmoon Valley
 EndScriptData */
 
 /* ContentData
-mob_mature_netherwing_drake
-mob_enslaved_netherwing_drake
+npc_mature_netherwing_drake
+npc_enslaved_netherwing_drake
 npc_drake_dealer_hurlunk
 npcs_flanis_swiftwing_and_kagrosh
 npc_murkblood_overseer
@@ -33,8 +33,8 @@ npc_karynaku
 npc_oronok_tornheart
 npc_overlord_morghor
 npc_earthmender_wilda
-mob_torloth_the_magnificent
-mob_illidari_spawn
+npc_torloth_the_magnificent
+npc_illidari_spawn
 npc_lord_illidan_stormrage
 go_crystal_prison
 npc_enraged_spirit
@@ -50,7 +50,7 @@ EndContentData */
 #include "WorldSession.h"
 
 /*#####
-# mob_mature_netherwing_drake
+# npc_mature_netherwing_drake
 #####*/
 
 enum eMatureNetherwing
@@ -68,19 +68,19 @@ enum eMatureNetherwing
     NPC_EVENT_PINGER            = 22131
 };
 
-class mob_mature_netherwing_drake : public CreatureScript
+class npc_mature_netherwing_drake : public CreatureScript
 {
 public:
-    mob_mature_netherwing_drake() : CreatureScript("mob_mature_netherwing_drake") { }
+    npc_mature_netherwing_drake() : CreatureScript("npc_mature_netherwing_drake") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_mature_netherwing_drakeAI(creature);
+        return new npc_mature_netherwing_drakeAI(creature);
     }
 
-    struct mob_mature_netherwing_drakeAI : public ScriptedAI
+    struct npc_mature_netherwing_drakeAI : public ScriptedAI
     {
-        mob_mature_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature) { }
+        npc_mature_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature) { }
 
         uint64 uiPlayerGUID;
 
@@ -187,7 +187,7 @@ public:
 };
 
 /*###
-# mob_enslaved_netherwing_drake
+# npc_enslaved_netherwing_drake
 ####*/
 
 #define FACTION_DEFAULT     62
@@ -199,19 +199,19 @@ public:
 #define CREATURE_DRAGONMAW_SUBJUGATOR   21718
 #define CREATURE_ESCAPE_DUMMY           22317
 
-class mob_enslaved_netherwing_drake : public CreatureScript
+class npc_enslaved_netherwing_drake : public CreatureScript
 {
 public:
-    mob_enslaved_netherwing_drake() : CreatureScript("mob_enslaved_netherwing_drake") { }
+    npc_enslaved_netherwing_drake() : CreatureScript("npc_enslaved_netherwing_drake") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_enslaved_netherwing_drakeAI(creature);
+        return new npc_enslaved_netherwing_drakeAI(creature);
     }
 
-    struct mob_enslaved_netherwing_drakeAI : public ScriptedAI
+    struct npc_enslaved_netherwing_drakeAI : public ScriptedAI
     {
-        mob_enslaved_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature)
+        npc_enslaved_netherwing_drakeAI(Creature* creature) : ScriptedAI(creature)
         {
             PlayerGUID = 0;
             Tapped = false;
@@ -327,22 +327,22 @@ public:
 };
 
 /*#####
-# mob_dragonmaw_peon
+# npc_dragonmaw_peon
 #####*/
 
-class mob_dragonmaw_peon : public CreatureScript
+class npc_dragonmaw_peon : public CreatureScript
 {
 public:
-    mob_dragonmaw_peon() : CreatureScript("mob_dragonmaw_peon") { }
+    npc_dragonmaw_peon() : CreatureScript("npc_dragonmaw_peon") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_dragonmaw_peonAI(creature);
+        return new npc_dragonmaw_peonAI(creature);
     }
 
-    struct mob_dragonmaw_peonAI : public ScriptedAI
+    struct npc_dragonmaw_peonAI : public ScriptedAI
     {
-        mob_dragonmaw_peonAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_dragonmaw_peonAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint64 PlayerGUID;
         bool Tapped;
@@ -1153,8 +1153,8 @@ public:
 
 /* ContentData
 Battle of the crimson watch - creatures, gameobjects and defines
-mob_illidari_spawn : Adds that are summoned in the Crimson Watch battle.
-mob_torloth_the_magnificent : Final Creature that players have to face before quest is completed
+npc_illidari_spawn : Adds that are summoned in the Crimson Watch battle.
+npc_torloth_the_magnificent : Final Creature that players have to face before quest is completed
 npc_lord_illidan_stormrage : Creature that controls the event.
 go_crystal_prison : GameObject that begins the event and hands out quest
 EndContentData */
@@ -1240,22 +1240,22 @@ static SpawnSpells SpawnCast[]=
 };
 
 /*######
-# mob_torloth_the_magnificent
+# npc_torloth_the_magnificent
 #####*/
 
-class mob_torloth_the_magnificent : public CreatureScript
+class npc_torloth_the_magnificent : public CreatureScript
 {
 public:
-    mob_torloth_the_magnificent() : CreatureScript("mob_torloth_the_magnificent") { }
+    npc_torloth_the_magnificent() : CreatureScript("npc_torloth_the_magnificent") { }
 
     CreatureAI* GetAI(Creature* c) const
     {
-        return new mob_torloth_the_magnificentAI(c);
+        return new npc_torloth_the_magnificentAI(c);
     }
 
-    struct mob_torloth_the_magnificentAI : public ScriptedAI
+    struct npc_torloth_the_magnificentAI : public ScriptedAI
     {
-        mob_torloth_the_magnificentAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_torloth_the_magnificentAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint32 AnimationTimer, SpellTimer1, SpellTimer2, SpellTimer3;
 
@@ -1543,22 +1543,22 @@ public:
 };
 
 /*######
-# mob_illidari_spawn
+# npc_illidari_spawn
 ######*/
 
-class mob_illidari_spawn : public CreatureScript
+class npc_illidari_spawn : public CreatureScript
 {
 public:
-    mob_illidari_spawn() : CreatureScript("mob_illidari_spawn") { }
+    npc_illidari_spawn() : CreatureScript("npc_illidari_spawn") { }
 
     CreatureAI* GetAI(Creature* c) const
     {
-        return new mob_illidari_spawnAI(c);
+        return new npc_illidari_spawnAI(c);
     }
 
-    struct mob_illidari_spawnAI : public ScriptedAI
+    struct npc_illidari_spawnAI : public ScriptedAI
     {
-        mob_illidari_spawnAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_illidari_spawnAI(Creature* creature) : ScriptedAI(creature) {}
 
         uint64 LordIllidanGUID;
         uint32 SpellTimer1, SpellTimer2, SpellTimer3;
@@ -1712,14 +1712,14 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave()
                         Spawn->GetMotionMaster()->MovePoint(0, x, y, z);
                     }
                 }
-                CAST_AI(mob_illidari_spawn::mob_illidari_spawnAI, Spawn->AI())->LordIllidanGUID = me->GetGUID();
+                CAST_AI(npc_illidari_spawn::npc_illidari_spawnAI, Spawn->AI())->LordIllidanGUID = me->GetGUID();
             }
 
             if (WavesInfo[WaveCount].CreatureId == 22076) // Torloth
             {
-                CAST_AI(mob_torloth_the_magnificent::mob_torloth_the_magnificentAI, Spawn->AI())->LordIllidanGUID = me->GetGUID();
+                CAST_AI(npc_torloth_the_magnificent::npc_torloth_the_magnificentAI, Spawn->AI())->LordIllidanGUID = me->GetGUID();
                 if (PlayerGUID)
-                    CAST_AI(mob_torloth_the_magnificent::mob_torloth_the_magnificentAI, Spawn->AI())->AggroTargetGUID = PlayerGUID;
+                    CAST_AI(npc_torloth_the_magnificent::npc_torloth_the_magnificentAI, Spawn->AI())->AggroTargetGUID = PlayerGUID;
             }
         }
     }
@@ -2000,9 +2000,9 @@ public:
 
 void AddSC_shadowmoon_valley()
 {
-    new mob_mature_netherwing_drake();
-    new mob_enslaved_netherwing_drake();
-    new mob_dragonmaw_peon();
+    new npc_mature_netherwing_drake();
+    new npc_enslaved_netherwing_drake();
+    new npc_dragonmaw_peon();
     new npc_drake_dealer_hurlunk();
     new npcs_flanis_swiftwing_and_kagrosh();
     new npc_murkblood_overseer();
@@ -2012,8 +2012,8 @@ void AddSC_shadowmoon_valley()
     new npc_earthmender_wilda();
     new npc_lord_illidan_stormrage();
     new go_crystal_prison();
-    new mob_illidari_spawn();
-    new mob_torloth_the_magnificent();
+    new npc_illidari_spawn();
+    new npc_torloth_the_magnificent();
     new npc_enraged_spirit();
     new spell_unlocking_zuluheds_chains();
     new npc_shadowmoon_tuber_node();
diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
index d463f003523..fc43dac2c5d 100644
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -24,10 +24,10 @@ SDCategory: Terokkar Forest
 EndScriptData */
 
 /* ContentData
-mob_unkor_the_ruthless
-mob_infested_root_walker
-mob_rotting_forest_rager
-mob_netherweb_victim
+npc_unkor_the_ruthless
+npc_infested_root_walker
+npc_rotting_forest_rager
+npc_netherweb_victim
 npc_floon
 npc_isla_starmane
 npc_slim
@@ -42,7 +42,7 @@ EndContentData */
 #include "WorldSession.h"
 
 /*######
-## mob_unkor_the_ruthless
+## npc_unkor_the_ruthless
 ######*/
 
 enum UnkorTheRuthless
@@ -56,19 +56,19 @@ enum UnkorTheRuthless
     SPELL_PULVERIZE                 = 2676
 };
 
-class mob_unkor_the_ruthless : public CreatureScript
+class npc_unkor_the_ruthless : public CreatureScript
 {
 public:
-    mob_unkor_the_ruthless() : CreatureScript("mob_unkor_the_ruthless") { }
+    npc_unkor_the_ruthless() : CreatureScript("npc_unkor_the_ruthless") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_unkor_the_ruthlessAI (creature);
+        return new npc_unkor_the_ruthlessAI (creature);
     }
 
-    struct mob_unkor_the_ruthlessAI : public ScriptedAI
+    struct npc_unkor_the_ruthlessAI : public ScriptedAI
     {
-        mob_unkor_the_ruthlessAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_unkor_the_ruthlessAI(Creature* creature) : ScriptedAI(creature) {}
 
         bool CanDoQuest;
         uint32 UnkorUnfriendly_Timer;
@@ -160,22 +160,22 @@ public:
 };
 
 /*######
-## mob_infested_root_walker
+## npc_infested_root_walker
 ######*/
 
-class mob_infested_root_walker : public CreatureScript
+class npc_infested_root_walker : public CreatureScript
 {
 public:
-    mob_infested_root_walker() : CreatureScript("mob_infested_root_walker") { }
+    npc_infested_root_walker() : CreatureScript("npc_infested_root_walker") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_infested_root_walkerAI (creature);
+        return new npc_infested_root_walkerAI (creature);
     }
 
-    struct mob_infested_root_walkerAI : public ScriptedAI
+    struct npc_infested_root_walkerAI : public ScriptedAI
     {
-        mob_infested_root_walkerAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_infested_root_walkerAI(Creature* creature) : ScriptedAI(creature) {}
 
         void Reset() { }
         void EnterCombat(Unit* /*who*/) { }
@@ -192,7 +192,7 @@ public:
 };
 
 /*######
-## mob_skywing
+## npc_skywing
 ######*/
 class npc_skywing : public CreatureScript
 {
@@ -246,22 +246,22 @@ public:
 };
 
 /*######
-## mob_rotting_forest_rager
+## npc_rotting_forest_rager
 ######*/
 
-class mob_rotting_forest_rager : public CreatureScript
+class npc_rotting_forest_rager : public CreatureScript
 {
 public:
-    mob_rotting_forest_rager() : CreatureScript("mob_rotting_forest_rager") { }
+    npc_rotting_forest_rager() : CreatureScript("npc_rotting_forest_rager") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_rotting_forest_ragerAI (creature);
+        return new npc_rotting_forest_ragerAI (creature);
     }
 
-    struct mob_rotting_forest_ragerAI : public ScriptedAI
+    struct npc_rotting_forest_ragerAI : public ScriptedAI
     {
-        mob_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) {}
 
         void Reset() { }
         void EnterCombat(Unit* /*who*/) { }
@@ -278,7 +278,7 @@ public:
 };
 
 /*######
-## mob_netherweb_victim
+## npc_netherweb_victim
 ######*/
 
 #define QUEST_TARGET        22459
@@ -288,19 +288,19 @@ const uint32 netherwebVictims[6] =
 {
     18470, 16805, 21242, 18452, 22482, 21285
 };
-class mob_netherweb_victim : public CreatureScript
+class npc_netherweb_victim : public CreatureScript
 {
 public:
-    mob_netherweb_victim() : CreatureScript("mob_netherweb_victim") { }
+    npc_netherweb_victim() : CreatureScript("npc_netherweb_victim") { }
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        return new mob_netherweb_victimAI (creature);
+        return new npc_netherweb_victimAI (creature);
     }
 
-    struct mob_netherweb_victimAI : public ScriptedAI
+    struct npc_netherweb_victimAI : public ScriptedAI
     {
-        mob_netherweb_victimAI(Creature* creature) : ScriptedAI(creature) {}
+        npc_netherweb_victimAI(Creature* creature) : ScriptedAI(creature) {}
 
         void Reset() { }
         void EnterCombat(Unit* /*who*/) { }
@@ -696,10 +696,10 @@ public:
 
 void AddSC_terokkar_forest()
 {
-    new mob_unkor_the_ruthless();
-    new mob_infested_root_walker();
-    new mob_rotting_forest_rager();
-    new mob_netherweb_victim();
+    new npc_unkor_the_ruthless();
+    new npc_infested_root_walker();
+    new npc_rotting_forest_rager();
+    new npc_netherweb_victim();
     new npc_floon();
     new npc_isla_starmane();
     new go_skull_pile();