diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index d7fe915d03..5a54c3ee37 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Base class for avatar drivers
-* @package avatars
+* @package phpBB3
 */
 abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 {
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 79cac75e28..b54aae94b7 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Handles avatars hosted at gravatar.com
-* @package avatars
+* @package phpBB3
 */
 class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 {
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 5d6d6b10ac..9364699b5f 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Interface for avatar drivers
-* @package avatars
+* @package phpBB3
 */
 interface phpbb_avatar_driver_interface
 {
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 5132ecd389..a789cd391d 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Handles avatars selected from the board gallery
-* @package avatars
+* @package phpBB3
 */
 class phpbb_avatar_driver_local extends phpbb_avatar_driver
 {
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 9b481f983e..9845db4b7f 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Handles avatars hosted remotely
-* @package avatars
+* @package phpBB3
 */
 class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 {
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index ae39eb6920..282e0a21ff 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Handles avatars uploaded to the board
-* @package avatars
+* @package phpBB3
 */
 class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 {
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 4284e2262d..9c60436de8 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index 4f96e46417..b0655ff291 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package phpBB3
-* @copyright (c) 2005 phpBB Group
+* @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */