diff --git a/quests/greyshield/Archery b/quests/greyshield/Archery
index 759078301..913473e82 100644
--- a/quests/greyshield/Archery
+++ b/quests/greyshield/Archery
@@ -1,5 +1,5 @@
 arch map
-name Archery
+name Grey Castle Archery
 difficulty 55
 width 32
 height 32
@@ -7,7 +7,7 @@ enter_x 16
 enter_y 30
 msg
 Created:  1996-09-21 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/quests/greyshield/Arena b/quests/greyshield/Arena
index 6ceca6660..5da749f74 100644
--- a/quests/greyshield/Arena
+++ b/quests/greyshield/Arena
@@ -1,5 +1,5 @@
 arch map
-name Castle
+name Grey Castle Arena
 difficulty 35
 width 32
 height 32
@@ -7,7 +7,7 @@ enter_x 7
 enter_y 20
 msg
 Created:  1996-09-16 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch medium_stones
diff --git a/quests/greyshield/Castle b/quests/greyshield/Castle
index 5a563b3de..47457426d 100644
--- a/quests/greyshield/Castle
+++ b/quests/greyshield/Castle
@@ -1,5 +1,5 @@
 arch map
-name Castle
+name Grey Castle Entrance
 difficulty 35
 width 32
 height 32
@@ -7,7 +7,7 @@ enter_x 15
 enter_y 30
 msg
 Created:  1996-09-16 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch woods_3
diff --git a/quests/greyshield/Cave b/quests/greyshield/Cave
index f0ebb328c..22143b142 100644
--- a/quests/greyshield/Cave
+++ b/quests/greyshield/Cave
@@ -1,11 +1,13 @@
 arch map
-name Cave
+name Grey Cavern Entrance
+difficulty 30
 width 16
 height 16
+enter_x 2
 enter_y 13
 msg
 Created:  1996-09-16 Chris Jeske
-Modified: 2008-06-06 Arvid Norlander
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/greyshield/Cavern b/quests/greyshield/Cavern
index 61c8a98ec..539f1ed81 100644
--- a/quests/greyshield/Cavern
+++ b/quests/greyshield/Cavern
@@ -1,5 +1,5 @@
 arch map
-name Cavern
+name Grey Cavern
 difficulty 35
 darkness 4
 width 32
@@ -8,7 +8,7 @@ enter_x 15
 enter_y 18
 msg
 Created:  1996-09-13 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/greyshield/Cavern2 b/quests/greyshield/Cavern2
index 1a6a75787..6d15da450 100644
--- a/quests/greyshield/Cavern2
+++ b/quests/greyshield/Cavern2
@@ -1,12 +1,12 @@
 arch map
-name Cavern
+name Grey Cavern, Level 2
 width 32
 height 32
 enter_x 2
 enter_y 30
 msg
 Created:  1996-09-13 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/greyshield/Chamber b/quests/greyshield/Chamber
index 424ce1e65..15f42c440 100644
--- a/quests/greyshield/Chamber
+++ b/quests/greyshield/Chamber
@@ -1,5 +1,5 @@
 arch map
-name Chamber
+name Grey Castle Chamber
 difficulty 80
 darkness 3
 width 32
@@ -8,7 +8,7 @@ enter_x 11
 enter_y 13
 msg
 Created:  1996-10-25 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch flagstone
diff --git a/quests/greyshield/Doors b/quests/greyshield/Doors
index 39961bf7a..054b2df2c 100644
--- a/quests/greyshield/Doors
+++ b/quests/greyshield/Doors
@@ -1,5 +1,5 @@
 arch map
-name Doors
+name Grey Castle Doors
 difficulty 50
 width 16
 height 9
@@ -7,7 +7,7 @@ enter_x 2
 enter_y 4
 msg
 Created:  1996-11-06 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch flagstone
diff --git a/quests/greyshield/Dungeon b/quests/greyshield/Dungeon
index 50801ada1..47d19115b 100644
--- a/quests/greyshield/Dungeon
+++ b/quests/greyshield/Dungeon
@@ -1,5 +1,5 @@
 arch map
-name Dungeon
+name Grey Cavern, Dungeon
 difficulty 35
 width 32
 height 32
@@ -7,7 +7,7 @@ enter_x 1
 enter_y 30
 msg
 Created:  1996-09-19 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch mine10
diff --git a/quests/greyshield/Elements b/quests/greyshield/Elements
index 1c5dfb591..564c5a4ea 100644
--- a/quests/greyshield/Elements
+++ b/quests/greyshield/Elements
@@ -1,5 +1,5 @@
 arch map
-name Elements
+name Grey Castle Elements
 difficulty 35
 width 32
 height 32
@@ -7,7 +7,7 @@ enter_x 7
 enter_y 30
 msg
 Created:  1996-12-06 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch medium_stones
diff --git a/quests/greyshield/Factory b/quests/greyshield/Factory
index 84579564d..cf32a5ec8 100644
--- a/quests/greyshield/Factory
+++ b/quests/greyshield/Factory
@@ -1,5 +1,5 @@
 arch map
-name Factory
+name Grey Castle Factory
 difficulty 25
 width 32
 height 32
@@ -7,7 +7,7 @@ enter_x 2
 enter_y 27
 msg
 Created:  1996-09-16 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch medium_stones
diff --git a/quests/greyshield/Finish b/quests/greyshield/Finish
index 3f053677f..5b4b528bc 100644
--- a/quests/greyshield/Finish
+++ b/quests/greyshield/Finish
@@ -1,5 +1,5 @@
 arch map
-name Finish
+name Grey Castle Finale
 difficulty 60
 darkness 4
 width 22
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 7
 msg
 Created:  1996-10-26 Chris Jeske
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/quests/greyshield/Sphinx b/quests/greyshield/Sphinx
index 7068e04b5..41deb2ad2 100644
--- a/quests/greyshield/Sphinx
+++ b/quests/greyshield/Sphinx
@@ -1,5 +1,5 @@
 arch map
-name Sphinx
+name Grey Castle Sphinx
 difficulty 50
 darkness 4
 width 24
@@ -8,6 +8,7 @@ enter_x 14
 enter_y 7
 msg
 Created:  1996-09-24 Chris Jeske
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/world/world_107_128 b/world/world_107_128
index 26d630291..2142f424f 100644
--- a/world/world_107_128
+++ b/world/world_107_128
@@ -4,7 +4,7 @@ difficulty 1
 width 50
 height 50
 msg
-Modified: 2007-12-24 tchize
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_107_127
@@ -4069,6 +4069,7 @@ x 16
 y 39
 end
 arch mountain_cave
+name Grey Cavern
 slaying /quests/greyshield/Cave
 hp 2
 sp 13