diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
index 5ea113cc54..50242d1bb9 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace AuchenaiCrypts
+{
 #define ACScriptName "instance_auchenai_crypts"
 #define DataHeader   "AC"
 
@@ -37,5 +39,6 @@ inline AI* GetAuchenaiCryptsAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, ACScriptName);
 }
+}
 
 #endif // AUCHENAI_CRYPTS_H_
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 7dd82f416f..008193e773 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -33,6 +33,8 @@ EndContentData */
 #include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 
+namespace AuchenaiCrypts::ExarchMaladaar
+{
 enum Spells
 {
     SPELL_MOONFIRE              = 37328,
@@ -362,9 +364,12 @@ public:
     };
 
 };
+}
 
 void AddSC_boss_exarch_maladaar()
 {
+    using namespace AuchenaiCrypts;
+    using namespace AuchenaiCrypts::ExarchMaladaar;
     new boss_exarch_maladaar();
     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 c8dd0f21c3..05beb0e2f7 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
@@ -29,6 +29,8 @@ EndScriptData */
 #include "Player.h"
 #include "ScriptedCreature.h"
 
+namespace AuchenaiCrypts::ShirrakTheDeadWatcher
+{
 enum Spells
 {
     SPELL_INHIBITMAGIC          = 32264,
@@ -223,9 +225,12 @@ public:
     };
 
 };
+}
 
 void AddSC_boss_shirrak_the_dead_watcher()
 {
+    using namespace AuchenaiCrypts;
+    using namespace AuchenaiCrypts::ShirrakTheDeadWatcher;
     new boss_shirrak_the_dead_watcher();
     new npc_focus_fire();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
index c12df1266f..c25582001a 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
@@ -19,6 +19,8 @@
 #include "auchenai_crypts.h"
 #include "InstanceScript.h"
 
+namespace AuchenaiCrypts
+{
 class instance_auchenai_crypts : public InstanceMapScript
 {
     public:
@@ -38,8 +40,10 @@ class instance_auchenai_crypts : public InstanceMapScript
             return new instance_auchenai_crypts_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_auchenai_crypts()
 {
+    using namespace AuchenaiCrypts;
     new instance_auchenai_crypts();
 }
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 8a33f89ac5..3e9064d2b1 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -27,6 +27,8 @@ EndScriptData */
 #include "MotionMaster.h"
 #include "ScriptedCreature.h"
 
+namespace ManaTombs::NexusPrinceShaffar
+{
 enum Yells
 {
     SAY_INTRO                       = 0,
@@ -384,9 +386,12 @@ public:
         return GetManaTombsAI<npc_yorAI>(creature);
     }
 };
+}
 
 void AddSC_boss_nexusprince_shaffar()
 {
+    using namespace ManaTombs;
+    using namespace ManaTombs::NexusPrinceShaffar;
     new boss_nexusprince_shaffar();
     new npc_ethereal_beacon();
     new npc_ethereal_apprentice();
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
index 4c802d136e..dea2f1b8d2 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "mana_tombs.h"
 
+namespace ManaTombs::Pandemonius
+{
 enum Texts
 {
     SAY_AGGRO                       = 0,
@@ -118,8 +120,11 @@ public:
         return GetManaTombsAI<boss_pandemoniusAI>(creature);
     }
 };
+}
 
 void AddSC_boss_pandemonius()
 {
+    using namespace ManaTombs;
+    using namespace ManaTombs::Pandemonius;
     new boss_pandemonius();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
index 4a38814781..c16f86569a 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
@@ -19,6 +19,8 @@
 #include "InstanceScript.h"
 #include "mana_tombs.h"
 
+namespace ManaTombs
+{
 class instance_mana_tombs : public InstanceMapScript
 {
     public:
@@ -38,8 +40,10 @@ class instance_mana_tombs : public InstanceMapScript
             return new instance_mana_tombs_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_mana_tombs()
 {
+    using namespace ManaTombs;
     new instance_mana_tombs();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
index 2b6844017f..42c7bee202 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace ManaTombs
+{
 #define MTScriptName "instance_mana_tombs"
 #define DataHeader "MT"
 
@@ -39,5 +41,6 @@ inline AI* GetManaTombsAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, MTScriptName);
 }
+}
 
 #endif // MANA_TOMBS_H_
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
index 599650544d..a7f43a34eb 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
@@ -26,6 +26,8 @@ Category: Auchindoun, Sethekk Halls
 #include "ScriptedCreature.h"
 #include "sethekk_halls.h"
 
+namespace SethekkHalls::Anzu
+{
 enum Says
 {
     SAY_SUMMON_BROOD            = 0,
@@ -170,8 +172,11 @@ class boss_anzu : public CreatureScript
             return GetSethekkHallsAI<boss_anzuAI>(creature);
         }
 };
+}
 
 void AddSC_boss_anzu()
 {
+    using namespace SethekkHalls;
+    using namespace SethekkHalls::Anzu;
     new boss_anzu();
 }
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 7f34cf9491..a40b54a1a5 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
@@ -26,6 +26,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "sethekk_halls.h"
 
+namespace SethekkHalls::DearkweaverSyth
+{
 enum Says
 {
     SAY_SUMMON                  = 0,
@@ -436,9 +438,12 @@ public:
         return GetSethekkHallsAI<npc_syth_shadowAI>(creature);
     }
 };
+}
 
 void AddSC_boss_darkweaver_syth()
 {
+    using namespace SethekkHalls;
+    using namespace SethekkHalls::DearkweaverSyth;
     new boss_darkweaver_syth();
     new npc_syth_fire();
     new npc_syth_arcane();
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
index b9e2c1261a..b003e75f35 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
@@ -20,6 +20,8 @@
 #include "SpellScript.h"
 #include "sethekk_halls.h"
 
+namespace SethekkHalls::TalonKingIkiss
+{
 enum Says
 {
     SAY_INTRO                   = 0,
@@ -202,9 +204,12 @@ class spell_talon_king_ikiss_blink : public SpellScriptLoader
             return new spell_talon_king_ikiss_blink_SpellScript();
         }
 };
+}
 
 void AddSC_boss_talon_king_ikiss()
 {
+    using namespace SethekkHalls;
+    using namespace SethekkHalls::TalonKingIkiss;
     new boss_talon_king_ikiss();
     new spell_talon_king_ikiss_blink();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
index 1c75672b55..33a59796f9 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -21,6 +21,8 @@
 #include "InstanceScript.h"
 #include "sethekk_halls.h"
 
+namespace SethekkHalls
+{
 DoorData const doorData[] =
 {
     { GO_IKISS_DOOR, DATA_TALON_KING_IKISS, DOOR_TYPE_PASSAGE },
@@ -88,8 +90,10 @@ class instance_sethekk_halls : public InstanceMapScript
             return new instance_sethekk_halls_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_sethekk_halls()
 {
+    using namespace SethekkHalls;
     new instance_sethekk_halls();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
index bf64986f10..48b06ba2c0 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace SethekkHalls
+{
 #define SHScriptName "instance_sethekk_halls"
 #define DataHeader "SH"
 
@@ -53,5 +55,6 @@ inline AI* GetSethekkHallsAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, SHScriptName);
 }
+}
 
 #endif // SETHEKK_HALLS_H_
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index 246886be4d..4d16846933 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -27,6 +27,8 @@ EndScriptData */
 #include "ScriptedEscortAI.h"
 #include "shadow_labyrinth.h"
 
+namespace ShadowLabyrinth::AmbassadorHellmaw
+{
 enum Yells
 {
     SAY_INTRO       = 0,
@@ -185,8 +187,11 @@ class boss_ambassador_hellmaw : public CreatureScript
             return GetShadowLabyrinthAI<boss_ambassador_hellmawAI>(creature);
         }
 };
+}
 
 void AddSC_boss_ambassador_hellmaw()
 {
+    using namespace ShadowLabyrinth;
+    using namespace ShadowLabyrinth::AmbassadorHellmaw;
     new boss_ambassador_hellmaw();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index cab3678f7e..a7c335ef72 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -26,6 +26,8 @@
 #include "SpellScript.h"
 #include "shadow_labyrinth.h"
 
+namespace ShadowLabyrinth::BlackheartTheInciter
+{
 enum BlackheartTheInciter
 {
     SPELL_INCITE_CHAOS      = 33676,
@@ -220,9 +222,12 @@ class spell_blackheart_incite_chaos : public SpellScript
     }
 };
 const uint32 spell_blackheart_incite_chaos::INCITE_SPELLS[spell_blackheart_incite_chaos::NUM_INCITE_SPELLS] = { 33677,33680,33681,33682,33683 };
+}
 
 void AddSC_boss_blackheart_the_inciter()
 {
+    using namespace ShadowLabyrinth;
+    using namespace ShadowLabyrinth::BlackheartTheInciter;
     RegisterCreatureAIWithFactory(boss_blackheart_the_inciter, GetShadowLabyrinthAI);
     RegisterCreatureAIWithFactory(boss_blackheart_the_inciter_mc_dummy, GetShadowLabyrinthAI);
     RegisterSpellScript(spell_blackheart_incite_chaos);
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
index be66b5bb3d..a0aba3be53 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -31,6 +31,8 @@ Category: Auchindoun, Shadow Labyrinth
 #include "shadow_labyrinth.h"
 #include "TemporarySummon.h"
 
+namespace ShadowLabyrinth::GrandmasterVorpil
+{
 enum GrandmasterVorpil
 {
     SAY_INTRO                   = 0,
@@ -292,9 +294,12 @@ class npc_voidtraveler : public CreatureScript
             return GetShadowLabyrinthAI<npc_voidtravelerAI>(creature);
         }
 };
+}
 
 void AddSC_boss_grandmaster_vorpil()
 {
+    using namespace ShadowLabyrinth;
+    using namespace ShadowLabyrinth::GrandmasterVorpil;
     new boss_grandmaster_vorpil();
     new npc_voidtraveler();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index d1294b7228..049d4b56dc 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -28,6 +28,8 @@ EndScriptData */
 #include "shadow_labyrinth.h"
 #include "SpellScript.h"
 
+namespace ShadowLabyrinth::Murmur
+{
 enum Murmur
 {
     // Spell
@@ -252,9 +254,12 @@ class spell_murmur_thundering_storm : public SpellScriptLoader
             return new spell_murmur_thundering_storm_SpellScript();
         }
 };
+}
 
 void AddSC_boss_murmur()
 {
+    using namespace ShadowLabyrinth;
+    using namespace ShadowLabyrinth::Murmur;
     new boss_murmur();
     new spell_murmur_sonic_boom();
     new spell_murmur_sonic_boom_effect();
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index b83e6786f6..0a3a64e73a 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -22,6 +22,8 @@
 #include "ScriptedCreature.h"
 #include "shadow_labyrinth.h"
 
+namespace ShadowLabyrinth
+{
 DoorData const doorData[] =
 {
     { GO_REFECTORY_DOOR,        DATA_BLACKHEART_THE_INCITER,    DOOR_TYPE_PASSAGE },
@@ -186,8 +188,10 @@ GuidUnorderedSet const* GetBlackheartDummies(InstanceScript const* s)
     return nullptr;
 
 }
+}
 
 void AddSC_instance_shadow_labyrinth()
 {
+    using namespace ShadowLabyrinth;
     new instance_shadow_labyrinth();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
index 4705397512..0d47f0face 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
@@ -21,6 +21,8 @@
 #include "SpellAuraEffects.h"
 #include "Unit.h"
 
+namespace ShadowLabyrinth
+{
 enum Spells
 {
     SPELL_MARK_OF_MALICE_TRIGGERED = 33494
@@ -59,8 +61,10 @@ class spell_mark_of_malice : public SpellScriptLoader
             return new spell_mark_of_malice_AuraScript();
         }
 };
+}
 
 void AddSC_shadow_labyrinth()
 {
+    using namespace ShadowLabyrinth;
     new spell_mark_of_malice();
 }
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
index 642ee11605..95823b787f 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
@@ -21,6 +21,8 @@
 #include "CreatureAIImpl.h"
 #include "ObjectGuid.h"
 
+namespace ShadowLabyrinth
+{
 #define SLScriptName "instance_shadow_labyrinth"
 #define DataHeader "SL"
 
@@ -70,5 +72,6 @@ inline AI* GetShadowLabyrinthAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, SLScriptName);
 }
+}
 
 #endif // SHADOW_LABYRINTH_H_
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index 08aa67d952..51683241d2 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -22,6 +22,8 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
+namespace BlackTemple
+{
 enum Spells
 {
     // Wrathbone Flayer
@@ -268,9 +270,11 @@ class spell_illidari_nightlord_shadow_inferno : public AuraScript
         OnEffectPeriodic.Register(&spell_illidari_nightlord_shadow_inferno::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
     }
 };
+}
 
 void AddSC_black_temple()
 {
+    using namespace BlackTemple;
     RegisterBlackTempleCreatureAI(npc_wrathbone_flayer);
     RegisterBlackTempleCreatureAI(npc_angered_soul_fragment);
     RegisterSpellScript(spell_soul_fragment_anger);
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h
index 1150096f74..58d2032b31 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.h
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace BlackTemple
+{
 #define BTScriptName "instance_black_temple"
 #define DataHeader   "BT"
 
@@ -148,5 +150,6 @@ inline AI* GetBlackTempleAI(T* obj)
 }
 
 #define RegisterBlackTempleCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetBlackTempleAI)
+}
 
 #endif // BLACK_TEMPLE_H_
diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
index a9af2c79a2..97440cd585 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
@@ -23,6 +23,8 @@
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 
+namespace BlackTemple::GurtoggBloodboil
+{
 enum Says
 {
     SAY_AGGRO     = 0,
@@ -353,9 +355,12 @@ class spell_gurtogg_bloodboil_insignificance : public SpellScript
         OnObjectAreaTargetSelect.Register(&spell_gurtogg_bloodboil_insignificance::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
     }
 };
+}
 
 void AddSC_boss_gurtogg_bloodboil()
 {
+    using namespace BlackTemple;
+    using namespace BlackTemple::GurtoggBloodboil;
     RegisterBlackTempleCreatureAI(boss_gurtogg_bloodboil);
     RegisterBlackTempleCreatureAI(npc_fel_geyser);
     RegisterSpellScript(spell_gurtogg_bloodboil_bloodboil);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 4efc75860a..a3d6f32ab8 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -31,6 +31,8 @@
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 
+namespace BlackTemple::Illidan
+{
 enum IllidanSay
 {
     // Illidan
@@ -2313,9 +2315,12 @@ class spell_illidan_despawn_akama : public SpellScript
         OnEffectHitTarget.Register(&spell_illidan_despawn_akama::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
     }
 };
+}
 
 void AddSC_boss_illidan()
 {
+    using namespace BlackTemple;
+    using namespace BlackTemple::Illidan;
     RegisterBlackTempleCreatureAI(boss_illidan_stormrage);
     RegisterBlackTempleCreatureAI(npc_akama_illidan);
     RegisterBlackTempleCreatureAI(npc_parasitic_shadowfiend);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
index 1b49911c6b..7c8fc7773c 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
@@ -25,6 +25,8 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
+namespace BlackTemple::IllidariCouncil
+{
 enum Says
 {
     SAY_COUNCIL_AGRO     = 0,
@@ -773,9 +775,12 @@ class spell_illidari_dampen_magic : public AuraScript
         OnEffectRemove.Register(&spell_illidari_dampen_magic::OnRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL);
     }
 };
+}
 
 void AddSC_boss_illidari_council()
 {
+    using namespace BlackTemple;
+    using namespace BlackTemple::IllidariCouncil;
     RegisterBlackTempleCreatureAI(boss_illidari_council);
     RegisterBlackTempleCreatureAI(boss_gathios_the_shatterer);
     RegisterBlackTempleCreatureAI(boss_lady_malande);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index 5513be3702..7d549017dd 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -23,6 +23,8 @@
 #include "SpellAuraEffects.h"
 #include "GridNotifiers.h"
 
+namespace BlackTemple::MotherShahraz
+{
 enum Texts
 {
     SAY_TAUNT     = 0,
@@ -306,9 +308,12 @@ class spell_mother_shahraz_random_periodic : public AuraScript
         OnEffectPeriodic.Register(&spell_mother_shahraz_random_periodic::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
     }
 };
+}
 
 void AddSC_boss_mother_shahraz()
 {
+    using namespace BlackTemple;
+    using namespace BlackTemple::MotherShahraz;
     RegisterBlackTempleCreatureAI(boss_mother_shahraz);
     RegisterSpellScript(spell_mother_shahraz_fatal_attraction);
     RegisterSpellScript(spell_mother_shahraz_fatal_attraction_link);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index 91a2f02902..f2f7780f5a 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -25,6 +25,8 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
+namespace BlackTemple::ReliquaryOfSouls
+{
 enum Says
 {
     // Essence of Suffering
@@ -798,9 +800,12 @@ class spell_reliquary_of_souls_frenzy : public SpellScript
         AfterCast.Register(&spell_reliquary_of_souls_frenzy::HandleAfterCast);
     }
 };
+}
 
 void AddSC_boss_reliquary_of_souls()
 {
+    using namespace BlackTemple;
+    using namespace BlackTemple::ReliquaryOfSouls;
     RegisterBlackTempleCreatureAI(boss_reliquary_of_souls);
     RegisterBlackTempleCreatureAI(boss_essence_of_suffering);
     RegisterBlackTempleCreatureAI(boss_essence_of_desire);
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 7a2b0cef46..8cc142df86 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -29,6 +29,8 @@
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 
+namespace BlackTemple::ShadeOfAkama
+{
 enum Says
 {
     // Akama
@@ -1116,9 +1118,12 @@ class spell_shade_soul_channel : public AuraScript
         AfterEffectApply.Register(&spell_shade_soul_channel::OnApply, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
     }
 };
+}
 
 void AddSC_boss_shade_of_akama()
 {
+    using namespace BlackTemple;
+    using namespace BlackTemple::ShadeOfAkama;
     RegisterBlackTempleCreatureAI(boss_shade_of_akama);
     RegisterBlackTempleCreatureAI(npc_akama_shade);
     RegisterBlackTempleCreatureAI(npc_ashtongue_channeler);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
index 630b08f740..848a54bd31 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
@@ -22,6 +22,8 @@
 #include "PassiveAI.h"
 #include "ScriptedCreature.h"
 
+namespace BlackTemple::Supremus
+{
 enum Texts
 {
     EMOTE_NEW_TARGET          = 0,
@@ -218,9 +220,12 @@ struct npc_volcano : public NullCreatureAI
 private:
     TaskScheduler _scheduler;
 };
+}
 
 void AddSC_boss_supremus()
 {
+    using namespace BlackTemple;
+    using namespace BlackTemple::Supremus;
     RegisterBlackTempleCreatureAI(boss_supremus);
     RegisterBlackTempleCreatureAI(npc_molten_flame);
     RegisterBlackTempleCreatureAI(npc_volcano);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 0b59a52da4..c0d88aefa5 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -26,6 +26,8 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
+namespace BlackTemple::TeronGorefiend
+{
 enum Says
 {
     SAY_INTRO      = 0,
@@ -434,9 +436,12 @@ public:
         return true;
     }
 };
+}
 
 void AddSC_boss_teron_gorefiend()
 {
+    using namespace BlackTemple;
+    using namespace BlackTemple::TeronGorefiend;
     RegisterBlackTempleCreatureAI(boss_teron_gorefiend);
     RegisterBlackTempleCreatureAI(npc_doom_blossom);
     RegisterBlackTempleCreatureAI(npc_shadowy_construct);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index aa1cd5fa17..521f43a2bb 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -26,6 +26,8 @@
 #include "SpellInfo.h"
 #include "SpellScript.h"
 
+namespace BlackTemple::WarlordNajentus
+{
 enum Texts
 {
     SAY_AGGRO   = 0,
@@ -223,9 +225,12 @@ class spell_najentus_needle_spine : public SpellScript
         OnEffectHitTarget.Register(&spell_najentus_needle_spine::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
     }
 };
+}
 
 void AddSC_boss_najentus()
 {
+    using namespace BlackTemple;
+    using namespace BlackTemple::WarlordNajentus;
     RegisterBlackTempleCreatureAI(boss_najentus);
     RegisterGameObjectAI(go_najentus_spine);
     RegisterSpellScript(spell_najentus_needle_spine);
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index c69478a51f..a6d102ed00 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -24,6 +24,8 @@
 #include "InstanceScript.h"
 #include "Map.h"
 
+namespace BlackTemple
+{
 DoorData const doorData[] =
 {
     { GO_NAJENTUS_GATE,         DATA_HIGH_WARLORD_NAJENTUS, DOOR_TYPE_PASSAGE },
@@ -237,8 +239,10 @@ class instance_black_temple : public InstanceMapScript
             return new instance_black_temple_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_black_temple()
 {
+    using namespace BlackTemple;
     new instance_black_temple();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index e5d69c2699..f699ef8b27 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -30,6 +30,8 @@ EndScriptData */
 #include "serpent_shrine.h"
 #include "TemporarySummon.h"
 
+namespace SerpentShrine::FathomlordKarathress
+{
 enum FathomlordKarathress
 {
     SAY_AGGRO                       = 0,
@@ -713,9 +715,12 @@ public:
         }
     };
 };
+}
 
 void AddSC_boss_fathomlord_karathress()
 {
+    using namespace SerpentShrine;
+    using namespace SerpentShrine::FathomlordKarathress;
     new boss_fathomlord_karathress();
     new boss_fathomguard_sharkkis();
     new boss_fathomguard_tidalvess();
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index 2d8db67511..7c7048db9c 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -29,6 +29,8 @@ EndScriptData */
 #include "serpent_shrine.h"
 #include "TemporarySummon.h"
 
+namespace SerpentShrine::HydrossTheUnstable
+{
 enum HydrossTheUnstable
 {
     SAY_AGGRO                   = 0,
@@ -404,8 +406,11 @@ public:
         }
     };
 };
+}
 
 void AddSC_boss_hydross_the_unstable()
 {
+    using namespace SerpentShrine;
+    using namespace SerpentShrine::HydrossTheUnstable;
     new boss_hydross_the_unstable();
 }
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 2fdb7be3f6..1394eec26b 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -35,6 +35,8 @@ EndScriptData */
 #include "TemporarySummon.h"
 #include "WorldSession.h"
 
+namespace SerpentShrine::LadyVashj
+{
 enum LadyVashj
 {
     SAY_INTRO                   = 0,
@@ -955,9 +957,12 @@ public:
     }
 
 };
+}
 
 void AddSC_boss_lady_vashj()
 {
+    using namespace SerpentShrine;
+    using namespace SerpentShrine::LadyVashj;
     new boss_lady_vashj();
     new npc_enchanted_elemental();
     new npc_tainted_elemental();
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 f02299b6da..5993969565 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
@@ -32,6 +32,8 @@ EndScriptData */
 #include "serpent_shrine.h"
 #include "TemporarySummon.h"
 
+namespace SerpentShrine::LeotherasTheBlind
+{
 enum LeotherasTheBlind
 {
     // Spells used by Leotheras The Blind
@@ -810,9 +812,12 @@ public:
         void JustDied(Unit* /*killer*/) override { }
     };
 };
+}
 
 void AddSC_boss_leotheras_the_blind()
 {
+    using namespace SerpentShrine;
+    using namespace SerpentShrine::LeotherasTheBlind;
     new boss_leotheras_the_blind();
     new boss_leotheras_the_blind_demonform();
     new npc_greyheart_spellbinder();
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 68e614a111..17fe7c5af8 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -34,6 +34,8 @@ EndScriptData */
 #include "Spell.h"
 #include "TemporarySummon.h"
 
+namespace SerpentShrine::LurkerBelow
+{
 enum Spells
 {
     SPELL_SPOUT             = 37433,
@@ -481,9 +483,12 @@ class go_strange_pool : public GameObjectScript
             return GetSerpentshrineCavernAI<go_strange_poolAI>(go);
         }
 };
+}
 
 void AddSC_boss_the_lurker_below()
 {
+    using namespace SerpentShrine;
+    using namespace SerpentShrine::LurkerBelow;
     new boss_the_lurker_below();
     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 a0decdef06..7084a6b493 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -29,6 +29,8 @@ EndScriptData */
 #include "serpent_shrine.h"
 #include "TemporarySummon.h"
 
+namespace SerpentShrine::MorogrimTidewalker
+{
 enum Yells
 {
     // Yell
@@ -364,9 +366,12 @@ public:
     };
 
 };
+}
 
 void AddSC_boss_morogrim_tidewalker()
 {
+    using namespace SerpentShrine;
+    using namespace SerpentShrine::MorogrimTidewalker;
     new boss_morogrim_tidewalker();
     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 a71e469d77..e9c477bd07 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -32,6 +32,8 @@ EndScriptData */
 #include "serpent_shrine.h"
 #include "TemporarySummon.h"
 
+namespace SerpentShrine
+{
 #define MAX_ENCOUNTER 6
 
 enum Misc
@@ -445,9 +447,11 @@ class instance_serpent_shrine : public InstanceMapScript
             return new instance_serpentshrine_cavern_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_serpentshrine_cavern()
 {
+    using namespace SerpentShrine;
     new instance_serpent_shrine();
     new go_bridge_console();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
index b7ad1f7351..e1f0d7f0e5 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace SerpentShrine
+{
 #define SSCScriptName "instance_serpent_shrine"
 #define DataHeader "SS"
 
@@ -64,5 +66,6 @@ inline AI* GetSerpentshrineCavernAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, SSCScriptName);
 }
+}
 
 #endif
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 027518c0a6..1e9e1abfa0 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "steam_vault.h"
 
+namespace SteamVault::HydromancerThespia
+{
 enum Yells
 {
     SAY_SUMMON                  = 0,
@@ -178,9 +180,12 @@ class npc_coilfang_waterelemental : public CreatureScript
             return GetSteamVaultAI<npc_coilfang_waterelementalAI>(creature);
         }
 };
+}
 
 void AddSC_boss_hydromancer_thespia()
 {
+    using namespace SteamVault;
+    using namespace SteamVault::HydromancerThespia;
     new boss_hydromancer_thespia();
     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 a0e63dcb9d..0c3229b4f8 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -28,6 +28,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "steam_vault.h"
 
+namespace SteamVault::MekgineerSteamrigger
+{
 enum Yells
 {
     SAY_MECHANICS               = 0,
@@ -271,9 +273,12 @@ public:
     };
 
 };
+}
 
 void AddSC_boss_mekgineer_steamrigger()
 {
+    using namespace SteamVault;
+    using namespace SteamVault::MekgineerSteamrigger;
     new boss_mekgineer_steamrigger();
     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 9aa46b0cc6..badc676926 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -28,6 +28,8 @@ EndScriptData */
 #include "SpellInfo.h"
 #include "steam_vault.h"
 
+namespace SteamVault::WarlordKalithresh
+{ 
 enum NagaDistiller
 {
     SAY_INTRO                   = 0,
@@ -200,9 +202,12 @@ public:
         }
     };
 };
+}
 
 void AddSC_boss_warlord_kalithresh()
 {
+    using namespace SteamVault;
+    using namespace SteamVault::WarlordKalithresh;
     new npc_naga_distiller();
     new boss_warlord_kalithresh();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index 43635e9a1e..0013ba3c48 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -23,6 +23,8 @@
 #include "Log.h"
 #include "steam_vault.h"
 
+namespace SteamVault
+{
 class go_main_chambers_access_panel : public GameObjectScript
 {
     public:
@@ -190,9 +192,11 @@ class instance_steam_vault : public InstanceMapScript
             return new instance_steam_vault_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_steam_vault()
 {
+    using namespace SteamVault;
     new go_main_chambers_access_panel();
     new instance_steam_vault();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
index b153df14d6..ebdb71150d 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace SteamVault
+{
 #define SteamVaultScriptName "instance_steam_vault"
 #define DataHeader "SV"
 
@@ -56,5 +58,5 @@ inline AI* GetSteamVaultAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, SteamVaultScriptName);
 }
-
+}
 #endif
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
index 3d30b918d8..11ce59acd1 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
@@ -33,6 +33,8 @@
 #include "TemporarySummon.h"
 #include "the_slave_pens.h"
 
+namespace TheSlavePens::Ahune
+{
 enum Spells
 {
     // Ahune
@@ -1012,9 +1014,12 @@ public:
         return new spell_ice_bombardment_dest_picker_SpellScript();
     }
 };
+}
 
 void AddSC_boss_ahune()
 {
+    using namespace TheSlavePens;
+    using namespace TheSlavePens::Ahune;
     new boss_ahune();
     new npc_frozen_core();
     new npc_earthen_ring_flamecaller();
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
index a61f2d9deb..dee3167573 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
@@ -26,6 +26,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "the_slave_pens.h"
 
+namespace TheSlavePens::MennuTheBetrayer
+{
 enum Say
 {
     SAY_AGGRO                       = 0,
@@ -137,8 +139,11 @@ class boss_mennu_the_betrayer : public CreatureScript
             return GetSlavePensAI<boss_mennu_the_betrayerAI>(creature);
         }
 };
+}
 
 void AddSC_boss_mennu_the_betrayer()
 {
+    using namespace TheSlavePens;
+    using namespace TheSlavePens::MennuTheBetrayer;
     new boss_mennu_the_betrayer();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
index c8dac8cdfa..54f92168ae 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
@@ -26,6 +26,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "the_slave_pens.h"
 
+namespace TheSlavePens::Quagmirran
+{
 enum Spells
 {
     SPELL_ACID_SPRAY                = 38153,
@@ -120,8 +122,11 @@ class boss_quagmirran : public CreatureScript
             return GetSlavePensAI<boss_quagmirranAI>(creature);
         }
 };
+}
 
 void AddSC_boss_quagmirran()
 {
+    using namespace TheSlavePens;
+    using namespace TheSlavePens::Quagmirran;
     new boss_quagmirran();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
index 7e9b854238..b485f5780b 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
@@ -26,6 +26,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "the_slave_pens.h"
 
+namespace TheSlavePens::RokmarTheCrackler
+{
 enum Spells
 {
     SPELL_GRIEVOUS_WOUND            = 31956,
@@ -131,8 +133,11 @@ class boss_rokmar_the_crackler : public CreatureScript
             return GetSlavePensAI<boss_rokmar_the_cracklerAI>(creature);
         }
 };
+}
 
 void AddSC_boss_rokmar_the_crackler()
 {
+    using namespace TheSlavePens;
+    using namespace TheSlavePens::RokmarTheCrackler;
     new boss_rokmar_the_crackler();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
index 3666229ed7..186ed9dc44 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
@@ -27,6 +27,8 @@ gets instead the deserter debuff.
 #include "InstanceScript.h"
 #include "the_slave_pens.h"
 
+namespace TheSlavePens
+{
 class instance_the_slave_pens : public InstanceMapScript
 {
 public:
@@ -152,8 +154,9 @@ public:
         return new instance_the_slave_pens_InstanceMapScript(map);
     }
 };
-
+}
 void AddSC_instance_the_slave_pens()
 {
+    using namespace TheSlavePens;
     new instance_the_slave_pens();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
index 0f0e877425..fb0b88faa9 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace TheSlavePens
+{
 uint32 const EncounterCount               = 3;
 
 #define SPScriptName "instance_the_slave_pens"
@@ -73,5 +75,5 @@ inline AI* GetSlavePensAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, SPScriptName);
 }
-
+}
 #endif // SLAVE_PENS_H
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
index fdd5c88963..f8c37b2899 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
@@ -26,6 +26,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "the_underbog.h"
 
+namespace TheUnderbog::Hungarfen
+{
 enum Spells
 {
     SPELL_FOUL_SPORES           = 31673,
@@ -173,9 +175,12 @@ public:
     };
 
 };
+}
 
 void AddSC_boss_hungarfen()
 {
+    using namespace TheUnderbog;
+    using namespace TheUnderbog::Hungarfen;
     new boss_hungarfen();
     new npc_underbog_mushroom();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
index 3baf3fae1e..4681e978f1 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
@@ -27,6 +27,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "the_underbog.h"
 
+namespace TheUnderbog::TheBlackStalker
+{
 enum Spells
 {
     SPELL_LEVITATE              = 31704,
@@ -194,8 +196,11 @@ public:
     };
 
 };
+}
 
 void AddSC_boss_the_black_stalker()
 {
+    using namespace TheUnderbog;
+    using namespace TheUnderbog::TheBlackStalker;
     new boss_the_black_stalker();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp
index 805846bc81..14cdac6870 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp
@@ -26,6 +26,8 @@ gets instead the deserter debuff.
 #include "InstanceScript.h"
 #include "the_underbog.h"
 
+namespace TheUnderbog
+{
 class instance_the_underbog : public InstanceMapScript
 {
 public:
@@ -41,8 +43,10 @@ public:
         instance_the_underbog_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { }
     };
 };
+}
 
 void AddSC_instance_the_underbog()
 {
+    using namespace TheUnderbog;
     new instance_the_underbog();
 }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/the_underbog.h b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/the_underbog.h
index a671d1c5fd..e6ade19717 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/the_underbog.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/the_underbog.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace TheUnderbog
+{
 #define TheUndebogScriptName "instance_the_underbog"
 
 template <class AI, class T>
@@ -27,5 +29,6 @@ inline AI* GetTheUnderbogAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, TheUndebogScriptName);
 }
+}
 
 #endif // the_underbog_h__
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index 61915b8b8c..78903c01da 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -29,6 +29,8 @@ EndScriptData */
 #include "SpellInfo.h"
 #include "SpellScript.h"
 
+namespace GruulsLair::Gruul
+{
 enum Yells
 {
     SAY_AGGRO                   = 0,
@@ -330,9 +332,12 @@ class spell_gruul_shatter_effect : public SpellScriptLoader
             return new spell_gruul_shatter_effect_SpellScript();
         }
 };
+}
 
 void AddSC_boss_gruul()
 {
+    using namespace GruulsLair;
+    using namespace GruulsLair::Gruul;
     new boss_gruul();
     new spell_gruul_shatter();
     new spell_gruul_shatter_effect();
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index 717c7693c7..60a380d701 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -29,6 +29,8 @@ EndScriptData */
 #include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 
+namespace GruulsLair::HighKingMaulgar
+{
 enum HighKingMaulgar
 {
     SAY_AGGRO                   = 0,
@@ -577,9 +579,12 @@ public:
         return GetGruulsLairAI<boss_krosh_firehandAI>(creature);
     }
 };
+}
 
 void AddSC_boss_high_king_maulgar()
 {
+    using namespace GruulsLair;
+    using namespace GruulsLair::HighKingMaulgar;
     new boss_high_king_maulgar();
     new boss_kiggler_the_crazed();
     new boss_blindeye_the_seer();
diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
index c7939dadc7..6c5cb4ebfb 100644
--- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
+++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace GruulsLair
+{
 #define GLScriptName "instance_gruuls_lair"
 #define DataHeader   "GL"
 
@@ -52,5 +54,5 @@ inline AI* GetGruulsLairAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, GLScriptName);
 }
-
+}
 #endif // GRUULS_LAIR_H_
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index 0851d2bff4..b9532c067c 100644
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -20,6 +20,8 @@
 #include "gruuls_lair.h"
 #include "InstanceScript.h"
 
+namespace GruulsLair
+{
 DoorData const doorData[] =
 {
     { GO_MAULGAR_DOOR,  DATA_MAULGAR,   DOOR_TYPE_PASSAGE },
@@ -86,8 +88,10 @@ class instance_gruuls_lair : public InstanceMapScript
             return new instance_gruuls_lair_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_gruuls_lair()
 {
+    using namespace GruulsLair;
     new instance_gruuls_lair();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
index 63c4bef65f..bcae0653f1 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace BloodFurnace
+{
 #define BFScriptName "instance_blood_furnace"
 #define DataHeader   "BF"
 
@@ -87,5 +89,6 @@ inline AI* GetBloodFurnaceAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, BFScriptName);
 }
+}
 
 #endif // BLOOD_FURNACE_H_
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index 8ecd2ecc92..3492d640a3 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -25,6 +25,8 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
+namespace BloodFurnace::Broggok
+{
 enum Yells
 {
     SAY_AGGRO                   = 0
@@ -194,9 +196,12 @@ class spell_broggok_poison_cloud : public SpellScriptLoader
             return new spell_broggok_poison_cloud_AuraScript();
         }
 };
+}
 
 void AddSC_boss_broggok()
 {
+    using namespace BloodFurnace;
+    using namespace BloodFurnace::Broggok;
     new boss_broggok();
     new go_broggok_lever();
     new spell_broggok_poison_cloud();
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 388a0cc386..2c4bce08fe 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
@@ -22,6 +22,8 @@
 #include "SpellAuras.h"
 #include "TemporarySummon.h"
 
+namespace BloodFurnace::KelidanTheBreaker
+{
 enum Kelidan
 {
     SAY_WAKE                    = 0,
@@ -367,9 +369,12 @@ class npc_shadowmoon_channeler : public CreatureScript
             return GetBloodFurnaceAI<npc_shadowmoon_channelerAI>(creature);
         }
 };
+}
 
 void AddSC_boss_kelidan_the_breaker()
 {
+    using namespace BloodFurnace;
+    using namespace BloodFurnace::KelidanTheBreaker;
     new boss_kelidan_the_breaker();
     new npc_shadowmoon_channeler();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
index 825482293c..885f07b9c2 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "blood_furnace.h"
 
+namespace BloodFurnace::TheMaker
+{
 enum Yells
 {
     SAY_AGGRO                   = 0,
@@ -107,8 +109,11 @@ class boss_the_maker : public CreatureScript
             return GetBloodFurnaceAI<boss_the_makerAI>(creature);
         }
 };
+}
 
 void AddSC_boss_the_maker()
 {
+    using namespace BloodFurnace;
+    using namespace BloodFurnace::TheMaker;
     new boss_the_maker();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index 97d113dd3b..169f4d637f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -22,6 +22,8 @@
 #include "Map.h"
 #include "ScriptedCreature.h"
 
+namespace BloodFurnace
+{
 DoorData const doorData[] =
 {
     { GO_PRISON_DOOR_01, DATA_KELIDAN_THE_BREAKER, DOOR_TYPE_PASSAGE },
@@ -317,8 +319,10 @@ class instance_blood_furnace : public InstanceMapScript
             return new instance_blood_furnace_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_blood_furnace()
 {
+    using namespace BloodFurnace;
     new instance_blood_furnace();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index 72cf62671e..8a33876758 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -28,6 +28,8 @@ EndScriptData */
 #include "Player.h"
 #include "ScriptedCreature.h"
 
+namespace HellfireRamparts::OmorTheUnscarred
+{
 enum Says
 {
     SAY_AGGRO                    = 0,
@@ -233,8 +235,11 @@ class boss_omor_the_unscarred : public CreatureScript
             return GetHellfireRampartsAI<boss_omor_the_unscarredAI>(creature);
         }
 };
+}
 
 void AddSC_boss_omor_the_unscarred()
 {
+    using namespace HellfireRamparts;
+    using namespace HellfireRamparts::OmorTheUnscarred;
     new boss_omor_the_unscarred();
 }
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 bd7b657980..efb704f12f 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
@@ -30,6 +30,8 @@ EndScriptData */
 #include "SpellInfo.h"
 #include "TemporarySummon.h"
 
+namespace HellfireRamparts::VazrudenTheHerald
+{
 enum Says
 {
     SAY_INTRO                     = 0,
@@ -519,8 +521,12 @@ class npc_hellfire_sentry : public CreatureScript
             return GetHellfireRampartsAI<npc_hellfire_sentryAI>(creature);
         }
 };
+}
+
 void AddSC_boss_vazruden_the_herald()
 {
+    using namespace HellfireRamparts;
+    using namespace HellfireRamparts::VazrudenTheHerald;
     new boss_vazruden_the_herald();
     new boss_vazruden();
     new boss_nazan();
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index 85020e64ac..72f27144d8 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -26,6 +26,8 @@ EndScriptData */
 #include "hellfire_ramparts.h"
 #include "ScriptedCreature.h"
 
+namespace HellfireRamparts::WatchkeeperGargolmar
+{
 enum Says
 {
     SAY_TAUNT              = 0,
@@ -177,8 +179,11 @@ class boss_watchkeeper_gargolmar : public CreatureScript
             return GetHellfireRampartsAI<boss_watchkeeper_gargolmarAI>(creature);
         }
 };
+}
 
 void AddSC_boss_watchkeeper_gargolmar()
 {
+    using namespace HellfireRamparts;
+    using namespace HellfireRamparts::WatchkeeperGargolmar;
     new boss_watchkeeper_gargolmar();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
index f3115b745c..3a3540106a 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace HellfireRamparts
+{
 #define HRScriptName "instance_ramparts"
 #define DataHeader "HR"
 
@@ -53,5 +55,6 @@ inline AI* GetHellfireRampartsAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, HRScriptName);
 }
+}
 
 #endif
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index eddf4d2bff..69c996804b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -28,6 +28,8 @@ EndScriptData */
 #include "InstanceScript.h"
 #include "Map.h"
 
+namespace HellfireRamparts
+{
 class instance_ramparts : public InstanceMapScript
 {
     public:
@@ -80,8 +82,10 @@ class instance_ramparts : public InstanceMapScript
             return new instance_ramparts_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_ramparts()
 {
+    using namespace HellfireRamparts;
     new instance_ramparts;
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index e3de302daf..a125efd609 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -26,6 +26,8 @@
 #include "SpellInfo.h"
 #include "SpellScript.h"
 
+namespace MagtheridonsLair::Magtheridon
+{
 enum Yells
 {
     SAY_TAUNT           = 0,
@@ -594,9 +596,12 @@ class spell_magtheridon_shadow_grasp_visual : public SpellScriptLoader
             return new spell_magtheridon_shadow_grasp_visual_AuraScript();
         }
 };
+}
 
 void AddSC_boss_magtheridon()
 {
+    using namespace MagtheridonsLair;
+    using namespace MagtheridonsLair::Magtheridon;
     new boss_magtheridon();
     new npc_hellfire_channeler();
     new npc_magtheridon_room();
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index ee5440dfef..b90ddadc98 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -24,6 +24,8 @@
 #include "magtheridons_lair.h"
 #include "Map.h"
 
+namespace MagtheridonsLair
+{
 BossBoundaryData const boundaries =
 {
     { DATA_MAGTHERIDON, new CircleBoundary(Position(-18.70f, 2.24f), 52.30) }
@@ -141,8 +143,10 @@ class instance_magtheridons_lair : public InstanceMapScript
             return new instance_magtheridons_lair_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_magtheridons_lair()
 {
+    using namespace MagtheridonsLair;
     new instance_magtheridons_lair();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
index cd0b441fad..64e3bfc55f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace MagtheridonsLair
+{
 #define MLScriptName "instance_magtheridons_lair"
 #define DataHeader "ML"
 
@@ -79,5 +81,6 @@ inline AI* GetMagtheridonsLairAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, MLScriptName);
 }
+}
 
 #endif
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index f8578fb825..64144d2294 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -34,6 +34,8 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "shattered_halls.h"
 
+namespace ShatteredHalls::Nethekurse
+{
 enum Says
 {
     SAY_INTRO          = 0,
@@ -396,9 +398,12 @@ class npc_lesser_shadow_fissure : public CreatureScript
             return GetShatteredHallsAI<npc_lesser_shadow_fissureAI>(creature);
         }
 };
+}
 
 void AddSC_boss_grand_warlock_nethekurse()
 {
+    using namespace ShatteredHalls;
+    using namespace ShatteredHalls::Nethekurse;
     new boss_grand_warlock_nethekurse();
     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 7ff3363c94..cedc8b25f1 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -33,6 +33,8 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "shattered_halls.h"
 
+namespace ShatteredHalls::WarbringerOmrogg
+{
 enum Yells
 {
     YELL_DIE_L                  = 0,
@@ -447,9 +449,12 @@ class npc_omrogg_heads : public CreatureScript
             return GetShatteredHallsAI<npc_omrogg_headsAI>(creature);
         }
 };
+}
 
 void AddSC_boss_warbringer_omrogg()
 {
+    using namespace ShatteredHalls;
+    using namespace ShatteredHalls::WarbringerOmrogg;
     new boss_warbringer_omrogg();
     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 cf1976e1a5..b8e7b366c1 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
@@ -33,6 +33,8 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "shattered_halls.h"
 
+namespace ShatteredHalls::WarchiefKargathBladefist
+{
 enum Says
 {
     SAY_AGGRO                      = 0,
@@ -336,8 +338,11 @@ class boss_warchief_kargath_bladefist : public CreatureScript
             return GetShatteredHallsAI<boss_warchief_kargath_bladefistAI>(creature);
         }
 };
+}
 
 void AddSC_boss_warchief_kargath_bladefist()
 {
+    using namespace ShatteredHalls;
+    using namespace ShatteredHalls::WarchiefKargathBladefist;
     new boss_warchief_kargath_bladefist();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index 4cadbc64eb..e877737f22 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -32,6 +32,8 @@ EndScriptData */
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 
+namespace ShatteredHalls
+{
 DoorData const doorData[] =
 {
     { GO_GRAND_WARLOCK_CHAMBER_DOOR_1, DATA_NETHEKURSE, DOOR_TYPE_PASSAGE },
@@ -278,8 +280,10 @@ class instance_shattered_halls : public InstanceMapScript
             uint32 _team;
         };
 };
+}
 
 void AddSC_instance_shattered_halls()
 {
+    using namespace ShatteredHalls;
     new instance_shattered_halls();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
index 0d2c99b9c8..4e16763f55 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
@@ -25,6 +25,8 @@
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 
+namespace ShatteredHalls
+{
 class at_nethekurse_exit : public AreaTriggerScript
 {
     public:
@@ -245,9 +247,11 @@ class spell_remove_kargath_executioner : public SpellScriptLoader
             return new spell_remove_kargath_executioner_SpellScript();
         }
 };
+}
 
 void AddSC_shattered_halls()
 {
+    using namespace ShatteredHalls;
     new at_nethekurse_exit();
     new boss_shattered_executioner();
     new spell_kargath_executioner();
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
index c472a01973..2a55443497 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace ShatteredHalls
+{
 #define SHScriptName "instance_shattered_halls"
 #define DataHeader "SH"
 
@@ -117,5 +119,6 @@ inline AI* GetShatteredHallsAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, SHScriptName);
 }
+}
 
 #endif