diff --git a/Source/Game/Maps/Instances/InstanceScript.cs b/Source/Game/Maps/Instances/InstanceScript.cs
index 323c7e567..c2aa1ffe9 100644
--- a/Source/Game/Maps/Instances/InstanceScript.cs
+++ b/Source/Game/Maps/Instances/InstanceScript.cs
@@ -29,14 +29,14 @@ namespace Game.Maps
 {
     public class InstanceScript : ZoneScript
     {
-        public InstanceScript(Map map)
+        public InstanceScript(InstanceMap map)
         {
             instance = map;
         }
 
         public void SaveToDB()
         {
-            InstanceScenario scenario = instance.ToInstanceMap().GetInstanceScenario();
+            InstanceScenario scenario = instance.GetInstanceScenario();
             if (scenario != null)
                 scenario.SaveToDB();
 
@@ -838,7 +838,7 @@ namespace Game.Maps
 
         public virtual void WriteSaveDataMore(StringBuilder data) { }
 
-        public Map instance;
+        public InstanceMap instance;
         List<char> headers = new List<char>();
         Dictionary<uint, BossInfo> bosses = new Dictionary<uint, BossInfo>();
         MultiMap<uint, DoorInfo> doors = new MultiMap<uint, DoorInfo>();
diff --git a/Source/Scripts/EasternKingdoms/Karazhan/InstanceKarazhan.cs b/Source/Scripts/EasternKingdoms/Karazhan/InstanceKarazhan.cs
index 914c031d8..5fe535b76 100644
--- a/Source/Scripts/EasternKingdoms/Karazhan/InstanceKarazhan.cs
+++ b/Source/Scripts/EasternKingdoms/Karazhan/InstanceKarazhan.cs
@@ -159,7 +159,7 @@ namespace Scripts.EasternKingdoms.Karazhan
 
         public class instance_karazhan_InstanceMapScript : InstanceScript
         {
-            public instance_karazhan_InstanceMapScript(Map map) : base(map)
+            public instance_karazhan_InstanceMapScript(InstanceMap map) : base(map)
             {
                 SetHeaders("KZ");
 
diff --git a/Source/Scripts/EasternKingdoms/TheStockade/InstanceTheStockade.cs b/Source/Scripts/EasternKingdoms/TheStockade/InstanceTheStockade.cs
index ea7f91aaf..b56fe5529 100644
--- a/Source/Scripts/EasternKingdoms/TheStockade/InstanceTheStockade.cs
+++ b/Source/Scripts/EasternKingdoms/TheStockade/InstanceTheStockade.cs
@@ -35,7 +35,7 @@ namespace Scripts.EasternKingdoms.TheStockade
 
         class instance_the_stockade_InstanceMapScript : InstanceScript
         {
-            public instance_the_stockade_InstanceMapScript(Map map) : base(map)
+            public instance_the_stockade_InstanceMapScript(InstanceMap map) : base(map)
             {
                 SetHeaders("SS");
                 SetBossNumber(3);
diff --git a/Source/Scripts/Kalimdor/RagefireChasm/InstanceRageFireChasm.cs b/Source/Scripts/Kalimdor/RagefireChasm/InstanceRageFireChasm.cs
index 00bb56fb2..6a8474c71 100644
--- a/Source/Scripts/Kalimdor/RagefireChasm/InstanceRageFireChasm.cs
+++ b/Source/Scripts/Kalimdor/RagefireChasm/InstanceRageFireChasm.cs
@@ -32,7 +32,7 @@ namespace Scripts.Kalimdor
 
         class RagefireChasmInstanceMapScript : InstanceScript
         {
-            public RagefireChasmInstanceMapScript(Map map) : base(map) { }
+            public RagefireChasmInstanceMapScript(InstanceMap map) : base(map) { }
         }
     }
 }
diff --git a/Source/Scripts/Northrend/AzjolNerub/Ahnkahet/InstanceAhnahet.cs b/Source/Scripts/Northrend/AzjolNerub/Ahnkahet/InstanceAhnahet.cs
index 5920980ab..96c1ff353 100644
--- a/Source/Scripts/Northrend/AzjolNerub/Ahnkahet/InstanceAhnahet.cs
+++ b/Source/Scripts/Northrend/AzjolNerub/Ahnkahet/InstanceAhnahet.cs
@@ -83,7 +83,7 @@ namespace Scripts.Northrend.AzjolNerub.Ahnkahet
 
         class instance_ahnkahet_InstanceScript : InstanceScript
         {
-            public instance_ahnkahet_InstanceScript(Map map) : base(map)
+            public instance_ahnkahet_InstanceScript(InstanceMap map) : base(map)
             {
                 SetHeaders("AK");
                 SetBossNumber(DataTypes.HeraldVolazj + 1);
diff --git a/Source/Scripts/Northrend/AzjolNerub/AzjolNerub/InstanceAzjolNerub.cs b/Source/Scripts/Northrend/AzjolNerub/AzjolNerub/InstanceAzjolNerub.cs
index cf2fd0165..155482cd6 100644
--- a/Source/Scripts/Northrend/AzjolNerub/AzjolNerub/InstanceAzjolNerub.cs
+++ b/Source/Scripts/Northrend/AzjolNerub/AzjolNerub/InstanceAzjolNerub.cs
@@ -103,7 +103,7 @@ namespace Scripts.Northrend.AzjolNerub.AzjolNerub
 
         class instance_azjol_nerub_InstanceScript : InstanceScript
         {
-            public instance_azjol_nerub_InstanceScript(Map map) : base(map)
+            public instance_azjol_nerub_InstanceScript(InstanceMap map) : base(map)
             {
                 SetHeaders(ANInstanceMisc.DataHeader);
                 SetBossNumber(ANInstanceMisc.EncounterCount);
diff --git a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/InstanceTrialOfTheChampion.cs b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/InstanceTrialOfTheChampion.cs
index c1a8547c6..381c7bc6e 100644
--- a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/InstanceTrialOfTheChampion.cs
+++ b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/InstanceTrialOfTheChampion.cs
@@ -35,7 +35,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion
 
         class instance_trial_of_the_champion_InstanceMapScript : InstanceScript
         {
-            public instance_trial_of_the_champion_InstanceMapScript(Map map) : base(map)
+            public instance_trial_of_the_champion_InstanceMapScript(InstanceMap map) : base(map)
             {
                 SetHeaders("TC");
                 uiMovementDone = 0;
diff --git a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/TrialOfTheCrusader.cs b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/TrialOfTheCrusader.cs
index fcfc239fa..99dbc8cea 100644
--- a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/TrialOfTheCrusader.cs
+++ b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/TrialOfTheCrusader.cs
@@ -32,7 +32,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheCrusader
 
         class instance_trial_of_the_crusader_InstanceMapScript : InstanceScript
         {
-            public instance_trial_of_the_crusader_InstanceMapScript(Map map) : base(map)
+            public instance_trial_of_the_crusader_InstanceMapScript(InstanceMap map) : base(map)
             {
                 SetHeaders("TCR");
                 SetBossNumber(DataTypes.MaxEncounters);
diff --git a/Source/Scripts/Northrend/DraktharonKeep/InstanceDrakTharonKeep.cs b/Source/Scripts/Northrend/DraktharonKeep/InstanceDrakTharonKeep.cs
index 460052744..984fd0639 100644
--- a/Source/Scripts/Northrend/DraktharonKeep/InstanceDrakTharonKeep.cs
+++ b/Source/Scripts/Northrend/DraktharonKeep/InstanceDrakTharonKeep.cs
@@ -89,7 +89,7 @@ namespace Scripts.Northrend.DraktharonKeep
 
         class instance_drak_tharon_keep_InstanceScript : InstanceScript
         {
-            public instance_drak_tharon_keep_InstanceScript(Map map) : base(map)
+            public instance_drak_tharon_keep_InstanceScript(InstanceMap map) : base(map)
             {
                 SetHeaders("DTK");
                 SetBossNumber(4);
diff --git a/Source/Scripts/Northrend/FrozenHalls/ForgeOfSouls/InstanceForgeOfSouls.cs b/Source/Scripts/Northrend/FrozenHalls/ForgeOfSouls/InstanceForgeOfSouls.cs
index 31ac3b76c..07c8fba7b 100644
--- a/Source/Scripts/Northrend/FrozenHalls/ForgeOfSouls/InstanceForgeOfSouls.cs
+++ b/Source/Scripts/Northrend/FrozenHalls/ForgeOfSouls/InstanceForgeOfSouls.cs
@@ -110,7 +110,7 @@ namespace Scripts.Northrend.FrozenHalls.ForgeOfSouls
 
         class instance_forge_of_souls_InstanceScript : InstanceScript
         {
-            public instance_forge_of_souls_InstanceScript(Map map) : base(map)
+            public instance_forge_of_souls_InstanceScript(InstanceMap map) : base(map)
             {
                 SetHeaders("FOS");
                 SetBossNumber(2);
diff --git a/Source/Scripts/Northrend/FrozenHalls/PitOfSaron/InstancePitOfSaron.cs b/Source/Scripts/Northrend/FrozenHalls/PitOfSaron/InstancePitOfSaron.cs
index 1982cd556..203400ec5 100644
--- a/Source/Scripts/Northrend/FrozenHalls/PitOfSaron/InstancePitOfSaron.cs
+++ b/Source/Scripts/Northrend/FrozenHalls/PitOfSaron/InstancePitOfSaron.cs
@@ -29,7 +29,7 @@ namespace Scripts.Northrend.FrozenHalls.PitOfSaron
 
         class instance_pit_of_saron_InstanceScript : InstanceScript
         {
-            public instance_pit_of_saron_InstanceScript(Map map) : base(map)
+            public instance_pit_of_saron_InstanceScript(InstanceMap map) : base(map)
             {
                 SetHeaders("POS");
                 SetBossNumber(3);
diff --git a/Source/Scripts/Northrend/Gundrak/InstanceGundrak.cs b/Source/Scripts/Northrend/Gundrak/InstanceGundrak.cs
index a00c9a324..515a349d2 100644
--- a/Source/Scripts/Northrend/Gundrak/InstanceGundrak.cs
+++ b/Source/Scripts/Northrend/Gundrak/InstanceGundrak.cs
@@ -128,7 +128,7 @@ namespace Scripts.Northrend.Gundrak
 
         class instance_gundrak_InstanceMapScript : InstanceScript
         {
-            public instance_gundrak_InstanceMapScript(Map map) : base(map)
+            public instance_gundrak_InstanceMapScript(InstanceMap map) : base(map)
             {
                 SetHeaders("GD");
                 SetBossNumber(5);
diff --git a/Source/Scripts/Northrend/Nexus/EyeOfEternity/EyeOfEternity.cs b/Source/Scripts/Northrend/Nexus/EyeOfEternity/EyeOfEternity.cs
index ffa13d259..494d59a18 100644
--- a/Source/Scripts/Northrend/Nexus/EyeOfEternity/EyeOfEternity.cs
+++ b/Source/Scripts/Northrend/Nexus/EyeOfEternity/EyeOfEternity.cs
@@ -95,7 +95,7 @@ namespace Scripts.Northrend.Nexus.EyeOfEternity
 
         class instance_eye_of_eternity_InstanceMapScript : InstanceScript
         {
-            public instance_eye_of_eternity_InstanceMapScript(Map map) : base(map)
+            public instance_eye_of_eternity_InstanceMapScript(InstanceMap map) : base(map)
             {
                 SetHeaders("EOE");
                 SetBossNumber(EyeOfEternityConst.MaxEncounter);
diff --git a/Source/Scripts/Northrend/Nexus/Nexus/InstanceNexus.cs b/Source/Scripts/Northrend/Nexus/Nexus/InstanceNexus.cs
index 8ea0d8886..5331c9920 100644
--- a/Source/Scripts/Northrend/Nexus/Nexus/InstanceNexus.cs
+++ b/Source/Scripts/Northrend/Nexus/Nexus/InstanceNexus.cs
@@ -69,7 +69,7 @@ namespace Scripts.Northrend.Nexus.Nexus
 
         class instance_nexus_InstanceMapScript : InstanceScript
         {
-            public instance_nexus_InstanceMapScript(Map map) : base(map)
+            public instance_nexus_InstanceMapScript(InstanceMap map) : base(map)
             {
                 SetHeaders("NEX");
                 SetBossNumber(DataTypes.Keristrasza + 1);