diff --git a/scripts/missions/sandoria/6_2_Ranperres_Final_Rest.lua b/scripts/missions/sandoria/6_2_Ranperres_Final_Rest.lua
index e5a8f701e66..42341fbf39a 100644
--- a/scripts/missions/sandoria/6_2_Ranperres_Final_Rest.lua
+++ b/scripts/missions/sandoria/6_2_Ranperres_Final_Rest.lua
@@ -16,6 +16,13 @@ local krtID = zones[xi.zone.KING_RANPERRES_TOMB]
 
 local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.RANPERRES_FINAL_REST)
 
+local ranparresRestTable =
+{
+    krtID.mob.CORRUPTED_YORGOS,
+    krtID.mob.CORRUPTED_SOFFEIL,
+    krtID.mob.CORRUPTED_ULBRIG,
+}
+
 mission.reward =
 {
     rank = 7,
@@ -118,13 +125,8 @@ mission.sections =
 
                     if
                         missionStatus == 1 and
-                        not GetMobByID(krtID.mob.CORRUPTED_YORGOS):isSpawned() and
-                        not GetMobByID(krtID.mob.CORRUPTED_SOFFEIL):isSpawned() and
-                        not GetMobByID(krtID.mob.CORRUPTED_ULBRIG):isSpawned()
+                        npcUtil.popFromQM(player, npc, ranparresRestTable, { hide = 0, })
                     then
-                        SpawnMob(krtID.mob.CORRUPTED_YORGOS)
-                        SpawnMob(krtID.mob.CORRUPTED_SOFFEIL)
-                        SpawnMob(krtID.mob.CORRUPTED_ULBRIG)
                         return mission:messageSpecial(krtID.text.SENSE_SOMETHING_EVIL)
                     elseif
                         (missionStatus == 2 or missionStatus == 3) and
@@ -188,6 +190,8 @@ mission.sections =
                         not player:hasKeyItem(xi.ki.ANCIENT_SAN_DORIAN_BOOK)
                     then
                         return mission:progressEvent(8)
+                    elseif player:hasKeyItem(xi.ki.ANCIENT_SAN_DORIAN_BOOK) then
+                        return mission:messageSpecial(krtID.text.FINAL_RESTING_PLACE)
                     end
                 end,
             },
diff --git a/scripts/zones/King_Ranperres_Tomb/DefaultActions.lua b/scripts/zones/King_Ranperres_Tomb/DefaultActions.lua
index d04cc5cef76..b621cf52de2 100644
--- a/scripts/zones/King_Ranperres_Tomb/DefaultActions.lua
+++ b/scripts/zones/King_Ranperres_Tomb/DefaultActions.lua
@@ -1,5 +1,6 @@
 local ID = zones[xi.zone.KING_RANPERRES_TOMB]
 
 return {
-    ['_5a0'] = { messageSpecial = ID.text.HEAVY_DOOR },
+    ['_5a0']      = { messageSpecial = ID.text.HEAVY_DOOR },
+    ['Tombstone'] = { messageSpecial = ID.text.A_TOMB },
 }
diff --git a/scripts/zones/King_Ranperres_Tomb/IDs.lua b/scripts/zones/King_Ranperres_Tomb/IDs.lua
index 5f68b091c9a..799feb192ac 100644
--- a/scripts/zones/King_Ranperres_Tomb/IDs.lua
+++ b/scripts/zones/King_Ranperres_Tomb/IDs.lua
@@ -31,23 +31,15 @@ zones[xi.zone.KING_RANPERRES_TOMB] =
     },
     mob =
     {
-        GWYLLGI_PH            =
-        {
-            [17555661] = 17555664,
-        },
-        CRYPT_GHOST_PH        =
-        {
-            [17555665] = 17555668,
-            [17555666] = 17555668,
-            [17555667] = 17555668,
-        },
-        BARBASTELLE           = 17555721,
-        CHERRY_SAPLING_OFFSET = 17555748,
-        VRTRA                 = 17555763,
-        CORRUPTED_YORGOS      = 17555770,
-        CORRUPTED_SOFFEIL     = 17555771,
-        CORRUPTED_ULBRIG      = 17555772,
-        ANKOU                 = 17555709,
+        GWYLLGI               = GetFirstID('Gwyllgi'),
+        CRYPT_GHOST           = GetFirstID('Crypt_Ghost'),
+        BARBASTELLE           = GetFirstID('Barbastelle'),
+        CHERRY_SAPLING_OFFSET = GetFirstID('Cherry_Sapling'),
+        VRTRA                 = GetFirstID('Vrtra'),
+        CORRUPTED_YORGOS      = GetFirstID('Corrupted_Yorgos'),
+        CORRUPTED_SOFFEIL     = GetFirstID('Corrupted_Soffeil'),
+        CORRUPTED_ULBRIG      = GetFirstID('Corrupted_Ulbrig'),
+        ANKOU                 = GetFirstID('Ankou'),
     },
     npc =
     {