diff --git a/darcap/undead/undead.1 b/darcap/undead/undead.1
index ec12623ab..41fa664f5 100644
--- a/darcap/undead/undead.1
+++ b/darcap/undead/undead.1
@@ -1,5 +1,5 @@
 arch map
-name Undead Ruins
+name Undead Ruins, Level 1
 difficulty 10
 region darcap
 width 28
@@ -8,7 +8,7 @@ enter_x 4
 enter_y 4
 msg
 Created:  1994-11-14
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch small_stones
diff --git a/darcap/undead/undead.2 b/darcap/undead/undead.2
index 4de635a8f..0c9edc8ae 100644
--- a/darcap/undead/undead.2
+++ b/darcap/undead/undead.2
@@ -1,5 +1,5 @@
 arch map
-name Undead Ruins
+name Undead Ruins, Level 2
 difficulty 18
 region darcap
 width 28
@@ -8,7 +8,7 @@ enter_x 16
 enter_y 12
 msg
 Created:  1994-11-14
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch small_stones
diff --git a/darcap/undead/undead.3 b/darcap/undead/undead.3
index 6e4fb6776..50a0e0260 100644
--- a/darcap/undead/undead.3
+++ b/darcap/undead/undead.3
@@ -1,5 +1,5 @@
 arch map
-name Undead Ruins
+name Undead Ruins, Level 3
 difficulty 20
 region darcap
 width 28
@@ -7,7 +7,7 @@ height 24
 enter_x 1
 enter_y 1
 msg
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch small_stones
diff --git a/euthville/devil.church1 b/euthville/devil.church1
index 310b9208c..87c9cf593 100644
--- a/euthville/devil.church1
+++ b/euthville/devil.church1
@@ -1,5 +1,5 @@
 arch map
-name Valriel Weeping
+name Valriel Weeping, Entrance
 reset_timeout 7200
 difficulty 6
 region euthville
@@ -9,7 +9,7 @@ enter_x 9
 enter_y 15
 msg
 Created:  1993-11-02
-Modified: 2008-09-17 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/euthville/devil.church2 b/euthville/devil.church2
index f20f1e85b..89c39e550 100644
--- a/euthville/devil.church2
+++ b/euthville/devil.church2
@@ -1,5 +1,5 @@
 arch map
-name Valriel Weeping
+name Valriel Weeping, Dungeon Level 2
 difficulty 15
 region euthville
 width 25
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1993-11-24
-Modified: 2008-09-17 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/euthville/devil.church4 b/euthville/devil.church4
index c3b72a0c9..6497012bb 100644
--- a/euthville/devil.church4
+++ b/euthville/devil.church4
@@ -1,5 +1,5 @@
 arch map
-name Valriel Weeping
+name Valriel Weeping, Level 4
 difficulty 15
 region euthville
 width 30
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1993-12-10
-Modified: 2008-09-17 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch pstone_1
diff --git a/euthville/devil.church5 b/euthville/devil.church5
index 7d51551ff..1ef9467e3 100644
--- a/euthville/devil.church5
+++ b/euthville/devil.church5
@@ -1,5 +1,5 @@
 arch map
-name Valriel Weeping
+name Valriel Weeping, Level 5
 reset_timeout 7200
 difficulty 25
 region euthville
@@ -9,7 +9,7 @@ enter_x 16
 enter_y 17
 msg
 Created:  1993-12-10
-Modified: 2008-09-17 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch cobblestones2
diff --git a/lake_country/Butakis/B_wshop b/lake_country/Butakis/B_wshop
index 115379c1f..2b28e051d 100644
--- a/lake_country/Butakis/B_wshop
+++ b/lake_country/Butakis/B_wshop
@@ -1,5 +1,5 @@
 arch map
-name Weapon Shop
+name Lord Butakis Weapon Shop
 difficulty 25
 region lakecountry
 shopitems weapons:65;potion:0;scroll:0;arrow:20;bow:20;armour:-15;boots:-20;shield:-15;helmet:-20;bracers:-20;girdle:-20;weapon improver:5;*:-50
@@ -13,7 +13,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  1995-03-27 Kundi, Xue (xkd@soda.csua.berkeley.edu)
-Modified: 2008-09-19 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/pup_land/ancient/ruin/village b/pup_land/ancient/ruin/village
index 69e611a3d..ac6c1802a 100644
--- a/pup_land/ancient/ruin/village
+++ b/pup_land/ancient/ruin/village
@@ -1,5 +1,5 @@
 arch map
-name Village
+name Shining Village
 difficulty 1
 region ancientpupland
 width 21
@@ -8,7 +8,7 @@ enter_x 8
 enter_y 2
 msg
 Created:  1996-02-30
-Modified: 2008-10-07 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch invis_exit
diff --git a/pup_land/ancient/village/village b/pup_land/ancient/village/village
index 60894afa0..d9e008931 100644
--- a/pup_land/ancient/village/village
+++ b/pup_land/ancient/village/village
@@ -1,5 +1,5 @@
 arch map
-name Village
+name Lone Village
 difficulty 1
 region ancientpupland
 width 30
diff --git a/pup_land/ancient/volcano/volcano.1 b/pup_land/ancient/volcano/volcano.1
index 14376ed81..790afdfc6 100755
--- a/pup_land/ancient/volcano/volcano.1
+++ b/pup_land/ancient/volcano/volcano.1
@@ -1,5 +1,5 @@
 arch map
-name Volcano
+name Volcano, Entrance
 difficulty 1
 region ancientpupland
 darkness 4
@@ -9,7 +9,7 @@ enter_x 5
 enter_y 7
 msg
 Created:  2000-06-06 Andreas Vogl (red.blaze@gmx.net)
-Modified: 2008-10-07 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch cave25
diff --git a/pup_land/ancient/volcano/volcano.2 b/pup_land/ancient/volcano/volcano.2
index 9cd80296b..80a106421 100755
--- a/pup_land/ancient/volcano/volcano.2
+++ b/pup_land/ancient/volcano/volcano.2
@@ -1,5 +1,5 @@
 arch map
-name Volcano
+name Volcano Cavern
 difficulty 1
 region ancientpupland
 darkness 4
@@ -9,7 +9,7 @@ enter_x 3
 enter_y 4
 msg
 Created:  2000-06-06
-Modified: 2008-10-07 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/pup_land/ancient/volcano/volcano.3 b/pup_land/ancient/volcano/volcano.3
index 7ed66502b..940223b1a 100755
--- a/pup_land/ancient/volcano/volcano.3
+++ b/pup_land/ancient/volcano/volcano.3
@@ -1,5 +1,5 @@
 arch map
-name Volcano
+name Volcano, Inner Cavern
 difficulty 45
 region ancientpupland
 darkness 4
@@ -9,7 +9,7 @@ enter_x 20
 enter_y 25
 msg
 Created:  2000-06-06
-Modified: 2008-10-07 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/santo_dominion/shaft/undeadshaft.1 b/santo_dominion/shaft/undeadshaft.1
index b634c16ed..ac2d28deb 100755
--- a/santo_dominion/shaft/undeadshaft.1
+++ b/santo_dominion/shaft/undeadshaft.1
@@ -1,5 +1,5 @@
 arch map
-name UndeadShaft
+name UndeadShaft, 1st Level
 difficulty 12
 region santodominion
 width 16
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2006-04-30 Bort
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch medium_stones
diff --git a/santo_dominion/shaft/undeadshaft.2 b/santo_dominion/shaft/undeadshaft.2
index 4d4a7160d..b79a447a8 100755
--- a/santo_dominion/shaft/undeadshaft.2
+++ b/santo_dominion/shaft/undeadshaft.2
@@ -1,5 +1,5 @@
 arch map
-name UndeadShaft
+name UndeadShaft, 2nd Level
 difficulty 12
 region santodominion
 width 16
@@ -8,7 +8,7 @@ enter_x 13
 enter_y 14
 msg
 Created:  2006-05-09 Bort
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/santo_dominion/shaft/undeadshaft.3 b/santo_dominion/shaft/undeadshaft.3
index 9d1705b90..05f275613 100755
--- a/santo_dominion/shaft/undeadshaft.3
+++ b/santo_dominion/shaft/undeadshaft.3
@@ -1,5 +1,5 @@
 arch map
-name UndeadShaft
+name UndeadShaft, 3rd Level
 difficulty 16
 region santodominion
 width 20
@@ -8,7 +8,7 @@ enter_x 17
 enter_y 15
 msg
 Created:  2006-05-09 Bort
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch medium_stones
diff --git a/santo_dominion/shaft/undeadshaft.4 b/santo_dominion/shaft/undeadshaft.4
index 2e138dada..3c0fa25f0 100755
--- a/santo_dominion/shaft/undeadshaft.4
+++ b/santo_dominion/shaft/undeadshaft.4
@@ -1,5 +1,5 @@
 arch map
-name UndeadShaft
+name UndeadShaft, 4th Level
 difficulty 17
 region santodominion
 width 32
@@ -8,7 +8,7 @@ enter_x 9
 enter_y 3
 msg
 Created:  2006-05-14 Bort
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch medium_stones
diff --git a/scorn/houses/breezy_under2 b/scorn/houses/breezy_under2
index a5451a8b8..38e28dbd4 100644
--- a/scorn/houses/breezy_under2
+++ b/scorn/houses/breezy_under2
@@ -1,5 +1,5 @@
 arch map
-name Under Breezy Acres
+name Under Breezy Acres, Sublevel 2
 difficulty 12
 region scorn
 darkness 3
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2003-05-11 Avion
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/whalingoutpost/underwaterdungeon/level1 b/whalingoutpost/underwaterdungeon/level1
index 052eb81fe..e7d8af6fb 100644
--- a/whalingoutpost/underwaterdungeon/level1
+++ b/whalingoutpost/underwaterdungeon/level1
@@ -1,5 +1,5 @@
 arch map
-name Underwater Dungeon
+name Underwater Dungeon Level 1
 reset_timeout 7200
 difficulty 1
 darkness 3
@@ -9,7 +9,7 @@ enter_x 26
 enter_y 40
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-10-01 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch pstone_1
diff --git a/whalingoutpost/underwaterdungeon/level2 b/whalingoutpost/underwaterdungeon/level2
index 2ffee84e3..da240f1f0 100644
--- a/whalingoutpost/underwaterdungeon/level2
+++ b/whalingoutpost/underwaterdungeon/level2
@@ -1,5 +1,5 @@
 arch map
-name Underwater Dungeon
+name Underwater Dungeon Level 2
 reset_timeout 7200
 difficulty 7
 width 16
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2005-03-10 Mikeeusa
-Modified: 2008-10-01 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch pstone_1
diff --git a/whalingoutpost/underwaterdungeon/level3 b/whalingoutpost/underwaterdungeon/level3
index 4693ed1b9..e8dec568f 100644
--- a/whalingoutpost/underwaterdungeon/level3
+++ b/whalingoutpost/underwaterdungeon/level3
@@ -1,5 +1,5 @@
 arch map
-name Underwater Dungeon
+name Underwater Dungeon Level 3
 reset_timeout 7200
 difficulty 40
 width 16
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2005-03-10 Mikeeusa
-Modified: 2008-10-01 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/world/world_104_109 b/world/world_104_109
index e47daef8d..c8fe72a77 100644
--- a/world/world_104_109
+++ b/world/world_104_109
@@ -3,7 +3,7 @@ name world_104_109
 width 50
 height 50
 msg
-Modified: 2007-12-24 tchize
+Modified: 2008-10-26 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_104_108
@@ -7851,6 +7851,7 @@ y 42
 elevation 4665
 end
 arch chole_2
+name HauntedShaft
 slaying /santo_dominion/shaft/undeadshaft.1
 hp 1
 sp 1