diff --git a/modules/book/book-all-books-block.tpl.php b/modules/book/book-all-books-block.tpl.php
index e3c2d2c898ab6b3ee1b9d8fc5c692c0aacf5ff56..3f4eb2259f224e3a8b778eb5f869e6fdf128c5bf 100644
--- a/modules/book/book-all-books-block.tpl.php
+++ b/modules/book/book-all-books-block.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file book-all-books-block.tpl.php
+ * @file
  * Default theme implementation for rendering book outlines within a block.
  * This template is used only when the block is configured to "show block on
  * all pages" which presents Multiple independent books on all pages.
diff --git a/modules/forum/forum-icon.tpl.php b/modules/forum/forum-icon.tpl.php
index 0139063cbac1dd4264c708fb0546cc8480e72f2e..1165c793030420972302859a848912377f40c71a 100644
--- a/modules/forum/forum-icon.tpl.php
+++ b/modules/forum/forum-icon.tpl.php
@@ -2,8 +2,8 @@
 // $Id$
 
 /**
- * @file forum-icon.tpl.php
- * Display an appropriate icon for a forum post.
+ * @file
+ * Default theme implementation to display an appropriate icon for a forum post.
  *
  * Available variables:
  * - $new_posts: Indicates whether or not the topic contains new posts.
diff --git a/modules/forum/forum-list.tpl.php b/modules/forum/forum-list.tpl.php
index 46dbd5ed9eb531dad65fd81c3521dd0c975ac9ba..5d8f18ceca882cb958c53070d470188524194a6e 100644
--- a/modules/forum/forum-list.tpl.php
+++ b/modules/forum/forum-list.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file forum-list.tpl.php
+ * @file
  * Default theme implementation to display a list of forums and containers.
  *
  * Available variables:
diff --git a/modules/forum/forum-submitted.tpl.php b/modules/forum/forum-submitted.tpl.php
index dc3a6e4a310cba3618688ab1e6854dd5340afd2d..8695e3464bb2ac2d1e5c674de4b227deadfbbbad 100644
--- a/modules/forum/forum-submitted.tpl.php
+++ b/modules/forum/forum-submitted.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file forum-submitted.tpl.php
+ * @file
  * Default theme implementation to format a simple string indicated when and
  * by whom a topic was submitted.
  *
diff --git a/modules/forum/forum-topic-list.tpl.php b/modules/forum/forum-topic-list.tpl.php
index 5995850e242f3ac259fdf3d3b3f324d6dfc5b49a..6613ad7d517b664c5bf9e9e3a250f6fb2c413995 100644
--- a/modules/forum/forum-topic-list.tpl.php
+++ b/modules/forum/forum-topic-list.tpl.php
@@ -2,8 +2,8 @@
 // $Id$
 
 /**
- * @file forum-topic-list.tpl.php
- * Theme implementation to display a list of forum topics.
+ * @file
+ * Default theme implementation to display a list of forum topics.
  *
  * Available variables:
  * - $header: The table header. This is pre-generated with click-sorting
diff --git a/modules/forum/forum-topic-navigation.tpl.php b/modules/forum/forum-topic-navigation.tpl.php
index 92b2ff5de35f829fdb9c78ea43eb5eed449b0f19..362c2410b2f5670f855d1fd09c529309fb207152 100644
--- a/modules/forum/forum-topic-navigation.tpl.php
+++ b/modules/forum/forum-topic-navigation.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file forum-topic-navigation.tpl.php
+ * @file
  * Default theme implementation to display the topic navigation string at the
  * bottom of all forum topics.
  *
diff --git a/modules/forum/forums.tpl.php b/modules/forum/forums.tpl.php
index 7c2dbc84aa4d5943e4e7406690ef0af5eb24940a..d9a0506c69995c645cfa1cb74f003588fba0d569 100644
--- a/modules/forum/forums.tpl.php
+++ b/modules/forum/forums.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file forums.tpl.php
+ * @file
  * Default theme implementation to display a forum which may contain forum
  * containers as well as forum topics.
  *
diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 009153023fe7b633caa40b41c0e9ed63f6f284b2..9a92d5a1c38442eb90aa7780675de3c2a4783e68 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -2,9 +2,8 @@
 // $Id$
 
 /**
- * @file node.tpl.php
- *
- * Theme implementation to display a node.
+ * @file
+ * Default theme implementation to display a node.
  *
  * Available variables:
  * - $title: the (sanitized) title of the node.
diff --git a/modules/poll/poll-bar-block.tpl.php b/modules/poll/poll-bar-block.tpl.php
index ca744d6206376c658a1f3b8db4c4033a65207abf..6de5e77377c470db2bf6366c4d974ec78a1a15d2 100644
--- a/modules/poll/poll-bar-block.tpl.php
+++ b/modules/poll/poll-bar-block.tpl.php
@@ -2,8 +2,9 @@
 // $Id$
 
 /**
- * @file poll-bar-block.tpl.php
- * Display the bar for a single choice in a poll
+ * @file
+ * Default theme implementation to display the bar for a single choice in a
+ * poll.
  *
  * Variables available:
  * - $title: The title of the poll.
diff --git a/modules/poll/poll-bar.tpl.php b/modules/poll/poll-bar.tpl.php
index 54a79997c5856e0bdad0432426faac81687f036f..1907ba1f252b1cd58fe455c8183c60d90f5a9220 100644
--- a/modules/poll/poll-bar.tpl.php
+++ b/modules/poll/poll-bar.tpl.php
@@ -2,8 +2,9 @@
 // $Id$
 
 /**
- * @file poll-bar.tpl.php
- * Display the bar for a single choice in a poll
+ * @file
+ * Default theme implementation to display the bar for a single choice in a
+ * poll.
  *
  * Variables available:
  * - $title: The title of the poll.
diff --git a/modules/poll/poll-results-block.tpl.php b/modules/poll/poll-results-block.tpl.php
index 0d2d62d3f0cb8e7aa4df09bee040cd621a40f179..a0598c4a9e4402c2ba1a1784a5ed25182fc96dbd 100644
--- a/modules/poll/poll-results-block.tpl.php
+++ b/modules/poll/poll-results-block.tpl.php
@@ -1,8 +1,8 @@
 <?php
 // $Id$
 /**
- * @file poll-results-block.tpl.php
- * Display the poll results in a block.
+ * @file
+ * Default theme implementation to display the poll results in a block.
  *
  * Variables available:
  * - $title: The title of the poll.
diff --git a/modules/poll/poll-results.tpl.php b/modules/poll/poll-results.tpl.php
index 670a50af5f572018dc3041d5f052fe145be6faec..cf89768ed0d3398713823a6ddff31c9a45a9bbff 100644
--- a/modules/poll/poll-results.tpl.php
+++ b/modules/poll/poll-results.tpl.php
@@ -2,8 +2,8 @@
 // $Id$
 
 /**
- * @file poll-results-block.tpl.php
- * Display the poll results in a block.
+ * @file
+ * Default theme implementation to display the poll results in a block.
  *
  * Variables available:
  * - $title: The title of the poll.
diff --git a/modules/poll/poll-vote.tpl.php b/modules/poll/poll-vote.tpl.php
index 5b4a736681591527b04604e751fac35a205fd50a..8c3a46636eb1bd47196a7fcd7f3cd977ed8aec80 100644
--- a/modules/poll/poll-vote.tpl.php
+++ b/modules/poll/poll-vote.tpl.php
@@ -2,8 +2,8 @@
 // $Id$
 
 /**
- * @file poll-vote.tpl.php
- * Voting form for a poll.
+ * @file
+ * Default theme implementation to display voting form for a poll.
  *
  * - $choice: The radio buttons for the choices in the poll.
  * - $title: The title of the poll.
diff --git a/modules/profile/profile-block.tpl.php b/modules/profile/profile-block.tpl.php
index 31bf5d1403f8575f4957fa10f65b6973c7cd7ff2..d846334940621a9a6090a81011e8e4a8c5f174c2 100644
--- a/modules/profile/profile-block.tpl.php
+++ b/modules/profile/profile-block.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file profile-block.tpl.php
+ * @file
  * Default theme implementation for displaying a users profile within a
  * block. It only shows in relation to a node displayed as a full page.
  *
diff --git a/modules/profile/profile-listing.tpl.php b/modules/profile/profile-listing.tpl.php
index 59e2c9710293e644fb0888a5ef4c976d2fabb711..07c111b5d7f1e655f2626a51c9a60f393d193ca8 100644
--- a/modules/profile/profile-listing.tpl.php
+++ b/modules/profile/profile-listing.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file profile-listing.tpl.php
+ * @file
  * Default theme implementation for displaying a user and their profile data
  * for member listing pages.
  *
diff --git a/modules/profile/profile-wrapper.tpl.php b/modules/profile/profile-wrapper.tpl.php
index 2030c2a49feb38fea29278798d4dce5930074525..52de80279533a4bb3150629a2d6918ab752f0a5f 100644
--- a/modules/profile/profile-wrapper.tpl.php
+++ b/modules/profile/profile-wrapper.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file profile-wrapper.tpl.php
+ * @file
  * Default theme implementation for wrapping member listings and their
  * profiles.
  *
diff --git a/modules/search/search-block-form.tpl.php b/modules/search/search-block-form.tpl.php
index a464765a9f965da2502a7695f78888404b1a0398..f483ddd7a7a0cdab7ee7537dd14dbc0fe16d52ca 100644
--- a/modules/search/search-block-form.tpl.php
+++ b/modules/search/search-block-form.tpl.php
@@ -2,8 +2,9 @@
 // $Id$
 
 /**
- * @file search-block-form.tpl.php
- * Default theme implementation for displaying a search form within a block region.
+ * @file
+ * Default theme implementation for displaying a search form within a block
+ * region.
  *
  * Available variables:
  * - $search_form: The complete search form ready for print.
diff --git a/modules/search/search-result.tpl.php b/modules/search/search-result.tpl.php
index 1f9f96eb14c320ccbd3daa3b101ba9338e2986bc..247595fc589f020fbe55d06e6c49732933903a3c 100644
--- a/modules/search/search-result.tpl.php
+++ b/modules/search/search-result.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file search-result.tpl.php
+ * @file
  * Default theme implementation for displaying a single search result.
  *
  * This template renders a single search result and is collected into
diff --git a/modules/search/search-results.tpl.php b/modules/search/search-results.tpl.php
index 709245b261d5fe65bb43ccd218a1e485d6daa389..f87797ae6c532d6d94be6119e5542d3914aebb02 100644
--- a/modules/search/search-results.tpl.php
+++ b/modules/search/search-results.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file search-results.tpl.php
+ * @file
  * Default theme implementation for displaying search results.
  *
  * This template collects each invocation of theme_search_result(). This and
diff --git a/modules/search/search-theme-form.tpl.php b/modules/search/search-theme-form.tpl.php
index 541b498b4fed9725cdd4566575b536998e3cefb6..60bc3e45df6112e8756e7e1b427388643191b9ea 100644
--- a/modules/search/search-theme-form.tpl.php
+++ b/modules/search/search-theme-form.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file search-theme-form.tpl.php
+ * @file
  * Default theme implementation for displaying a search form directly into the
  * theme layout. Not to be confused with the search block or the search page.
  *
diff --git a/modules/system/block.tpl.php b/modules/system/block.tpl.php
index 8ca0f2ba4c2451c38533611fdc45a2994fbc9752..459a940346b8c90f7762b67283e00761e6b14f23 100644
--- a/modules/system/block.tpl.php
+++ b/modules/system/block.tpl.php
@@ -2,9 +2,8 @@
 // $Id$
 
 /**
- * @file block.tpl.php
- *
- * Theme implementation to display a block.
+ * @file
+ * Default theme implementation to display a block.
  *
  * Available variables:
  * - $block->subject: Block title.
diff --git a/modules/system/box.tpl.php b/modules/system/box.tpl.php
index 796c3dcfe2aa2f42a784a46bf54675452f8b8179..b69a21f9f22059949b53737922f14eb117e76883 100644
--- a/modules/system/box.tpl.php
+++ b/modules/system/box.tpl.php
@@ -2,9 +2,8 @@
 // $Id$
 
 /**
- * @file box.tpl.php
- *
- * Theme implementation to display a box.
+ * @file
+ * Default theme implementation to display a box.
  *
  * Available variables:
  * - $title: Box title.
diff --git a/modules/system/maintenance-page.tpl.php b/modules/system/maintenance-page.tpl.php
index 1c8b4b32997280974cbc46384e682e67d8088ff4..3a6139306068a2bb846132a9f8b0d95e1f59ba16 100644
--- a/modules/system/maintenance-page.tpl.php
+++ b/modules/system/maintenance-page.tpl.php
@@ -2,14 +2,12 @@
 // $Id$
 
 /**
- * @file maintenance-page.tpl.php
- *
- * Theme implementation to display a single Drupal page while offline.
+ * @file
+ * Default theme implementation to display a single Drupal page while offline.
  *
  * All the available variables are mirrored in page.tpl.php. Some may be left
  * blank but they are provided for consistency.
  *
- *
  * @see template_preprocess()
  * @see template_preprocess_maintenance_page()
  */
diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index cbbf01f72113367c0dd6a6769a0175155114845b..2a38a7d5d4e73ca2c9c2cd33771affb93a304ae8 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -2,9 +2,8 @@
 // $Id$
 
 /**
- * @file page.tpl.php
- *
- * Theme implementation to display a single Drupal page.
+ * @file
+ * Default theme implementation to display a single Drupal page.
  *
  * Available variables:
  *
diff --git a/modules/user/user-picture.tpl.php b/modules/user/user-picture.tpl.php
index ae07680f5f822a6a89e6b2f17a5b52f57975390c..a194fc4477533b7fa53ebf6e8414033b4fd8f62f 100644
--- a/modules/user/user-picture.tpl.php
+++ b/modules/user/user-picture.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file user-picture.tpl.php
+ * @file
  * Default theme implementation to present an picture configured for the
  * user's account.
  *
diff --git a/modules/user/user-profile-category.tpl.php b/modules/user/user-profile-category.tpl.php
index 55946643a629835f981ed0bebc6d874fc8b2aac0..4ad038ba2767c3e63968be949cd1c8997beb87b5 100644
--- a/modules/user/user-profile-category.tpl.php
+++ b/modules/user/user-profile-category.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file user-profile-category.tpl.php
+ * @file
  * Default theme implementation to present profile categories (groups of
  * profile items).
  *
diff --git a/modules/user/user-profile-item.tpl.php b/modules/user/user-profile-item.tpl.php
index e51a4b1148a650c9edb86fee2162d6b457f31899..2f7236822bfcf92e3b4a4f7e564f1a4f44292163 100644
--- a/modules/user/user-profile-item.tpl.php
+++ b/modules/user/user-profile-item.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file user-profile-item.tpl.php
+ * @file
  * Default theme implementation to present profile items (values from user
  * account profile fields or modules).
  *
diff --git a/modules/user/user-profile.tpl.php b/modules/user/user-profile.tpl.php
index 14a5bda0d0dd1f01c094dace15b24fb2350741f7..73bf250d608b2684bb48f8b2473dd3342b025274 100644
--- a/modules/user/user-profile.tpl.php
+++ b/modules/user/user-profile.tpl.php
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file user-profile.tpl.php
+ * @file
  * Default theme implementation to present all user profile data.
  *
  * This template is used when viewing a registered member's profile page,
diff --git a/themes/garland/maintenance-page.tpl.php b/themes/garland/maintenance-page.tpl.php
index 85bc411031760b19aa4ffa14ef100e2460177b6d..b05fc8adefd12ac993ae1e363ea081f9377bd3ef 100644
--- a/themes/garland/maintenance-page.tpl.php
+++ b/themes/garland/maintenance-page.tpl.php
@@ -2,7 +2,8 @@
 // $Id$
 
 /**
- * @file maintenance-page.tpl.php
+ * @file
+ * Override of the default maintenance page.
  *
  * This is an override of the default maintenance page. Used for Garland and
  * Minnelli, this file should not be moved or modified since the installation