diff --git a/azumauindo/minatomachi/stores/postoffice b/azumauindo/minatomachi/stores/postoffice
index fc4fe31f7..3a52b7263 100644
--- a/azumauindo/minatomachi/stores/postoffice
+++ b/azumauindo/minatomachi/stores/postoffice
@@ -1,5 +1,5 @@
 arch map
-name IPO
+name Minatomachi IPO
 reset_timeout 7200
 difficulty 1
 region azumauindo
@@ -9,7 +9,7 @@ enter_x 10
 enter_y 18
 msg
 Created:  2004-02-03 Mikeeusa
-Modified: 2008-10-05 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/brest/brest.IPO b/brest/brest.IPO
index 24bf1042d..84566f8c1 100644
--- a/brest/brest.IPO
+++ b/brest/brest.IPO
@@ -1,5 +1,5 @@
 arch map
-name Imperial Post Office
+name Brest Imperial Post Office
 difficulty 2
 region brest
 width 10
@@ -8,7 +8,7 @@ enter_x 5
 enter_y 8
 msg
 Created:  2001-09-05 Commander Gros (yann.chachkoff@mailandnews.com)
-Modified: mikeeusa
+Modified: 2008-10-24 Rick Tanner
 Following a Lord MiDS idea
 endmsg
 end
diff --git a/brest/brittany/jessy.1 b/brest/brittany/jessy.1
index 3137fb217..0114dc81f 100644
--- a/brest/brittany/jessy.1
+++ b/brest/brittany/jessy.1
@@ -1,10 +1,10 @@
 arch map
-name Jessy Castle
+name Jessy Castle, Entrance
 region brest
 width 45
 height 30
 msg
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/brest/brittany/jessy.2 b/brest/brittany/jessy.2
index 0d21770bc..c24bce00d 100644
--- a/brest/brittany/jessy.2
+++ b/brest/brittany/jessy.2
@@ -1,10 +1,11 @@
 arch map
-name Jessy Castle
+name Jessy Castle, Level 2
 region brest
 width 25
 height 28
 msg
 Created:  1994-02-25
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/brest/brittany/jessy.3 b/brest/brittany/jessy.3
index fd22f597c..bcc9195b6 100644
--- a/brest/brittany/jessy.3
+++ b/brest/brittany/jessy.3
@@ -1,10 +1,10 @@
 arch map
-name Jessy Castle
+name Jessy Castle, Level 3
 region brest
 width 25
 height 29
 msg
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/lake_country/Butakis/gate_inner b/lake_country/Butakis/gate_inner
index 5f8ab0f3d..bdf1e1a18 100644
--- a/lake_country/Butakis/gate_inner
+++ b/lake_country/Butakis/gate_inner
@@ -1,5 +1,5 @@
 arch map
-name Inner Gate
+name Lord Butakis' Fortress, Inner Gate
 difficulty 20
 region lakecountry
 width 16
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 1
 msg
 Created:  1995-03-28 Kundi, Xue (xkd@soda.csua.berkeley.edu)
-Modified: 2008-09-19 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/navar_city/misc/IPO_navar b/navar_city/misc/IPO_navar
index 8751032d1..125117682 100644
--- a/navar_city/misc/IPO_navar
+++ b/navar_city/misc/IPO_navar
@@ -1,5 +1,5 @@
 arch map
-name Imperial Post Office
+name Navar Imperial Post Office
 difficulty 2
 region navar
 width 10
@@ -9,6 +9,7 @@ enter_y 8
 msg
 Created:  2001-09-05 Commander Gros (yann.chachkoff@mailandnews.com)
 Following a Lord MiDS idea
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch tile_tan_floor
diff --git a/pup_land/ancient/village/inn b/pup_land/ancient/village/inn
index ec68c954d..f0d29324b 100644
--- a/pup_land/ancient/village/inn
+++ b/pup_land/ancient/village/inn
@@ -1,5 +1,5 @@
 arch map
-name Inn
+name Lone Village Inn
 difficulty 1
 region ancientpupland
 width 16
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 7
 msg
 Created:  1996-05-17
-Modified: 2008-10-09 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch pstone_1
diff --git a/pup_land/ancient/village/village b/pup_land/ancient/village/village
index 10029d003..3e13df588 100644
--- a/pup_land/ancient/village/village
+++ b/pup_land/ancient/village/village
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 14
 msg
 Created:  1996-05-17
-Modified: 2008-10-09 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch pstone_2
@@ -3338,7 +3338,7 @@ x 22
 y 14
 end
 arch hovels
-name inn
+name Lone Village Inn
 slaying inn
 hp 1
 sp 7
diff --git a/pup_land/hall2 b/pup_land/hall2
index 28931a405..e9d053f03 100644
--- a/pup_land/hall2
+++ b/pup_land/hall2
@@ -1,5 +1,5 @@
 arch map
-name Hall of Fame
+name Hall of Fame, Level 2
 difficulty 1
 region pupland
 width 7
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1996-04-11
-Modified: 2008-10-13 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch cobblestones2
diff --git a/pup_land/lone_town/inn b/pup_land/lone_town/inn
index 40d7c11ab..1d7799b67 100644
--- a/pup_land/lone_town/inn
+++ b/pup_land/lone_town/inn
@@ -1,5 +1,5 @@
 arch map
-name Inn
+name Lone Town Inn
 difficulty 1
 region lonetown
 width 20
@@ -8,7 +8,7 @@ enter_x 9
 enter_y 8
 msg
 Created:  1996-01-25
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch flagstone
diff --git a/pup_land/lone_town/town b/pup_land/lone_town/town
index b3d9e6721..f3cb3b6a0 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-23 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch grass
@@ -2167,7 +2167,7 @@ x 16
 y 16
 end
 arch house_long
-name Inn
+name Lone Town Inn
 slaying inn
 hp 9
 sp 8
diff --git a/pup_land/nurnberg/IPO_nurnberg b/pup_land/nurnberg/IPO_nurnberg
index 750664273..1ca3ccb56 100644
--- a/pup_land/nurnberg/IPO_nurnberg
+++ b/pup_land/nurnberg/IPO_nurnberg
@@ -1,5 +1,5 @@
 arch map
-name Imperial Post Office
+name Nurnberg Imperial Post Office
 difficulty 1
 region nurnberg
 width 10
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 5
 msg
 Created:  2004-07-11 Avion
-Modified: 2008-10-11 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch flagstone
diff --git a/pup_land/nurnberg/city b/pup_land/nurnberg/city
index d2802116f..36a622c42 100644
--- a/pup_land/nurnberg/city
+++ b/pup_land/nurnberg/city
@@ -8,7 +8,7 @@ msg
 Created:  1996-02-07
 Updated 2007.11.12 by Gene Alexander
  - make this an outdoor map for day/night/weather
-Modified: 2008-10-21 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 outdoor 1
 end
@@ -4314,7 +4314,7 @@ x 26
 y 19
 end
 arch s_shop2
-name Imperial Post
+name Nurnberg Imperial Post Office
 slaying IPO_nurnberg
 msg
 Ding!
diff --git a/pup_land/s_f/ki b/pup_land/s_f/ki
index b3f4aae80..540a8bd3c 100755
--- a/pup_land/s_f/ki
+++ b/pup_land/s_f/ki
@@ -1,5 +1,5 @@
 arch map
-name J.Griffin's Hut
+name J.Griffin's Hut, Mainfloor
 difficulty 1
 region pupland
 width 12
@@ -8,7 +8,7 @@ enter_x 2
 enter_y 10
 msg
 Created:  1996-02-08
-Modified: 2008-10-13 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/pup_land/s_f/ki2 b/pup_land/s_f/ki2
index ab90672db..c02d619d5 100755
--- a/pup_land/s_f/ki2
+++ b/pup_land/s_f/ki2
@@ -1,5 +1,5 @@
 arch map
-name J.Griffin's Hut
+name J.Griffin's Hut, Upstairs
 difficulty 15
 region pupland
 width 10
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 1
 msg
 Created:  1996-02-08
-Modified: 2008-10-13 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/quests/peterm/temple/AnteChamber b/quests/peterm/temple/AnteChamber
index a7e1a0c69..e93757e5e 100644
--- a/quests/peterm/temple/AnteChamber
+++ b/quests/peterm/temple/AnteChamber
@@ -1,5 +1,5 @@
 arch map
-name Dark Temple -- AnteChamber
+name Dark Temple, AnteChamber
 difficulty 20
 darkness 5
 width 24
@@ -8,7 +8,7 @@ enter_x 21
 enter_y 1
 msg
 Created:  1994-01-14 peterm (peterm@soda.berkeley.edu)
-Modified: 2008-09-23 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch pstone_1
diff --git a/quests/peterm/temple/GemTunnel b/quests/peterm/temple/GemTunnel
index 4c4adf0c3..ba4127dad 100644
--- a/quests/peterm/temple/GemTunnel
+++ b/quests/peterm/temple/GemTunnel
@@ -1,5 +1,5 @@
 arch map
-name Dark Temple -- GemTunnel
+name Dark Temple, GemTunnel
 difficulty 25
 darkness 5
 width 8
@@ -8,7 +8,7 @@ enter_x 3
 enter_y 39
 msg
 Created:  1994-01-14 peterm (peterm@soda.berkeley.edu)
-Modified: 2008-09-23 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch cobblestones
diff --git a/quests/peterm/temple/InnerTemple b/quests/peterm/temple/InnerTemple
index a6c8dead6..f21d1669c 100644
--- a/quests/peterm/temple/InnerTemple
+++ b/quests/peterm/temple/InnerTemple
@@ -1,5 +1,5 @@
 arch map
-name Inner Temple
+name Dark Forest, Inner Temple
 difficulty 18
 width 16
 height 40
@@ -7,7 +7,7 @@ enter_x 7
 enter_y 39
 msg
 Created:  1994-01-14 peterm (peterm@soda.berkeley.edu)
-Modified: 2008-09-23 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch cobblestones2
diff --git a/quests/peterm/temple/OuterTemple b/quests/peterm/temple/OuterTemple
index 711368269..7425cc80f 100644
--- a/quests/peterm/temple/OuterTemple
+++ b/quests/peterm/temple/OuterTemple
@@ -1,5 +1,5 @@
 arch map
-name Outer Temple
+name Dark Forest, Outer Temple
 difficulty 15
 width 16
 height 30
@@ -7,7 +7,7 @@ enter_x 7
 enter_y 29
 msg
 Created:  1994-01-14 peterm (peterm@soda.berkeley.edu)
-Modified: 2008-09-23 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch pstone_1
diff --git a/scorn/kar/creepy.house2 b/scorn/kar/creepy.house2
index a7437186d..289609575 100644
--- a/scorn/kar/creepy.house2
+++ b/scorn/kar/creepy.house2
@@ -1,5 +1,5 @@
 arch map
-name Haunted House
+name Haunted House, Dungeon Level 2
 difficulty 12
 region scorn
 width 25
@@ -7,7 +7,7 @@ height 25
 enter_x 12
 enter_y 11
 msg
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch dirtfloor
diff --git a/scorn/misc/jail b/scorn/misc/jail
index eca98a13c..e5b85e9cb 100644
--- a/scorn/misc/jail
+++ b/scorn/misc/jail
@@ -1,5 +1,5 @@
 arch map
-name Jail
+name Scorn Jail
 reset_timeout 7200
 difficulty 6
 region scorn
@@ -8,7 +8,7 @@ height 15
 enter_y 7
 msg
 Created:  2001-10-17
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/scorn/misc/jail_upper b/scorn/misc/jail_upper
index e3272bffa..33463eee3 100644
--- a/scorn/misc/jail_upper
+++ b/scorn/misc/jail_upper
@@ -1,5 +1,5 @@
 arch map
-name Jail
+name Scorn Jail, Upperlevel
 reset_timeout 7200
 difficulty 6
 region scorn
@@ -9,7 +9,7 @@ enter_x 3
 enter_y 7
 msg
 Created:  2004-11-09 Casper and Salathar (salathar@hotmail.com)
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/scorn/shops/IPO_scorn b/scorn/shops/IPO_scorn
index 413d5809d..db2c00da0 100644
--- a/scorn/shops/IPO_scorn
+++ b/scorn/shops/IPO_scorn
@@ -1,5 +1,5 @@
 arch map
-name Imperial Post Office
+name Scorn Imperial Post Office
 difficulty 1
 region scorn
 width 10
@@ -9,6 +9,7 @@ enter_y 8
 msg
 Created:  2001-09-05 Commander Gros (yann.chachkoff@mailandnews.com)
 Following a Lord MiDS idea
+Modified: 2008-10-24 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/world/world_104_115 b/world/world_104_115
index 9c5b70652..c92de961c 100644
--- a/world/world_104_115
+++ b/world/world_104_115
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2001-02-16
-Modified: 2007-12-24 tchize
+Modified: 2008-10-24 Rick Tanner
 Modified: 2008-08-01 Raphaël Quinet
 endmsg
 outdoor 1
@@ -14944,7 +14944,7 @@ y 37
 elevation 1191
 end
 arch s_shop2
-name Imperial Post Office
+name Scorn Imperial Post Office
 slaying /scorn/shops/IPO_scorn
 msg
 Ding!
diff --git a/world/world_107_123 b/world/world_107_123
index 65f8f205c..1a491d720 100644
--- a/world/world_107_123
+++ b/world/world_107_123
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2008-10-20 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_107_122
@@ -10157,7 +10157,7 @@ y 29
 elevation 1509
 end
 arch house_1
-name IPO
+name Brest Imperial Post Office
 name_pl IPO
 slaying /brest/brest.IPO
 hp 5
diff --git a/world/world_122_117 b/world/world_122_117
index 51d77b800..bf9df71d1 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-10-21 Rick Tanner
+Modified: 2008-10-24 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_116
@@ -407,7 +407,7 @@ x 1
 y 7
 end
 arch s_shop1
-name Imperial Post
+name Navar Imperial Post Office
 name_pl Imperial Post
 slaying /navar_city/misc/IPO_navar
 msg
diff --git a/world/world_129_101 b/world/world_129_101
index ca6518a51..1e76a6bb7 100644
--- a/world/world_129_101
+++ b/world/world_129_101
@@ -9,6 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2005-02-14
+Modified: 2008-10-24 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_129_100
@@ -2483,7 +2484,7 @@ y 42
 elevation 710
 end
 arch building2_east
-name IPO
+name Minatomachi IPO
 name_pl IPO
 slaying /azumauindo/minatomachi/stores/postoffice
 hp 10