diff --git a/src/servers/Scripts/CMakeLists.txt b/src/servers/Scripts/CMakeLists.txt
index a80e7821..06ea6827 100644
--- a/src/servers/Scripts/CMakeLists.txt
+++ b/src/servers/Scripts/CMakeLists.txt
@@ -31,7 +31,7 @@ foreach(_scriptDir ${children})
                     set(ScriptIncludes "#include \"${_script}\"")
                 endif()
 
-                set(ScriptNames "${ScriptNames}   static_cast< ScriptObject* >( new ${_scriptname} ),\n")
+                set(ScriptNames "${ScriptNames}   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ${_scriptname} ),\n")
             endif()
         endforeach()
 
diff --git a/src/servers/Scripts/ScriptLoader.cpp.in b/src/servers/Scripts/ScriptLoader.cpp.in
index 739b32af..c68d5f5d 100644
--- a/src/servers/Scripts/ScriptLoader.cpp.in
+++ b/src/servers/Scripts/ScriptLoader.cpp.in
@@ -2,13 +2,13 @@
 
 @ScriptIncludes@
 
-const ScriptObject* ptrs[] =
+const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
 {
 @ScriptNames@
    nullptr
 };
 
-extern "C" EXPORT const ScriptObject** getScripts()
+extern "C" EXPORT const Sapphire::ScriptAPI::ScriptObject** getScripts()
 {
    return ptrs;
 }
diff --git a/src/servers/Scripts/action/ActionReturn6.cpp b/src/servers/Scripts/action/ActionReturn6.cpp
index 09169014..82580430 100644
--- a/src/servers/Scripts/action/ActionReturn6.cpp
+++ b/src/servers/Scripts/action/ActionReturn6.cpp
@@ -3,11 +3,11 @@
 #include <Actor/Player.h>
 
 class ActionReturn6 :
-  public ActionScript
+  public Sapphire::ScriptAPI::ActionScript
 {
 public:
   ActionReturn6() :
-    ActionScript( 6 )
+    Sapphire::ScriptAPI::ActionScript( 6 )
   {
   }
 
diff --git a/src/servers/Scripts/action/ActionSprint3.cpp b/src/servers/Scripts/action/ActionSprint3.cpp
index b44746ae..31767e03 100644
--- a/src/servers/Scripts/action/ActionSprint3.cpp
+++ b/src/servers/Scripts/action/ActionSprint3.cpp
@@ -2,11 +2,11 @@
 #include <Actor/Player.h>
 
 class ActionSprint3 :
-  public ActionScript
+  public Sapphire::ScriptAPI::ActionScript
 {
 public:
   ActionSprint3() :
-    ActionScript( 3 )
+    Sapphire::ScriptAPI::ActionScript( 3 )
   {
   }
 
diff --git a/src/servers/Scripts/common/Aethernet.cpp b/src/servers/Scripts/common/Aethernet.cpp
index 68903bce..c813f2b5 100644
--- a/src/servers/Scripts/common/Aethernet.cpp
+++ b/src/servers/Scripts/common/Aethernet.cpp
@@ -13,11 +13,11 @@
 using namespace Core;
 
 class Aethernet :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   Aethernet() :
-    EventScript( EVENTSCRIPT_AETHERNET_ID )
+    Sapphire::ScriptAPI::EventScript( EVENTSCRIPT_AETHERNET_ID )
   {
   }
 
diff --git a/src/servers/Scripts/common/Aetheryte.cpp b/src/servers/Scripts/common/Aetheryte.cpp
index e7b9df75..c8f602eb 100644
--- a/src/servers/Scripts/common/Aetheryte.cpp
+++ b/src/servers/Scripts/common/Aetheryte.cpp
@@ -15,11 +15,11 @@
 using namespace Core;
 
 class Aetheryte :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   Aetheryte() :
-    EventScript( EVENTSCRIPT_AETHERYTE_ID )
+    Sapphire::ScriptAPI::EventScript( EVENTSCRIPT_AETHERYTE_ID )
   {
   }
 
diff --git a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
index 460add24..51d94663 100644
--- a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
+++ b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefCutSceneReplay :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefCutSceneReplay() :
-    EventScript( 721028 )
+    Sapphire::ScriptAPI::EventScript( 721028 )
   {
   }
 
diff --git a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp
index 43e01820..b107ec66 100644
--- a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp
+++ b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp
@@ -11,10 +11,10 @@ using namespace Network;
 using namespace Packets;
 using namespace Server;
 
-class CmnDefHousingSignboard : public EventScript
+class CmnDefHousingSignboard : public Sapphire::ScriptAPI::EventScript
 {
 public:
-  CmnDefHousingSignboard() : EventScript( 721031 )
+  CmnDefHousingSignboard() : Sapphire::ScriptAPI::EventScript( 721031 )
   {
   }
 
diff --git a/src/servers/Scripts/common/CmnDefInnBed.cpp b/src/servers/Scripts/common/CmnDefInnBed.cpp
index bb9c262b..4d89e93e 100644
--- a/src/servers/Scripts/common/CmnDefInnBed.cpp
+++ b/src/servers/Scripts/common/CmnDefInnBed.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefInnBed :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefInnBed() :
-    EventScript( 720916 )
+    Sapphire::ScriptAPI::EventScript( 720916 )
   {
   }
 
diff --git a/src/servers/Scripts/common/CmnDefLinkShell.cpp b/src/servers/Scripts/common/CmnDefLinkShell.cpp
index 6c15df52..b340a4b7 100644
--- a/src/servers/Scripts/common/CmnDefLinkShell.cpp
+++ b/src/servers/Scripts/common/CmnDefLinkShell.cpp
@@ -8,11 +8,11 @@
 using namespace Core;
 
 class CmnDefLinkShell :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefLinkShell() :
-    EventScript( 0xB0006 )
+    Sapphire::ScriptAPI::EventScript( 0xB0006 )
   {
   }
 
diff --git a/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp b/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp
index 14864b6b..4429c393 100644
--- a/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp
+++ b/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefMarketBoardGridania :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefMarketBoardGridania() :
-    EventScript( 0xB0027 )
+    Sapphire::ScriptAPI::EventScript( 0xB0027 )
   {
   }
 
diff --git a/src/servers/Scripts/common/CmnDefMogLetter.cpp b/src/servers/Scripts/common/CmnDefMogLetter.cpp
index 22922887..03de2ba0 100644
--- a/src/servers/Scripts/common/CmnDefMogLetter.cpp
+++ b/src/servers/Scripts/common/CmnDefMogLetter.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefMogLetter :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefMogLetter() :
-    EventScript( 720898 )
+    Sapphire::ScriptAPI::EventScript( 720898 )
   {
   }
 
diff --git a/src/servers/Scripts/common/CmnDefNpcRepair.cpp b/src/servers/Scripts/common/CmnDefNpcRepair.cpp
index 1a2e609e..5629d97c 100644
--- a/src/servers/Scripts/common/CmnDefNpcRepair.cpp
+++ b/src/servers/Scripts/common/CmnDefNpcRepair.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefNpcRepair :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefNpcRepair() :
-    EventScript( 0xB0013 )
+    Sapphire::ScriptAPI::EventScript( 0xB0013 )
   {
   }
 
diff --git a/src/servers/Scripts/common/CmnDefWeatherForeCast.cpp b/src/servers/Scripts/common/CmnDefWeatherForeCast.cpp
index 2efd1fdb..69d565ac 100644
--- a/src/servers/Scripts/common/CmnDefWeatherForeCast.cpp
+++ b/src/servers/Scripts/common/CmnDefWeatherForeCast.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefWeatherForeCast :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefWeatherForeCast() :
-    EventScript( 721100 )
+    Sapphire::ScriptAPI::EventScript( 721100 )
   {
   }
 
diff --git a/src/servers/Scripts/common/ComDefMobHuntBoard.cpp b/src/servers/Scripts/common/ComDefMobHuntBoard.cpp
index 7a36eaa9..732b88b9 100644
--- a/src/servers/Scripts/common/ComDefMobHuntBoard.cpp
+++ b/src/servers/Scripts/common/ComDefMobHuntBoard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ComDefMobHuntBoard :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   ComDefMobHuntBoard() :
-    EventScript( 0xB00CA )
+    Sapphire::ScriptAPI::EventScript( 0xB00CA )
   {
   }
 
diff --git a/src/servers/Scripts/common/GilShop.cpp b/src/servers/Scripts/common/GilShop.cpp
index 2d1baee7..8b9cac58 100644
--- a/src/servers/Scripts/common/GilShop.cpp
+++ b/src/servers/Scripts/common/GilShop.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class GilShop :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   GilShop() :
-    EventScript( 0x00040001 )
+    Sapphire::ScriptAPI::EventScript( 0x00040001 )
   {
   }
 
diff --git a/src/servers/Scripts/common/HouFurOrchestrion.cpp b/src/servers/Scripts/common/HouFurOrchestrion.cpp
index fc93006c..196a7d77 100644
--- a/src/servers/Scripts/common/HouFurOrchestrion.cpp
+++ b/src/servers/Scripts/common/HouFurOrchestrion.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HouFurOrchestrion :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   HouFurOrchestrion() :
-    EventScript( 721226 )
+    Sapphire::ScriptAPI::EventScript( 721226 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
index 02471170..c6830f72 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors101110 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors101110() :
-    InstanceContentScript( 60011 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60011 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
index c572f7a4..60e1f2c2 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors110 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors110() :
-    InstanceContentScript( 60001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60001 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
index caff9745..dd7b48ea 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors111120 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors111120() :
-    InstanceContentScript( 60012 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60012 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
index 8dc281b9..0193c863 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors1120 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors1120() :
-    InstanceContentScript( 60002 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60002 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
index c28741e6..61744f2a 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors121130 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors121130() :
-    InstanceContentScript( 60013 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60013 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
index 6be59559..ff6f6202 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors131140 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors131140() :
-    InstanceContentScript( 60014 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60014 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
index fde06fce..08b2c657 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors141150 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors141150() :
-    InstanceContentScript( 60015 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60015 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
index 90ea9137..0324fc13 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors151160 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors151160() :
-    InstanceContentScript( 60016 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60016 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
index 34a5d948..8523dfaa 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors161170 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors161170() :
-    InstanceContentScript( 60017 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60017 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
index 8e588e97..b4dd9b78 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors171180 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors171180() :
-    InstanceContentScript( 60018 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60018 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
index 9b398925..bc197672 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors181190 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors181190() :
-    InstanceContentScript( 60019 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60019 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
index 56583f60..eb877fd3 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors191200 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors191200() :
-    InstanceContentScript( 60020 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60020 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
index 8371b711..1bf1d276 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors2130 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors2130() :
-    InstanceContentScript( 60003 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60003 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
index b153f460..5e122192 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors3140 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors3140() :
-    InstanceContentScript( 60004 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60004 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
index c6ccb56f..ead27865 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors4150 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors4150() :
-    InstanceContentScript( 60005 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60005 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
index fbaffaae..e9391c05 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors5160 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors5160() :
-    InstanceContentScript( 60006 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60006 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
index e97cf024..8fac7b93 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors6170 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors6170() :
-    InstanceContentScript( 60007 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60007 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
index 2e7bdd6a..08e3d1f9 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors7180 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors7180() :
-    InstanceContentScript( 60008 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60008 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
index 1d27f666..7457e2a3 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors8190 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors8190() :
-    InstanceContentScript( 60009 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60009 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
index f8888a87..ef06aa30 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors91100 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors91100() :
-    InstanceContentScript( 60010 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60010 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp b/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
index 8d65094f..3fb7fc32 100644
--- a/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
+++ b/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlaMhigo :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlaMhigo() :
-    InstanceContentScript( 56 )
+    Sapphire::ScriptAPI::InstanceContentScript( 56 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp b/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
index 26ebd5e3..db538952 100644
--- a/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
+++ b/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AmdaporKeep :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AmdaporKeep() :
-    InstanceContentScript( 14 )
+    Sapphire::ScriptAPI::InstanceContentScript( 14 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
index f2d1687c..c820bdb6 100644
--- a/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AmdaporKeepHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AmdaporKeepHard() :
-    InstanceContentScript( 29 )
+    Sapphire::ScriptAPI::InstanceContentScript( 29 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp b/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
index 6edf0424..f99202bf 100644
--- a/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
+++ b/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BaelsarsWall :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BaelsarsWall() :
-    InstanceContentScript( 48 )
+    Sapphire::ScriptAPI::InstanceContentScript( 48 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp b/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
index 01904a31..728d4788 100644
--- a/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
+++ b/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BardamsMettle :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BardamsMettle() :
-    InstanceContentScript( 53 )
+    Sapphire::ScriptAPI::InstanceContentScript( 53 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
index 876a66a8..961003e2 100644
--- a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
+++ b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BrayfloxsLongstop :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BrayfloxsLongstop() :
-    InstanceContentScript( 8 )
+    Sapphire::ScriptAPI::InstanceContentScript( 8 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
index 58899405..89e575ca 100644
--- a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BrayfloxsLongstopHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BrayfloxsLongstopHard() :
-    InstanceContentScript( 20 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp b/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
index 1db6bc4a..afcac3f1 100644
--- a/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
+++ b/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CastrumAbania :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CastrumAbania() :
-    InstanceContentScript( 55 )
+    Sapphire::ScriptAPI::InstanceContentScript( 55 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp b/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
index 7de5c4b3..8528f003 100644
--- a/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
+++ b/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CastrumMeridianum :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CastrumMeridianum() :
-    InstanceContentScript( 15 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp b/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
index de5494a3..5e055cb3 100644
--- a/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
+++ b/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CopperbellMines :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CopperbellMines() :
-    InstanceContentScript( 3 )
+    Sapphire::ScriptAPI::InstanceContentScript( 3 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
index 7cf4c7c8..531bedfc 100644
--- a/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CopperbellMinesHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CopperbellMinesHard() :
-    InstanceContentScript( 18 )
+    Sapphire::ScriptAPI::InstanceContentScript( 18 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/CuttersCry.cpp b/src/servers/Scripts/instances/dungeons/CuttersCry.cpp
index 2cbfa2b2..0b97079a 100644
--- a/src/servers/Scripts/instances/dungeons/CuttersCry.cpp
+++ b/src/servers/Scripts/instances/dungeons/CuttersCry.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CuttersCry :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CuttersCry() :
-    InstanceContentScript( 12 )
+    Sapphire::ScriptAPI::InstanceContentScript( 12 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/DomaCastle.cpp b/src/servers/Scripts/instances/dungeons/DomaCastle.cpp
index c9287448..258433a9 100644
--- a/src/servers/Scripts/instances/dungeons/DomaCastle.cpp
+++ b/src/servers/Scripts/instances/dungeons/DomaCastle.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DomaCastle :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DomaCastle() :
-    InstanceContentScript( 54 )
+    Sapphire::ScriptAPI::InstanceContentScript( 54 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
index 582de6e5..d80fcda8 100644
--- a/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
+++ b/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DzemaelDarkhold :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DzemaelDarkhold() :
-    InstanceContentScript( 13 )
+    Sapphire::ScriptAPI::InstanceContentScript( 13 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/Halatali.cpp b/src/servers/Scripts/instances/dungeons/Halatali.cpp
index 800cc92a..f4a3f351 100644
--- a/src/servers/Scripts/instances/dungeons/Halatali.cpp
+++ b/src/servers/Scripts/instances/dungeons/Halatali.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Halatali :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Halatali() :
-    InstanceContentScript( 7 )
+    Sapphire::ScriptAPI::InstanceContentScript( 7 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/HalataliHard.cpp b/src/servers/Scripts/instances/dungeons/HalataliHard.cpp
index d87558b5..6c94f120 100644
--- a/src/servers/Scripts/instances/dungeons/HalataliHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/HalataliHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HalataliHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HalataliHard() :
-    InstanceContentScript( 21 )
+    Sapphire::ScriptAPI::InstanceContentScript( 21 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp b/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
index db5cd593..d971a867 100644
--- a/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
+++ b/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HaukkeManor :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HaukkeManor() :
-    InstanceContentScript( 6 )
+    Sapphire::ScriptAPI::InstanceContentScript( 6 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp b/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
index c743ec11..6453acfa 100644
--- a/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HaukkeManorHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HaukkeManorHard() :
-    InstanceContentScript( 19 )
+    Sapphire::ScriptAPI::InstanceContentScript( 19 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/HellsLid.cpp b/src/servers/Scripts/instances/dungeons/HellsLid.cpp
index fcc0f239..2a13194a 100644
--- a/src/servers/Scripts/instances/dungeons/HellsLid.cpp
+++ b/src/servers/Scripts/instances/dungeons/HellsLid.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HellsLid :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HellsLid() :
-    InstanceContentScript( 59 )
+    Sapphire::ScriptAPI::InstanceContentScript( 59 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp b/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
index 98d8f160..4928ea5e 100644
--- a/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
+++ b/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HullbreakerIsle :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HullbreakerIsle() :
-    InstanceContentScript( 23 )
+    Sapphire::ScriptAPI::InstanceContentScript( 23 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
index 1dd359fa..be755127 100644
--- a/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HullbreakerIsleHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HullbreakerIsleHard() :
-    InstanceContentScript( 45 )
+    Sapphire::ScriptAPI::InstanceContentScript( 45 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp b/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
index 5d5016c9..3ebf2d44 100644
--- a/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
+++ b/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class KuganeCastle :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   KuganeCastle() :
-    InstanceContentScript( 57 )
+    Sapphire::ScriptAPI::InstanceContentScript( 57 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/Neverreap.cpp b/src/servers/Scripts/instances/dungeons/Neverreap.cpp
index 7e9e0c84..0ab7bd05 100644
--- a/src/servers/Scripts/instances/dungeons/Neverreap.cpp
+++ b/src/servers/Scripts/instances/dungeons/Neverreap.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Neverreap :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Neverreap() :
-    InstanceContentScript( 33 )
+    Sapphire::ScriptAPI::InstanceContentScript( 33 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/PharosSirius.cpp b/src/servers/Scripts/instances/dungeons/PharosSirius.cpp
index cf3abe42..7fefad30 100644
--- a/src/servers/Scripts/instances/dungeons/PharosSirius.cpp
+++ b/src/servers/Scripts/instances/dungeons/PharosSirius.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class PharosSirius :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   PharosSirius() :
-    InstanceContentScript( 17 )
+    Sapphire::ScriptAPI::InstanceContentScript( 17 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp b/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
index 16524234..3fc88190 100644
--- a/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class PharosSiriusHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   PharosSiriusHard() :
-    InstanceContentScript( 40 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
index 34aa9434..d71a5f7a 100644
--- a/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
+++ b/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SaintMociannesArboretum :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SaintMociannesArboretum() :
-    InstanceContentScript( 41 )
+    Sapphire::ScriptAPI::InstanceContentScript( 41 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/Scripts/instances/dungeons/Sastasha.cpp
index 43d9692e..2590119c 100644
--- a/src/servers/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/Scripts/instances/dungeons/Sastasha.cpp
@@ -5,11 +5,11 @@
 using namespace Core;
 
 class Sastasha :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Sastasha() :
-    InstanceContentScript( 4 )
+    Sapphire::ScriptAPI::InstanceContentScript( 4 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/SastashaHard.cpp b/src/servers/Scripts/instances/dungeons/SastashaHard.cpp
index 626443a4..52e059b0 100644
--- a/src/servers/Scripts/instances/dungeons/SastashaHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/SastashaHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SastashaHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SastashaHard() :
-    InstanceContentScript( 28 )
+    Sapphire::ScriptAPI::InstanceContentScript( 28 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
index 0cbb3949..05ae83b9 100644
--- a/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
+++ b/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ShisuioftheVioletTides :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ShisuioftheVioletTides() :
-    InstanceContentScript( 50 )
+    Sapphire::ScriptAPI::InstanceContentScript( 50 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/Snowcloak.cpp b/src/servers/Scripts/instances/dungeons/Snowcloak.cpp
index 48f3f82e..192c2a60 100644
--- a/src/servers/Scripts/instances/dungeons/Snowcloak.cpp
+++ b/src/servers/Scripts/instances/dungeons/Snowcloak.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Snowcloak :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Snowcloak() :
-    InstanceContentScript( 27 )
+    Sapphire::ScriptAPI::InstanceContentScript( 27 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/SohmAl.cpp b/src/servers/Scripts/instances/dungeons/SohmAl.cpp
index ad467f86..7398b1db 100644
--- a/src/servers/Scripts/instances/dungeons/SohmAl.cpp
+++ b/src/servers/Scripts/instances/dungeons/SohmAl.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SohmAl :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SohmAl() :
-    InstanceContentScript( 37 )
+    Sapphire::ScriptAPI::InstanceContentScript( 37 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp b/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
index e94ef1f1..203f43a4 100644
--- a/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SohmAlHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SohmAlHard() :
-    InstanceContentScript( 49 )
+    Sapphire::ScriptAPI::InstanceContentScript( 49 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/SohrKhai.cpp b/src/servers/Scripts/instances/dungeons/SohrKhai.cpp
index 026b7c7c..2f53ea94 100644
--- a/src/servers/Scripts/instances/dungeons/SohrKhai.cpp
+++ b/src/servers/Scripts/instances/dungeons/SohrKhai.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SohrKhai :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SohrKhai() :
-    InstanceContentScript( 44 )
+    Sapphire::ScriptAPI::InstanceContentScript( 44 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheAery.cpp b/src/servers/Scripts/instances/dungeons/TheAery.cpp
index dc3438b5..3fdc271d 100644
--- a/src/servers/Scripts/instances/dungeons/TheAery.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAery.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheAery :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheAery() :
-    InstanceContentScript( 39 )
+    Sapphire::ScriptAPI::InstanceContentScript( 39 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
index 89fe39ec..bb4a0d0d 100644
--- a/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheAetherochemicalResearchFacility :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheAetherochemicalResearchFacility() :
-    InstanceContentScript( 38 )
+    Sapphire::ScriptAPI::InstanceContentScript( 38 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheAntitower.cpp b/src/servers/Scripts/instances/dungeons/TheAntitower.cpp
index be9c9120..49c5d8fe 100644
--- a/src/servers/Scripts/instances/dungeons/TheAntitower.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAntitower.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheAntitower :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheAntitower() :
-    InstanceContentScript( 43 )
+    Sapphire::ScriptAPI::InstanceContentScript( 43 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp b/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
index 965decfa..58a0160a 100644
--- a/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheAurumVale :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheAurumVale() :
-    InstanceContentScript( 5 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
index 654f35be..a121d8c6 100644
--- a/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheDrownedCityofSkalla :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheDrownedCityofSkalla() :
-    InstanceContentScript( 58 )
+    Sapphire::ScriptAPI::InstanceContentScript( 58 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp b/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
index ca7eadc6..2bc1de12 100644
--- a/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheDuskVigil :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheDuskVigil() :
-    InstanceContentScript( 36 )
+    Sapphire::ScriptAPI::InstanceContentScript( 36 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp b/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
index 88a37fa2..3381682f 100644
--- a/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFractalContinuum :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFractalContinuum() :
-    InstanceContentScript( 35 )
+    Sapphire::ScriptAPI::InstanceContentScript( 35 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
index 9674bdf6..09d7b2bb 100644
--- a/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFractalContinuumHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFractalContinuumHard() :
-    InstanceContentScript( 60 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
index 87e8d879..c8109e07 100644
--- a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheGreatGubalLibrary :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheGreatGubalLibrary() :
-    InstanceContentScript( 31 )
+    Sapphire::ScriptAPI::InstanceContentScript( 31 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
index ef8d2cc5..d0eb3528 100644
--- a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheGreatGubalLibraryHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheGreatGubalLibraryHard() :
-    InstanceContentScript( 47 )
+    Sapphire::ScriptAPI::InstanceContentScript( 47 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
index e60ff386..1fb32b2d 100644
--- a/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheKeeperoftheLake :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheKeeperoftheLake() :
-    InstanceContentScript( 32 )
+    Sapphire::ScriptAPI::InstanceContentScript( 32 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
index 4e12cf38..4a393373 100644
--- a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheLostCityofAmdapor :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheLostCityofAmdapor() :
-    InstanceContentScript( 22 )
+    Sapphire::ScriptAPI::InstanceContentScript( 22 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
index 41116fc1..c62e4e95 100644
--- a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheLostCityofAmdaporHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheLostCityofAmdaporHard() :
-    InstanceContentScript( 42 )
+    Sapphire::ScriptAPI::InstanceContentScript( 42 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp b/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
index a037490e..a491c95d 100644
--- a/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
+++ b/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePraetorium :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePraetorium() :
-    InstanceContentScript( 16 )
+    Sapphire::ScriptAPI::InstanceContentScript( 16 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp b/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
index 65aeba85..ba97b9ca 100644
--- a/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSirensongSea :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSirensongSea() :
-    InstanceContentScript( 52 )
+    Sapphire::ScriptAPI::InstanceContentScript( 52 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp b/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
index 6a8d40e8..2111b994 100644
--- a/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheStoneVigil :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheStoneVigil() :
-    InstanceContentScript( 11 )
+    Sapphire::ScriptAPI::InstanceContentScript( 11 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
index e77c72a0..856c7453 100644
--- a/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheStoneVigilHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheStoneVigilHard() :
-    InstanceContentScript( 25 )
+    Sapphire::ScriptAPI::InstanceContentScript( 25 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
index c09aeb04..a7788b52 100644
--- a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSunkenTempleofQarn :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSunkenTempleofQarn() :
-    InstanceContentScript( 9 )
+    Sapphire::ScriptAPI::InstanceContentScript( 9 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
index a824afb5..31a593fc 100644
--- a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSunkenTempleofQarnHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSunkenTempleofQarnHard() :
-    InstanceContentScript( 26 )
+    Sapphire::ScriptAPI::InstanceContentScript( 26 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
index 7bf8565a..44311393 100644
--- a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheTamTaraDeepcroft :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheTamTaraDeepcroft() :
-    InstanceContentScript( 2 )
+    Sapphire::ScriptAPI::InstanceContentScript( 2 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
index 2308224d..f3198b1d 100644
--- a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheTamTaraDeepcroftHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheTamTaraDeepcroftHard() :
-    InstanceContentScript( 24 )
+    Sapphire::ScriptAPI::InstanceContentScript( 24 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
index daee6636..2bc27a7a 100644
--- a/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheTempleoftheFist :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheTempleoftheFist() :
-    InstanceContentScript( 51 )
+    Sapphire::ScriptAPI::InstanceContentScript( 51 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
index 7d9f7e6b..0d7910f3 100644
--- a/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheThousandMawsofTotoRak :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheThousandMawsofTotoRak() :
-    InstanceContentScript( 1 )
+    Sapphire::ScriptAPI::InstanceContentScript( 1 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheVault.cpp b/src/servers/Scripts/instances/dungeons/TheVault.cpp
index fa1df40a..583a64e2 100644
--- a/src/servers/Scripts/instances/dungeons/TheVault.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheVault.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheVault :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheVault() :
-    InstanceContentScript( 34 )
+    Sapphire::ScriptAPI::InstanceContentScript( 34 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp b/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
index 346138c6..61f515eb 100644
--- a/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheWanderersPalace :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheWanderersPalace() :
-    InstanceContentScript( 10 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
index c761ff6a..cef7b8cf 100644
--- a/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheWanderersPalaceHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheWanderersPalaceHard() :
-    InstanceContentScript( 30 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/dungeons/Xelphatol.cpp b/src/servers/Scripts/instances/dungeons/Xelphatol.cpp
index 5136736b..6b5e980a 100644
--- a/src/servers/Scripts/instances/dungeons/Xelphatol.cpp
+++ b/src/servers/Scripts/instances/dungeons/Xelphatol.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Xelphatol :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Xelphatol() :
-    InstanceContentScript( 46 )
+    Sapphire::ScriptAPI::InstanceContentScript( 46 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/events/TheHauntedManor.cpp b/src/servers/Scripts/instances/events/TheHauntedManor.cpp
index 8a356c6f..320f2b36 100644
--- a/src/servers/Scripts/instances/events/TheHauntedManor.cpp
+++ b/src/servers/Scripts/instances/events/TheHauntedManor.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheHauntedManor :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheHauntedManor() :
-    InstanceContentScript( 25001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 25001 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp b/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
index cfbe4e8f..44cea731 100644
--- a/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
+++ b/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheValentionesCeremony :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheValentionesCeremony() :
-    InstanceContentScript( 25002 )
+    Sapphire::ScriptAPI::InstanceContentScript( 25002 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp b/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
index 012a4d39..9930fcdd 100644
--- a/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
+++ b/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AllsWellthatEndsintheWell :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AllsWellthatEndsintheWell() :
-    InstanceContentScript( 10007 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10007 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp b/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
index 429311e0..302ef4e9 100644
--- a/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
+++ b/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AnnoytheVoid :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AnnoytheVoid() :
-    InstanceContentScript( 10010 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10010 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
index 5af95852..47f76d71 100644
--- a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
+++ b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BasicTrainingEnemyParties :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BasicTrainingEnemyParties() :
-    InstanceContentScript( 10001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10001 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
index 3215caac..8af49bb0 100644
--- a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
+++ b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BasicTrainingEnemyStrongholds :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BasicTrainingEnemyStrongholds() :
-    InstanceContentScript( 10003 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10003 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp b/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
index 2bd2ef61..b8f371e9 100644
--- a/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
+++ b/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class FlickingSticksandTakingNames :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   FlickingSticksandTakingNames() :
-    InstanceContentScript( 10008 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10008 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp b/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
index a76e7be0..4adf9750 100644
--- a/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
+++ b/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HeroontheHalfShell :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HeroontheHalfShell() :
-    InstanceContentScript( 10004 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10004 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp b/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
index 42a6bb69..f461543c 100644
--- a/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
+++ b/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class LongLivetheQueen :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   LongLivetheQueen() :
-    InstanceContentScript( 10012 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10012 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp b/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
index 1fb2194a..25bec36c 100644
--- a/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
+++ b/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class MorethanaFeeler :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   MorethanaFeeler() :
-    InstanceContentScript( 10009 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10009 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp b/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
index 92b9d05e..251059ff 100644
--- a/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
+++ b/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class PullingPoisonPosies :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   PullingPoisonPosies() :
-    InstanceContentScript( 10005 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10005 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp b/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
index d42e25df..950f7b5a 100644
--- a/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
+++ b/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ShadowandClaw :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ShadowandClaw() :
-    InstanceContentScript( 10011 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10011 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp b/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
index 620f3626..119386d5 100644
--- a/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
+++ b/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SolemnTrinity :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SolemnTrinity() :
-    InstanceContentScript( 10014 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10014 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/StingingBack.cpp b/src/servers/Scripts/instances/guildhests/StingingBack.cpp
index 229a0f0f..ac2b1808 100644
--- a/src/servers/Scripts/instances/guildhests/StingingBack.cpp
+++ b/src/servers/Scripts/instances/guildhests/StingingBack.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class StingingBack :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   StingingBack() :
-    InstanceContentScript( 10006 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10006 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp b/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
index 1176cfe6..e2393955 100644
--- a/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
+++ b/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class UndertheArmor :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   UndertheArmor() :
-    InstanceContentScript( 10002 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10002 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/guildhests/WardUp.cpp b/src/servers/Scripts/instances/guildhests/WardUp.cpp
index f54f91c8..889dd4a5 100644
--- a/src/servers/Scripts/instances/guildhests/WardUp.cpp
+++ b/src/servers/Scripts/instances/guildhests/WardUp.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class WardUp :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   WardUp() :
-    InstanceContentScript( 10013 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10013 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
index 52108b10..acd22554 100644
--- a/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AccrueEnmityfromMultipleTargets :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AccrueEnmityfromMultipleTargets() :
-    InstanceContentScript( 15004 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15004 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
index 3d710127..33e488a3 100644
--- a/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AssistAlliesinDefeatingaTarget :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AssistAlliesinDefeatingaTarget() :
-    InstanceContentScript( 15008 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15008 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
index 4ad02423..59cf12a4 100644
--- a/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AvoidAreaofEffectAttacks :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AvoidAreaofEffectAttacks() :
-    InstanceContentScript( 15001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15001 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
index 9f459614..e6c698d0 100644
--- a/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AvoidEngagedTargets :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AvoidEngagedTargets() :
-    InstanceContentScript( 15015 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15015 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
index b028bc5f..061f6983 100644
--- a/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DefeatanOccupiedTarget :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DefeatanOccupiedTarget() :
-    InstanceContentScript( 15009 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15009 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
index 5177c8a1..f47d47a6 100644
--- a/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class EngageEnemyReinforcements :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   EngageEnemyReinforcements() :
-    InstanceContentScript( 15011 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15011 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
index 2e658b69..a6f89615 100644
--- a/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class EngageMultipleTargets :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   EngageMultipleTargets() :
-    InstanceContentScript( 15005 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15005 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
index 0a11ae4b..d4308f8f 100644
--- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ExecuteaComboinBattle :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ExecuteaComboinBattle() :
-    InstanceContentScript( 15003 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15003 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
index dfd6fc50..10db2adb 100644
--- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ExecuteaCombotoIncreaseEnmity :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ExecuteaCombotoIncreaseEnmity() :
-    InstanceContentScript( 15002 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15002 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
index 52e56663..a8915102 100644
--- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ExecuteaRangedAttacktoIncreaseEnmity :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ExecuteaRangedAttacktoIncreaseEnmity() :
-    InstanceContentScript( 15006 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15006 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp b/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp
index f128070e..623f41d0 100644
--- a/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class FinalExercise :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   FinalExercise() :
-    InstanceContentScript( 15016 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15016 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
index 24710a26..56342715 100644
--- a/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HealMultipleAllies :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HealMultipleAllies() :
-    InstanceContentScript( 15014 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15014 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp b/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp
index ade09f40..3eb502ce 100644
--- a/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HealanAlly :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HealanAlly() :
-    InstanceContentScript( 15013 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15013 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
index c3f98a30..ba568c68 100644
--- a/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class InteractwiththeBattlefield :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   InteractwiththeBattlefield() :
-    InstanceContentScript( 15012 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15012 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/Astragalos.cpp b/src/servers/Scripts/instances/pvp/Astragalos.cpp
index 76fb376b..9bd97972 100644
--- a/src/servers/Scripts/instances/pvp/Astragalos.cpp
+++ b/src/servers/Scripts/instances/pvp/Astragalos.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Astragalos :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Astragalos() :
-    InstanceContentScript( 51001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 51001 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/SealRockSeize.cpp b/src/servers/Scripts/instances/pvp/SealRockSeize.cpp
index c25e5df3..957c9f22 100644
--- a/src/servers/Scripts/instances/pvp/SealRockSeize.cpp
+++ b/src/servers/Scripts/instances/pvp/SealRockSeize.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SealRockSeize :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SealRockSeize() :
-    InstanceContentScript( 50004 )
+    Sapphire::ScriptAPI::InstanceContentScript( 50004 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
index d7057b62..767b3a51 100644
--- a/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
+++ b/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheBorderlandRuinsSecure :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheBorderlandRuinsSecure() :
-    InstanceContentScript( 50001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 50001 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
index 08b72289..a697210f 100644
--- a/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFeast4on4LightParty :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFeast4on4LightParty() :
-    InstanceContentScript( 40012 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40012 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
index 672663b6..d9a0c6d4 100644
--- a/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFeast4on4Ranked :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFeast4on4Ranked() :
-    InstanceContentScript( 40018 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40018 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp
index e9924ca0..5b08c17b 100644
--- a/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFeast4on4Training :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFeast4on4Training() :
-    InstanceContentScript( 40016 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40016 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
index 29c63074..ab00a81f 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFeastCustomMatchCrystalTower :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFeastCustomMatchCrystalTower() :
-    InstanceContentScript( 40025 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40025 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
index ea726cfa..c62ebafa 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFeastCustomMatchFeastingGrounds :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFeastCustomMatchFeastingGrounds() :
-    InstanceContentScript( 40014 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40014 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
index 71380cba..1b3e00a5 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFeastCustomMatchLichenweed :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFeastCustomMatchLichenweed() :
-    InstanceContentScript( 40021 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40021 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp b/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp
index 829334a0..2614c52d 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFeastRanked :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFeastRanked() :
-    InstanceContentScript( 40023 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40023 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp b/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp
index 5a5630c3..86a1d7a2 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFeastTeamRanked :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFeastTeamRanked() :
-    InstanceContentScript( 40022 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40022 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp b/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp
index 61bcb9df..109fa8c3 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFeastTraining :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFeastTraining() :
-    InstanceContentScript( 40024 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40024 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
index 1ac9d496..ffa05e9a 100644
--- a/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFieldsofGloryShatter :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFieldsofGloryShatter() :
-    InstanceContentScript( 50005 )
+    Sapphire::ScriptAPI::InstanceContentScript( 50005 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp b/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp
index 6f321795..5156924c 100644
--- a/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp
+++ b/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ABloodyReunion :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ABloodyReunion() :
-    InstanceContentScript( 5002 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5002 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp b/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
index 1391996d..812ca933 100644
--- a/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
+++ b/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ASpectaclefortheAges :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ASpectaclefortheAges() :
-    InstanceContentScript( 5001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5001 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp b/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp
index 134acf7b..213ea2a3 100644
--- a/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp
+++ b/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BloodDragoon :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BloodDragoon() :
-    InstanceContentScript( 5021 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5021 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp b/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp
index 52798fc6..7d7a7904 100644
--- a/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp
+++ b/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BloodontheDeck :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BloodontheDeck() :
-    InstanceContentScript( 5009 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5009 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp b/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
index e9a5219d..9d11e0d9 100644
--- a/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
+++ b/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CuriousGorgeMeetsHisMatch :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CuriousGorgeMeetsHisMatch() :
-    InstanceContentScript( 5013 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5013 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp b/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp
index ee13738d..dbb22306 100644
--- a/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp
+++ b/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DarkwingDragon :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DarkwingDragon() :
-    InstanceContentScript( 5016 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5016 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/InThalsName.cpp b/src/servers/Scripts/instances/questbattles/InThalsName.cpp
index 11c9acb0..30651049 100644
--- a/src/servers/Scripts/instances/questbattles/InThalsName.cpp
+++ b/src/servers/Scripts/instances/questbattles/InThalsName.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class InThalsName :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   InThalsName() :
-    InstanceContentScript( 5006 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5006 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp b/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp
index 24c4620a..3d59bb98 100644
--- a/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp
+++ b/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class InterdimensionalRift :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   InterdimensionalRift() :
-    InstanceContentScript( 5023 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5023 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp b/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
index 7d650ed6..e66d6988 100644
--- a/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
+++ b/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ItsProbablyaTrap :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ItsProbablyaTrap() :
-    InstanceContentScript( 5005 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5005 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp b/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp
index 2ef58362..b300c2a0 100644
--- a/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp
+++ b/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class MatsubaMayhem :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   MatsubaMayhem() :
-    InstanceContentScript( 5011 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5011 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/Naadam.cpp b/src/servers/Scripts/instances/questbattles/Naadam.cpp
index 5710af45..24d86f58 100644
--- a/src/servers/Scripts/instances/questbattles/Naadam.cpp
+++ b/src/servers/Scripts/instances/questbattles/Naadam.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Naadam :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Naadam() :
-    InstanceContentScript( 5008 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5008 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp b/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
index 4240d125..04e19bcc 100644
--- a/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
+++ b/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class OneLifeforOneWorld :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   OneLifeforOneWorld() :
-    InstanceContentScript( 5003 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5003 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/OurCompromise.cpp b/src/servers/Scripts/instances/questbattles/OurCompromise.cpp
index 933b80b6..d1a86fb4 100644
--- a/src/servers/Scripts/instances/questbattles/OurCompromise.cpp
+++ b/src/servers/Scripts/instances/questbattles/OurCompromise.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class OurCompromise :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   OurCompromise() :
-    InstanceContentScript( 5020 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5020 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp b/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp
index b1d0ace6..1e8eead9 100644
--- a/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp
+++ b/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class OurUnsungHeroes :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   OurUnsungHeroes() :
-    InstanceContentScript( 5014 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5014 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp b/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp
index d6213de7..ece6cfa3 100644
--- a/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp
+++ b/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class RaisingtheSword :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   RaisingtheSword() :
-    InstanceContentScript( 5018 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5018 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp b/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp
index 2c9977d2..ce800b13 100644
--- a/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp
+++ b/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ReturnoftheBull :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ReturnoftheBull() :
-    InstanceContentScript( 5024 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5024 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp b/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp
index 58db4e72..96279282 100644
--- a/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheBattleonBekko :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheBattleonBekko() :
-    InstanceContentScript( 5012 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5012 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp b/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
index 3296c99a..6c5deaaf 100644
--- a/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheCarteneauFlatsHeliodrome :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheCarteneauFlatsHeliodrome() :
-    InstanceContentScript( 5004 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5004 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp b/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
index 357807d8..66caf3cd 100644
--- a/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFaceofTrueEvil :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFaceofTrueEvil() :
-    InstanceContentScript( 5010 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5010 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp b/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
index 4301b69b..9524aa55 100644
--- a/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheHeartoftheProblem :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheHeartoftheProblem() :
-    InstanceContentScript( 5015 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5015 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp b/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
index d0616873..7fbc59da 100644
--- a/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheOrphansandtheBrokenBlade :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheOrphansandtheBrokenBlade() :
-    InstanceContentScript( 5019 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5019 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/TheResonant.cpp b/src/servers/Scripts/instances/questbattles/TheResonant.cpp
index 191cc6c8..c09b35d1 100644
--- a/src/servers/Scripts/instances/questbattles/TheResonant.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheResonant.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheResonant :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheResonant() :
-    InstanceContentScript( 5017 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5017 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp b/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp
index 4f956918..78fae391 100644
--- a/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp
+++ b/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class WhenClansCollide :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   WhenClansCollide() :
-    InstanceContentScript( 5022 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5022 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp b/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp
index 4fbeafc2..8c0c3923 100644
--- a/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp
+++ b/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class WithHeartandSteel :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   WithHeartandSteel() :
-    InstanceContentScript( 5007 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5007 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
index 614b1f7d..b5161204 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheArmoftheFather :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheArmoftheFather() :
-    InstanceContentScript( 30023 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30023 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
index c2c4fac9..02a980f8 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheArmoftheFatherSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheArmoftheFatherSavage() :
-    InstanceContentScript( 30027 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30027 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
index 51b3dff7..b6c952b2 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheArmoftheSon :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheArmoftheSon() :
-    InstanceContentScript( 30032 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30032 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
index b888dd35..9164e297 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheArmoftheSonSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheArmoftheSonSavage() :
-    InstanceContentScript( 30036 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30036 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
index 4d6f98ee..6d0c95e9 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheBreathoftheCreator :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheBreathoftheCreator() :
-    InstanceContentScript( 30040 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30040 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
index 901dee86..858e3c06 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheBreathoftheCreatorSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheBreathoftheCreatorSavage() :
-    InstanceContentScript( 30044 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30044 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
index 2444c360..282e906b 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheBurdenoftheFather :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheBurdenoftheFather() :
-    InstanceContentScript( 30024 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30024 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
index 04d41b7a..9a90cb11 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheBurdenoftheFatherSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheBurdenoftheFatherSavage() :
-    InstanceContentScript( 30028 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30028 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
index 807283a9..55e43cf9 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheBurdenoftheSon :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheBurdenoftheSon() :
-    InstanceContentScript( 30033 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30033 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
index 2c7c212b..c4590c74 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheBurdenoftheSonSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheBurdenoftheSonSavage() :
-    InstanceContentScript( 30037 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30037 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
index 36707b42..8dd80f5c 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheCuffoftheFather :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheCuffoftheFather() :
-    InstanceContentScript( 30022 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30022 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
index 2d1dbae7..b84bbe49 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheCuffoftheFatherSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheCuffoftheFatherSavage() :
-    InstanceContentScript( 30026 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30026 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
index 833cbcbb..2f54eeae 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheCuffoftheSon :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheCuffoftheSon() :
-    InstanceContentScript( 30031 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30031 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
index abb2e61d..7c90efa7 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheCuffoftheSonSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheCuffoftheSonSavage() :
-    InstanceContentScript( 30035 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30035 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
index 937182be..00aeb92c 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheEyesoftheCreator :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheEyesoftheCreator() :
-    InstanceContentScript( 30039 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30039 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
index db24d92a..7793d5b1 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheEyesoftheCreatorSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheEyesoftheCreatorSavage() :
-    InstanceContentScript( 30043 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30043 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
index 4fe1a928..f9debc0a 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheFistoftheFather :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheFistoftheFather() :
-    InstanceContentScript( 30021 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30021 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
index 2db154b0..2428de47 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheFistoftheFatherSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheFistoftheFatherSavage() :
-    InstanceContentScript( 30025 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30025 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
index ac3e9d83..3701bf2a 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheFistoftheSon :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheFistoftheSon() :
-    InstanceContentScript( 30030 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30030 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
index 2a04d874..ecf691c2 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheFistoftheSonSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheFistoftheSonSavage() :
-    InstanceContentScript( 30034 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30034 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
index da84d428..b11bea73 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheHeartoftheCreator :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheHeartoftheCreator() :
-    InstanceContentScript( 30041 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30041 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
index 3946f873..b75875f4 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheHeartoftheCreatorSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheHeartoftheCreatorSavage() :
-    InstanceContentScript( 30045 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30045 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
index 151f02bf..452d046c 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheSouloftheCreator :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheSouloftheCreator() :
-    InstanceContentScript( 30042 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30042 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
index 61a1a7be..2ec67e1f 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlexanderTheSouloftheCreatorSavage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlexanderTheSouloftheCreatorSavage() :
-    InstanceContentScript( 30046 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30046 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV10.cpp b/src/servers/Scripts/instances/raids/DeltascapeV10.cpp
index cd73672d..68d9ba14 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV10.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV10.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DeltascapeV10 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DeltascapeV10() :
-    InstanceContentScript( 30049 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30049 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp
index 9a2da733..52bf199e 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DeltascapeV10Savage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DeltascapeV10Savage() :
-    InstanceContentScript( 30053 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30053 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV20.cpp b/src/servers/Scripts/instances/raids/DeltascapeV20.cpp
index 5a5b7b92..910c47e2 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV20.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV20.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DeltascapeV20 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DeltascapeV20() :
-    InstanceContentScript( 30050 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30050 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp
index 8f1cad21..a65efc62 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DeltascapeV20Savage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DeltascapeV20Savage() :
-    InstanceContentScript( 30054 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30054 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV30.cpp b/src/servers/Scripts/instances/raids/DeltascapeV30.cpp
index 6c886233..56dae699 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV30.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV30.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DeltascapeV30 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DeltascapeV30() :
-    InstanceContentScript( 30051 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30051 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp
index dc54d1bc..ed6487f1 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DeltascapeV30Savage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DeltascapeV30Savage() :
-    InstanceContentScript( 30055 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30055 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV40.cpp b/src/servers/Scripts/instances/raids/DeltascapeV40.cpp
index 6181a52b..be9f64b9 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV40.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV40.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DeltascapeV40 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DeltascapeV40() :
-    InstanceContentScript( 30052 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30052 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp
index 63b753c1..bd3f4d5b 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DeltascapeV40Savage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DeltascapeV40Savage() :
-    InstanceContentScript( 30056 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30056 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/DunScaith.cpp b/src/servers/Scripts/instances/raids/DunScaith.cpp
index 09bbe8bb..06c8e9aa 100644
--- a/src/servers/Scripts/instances/raids/DunScaith.cpp
+++ b/src/servers/Scripts/instances/raids/DunScaith.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DunScaith :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DunScaith() :
-    InstanceContentScript( 30047 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30047 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV10.cpp b/src/servers/Scripts/instances/raids/SigmascapeV10.cpp
index b68624d6..d9608496 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV10.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV10.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SigmascapeV10 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SigmascapeV10() :
-    InstanceContentScript( 30059 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30059 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp
index d97cfa73..1e57ffcc 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SigmascapeV10Savage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SigmascapeV10Savage() :
-    InstanceContentScript( 30063 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30063 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV20.cpp b/src/servers/Scripts/instances/raids/SigmascapeV20.cpp
index 1dca0d5d..605c83a0 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV20.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV20.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SigmascapeV20 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SigmascapeV20() :
-    InstanceContentScript( 30060 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30060 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp
index cf17ed24..9ee27657 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SigmascapeV20Savage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SigmascapeV20Savage() :
-    InstanceContentScript( 30064 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30064 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV30.cpp b/src/servers/Scripts/instances/raids/SigmascapeV30.cpp
index 6e7c3121..898e409f 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV30.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV30.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SigmascapeV30 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SigmascapeV30() :
-    InstanceContentScript( 30061 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30061 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp
index b2029d55..48e0c000 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SigmascapeV30Savage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SigmascapeV30Savage() :
-    InstanceContentScript( 30065 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30065 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV40.cpp b/src/servers/Scripts/instances/raids/SigmascapeV40.cpp
index 1acffe7c..303b1cb2 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV40.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV40.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SigmascapeV40 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SigmascapeV40() :
-    InstanceContentScript( 30062 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30062 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp
index c9b3c203..4f78764e 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SigmascapeV40Savage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SigmascapeV40Savage() :
-    InstanceContentScript( 30066 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30066 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/SyrcusTower.cpp b/src/servers/Scripts/instances/raids/SyrcusTower.cpp
index 2cc0ac36..e70e9634 100644
--- a/src/servers/Scripts/instances/raids/SyrcusTower.cpp
+++ b/src/servers/Scripts/instances/raids/SyrcusTower.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SyrcusTower :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SyrcusTower() :
-    InstanceContentScript( 30011 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30011 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
index 4f2755d2..235b388f 100644
--- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
+++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheBindingCoilofBahamutTurn1 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheBindingCoilofBahamutTurn1() :
-    InstanceContentScript( 30002 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30002 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
index 843aefbe..a46be3e8 100644
--- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
+++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheBindingCoilofBahamutTurn2 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheBindingCoilofBahamutTurn2() :
-    InstanceContentScript( 30003 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30003 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
index f479e526..250b23bf 100644
--- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
+++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheBindingCoilofBahamutTurn3 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheBindingCoilofBahamutTurn3() :
-    InstanceContentScript( 30004 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30004 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
index 3bb539b5..3d71d330 100644
--- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
+++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheBindingCoilofBahamutTurn4 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheBindingCoilofBahamutTurn4() :
-    InstanceContentScript( 30005 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30005 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
index 1cbffc8e..ef292f8e 100644
--- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
+++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheBindingCoilofBahamutTurn5 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheBindingCoilofBahamutTurn5() :
-    InstanceContentScript( 30006 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30006 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
index e7e10311..0b3389da 100644
--- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
+++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFinalCoilofBahamutTurn1 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFinalCoilofBahamutTurn1() :
-    InstanceContentScript( 30016 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30016 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
index eec5679d..9d92d87b 100644
--- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
+++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFinalCoilofBahamutTurn2 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFinalCoilofBahamutTurn2() :
-    InstanceContentScript( 30017 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30017 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
index d69ba344..3e5c1293 100644
--- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
+++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFinalCoilofBahamutTurn3 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFinalCoilofBahamutTurn3() :
-    InstanceContentScript( 30018 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30018 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
index f76a2c3f..bb4a3fa2 100644
--- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
+++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFinalCoilofBahamutTurn4 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFinalCoilofBahamutTurn4() :
-    InstanceContentScript( 30019 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30019 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp b/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
index d4213145..4d5e5c5e 100644
--- a/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
+++ b/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheLabyrinthoftheAncients :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheLabyrinthoftheAncients() :
-    InstanceContentScript( 30001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30001 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
index 2498ebeb..a10c2ffb 100644
--- a/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
+++ b/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheRoyalCityofRabanastre :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheRoyalCityofRabanastre() :
-    InstanceContentScript( 30058 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30058 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
index c96eb64f..fae2b3fe 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSecondCoilofBahamutSavageTurn1 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSecondCoilofBahamutSavageTurn1() :
-    InstanceContentScript( 30012 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30012 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
index d8aac76b..f7b175c4 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSecondCoilofBahamutSavageTurn2 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSecondCoilofBahamutSavageTurn2() :
-    InstanceContentScript( 30013 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30013 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
index 1909401c..cb88270b 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSecondCoilofBahamutSavageTurn3 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSecondCoilofBahamutSavageTurn3() :
-    InstanceContentScript( 30014 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30014 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
index 4bb2fcd6..610f265d 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSecondCoilofBahamutSavageTurn4 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSecondCoilofBahamutSavageTurn4() :
-    InstanceContentScript( 30015 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30015 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
index 4e1f4ecf..4b4fed34 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSecondCoilofBahamutTurn1 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSecondCoilofBahamutTurn1() :
-    InstanceContentScript( 30007 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30007 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
index 602a7d23..4fb47af4 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSecondCoilofBahamutTurn2 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSecondCoilofBahamutTurn2() :
-    InstanceContentScript( 30008 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30008 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
index 245d077f..c94efd60 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSecondCoilofBahamutTurn3 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSecondCoilofBahamutTurn3() :
-    InstanceContentScript( 30009 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30009 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
index bfd1657f..8974b720 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSecondCoilofBahamutTurn4 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSecondCoilofBahamutTurn4() :
-    InstanceContentScript( 30010 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30010 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
index b9286341..ec389f1f 100644
--- a/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
+++ b/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheUnendingCoilofBahamutUltimate :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheUnendingCoilofBahamutUltimate() :
-    InstanceContentScript( 30057 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30057 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheVoidArk.cpp b/src/servers/Scripts/instances/raids/TheVoidArk.cpp
index b359da00..86a6a9e7 100644
--- a/src/servers/Scripts/instances/raids/TheVoidArk.cpp
+++ b/src/servers/Scripts/instances/raids/TheVoidArk.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheVoidArk :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheVoidArk() :
-    InstanceContentScript( 30029 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30029 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp b/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp
index 3c2d117a..67bd9aeb 100644
--- a/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp
+++ b/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheWeaponsRefrainUltimate :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheWeaponsRefrainUltimate() :
-    InstanceContentScript( 30067 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30067 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp b/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp
index 13595708..46a057e7 100644
--- a/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp
+++ b/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheWeepingCityofMhach :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheWeepingCityofMhach() :
-    InstanceContentScript( 30038 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30038 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp b/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp
index f185a110..fbc4df00 100644
--- a/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp
+++ b/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheWorldofDarkness :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheWorldofDarkness() :
-    InstanceContentScript( 30020 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30020 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp b/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp
index e56ff057..bc94deb6 100644
--- a/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp
+++ b/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheAquapolis :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheAquapolis() :
-    InstanceContentScript( 55001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 55001 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
index 4f5ac3bb..64f769bd 100644
--- a/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
+++ b/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheHiddenCanalsofUznair :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheHiddenCanalsofUznair() :
-    InstanceContentScript( 55003 )
+    Sapphire::ScriptAPI::InstanceContentScript( 55003 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
index 063678af..3005ce36 100644
--- a/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
+++ b/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheLostCanalsofUznair :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheLostCanalsofUznair() :
-    InstanceContentScript( 55002 )
+    Sapphire::ScriptAPI::InstanceContentScript( 55002 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp b/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp
index 75290e8f..4b5c2d2f 100644
--- a/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp
+++ b/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ARelicReborntheChimera :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ARelicReborntheChimera() :
-    InstanceContentScript( 20019 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20019 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp b/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp
index b0901b37..fe590f66 100644
--- a/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp
+++ b/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ARelicReborntheHydra :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ARelicReborntheHydra() :
-    InstanceContentScript( 20020 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20020 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
index 893379f5..0fcac9c1 100644
--- a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
@@ -3,10 +3,10 @@
 
 using namespace Core;
 
-class AkhAfahAmphitheatreExtreme : public InstanceContentScript
+class AkhAfahAmphitheatreExtreme : public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
-  AkhAfahAmphitheatreExtreme() : InstanceContentScript( 20025 )
+  AkhAfahAmphitheatreExtreme() : Sapphire::ScriptAPI::InstanceContentScript( 20025 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
index 5f983199..7147090a 100644
--- a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
+++ b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AkhAfahAmphitheatreHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AkhAfahAmphitheatreHard() :
-    InstanceContentScript( 20024 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20024 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp b/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp
index d0c3d279..3e283f09 100644
--- a/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp
+++ b/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BattleintheBigKeep :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BattleintheBigKeep() :
-    InstanceContentScript( 20030 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20030 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp b/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp
index b849d7a4..26fb633b 100644
--- a/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp
+++ b/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BattleontheBigBridge :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BattleontheBigBridge() :
-    InstanceContentScript( 20021 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20021 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/CapeWestwind.cpp b/src/servers/Scripts/instances/trials/CapeWestwind.cpp
index ad755e7b..d67714e2 100644
--- a/src/servers/Scripts/instances/trials/CapeWestwind.cpp
+++ b/src/servers/Scripts/instances/trials/CapeWestwind.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CapeWestwind :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CapeWestwind() :
-    InstanceContentScript( 20007 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20007 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp b/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp
index 6b3f8da8..931f5d90 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ContainmentBayP1T6 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ContainmentBayP1T6() :
-    InstanceContentScript( 20041 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20041 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
index 793e3cf6..2595a99f 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ContainmentBayP1T6Extreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ContainmentBayP1T6Extreme() :
-    InstanceContentScript( 20042 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20042 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp b/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp
index 48fb5198..b0ec25d9 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ContainmentBayS1T7 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ContainmentBayS1T7() :
-    InstanceContentScript( 20037 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20037 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
index 0bd7ee35..846bb7bc 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ContainmentBayS1T7Extreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ContainmentBayS1T7Extreme() :
-    InstanceContentScript( 20038 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20038 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp
index 77ba04ec..d7d6f352 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ContainmentBayZ1T9 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ContainmentBayZ1T9() :
-    InstanceContentScript( 20043 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20043 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
index 6987135c..2ecd9f20 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ContainmentBayZ1T9Extreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ContainmentBayZ1T9Extreme() :
-    InstanceContentScript( 20044 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20044 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/Emanation.cpp b/src/servers/Scripts/instances/trials/Emanation.cpp
index 3af527e8..6860ffcb 100644
--- a/src/servers/Scripts/instances/trials/Emanation.cpp
+++ b/src/servers/Scripts/instances/trials/Emanation.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Emanation :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Emanation() :
-    InstanceContentScript( 20048 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20048 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/EmanationExtreme.cpp b/src/servers/Scripts/instances/trials/EmanationExtreme.cpp
index 11849d3c..8bfefb1e 100644
--- a/src/servers/Scripts/instances/trials/EmanationExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/EmanationExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class EmanationExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   EmanationExtreme() :
-    InstanceContentScript( 20049 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20049 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/SpecialEventI.cpp b/src/servers/Scripts/instances/trials/SpecialEventI.cpp
index af4eef79..8945086d 100644
--- a/src/servers/Scripts/instances/trials/SpecialEventI.cpp
+++ b/src/servers/Scripts/instances/trials/SpecialEventI.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SpecialEventI :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SpecialEventI() :
-    InstanceContentScript( 20014 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20014 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/SpecialEventII.cpp b/src/servers/Scripts/instances/trials/SpecialEventII.cpp
index e76d49e9..450976b7 100644
--- a/src/servers/Scripts/instances/trials/SpecialEventII.cpp
+++ b/src/servers/Scripts/instances/trials/SpecialEventII.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SpecialEventII :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SpecialEventII() :
-    InstanceContentScript( 20015 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20015 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/SpecialEventIII.cpp b/src/servers/Scripts/instances/trials/SpecialEventIII.cpp
index 864edc8e..d0a8a2ca 100644
--- a/src/servers/Scripts/instances/trials/SpecialEventIII.cpp
+++ b/src/servers/Scripts/instances/trials/SpecialEventIII.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SpecialEventIII :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SpecialEventIII() :
-    InstanceContentScript( 20016 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20016 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp
index e02da370..6f8c70b0 100644
--- a/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp
+++ b/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheBowlofEmbers :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheBowlofEmbers() :
-    InstanceContentScript( 20001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20001 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
index 57e2f0f4..22b137ee 100644
--- a/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheBowlofEmbersExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheBowlofEmbersExtreme() :
-    InstanceContentScript( 20008 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20008 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp
index 4d3eeea1..6b9408cf 100644
--- a/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheBowlofEmbersHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheBowlofEmbersHard() :
-    InstanceContentScript( 20004 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20004 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheChrysalis.cpp b/src/servers/Scripts/instances/trials/TheChrysalis.cpp
index 9ab2c0ee..57adf3ca 100644
--- a/src/servers/Scripts/instances/trials/TheChrysalis.cpp
+++ b/src/servers/Scripts/instances/trials/TheChrysalis.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheChrysalis :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheChrysalis() :
-    InstanceContentScript( 20029 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20029 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp b/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp
index 1ac06a84..bd9762ec 100644
--- a/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp
+++ b/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheDragonsNeck :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheDragonsNeck() :
-    InstanceContentScript( 20026 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20026 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp
index 59fc233a..0900ff1f 100644
--- a/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp
+++ b/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFinalStepsofFaith :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFinalStepsofFaith() :
-    InstanceContentScript( 20039 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20039 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheHowlingEye.cpp b/src/servers/Scripts/instances/trials/TheHowlingEye.cpp
index f552b5ca..5fc19232 100644
--- a/src/servers/Scripts/instances/trials/TheHowlingEye.cpp
+++ b/src/servers/Scripts/instances/trials/TheHowlingEye.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheHowlingEye :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheHowlingEye() :
-    InstanceContentScript( 20003 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20003 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
index d79fa4c0..fbeead31 100644
--- a/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheHowlingEyeExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheHowlingEyeExtreme() :
-    InstanceContentScript( 20010 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20010 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp b/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp
index 61f070f3..1f301b38 100644
--- a/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheHowlingEyeHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheHowlingEyeHard() :
-    InstanceContentScript( 20006 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20006 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheJadeStoa.cpp b/src/servers/Scripts/instances/trials/TheJadeStoa.cpp
index d54a5d7d..52d2ed64 100644
--- a/src/servers/Scripts/instances/trials/TheJadeStoa.cpp
+++ b/src/servers/Scripts/instances/trials/TheJadeStoa.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheJadeStoa :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheJadeStoa() :
-    InstanceContentScript( 20051 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20051 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp b/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp
index 269fe63f..8b4f1857 100644
--- a/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheJadeStoaExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheJadeStoaExtreme() :
-    InstanceContentScript( 20052 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20052 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
index c127cd30..4d869a19 100644
--- a/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheLimitlessBlueExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheLimitlessBlueExtreme() :
-    InstanceContentScript( 20034 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20034 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp
index 622a5392..c1bf0dd8 100644
--- a/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheLimitlessBlueHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheLimitlessBlueHard() :
-    InstanceContentScript( 20033 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20033 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
index e8e9d250..7600ef70 100644
--- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
+++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheMinstrelsBalladNidhoggsRage :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheMinstrelsBalladNidhoggsRage() :
-    InstanceContentScript( 20040 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20040 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
index 659f80a0..1cde1c30 100644
--- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
+++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheMinstrelsBalladShinryusDomain :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheMinstrelsBalladShinryusDomain() :
-    InstanceContentScript( 20050 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20050 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
index a2ea4f9e..bd67a04f 100644
--- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
+++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheMinstrelsBalladThordansReign :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheMinstrelsBalladThordansReign() :
-    InstanceContentScript( 20036 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20036 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
index cda5a938..9b2a0c87 100644
--- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
+++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheMinstrelsBalladUltimasBane :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheMinstrelsBalladUltimasBane() :
-    InstanceContentScript( 20013 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20013 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheNavel.cpp b/src/servers/Scripts/instances/trials/TheNavel.cpp
index efafa11f..6daf15f3 100644
--- a/src/servers/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/Scripts/instances/trials/TheNavel.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheNavel :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheNavel() :
-    InstanceContentScript( 20002 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20002 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp b/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp
index 888eca76..145dc1cf 100644
--- a/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheNavelExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheNavelExtreme() :
-    InstanceContentScript( 20009 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20009 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheNavelHard.cpp b/src/servers/Scripts/instances/trials/TheNavelHard.cpp
index c2853340..2f7f601a 100644
--- a/src/servers/Scripts/instances/trials/TheNavelHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheNavelHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheNavelHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheNavelHard() :
-    InstanceContentScript( 20005 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20005 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp b/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp
index 3a947f25..cba40367 100644
--- a/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp
+++ b/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePoolofTribute :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePoolofTribute() :
-    InstanceContentScript( 20046 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20046 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
index 8853d0e2..8b65f471 100644
--- a/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePoolofTributeExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePoolofTributeExtreme() :
-    InstanceContentScript( 20047 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20047 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp b/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp
index 982b1a38..c16d50b4 100644
--- a/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp
+++ b/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheRoyalMenagerie :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheRoyalMenagerie() :
-    InstanceContentScript( 20045 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20045 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp b/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp
index b02fed9a..910219c4 100644
--- a/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp
+++ b/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSingularityReactor :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSingularityReactor() :
-    InstanceContentScript( 20035 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20035 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp b/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp
index 7c553c5d..a0253e07 100644
--- a/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp
+++ b/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheStepsofFaith :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheStepsofFaith() :
-    InstanceContentScript( 20028 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20028 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
index 01573c6d..b0a48eb0 100644
--- a/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheStrikingTreeExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheStrikingTreeExtreme() :
-    InstanceContentScript( 20023 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20023 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp b/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp
index 378b2844..fe3245ee 100644
--- a/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheStrikingTreeHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheStrikingTreeHard() :
-    InstanceContentScript( 20022 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20022 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp
index be095d69..450da17f 100644
--- a/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheWhorleaterExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheWhorleaterExtreme() :
-    InstanceContentScript( 20018 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20018 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp b/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp
index 961de4ec..cb73810f 100644
--- a/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheWhorleaterHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheWhorleaterHard() :
-    InstanceContentScript( 20017 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20017 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp b/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp
index 203b6e7f..89003f45 100644
--- a/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThokastThokExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThokastThokExtreme() :
-    InstanceContentScript( 20032 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20032 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ThokastThokHard.cpp b/src/servers/Scripts/instances/trials/ThokastThokHard.cpp
index 12bf19d9..ee25d9db 100644
--- a/src/servers/Scripts/instances/trials/ThokastThokHard.cpp
+++ b/src/servers/Scripts/instances/trials/ThokastThokHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThokastThokHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThokastThokHard() :
-    InstanceContentScript( 20031 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20031 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp b/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp
index ad744b82..df1edf14 100644
--- a/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThornmarchExtreme :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThornmarchExtreme() :
-    InstanceContentScript( 20012 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20012 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/ThornmarchHard.cpp b/src/servers/Scripts/instances/trials/ThornmarchHard.cpp
index b0b66420..b6f02b7e 100644
--- a/src/servers/Scripts/instances/trials/ThornmarchHard.cpp
+++ b/src/servers/Scripts/instances/trials/ThornmarchHard.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThornmarchHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThornmarchHard() :
-    InstanceContentScript( 20011 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20011 )
   {
   }
 
diff --git a/src/servers/Scripts/instances/trials/UrthsFount.cpp b/src/servers/Scripts/instances/trials/UrthsFount.cpp
index 58f03d00..adefd618 100644
--- a/src/servers/Scripts/instances/trials/UrthsFount.cpp
+++ b/src/servers/Scripts/instances/trials/UrthsFount.cpp
@@ -4,11 +4,11 @@
 using namespace Core;
 
 class UrthsFount :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   UrthsFount() :
-    InstanceContentScript( 20027 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20027 )
   {
   }
 
diff --git a/src/servers/Scripts/opening/OpeningGridania.cpp b/src/servers/Scripts/opening/OpeningGridania.cpp
index 294fd939..069625cd 100644
--- a/src/servers/Scripts/opening/OpeningGridania.cpp
+++ b/src/servers/Scripts/opening/OpeningGridania.cpp
@@ -3,7 +3,7 @@
 
 using namespace Core;
 
-class OpeningGridania : public EventScript
+class OpeningGridania : public Sapphire::ScriptAPI::EventScript
 {
 private:
   static constexpr auto ERANGE_HOWTO_ANN_AND_QUEST = 2117539;
@@ -99,7 +99,7 @@ private:
 
 public:
   OpeningGridania() :
-    EventScript( 1245186 )
+    Sapphire::ScriptAPI::EventScript( 1245186 )
   {
   }
 
diff --git a/src/servers/Scripts/opening/OpeningLimsa.cpp b/src/servers/Scripts/opening/OpeningLimsa.cpp
index 13ab9a94..2401ccc6 100644
--- a/src/servers/Scripts/opening/OpeningLimsa.cpp
+++ b/src/servers/Scripts/opening/OpeningLimsa.cpp
@@ -8,7 +8,7 @@ using namespace Core;
 // Quest ID: 1245185
 
 class OpeningLimsa :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   static constexpr auto ERANGE_HOWTO_ANN_AND_QUEST = 4101831;
@@ -116,7 +116,7 @@ private:
 
 public:
   OpeningLimsa() :
-    EventScript( 1245185 )
+    Sapphire::ScriptAPI::EventScript( 1245185 )
   {
   }
 
diff --git a/src/servers/Scripts/opening/OpeningUldah.cpp b/src/servers/Scripts/opening/OpeningUldah.cpp
index 18eb3a89..42e9fada 100644
--- a/src/servers/Scripts/opening/OpeningUldah.cpp
+++ b/src/servers/Scripts/opening/OpeningUldah.cpp
@@ -3,7 +3,7 @@
 
 using namespace Core;
 
-class OpeningUldah : public EventScript
+class OpeningUldah : public Sapphire::ScriptAPI::EventScript
 {
 private:
   static constexpr auto ERANGE_HOWTO_ANN_AND_QUEST = 4101650;
@@ -98,7 +98,7 @@ private:
 
 public:
   OpeningUldah() :
-    EventScript( 1245187 )
+    Sapphire::ScriptAPI::EventScript( 1245187 )
   {
   }
 
diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp
index 7b2cae4d..8aceb25b 100644
--- a/src/servers/Scripts/quest/ManFst001.cpp
+++ b/src/servers/Scripts/quest/ManFst001.cpp
@@ -12,7 +12,7 @@
 using namespace Core;
 
 class ManFst001 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   static constexpr auto SEQ_0 = 0;
@@ -88,7 +88,7 @@ private:
 
 public:
   ManFst001() :
-    EventScript( 65575 )
+    Sapphire::ScriptAPI::EventScript( 65575 )
   {
   }
 
diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp
index f8165da3..cd72400c 100644
--- a/src/servers/Scripts/quest/ManFst002.cpp
+++ b/src/servers/Scripts/quest/ManFst002.cpp
@@ -11,7 +11,7 @@
 
 using namespace Core;
 
-class ManFst002 : public EventScript
+class ManFst002 : public Sapphire::ScriptAPI::EventScript
 {
 private:
 
@@ -186,7 +186,7 @@ private:
 
 public:
   ManFst002() :
-    EventScript( 65621 )
+    Sapphire::ScriptAPI::EventScript( 65621 )
   {
   }
 
diff --git a/src/servers/Scripts/quest/ManFst003.cpp b/src/servers/Scripts/quest/ManFst003.cpp
index aa8631f1..b0c5f26e 100644
--- a/src/servers/Scripts/quest/ManFst003.cpp
+++ b/src/servers/Scripts/quest/ManFst003.cpp
@@ -11,7 +11,7 @@
 using namespace Core;
 
 class ManFst003 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -71,7 +71,7 @@ private:
 
 public:
   ManFst003() :
-    EventScript( 65659 )
+    Sapphire::ScriptAPI::EventScript( 65659 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/ManFst004.cpp b/src/servers/Scripts/quest/ManFst004.cpp
index d6c2b44b..4231a30e 100644
--- a/src/servers/Scripts/quest/ManFst004.cpp
+++ b/src/servers/Scripts/quest/ManFst004.cpp
@@ -11,7 +11,7 @@
 using namespace Core;
 
 class ManFst004 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -71,7 +71,7 @@ private:
 
 public:
   ManFst004() :
-    EventScript( 65660 )
+    Sapphire::ScriptAPI::EventScript( 65660 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/ManSea001.cpp b/src/servers/Scripts/quest/ManSea001.cpp
index 41d6ff89..61899a69 100644
--- a/src/servers/Scripts/quest/ManSea001.cpp
+++ b/src/servers/Scripts/quest/ManSea001.cpp
@@ -11,7 +11,7 @@
 using namespace Core;
 
 class ManSea001 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
 
@@ -134,7 +134,7 @@ private:
 
 public:
   ManSea001() :
-    EventScript( 65643 )
+    Sapphire::ScriptAPI::EventScript( 65643 )
   {
   }
 
diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index 2478e254..088a9153 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -11,7 +11,7 @@
 using namespace Core;
 
 class ManSea002 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   static constexpr auto SEQ_0 = 0;
@@ -37,7 +37,7 @@ private:
 
 public:
   ManSea002() :
-    EventScript( 65644 )
+    Sapphire::ScriptAPI::EventScript( 65644 )
   {
   }
 
diff --git a/src/servers/Scripts/quest/ManSea003.cpp b/src/servers/Scripts/quest/ManSea003.cpp
index c1d3a077..e4904ba4 100644
--- a/src/servers/Scripts/quest/ManSea003.cpp
+++ b/src/servers/Scripts/quest/ManSea003.cpp
@@ -11,7 +11,7 @@
 using namespace Core;
 
 class ManSea003 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -53,7 +53,7 @@ private:
 
 public:
   ManSea003() :
-    EventScript( 65645 )
+    Sapphire::ScriptAPI::EventScript( 65645 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp
index b70abf12..03602e5f 100644
--- a/src/servers/Scripts/quest/ManWil001.cpp
+++ b/src/servers/Scripts/quest/ManWil001.cpp
@@ -11,7 +11,7 @@
 using namespace Core;
 
 class ManWil001 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   static constexpr auto SEQ_0 = 0;
@@ -166,7 +166,7 @@ private:
 
 public:
   ManWil001() :
-    EventScript( 66130 )
+    Sapphire::ScriptAPI::EventScript( 66130 )
   {
   }
 
diff --git a/src/servers/Scripts/quest/ManWil002.cpp b/src/servers/Scripts/quest/ManWil002.cpp
index b58256d9..0412de3b 100644
--- a/src/servers/Scripts/quest/ManWil002.cpp
+++ b/src/servers/Scripts/quest/ManWil002.cpp
@@ -11,7 +11,7 @@
 using namespace Core;
 
 class ManWil002 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -59,7 +59,7 @@ private:
 
 public:
   ManWil002() :
-    EventScript( 66104 )
+    Sapphire::ScriptAPI::EventScript( 66104 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
index f9a46c43..c71fadce 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000233
 
 class SubFst001 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   static constexpr auto SEQ_0 = 0;
@@ -66,7 +66,7 @@ private:
 
 public:
   SubFst001() :
-    EventScript( 65560 )
+    Sapphire::ScriptAPI::EventScript( 65560 )
   {
   }
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
index 8206de6b..481e3610 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000263
 
 class SubFst002 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   static constexpr auto SEQ_0 = 0;
@@ -52,7 +52,7 @@ private:
 
 public:
   SubFst002() :
-    EventScript( 65561 )
+    Sapphire::ScriptAPI::EventScript( 65561 )
   {
   }
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp
index 62dd4425..c019ea1f 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000315
 
 class SubFst003 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -41,7 +41,7 @@ private:
 
 public:
   SubFst003() :
-    EventScript( 65562 )
+    Sapphire::ScriptAPI::EventScript( 65562 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp
index 89fcb0df..155db5ca 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000789
 
 class SubFst004 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -45,7 +45,7 @@ private:
 
 public:
   SubFst004() :
-    EventScript( 65563 )
+    Sapphire::ScriptAPI::EventScript( 65563 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp
index f0a70157..641ec07e 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000629
 
 class SubFst008 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -45,7 +45,7 @@ private:
 
 public:
   SubFst008() :
-    EventScript( 65568 )
+    Sapphire::ScriptAPI::EventScript( 65568 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp
index b1cb6e61..e9cee5ee 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000408
 
 class SubFst009 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -41,7 +41,7 @@ private:
 
 public:
   SubFst009() :
-    EventScript( 65570 )
+    Sapphire::ScriptAPI::EventScript( 65570 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
index 782848c1..d1339fb8 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000195
 
 class SubFst010 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   static constexpr auto SEQ_0 = 0;
@@ -48,7 +48,7 @@ private:
 
 public:
   SubFst010() :
-    EventScript( 65537 )
+    Sapphire::ScriptAPI::EventScript( 65537 )
   {
   }
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp
index 5caf16ab..e9839111 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp
@@ -13,7 +13,7 @@ using namespace Core;
 //NEED TEST KILLCREDIT
 
 class SubFst011 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // GetQuestUI8AL
@@ -38,7 +38,7 @@ private:
 
 public:
   SubFst011() :
-    EventScript( 65573 )
+    Sapphire::ScriptAPI::EventScript( 65573 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
index 93b6f3b2..740da9b7 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000162
 
 class SubFst013 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   static constexpr auto SEQ_0 = 0;
@@ -154,7 +154,7 @@ private:
 
 public:
   SubFst013() :
-    EventScript( 65576 )
+    Sapphire::ScriptAPI::EventScript( 65576 )
   {
   }
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp
index 45db93ad..abea218c 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000300
 
 class SubFst014 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -45,7 +45,7 @@ private:
 
 public:
   SubFst014() :
-    EventScript( 65577 )
+    Sapphire::ScriptAPI::EventScript( 65577 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp
index 1c221595..a574dc7b 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000286
 
 class SubFst015 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -43,7 +43,7 @@ private:
 
 public:
   SubFst015() :
-    EventScript( 65578 )
+    Sapphire::ScriptAPI::EventScript( 65578 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp
index bbccc753..3e793627 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000429
 
 class SubFst019 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -38,7 +38,7 @@ private:
 
 public:
   SubFst019() :
-    EventScript( 65585 )
+    Sapphire::ScriptAPI::EventScript( 65585 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp
index 908c2ff5..6c1710ad 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp
@@ -13,7 +13,7 @@ using namespace Core;
 //NEED TEST KILLCREDIT
 
 class SubFst026 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -40,7 +40,7 @@ private:
 
 public:
   SubFst026() :
-    EventScript( 65706 )
+    Sapphire::ScriptAPI::EventScript( 65706 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp
index 045ac1ba..90e5862f 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1000430
 
 class SubFst029 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -38,7 +38,7 @@ private:
   static constexpr auto Seq1Actor0Npctradeok = 100;
 
 public:
-  SubFst029() : EventScript( 65708 )
+  SubFst029() : Sapphire::ScriptAPI::EventScript( 65708 )
   {};
 
   ~SubFst029()
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst030.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst030.cpp
index ea27aac3..2ba2eb3b 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst030.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst030.cpp
@@ -12,7 +12,7 @@ using namespace Core;
 // End NPC: 1000632
 
 class SubFst030 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -54,7 +54,7 @@ private:
 
 public:
   SubFst030() :
-    EventScript( 65709 )
+    Sapphire::ScriptAPI::EventScript( 65709 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp
index d120d80c..6ab413f2 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp
@@ -13,7 +13,7 @@ using namespace Core;
 //NEED TEST KILLCREDIT
 
 class SubFst041 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -46,7 +46,7 @@ private:
 
 public:
   SubFst041() :
-    EventScript( 65733 )
+    Sapphire::ScriptAPI::EventScript( 65733 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
index a35c5967..1c947ed9 100644
--- a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
+++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
@@ -12,7 +12,7 @@ using namespace Core;
 // End NPC: 1003604
 
 class SubSea001 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -54,7 +54,7 @@ private:
 
 public:
   SubSea001() :
-    EventScript( 65647 )
+    Sapphire::ScriptAPI::EventScript( 65647 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil000.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil000.cpp
index 4b5e3c35..760db8ac 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil000.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil000.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1002278
 
 class SubWil000 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -37,7 +37,7 @@ private:
 
 public:
   SubWil000() :
-    EventScript( 65685 )
+    Sapphire::ScriptAPI::EventScript( 65685 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil001.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil001.cpp
index 2a461cb2..fdd6ef2f 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil001.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil001.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1001288
 
 class SubWil001 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -38,7 +38,7 @@ private:
 
 public:
   SubWil001() :
-    EventScript( 65686 )
+    Sapphire::ScriptAPI::EventScript( 65686 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil002.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil002.cpp
index 3087c84f..20f65c02 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil002.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil002.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1001289
 
 class SubWil002 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -42,7 +42,7 @@ private:
 
 public:
   SubWil002() :
-    EventScript( 65687 )
+    Sapphire::ScriptAPI::EventScript( 65687 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil004.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil004.cpp
index 4b558331..6d857111 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil004.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil004.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1003896
 
 class SubWil004 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -47,7 +47,7 @@ private:
 
 public:
   SubWil004() :
-    EventScript( 65689 )
+    Sapphire::ScriptAPI::EventScript( 65689 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil006.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil006.cpp
index e1a11261..0cf698ea 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil006.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil006.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1001299
 
 class SubWil006 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -40,7 +40,7 @@ private:
 
 public:
   SubWil006() :
-    EventScript( 65701 )
+    Sapphire::ScriptAPI::EventScript( 65701 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil007.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil007.cpp
index 0a873bf9..9d2f2200 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil007.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil007.cpp
@@ -12,7 +12,7 @@ using namespace Core;
 // End NPC: 1007621
 
 class SubWil007 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -44,7 +44,7 @@ private:
 
 public:
   SubWil007() :
-    EventScript( 65703 )
+    Sapphire::ScriptAPI::EventScript( 65703 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil018.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil018.cpp
index e2e78206..097320d5 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil018.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil018.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1001675
 
 class SubWil018 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -44,7 +44,7 @@ private:
 
 public:
   SubWil018() :
-    EventScript( 65932 )
+    Sapphire::ScriptAPI::EventScript( 65932 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil019.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil019.cpp
index 4754adce..550d359f 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil019.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil019.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1001691
 
 class SubWil019 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -37,7 +37,7 @@ private:
 
 public:
   SubWil019() :
-    EventScript( 65928 )
+    Sapphire::ScriptAPI::EventScript( 65928 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil021.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil021.cpp
index f4947d51..0920de6a 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil021.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil021.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1001657
 
 class SubWil021 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -41,7 +41,7 @@ private:
 
 public:
   SubWil021() :
-    EventScript( 65930 )
+    Sapphire::ScriptAPI::EventScript( 65930 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil022.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil022.cpp
index ced80b96..1d090eb0 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil022.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil022.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1001679
 
 class SubWil022 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -41,7 +41,7 @@ private:
 
 public:
   SubWil022() :
-    EventScript( 65931 )
+    Sapphire::ScriptAPI::EventScript( 65931 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil027.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil027.cpp
index d79f36af..11097fc0 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil027.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil027.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1003995
 
 class SubWil027 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -35,7 +35,7 @@ private:
 
 public:
   SubWil027() :
-    EventScript( 66131 )
+    Sapphire::ScriptAPI::EventScript( 66131 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil028.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil028.cpp
index 7215484e..1fcef78e 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil028.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil028.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1001497
 
 class SubWil028 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -37,7 +37,7 @@ private:
 
 public:
   SubWil028() :
-    EventScript( 65925 )
+    Sapphire::ScriptAPI::EventScript( 65925 )
   {
   };
 
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil029.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil029.cpp
index 778d645d..eddeabad 100644
--- a/src/servers/Scripts/quest/subquest/uldah/SubWil029.cpp
+++ b/src/servers/Scripts/quest/subquest/uldah/SubWil029.cpp
@@ -11,7 +11,7 @@ using namespace Core;
 // End NPC: 1001992
 
 class SubWil029 :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 private:
   // Basic quest information
@@ -40,7 +40,7 @@ private:
 
 public:
   SubWil029() :
-    EventScript( 65926 )
+    Sapphire::ScriptAPI::EventScript( 65926 )
   {
   };
 
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.cpp b/src/servers/sapphire_zone/Script/NativeScriptApi.cpp
index 3963f7aa..e4dc2e7e 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.cpp
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.cpp
@@ -3,6 +3,7 @@
 #include <typeindex>
 #include <Event/EventHandler.h>
 #include "NativeScriptApi.h"
+#include <cassert>
 
 #ifdef _MSC_VER
 #define EXPORT __declspec( dllexport )
@@ -12,156 +13,171 @@
 
 using namespace Core;
 
-ScriptObject::ScriptObject( uint32_t id, std::size_t type ) :
-  m_id( id ),
-  m_type( type )
-{
-}
-
-uint32_t ScriptObject::getId() const
-{
-  return m_id;
-}
-
-std::size_t ScriptObject::getType() const
-{
-  return m_type;
-}
-
-///////////////////////////////////////////////////////////////////
-
-StatusEffectScript::StatusEffectScript( uint32_t effectId ) :
-  ScriptObject( effectId, typeid( StatusEffectScript ).hash_code() )
-{
-}
-
-void StatusEffectScript::onTick( Entity::Chara& actor )
-{
-}
-
-void StatusEffectScript::onApply( Entity::Chara& actor )
-{
-}
-
-void StatusEffectScript::onRemove( Entity::Chara& actor )
-{
-}
-
-void StatusEffectScript::onExpire( Entity::Chara& actor )
-{
-}
-
-void StatusEffectScript::onPlayerCollision( Entity::Chara& actor, Entity::Chara& actorHit )
-{
-}
-
-void StatusEffectScript::onPlayerFinishCast( Entity::Chara& actor )
-{
-}
-
-void StatusEffectScript::onPlayerDamaged( Entity::Chara& actor )
-{
-}
-
-void StatusEffectScript::onPlayerDeath( Entity::Chara& actor )
-{
-}
-
-///////////////////////////////////////////////////////////////////
-
-ActionScript::ActionScript( uint32_t abilityId ) :
-  ScriptObject( abilityId, typeid( ActionScript ).hash_code() )
-{
-}
-
-void ActionScript::onStart( Entity::Chara& sourceActor, Entity::Chara& targetActor )
-{
-}
-
-void ActionScript::onCastFinish( Entity::Player& player, Entity::Chara& targetActor )
-{
-}
-
-void ActionScript::onInterrupt( Entity::Chara& sourceActor/*, Core::Entity::Chara targetActor*/ )
-{
-}
-
-///////////////////////////////////////////////////////////////////
-
-EventScript::EventScript( uint32_t questId ) :
-  ScriptObject( questId, typeid( EventScript ).hash_code() )
-{
-}
-
-void EventScript::onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId )
-{
-}
-
-void EventScript::onNpcKill( uint32_t npcId, Entity::Player& player )
-{
-}
-
-void EventScript::onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player )
-{
-}
-
-void EventScript::onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
-{
-}
-
-void EventScript::onWithinRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z )
-{
-}
-
-void EventScript::onOutsideRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z )
-{
-}
-
-void
-  EventScript::onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId )
-{
-}
-
-void EventScript::onEventHandlerTradeReturn( Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param,
-                                             uint32_t catalogId )
-{
-}
-
-///////////////////////////////////////////////////////////////////
-
-BattleNpcScript::BattleNpcScript( uint32_t npcId ) :
-  ScriptObject( npcId, typeid( BattleNpcScript ).hash_code() )
-{
-}
-
-///////////////////////////////////////////////////////////////////
-
-ZoneScript::ZoneScript( uint32_t zoneId ) :
-  ScriptObject( zoneId, typeid( ZoneScript ).hash_code() )
-{
-}
-
-void ZoneScript::onZoneInit()
-{
-}
-
-///////////////////////////////////////////////////////////////////
-
-InstanceContentScript::InstanceContentScript( uint32_t instanceContentId ) :
-  ScriptObject( uint32_t{ 0x8003 } << 16 | instanceContentId, typeid( InstanceContentScript ).hash_code() )
-{
-}
-
-void InstanceContentScript::onInit( InstanceContentPtr instance )
-{
-}
-
-void InstanceContentScript::onUpdate( InstanceContentPtr instance, uint32_t currTime )
-{
-}
-
-void InstanceContentScript::onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                                              uint16_t param2 )
+namespace Sapphire::ScriptAPI
 {
+  ScriptObject::ScriptObject( uint32_t id, std::size_t type ) :
+    m_id( id ),
+    m_type( type )
+  {
+  }
+
+  uint32_t ScriptObject::getId() const
+  {
+    return m_id;
+  }
+
+  std::size_t ScriptObject::getType() const
+  {
+    return m_type;
+  }
+
+  void ScriptObject::setFramework( Core::Framework* fw )
+  {
+    assert( fw );
+    m_framework = fw;
+  }
+
+  Core::Framework* ScriptObject::getFramework() const
+  {
+    return m_framework;
+  }
+
+  ///////////////////////////////////////////////////////////////////
+
+  StatusEffectScript::StatusEffectScript( uint32_t effectId ) :
+    ScriptObject( effectId, typeid( StatusEffectScript ).hash_code() )
+  {
+  }
+
+  void StatusEffectScript::onTick( Entity::Chara& actor )
+  {
+  }
+
+  void StatusEffectScript::onApply( Entity::Chara& actor )
+  {
+  }
+
+  void StatusEffectScript::onRemove( Entity::Chara& actor )
+  {
+  }
+
+  void StatusEffectScript::onExpire( Entity::Chara& actor )
+  {
+  }
+
+  void StatusEffectScript::onPlayerCollision( Entity::Chara& actor, Entity::Chara& actorHit )
+  {
+  }
+
+  void StatusEffectScript::onPlayerFinishCast( Entity::Chara& actor )
+  {
+  }
+
+  void StatusEffectScript::onPlayerDamaged( Entity::Chara& actor )
+  {
+  }
+
+  void StatusEffectScript::onPlayerDeath( Entity::Chara& actor )
+  {
+  }
+
+  ///////////////////////////////////////////////////////////////////
+
+  ActionScript::ActionScript( uint32_t abilityId ) :
+    ScriptObject( abilityId, typeid( ActionScript ).hash_code() )
+  {
+  }
+
+  void ActionScript::onStart( Entity::Chara& sourceActor, Entity::Chara& targetActor )
+  {
+  }
+
+  void ActionScript::onCastFinish( Entity::Player& player, Entity::Chara& targetActor )
+  {
+  }
+
+  void ActionScript::onInterrupt( Entity::Chara& sourceActor/*, Core::Entity::Chara targetActor*/ )
+  {
+  }
+
+  ///////////////////////////////////////////////////////////////////
+
+  EventScript::EventScript( uint32_t questId ) :
+    ScriptObject( questId, typeid( EventScript ).hash_code() )
+  {
+  }
+
+  void EventScript::onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId )
+  {
+  }
+
+  void EventScript::onNpcKill( uint32_t npcId, Entity::Player& player )
+  {
+  }
+
+  void EventScript::onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player )
+  {
+  }
+
+  void EventScript::onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
+  {
+  }
+
+  void EventScript::onWithinRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z )
+  {
+  }
+
+  void EventScript::onOutsideRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z )
+  {
+  }
+
+  void
+    EventScript::onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId )
+  {
+  }
+
+  void EventScript::onEventHandlerTradeReturn( Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param,
+                                              uint32_t catalogId )
+  {
+  }
+
+  ///////////////////////////////////////////////////////////////////
+
+  BattleNpcScript::BattleNpcScript( uint32_t npcId ) :
+    ScriptObject( npcId, typeid( BattleNpcScript ).hash_code() )
+  {
+  }
+
+  ///////////////////////////////////////////////////////////////////
+
+  ZoneScript::ZoneScript( uint32_t zoneId ) :
+    ScriptObject( zoneId, typeid( ZoneScript ).hash_code() )
+  {
+  }
+
+  void ZoneScript::onZoneInit()
+  {
+  }
+
+  ///////////////////////////////////////////////////////////////////
+
+  InstanceContentScript::InstanceContentScript( uint32_t instanceContentId ) :
+    ScriptObject( uint32_t{ 0x8003 } << 16 | instanceContentId, typeid( InstanceContentScript ).hash_code() )
+  {
+  }
+
+  void InstanceContentScript::onInit( InstanceContentPtr instance )
+  {
+  }
+
+  void InstanceContentScript::onUpdate( InstanceContentPtr instance, uint32_t currTime )
+  {
+  }
+
+  void InstanceContentScript::onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                                                uint16_t param2 )
+  {
+  }
+
 }
 
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index 64c8e79a..566422dc 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -15,190 +15,215 @@
 #define EVENTSCRIPT_AETHERYTE_ID 0x50000
 #define EVENTSCRIPT_AETHERNET_ID 0x50001
 
-/*!
- * @brief The base class that any script should inherit from and set the type param accordingly
- */
-class ScriptObject
+namespace Core
 {
-protected:
-  uint32_t m_id;
-  std::size_t m_type;
+  class Framework;
+}
 
-public:
-  /*!
-   * @param id an ID which uniquely identifies this script in relation to it's type
-   * @param type The RTTI hash code of the implementing type to uniquely identify it
-   */
-  ScriptObject( uint32_t id, std::size_t type );
-
-  /*!
-   * @brief Gets the ID set for this script
-   *
-   * @return The allocated ID of the script set during object construction
-   */
-  virtual uint32_t getId() const;
-
-  /*!
-   * @brief Gets the unique identifier (hash_code) of the script
-   *
-   * @return The hash_code of the script
-   */
-  virtual std::size_t getType() const;
-};
-
-
-/*!
- * @brief The base class for any scripts that implement behaviour related to status effects.
- */
-class StatusEffectScript : public ScriptObject
+namespace Sapphire::ScriptAPI
 {
-public:
-  explicit StatusEffectScript( uint32_t effectId );
-
   /*!
-   * @brief Called on each tick that a status effect is active on an actor
-   *
-   * @param actor the actor the status effect is ticking on
-   */
-  virtual void onTick( Core::Entity::Chara& actor );
-
-  /*!
-   * @brief Called when the status effect is applied to an actor
-   *
-   * @param actor the actor on which the status effect was applied to
-   */
-  virtual void onApply( Core::Entity::Chara& actor );
-
-  /*!
-   * @brief Called when the actor (usually a player) removes the status effect by right clicking it
-   *
-   * @param actor The actor on which the effect was removed from
-   */
-  virtual void onRemove( Core::Entity::Chara& actor );
-
-  /*!
-   * @brief Called when the status effect expires
-   *
-   * @param actor The actor on which the efect expired on
-   */
-  virtual void onExpire( Core::Entity::Chara& actor );
-
-  /*!
-   * @brief Called when the player with the status effect collides with another player, eg. hot potato
-   *
-   * @param actor The actor which has status effect
-   * @param actorHit The actor who collided with the status effect owner
-   */
-  virtual void onPlayerCollision( Core::Entity::Chara& actor, Core::Entity::Chara& actorHit );
-
-  /*!
-   * @brief Called when the owner finishes a cast
-   *
-   * @param actor The actor who finished a cast
-   */
-  virtual void onPlayerFinishCast( Core::Entity::Chara& actor );
-
-  /*!
-   * @brief Called when the status effect owner was damaged
-   *
-   * @param actor The actor that was damaged
-   */
-  virtual void onPlayerDamaged( Core::Entity::Chara& actor );
-
-  /*!
-   * @brief Called when the status effect owner dies
-   *
-   * @param actor The actor that died
-   */
-  virtual void onPlayerDeath( Core::Entity::Chara& actor );
-};
-
-
-/*!
- * @brief The base class for any scripts that implement behaviour related to actions
- */
-class ActionScript :  public ScriptObject
-{
-public:
-  explicit ActionScript( uint32_t abilityId );
-
-  virtual void onStart( Core::Entity::Chara& sourceActor, Core::Entity::Chara& targetActor );
-
-  virtual void onCastFinish( Core::Entity::Player& player, Core::Entity::Chara& targetActor );
-
-  virtual void onInterrupt( Core::Entity::Chara& sourceActor/*, Core::Entity::Chara targetActor*/ );
-};
-
-/*!
- * @brief The base class for any scripts that implement behaviour related to the event system.
- * This includes but is not limited to: NPCs, shops, some world objects
- */
-class EventScript : public ScriptObject
-{
-protected:
-  template< typename Ret, class Obj >
-  inline std::function< void( Core::Entity::Player& ) > bindScene( Ret ( Obj::*f )( Core::Entity::Player& ) )
+  * @brief The base class that any script should inherit from and set the type param accordingly
+  */
+  class ScriptObject
   {
-    return std::bind( f, static_cast< Obj* >( this ), std::placeholders::_1 );
-  }
+  protected:
+    uint32_t m_id;
+    std::size_t m_type;
 
-public:
-  explicit EventScript( uint32_t questId );
+    Core::Framework* m_framework;
 
-  virtual void onTalk( uint32_t eventId, Core::Entity::Player& player, uint64_t actorId );
+  public:
+    /*!
+    * @param id an ID which uniquely identifies this script in relation to it's type
+    * @param type The RTTI hash code of the implementing type to uniquely identify it
+    */
+    ScriptObject( uint32_t id, std::size_t type );
 
-  virtual void onNpcKill( uint32_t npcId, Core::Entity::Player& player );
+    /*!
+    * @brief Gets the ID set for this script
+    *
+    * @return The allocated ID of the script set during object construction
+    */
+    virtual uint32_t getId() const;
 
-  virtual void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Core::Entity::Player& player );
+    /*!
+    * @brief Gets the unique identifier (hash_code) of the script
+    *
+    * @return The hash_code of the script
+    */
+    virtual std::size_t getType() const;
 
-  virtual void onEnterTerritory( Core::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 );
+    /*!
+    * @brief Sets the ptr to the framework for use inside scripts
+    * 
+    * @param fw The ptr to g_fw (Core::Framework)
+    */
+    virtual void setFramework( Core::Framework* fw );
 
-  virtual void onWithinRange( Core::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z );
-
-  virtual void onOutsideRange( Core::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z );
-
-  virtual void
-    onEventItem( Core::Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId );
-
-  virtual void onEventHandlerTradeReturn( Core::Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param,
-                                          uint32_t catalogId );
-};
+    /*!
+    * @brief Returns the current ptr to framework set for the current script
+    * 
+    * @return A pointer to Core::Framework
+    */
+    virtual Core::Framework* getFramework() const;
+  };
 
 
-/*!
- * @brief The base class for any scripts that implement behaviour related to BattleNPCs
- */
-class BattleNpcScript : public ScriptObject
-{
-public:
-  explicit BattleNpcScript( uint32_t npcId );
-};
+  /*!
+  * @brief The base class for any scripts that implement behaviour related to status effects.
+  */
+  class StatusEffectScript : public ScriptObject
+  {
+  public:
+    explicit StatusEffectScript( uint32_t effectId );
 
-/*!
- * @brief The base class for any scripts that implement behaviour related to zones
- */
-class ZoneScript : public ScriptObject
-{
-public:
-  explicit ZoneScript( uint32_t zoneId );
+    /*!
+    * @brief Called on each tick that a status effect is active on an actor
+    *
+    * @param actor the actor the status effect is ticking on
+    */
+    virtual void onTick( Core::Entity::Chara& actor );
 
-  virtual void onZoneInit();
-};
+    /*!
+    * @brief Called when the status effect is applied to an actor
+    *
+    * @param actor the actor on which the status effect was applied to
+    */
+    virtual void onApply( Core::Entity::Chara& actor );
 
-/*!
- * @brief The base class for any scripts that implement behaviour related to instance content zones
- */
-class InstanceContentScript : public ScriptObject
-{
-public:
-  explicit InstanceContentScript( uint32_t instanceContentId );
+    /*!
+    * @brief Called when the actor (usually a player) removes the status effect by right clicking it
+    *
+    * @param actor The actor on which the effect was removed from
+    */
+    virtual void onRemove( Core::Entity::Chara& actor );
 
-  virtual void onInit( Core::InstanceContentPtr instance );
+    /*!
+    * @brief Called when the status effect expires
+    *
+    * @param actor The actor on which the efect expired on
+    */
+    virtual void onExpire( Core::Entity::Chara& actor );
 
-  virtual void onUpdate( Core::InstanceContentPtr instance, uint32_t currTime );
+    /*!
+    * @brief Called when the player with the status effect collides with another player, eg. hot potato
+    *
+    * @param actor The actor which has status effect
+    * @param actorHit The actor who collided with the status effect owner
+    */
+    virtual void onPlayerCollision( Core::Entity::Chara& actor, Core::Entity::Chara& actorHit );
 
-  virtual void onEnterTerritory( Core::InstanceContentPtr instance, Core::Entity::Player& player, uint32_t eventId,
-                                 uint16_t param1, uint16_t param2 );
-};
+    /*!
+    * @brief Called when the owner finishes a cast
+    *
+    * @param actor The actor who finished a cast
+    */
+    virtual void onPlayerFinishCast( Core::Entity::Chara& actor );
+
+    /*!
+    * @brief Called when the status effect owner was damaged
+    *
+    * @param actor The actor that was damaged
+    */
+    virtual void onPlayerDamaged( Core::Entity::Chara& actor );
+
+    /*!
+    * @brief Called when the status effect owner dies
+    *
+    * @param actor The actor that died
+    */
+    virtual void onPlayerDeath( Core::Entity::Chara& actor );
+  };
+
+
+  /*!
+  * @brief The base class for any scripts that implement behaviour related to actions
+  */
+  class ActionScript :  public ScriptObject
+  {
+  public:
+    explicit ActionScript( uint32_t abilityId );
+
+    virtual void onStart( Core::Entity::Chara& sourceActor, Core::Entity::Chara& targetActor );
+
+    virtual void onCastFinish( Core::Entity::Player& player, Core::Entity::Chara& targetActor );
+
+    virtual void onInterrupt( Core::Entity::Chara& sourceActor/*, Core::Entity::Chara targetActor*/ );
+  };
+
+  /*!
+  * @brief The base class for any scripts that implement behaviour related to the event system.
+  * This includes but is not limited to: NPCs, shops, some world objects
+  */
+  class EventScript : public ScriptObject
+  {
+  protected:
+    template< typename Ret, class Obj >
+    inline std::function< void( Core::Entity::Player& ) > bindScene( Ret ( Obj::*f )( Core::Entity::Player& ) )
+    {
+      return std::bind( f, static_cast< Obj* >( this ), std::placeholders::_1 );
+    }
+
+  public:
+    explicit EventScript( uint32_t questId );
+
+    virtual void onTalk( uint32_t eventId, Core::Entity::Player& player, uint64_t actorId );
+
+    virtual void onNpcKill( uint32_t npcId, Core::Entity::Player& player );
+
+    virtual void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Core::Entity::Player& player );
+
+    virtual void onEnterTerritory( Core::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 );
+
+    virtual void onWithinRange( Core::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z );
+
+    virtual void onOutsideRange( Core::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z );
+
+    virtual void
+      onEventItem( Core::Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId );
+
+    virtual void onEventHandlerTradeReturn( Core::Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param,
+                                            uint32_t catalogId );
+  };
+
+
+  /*!
+  * @brief The base class for any scripts that implement behaviour related to BattleNPCs
+  */
+  class BattleNpcScript : public ScriptObject
+  {
+  public:
+    explicit BattleNpcScript( uint32_t npcId );
+  };
+
+  /*!
+  * @brief The base class for any scripts that implement behaviour related to zones
+  */
+  class ZoneScript : public ScriptObject
+  {
+  public:
+    explicit ZoneScript( uint32_t zoneId );
+
+    virtual void onZoneInit();
+  };
+
+  /*!
+  * @brief The base class for any scripts that implement behaviour related to instance content zones
+  */
+  class InstanceContentScript : public ScriptObject
+  {
+  public:
+    explicit InstanceContentScript( uint32_t instanceContentId );
+
+    virtual void onInit( Core::InstanceContentPtr instance );
+
+    virtual void onUpdate( Core::InstanceContentPtr instance, uint32_t currTime );
+
+    virtual void onEnterTerritory( Core::InstanceContentPtr instance, Core::Entity::Player& player, uint32_t eventId,
+                                  uint16_t param1, uint16_t param2 );
+  };
+
+}
 
 #endif
diff --git a/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp b/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp
index ac7a1f7f..d7bd0139 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp
+++ b/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp
@@ -2,6 +2,10 @@
 
 #include <Crypt/md5.h>
 
+#include "Framework.h"
+
+extern Core::Framework g_fw;
+
 namespace Core {
 namespace Scripting {
 
@@ -29,6 +33,8 @@ bool NativeScriptMgr::loadScript( const std::string& path )
     auto script = scripts[ i ];
     module->scripts.push_back( script );
 
+    script->setFramework( &g_fw );
+
     m_scripts[ script->getType() ][ script->getId() ] = script;
 
     success = true;
diff --git a/src/servers/sapphire_zone/Script/NativeScriptMgr.h b/src/servers/sapphire_zone/Script/NativeScriptMgr.h
index d3294e54..5d326cef 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptMgr.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptMgr.h
@@ -19,7 +19,7 @@ namespace Core::Scripting
     /*!
      * @brief An internal list that maps script types to another list containing scripts indexed by their assoicated id
      */
-    std::unordered_map< std::size_t, std::unordered_map< uint32_t, ScriptObject* > > m_scripts;
+    std::unordered_map< std::size_t, std::unordered_map< uint32_t, Sapphire::ScriptAPI::ScriptObject* > > m_scripts;
 
 
     ScriptLoader m_loader;
diff --git a/src/servers/sapphire_zone/Script/ScriptInfo.h b/src/servers/sapphire_zone/Script/ScriptInfo.h
index 058860ee..2632c762 100644
--- a/src/servers/sapphire_zone/Script/ScriptInfo.h
+++ b/src/servers/sapphire_zone/Script/ScriptInfo.h
@@ -60,7 +60,7 @@ namespace Core::Scripting
      *
      * This is tracked so when we unload this module we can call delete on each ScriptObject and correctly free it from memory.
      */
-    std::vector< ScriptObject* > scripts;
+    std::vector< Sapphire::ScriptAPI::ScriptObject* > scripts;
   };
 
 }
diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
index 46ee4ca5..657ffff9 100644
--- a/src/servers/sapphire_zone/Script/ScriptLoader.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
@@ -101,9 +101,9 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st
   return info;
 }
 
-ScriptObject** Core::Scripting::ScriptLoader::getScripts( ModuleHandle handle )
+Sapphire::ScriptAPI::ScriptObject** Core::Scripting::ScriptLoader::getScripts( ModuleHandle handle )
 {
-  using getScripts = ScriptObject** ( * )();
+  using getScripts = Sapphire::ScriptAPI::ScriptObject** ( * )();
   auto pLog = g_fw.get< Logger >();
 
 #ifdef _WIN32
diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.h b/src/servers/sapphire_zone/Script/ScriptLoader.h
index 11d399c4..403556c8 100644
--- a/src/servers/sapphire_zone/Script/ScriptLoader.h
+++ b/src/servers/sapphire_zone/Script/ScriptLoader.h
@@ -86,7 +86,7 @@ namespace Core::Scripting
      * @param handle The handle to the module
      * @return An array of unknown size ending with nullptr if success, nullptr if not
      */
-    ScriptObject** getScripts( ModuleHandle handle );
+    Sapphire::ScriptAPI::ScriptObject** getScripts( ModuleHandle handle );
 
     /*!
      * @brief Checks to see if a module with the specified name exists
diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.cpp b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
index cbd8cada..8cb15069 100644
--- a/src/servers/sapphire_zone/Script/ScriptMgr.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
@@ -187,7 +187,7 @@ bool Core::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t actorI
     scriptId = 0x00040001;
   }
 
-  auto script = m_nativeScriptMgr->getScript< EventScript >( scriptId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( scriptId );
   if( !script )
     return false;
   script->onTalk( eventId, player, actorId );
@@ -197,7 +197,7 @@ bool Core::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t actorI
 bool Core::Scripting::ScriptMgr::onEnterTerritory( Entity::Player& player, uint32_t eventId,
                                                    uint16_t param1, uint16_t param2 )
 {
-  auto script = m_nativeScriptMgr->getScript< EventScript >( eventId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId );
   if( !script )
     return false;
   script->onEnterTerritory( player, eventId, param1, param2 );
@@ -207,7 +207,7 @@ bool Core::Scripting::ScriptMgr::onEnterTerritory( Entity::Player& player, uint3
 bool Core::Scripting::ScriptMgr::onWithinRange( Entity::Player& player, uint32_t eventId, uint32_t param1,
                                                 float x, float y, float z )
 {
-  auto script = m_nativeScriptMgr->getScript< EventScript >( eventId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId );
   if( !script )
     return false;
   script->onWithinRange( player, eventId, param1, x, y, z );
@@ -217,7 +217,7 @@ bool Core::Scripting::ScriptMgr::onWithinRange( Entity::Player& player, uint32_t
 bool Core::Scripting::ScriptMgr::onOutsideRange( Entity::Player& player, uint32_t eventId, uint32_t param1,
                                                  float x, float y, float z )
 {
-  auto script = m_nativeScriptMgr->getScript< EventScript >( eventId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId );
   if( !script )
     return false;
   script->onOutsideRange( player, eventId, param1, x, y, z );
@@ -227,7 +227,7 @@ bool Core::Scripting::ScriptMgr::onOutsideRange( Entity::Player& player, uint32_
 bool Core::Scripting::ScriptMgr::onEmote( Entity::Player& player, uint64_t actorId,
                                           uint32_t eventId, uint8_t emoteId )
 {
-  auto script = m_nativeScriptMgr->getScript< EventScript >( eventId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId );
   if( !script )
     return false;
   script->onEmote( actorId, eventId, emoteId, player );
@@ -245,7 +245,7 @@ bool Core::Scripting::ScriptMgr::onEventHandlerReturn( Entity::Player& player, u
 bool Core::Scripting::ScriptMgr::onEventHandlerTradeReturn( Entity::Player& player, uint32_t eventId,
                                                             uint16_t subEvent, uint16_t param, uint32_t catalogId )
 {
-  auto script = m_nativeScriptMgr->getScript< EventScript >( eventId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId );
   if( script )
   {
     script->onEventHandlerTradeReturn( player, eventId, subEvent, param, catalogId );
@@ -262,7 +262,7 @@ bool Core::Scripting::ScriptMgr::onEventItem( Entity::Player& player, uint32_t e
   std::string objName = Event::getEventName( eventId );
   player.sendDebug( "Calling: " + objName + "." + eventName + " - " + std::to_string( eventId ) );
 
-  auto script = m_nativeScriptMgr->getScript< EventScript >( eventId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId );
   if( script )
   {
     player.eventStart( targetId, eventId, Event::EventHandler::Item, 0, 0 );
@@ -288,7 +288,7 @@ bool Core::Scripting::ScriptMgr::onMobKill( Entity::Player& player, uint16_t nam
 
     uint16_t questId = activeQuests->c.questId;
 
-    auto script = m_nativeScriptMgr->getScript< EventScript >( questId );
+    auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( questId );
     if( script )
     {
       std::string objName = Event::getEventName( 0x00010000 | questId );
@@ -304,7 +304,7 @@ bool Core::Scripting::ScriptMgr::onMobKill( Entity::Player& player, uint16_t nam
 
 bool Core::Scripting::ScriptMgr::onCastFinish( Entity::Player& player, Entity::CharaPtr pTarget, uint32_t actionId )
 {
-  auto script = m_nativeScriptMgr->getScript< ActionScript >( actionId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( actionId );
 
   if( script )
     script->onCastFinish( player, *pTarget );
@@ -313,7 +313,7 @@ bool Core::Scripting::ScriptMgr::onCastFinish( Entity::Player& player, Entity::C
 
 bool Core::Scripting::ScriptMgr::onStatusReceive( Entity::CharaPtr pActor, uint32_t effectId )
 {
-  auto script = m_nativeScriptMgr->getScript< StatusEffectScript >( effectId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::StatusEffectScript >( effectId );
 
   if( script )
   {
@@ -329,7 +329,7 @@ bool Core::Scripting::ScriptMgr::onStatusReceive( Entity::CharaPtr pActor, uint3
 
 bool Core::Scripting::ScriptMgr::onStatusTick( Entity::CharaPtr pChara, Core::StatusEffect::StatusEffect& effect )
 {
-  auto script = m_nativeScriptMgr->getScript< StatusEffectScript >( effect.getId() );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::StatusEffectScript >( effect.getId() );
   if( script )
   {
     if( pChara->isPlayer() )
@@ -344,7 +344,7 @@ bool Core::Scripting::ScriptMgr::onStatusTick( Entity::CharaPtr pChara, Core::St
 
 bool Core::Scripting::ScriptMgr::onStatusTimeOut( Entity::CharaPtr pChara, uint32_t effectId )
 {
-  auto script = m_nativeScriptMgr->getScript< StatusEffectScript >( effectId );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::StatusEffectScript >( effectId );
   if( script )
   {
     if( pChara->isPlayer() )
@@ -359,7 +359,7 @@ bool Core::Scripting::ScriptMgr::onStatusTimeOut( Entity::CharaPtr pChara, uint3
 
 bool Core::Scripting::ScriptMgr::onZoneInit( ZonePtr pZone )
 {
-  auto script = m_nativeScriptMgr->getScript< ZoneScript >( pZone->getTerritoryTypeId() );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ZoneScript >( pZone->getTerritoryTypeId() );
   if( script )
   {
     script->onZoneInit();
@@ -371,7 +371,7 @@ bool Core::Scripting::ScriptMgr::onZoneInit( ZonePtr pZone )
 
 bool Core::Scripting::ScriptMgr::onInstanceInit( InstanceContentPtr instance )
 {
-  auto script = m_nativeScriptMgr->getScript< InstanceContentScript >( instance->getDirectorId() );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() );
   if( script )
   {
     script->onInit( instance );
@@ -383,7 +383,7 @@ bool Core::Scripting::ScriptMgr::onInstanceInit( InstanceContentPtr instance )
 
 bool Core::Scripting::ScriptMgr::onInstanceUpdate( InstanceContentPtr instance, uint32_t currTime )
 {
-  auto script = m_nativeScriptMgr->getScript< InstanceContentScript >( instance->getDirectorId() );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() );
 
   if( script )
   {
@@ -397,7 +397,7 @@ bool Core::Scripting::ScriptMgr::onInstanceUpdate( InstanceContentPtr instance,
 bool Core::Scripting::ScriptMgr::onInstanceEnterTerritory( InstanceContentPtr instance, Entity::Player& player,
                                                            uint32_t eventId, uint16_t param1, uint16_t param2 )
 {
-  auto script = m_nativeScriptMgr->getScript< InstanceContentScript >( instance->getDirectorId() );
+  auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() );
   if( script )
   {
     script->onEnterTerritory( instance, player, eventId, param1, param2 );