diff --git a/scripts/zones/Behemoths_Dominion/IDs.lua b/scripts/zones/Behemoths_Dominion/IDs.lua
index f7ea51082d0..ab6b4b2b539 100644
--- a/scripts/zones/Behemoths_Dominion/IDs.lua
+++ b/scripts/zones/Behemoths_Dominion/IDs.lua
@@ -49,7 +49,7 @@ zones[xi.zone.BEHEMOTHS_DOMINION] =
     },
     npc =
     {
-        BEHEMOTH_QM      = GetFirstID('qm2'),
+        BEHEMOTH_QM      = GetFirstID('qm_behemoth'),
         CERMET_HEADSTONE = GetFirstID('Cermet_Headstone'),
     },
 }
diff --git a/scripts/zones/Behemoths_Dominion/mobs/Behemoth.lua b/scripts/zones/Behemoths_Dominion/mobs/Behemoth.lua
index 9df2e3869e0..e3f2ccd21aa 100644
--- a/scripts/zones/Behemoths_Dominion/mobs/Behemoth.lua
+++ b/scripts/zones/Behemoths_Dominion/mobs/Behemoth.lua
@@ -2,7 +2,6 @@
 -- Area: Behemoth's Dominion
 --  HNM: Behemoth
 -----------------------------------
-local ID = zones[xi.zone.BEHEMOTHS_DOMINION]
 mixins = { require('scripts/mixins/rage') }
 -----------------------------------
 ---@type TMobEntity
@@ -24,9 +23,6 @@ entity.onMobSpawn = function(mob)
     mob:setMod(xi.mod.ATT, 211)
     mob:setMod(xi.mod.DARK_SLEEP_RES_RANK, 11)
     mob:setMod(xi.mod.STUN_RES_RANK, 10)
-
-    -- Despawn the ???
-    GetNPCByID(ID.npc.BEHEMOTH_QM):setStatus(xi.status.DISAPPEAR)
 end
 
 entity.onMobRoam = function(mob)
@@ -61,9 +57,4 @@ entity.onMobDeath = function(mob, player, optParams)
     end
 end
 
-entity.onMobDespawn = function(mob)
-    -- Respawn the ???
-    GetNPCByID(ID.npc.BEHEMOTH_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
-end
-
 return entity
diff --git a/scripts/zones/Behemoths_Dominion/mobs/King_Behemoth.lua b/scripts/zones/Behemoths_Dominion/mobs/King_Behemoth.lua
index e57d5bf76e1..8b00039edf6 100644
--- a/scripts/zones/Behemoths_Dominion/mobs/King_Behemoth.lua
+++ b/scripts/zones/Behemoths_Dominion/mobs/King_Behemoth.lua
@@ -2,7 +2,6 @@
 -- Area: Behemoth's Dominion
 --  HNM: King Behemoth
 -----------------------------------
-local ID = zones[xi.zone.BEHEMOTHS_DOMINION]
 mixins = { require('scripts/mixins/rage') }
 -----------------------------------
 ---@type TMobEntity
@@ -31,8 +30,6 @@ entity.onMobSpawn = function(mob)
     mob:setMod(xi.mod.ATT, 462)
     mob:setMod(xi.mod.DEF, 500)
     mob:setMod(xi.mod.EVA, 370)
-    -- Despawn the ???
-    GetNPCByID(ID.npc.BEHEMOTH_QM):setStatus(xi.status.DISAPPEAR)
 end
 
 entity.onMobRoam = function(mob)
@@ -89,9 +86,4 @@ entity.onMobDeath = function(mob, player, optParams)
     end
 end
 
-entity.onMobDespawn = function(mob)
-    -- Respawn the ???
-    GetNPCByID(ID.npc.BEHEMOTH_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
-end
-
 return entity
diff --git a/scripts/zones/Behemoths_Dominion/npcs/qm2.lua b/scripts/zones/Behemoths_Dominion/npcs/qm_behemoth.lua
similarity index 97%
rename from scripts/zones/Behemoths_Dominion/npcs/qm2.lua
rename to scripts/zones/Behemoths_Dominion/npcs/qm_behemoth.lua
index 61ebdc7e0e5..9ae241e70fe 100644
--- a/scripts/zones/Behemoths_Dominion/npcs/qm2.lua
+++ b/scripts/zones/Behemoths_Dominion/npcs/qm_behemoth.lua
@@ -1,6 +1,6 @@
 -----------------------------------
 -- Area: Behemoth's Dominion
---  NPC: qm2 (???)
+--  NPC: qm_behemoth (???)
 -- Spawns Behemoth or King Behemoth
 -- !pos -267 -19 74 127
 -----------------------------------
diff --git a/scripts/zones/Dragons_Aery/IDs.lua b/scripts/zones/Dragons_Aery/IDs.lua
index 485633c9a7e..f5c8e7c0205 100644
--- a/scripts/zones/Dragons_Aery/IDs.lua
+++ b/scripts/zones/Dragons_Aery/IDs.lua
@@ -29,7 +29,7 @@ zones[xi.zone.DRAGONS_AERY] =
     },
     npc =
     {
-        FAFNIR_QM = GetFirstID('qm0'),
+        FAFNIR_QM = GetFirstID('qm_fafnir'),
     },
 }
 
diff --git a/scripts/zones/Dragons_Aery/mobs/Fafnir.lua b/scripts/zones/Dragons_Aery/mobs/Fafnir.lua
index b3d93e6289c..8636a0f8bcb 100644
--- a/scripts/zones/Dragons_Aery/mobs/Fafnir.lua
+++ b/scripts/zones/Dragons_Aery/mobs/Fafnir.lua
@@ -2,7 +2,6 @@
 -- Area: Dragons Aery
 --  HNM: Fafnir
 -----------------------------------
-local ID = zones[xi.zone.DRAGONS_AERY]
 mixins = { require('scripts/mixins/rage') }
 -----------------------------------
 ---@type TMobEntity
@@ -23,9 +22,6 @@ entity.onMobSpawn = function(mob)
     mob:setMod(xi.mod.ATT, 489) -- 550 Total Attack
     mob:setMod(xi.mod.REGEN, 20) -- 1% every 90s
     mob:setMod(xi.mod.STUN_RES_RANK, 10)
-
-    -- Despawn the ???
-    GetNPCByID(ID.npc.FAFNIR_QM):setStatus(xi.status.DISAPPEAR)
 end
 
 entity.onMobFight = function(mob, target)
@@ -57,9 +53,4 @@ entity.onMobDeath = function(mob, player, optParams)
     end
 end
 
-entity.onMobDespawn = function(mob)
-    -- Respawn the ???
-    GetNPCByID(ID.npc.FAFNIR_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
-end
-
 return entity
diff --git a/scripts/zones/Dragons_Aery/mobs/Nidhogg.lua b/scripts/zones/Dragons_Aery/mobs/Nidhogg.lua
index 53958bae7ed..5559689a895 100644
--- a/scripts/zones/Dragons_Aery/mobs/Nidhogg.lua
+++ b/scripts/zones/Dragons_Aery/mobs/Nidhogg.lua
@@ -2,7 +2,6 @@
 -- Area: Dragons Aery
 --  HNM: Nidhogg
 -----------------------------------
-local ID = zones[xi.zone.DRAGONS_AERY]
 mixins = { require('scripts/mixins/rage') }
 -----------------------------------
 ---@type TMobEntity
@@ -26,8 +25,6 @@ entity.onMobSpawn = function(mob)
     mob:setMod(xi.mod.REGAIN, 100) -- Ability every 30 seconds below 25% HP
     mob:setMod(xi.mod.REGEN, 20) -- 1% every 90s
     mob:setMod(xi.mod.STUN_RES_RANK, 10)
-    -- Despawn the ???
-    GetNPCByID(ID.npc.FAFNIR_QM):setStatus(xi.status.DISAPPEAR)
 end
 
 entity.onMobFight = function(mob, target)
@@ -70,9 +67,4 @@ entity.onMobDeath = function(mob, player, optParams)
     end
 end
 
-entity.onMobDespawn = function(mob)
-    -- Respawn the ???
-    GetNPCByID(ID.npc.FAFNIR_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
-end
-
 return entity
diff --git a/scripts/zones/Dragons_Aery/npcs/qm0.lua b/scripts/zones/Dragons_Aery/npcs/qm_fafnir.lua
similarity index 95%
rename from scripts/zones/Dragons_Aery/npcs/qm0.lua
rename to scripts/zones/Dragons_Aery/npcs/qm_fafnir.lua
index 60549a71e37..61f17e73923 100644
--- a/scripts/zones/Dragons_Aery/npcs/qm0.lua
+++ b/scripts/zones/Dragons_Aery/npcs/qm_fafnir.lua
@@ -1,8 +1,8 @@
 -----------------------------------
 -- Area: Dragons Aery
---  NPC: qm0 (???)
+--  NPC: qm_fafnir (???)
 -- Spawns Fafnir or Nidhogg
--- !pos -81 32 2 178
+-- !pos 82 6 42 154
 -----------------------------------
 local ID = zones[xi.zone.DRAGONS_AERY]
 -----------------------------------
diff --git a/scripts/zones/Valley_of_Sorrows/mobs/Adamantoise.lua b/scripts/zones/Valley_of_Sorrows/mobs/Adamantoise.lua
index 03efa3133d3..64ad2b636bd 100644
--- a/scripts/zones/Valley_of_Sorrows/mobs/Adamantoise.lua
+++ b/scripts/zones/Valley_of_Sorrows/mobs/Adamantoise.lua
@@ -2,7 +2,6 @@
 -- Area: Valley of Sorrows
 --  HNM: Adamantoise
 -----------------------------------
-local ID = zones[xi.zone.VALLEY_OF_SORROWS]
 mixins =
 {
     require('scripts/mixins/rage'),
@@ -29,9 +28,6 @@ entity.onMobInitialize = function(mob)
 end
 
 entity.onMobSpawn = function(mob)
-    -- Despawn the ???
-    GetNPCByID(ID.npc.ADAMANTOISE_QM):setStatus(xi.status.DISAPPEAR)
-
     mob:setMod(xi.mod.DEF, 4112)
     mob:setMod(xi.mod.ATT, 450)
     mob:setMod(xi.mod.DMGMAGIC, -3500)
@@ -45,9 +41,4 @@ entity.onMobDeath = function(mob, player, optParams)
     end
 end
 
-entity.onMobDespawn = function(mob)
-    -- Respawn the ???
-    GetNPCByID(ID.npc.ADAMANTOISE_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
-end
-
 return entity
diff --git a/scripts/zones/Valley_of_Sorrows/mobs/Aspidochelone.lua b/scripts/zones/Valley_of_Sorrows/mobs/Aspidochelone.lua
index 838f56f9fae..a2ed5c16a13 100644
--- a/scripts/zones/Valley_of_Sorrows/mobs/Aspidochelone.lua
+++ b/scripts/zones/Valley_of_Sorrows/mobs/Aspidochelone.lua
@@ -2,7 +2,6 @@
 -- Area: Valley of Sorrows
 --  HNM: Aspidochelone
 -----------------------------------
-local ID = zones[xi.zone.VALLEY_OF_SORROWS]
 mixins =
 {
     require('scripts/mixins/rage'),
@@ -51,9 +50,6 @@ entity.onMobInitialize = function(mob)
 end
 
 entity.onMobSpawn = function(mob)
-    -- Despawn the ???
-    GetNPCByID(ID.npc.ADAMANTOISE_QM):setStatus(xi.status.DISAPPEAR)
-
     mob:setMobAbilityEnabled(true)
     mob:setAutoAttackEnabled(true)
     mob:setAnimationSub(0)
@@ -116,9 +112,4 @@ entity.onMobDeath = function(mob, player, optParams)
     end
 end
 
-entity.onMobDespawn = function(mob)
-    -- Respawn the ???
-    GetNPCByID(ID.npc.ADAMANTOISE_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
-end
-
 return entity
diff --git a/sql/npc_list.sql b/sql/npc_list.sql
index eec25e6dc50..5ce66ec6db4 100644
--- a/sql/npc_list.sql
+++ b/sql/npc_list.sql
@@ -18576,7 +18576,7 @@ INSERT INTO `npc_list` VALUES (17293844,'Before_Delkfutts_Tower','Before Delkfut
 -- ------------------------------------------------------------
 
 INSERT INTO `npc_list` VALUES (17297458,'NPC[32]','',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,0);
-INSERT INTO `npc_list` VALUES (17297459,'qm2','???',0,-269.350,-19.778,74.269,1,50,50,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'ABYSSEA',0);
+INSERT INTO `npc_list` VALUES (17297459,'qm_behemoth','???',0,-269.350,-19.778,74.269,1,50,50,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'ABYSSEA',0);
 INSERT INTO `npc_list` VALUES (17297460,'Treasure_Casket','Treasure Casket',0,0.000,0.000,0.000,0,50,50,0,4,4,2,3,0x0000C50300000000000000000000000000000000,0,NULL,0);
 INSERT INTO `npc_list` VALUES (17297461,'Treasure_Casket','Treasure Casket',0,0.000,0.000,0.000,0,50,50,0,4,4,2,3,0x0000C50300000000000000000000000000000000,0,NULL,0);
 INSERT INTO `npc_list` VALUES (17297462,'Treasure_Casket','Treasure Casket',0,0.000,0.000,0.000,0,50,50,0,4,4,2,3,0x0000C50300000000000000000000000000000000,0,NULL,0);
@@ -22338,7 +22338,7 @@ INSERT INTO `npc_list` VALUES (17404444,'Mandragora_Warden_???','Mandragora Ward
 -- ------------------------------------------------------------
 
 INSERT INTO `npc_list` VALUES (17408032,'NPC[20]','',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,0);
-INSERT INTO `npc_list` VALUES (17408033,'qm0','???',0,82.326,6.870,42.042,1,50,50,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,NULL,0);
+INSERT INTO `npc_list` VALUES (17408033,'qm_fafnir','???',0,82.326,6.870,42.042,1,50,50,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,NULL,0);
 INSERT INTO `npc_list` VALUES (17408034,'Achieve_Master','Achieve Master',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,'SOA',0);
 INSERT INTO `npc_list` VALUES (17408035,'NPC[23]','',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,0);
 INSERT INTO `npc_list` VALUES (17408036,'Unity_Master','Unity Master',0,0.000,0.000,0.000,0,50,50,0,0,96,2,2051,0x0000340000000000000000000000000000000000,0,'SOA',0);