diff --git a/lake_country/ebony/entrance1 b/lake_country/ebony/entrance1
index a1b2c5b62..20ab55ec6 100644
--- a/lake_country/ebony/entrance1
+++ b/lake_country/ebony/entrance1
@@ -1,5 +1,5 @@
 arch map
-name Ebony Tiger Thief Guild
+name Ebony Tiger Thief Guild, Entrance
 difficulty 30
 region lakecountry
 width 16
@@ -8,7 +8,7 @@ enter_x 13
 enter_y 14
 msg
 Created:  1995-04-22
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/lake_country/ebony/entrance2 b/lake_country/ebony/entrance2
index c2c88fdc6..31297ef62 100644
--- a/lake_country/ebony/entrance2
+++ b/lake_country/ebony/entrance2
@@ -1,5 +1,5 @@
 arch map
-name Ebony Tiger Thief Guild
+name Ebony Tiger Thief Guild, Entrance
 difficulty 30
 region lakecountry
 width 16
@@ -8,7 +8,7 @@ enter_x 13
 enter_y 14
 msg
 Created:  1995-04-22
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dun10
diff --git a/lake_country/ebony/masterlev b/lake_country/ebony/masterlev
index c3b4e099a..c16351167 100644
--- a/lake_country/ebony/masterlev
+++ b/lake_country/ebony/masterlev
@@ -1,5 +1,5 @@
 arch map
-name Ebony Tiger Thief Guild
+name Ebony Tiger Thief Guild, Master Level
 difficulty 1
 region lakecountry
 shopitems potion:95;gem:95;*:-100
@@ -9,7 +9,7 @@ width 25
 height 25
 msg
 Created:  1995-04-24 Kundi, Xue (xkd@soda.csua.berkeley.edu)
-Modified: 2008-07-22 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/lake_country/elven_moon/elvenmoon.1 b/lake_country/elven_moon/elvenmoon.1
index c31b00fca..bfbf93ea0 100755
--- a/lake_country/elven_moon/elvenmoon.1
+++ b/lake_country/elven_moon/elvenmoon.1
@@ -1,5 +1,5 @@
 arch map
-name Elven Moon
+name Elven Moon Entrance
 difficulty 30
 region lakecountry
 width 32
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 7
 msg
 Created:  2006-07-23 Brad Reilly
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/lake_country/elven_moon/elvenmoon.6 b/lake_country/elven_moon/elvenmoon.6
index 5f27649fd..8d97cd903 100755
--- a/lake_country/elven_moon/elvenmoon.6
+++ b/lake_country/elven_moon/elvenmoon.6
@@ -1,5 +1,5 @@
 arch map
-name Elven Moon
+name Elven Moon Treehouse
 difficulty 30
 region lakecountry
 width 8
@@ -8,7 +8,7 @@ enter_x 5
 enter_y 2
 msg
 Created:  2006-09-17 Brad Reilly
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch woods
diff --git a/navar_city/magara/houses/earth_house b/navar_city/magara/houses/earth_house
index 51cd35f1e..4efaa7efc 100644
--- a/navar_city/magara/houses/earth_house
+++ b/navar_city/magara/houses/earth_house
@@ -1,5 +1,5 @@
 arch map
-name Earth House
+name Earthen House
 difficulty 15
 region navar
 width 25
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1994-10-11
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dirtfloor
diff --git a/port_joseph/town/churchcrypt b/port_joseph/town/churchcrypt
index b9a2715ea..b3f4c925e 100644
--- a/port_joseph/town/churchcrypt
+++ b/port_joseph/town/churchcrypt
@@ -1,5 +1,5 @@
 arch map
-name Church Crypt
+name Church of Gabriel, Crypt
 difficulty 9
 region portjoseph
 width 32
@@ -8,7 +8,7 @@ enter_x 26
 enter_y 3
 msg
 Created:  1994-05-14 langley (langley@fermat.dartmouth.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/quests/peterm/DragonQuest/ElectricAnte b/quests/peterm/DragonQuest/ElectricAnte
index f1b3bbce2..9f2f7b46e 100644
--- a/quests/peterm/DragonQuest/ElectricAnte
+++ b/quests/peterm/DragonQuest/ElectricAnte
@@ -1,5 +1,5 @@
 arch map
-name Electric Anteroom
+name Dragon Quest, Electric Anteroom
 difficulty 25
 darkness 5
 width 22
@@ -8,7 +8,7 @@ enter_x 18
 enter_y 16
 msg
 Created:  1994-08-21 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/peterm/DragonQuest/ElectricHatchery b/quests/peterm/DragonQuest/ElectricHatchery
index 2ffa56204..f5e11edab 100644
--- a/quests/peterm/DragonQuest/ElectricHatchery
+++ b/quests/peterm/DragonQuest/ElectricHatchery
@@ -1,5 +1,5 @@
 arch map
-name DragonQuest -- Electric Hatchery
+name Dragon Quest, Electric Hatchery
 difficulty 25
 darkness 5
 width 16
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 24
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/peterm/DragonQuest/ElectricLord b/quests/peterm/DragonQuest/ElectricLord
index 16cfc024c..11ace4006 100644
--- a/quests/peterm/DragonQuest/ElectricLord
+++ b/quests/peterm/DragonQuest/ElectricLord
@@ -1,5 +1,5 @@
 arch map
-name Electric Dragon Lord
+name Dragon Quest, Electric Dragon Lord
 difficulty 30
 darkness 5
 width 41
@@ -8,7 +8,7 @@ enter_x 36
 enter_y 4
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/peterm/DragonQuest/Entrance b/quests/peterm/DragonQuest/Entrance
index 445d0664b..e49a656da 100644
--- a/quests/peterm/DragonQuest/Entrance
+++ b/quests/peterm/DragonQuest/Entrance
@@ -1,5 +1,5 @@
 arch map
-name Entrance
+name Dragon Quest, Entrance
 difficulty 17
 width 27
 height 16
@@ -7,7 +7,7 @@ enter_x 1
 enter_y 7
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch pstone_1
diff --git a/quests/peterm/DragonQuest/FireAnte b/quests/peterm/DragonQuest/FireAnte
index e9b727ea4..a012606a2 100644
--- a/quests/peterm/DragonQuest/FireAnte
+++ b/quests/peterm/DragonQuest/FireAnte
@@ -1,5 +1,5 @@
 arch map
-name Fire Anteroom
+name Dragon Quest, Fire Anteroom
 difficulty 25
 darkness 5
 width 22
@@ -8,7 +8,7 @@ enter_x 2
 enter_y 2
 msg
 Created:  1994-08-21 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/peterm/DragonQuest/FireHatchery b/quests/peterm/DragonQuest/FireHatchery
index ffc77207e..50f9f3792 100644
--- a/quests/peterm/DragonQuest/FireHatchery
+++ b/quests/peterm/DragonQuest/FireHatchery
@@ -1,5 +1,5 @@
 arch map
-name Fire Hatchery
+name Dragon Quest, Fire Hatchery
 difficulty 20
 darkness 5
 width 41
@@ -8,7 +8,7 @@ enter_x 5
 enter_y 11
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/peterm/DragonQuest/FireLord b/quests/peterm/DragonQuest/FireLord
index fcd0846be..7271e5c37 100644
--- a/quests/peterm/DragonQuest/FireLord
+++ b/quests/peterm/DragonQuest/FireLord
@@ -1,5 +1,5 @@
 arch map
-name Dragon Fire Lord
+name Dragon Quest, Dragon Fire Lord
 difficulty 30
 darkness 5
 width 16
@@ -8,7 +8,7 @@ enter_x 3
 enter_y 26
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/peterm/DragonQuest/IceAnte b/quests/peterm/DragonQuest/IceAnte
index 8beb66c91..7fbb1f745 100644
--- a/quests/peterm/DragonQuest/IceAnte
+++ b/quests/peterm/DragonQuest/IceAnte
@@ -1,5 +1,5 @@
 arch map
-name Ice Anteroom
+name Dragon Quest, Ice Anteroom
 difficulty 25
 darkness 5
 width 30
@@ -8,7 +8,7 @@ enter_x 2
 enter_y 11
 msg
 Created:  1994-08-20 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/peterm/DragonQuest/IceHatchery b/quests/peterm/DragonQuest/IceHatchery
index e0a671c5c..7f142f14c 100644
--- a/quests/peterm/DragonQuest/IceHatchery
+++ b/quests/peterm/DragonQuest/IceHatchery
@@ -1,5 +1,5 @@
 arch map
-name Ice Hatchery
+name Dragon Quest, Ice Hatchery
 difficulty 25
 darkness 5
 width 16
@@ -8,7 +8,7 @@ enter_x 4
 enter_y 5
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/peterm/DragonQuest/IceLord b/quests/peterm/DragonQuest/IceLord
index 42b103c03..ce8388f15 100644
--- a/quests/peterm/DragonQuest/IceLord
+++ b/quests/peterm/DragonQuest/IceLord
@@ -1,5 +1,5 @@
 arch map
-name Dragon Ice lord
+name Dragon Quest, Dragon Ice lord
 difficulty 30
 darkness 5
 width 16
@@ -8,7 +8,7 @@ enter_x 9
 enter_y 26
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/peterm/DragonQuest/WyvernNest b/quests/peterm/DragonQuest/WyvernNest
index 1651184f1..21cfa6861 100644
--- a/quests/peterm/DragonQuest/WyvernNest
+++ b/quests/peterm/DragonQuest/WyvernNest
@@ -1,5 +1,5 @@
 arch map
-name Wyvern Nest
+name Dragon Quest, Wyvern Nest
 difficulty 20
 darkness 3
 width 40
@@ -8,7 +8,7 @@ enter_x 5
 enter_y 20
 msg
 Created:  1994-08-19 peterm (peterm@soda.berkeley.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/quests/skud/court b/quests/skud/court
index 115befc90..74d564106 100644
--- a/quests/skud/court
+++ b/quests/skud/court
@@ -1,5 +1,5 @@
 arch map
-name Skud Tower Court
+name Skud Tower, Court
 difficulty 20
 width 40
 height 40
@@ -7,7 +7,7 @@ enter_x 19
 enter_y 39
 msg
 Created:  1993-11-13
-Modified: 2008-09-25 Arvid Norlander
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/quests/skud/east_1 b/quests/skud/east_1
index 15be8b906..99eec281c 100644
--- a/quests/skud/east_1
+++ b/quests/skud/east_1
@@ -1,12 +1,12 @@
 arch map
-name East Skud Tower
+name Skud Tower, East
 difficulty 20
 width 40
 height 30
 enter_y 5
 msg
 Created:  1993-11-18 Skud the Great (tvangod@ecst.csuchico.edu)
-Modified: 2008-09-25 Arvid Norlander
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/quests/skud/entrance b/quests/skud/entrance
index da1e9f31f..d82390f8a 100644
--- a/quests/skud/entrance
+++ b/quests/skud/entrance
@@ -1,5 +1,5 @@
 arch map
-name Skud Tower Entrance Hall
+name Skud Tower, Entrance Hall
 difficulty 20
 width 10
 height 20
@@ -7,7 +7,7 @@ enter_x 5
 enter_y 16
 msg
 Created:  1993-10-20 Skud the Great (tvangod@ecst.csuchico.edu)
-Modified: 2008-09-23 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/quests/skud/maze b/quests/skud/maze
index 5b9c29625..f6d41c80c 100644
--- a/quests/skud/maze
+++ b/quests/skud/maze
@@ -1,5 +1,5 @@
 arch map
-name Maze
+name Skud Tower, Maze
 difficulty 30
 width 40
 height 40
@@ -12,7 +12,7 @@ on metal. It is coming from one of
 the many passages in this maze. A
 Maze in which, a wrong turn could
 be fatal.
-Modified: 2008-09-25 Arvid Norlander
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/quests/skud/north_1 b/quests/skud/north_1
index 7760fa171..c1b70a1b8 100644
--- a/quests/skud/north_1
+++ b/quests/skud/north_1
@@ -1,5 +1,5 @@
 arch map
-name North Skud Tower
+name Skud Tower, North
 difficulty 20
 width 30
 height 40
@@ -7,7 +7,7 @@ enter_x 15
 enter_y 38
 msg
 Created:  1993-11-16 Skud the Great (tvangod@ecst.csuchico.edu)
-Modified: 2008-09-25 Arvid Norlander
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/quests/skud/west_1 b/quests/skud/west_1
index de1ec357a..e6bb1a950 100644
--- a/quests/skud/west_1
+++ b/quests/skud/west_1
@@ -1,5 +1,5 @@
 arch map
-name West Skud Tower
+name Skud Tower, West
 difficulty 20
 width 30
 height 40
@@ -7,7 +7,7 @@ enter_x 29
 enter_y 4
 msg
 Created:  1994-04-10 Skud the Great (tvangod@ecst.csuchico.edu)
-Modified: 2008-09-23 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/sisters/shrine0 b/sisters/shrine0
index 95ac0c42c..a5f79f867 100644
--- a/sisters/shrine0
+++ b/sisters/shrine0
@@ -1,5 +1,5 @@
 arch map
-name Evil Shrine
+name Evil Shrine, Antechamber
 difficulty 1
 darkness 4
 width 36
@@ -8,7 +8,7 @@ enter_x 17
 enter_y 33
 msg
 Created:  1994-12-20 bt (thomas@Nomad.astro.psu.edu)
-Modified: 2008-09-30 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/sisters/shrine0_east b/sisters/shrine0_east
index 0b1110c93..18be0dac7 100644
--- a/sisters/shrine0_east
+++ b/sisters/shrine0_east
@@ -1,5 +1,5 @@
 arch map
-name Evil Shrine
+name Evil Shrine, East
 difficulty 30
 darkness 5
 width 33
@@ -8,7 +8,7 @@ enter_x 5
 enter_y 12
 msg
 Created:  1995-01-03 bt (thomas@nomad.astro.psu.edu)
-Modified: 2008-09-30 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/sisters/shrine0_west b/sisters/shrine0_west
index 1da26d847..cf5028380 100644
--- a/sisters/shrine0_west
+++ b/sisters/shrine0_west
@@ -1,5 +1,5 @@
 arch map
-name Evil Shrine
+name Evil Shrine, West
 difficulty 20
 darkness 5
 width 29
@@ -8,7 +8,7 @@ enter_x 22
 enter_y 13
 msg
 Created:  1995-01-03 bt (thomas@nomad.astro.psu.edu)
-Modified: 2008-09-30 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/sisters/shrine1 b/sisters/shrine1
index c10c9634d..58ed81e78 100644
--- a/sisters/shrine1
+++ b/sisters/shrine1
@@ -1,5 +1,5 @@
 arch map
-name Evil Shrine
+name Evil Shrine, Central Chambers
 difficulty 75
 darkness 5
 width 32
@@ -8,7 +8,7 @@ enter_x 15
 enter_y 32
 msg
 Created:  1994-12-19 bt (thomas@nomad.astro.psu.edu)
-Modified: 2008-09-30 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/sisters/shrine_entrance b/sisters/shrine_entrance
index aa5193d29..6a77e76e5 100644
--- a/sisters/shrine_entrance
+++ b/sisters/shrine_entrance
@@ -1,5 +1,5 @@
 arch map
-name Evil Shrine Entrance
+name Evil Shrine, Entrance
 difficulty 22
 darkness 4
 width 20
@@ -8,7 +8,7 @@ enter_x 9
 enter_y 33
 msg
 Created:  1995-01-03 bt (thomas@nomad.astro.psu.edu)
-Modified: 2008-09-30 Rick Tanner
+Modified: 2008-10-21 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/world/world_107_124 b/world/world_107_124
index 77e2445a5..937536fd8 100644
--- a/world/world_107_124
+++ b/world/world_107_124
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2007-12-24 tchize
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_107_123
@@ -2291,6 +2291,7 @@ y 32
 elevation 555
 end
 arch mountain_cave
+name Enigme
 slaying /brest/brittany/enigme.1
 hp 16
 sp 33
@@ -2500,6 +2501,7 @@ y 20
 elevation 1484
 end
 arch tower_a
+name Dol-Guldur
 slaying /brest/brittany/dol-guldur.1
 hp 3
 x 9
@@ -3791,6 +3793,7 @@ y 16
 elevation 106
 end
 arch mountain_cave2
+name Khazad
 slaying /brest/brittany/khazad.1
 hp 1
 sp 20
diff --git a/world/world_121_117 b/world/world_121_117
index a85ff7ec2..f2bded8ee 100644
--- a/world/world_121_117
+++ b/world/world_121_117
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2008-02-09 Nicolas Weeger
+Modified: 2008-10-21 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_121_116
@@ -13148,7 +13148,7 @@ arch grass
 x 46
 end
 arch tavern
-name Earth house
+name Earthen House
 name_pl Earth house
 slaying /navar_city/magara/houses/earth_house
 hp 1