diff --git a/mod/assignment/backup/moodle1/lib.php b/mod/assignment/backup/moodle1/lib.php
index 45ee3c131fe..e518e85139b 100644
--- a/mod/assignment/backup/moodle1/lib.php
+++ b/mod/assignment/backup/moodle1/lib.php
@@ -19,8 +19,7 @@
  * Provides support for the conversion of moodle1 backup to the moodle2 format
  * Based off of a template @ http://docs.moodle.org/dev/Backup_1.9_conversion_for_developers
  *
- * @package    mod
- * @subpackage assignment
+ * @package    mod_assignment
  * @copyright  2011 Aparup Banerjee <aparup@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/assignment/backup/moodle2/backup_assignment_stepslib.php b/mod/assignment/backup/moodle2/backup_assignment_stepslib.php
index 8d758873b21..fcc2296a5fe 100644
--- a/mod/assignment/backup/moodle2/backup_assignment_stepslib.php
+++ b/mod/assignment/backup/moodle2/backup_assignment_stepslib.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package    mod_assignment
  * @subpackage backup-moodle2
  * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/backup/moodle2/restore_assignment_activity_task.class.php b/mod/assignment/backup/moodle2/restore_assignment_activity_task.class.php
index 072e87f3cf2..bdfbab0f2ef 100644
--- a/mod/assignment/backup/moodle2/restore_assignment_activity_task.class.php
+++ b/mod/assignment/backup/moodle2/restore_assignment_activity_task.class.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package    mod_assignment
  * @subpackage backup-moodle2
  * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/backup/moodle2/restore_assignment_stepslib.php b/mod/assignment/backup/moodle2/restore_assignment_stepslib.php
index 11ee37d5392..3fbd606902a 100644
--- a/mod/assignment/backup/moodle2/restore_assignment_stepslib.php
+++ b/mod/assignment/backup/moodle2/restore_assignment_stepslib.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package    mod_assignment
  * @subpackage backup-moodle2
  * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/db/messages.php b/mod/assignment/db/messages.php
index 3af94b6413d..3d80758f2fc 100644
--- a/mod/assignment/db/messages.php
+++ b/mod/assignment/db/messages.php
@@ -18,8 +18,8 @@
 /**
  * Defines message providers (types of messages being sent)
  *
- * @package mod-assignment
- * @copyright  2010 onwards  Aparup Banerjee  http://moodle.com
+ * @package   mod_assignment
+ * @copyright 2010 onwards  Aparup Banerjee  http://moodle.com
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
diff --git a/mod/assignment/lang/en/assignment.php b/mod/assignment/lang/en/assignment.php
index 9e0c70c4fb7..76fd7095de5 100644
--- a/mod/assignment/lang/en/assignment.php
+++ b/mod/assignment/lang/en/assignment.php
@@ -18,7 +18,7 @@
 /**
  * Strings for component 'assignment', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   assignment
+ * @package   mod_assignment
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index bd90f8b1aac..0f6940d1b69 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -20,7 +20,7 @@
  *
  * This class provides all the functionality for an assignment
  *
- * @package   mod-assignment
+ * @package   mod_assignment
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/assignment/type/offline/backup/moodle1/lib.php b/mod/assignment/type/offline/backup/moodle1/lib.php
index 939eb2df0e8..2898f3092ef 100644
--- a/mod/assignment/type/offline/backup/moodle1/lib.php
+++ b/mod/assignment/type/offline/backup/moodle1/lib.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package assignment
+ * @package mod_assignment
  * @subpackage offline subplugin
  * @copyright 2011 onwards Aparup Banerjee (nebgor)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/offline/backup/moodle2/backup_assignment_offline_subplugin.class.php b/mod/assignment/type/offline/backup/moodle2/backup_assignment_offline_subplugin.class.php
index 5ae60021e78..b6bae7a5347 100644
--- a/mod/assignment/type/offline/backup/moodle2/backup_assignment_offline_subplugin.class.php
+++ b/mod/assignment/type/offline/backup/moodle2/backup_assignment_offline_subplugin.class.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package mod_assignment
  * @subpackage backup-moodle2
  * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/offline/backup/moodle2/restore_assignment_offline_subplugin.class.php b/mod/assignment/type/offline/backup/moodle2/restore_assignment_offline_subplugin.class.php
index f77119b5cf3..56dfde846a0 100644
--- a/mod/assignment/type/offline/backup/moodle2/restore_assignment_offline_subplugin.class.php
+++ b/mod/assignment/type/offline/backup/moodle2/restore_assignment_offline_subplugin.class.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package mod_assignment
  * @subpackage backup-moodle2
  * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/offline/lang/en/assignment_offline.php b/mod/assignment/type/offline/lang/en/assignment_offline.php
index 4bc0bff990b..898e8c32cdb 100644
--- a/mod/assignment/type/offline/lang/en/assignment_offline.php
+++ b/mod/assignment/type/offline/lang/en/assignment_offline.php
@@ -17,7 +17,7 @@
 /**
  * Strings for component 'assignment_offline', language 'en', branch 'master'
  *
- * @package    assignment
+ * @package    mod_assignment
  * @subpackage offline
  * @copyright  2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/offline/version.php b/mod/assignment/type/offline/version.php
index 489631fa4ba..ed23e528b4a 100644
--- a/mod/assignment/type/offline/version.php
+++ b/mod/assignment/type/offline/version.php
@@ -17,7 +17,7 @@
 /**
  * Version details
  *
- * @package    assignment
+ * @package    mod_assignment
  * @subpackage offline
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/online/backup/moodle1/lib.php b/mod/assignment/type/online/backup/moodle1/lib.php
index c1516d377c7..0092a009781 100644
--- a/mod/assignment/type/online/backup/moodle1/lib.php
+++ b/mod/assignment/type/online/backup/moodle1/lib.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package assignment
+ * @package mod_assignment
  * @subpackage online subplugin
  * @copyright 2011 onwards Aparup Banerjee (nebgor)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/online/lang/en/assignment_online.php b/mod/assignment/type/online/lang/en/assignment_online.php
index dcf5a270664..324bf0999a5 100644
--- a/mod/assignment/type/online/lang/en/assignment_online.php
+++ b/mod/assignment/type/online/lang/en/assignment_online.php
@@ -17,7 +17,7 @@
 /**
  * Strings for component 'assignment_online', language 'en', branch 'master'
  *
- * @package    assignment
+ * @package    mod_assignment
  * @subpackage online
  * @copyright  2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/online/version.php b/mod/assignment/type/online/version.php
index c34f6d4b6c2..1142d8b672a 100644
--- a/mod/assignment/type/online/version.php
+++ b/mod/assignment/type/online/version.php
@@ -17,7 +17,7 @@
 /**
  * Version details
  *
- * @package    assignment
+ * @package    mod_assignment
  * @subpackage online
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/upload/backup/moodle1/lib.php b/mod/assignment/type/upload/backup/moodle1/lib.php
index 5537f3efa6b..923e8f478c4 100644
--- a/mod/assignment/type/upload/backup/moodle1/lib.php
+++ b/mod/assignment/type/upload/backup/moodle1/lib.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package assignment
+ * @package mod_assignment
  * @subpackage upload subplugin
  * @copyright 2011 onwards Aparup Banerjee (nebgor)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/upload/lang/en/assignment_upload.php b/mod/assignment/type/upload/lang/en/assignment_upload.php
index e767b914fb8..854383a3338 100644
--- a/mod/assignment/type/upload/lang/en/assignment_upload.php
+++ b/mod/assignment/type/upload/lang/en/assignment_upload.php
@@ -17,7 +17,7 @@
 /**
  * Strings for component 'assignment_upload', language 'en', branch 'master'
  *
- * @package    assignment
+ * @package    mod_assignment
  * @subpackage upload
  * @copyright  2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/upload/version.php b/mod/assignment/type/upload/version.php
index 99d4a3072ed..e8d5e0e4a6e 100644
--- a/mod/assignment/type/upload/version.php
+++ b/mod/assignment/type/upload/version.php
@@ -17,7 +17,7 @@
 /**
  * Version details
  *
- * @package    assignment
+ * @package    mod_assignment
  * @subpackage upload
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/uploadsingle/backup/moodle1/lib.php b/mod/assignment/type/uploadsingle/backup/moodle1/lib.php
index 70a3592a4af..c9c47caba85 100644
--- a/mod/assignment/type/uploadsingle/backup/moodle1/lib.php
+++ b/mod/assignment/type/uploadsingle/backup/moodle1/lib.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package assignment
+ * @package mod_assignment
  * @subpackage uploadsingle subplugin
  * @copyright 2011 onwards Aparup Banerjee (nebgor)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/uploadsingle/lang/en/assignment_uploadsingle.php b/mod/assignment/type/uploadsingle/lang/en/assignment_uploadsingle.php
index 6c5e400a47b..2010456f41a 100644
--- a/mod/assignment/type/uploadsingle/lang/en/assignment_uploadsingle.php
+++ b/mod/assignment/type/uploadsingle/lang/en/assignment_uploadsingle.php
@@ -17,7 +17,7 @@
 /**
  * Strings for component 'assignment_uploadsingle', language 'en', branch 'master'
  *
- * @package    assignment
+ * @package    mod_assignment
  * @subpackage uploadsingle
  * @copyright  2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/type/uploadsingle/version.php b/mod/assignment/type/uploadsingle/version.php
index 62ddae1a063..ba03e6deee4 100644
--- a/mod/assignment/type/uploadsingle/version.php
+++ b/mod/assignment/type/uploadsingle/version.php
@@ -17,7 +17,7 @@
 /**
  * Version details
  *
- * @package    assignment
+ * @package    mod_assignment
  * @subpackage uploadsingle
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/mod/assignment/version.php b/mod/assignment/version.php
index 6d82aee03e9..55464818e44 100644
--- a/mod/assignment/version.php
+++ b/mod/assignment/version.php
@@ -17,10 +17,9 @@
 /**
  * Version information
  *
- * @package    mod
- * @subpackage assignment
- * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   mod_assignment
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();