diff --git a/src/Naxxramas/scripts/boss_heigan_40.cpp b/src/Naxxramas/scripts/boss_heigan_40.cpp
index 355222f..431bc5e 100644
--- a/src/Naxxramas/scripts/boss_heigan_40.cpp
+++ b/src/Naxxramas/scripts/boss_heigan_40.cpp
@@ -127,7 +127,7 @@ class boss_heigan_40 : public CreatureScript
                     go->SetGoState(GO_STATE_ACTIVE);
                 }
                 // Close tunnel door
-                if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetGuidData(DATA_HEIGAN_EXIT_GATE)))
+                if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetGuidData(DATA_HEIGAN_EXIT_GATE_40)))
                 {
                     go->SetGoState(GO_STATE_READY);
                 }
@@ -164,12 +164,12 @@ class boss_heigan_40 : public CreatureScript
                     go->SetGoState(GO_STATE_READY);
                 }
                 // Open tunnel door
-                if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetGuidData(DATA_HEIGAN_EXIT_GATE)))
+                if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetGuidData(DATA_HEIGAN_EXIT_GATE_40)))
                 {
                     go->SetGoState(GO_STATE_ACTIVE);
                 }
                 // Close loatheb door
-                if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetGuidData(DATA_HEIGAN_EXIT_GATE_OLD)))
+                if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetGuidData(DATA_HEIGAN_EXIT_GATE_OLD_40)))
                 {
                     go->SetGoState(GO_STATE_READY);
                 }
diff --git a/src/Naxxramas/scripts/boss_loatheb_40.cpp b/src/Naxxramas/scripts/boss_loatheb_40.cpp
index 24dc0f0..c6b9017 100644
--- a/src/Naxxramas/scripts/boss_loatheb_40.cpp
+++ b/src/Naxxramas/scripts/boss_loatheb_40.cpp
@@ -22,7 +22,6 @@
 enum Spells
 {
     SPELL_NECROTIC_AURA                         = 55593,
-    SPELL_SUMMON_SPORE                          = 90006,
     SPELL_DEATHBLOOM                            = 29865,
     SPELL_INEVITABLE_DOOM                       = 29204,
     SPELL_BERSERK                               = 26662
diff --git a/src/Naxxramas/scripts/boss_maexxna_40.cpp b/src/Naxxramas/scripts/boss_maexxna_40.cpp
index 31165c4..8c8757e 100644
--- a/src/Naxxramas/scripts/boss_maexxna_40.cpp
+++ b/src/Naxxramas/scripts/boss_maexxna_40.cpp
@@ -32,7 +32,6 @@ enum Spells
     SPELL_FRENZY                        = 54123,
     SPELL_WEB_WRAP_STUN                 = 28622,
     SPELL_WEB_WRAP_SUMMON               = 28627,
-    SPELL_WEB_WRAP_SUMMON_40            = 90007, // custom summon entry: 16486 -> 351075
     SPELL_WEB_WRAP_PACIFY_5             = 28618
 };
 
diff --git a/src/Naxxramas/scripts/custom_creatures_40.cpp b/src/Naxxramas/scripts/custom_creatures_40.cpp
index cff2b91..e20f573 100644
--- a/src/Naxxramas/scripts/custom_creatures_40.cpp
+++ b/src/Naxxramas/scripts/custom_creatures_40.cpp
@@ -49,7 +49,7 @@ class npc_naxx40_area_trigger : public CreatureScript
                 {
                     if (isAttuned(player))
                     {
-                        GameObject* door = me->FindNearestGameObject(NAXX_STRATH_GATE, 100.0f);
+                        GameObject* door = me->FindNearestGameObject(GO_STRATH_GATE_40, 100.0f);
                         if (door)
                         {
                             door->SetGoState(GO_STATE_ACTIVE);
diff --git a/src/Naxxramas/scripts/instance_naxxramas.cpp b/src/Naxxramas/scripts/instance_naxxramas.cpp
index c01a675..ac737f4 100644
--- a/src/Naxxramas/scripts/instance_naxxramas.cpp
+++ b/src/Naxxramas/scripts/instance_naxxramas.cpp
@@ -722,7 +722,7 @@ class instance_naxxramas_combined : public InstanceMapScript
                 case DATA_HEIGAN_ERUPTION:
                     HeiganEruptSections(data);
                     return;
-                case DATA_HEIGAN_ERUPTION_TUNNEL:
+                case DATA_HEIGAN_ERUPTION_TUNNEL_40:
                     HeiganEruptSectionsTunnel();
                     return;
                 case DATA_HAD_THADDIUS_GREET:
@@ -1191,9 +1191,9 @@ class instance_naxxramas_combined : public InstanceMapScript
                 // GameObjects
                 case DATA_HEIGAN_ENTER_GATE:
                     return _heiganGateGUID;
-                case DATA_HEIGAN_EXIT_GATE_OLD:
+                case DATA_HEIGAN_EXIT_GATE_OLD_40:
                     return _heiganGateExitOldGUID;
-                case DATA_HEIGAN_EXIT_GATE:
+                case DATA_HEIGAN_EXIT_GATE_40:
                     return _heiganGateExitGUID;
                 case DATA_LOATHEB_GATE:
                     return _loathebGateGUID;
diff --git a/src/Naxxramas/scripts/naxxramas.h b/src/Naxxramas/scripts/naxxramas.h
index d79a957..070ac83 100644
--- a/src/Naxxramas/scripts/naxxramas.h
+++ b/src/Naxxramas/scripts/naxxramas.h
@@ -104,7 +104,6 @@ enum NXGOs
 
     GO_HORSEMEN_CHEST_10            = 181366,
     GO_HORSEMEN_CHEST_25            = 193426,
-    GO_HORSEMEN_CHEST_40            = 361000,
 
     GO_SAPPHIRON_BIRTH              = 181356,
     GO_KELTHUZAD_FLOOR              = 181444,
diff --git a/src/Naxxramas/scripts/naxxramas_40.h b/src/Naxxramas/scripts/naxxramas_40.h
index 61d5571..04e1832 100644
--- a/src/Naxxramas/scripts/naxxramas_40.h
+++ b/src/Naxxramas/scripts/naxxramas_40.h
@@ -20,26 +20,28 @@
 
 enum NX40Spells
 {
-    SPELL_SUMMON_CORPSE_SCRABS_5    = 90001, // Changed from 29105 to Level 60 Mob ID for summon
-    SPELL_SUMMON_CORPSE_SCRABS_10   = 90002, // Changed from 29105 to Level 60 Mob ID for summon
-    SPELL_BOMBARD_SLIME                     = 90003 // update summon entry
+    SPELL_SUMMON_CORPSE_SCRABS_5       = 90001, // Changed from 29105 to Level 60 Mob ID for summon
+    SPELL_SUMMON_CORPSE_SCRABS_10      = 90002, // Changed from 29105 to Level 60 Mob ID for summon
+    SPELL_BOMBARD_SLIME                = 90003, // update summon entry
+    SPELL_SUMMON_SPORE                 = 90006,
+    SPELL_WEB_WRAP_SUMMON_40           = 90007  // custom summon entry: 16486 -> 351075
 };
 
 enum NX40Data
 {
-    DATA_HEIGAN_EXIT_GATE_OLD_40    = 4130,
-    DATA_HEIGAN_EXIT_GATE_40        = 4131,
-    DATA_HEIGAN_ERUPTION_TUNNEL_40  = 4132
+    DATA_HEIGAN_EXIT_GATE_OLD_40       = 4130,
+    DATA_HEIGAN_EXIT_GATE_40           = 4131,
+    DATA_HEIGAN_ERUPTION_TUNNEL_40     = 4132
 };
 
 enum NX40GOs
 {
-    GO_HEIGAN_ENTRY_GATE_40         = 181202,
-    GO_HEIGAN_EXIT_GATE_40          = 181203,
-    GO_HEIGAN_EXIT_GATE_OLD_40      = 181496,
-    GO_HORSEMEN_CHEST_40            = 361000,
+    GO_HEIGAN_ENTRY_GATE_40            = 181202,
+    GO_HEIGAN_EXIT_GATE_40             = 181203,
+    GO_HEIGAN_EXIT_GATE_OLD_40         = 181496,
+    GO_HORSEMEN_CHEST_40               = 361000,
     // Gate to enter Naxx 40 from Strath
-    GO_STRATH_GATE_40             = 176424
+    GO_STRATH_GATE_40                  = 176424
 };
 
 enum NX40NPCs