diff --git a/mlab/mlabscrntrd1 b/mlab/mlabscrntrd1
index 448c06513..e232285dc 100644
--- a/mlab/mlabscrntrd1
+++ b/mlab/mlabscrntrd1
@@ -1,5 +1,5 @@
 arch map
-name West Scorn Trade Market
+name West Scorn Trade Market, Entrance
 reset_timeout 1
 difficulty 1
 region scorn
@@ -14,7 +14,7 @@ enter_x 1
 enter_y 10
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-10-14 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/mlab/mlabscrntrd2 b/mlab/mlabscrntrd2
index 1665bf202..a4ba1afab 100644
--- a/mlab/mlabscrntrd2
+++ b/mlab/mlabscrntrd2
@@ -1,5 +1,5 @@
 arch map
-name West Scorn Trade Market
+name West Scorn Trade Market, Upstairs
 reset_timeout 7200
 difficulty 35
 region scorn
@@ -9,7 +9,7 @@ enter_x 6
 enter_y 7
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-10-14 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch woodfloor2
diff --git a/mlab/mlabscrntrdb1 b/mlab/mlabscrntrdb1
index 709d31d5c..7a7fdea6a 100644
--- a/mlab/mlabscrntrdb1
+++ b/mlab/mlabscrntrdb1
@@ -1,5 +1,5 @@
 arch map
-name West Scorn Trade Market
+name West Scorn Trade Market, Vault Level 1
 reset_timeout 1
 difficulty 1
 region scorn
@@ -14,7 +14,7 @@ enter_x 6
 enter_y 14
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-10-14 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/mlab/mlabscrntrdb2 b/mlab/mlabscrntrdb2
index d1f0643b3..c5034a161 100644
--- a/mlab/mlabscrntrdb2
+++ b/mlab/mlabscrntrdb2
@@ -1,5 +1,5 @@
 arch map
-name West Scorn Trade Market
+name West Scorn Trade Market, Vault Level 2
 reset_timeout 1
 difficulty 1
 region scorn
@@ -14,7 +14,7 @@ enter_x 19
 enter_y 4
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-10-14 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/mlab/mlabscrntrdb3 b/mlab/mlabscrntrdb3
index 6aea5815f..203ccb397 100644
--- a/mlab/mlabscrntrdb3
+++ b/mlab/mlabscrntrdb3
@@ -1,5 +1,5 @@
 arch map
-name West Scorn Trade Market
+name West Scorn Trade Market, Vault Level 3
 reset_timeout 1
 difficulty 1
 region scorn
@@ -14,7 +14,7 @@ enter_x 13
 enter_y 4
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-10-14 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/navar_city/misc/navarwiz b/navar_city/misc/navarwiz
index 0b8c53acc..147a66608 100644
--- a/navar_city/misc/navarwiz
+++ b/navar_city/misc/navarwiz
@@ -1,5 +1,5 @@
 arch map
-name Wizard's Hideout
+name Wizard's Eastern Hideout
 difficulty 1
 region navar
 darkness 4
@@ -9,7 +9,7 @@ enter_x 5
 enter_y 5
 msg
 Created:  2006-08-11 Alex Schultz
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/navar_city/mlab/tavern b/navar_city/mlab/tavern
index f534d4e74..cd1579328 100644
--- a/navar_city/mlab/tavern
+++ b/navar_city/mlab/tavern
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tavern
+name Western Navar Tavern, Mainfloor
 reset_timeout 7200
 difficulty 20
 region navar
@@ -9,7 +9,7 @@ enter_x 25
 enter_y 1
 msg
 Created:  2002-02-18 Mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch invis_exit
diff --git a/navar_city/mlab/tavern2 b/navar_city/mlab/tavern2
index ec867e28d..b1208b639 100644
--- a/navar_city/mlab/tavern2
+++ b/navar_city/mlab/tavern2
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tavern
+name Western Navar Tavern, Level 2
 reset_timeout 7200
 difficulty 20
 region navar
@@ -9,7 +9,7 @@ enter_x 28
 enter_y 16
 msg
 Created:  2002-02-19 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/tavern3 b/navar_city/mlab/tavern3
index c7653de8c..cb88b348f 100644
--- a/navar_city/mlab/tavern3
+++ b/navar_city/mlab/tavern3
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tavern
+name Western Navar Tavern, Level 3
 reset_timeout 7200
 difficulty 20
 region navar
@@ -9,7 +9,7 @@ enter_x 29
 enter_y 16
 msg
 Created:  2002-02-20 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/tavern4 b/navar_city/mlab/tavern4
index 1c85728de..c3c30bbec 100644
--- a/navar_city/mlab/tavern4
+++ b/navar_city/mlab/tavern4
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tavern
+name Western Navar Tavern, Level 4
 reset_timeout 7200
 difficulty 1
 region navar
@@ -9,7 +9,7 @@ enter_x 8
 enter_y 8
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/tavern5 b/navar_city/mlab/tavern5
index 468e031f1..239328b3c 100644
--- a/navar_city/mlab/tavern5
+++ b/navar_city/mlab/tavern5
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tavern
+name Western Navar Tavern, Level 5
 reset_timeout 7200
 difficulty 1
 region navar
@@ -9,7 +9,7 @@ enter_x 4
 enter_y 7
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/tavern6 b/navar_city/mlab/tavern6
index a7ccab5dd..0991d6380 100644
--- a/navar_city/mlab/tavern6
+++ b/navar_city/mlab/tavern6
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tavern
+name Western Navar Tavern, Level 6
 reset_timeout 7200
 difficulty 1
 region navar
@@ -9,7 +9,7 @@ enter_x 8
 enter_y 8
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/tavern7 b/navar_city/mlab/tavern7
index 2f2f05531..f2c9ca1fb 100644
--- a/navar_city/mlab/tavern7
+++ b/navar_city/mlab/tavern7
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tavern
+name Western Navar Tavern, Level 7
 reset_timeout 7200
 difficulty 1
 region navar
@@ -9,7 +9,7 @@ enter_x 9
 enter_y 6
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower10 b/navar_city/mlab/ttower10
index 15f62dcea..a18f7f884 100644
--- a/navar_city/mlab/ttower10
+++ b/navar_city/mlab/ttower10
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tavern
+name Western Navar Tavern, Level 10
 reset_timeout 7200
 difficulty 25
 region navar
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 10
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower11 b/navar_city/mlab/ttower11
index 7ffaae427..db2712fdf 100644
--- a/navar_city/mlab/ttower11
+++ b/navar_city/mlab/ttower11
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 11
 reset_timeout 7200
 difficulty 20
 region navar
@@ -9,7 +9,7 @@ enter_x 4
 enter_y 7
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower12 b/navar_city/mlab/ttower12
index b2a9d2ecb..6a25322c2 100644
--- a/navar_city/mlab/ttower12
+++ b/navar_city/mlab/ttower12
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 12
 reset_timeout 7200
 difficulty 30
 region navar
@@ -9,7 +9,7 @@ enter_x 10
 enter_y 13
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower13 b/navar_city/mlab/ttower13
index fa7d9b8ae..513c4b66f 100644
--- a/navar_city/mlab/ttower13
+++ b/navar_city/mlab/ttower13
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 13
 reset_timeout 7200
 difficulty 30
 region navar
@@ -9,7 +9,7 @@ enter_x 9
 enter_y 9
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower14 b/navar_city/mlab/ttower14
index c439b0b68..5d2effdf3 100644
--- a/navar_city/mlab/ttower14
+++ b/navar_city/mlab/ttower14
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 14
 reset_timeout 7200
 difficulty 35
 region navar
@@ -9,7 +9,7 @@ enter_x 5
 enter_y 12
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower15 b/navar_city/mlab/ttower15
index f698f591a..ff0699402 100644
--- a/navar_city/mlab/ttower15
+++ b/navar_city/mlab/ttower15
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 15
 reset_timeout 7200
 difficulty 40
 region navar
@@ -9,7 +9,7 @@ enter_x 10
 enter_y 4
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower16 b/navar_city/mlab/ttower16
index fb2e615c5..557bd07c8 100644
--- a/navar_city/mlab/ttower16
+++ b/navar_city/mlab/ttower16
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 16
 reset_timeout 7200
 difficulty 45
 region navar
@@ -9,7 +9,7 @@ enter_x 7
 enter_y 13
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower17 b/navar_city/mlab/ttower17
index 63d653a56..337f0a120 100644
--- a/navar_city/mlab/ttower17
+++ b/navar_city/mlab/ttower17
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 17
 reset_timeout 7200
 difficulty 50
 region navar
@@ -9,7 +9,7 @@ enter_x 11
 enter_y 12
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower18 b/navar_city/mlab/ttower18
index 4b8e2cbe2..699bfbb99 100644
--- a/navar_city/mlab/ttower18
+++ b/navar_city/mlab/ttower18
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 18
 reset_timeout 7200
 difficulty 50
 region navar
@@ -9,7 +9,7 @@ enter_x 10
 enter_y 4
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower19 b/navar_city/mlab/ttower19
index 1188b7a7e..4d69ddfc3 100644
--- a/navar_city/mlab/ttower19
+++ b/navar_city/mlab/ttower19
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 19
 reset_timeout 7200
 difficulty 50
 region navar
@@ -9,7 +9,7 @@ enter_x 7
 enter_y 13
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower20 b/navar_city/mlab/ttower20
index f996367d3..67bdc75e9 100644
--- a/navar_city/mlab/ttower20
+++ b/navar_city/mlab/ttower20
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 20
 reset_timeout 7200
 difficulty 50
 region navar
@@ -9,7 +9,7 @@ enter_x 3
 enter_y 8
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower21 b/navar_city/mlab/ttower21
index 4106d87da..e42860537 100644
--- a/navar_city/mlab/ttower21
+++ b/navar_city/mlab/ttower21
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 21
 reset_timeout 7200
 difficulty 55
 region navar
@@ -9,7 +9,7 @@ enter_x 8
 enter_y 8
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower22 b/navar_city/mlab/ttower22
index 286bcd599..8224cc74c 100644
--- a/navar_city/mlab/ttower22
+++ b/navar_city/mlab/ttower22
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 22
 reset_timeout 7200
 difficulty 55
 region navar
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 5
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower23 b/navar_city/mlab/ttower23
index 6b07386c9..7eda688d6 100644
--- a/navar_city/mlab/ttower23
+++ b/navar_city/mlab/ttower23
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 23
 reset_timeout 7200
 difficulty 65
 region navar
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 12
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch stonefloor2
diff --git a/navar_city/mlab/ttower24 b/navar_city/mlab/ttower24
index c2552dcf0..454ad1911 100644
--- a/navar_city/mlab/ttower24
+++ b/navar_city/mlab/ttower24
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 24
 reset_timeout 7200
 difficulty 75
 region navar
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 3
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch stonefloor2
diff --git a/navar_city/mlab/ttower25 b/navar_city/mlab/ttower25
index 983ab8552..e81dab645 100644
--- a/navar_city/mlab/ttower25
+++ b/navar_city/mlab/ttower25
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 25
 reset_timeout 7200
 difficulty 75
 region navar
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 23
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch stonefloor2
diff --git a/navar_city/mlab/ttower26 b/navar_city/mlab/ttower26
index dc8409eb7..f2e8e23aa 100644
--- a/navar_city/mlab/ttower26
+++ b/navar_city/mlab/ttower26
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 26
 reset_timeout 7200
 difficulty 75
 region navar
@@ -9,7 +9,7 @@ enter_x 21
 enter_y 12
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower27 b/navar_city/mlab/ttower27
index 47ef16963..c6b6aa5b2 100644
--- a/navar_city/mlab/ttower27
+++ b/navar_city/mlab/ttower27
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 27
 reset_timeout 7200
 difficulty 80
 region navar
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 13
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower28 b/navar_city/mlab/ttower28
index a3db4d092..4c089474c 100644
--- a/navar_city/mlab/ttower28
+++ b/navar_city/mlab/ttower28
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 28
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 5
 enter_y 9
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower29 b/navar_city/mlab/ttower29
index d7385b1e7..711686a88 100644
--- a/navar_city/mlab/ttower29
+++ b/navar_city/mlab/ttower29
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 29
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 10
 enter_y 13
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower30 b/navar_city/mlab/ttower30
index cc115b463..7616c4320 100644
--- a/navar_city/mlab/ttower30
+++ b/navar_city/mlab/ttower30
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 30
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 12
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower31 b/navar_city/mlab/ttower31
index 25a767b48..9619da918 100644
--- a/navar_city/mlab/ttower31
+++ b/navar_city/mlab/ttower31
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 31
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 13
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower32 b/navar_city/mlab/ttower32
index 42a4d2e8e..981e11f76 100644
--- a/navar_city/mlab/ttower32
+++ b/navar_city/mlab/ttower32
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 32
 reset_timeout 7200
 difficulty 90
 region navar
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 12
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower33 b/navar_city/mlab/ttower33
index 9931511cd..a56f56054 100644
--- a/navar_city/mlab/ttower33
+++ b/navar_city/mlab/ttower33
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 33
 reset_timeout 7200
 difficulty 90
 region navar
@@ -9,7 +9,7 @@ enter_x 14
 enter_y 8
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower34 b/navar_city/mlab/ttower34
index 06c3db843..17a95c80b 100644
--- a/navar_city/mlab/ttower34
+++ b/navar_city/mlab/ttower34
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 34
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 13
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower35 b/navar_city/mlab/ttower35
index 0dc1ae3a4..75142d0bf 100644
--- a/navar_city/mlab/ttower35
+++ b/navar_city/mlab/ttower35
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 35
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 12
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower36 b/navar_city/mlab/ttower36
index 11123b564..74f4b6a7e 100644
--- a/navar_city/mlab/ttower36
+++ b/navar_city/mlab/ttower36
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 36
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 14
 enter_y 17
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower37 b/navar_city/mlab/ttower37
index 47e4ab424..49b03ed73 100644
--- a/navar_city/mlab/ttower37
+++ b/navar_city/mlab/ttower37
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 37
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 13
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower38 b/navar_city/mlab/ttower38
index 344c97288..358ca691f 100644
--- a/navar_city/mlab/ttower38
+++ b/navar_city/mlab/ttower38
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 38
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 14
 enter_y 12
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower39 b/navar_city/mlab/ttower39
index 5e407f936..6624616ae 100644
--- a/navar_city/mlab/ttower39
+++ b/navar_city/mlab/ttower39
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 39
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 9
 enter_y 10
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower40 b/navar_city/mlab/ttower40
index b77083866..7113a6334 100644
--- a/navar_city/mlab/ttower40
+++ b/navar_city/mlab/ttower40
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 40
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 9
 enter_y 15
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower41 b/navar_city/mlab/ttower41
index 803a3c8d6..fb37a5c52 100644
--- a/navar_city/mlab/ttower41
+++ b/navar_city/mlab/ttower41
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 41
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 16
 enter_y 11
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower42 b/navar_city/mlab/ttower42
index 9e879b269..43fa8cd9c 100644
--- a/navar_city/mlab/ttower42
+++ b/navar_city/mlab/ttower42
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 42
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 13
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower43 b/navar_city/mlab/ttower43
index a6b692e08..368499b04 100644
--- a/navar_city/mlab/ttower43
+++ b/navar_city/mlab/ttower43
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 43
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 12
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower44 b/navar_city/mlab/ttower44
index 371424fa3..d8c9c3667 100644
--- a/navar_city/mlab/ttower44
+++ b/navar_city/mlab/ttower44
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 44
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 13
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower45 b/navar_city/mlab/ttower45
index 408992af1..8189a62ef 100644
--- a/navar_city/mlab/ttower45
+++ b/navar_city/mlab/ttower45
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 45
 reset_timeout 7200
 difficulty 85
 region navar
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 12
 msg
 Created:  2002-02-25 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower8 b/navar_city/mlab/ttower8
index fd119d04b..efb7316bc 100644
--- a/navar_city/mlab/ttower8
+++ b/navar_city/mlab/ttower8
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 8
 reset_timeout 7200
 difficulty 20
 region navar
@@ -9,7 +9,7 @@ enter_x 8
 enter_y 8
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/ttower9 b/navar_city/mlab/ttower9
index cf452e91a..f5c0d0a09 100644
--- a/navar_city/mlab/ttower9
+++ b/navar_city/mlab/ttower9
@@ -1,5 +1,5 @@
 arch map
-name Western Navar Tower
+name Western Navar Tower, Level 9
 reset_timeout 7200
 difficulty 20
 region navar
@@ -9,7 +9,7 @@ enter_x 10
 enter_y 4
 msg
 Created:  2002-02-22 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/mlab/zealothouseb1 b/navar_city/mlab/zealothouseb1
index d8cc5d301..5d45d675a 100644
--- a/navar_city/mlab/zealothouseb1
+++ b/navar_city/mlab/zealothouseb1
@@ -1,5 +1,5 @@
 arch map
-name Zealot House
+name Zealot House, Downstairs
 reset_timeout 7200
 difficulty 20
 region navar
@@ -10,7 +10,7 @@ enter_x 6
 enter_y 12
 msg
 Created:  2004-02-26 mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/pup_land/lone_town/shops/transport.shoppe b/pup_land/lone_town/shops/transport.shoppe
index d1451ffb2..112175b19 100644
--- a/pup_land/lone_town/shops/transport.shoppe
+++ b/pup_land/lone_town/shops/transport.shoppe
@@ -1,5 +1,5 @@
 arch map
-name Ye Olde Shoppe of Transport
+name Lone Town's Ye Olde Shoppe of Transport
 reset_timeout 1800
 difficulty 110
 region lonetown
@@ -12,7 +12,7 @@ enter_x 17
 enter_y 22
 msg
 Created:  2007-04-08 Gene Alexander
-Modified: 2008-10-10 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch grass
diff --git a/pup_land/lone_town/town b/pup_land/lone_town/town
index e6b70c360..76f285c28 100644
--- a/pup_land/lone_town/town
+++ b/pup_land/lone_town/town
@@ -8,7 +8,7 @@ enter_x 5
 enter_y 18
 msg
 Created:  1996-02-25
-Modified: 2008-10-26 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch grass
@@ -241,7 +241,7 @@ x 1
 y 15
 end
 arch s_shop2
-name Ye Olde Shoppe of Transport
+name Lone Town's Ye Olde Shoppe of Transport
 slaying /pup_land/lone_town/shops/transport.shoppe
 hp 17
 sp 22
diff --git a/pup_land/lone_town/town_ud1 b/pup_land/lone_town/town_ud1
index 09dc4b34f..4ae764757 100644
--- a/pup_land/lone_town/town_ud1
+++ b/pup_land/lone_town/town_ud1
@@ -1,5 +1,5 @@
 arch map
-name Well
+name Lone Town Well, Level 1
 difficulty 12
 region lonetown
 width 22
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 8
 msg
 Created:  1996-01-31
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/pup_land/lone_town/town_ud2 b/pup_land/lone_town/town_ud2
index f68dda4c9..a13659948 100644
--- a/pup_land/lone_town/town_ud2
+++ b/pup_land/lone_town/town_ud2
@@ -1,5 +1,5 @@
 arch map
-name Lone Town Well
+name Lone Town Well, Level 2
 difficulty 27
 region lonetown
 width 25
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 20
 msg
 Created:  1996-01-31
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch pstone_1
diff --git a/santo_dominion/magara/well/top b/santo_dominion/magara/well/top
index 8e793f5e9..17c413815 100644
--- a/santo_dominion/magara/well/top
+++ b/santo_dominion/magara/well/top
@@ -1,5 +1,5 @@
 arch map
-name Well
+name Santo Dominion Well
 difficulty 11
 region santodominion
 darkness 1
@@ -9,7 +9,7 @@ enter_x 15
 enter_y 14
 msg
 Created:  2002-08-23 Andreas Vogl
-Modified: 2008-09-25 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/scorn/houses/wizz.entry b/scorn/houses/wizz.entry
index cbe5d0559..16e742094 100644
--- a/scorn/houses/wizz.entry
+++ b/scorn/houses/wizz.entry
@@ -1,5 +1,5 @@
 arch map
-name Yarid's House
+name Yarid's House, Entrance
 swap_time 3600
 difficulty 9
 region scorn
@@ -9,7 +9,7 @@ enter_x 14
 enter_y 7
 msg
 Created:  1996-01-06 Bjoern Helfesrieder (helfesri@igd.fhg.de)
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/scorn/houses/wizz.lev1 b/scorn/houses/wizz.lev1
index 2e0603fb9..c7f22675e 100644
--- a/scorn/houses/wizz.lev1
+++ b/scorn/houses/wizz.lev1
@@ -1,5 +1,5 @@
 arch map
-name Yarid's House
+name Yarid's House, Downstairs
 swap_time 3600
 difficulty 16
 region scorn
@@ -9,7 +9,7 @@ enter_x 2
 enter_y 2
 msg
 Created:  1996-01-05 Bjoern Helfesrieder (helfesri@igd.fhg.de)
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/scorn/houses/wizz.lev1.pass1 b/scorn/houses/wizz.lev1.pass1
index 3c143e80c..e13fd9ff4 100644
--- a/scorn/houses/wizz.lev1.pass1
+++ b/scorn/houses/wizz.lev1.pass1
@@ -1,5 +1,5 @@
 arch map
-name Yarid's House
+name Yarid's House, Dark Tunnel
 swap_time 3600
 difficulty 15
 region scorn
@@ -9,7 +9,7 @@ enter_x 12
 enter_y 2
 msg
 Created:  1996-01-06 Bjoern Helfesrieder (helfesri@igd.fhg.de)
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/scorn/misc/wizhide b/scorn/misc/wizhide
index f4262d3b4..7262aaca1 100644
--- a/scorn/misc/wizhide
+++ b/scorn/misc/wizhide
@@ -1,5 +1,5 @@
 arch map
-name Wizard's Hideout
+name Wizard's Western Hideout
 difficulty 3
 region scorn
 darkness 4
@@ -9,7 +9,7 @@ enter_x 10
 enter_y 12
 msg
 Created:  2006-08-05 Alex Schultz
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/scorn/misc/zoo2 b/scorn/misc/zoo2
index 8a6ca4319..9aa190085 100644
--- a/scorn/misc/zoo2
+++ b/scorn/misc/zoo2
@@ -1,5 +1,5 @@
 arch map
-name Zoo
+name Zoo, Lower Level
 difficulty 1
 region scorn
 width 50
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2001-03-13
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/whalingoutpost/lightkeepershouseb1 b/whalingoutpost/lightkeepershouseb1
index 71ec3e865..a6c6e1473 100644
--- a/whalingoutpost/lightkeepershouseb1
+++ b/whalingoutpost/lightkeepershouseb1
@@ -1,5 +1,5 @@
 arch map
-name 'Keeper's Cavern
+name Lightkeeper's Cavern
 reset_timeout 7200
 difficulty 35
 darkness 3
@@ -9,7 +9,7 @@ enter_x 97
 enter_y 9
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-10-02 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch istone
diff --git a/wolfsburg/dungeons/church.2 b/wolfsburg/dungeons/church.2
index 4d2d4136a..06f40dda4 100644
--- a/wolfsburg/dungeons/church.2
+++ b/wolfsburg/dungeons/church.2
@@ -1,5 +1,5 @@
 arch map
-name Well to Catabombs
+name Well to Catabombs, Level 1
 difficulty 9
 region wolfsburg
 width 32
@@ -7,7 +7,7 @@ height 29
 enter_x 5
 enter_y 6
 msg
-Modified: 2008-10-02 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/wolfsburg/dungeons/church.3 b/wolfsburg/dungeons/church.3
index 9ce39e510..a1f379d16 100644
--- a/wolfsburg/dungeons/church.3
+++ b/wolfsburg/dungeons/church.3
@@ -1,5 +1,5 @@
 arch map
-name Well to Catabombs
+name Well to Catabombs, Level 2
 difficulty 4
 region wolfsburg
 width 32
@@ -8,7 +8,7 @@ enter_x 30
 enter_y 16
 msg
 Created:  1994-11-15
-Modified: 2008-10-02 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/wolfsburg/dungeons/church.4a b/wolfsburg/dungeons/church.4a
index ed077889a..1affcc68f 100644
--- a/wolfsburg/dungeons/church.4a
+++ b/wolfsburg/dungeons/church.4a
@@ -1,5 +1,5 @@
 arch map
-name Well to Catabombs
+name Well to Catabombs, Level 4a
 difficulty 14
 region wolfsburg
 width 36
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 16
 msg
 Created:  1994-11-15
-Modified: 2008-10-02 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/wolfsburg/dungeons/church.4b b/wolfsburg/dungeons/church.4b
index abd5aae01..d595bf238 100644
--- a/wolfsburg/dungeons/church.4b
+++ b/wolfsburg/dungeons/church.4b
@@ -1,5 +1,5 @@
 arch map
-name Well to Catabombs
+name Well to Catabombs, Level 4b
 difficulty 14
 region wolfsburg
 width 30
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1994-11-15
-Modified: 2008-10-02 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/wolfsburg/dungeons/church.4c b/wolfsburg/dungeons/church.4c
index baac8ebf0..82bec3727 100644
--- a/wolfsburg/dungeons/church.4c
+++ b/wolfsburg/dungeons/church.4c
@@ -1,5 +1,5 @@
 arch map
-name Well to Catabombs
+name Well to Catabombs, Level 4c
 difficulty 14
 region wolfsburg
 width 29
@@ -8,7 +8,7 @@ enter_x 18
 enter_y 20
 msg
 Created:  1994-11-15
-Modified: 2008-10-02 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch medium_stones
diff --git a/wolfsburg/dungeons/church.4d b/wolfsburg/dungeons/church.4d
index 0b6d4461b..e9875d6e2 100644
--- a/wolfsburg/dungeons/church.4d
+++ b/wolfsburg/dungeons/church.4d
@@ -1,5 +1,5 @@
 arch map
-name Well to Catabombs
+name Well to Catabombs, Level 4d
 difficulty 18
 region wolfsburg
 width 63
@@ -8,7 +8,7 @@ enter_x 60
 enter_y 12
 msg
 Created:  1994-11-15
-Modified: 2008-10-02 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/wolfsburg/shops/transport.shoppe b/wolfsburg/shops/transport.shoppe
index e41e49dc8..924765b4d 100644
--- a/wolfsburg/shops/transport.shoppe
+++ b/wolfsburg/shops/transport.shoppe
@@ -1,5 +1,5 @@
 arch map
-name Ye Olde Shoppe of Transport
+name Wolfsburg's Ye Olde Shoppe of Transport
 reset_timeout 1800
 difficulty 110
 region wolfsburg
@@ -12,7 +12,7 @@ enter_x 17
 enter_y 22
 msg
 Created:  2007-04-08 Gene Alexander
-Modified: 2008-10-04 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/world/world_102_108 b/world/world_102_108
index 050f896ff..0b6a621a6 100644
--- a/world/world_102_108
+++ b/world/world_102_108
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-02-19
-Modified: 2008-10-21 Rick Tanner
+Modified: 2008-10-26 Rick Tanner
 Modified: 2008-08-01 Raphaël Quinet
 endmsg
 outdoor 1
@@ -4647,7 +4647,7 @@ x 19
 y 18
 end
 arch well
-name Well
+name Santo Dominion Well
 slaying /santo_dominion/magara/well/top
 hp 14
 sp 14
diff --git a/world/world_128_109 b/world/world_128_109
index 056a02902..d4505d734 100644
--- a/world/world_128_109
+++ b/world/world_128_109
@@ -5,7 +5,7 @@ region wolfsburg
 width 50
 height 50
 msg
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-10-27 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_128_108
@@ -8001,7 +8001,7 @@ x 32
 y 2
 end
 arch house_2
-name Ye Olde Transport Shoppe
+name Wolfsburg's Ye Olde Shoppe of Transport
 slaying /wolfsburg/shops/transport.shoppe
 hp 17
 sp 22