diff --git a/phpBB/admin/admin_mass_email.php b/phpBB/admin/admin_mass_email.php
index 2a02135cc5..d90f432da3 100644
--- a/phpBB/admin/admin_mass_email.php
+++ b/phpBB/admin/admin_mass_email.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
-*                             admin_email.php
+*                             admin_mass_email.php
 *                              -------------------
 *     begin                : Thu May 31, 2001
 *     copyright            : (C) 2001 The phpBB Group
diff --git a/phpBB/admin/admin_styles.php b/phpBB/admin/admin_styles.php
index 2d5c64a8ff..718726a5a5 100644
--- a/phpBB/admin/admin_styles.php
+++ b/phpBB/admin/admin_styles.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                              admin_words.php
+ *                              admin_styles.php
  *                            -------------------
  *   begin                : Thursday, Jul 12, 2001
  *   copyright            : (C) 2001 The phpBB Group
diff --git a/phpBB/admin/admin_ug_auth.php b/phpBB/admin/admin_ug_auth.php
index a9e10e0dc8..6b81bc4e2d 100644
--- a/phpBB/admin/admin_ug_auth.php
+++ b/phpBB/admin/admin_ug_auth.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                            admin_userauth.php
+ *                            admin_ug_auth.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
diff --git a/phpBB/db/mysql4.php b/phpBB/db/mysql4.php
index de01f42b09..b0e657e8ee 100644
--- a/phpBB/db/mysql4.php
+++ b/phpBB/db/mysql4.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                                 mysql.php
+ *                                 mysql4.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -337,4 +337,4 @@ class sql_db
 
 } // if ... define
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 4e4e40f719..2034edc91e 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                               includes.php
+ *                               constants.php
  *                            -------------------
  *   begin                : Saturday', Feb 13', 2001
  *   copyright            : ('C) 2001 The phpBB Group
@@ -178,4 +178,4 @@ define('VOTE_DESC_TABLE', $table_prefix.'vote_desc');
 define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results');
 define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/includes/functions_post.php b/phpBB/includes/functions_post.php
index ce1049ac13..03daee23fe 100644
--- a/phpBB/includes/functions_post.php
+++ b/phpBB/includes/functions_post.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                                 post.php
+ *                            functions_post.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -839,4 +839,4 @@ function generate_smilies($mode, $page_id)
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/includes/functions_validate.php b/phpBB/includes/functions_validate.php
index c9c9724368..4d61a44458 100644
--- a/phpBB/includes/functions_validate.php
+++ b/phpBB/includes/functions_validate.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                             user_selects.php
+ *                          functions_validate.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
diff --git a/phpBB/includes/smtp.php b/phpBB/includes/smtp.php
index 1539855c77..de8c76f375 100644
--- a/phpBB/includes/smtp.php
+++ b/phpBB/includes/smtp.php
@@ -1,13 +1,13 @@
 <?php
 /***************************************************************************
-                                smtp.php
-						  -------------------
-    begin                : Wed May 09 2001
-    copyright            : (C) 2001 The phpBB Group
-    email                : support@phpbb.com
-
-    $Id$
-
+ *                              smtp.php
+ *                       -------------------
+ *   begin                : Wed May 09 2001
+ *   copyright            : (C) 2001 The phpBB Group
+ *   email                : support@phpbb.com
+ *
+ *   $Id$
+ *
  ***************************************************************************/
 
 /***************************************************************************
@@ -228,4 +228,4 @@ function smtpmail($mail_to, $subject, $message, $headers = "")
 	return TRUE;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 3a15710a2c..d27a3e4259 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                              template.inc
+ *                              template.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -475,4 +475,4 @@ class Template {
 
 }
 
-?>
\ No newline at end of file
+?>