diff --git a/mod/label/backup/moodle1/lib.php b/mod/label/backup/moodle1/lib.php
index dfd9634fb6b..dec832b4726 100644
--- a/mod/label/backup/moodle1/lib.php
+++ b/mod/label/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 label
+ * @package mod_label
  * @copyright  2011 Aparup Banerjee <aparup@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/label/backup/moodle2/backup_label_stepslib.php b/mod/label/backup/moodle2/backup_label_stepslib.php
index 47fc4c71622..486ad7dc27d 100644
--- a/mod/label/backup/moodle2/backup_label_stepslib.php
+++ b/mod/label/backup/moodle2/backup_label_stepslib.php
@@ -16,8 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    mod
- * @subpackage label
+ * @package mod_label
  * @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/label/backup/moodle2/restore_label_activity_task.class.php b/mod/label/backup/moodle2/restore_label_activity_task.class.php
index 6bfad238bf5..8b37d24983f 100644
--- a/mod/label/backup/moodle2/restore_label_activity_task.class.php
+++ b/mod/label/backup/moodle2/restore_label_activity_task.class.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package mod_label
  * @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/label/backup/moodle2/restore_label_stepslib.php b/mod/label/backup/moodle2/restore_label_stepslib.php
index c590499e9c8..b08698dea7a 100644
--- a/mod/label/backup/moodle2/restore_label_stepslib.php
+++ b/mod/label/backup/moodle2/restore_label_stepslib.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package mod_label
  * @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/label/db/upgrade.php b/mod/label/db/upgrade.php
index 66406af7eba..00adcbb1a9c 100644
--- a/mod/label/db/upgrade.php
+++ b/mod/label/db/upgrade.php
@@ -18,8 +18,7 @@
 /**
  * Label module upgrade
  *
- * @package    mod
- * @subpackage label
+ * @package mod_label
  * @copyright  2006 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/label/index.php b/mod/label/index.php
index f13776a8ffc..47df577af47 100644
--- a/mod/label/index.php
+++ b/mod/label/index.php
@@ -18,8 +18,7 @@
 /**
  * Library of functions and constants for module label
  *
- * @package    mod
- * @subpackage label
+ * @package mod_label
  * @copyright  2003 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/label/lang/en/label.php b/mod/label/lang/en/label.php
index 5731413cea0..80896965b4f 100644
--- a/mod/label/lang/en/label.php
+++ b/mod/label/lang/en/label.php
@@ -18,8 +18,7 @@
 /**
  * Strings for component 'label', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package    mod
- * @subpackage label
+ * @package mod_label
  * @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/label/lib.php b/mod/label/lib.php
index a9aea19a324..afac5f39b30 100644
--- a/mod/label/lib.php
+++ b/mod/label/lib.php
@@ -18,8 +18,7 @@
 /**
  * Library of functions and constants for module label
  *
- * @package    mod
- * @subpackage label
+ * @package mod_label
  * @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/label/mod_form.php b/mod/label/mod_form.php
index ad86a4cf860..a9b436aa0f7 100644
--- a/mod/label/mod_form.php
+++ b/mod/label/mod_form.php
@@ -18,8 +18,7 @@
 /**
  * Add label form
  *
- * @package    mod
- * @subpackage label
+ * @package mod_label
  * @copyright  2006 Jamie Pratt
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/label/version.php b/mod/label/version.php
index 5418fb50f27..c4f3ae8c6ec 100644
--- a/mod/label/version.php
+++ b/mod/label/version.php
@@ -17,8 +17,7 @@
 /**
  * Label module version info
  *
- * @package    mod
- * @subpackage label
+ * @package mod_label
  * @copyright  2003 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/label/view.php b/mod/label/view.php
index b9e88a5a0b0..b00cd6c9788 100644
--- a/mod/label/view.php
+++ b/mod/label/view.php
@@ -18,8 +18,7 @@
 /**
  * Label module
  *
- * @package    mod
- * @subpackage label
+ * @package mod_label
  * @copyright  2003 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */