diff --git a/azumauindo/suno-yamatoshi/shops/bank2 b/azumauindo/suno-yamatoshi/shops/bank2
index a33320df4..a5cc0ae54 100644
--- a/azumauindo/suno-yamatoshi/shops/bank2
+++ b/azumauindo/suno-yamatoshi/shops/bank2
@@ -1,5 +1,5 @@
 arch map
-name Chokinbako
+name Chokinbako Rooftop
 reset_timeout 7200
 difficulty 35
 region azumauindo
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2005-04-07 MikeeUSA
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch afloor_right
diff --git a/brest/brittany/dol-guldur.1 b/brest/brittany/dol-guldur.1
index cbeaf691c..a6051c100 100644
--- a/brest/brittany/dol-guldur.1
+++ b/brest/brittany/dol-guldur.1
@@ -1,10 +1,11 @@
 arch map
-name Dol-Guldur
+name Dol-Guldur, Entry
 region brest
 width 7
 height 29
 msg
 Created:  1994-06-01
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/brest/brittany/dol-guldur.2 b/brest/brittany/dol-guldur.2
index c8faee956..c9625c938 100644
--- a/brest/brittany/dol-guldur.2
+++ b/brest/brittany/dol-guldur.2
@@ -1,10 +1,11 @@
 arch map
-name Dol-Guldur
+name Dol-Guldur, Stables
 region brest
 width 26
 height 15
 msg
 Created:  1994-06-02
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch pstone_1
diff --git a/brest/brittany/dol-guldur.3 b/brest/brittany/dol-guldur.3
index fd8a054e0..a9142ff62 100644
--- a/brest/brittany/dol-guldur.3
+++ b/brest/brittany/dol-guldur.3
@@ -1,11 +1,11 @@
 arch map
-name Dol-Guldur
+name Dol-Guldur, Library
 region brest
 width 27
 height 32
 msg
 Created:  1994-06-02
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dirtfloor
diff --git a/brest/brittany/dol-guldur.5 b/brest/brittany/dol-guldur.5
index 8dc17cbc7..1514e0be4 100644
--- a/brest/brittany/dol-guldur.5
+++ b/brest/brittany/dol-guldur.5
@@ -1,10 +1,11 @@
 arch map
-name Dol-Guldur
+name Dol-Guldur, Armoury
 region brest
 width 32
 height 19
 msg
 Created:  1994-06-02
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dungeon_floor
@@ -590,7 +591,7 @@ y 12
 end
 arch sign_e
 msg
-Armory...
+Armoury...
 endmsg
 x 4
 y 12
diff --git a/brest/brittany/dol-guldur.6 b/brest/brittany/dol-guldur.6
index 2daab1f89..369e65469 100644
--- a/brest/brittany/dol-guldur.6
+++ b/brest/brittany/dol-guldur.6
@@ -1,11 +1,11 @@
 arch map
-name Dol-Guldur
+name Dol-Guldur, Master's Chamber
 region brest
 width 35
 height 42
 msg
 Created:  1994-06-02
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dirtfloor
diff --git a/darcap/raffle/raffle1 b/darcap/raffle/raffle1
index c31e0679a..ddd514b55 100644
--- a/darcap/raffle/raffle1
+++ b/darcap/raffle/raffle1
@@ -1,5 +1,5 @@
 arch map
-name Darcap Raffle 1
+name Darcap Raffle 1, Entrance
 swap_time 5
 reset_timeout 3600
 fixed_resettime 1
@@ -10,7 +10,7 @@ height 30
 enter_y 7
 msg
 Created:  2008-02-29
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/darcap/raffle/raffle1_u1 b/darcap/raffle/raffle1_u1
index 8f999bcc8..34150a561 100644
--- a/darcap/raffle/raffle1_u1
+++ b/darcap/raffle/raffle1_u1
@@ -1,5 +1,5 @@
 arch map
-name Darcap Raffle 1
+name Darcap Raffle 1, Level 1
 swap_time 5
 reset_timeout 3600
 difficulty 15
@@ -10,7 +10,7 @@ enter_x 2
 enter_y 16
 msg
 Date: 2008-02-29
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/darcap/raffle/raffle1_u2 b/darcap/raffle/raffle1_u2
index f3dd8b398..859d1d4af 100644
--- a/darcap/raffle/raffle1_u2
+++ b/darcap/raffle/raffle1_u2
@@ -1,5 +1,5 @@
 arch map
-name Darcap Raffle 1
+name Darcap Raffle 1, Level 2
 swap_time 5
 reset_timeout 3600
 difficulty 15
@@ -10,7 +10,7 @@ enter_x 2
 enter_y 2
 msg
 Date: 2008-02-29
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/darcap/raffle/raffle1_u3 b/darcap/raffle/raffle1_u3
index cb28574b5..2264db267 100644
--- a/darcap/raffle/raffle1_u3
+++ b/darcap/raffle/raffle1_u3
@@ -1,5 +1,5 @@
 arch map
-name Darcap Raffle 1
+name Darcap Raffle 1, Level 3
 swap_time 5
 reset_timeout 3600
 difficulty 15
@@ -10,7 +10,7 @@ enter_x 2
 enter_y 16
 msg
 Date: 2008-02-29
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/dragonisland/damarishouse0 b/dragonisland/damarishouse0
index df6d4167a..49a35e56c 100644
--- a/dragonisland/damarishouse0
+++ b/dragonisland/damarishouse0
@@ -1,5 +1,5 @@
 arch map
-name Damaris' House
+name Damaris' House, Basement
 difficulty 14
 region stoneville
 width 14
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 7
 msg
 Created:  1997-06-17
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/dragonisland/damarishouse1 b/dragonisland/damarishouse1
index aea0c5280..c7e89ec0d 100644
--- a/dragonisland/damarishouse1
+++ b/dragonisland/damarishouse1
@@ -1,5 +1,5 @@
 arch map
-name Damaris' House
+name Damaris' House, Entrance
 difficulty 1
 region stoneville
 width 20
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 13
 msg
 Created:  1997-06-17
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch grass
diff --git a/dragonisland/damarishouse2 b/dragonisland/damarishouse2
index e424d5666..8b07568b5 100644
--- a/dragonisland/damarishouse2
+++ b/dragonisland/damarishouse2
@@ -1,5 +1,5 @@
 arch map
-name Damaris' House
+name Damaris' House, Upper Level
 difficulty 5
 region stoneville
 width 14
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  Viola Krings
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/dragonisland/dragonmountain0 b/dragonisland/dragonmountain0
index a2d616a8d..0e8b40cef 100644
--- a/dragonisland/dragonmountain0
+++ b/dragonisland/dragonmountain0
@@ -1,5 +1,5 @@
 arch map
-name Dragon Mountain
+name Dragon Mountain, Entry
 difficulty 35
 region stoneville
 width 40
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 12
 msg
 Created:  1997-09-02 Viola Krings (krings@informatik.tu-muenchen.de)
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch small_stones
diff --git a/dragonisland/dragonmountain1 b/dragonisland/dragonmountain1
index 00de01c3f..b40730ac0 100644
--- a/dragonisland/dragonmountain1
+++ b/dragonisland/dragonmountain1
@@ -1,5 +1,5 @@
 arch map
-name Dragon Mountain
+name Dragon Mountain, Peak
 difficulty 35
 region stoneville
 width 40
@@ -8,7 +8,7 @@ enter_x 38
 enter_y 11
 msg
 Created:  1997-09-02 Viola Krings (krings@informatik)
-Modified: 2008-09-14 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch small_stones
diff --git a/dragonisland/hangar b/dragonisland/hangar
index ff588e2f0..acba8f60a 100644
--- a/dragonisland/hangar
+++ b/dragonisland/hangar
@@ -1,5 +1,5 @@
 arch map
-name Dragon Hangar
+name Stoneville Dragon Hangar
 difficulty 10
 region stoneville
 width 35
@@ -8,7 +8,7 @@ enter_x 15
 enter_y 1
 msg
 Created:  1997-06-19
-Modified: 2008-09-15 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch magic_banned
diff --git a/dragonisland/hangar2 b/dragonisland/hangar2
index 676852640..d5c3c4fbe 100644
--- a/dragonisland/hangar2
+++ b/dragonisland/hangar2
@@ -1,5 +1,5 @@
 arch map
-name Dragon Hangar
+name Stoneville Dragon Hangar, Restricted Area
 difficulty 35
 region stoneville
 width 32
@@ -8,7 +8,7 @@ enter_x 15
 enter_y 30
 msg
 Created:  2001-03-06 Philipp Currlin (philipp.currlin@epost.de)
-Modified: 2008-09-15 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/dragonisland/hangar3 b/dragonisland/hangar3
index dc1c84b7c..77e1edf1b 100644
--- a/dragonisland/hangar3
+++ b/dragonisland/hangar3
@@ -1,5 +1,5 @@
 arch map
-name Dragon Hangar
+name Stoneville Dragon Hangar, Rookery
 difficulty 35
 region stoneville
 width 32
@@ -8,7 +8,7 @@ enter_x 14
 enter_y 15
 msg
 Created:  2001-03-17
-Modified: 2008-09-15 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dirtfloor
diff --git a/inn_and_outpost/pypers_treehouse b/inn_and_outpost/pypers_treehouse
index 930ab60cb..dcfa9c6ae 100644
--- a/inn_and_outpost/pypers_treehouse
+++ b/inn_and_outpost/pypers_treehouse
@@ -1,5 +1,5 @@
 arch map
-name DF Outpost 1
+name Pyper's Treehouse
 difficulty 10
 region wilderness
 width 15
@@ -8,7 +8,7 @@ enter_x 12
 enter_y 12
 msg
 Created:  2004-08-13 Avion
-Modified: 2008-09-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/inn_and_outpost/treehouse_df2 b/inn_and_outpost/treehouse_df2
index 89284bee2..9d1442be9 100644
--- a/inn_and_outpost/treehouse_df2
+++ b/inn_and_outpost/treehouse_df2
@@ -1,5 +1,5 @@
 arch map
-name DF Outpost 1
+name DF Outpost 2
 difficulty 5
 region wilderness
 width 10
@@ -8,7 +8,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
-Modified: 2008-09-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/inn_and_outpost/treehouse_df3 b/inn_and_outpost/treehouse_df3
index 3172a5af2..a49dee296 100644
--- a/inn_and_outpost/treehouse_df3
+++ b/inn_and_outpost/treehouse_df3
@@ -1,5 +1,5 @@
 arch map
-name DF Outpost 1
+name DF Outpost 3
 difficulty 5
 region wilderness
 width 10
@@ -8,7 +8,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
-Modified: 2008-09-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/inn_and_outpost/treehouse_df4 b/inn_and_outpost/treehouse_df4
index 7bdffb411..a517fe122 100644
--- a/inn_and_outpost/treehouse_df4
+++ b/inn_and_outpost/treehouse_df4
@@ -1,5 +1,5 @@
 arch map
-name DF Outpost 1
+name DF Outpost 4
 difficulty 5
 region wilderness
 width 10
@@ -8,7 +8,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
-Modified: 2008-09-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/inn_and_outpost/treehouse_df5 b/inn_and_outpost/treehouse_df5
index b96a75f22..c03cf1127 100644
--- a/inn_and_outpost/treehouse_df5
+++ b/inn_and_outpost/treehouse_df5
@@ -1,5 +1,5 @@
 arch map
-name DF Outpost 1
+name DF Outpost 5
 difficulty 5
 region wilderness
 width 10
@@ -8,7 +8,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
-Modified: 2008-09-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/inn_and_outpost/treehouse_df6 b/inn_and_outpost/treehouse_df6
index 58f0d9cf5..3b49e0f99 100644
--- a/inn_and_outpost/treehouse_df6
+++ b/inn_and_outpost/treehouse_df6
@@ -1,5 +1,5 @@
 arch map
-name DF Outpost 1
+name DF Outpost 6
 difficulty 5
 region wilderness
 width 10
@@ -8,7 +8,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
-Modified: 2008-09-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/lake_country/dragon_hangar/hangar b/lake_country/dragon_hangar/hangar
index 59c19c48a..161032e2d 100644
--- a/lake_country/dragon_hangar/hangar
+++ b/lake_country/dragon_hangar/hangar
@@ -1,5 +1,5 @@
 arch map
-name Dragon Hangar
+name Lake Country Dragon Hangar
 difficulty 5
 region lakecountry
 width 35
@@ -7,7 +7,7 @@ height 32
 enter_x 15
 msg
 Created:  2005-10-20 Gene Alexander
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch magic_banned
diff --git a/marksel/church b/marksel/church
index 0582160af..6147679a3 100644
--- a/marksel/church
+++ b/marksel/church
@@ -1,5 +1,5 @@
 arch map
-name Church of Valriel
+name Church to Valriel
 difficulty 8
 region wilderness
 width 7
@@ -8,7 +8,7 @@ enter_x 3
 enter_y 10
 msg
 Created:  1999-02-03 King Zoobus
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch cobblestones2
diff --git a/mlab/citydeclouds/apartment/cwdctownhaus1lvl1 b/mlab/citydeclouds/apartment/cwdctownhaus1lvl1
index 3f9218f85..9328633e4 100644
--- a/mlab/citydeclouds/apartment/cwdctownhaus1lvl1
+++ b/mlab/citydeclouds/apartment/cwdctownhaus1lvl1
@@ -1,5 +1,5 @@
 arch map
-name Cloud World Town Haus
+name Cloud World Town Haus One, Level 1
 difficulty 1
 region citydeclouds
 width 26
@@ -8,7 +8,7 @@ enter_x 12
 enter_y 20
 msg
 Created:  2007-03-11 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/mlab/citydeclouds/apartment/cwdctownhaus1lvl2 b/mlab/citydeclouds/apartment/cwdctownhaus1lvl2
index 8ff1f067f..b8408fcdd 100644
--- a/mlab/citydeclouds/apartment/cwdctownhaus1lvl2
+++ b/mlab/citydeclouds/apartment/cwdctownhaus1lvl2
@@ -1,5 +1,5 @@
 arch map
-name Clowd World Town Haus
+name Clowd World Town Haus One, Level 2
 difficulty 1
 region citydeclouds
 width 26
@@ -8,7 +8,7 @@ enter_x 21
 enter_y 19
 msg
 Created:  2007-03-11 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/mlab/citydeclouds/apartment/cwdctownhaus2lvl1 b/mlab/citydeclouds/apartment/cwdctownhaus2lvl1
index 72f333094..16d922f29 100644
--- a/mlab/citydeclouds/apartment/cwdctownhaus2lvl1
+++ b/mlab/citydeclouds/apartment/cwdctownhaus2lvl1
@@ -1,5 +1,5 @@
 arch map
-name Cloud World Town Haus
+name Cloud World Town Haus Two, Level 1
 difficulty 1
 region citydeclouds
 width 26
@@ -8,7 +8,7 @@ enter_x 12
 enter_y 20
 msg
 Created:  2007-03-11 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/mlab/citydeclouds/apartment/cwdctownhaus2lvl2 b/mlab/citydeclouds/apartment/cwdctownhaus2lvl2
index 9c04f4739..3d9ca9c70 100644
--- a/mlab/citydeclouds/apartment/cwdctownhaus2lvl2
+++ b/mlab/citydeclouds/apartment/cwdctownhaus2lvl2
@@ -1,5 +1,5 @@
 arch map
-name Clowd World Town Haus
+name Clowd World Town Haus Two, Level 2
 difficulty 1
 region citydeclouds
 width 26
@@ -8,7 +8,7 @@ enter_x 21
 enter_y 19
 msg
 Created:  2007-03-11 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/mlab/citydeclouds/apartment/cwdctownhaus3lvl1 b/mlab/citydeclouds/apartment/cwdctownhaus3lvl1
index 8b9f6f929..9df8fda69 100644
--- a/mlab/citydeclouds/apartment/cwdctownhaus3lvl1
+++ b/mlab/citydeclouds/apartment/cwdctownhaus3lvl1
@@ -1,5 +1,5 @@
 arch map
-name Cloud World Town Haus
+name Cloud World Town Haus Three, Level 1
 difficulty 1
 region citydeclouds
 width 26
@@ -8,7 +8,7 @@ enter_x 12
 enter_y 20
 msg
 Created:  2007-03-11 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/mlab/citydeclouds/apartment/cwdctownhaus3lvl2 b/mlab/citydeclouds/apartment/cwdctownhaus3lvl2
index d39998fb6..b203cf5d5 100644
--- a/mlab/citydeclouds/apartment/cwdctownhaus3lvl2
+++ b/mlab/citydeclouds/apartment/cwdctownhaus3lvl2
@@ -1,5 +1,5 @@
 arch map
-name Clowd World Town Haus
+name Clowd World Town Haus Three, Level 2
 difficulty 1
 region citydeclouds
 width 26
@@ -8,7 +8,7 @@ enter_x 21
 enter_y 19
 msg
 Created:  2007-03-11 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/mlab/citydeclouds/apartment/cwdctownhaus4lvl1 b/mlab/citydeclouds/apartment/cwdctownhaus4lvl1
index 9306992a8..93fa13d8e 100644
--- a/mlab/citydeclouds/apartment/cwdctownhaus4lvl1
+++ b/mlab/citydeclouds/apartment/cwdctownhaus4lvl1
@@ -1,5 +1,5 @@
 arch map
-name Cloud World Town Haus
+name Cloud World Town Haus Four, Level 1
 difficulty 1
 region citydeclouds
 width 26
@@ -8,7 +8,7 @@ enter_x 12
 enter_y 20
 msg
 Created:  2007-03-11 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/mlab/citydeclouds/apartment/cwdctownhaus4lvl2 b/mlab/citydeclouds/apartment/cwdctownhaus4lvl2
index 8c32b378c..03d182fe8 100644
--- a/mlab/citydeclouds/apartment/cwdctownhaus4lvl2
+++ b/mlab/citydeclouds/apartment/cwdctownhaus4lvl2
@@ -1,5 +1,5 @@
 arch map
-name Clowd World Town Haus
+name Clowd World Town Haus Four, Level 2
 difficulty 1
 region citydeclouds
 width 26
@@ -8,7 +8,7 @@ enter_x 21
 enter_y 19
 msg
 Created:  2007-03-11 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/mlab/citydeclouds/bank/bank1 b/mlab/citydeclouds/bank/bank1
index c414f58b8..e7f1d18ff 100644
--- a/mlab/citydeclouds/bank/bank1
+++ b/mlab/citydeclouds/bank/bank1
@@ -1,5 +1,5 @@
 arch map
-name City de Clouds Bank
+name City de Clouds Bank, Lobby
 difficulty 1
 region citydeclouds
 width 20
@@ -8,7 +8,7 @@ enter_x 6
 enter_y 22
 msg
 Created:  2005-05-28 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/mlab/citydeclouds/bank/bank2 b/mlab/citydeclouds/bank/bank2
index 801d70f7d..8f55aa89a 100644
--- a/mlab/citydeclouds/bank/bank2
+++ b/mlab/citydeclouds/bank/bank2
@@ -1,5 +1,5 @@
 arch map
-name City de Clouds Bank
+name City de Clouds Bank, 2nd Floor
 reset_timeout 7200
 difficulty 1
 region citydeclouds
@@ -9,7 +9,7 @@ enter_x 5
 enter_y 25
 msg
 Created:  2004-08-04 Mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/mlab/citydeclouds/bank/bank3 b/mlab/citydeclouds/bank/bank3
index 9cf26d607..877d52df3 100644
--- a/mlab/citydeclouds/bank/bank3
+++ b/mlab/citydeclouds/bank/bank3
@@ -1,5 +1,5 @@
 arch map
-name City de Clouds Bank
+name City de Clouds Bank, 3rd Floor
 difficulty 1
 region citydeclouds
 width 17
@@ -8,7 +8,7 @@ enter_x 9
 enter_y 25
 msg
 Created:  2005-05-28 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/mlab/citydeclouds/bank/bank4 b/mlab/citydeclouds/bank/bank4
index 5fb750101..91db3f3a8 100644
--- a/mlab/citydeclouds/bank/bank4
+++ b/mlab/citydeclouds/bank/bank4
@@ -1,5 +1,5 @@
 arch map
-name City de Clouds Bank
+name City de Clouds Bank, 4th Floor
 difficulty 1
 region citydeclouds
 width 17
@@ -8,7 +8,7 @@ enter_x 11
 enter_y 25
 msg
 Created:  2005-05-28 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/mlab/citydeclouds/bank/bank5 b/mlab/citydeclouds/bank/bank5
index aa7b53264..16d1c3276 100644
--- a/mlab/citydeclouds/bank/bank5
+++ b/mlab/citydeclouds/bank/bank5
@@ -1,5 +1,5 @@
 arch map
-name City de Clouds Bank
+name City de Clouds Bank, 5th Floor
 difficulty 1
 region citydeclouds
 width 17
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 8
 msg
 Created:  2005-05-28 mikeeusa
-Modified: 2008-10-06 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/mlab/citydeclouds/cdcgatea2 b/mlab/citydeclouds/cdcgatea2
index 6a1228b59..23cbf5871 100644
--- a/mlab/citydeclouds/cdcgatea2
+++ b/mlab/citydeclouds/cdcgatea2
@@ -1,5 +1,5 @@
 arch map
-name City de Clouds Gate
+name City de Clouds Gate, Rooftop
 reset_timeout 7200
 difficulty 1
 region citydeclouds
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 15
 msg
 Created:  2004-07-27 mikeeusa
-Modified: 2008-10-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/mlab/citydeclouds/cdcnwgateuprlv1 b/mlab/citydeclouds/cdcnwgateuprlv1
index 5476aeb91..77f3a91f7 100644
--- a/mlab/citydeclouds/cdcnwgateuprlv1
+++ b/mlab/citydeclouds/cdcnwgateuprlv1
@@ -1,5 +1,5 @@
 arch map
-name City de Clouds Gate
+name City de Clouds Northwest Gate
 reset_timeout 7200
 difficulty 35
 region citydeclouds
@@ -9,7 +9,7 @@ enter_x 10
 enter_y 12
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-10-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/mlab/citydeclouds/villa/citydecloudsvillab1 b/mlab/citydeclouds/villa/citydecloudsvillab1
index 5664dcce6..403fe103a 100644
--- a/mlab/citydeclouds/villa/citydecloudsvillab1
+++ b/mlab/citydeclouds/villa/citydecloudsvillab1
@@ -1,5 +1,5 @@
 arch map
-name City de Clouds Villa
+name City de Clouds Villa, Basement Level 1
 reset_timeout 700
 difficulty 30
 region citydeclouds
@@ -9,7 +9,7 @@ enter_x 23
 enter_y 31
 msg
 Created:  2003-08-17 mikeeusa
-Modified: 2008-10-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/mlab/citydeclouds/villa/citydecloudsvillab2 b/mlab/citydeclouds/villa/citydecloudsvillab2
index aadd80394..cdea07065 100644
--- a/mlab/citydeclouds/villa/citydecloudsvillab2
+++ b/mlab/citydeclouds/villa/citydecloudsvillab2
@@ -1,5 +1,5 @@
 arch map
-name City de Clouds Villa
+name City de Clouds Villa, Basement Level 2
 reset_timeout 700
 difficulty 30
 region citydeclouds
@@ -9,7 +9,7 @@ enter_x 17
 enter_y 30
 msg
 Created:  2003-08-17 mikeeusa
-Modified: 2008-10-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/mlab/citydeclouds/villa/citydecloudsvillab3 b/mlab/citydeclouds/villa/citydecloudsvillab3
index 6b89a452c..48e7ab3b5 100644
--- a/mlab/citydeclouds/villa/citydecloudsvillab3
+++ b/mlab/citydeclouds/villa/citydecloudsvillab3
@@ -1,5 +1,5 @@
 arch map
-name City de Clouds Villa
+name City de Clouds Villa, Basement Level 3
 reset_timeout 700
 difficulty 30
 region citydeclouds
@@ -9,7 +9,7 @@ enter_x 17
 enter_y 24
 msg
 Created:  2003-08-17 mikeeusa
-Modified: 2008-10-18 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/dragon_hangar/hangar b/navar_city/dragon_hangar/hangar
index 477cbe80f..dcf79d0f1 100644
--- a/navar_city/dragon_hangar/hangar
+++ b/navar_city/dragon_hangar/hangar
@@ -1,5 +1,5 @@
 arch map
-name Dragon Hangar
+name Navar Dragon Hangar
 difficulty 5
 region navar
 width 35
@@ -7,7 +7,7 @@ height 32
 enter_x 15
 msg
 Created:  2005-10-18 Gene Alexander
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch magic_banned
diff --git a/navar_city/misc/theater b/navar_city/misc/theater
index 721de1958..c267d875b 100644
--- a/navar_city/misc/theater
+++ b/navar_city/misc/theater
@@ -1,5 +1,5 @@
 arch map
-name Civic Theater
+name Civic Theater, Ground Floor
 reset_timeout 7200
 difficulty 1
 region navar
@@ -9,7 +9,7 @@ enter_x 15
 enter_y 28
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/navar_city/misc/theater2 b/navar_city/misc/theater2
index a64834894..0f8a3568c 100644
--- a/navar_city/misc/theater2
+++ b/navar_city/misc/theater2
@@ -1,5 +1,5 @@
 arch map
-name Civic Theater
+name Civic Theater, 2nd Floor
 reset_timeout 7200
 difficulty 1
 region navar
@@ -9,7 +9,7 @@ enter_x 29
 enter_y 2
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/navar_city/misc/theater3 b/navar_city/misc/theater3
index 3d8211bf6..227e691db 100644
--- a/navar_city/misc/theater3
+++ b/navar_city/misc/theater3
@@ -1,5 +1,5 @@
 arch map
-name Civic Theater
+name Civic Theater, 3rd Floor
 reset_timeout 7200
 difficulty 1
 region navar
@@ -9,7 +9,7 @@ enter_x 8
 enter_y 8
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/navar_city/misc/theater4 b/navar_city/misc/theater4
index 0b5de8f20..00d661d37 100644
--- a/navar_city/misc/theater4
+++ b/navar_city/misc/theater4
@@ -1,5 +1,5 @@
 arch map
-name Civic Theater
+name Civic Theater, Tower Rooftop
 reset_timeout 7200
 difficulty 1
 region navar
@@ -9,7 +9,7 @@ enter_x 4
 enter_y 4
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/navar_city/misc/theaterb1 b/navar_city/misc/theaterb1
index 5998544c5..1681b6314 100644
--- a/navar_city/misc/theaterb1
+++ b/navar_city/misc/theaterb1
@@ -1,5 +1,5 @@
 arch map
-name Civic Theater
+name Civic Theater, Lower Level 1
 reset_timeout 7200
 difficulty 65
 region navar
@@ -10,7 +10,7 @@ enter_x 2
 enter_y 29
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/misc/theaterb2 b/navar_city/misc/theaterb2
index 737d3b793..6d905d5e3 100644
--- a/navar_city/misc/theaterb2
+++ b/navar_city/misc/theaterb2
@@ -1,5 +1,5 @@
 arch map
-name Civic Theater
+name Civic Theater, Lower Level 2
 reset_timeout 7200
 difficulty 70
 region navar
@@ -10,7 +10,7 @@ enter_x 10
 enter_y 1
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/navar_city/misc/theaterb3 b/navar_city/misc/theaterb3
index 18533bf30..203e6a4dd 100644
--- a/navar_city/misc/theaterb3
+++ b/navar_city/misc/theaterb3
@@ -1,5 +1,5 @@
 arch map
-name Civic Theater
+name Civic Theater, Lower Level 3
 reset_timeout 7200
 difficulty 80
 region navar
@@ -10,7 +10,7 @@ enter_x 22
 enter_y 27
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 tile_path_4 /navar_city/misc/theaterb4
 end
diff --git a/navar_city/misc/theaterb4 b/navar_city/misc/theaterb4
index f0f29b64c..e0cc09526 100644
--- a/navar_city/misc/theaterb4
+++ b/navar_city/misc/theaterb4
@@ -1,5 +1,5 @@
 arch map
-name Civic Theater
+name Civic Theater, Finale
 reset_timeout 7200
 difficulty 1
 region navar
@@ -10,7 +10,7 @@ enter_x 30
 enter_y 73
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/temples/valriel b/navar_city/temples/valriel
index 45637fb6e..b9e8e1ca6 100644
--- a/navar_city/temples/valriel
+++ b/navar_city/temples/valriel
@@ -1,5 +1,5 @@
 arch map
-name Church of Valriel
+name Temple of Valriel
 difficulty 1
 region navar
 width 20
@@ -9,7 +9,7 @@ enter_y 28
 msg
 Created:  1999-01-18 Raphael Quinet (quinet@gamers.org)
 Note: Altar to level 120 20050525 #4
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch grass
diff --git a/pup_land/lone_town/dress1 b/pup_land/lone_town/dress1
index bd7c27871..f5c10ea91 100644
--- a/pup_land/lone_town/dress1
+++ b/pup_land/lone_town/dress1
@@ -1,5 +1,5 @@
 arch map
-name Dressing Room
+name Dressing Room, Level 1
 difficulty 10
 region lonetown
 width 16
@@ -8,7 +8,7 @@ enter_x 15
 enter_y 7
 msg
 Created:  1996-01-27
-Modified: 2008-10-10 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/pup_land/lone_town/dress2 b/pup_land/lone_town/dress2
index c7f1dcfce..ca00f962b 100644
--- a/pup_land/lone_town/dress2
+++ b/pup_land/lone_town/dress2
@@ -1,5 +1,5 @@
 arch map
-name Dressing Room
+name Dressing Room, Level 2
 difficulty 15
 region lonetown
 width 16
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 7
 msg
 Created:  1996-01-27
-Modified: 2008-10-10 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/pup_land/lone_town/dress3 b/pup_land/lone_town/dress3
index 3d1ed21c0..099ee497b 100644
--- a/pup_land/lone_town/dress3
+++ b/pup_land/lone_town/dress3
@@ -1,5 +1,5 @@
 arch map
-name Dressing Room
+name Dressing Room, Level 3
 difficulty 16
 region lonetown
 width 15
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 30
 msg
 Created:  1996-01-27
-Modified: 2008-10-10 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/pup_land/nurnberg/dick/house2 b/pup_land/nurnberg/dick/house2
index 31cd51464..086baa3dd 100644
--- a/pup_land/nurnberg/dick/house2
+++ b/pup_land/nurnberg/dick/house2
@@ -1,5 +1,5 @@
 arch map
-name Dick's House
+name Dick's House, Upstairs
 difficulty 1
 region nurnberg
 width 16
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 5
 msg
 Created:  1996-02-10
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/mak/chaos/down1 b/quests/mak/chaos/down1
index a918a7b4f..6e8db56b9 100644
--- a/quests/mak/chaos/down1
+++ b/quests/mak/chaos/down1
@@ -1,5 +1,5 @@
 arch map
-name Dungeon
+name Warriors' Tower, Dungeon Level 1
 reset_timeout 7200
 difficulty 50
 width 32
@@ -8,7 +8,7 @@ enter_x 15
 enter_y 1
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/quests/mak/chaos/down2 b/quests/mak/chaos/down2
index c62cdb1d1..dfbec267b 100644
--- a/quests/mak/chaos/down2
+++ b/quests/mak/chaos/down2
@@ -1,5 +1,5 @@
 arch map
-name Dungeon
+name Warriors' Tower, Dungeon Level 2
 swap_time 5300
 difficulty 25
 width 32
@@ -8,7 +8,7 @@ enter_x 14
 enter_y 15
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/quests/mak/chaos/down3 b/quests/mak/chaos/down3
index fb0930c1d..ac2beef6a 100644
--- a/quests/mak/chaos/down3
+++ b/quests/mak/chaos/down3
@@ -1,5 +1,5 @@
 arch map
-name Chamber
+name Warriors' Tower, Chamber
 swap_time 5300
 difficulty 45
 width 32
@@ -8,7 +8,7 @@ enter_x 4
 enter_y 1
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/quests/mak/chaos/down4 b/quests/mak/chaos/down4
index 2d7ff8f8f..f27748579 100644
--- a/quests/mak/chaos/down4
+++ b/quests/mak/chaos/down4
@@ -1,5 +1,5 @@
 arch map
-name Cave
+name Warriors' Tower, Cave
 swap_time 5300
 difficulty 55
 width 32
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/quests/mak/chaos/down5 b/quests/mak/chaos/down5
index 5a1d7e358..6b64bea4b 100644
--- a/quests/mak/chaos/down5
+++ b/quests/mak/chaos/down5
@@ -1,5 +1,5 @@
 arch map
-name Rancid
+name Warriors' Tower, Rancid's Chamber
 reset_timeout 7200
 difficulty 99
 width 23
@@ -8,7 +8,7 @@ enter_x 11
 enter_y 22
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/quests/mak/chaos/fallen b/quests/mak/chaos/fallen
index 6a0bc7f33..085008288 100644
--- a/quests/mak/chaos/fallen
+++ b/quests/mak/chaos/fallen
@@ -1,5 +1,5 @@
 arch map
-name The Fallen
+name Warriors' Tower, The Fallen
 reset_timeout 7200
 difficulty 125
 width 32
@@ -8,7 +8,7 @@ enter_x 2
 enter_y 31
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/quests/mak/chaos/tritemples b/quests/mak/chaos/tritemples
index 736858b26..6db38039a 100644
--- a/quests/mak/chaos/tritemples
+++ b/quests/mak/chaos/tritemples
@@ -1,5 +1,5 @@
 arch map
-name Temples
+name Warriors' Tower, Tri Temples
 swap_time 5300
 difficulty 30
 width 54
@@ -8,7 +8,7 @@ enter_x 17
 enter_y 23
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @def Lorkas
diff --git a/quests/mak/chaos/up1 b/quests/mak/chaos/up1
index 77b4e48af..ef586b40d 100644
--- a/quests/mak/chaos/up1
+++ b/quests/mak/chaos/up1
@@ -1,5 +1,5 @@
 arch map
-name Tower
+name Warriors' Tower, Level 1
 swap_time 5300
 difficulty 22
 width 32
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 12
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/quests/mak/chaos/up2 b/quests/mak/chaos/up2
index 385b2ffac..52d14f9ae 100644
--- a/quests/mak/chaos/up2
+++ b/quests/mak/chaos/up2
@@ -1,5 +1,5 @@
 arch map
-name Tower
+name Warriors' Tower, Level 2
 swap_time 5300
 difficulty 25
 width 32
@@ -8,7 +8,7 @@ enter_x 14
 enter_y 17
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/quests/mak/chaos/up3 b/quests/mak/chaos/up3
index c8fac0d91..b27f4bbda 100644
--- a/quests/mak/chaos/up3
+++ b/quests/mak/chaos/up3
@@ -1,5 +1,5 @@
 arch map
-name Tower
+name Warriors' Tower, Level 3
 swap_time 5300
 difficulty 40
 width 32
@@ -8,7 +8,7 @@ enter_x 17
 enter_y 13
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/quests/mak/chaos/up4 b/quests/mak/chaos/up4
index 72bc15a80..46aaca3f2 100644
--- a/quests/mak/chaos/up4
+++ b/quests/mak/chaos/up4
@@ -1,5 +1,5 @@
 arch map
-name Tower
+name Warriors' Tower, Level 4
 swap_time 5300
 difficulty 80
 width 32
@@ -8,7 +8,7 @@ enter_x 11
 enter_y 13
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/quests/mak/chaos/up5 b/quests/mak/chaos/up5
index 14baa5de5..9a87fef48 100644
--- a/quests/mak/chaos/up5
+++ b/quests/mak/chaos/up5
@@ -1,5 +1,5 @@
 arch map
-name Vultoor
+name Warriors' Tower, Vultoor's Chamber
 reset_timeout 7200
 difficulty 99
 width 23
@@ -8,7 +8,7 @@ enter_x 11
 enter_y 22
 msg
 Created:  2000-04-09 Magnus Kronhamn (mak@solace.mh.se)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 maplore
 @quest Lorkas
diff --git a/santo_dominion/city_hall b/santo_dominion/city_hall
index 652e9cd95..299d70028 100644
--- a/santo_dominion/city_hall
+++ b/santo_dominion/city_hall
@@ -1,5 +1,5 @@
 arch map
-name City Hall
+name Santo Dominion City Hall
 difficulty 1
 region santodominion
 width 21
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 17
 msg
 Created:  1993-11-01 (john_cater@yahoo.com)
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch cobblestones2
diff --git a/scorn/misc/cityhall b/scorn/misc/cityhall
index ee6b1633c..3026d5af8 100644
--- a/scorn/misc/cityhall
+++ b/scorn/misc/cityhall
@@ -1,5 +1,5 @@
 arch map
-name City Hall
+name Scorn City Hall
 reset_timeout 7200
 difficulty 1
 region scorn
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 25
 msg
 Created:  1993-10-15
-Modified: 2007-12-31 Kevin Bulgrien
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch woods_2
diff --git a/scorn/misc/dragon_guild b/scorn/misc/dragon_guild
index 341237e60..100a809c3 100644
--- a/scorn/misc/dragon_guild
+++ b/scorn/misc/dragon_guild
@@ -1,5 +1,5 @@
 arch map
-name Dragon Guild
+name Dragon Guild of Scorn
 fixed_resettime 1
 difficulty 1
 region scorn
@@ -12,7 +12,7 @@ enter_x 7
 enter_y 15
 msg
 Created:  2002-02-28
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch flagstone
diff --git a/scorn/temples/valriel2 b/scorn/temples/valriel2
index 04e322a4a..115707768 100644
--- a/scorn/temples/valriel2
+++ b/scorn/temples/valriel2
@@ -1,5 +1,5 @@
 arch map
-name Church of Valriel
+name Church of Valriel, Balcony
 difficulty 3
 region scorn
 width 13
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 10
 msg
 Created:  1999-01-18 Raphaël Quinet (raphael@gimp.org)
-Modified: 2008-09-29 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/scorn/temples/valriel3 b/scorn/temples/valriel3
index dea45bd98..e47e941c2 100644
--- a/scorn/temples/valriel3
+++ b/scorn/temples/valriel3
@@ -1,5 +1,5 @@
 arch map
-name Church of Valriel Belltower
+name Church of Valriel, Belltower
 difficulty 3
 region scorn
 darkness 2
@@ -9,7 +9,7 @@ enter_x 2
 enter_y 3
 msg
 Created:  1999-01-22 Raphaël Quinet (raphael@gimp.org)
-Modified: 2008-09-29 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/wolfsburg/magara/cellar1/hcellar_1 b/wolfsburg/magara/cellar1/hcellar_1
index f29ec25c4..470f370c8 100644
--- a/wolfsburg/magara/cellar1/hcellar_1
+++ b/wolfsburg/magara/cellar1/hcellar_1
@@ -1,5 +1,5 @@
 arch map
-name Dank House
+name Dank House, Cellar Level 1
 difficulty 14
 region wolfsburg
 width 20
@@ -7,7 +7,7 @@ height 25
 enter_x 9
 enter_y 16
 msg
-Modified: 2008-10-04 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch small_stones
diff --git a/wolfsburg/magara/cellar1/hcellar_2 b/wolfsburg/magara/cellar1/hcellar_2
index 7c4917525..64fd754fd 100644
--- a/wolfsburg/magara/cellar1/hcellar_2
+++ b/wolfsburg/magara/cellar1/hcellar_2
@@ -1,12 +1,12 @@
 arch map
-name Dank House
+name Dank House, Cellar Level 2
 difficulty 20
 region wolfsburg
 width 40
 height 40
 enter_y 9
 msg
-Modified: 2008-10-04 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch small_stones
diff --git a/wolfsburg/magara/cellar1/hole b/wolfsburg/magara/cellar1/hole
index 11d023f46..4a21f0555 100644
--- a/wolfsburg/magara/cellar1/hole
+++ b/wolfsburg/magara/cellar1/hole
@@ -1,5 +1,5 @@
 arch map
-name Dank House
+name Dank House, Cellar
 difficulty 12
 region wolfsburg
 width 40
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1994-10-12
-Modified: 2008-10-04 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch small_stones
diff --git a/world/world_103_127 b/world/world_103_127
index 8e6903f61..29ca92a4b 100644
--- a/world/world_103_127
+++ b/world/world_103_127
@@ -815,7 +815,7 @@ x 3
 y 9
 end
 arch barn
-name dragon hangar
+name Stoneville Dragon Hangar
 slaying /dragonisland/hangar
 hp 15
 x 3
diff --git a/world/world_105_115 b/world/world_105_115
index 0aba6bf1c..73730ff9b 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2001-02-16
-Modified: 2008-05-19 Arvid Norlander
+Modified: 2008-10-21 Rick Tanner
 Modified: 2008-08-01 Raphaël Quinet
 endmsg
 outdoor 1
@@ -6939,7 +6939,7 @@ y 34
 elevation 4816
 end
 arch fort
-name dragon guild
+name Scorn Dragon Guild
 name_pl dragon guild
 slaying /scorn/misc/dragon_guild
 hp 7
diff --git a/world/world_120_109 b/world/world_120_109
index 90de66dd1..b177cbe76 100644
--- a/world/world_120_109
+++ b/world/world_120_109
@@ -3,7 +3,7 @@ name world_120_109
 width 50
 height 50
 msg
-Modified: 2007-12-24 tchize
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_120_108
@@ -11596,7 +11596,7 @@ y 43
 elevation 3423
 end
 arch shrine
-name Church of Valriel
+name Church to Valriel
 slaying /marksel/church
 hp 3
 sp 10
diff --git a/world/world_122_117 b/world/world_122_117
index a25425000..51d77b800 100644
--- a/world/world_122_117
+++ b/world/world_122_117
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2008-02-09 Nicolas Weeger
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_116
@@ -56,7 +56,7 @@ arch grass
 y 4
 end
 arch church
-name Church of Valriel
+name Temple of Valriel
 slaying /navar_city/temples/valriel
 hp 9
 sp 27