diff --git a/templates/guild/basement b/templates/guild/basement
index 4d991a071..99f5dbda3 100644
--- a/templates/guild/basement
+++ b/templates/guild/basement
@@ -1,5 +1,5 @@
 arch map
-name basement
+name Guild of [Template], Basement
 swap_time 300
 difficulty 1
 region Template
@@ -10,7 +10,7 @@ Creator: CF Java Map Editor
 Date:    6/15/2003
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2010-09-11 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/guild_alchemy b/templates/guild/guild_alchemy
index 4a9e64c91..b8b066fce 100644
--- a/templates/guild/guild_alchemy
+++ b/templates/guild/guild_alchemy
@@ -1,5 +1,5 @@
 arch map
-name Guild Alchemy Lab
+name Guild of [Template], Guild Alchemy Lab
 reset_timeout 300
 difficulty 1
 region Template
@@ -12,7 +12,7 @@ Creator: CF Java Map Editor
 Date:    4/8/2007
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2010-11-20 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/guild_bbq b/templates/guild/guild_bbq
index 057e2cec8..a67783a45 100644
--- a/templates/guild/guild_bbq
+++ b/templates/guild/guild_bbq
@@ -1,5 +1,5 @@
 arch map
-name Guild Hall BBQ
+name Guild of [Template], Guild Hall BBQ
 reset_timeout 300
 difficulty 1
 region Template
@@ -13,7 +13,7 @@ Editor: CrossfireEditor
 Date:    3/15/2007
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2010-02-27 perkins
+Modified: 2011-10-30 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/templates/guild/guild_hq b/templates/guild/guild_hq
index 74c04173e..687dac234 100644
--- a/templates/guild/guild_hq
+++ b/templates/guild/guild_hq
@@ -1,5 +1,5 @@
 arch map
-name Guild HeadQuarters
+name Guild of [Template], Guild HeadQuarters
 reset_timeout 300
 difficulty 1
 region Template
@@ -13,7 +13,7 @@ Creator: Avion
 Date:    6/14/2003
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2010-09-07 crossfire
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch flagstone
diff --git a/templates/guild/guild_jeweler b/templates/guild/guild_jeweler
index 768b39dc9..bd6f95216 100644
--- a/templates/guild/guild_jeweler
+++ b/templates/guild/guild_jeweler
@@ -1,5 +1,5 @@
 arch map
-name Guild Jeweler
+name Guild of [Template], Guild Jeweler
 swap_time 300
 difficulty 1
 region Template
@@ -13,7 +13,7 @@ Editor: CrossfireEditor
 Date:    3/19/2007
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2010-11-14 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/guild_tan b/templates/guild/guild_tan
index a062dd5be..78439d5b4 100644
--- a/templates/guild/guild_tan
+++ b/templates/guild/guild_tan
@@ -1,5 +1,5 @@
 arch map
-name Guild Tannery
+name Guild of [Template], Guild Tannery
 reset_timeout 300
 region Template
 width 14
@@ -7,7 +7,7 @@ height 11
 msg
 Creator: Default
 Date:    2008-06-24
-Modified: 2010-09-04 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/guild_thaum b/templates/guild/guild_thaum
index b5a8a7a83..62609121f 100644
--- a/templates/guild/guild_thaum
+++ b/templates/guild/guild_thaum
@@ -1,5 +1,5 @@
 arch map
-name Guild Thaumaturgy Lab
+name Guild of [Template], Guild Thaumaturgy Lab
 reset_timeout 300
 difficulty 1
 region Template
@@ -13,7 +13,7 @@ Editor: CrossfireEditor
 Date:    3/19/2007
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2010-11-14 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/guild_toolshed b/templates/guild/guild_toolshed
index 0d38ed5f7..b428091d4 100644
--- a/templates/guild/guild_toolshed
+++ b/templates/guild/guild_toolshed
@@ -1,5 +1,5 @@
 arch map
-name Guild Tool Shed
+name Guild of [Template], Guild Tool Shed
 reset_timeout 300
 difficulty 1
 region Template
@@ -13,7 +13,7 @@ Editor: CrossfireEditor
 Date:    3/17/2007
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2010-11-22 Khaleh
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch grass
diff --git a/templates/guild/guildman_lounge b/templates/guild/guildman_lounge
index 0d5fa5c5e..55a17de95 100644
--- a/templates/guild/guildman_lounge
+++ b/templates/guild/guildman_lounge
@@ -1,5 +1,5 @@
 arch map
-name Guildman's Lounge
+name Guild of [Template], Guildman's Lounge
 reset_timeout 300
 difficulty 1
 region Template
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  2004-05-12
-Modified: 2010-09-25 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/guildmaster_lounge b/templates/guild/guildmaster_lounge
index 49661d204..da61bf371 100644
--- a/templates/guild/guildmaster_lounge
+++ b/templates/guild/guildmaster_lounge
@@ -1,5 +1,5 @@
 arch map
-name GuildMaster's Lounge
+name Guild of [Template], GuildMaster's Lounge
 reset_timeout 300
 difficulty 1
 region Template
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  2004-05-12
-Modified: 2010-09-25 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/hallofjoining b/templates/guild/hallofjoining
index 00c849c56..49194a7fe 100644
--- a/templates/guild/hallofjoining
+++ b/templates/guild/hallofjoining
@@ -1,5 +1,5 @@
 arch map
-name The Grand Hall
+name Guild of [Template], The Grand Hall
 reset_timeout 300
 difficulty 1
 region Template
@@ -14,7 +14,7 @@ CF Java Map Editor
 Date:    6/14/2003
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2010-09-06 crossfire
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch flagstone
diff --git a/templates/guild/journeyman_lounge b/templates/guild/journeyman_lounge
index 9759a5139..7a5ff9e84 100644
--- a/templates/guild/journeyman_lounge
+++ b/templates/guild/journeyman_lounge
@@ -1,5 +1,5 @@
 arch map
-name Journeyman's Lounge
+name Guild of [Template], Journeyman's Lounge
 reset_timeout 300
 difficulty 1
 region Template
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  2004-05-12
-Modified: 2010-09-25 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/mainfloor b/templates/guild/mainfloor
index 507e92517..d2e597d06 100644
--- a/templates/guild/mainfloor
+++ b/templates/guild/mainfloor
@@ -1,5 +1,5 @@
 arch map
-name Main Floor
+name Guild of [Template], Main Floor
 reset_timeout 300
 difficulty 1
 region Template
@@ -15,7 +15,7 @@ Avion
 Date:    11/19/2004
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2010-11-20 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/templates/guild/master_lounge b/templates/guild/master_lounge
index 8e742d12f..bd0311563 100644
--- a/templates/guild/master_lounge
+++ b/templates/guild/master_lounge
@@ -1,5 +1,5 @@
 arch map
-name Masters' Lounge
+name Guild of [Template], Masters' Lounge
 reset_timeout 300
 difficulty 1
 region Template
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  2004-05-12
-Modified: 2010-09-25 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/masters_lounge b/templates/guild/masters_lounge
index c969ff6b6..ebcd5ee5c 100644
--- a/templates/guild/masters_lounge
+++ b/templates/guild/masters_lounge
@@ -1,5 +1,5 @@
 arch map
-name Master's Lounge
+name Guild of [Template], Master's Lounge
 difficulty 1
 region Template
 width 18
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  2004-05-12
-Modified: 2010-09-04 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/novice_lounge b/templates/guild/novice_lounge
index 090cc0ad7..55282a13f 100644
--- a/templates/guild/novice_lounge
+++ b/templates/guild/novice_lounge
@@ -1,5 +1,5 @@
 arch map
-name Novice's Lounge
+name Guild of [Template], Novice's Lounge
 reset_timeout 300
 difficulty 1
 region Template
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  2004-05-12
-Modified: 2010-09-25 Nicolas Weeger
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/templates/guild/secondfloor b/templates/guild/secondfloor
index e17123bed..9ad435185 100644
--- a/templates/guild/secondfloor
+++ b/templates/guild/secondfloor
@@ -1,5 +1,5 @@
 arch map
-name secondfloor
+name Guild of [Template], Second Floor
 reset_timeout 300
 difficulty 1
 region Template
@@ -12,7 +12,7 @@ Creator: majorwoo josh@woosworld.net
 Date:    11/19/2004
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2011-10-21 Rick Tanner
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/templates/guild/storage_hall b/templates/guild/storage_hall
index 2298c27ac..2761a7f47 100644
--- a/templates/guild/storage_hall
+++ b/templates/guild/storage_hall
@@ -1,5 +1,5 @@
 arch map
-name Guild Hall Storage
+name Guild of [Template], Guild Hall Storage
 difficulty 1
 region Template
 width 23
@@ -10,7 +10,7 @@ msg
 Creator: Chad Opperman
 cromagic@sbcglobal.net
 Date:    2007-12-18
-Modified: 2008-04-06 Rick Tanner
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/templates/guild/storage_hall.0 b/templates/guild/storage_hall.0
index 22d7ba46b..5fedd912f 100644
--- a/templates/guild/storage_hall.0
+++ b/templates/guild/storage_hall.0
@@ -1,5 +1,5 @@
 arch map
-name Guild Hall Storage Basement
+name Guild of [Template], Guild Hall Storage Basement
 difficulty 1
 region Template
 width 7
@@ -10,7 +10,7 @@ msg
 Creator: Chad Opperman
 cromagic@sbcglobal.net
 Date:    2007-12-19
-Modified: 2010-09-06 crossfire
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch stonefloor2
diff --git a/templates/guild/storage_room b/templates/guild/storage_room
index 70d8af56a..24d10f979 100644
--- a/templates/guild/storage_room
+++ b/templates/guild/storage_room
@@ -1,5 +1,5 @@
 arch map
-name storage_room
+name Guild of [Template], Storage Room
 reset_timeout 300
 difficulty 1
 region Template
@@ -9,7 +9,7 @@ enter_x 28
 enter_y 14
 msg
 Created:  2008-10-10 Chad Opperman | cromagic@sbcglobal.net
-Modified: 2011-10-21 Rick Tanner
+Modified: 2011-10-30 Rick Tanner
 endmsg
 end
 arch blocked