diff --git a/enrol/ajax.php b/enrol/ajax.php
index f49c1dca32b..2d41a9892c1 100644
--- a/enrol/ajax.php
+++ b/enrol/ajax.php
@@ -20,8 +20,7 @@
  * The general idea behind this file is that any errors should throw exceptions
  * which will be returned and acted upon by the calling AJAX script.
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2010 Sam Hemelryk
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/authorize/authorizenet.class.php b/enrol/authorize/authorizenet.class.php
index 08fb8e527cd..299eda081d4 100644
--- a/enrol/authorize/authorizenet.class.php
+++ b/enrol/authorize/authorizenet.class.php
@@ -19,8 +19,7 @@
  *
  * This plugin allows you to set up paid courses, using authorize.net.
  *
- * @package    enrol
- * @subpackage authorize
+ * @package    enrol_authorize
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/authorize/db/upgrade.php b/enrol/authorize/db/upgrade.php
index c369c8f190f..d8a2a5ccba3 100644
--- a/enrol/authorize/db/upgrade.php
+++ b/enrol/authorize/db/upgrade.php
@@ -1,24 +1,27 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-// This file keeps track of upgrades to
-// the authorize enrol plugin
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installation to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// The commands in here will all be database-neutral,
-// using the methods of database_manager class
-//
-// Please do not forget to use upgrade_set_timeout()
-// before any action that may take longer time to finish.
+/**
+ * Authorize.Net enrolment plugin upgrades.
+ *
+ * @package    enrol_authorize
+ * @copyright  2006 Eugene Venter
+ * @author     Eugene Venter
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 function xmldb_enrol_authorize_upgrade($oldversion) {
     global $CFG, $DB;
diff --git a/enrol/authorize/enrol_form.php b/enrol/authorize/enrol_form.php
index 04911b9cfe2..49136dae50d 100644
--- a/enrol/authorize/enrol_form.php
+++ b/enrol/authorize/enrol_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * Authorize.Net enrol plugin implementation.
  *
- * @package    enrol
- * @subpackage authorize
+ * @package    enrol_authorize
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/authorize/import_form.php b/enrol/authorize/import_form.php
index 3af46d4c4f9..91484aa0e52 100644
--- a/enrol/authorize/import_form.php
+++ b/enrol/authorize/import_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -19,8 +18,7 @@
  * Adds new instance of enrol_authorize to specified course
  * or edits current instance.
  *
- * @package    enrol
- * @subpackage authorize
+ * @package    enrol_authorize
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php
index 7b93b042b9f..f888a9e2483 100644
--- a/enrol/authorize/index.php
+++ b/enrol/authorize/index.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -19,8 +18,7 @@
  * Adds new instance of enrol_authorize to specified course
  * or edits current instance.
  *
- * @package    enrol
- * @subpackage authorize
+ * @package    enrol_authorize
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/authorize/lang/en/enrol_authorize.php b/enrol/authorize/lang/en/enrol_authorize.php
index 1b74e212c15..5a67999ca5f 100644
--- a/enrol/authorize/lang/en/enrol_authorize.php
+++ b/enrol/authorize/lang/en/enrol_authorize.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'enrol_authorize', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'enrol_authorize', language 'en'.
  *
  * @package   enrol_authorize
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/enrol/authorize/localfuncs.php b/enrol/authorize/localfuncs.php
index f6b2935329d..473af614962 100644
--- a/enrol/authorize/localfuncs.php
+++ b/enrol/authorize/localfuncs.php
@@ -19,8 +19,7 @@
  *
  * This plugin allows you to set up paid courses, using authorize.net.
  *
- * @package    enrol
- * @subpackage authorize
+ * @package    enrol_authorize
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index 36ea35a5d41..b44c727d2b3 100644
--- a/enrol/authorize/locallib.php
+++ b/enrol/authorize/locallib.php
@@ -19,8 +19,7 @@
  *
  * This plugin allows you to set up paid courses, using authorize.net.
  *
- * @package    enrol
- * @subpackage authorize
+ * @package    enrol_authorize
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/authorize/uploadcsv.php b/enrol/authorize/uploadcsv.php
index d21cfb9a5d1..9c62501ef61 100644
--- a/enrol/authorize/uploadcsv.php
+++ b/enrol/authorize/uploadcsv.php
@@ -17,8 +17,7 @@
 /**
  * Authorize.Net enrolment plugin - support for user self unenrolment.
  *
- * @package    enrol
- * @subpackage authorize
+ * @package    enrol_authorize
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/authorize/version.php b/enrol/authorize/version.php
index 69c456cebd5..08fade1ecfb 100644
--- a/enrol/authorize/version.php
+++ b/enrol/authorize/version.php
@@ -17,8 +17,7 @@
 /**
  * Authorize.Net enrolment plugin version specification.
  *
- * @package    enrol
- * @subpackage authorize
+ * @package    enrol_authorize
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/bulkchange.php b/enrol/bulkchange.php
index 11c0324b3ab..1d451ae2098 100644
--- a/enrol/bulkchange.php
+++ b/enrol/bulkchange.php
@@ -17,8 +17,7 @@
 /**
  * Bulk user enrolment processing.
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2011 Sam Hemelryk
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/bulkchange_forms.php b/enrol/bulkchange_forms.php
index 65e6152b204..2c54b1c1a03 100644
--- a/enrol/bulkchange_forms.php
+++ b/enrol/bulkchange_forms.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * This file contains form for bulk changing user enrolments.
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2011 Sam Hemelryk
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/cohort/lang/en/enrol_cohort.php b/enrol/cohort/lang/en/enrol_cohort.php
index a74a480b926..97c3fa4fccd 100644
--- a/enrol/cohort/lang/en/enrol_cohort.php
+++ b/enrol/cohort/lang/en/enrol_cohort.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'enrol_cohort', language 'en'
+ * Strings for component 'enrol_cohort', language 'en'.
  *
  * @package    enrol_cohort
  * @copyright  2010 Petr Skoda  {@link http://skodak.org}
diff --git a/enrol/guest/addinstance.php b/enrol/guest/addinstance.php
index ce196320ae8..faa0531a4c2 100644
--- a/enrol/guest/addinstance.php
+++ b/enrol/guest/addinstance.php
@@ -17,8 +17,7 @@
 /**
  * Adds new instance of enrol_guest to specified course.
  *
- * @package    enrol
- * @subpackage guest
+ * @package    enrol_guest
  * @copyright  2010 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/guest/db/upgrade.php b/enrol/guest/db/upgrade.php
index 9769069918d..cb10d30f37f 100644
--- a/enrol/guest/db/upgrade.php
+++ b/enrol/guest/db/upgrade.php
@@ -15,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * This file keeps track of upgrades to the guest enrolment plugin
+ * This file keeps track of upgrades to the guest enrolment plugin.
  *
- * @package    enrol
- * @subpackage guest
+ * @package    enrol_guest
  * @copyright  2011 Petr Skoda {@link http://skodak.org
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/guest/lang/en/enrol_guest.php b/enrol/guest/lang/en/enrol_guest.php
index 8b0bd2d65c2..606def815cd 100644
--- a/enrol/guest/lang/en/enrol_guest.php
+++ b/enrol/guest/lang/en/enrol_guest.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'enrol_guest', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'enrol_guest', language 'en'.
  *
- * @package    enrol
- * @subpackage guest
+ * @package    enrol_guest
  * @copyright  2010 onwards Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/guest/lib.php b/enrol/guest/lib.php
index acd2536e390..9d3782460dd 100644
--- a/enrol/guest/lib.php
+++ b/enrol/guest/lib.php
@@ -20,8 +20,7 @@
  * This plugin does not add any entries into the user_enrolments table,
  * the access control is granted on the fly via the tricks in require_login().
  *
- * @package    enrol
- * @subpackage guest
+ * @package    enrol_guest
  * @copyright  2010 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/guest/locallib.php b/enrol/guest/locallib.php
index 6182070dccc..14e13a92fb4 100644
--- a/enrol/guest/locallib.php
+++ b/enrol/guest/locallib.php
@@ -17,8 +17,7 @@
 /**
  * Guest access plugin implementation.
  *
- * @package    enrol
- * @subpackage guest
+ * @package    enrol_guest
  * @copyright  2010 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/guest/settings.php b/enrol/guest/settings.php
index a9376cb0cc2..56de6f691d7 100644
--- a/enrol/guest/settings.php
+++ b/enrol/guest/settings.php
@@ -17,8 +17,7 @@
 /**
  * Guest access plugin settings and presets.
  *
- * @package    enrol
- * @subpackage guest
+ * @package    enrol_guest
  * @copyright  2010 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/guest/version.php b/enrol/guest/version.php
index 1260ae64974..530a739f476 100644
--- a/enrol/guest/version.php
+++ b/enrol/guest/version.php
@@ -17,8 +17,7 @@
 /**
  * Guest access plugin version specification.
  *
- * @package    enrol
- * @subpackage guest
+ * @package    enrol_guest
  * @copyright  2010 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/imsenterprise/db/install.php b/enrol/imsenterprise/db/install.php
index 5ce41bcc155..db69d201005 100644
--- a/enrol/imsenterprise/db/install.php
+++ b/enrol/imsenterprise/db/install.php
@@ -17,8 +17,7 @@
 /**
  * imsenterprise enrolment plugin installation.
  *
- * @package    enrol
- * @subpackage imsenterprise
+ * @package    enrol_imsenterprise
  * @copyright  2011 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/imsenterprise/db/upgrade.php b/enrol/imsenterprise/db/upgrade.php
index 384a74d6065..9ad1c353483 100644
--- a/enrol/imsenterprise/db/upgrade.php
+++ b/enrol/imsenterprise/db/upgrade.php
@@ -17,8 +17,7 @@
 /**
  * This file keeps track of upgrades to the imsenterprise enrolment plugin
  *
- * @package    enrol
- * @subpackage imsenterprise
+ * @package    enrol_imsenterprise
  * @copyright  2011 Petr Skoda {@link http://skodak.org
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/imsenterprise/lang/en/enrol_imsenterprise.php b/enrol/imsenterprise/lang/en/enrol_imsenterprise.php
index 511ac821fce..8564667f69e 100644
--- a/enrol/imsenterprise/lang/en/enrol_imsenterprise.php
+++ b/enrol/imsenterprise/lang/en/enrol_imsenterprise.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'enrol_imsenterprise', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'enrol_imsenterprise', language 'en'.
  *
- * @package    enrol
- * @subpackage imsenterprise
+ * @package    enrol_imsenterprise
  * @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/enrol/imsenterprise/lib.php b/enrol/imsenterprise/lib.php
index 970a1a7cd83..258f2cefee3 100644
--- a/enrol/imsenterprise/lib.php
+++ b/enrol/imsenterprise/lib.php
@@ -20,8 +20,7 @@
  * This plugin lets the user specify an IMS Enterprise file to be processed.
  * The IMS Enterprise file is mainly parsed on a regular cron,
  * but can also be imported via the UI (Admin Settings).
- * @package    enrol
- * @subpackage imsenterprise
+ * @package    enrol_imsenterprise
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter - based on code by Dan Stowell
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/imsenterprise/locallib.php b/enrol/imsenterprise/locallib.php
index 921bb306ba6..f203dc89184 100644
--- a/enrol/imsenterprise/locallib.php
+++ b/enrol/imsenterprise/locallib.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * IMS Enterprise enrol plugin implementation.
  *
- * @package    enrol
- * @subpackage imsenterprise
+ * @package    enrol_imsenterprise
  * @copyright  2010 Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/imsenterprise/settings.php b/enrol/imsenterprise/settings.php
index b644f491944..5b7fbb65fa9 100644
--- a/enrol/imsenterprise/settings.php
+++ b/enrol/imsenterprise/settings.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * IMS Enterprise enrolments plugin settings and presets.
  *
- * @package    enrol
- * @subpackage imsenterprise
+ * @package    enrol_imsenterprise
  * @copyright  2010 Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/imsenterprise/version.php b/enrol/imsenterprise/version.php
index b2218187655..b5c0cdfd25b 100644
--- a/enrol/imsenterprise/version.php
+++ b/enrol/imsenterprise/version.php
@@ -17,8 +17,7 @@
 /**
  * IMS Enterprise file enrolment plugin version specification.
  *
- * @package    enrol
- * @subpackage imsenterprise
+ * @package    enrol_imsenterprise
  * @copyright  2010 Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/index.php b/enrol/index.php
index 0c66f670928..d0e91b53443 100644
--- a/enrol/index.php
+++ b/enrol/index.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * This page shows all course enrolment options for current user.
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/instances.php b/enrol/instances.php
index ac4db48e665..3505d9afa7c 100644
--- a/enrol/instances.php
+++ b/enrol/instances.php
@@ -17,8 +17,7 @@
 /**
  * Main course enrolment management UI.
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/ldap/cli/sync.php b/enrol/ldap/cli/sync.php
index 1979a35dbf6..e43b12c1665 100644
--- a/enrol/ldap/cli/sync.php
+++ b/enrol/ldap/cli/sync.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -34,8 +33,7 @@
  *   - For debugging & better logging, you are encouraged to use in the command line:
  *     -d log_errors=1 -d error_reporting=E_ALL -d display_errors=0 -d html_errors=0
  *
- * @package    enrol
- * @subpackage ldap
+ * @package    enrol_ldap
  * @author     Iñaki Arenaza - based on code by Martin Dougiamas, Martin Langhoff and others
  * @copyright  1999 onwards Martin Dougiamas {@link http://moodle.com}
  * @copyright  2010 Iñaki Arenaza <iarenaza@eps.mondragon.edu>
diff --git a/enrol/ldap/db/install.php b/enrol/ldap/db/install.php
index ad0b9b756ad..485666602ec 100644
--- a/enrol/ldap/db/install.php
+++ b/enrol/ldap/db/install.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * LDAP enrolment plugin installation.
  *
- * @package    enrol
- * @subpackage ldap
+ * @package    enrol_ldap
  * @author     Iñaki Arenaza
  * @copyright  2010 Iñaki Arenaza <iarenaza@eps.mondragon.edu>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/ldap/lang/en/enrol_ldap.php b/enrol/ldap/lang/en/enrol_ldap.php
index a54e35e71c9..f6ec711cd36 100644
--- a/enrol/ldap/lang/en/enrol_ldap.php
+++ b/enrol/ldap/lang/en/enrol_ldap.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'enrol_ldap', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'enrol_ldap', language 'en'.
  *
- * @package    enrol
- * @subpackage ldap
+ * @package    enrol_ldap
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @copyright  2010 Iñaki Arenaza <iarenaza@eps.mondragon.edu>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/ldap/lib.php b/enrol/ldap/lib.php
index 3a1cb0fb434..a4448c76544 100644
--- a/enrol/ldap/lib.php
+++ b/enrol/ldap/lib.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -20,8 +19,7 @@
  *
  * This plugin synchronises enrolment and roles with a LDAP server.
  *
- * @package    enrol
- * @subpackage ldap
+ * @package    enrol_ldap
  * @author     Iñaki Arenaza - based on code by Martin Dougiamas, Martin Langhoff and others
  * @copyright  1999 onwards Martin Dougiamas {@link http://moodle.com}
  * @copyright  2010 Iñaki Arenaza <iarenaza@eps.mondragon.edu>
diff --git a/enrol/ldap/settings.php b/enrol/ldap/settings.php
index c27ea279fdf..a0838622932 100644
--- a/enrol/ldap/settings.php
+++ b/enrol/ldap/settings.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * LDAP enrolment plugin settings and presets.
  *
- * @package    enrol
- * @subpackage ldap
+ * @package    enrol_ldap
  * @author     Iñaki Arenaza
  * @copyright  2010 Iñaki Arenaza <iarenaza@eps.mondragon.edu>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/ldap/settingslib.php b/enrol/ldap/settingslib.php
index 9b1c4fbc123..c090c2c8d53 100644
--- a/enrol/ldap/settingslib.php
+++ b/enrol/ldap/settingslib.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * LDAP enrolment plugin admin setting classes
  *
- * @package    enrol
- * @subpackage ldap
+ * @package    enrol_ldap
  * @author     Iñaki Arenaza
  * @copyright  2010 Iñaki Arenaza <iarenaza@eps.mondragon.edu>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/ldap/version.php b/enrol/ldap/version.php
index 98039982d4f..e4ccf88c4c0 100644
--- a/enrol/ldap/version.php
+++ b/enrol/ldap/version.php
@@ -17,8 +17,7 @@
 /**
  * LDAP enrolment plugin version specification.
  *
- * @package    enrol
- * @subpackage ldap
+ * @package    enrol_ldap
  * @author     Iñaki Arenaza
  * @copyright  2010 Iñaki Arenaza <iarenaza@eps.mondragon.edu>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/locallib.php b/enrol/locallib.php
index e4ece1e672b..a2039da679e 100644
--- a/enrol/locallib.php
+++ b/enrol/locallib.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -19,8 +18,7 @@
  * This file contains the course_enrolment_manager class which is used to interface
  * with the functions that exist in enrollib.php in relation to a single course.
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2010 Sam Hemelryk
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/manual/db/services.php b/enrol/manual/db/services.php
index b5959dc14ed..7b080463ea9 100644
--- a/enrol/manual/db/services.php
+++ b/enrol/manual/db/services.php
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-
 /**
  * Manual plugin external functions and service definitions.
  *
diff --git a/enrol/meta/addinstance.php b/enrol/meta/addinstance.php
index b1bd857a7c1..ac2f2ff3cec 100644
--- a/enrol/meta/addinstance.php
+++ b/enrol/meta/addinstance.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * Adds new instance of enrol_meta to specified course.
  *
- * @package    enrol
- * @subpackage meta
+ * @package    enrol_meta
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/meta/addinstance_form.php b/enrol/meta/addinstance_form.php
index 092e3fdc996..469e23ff8d4 100644
--- a/enrol/meta/addinstance_form.php
+++ b/enrol/meta/addinstance_form.php
@@ -17,8 +17,7 @@
 /**
  * Adds instance form
  *
- * @package    enrol
- * @subpackage meta
+ * @package    enrol_meta
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/meta/cli/sync.php b/enrol/meta/cli/sync.php
index 01bc0d6d4a9..0f677acbf12 100644
--- a/enrol/meta/cli/sync.php
+++ b/enrol/meta/cli/sync.php
@@ -23,8 +23,7 @@
  *   - you need to change the "www-data" to match the apache user account
  *   - use "su" if "sudo" not available
  *
- * @package    enrol
- * @subpackage meta
+ * @package    enrol_meta
  * @copyright  2011 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/meta/db/install.php b/enrol/meta/db/install.php
index ecc21d0e945..f052adba218 100644
--- a/enrol/meta/db/install.php
+++ b/enrol/meta/db/install.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * Meta link enrolment plugin installation.
  *
- * @package    enrol
- * @subpackage meta
+ * @package    enrol_meta
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/meta/db/uninstall.php b/enrol/meta/db/uninstall.php
index 36011694ef2..1f817e2f790 100644
--- a/enrol/meta/db/uninstall.php
+++ b/enrol/meta/db/uninstall.php
@@ -17,8 +17,7 @@
 /**
  * Meta link enrolment plugin uninstallation.
  *
- * @package    enrol
- * @subpackage meta
+ * @package    enrol_meta
  * @copyright  2011 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/meta/lang/en/enrol_meta.php b/enrol/meta/lang/en/enrol_meta.php
index 4f64889de34..e554ddd27bf 100644
--- a/enrol/meta/lang/en/enrol_meta.php
+++ b/enrol/meta/lang/en/enrol_meta.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'enrol_meta', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'enrol_meta', language 'en'.
  *
- * @package    enrol
- * @subpackage meta
+ * @package    enrol_meta
  * @copyright  2010 onwards Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/meta/lib.php b/enrol/meta/lib.php
index 10f277bf138..2babc8a7059 100644
--- a/enrol/meta/lib.php
+++ b/enrol/meta/lib.php
@@ -17,8 +17,7 @@
 /**
  * Meta course enrolment plugin.
  *
- * @package    enrol
- * @subpackage meta
+ * @package    enrol_meta
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/meta/locallib.php b/enrol/meta/locallib.php
index 3d16b0e2414..5bfa2002d21 100644
--- a/enrol/meta/locallib.php
+++ b/enrol/meta/locallib.php
@@ -17,8 +17,7 @@
 /**
  * Local stuff for meta course enrolment plugin.
  *
- * @package    enrol
- * @subpackage meta
+ * @package    enrol_meta
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/meta/settings.php b/enrol/meta/settings.php
index b80f93b1071..d2f5d935510 100644
--- a/enrol/meta/settings.php
+++ b/enrol/meta/settings.php
@@ -17,8 +17,7 @@
 /**
  * Meta enrolment plugin settings and presets.
  *
- * @package    enrol
- * @subpackage meta
+ * @package    enrol_meta
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/meta/version.php b/enrol/meta/version.php
index a641b63976d..79d104e347b 100644
--- a/enrol/meta/version.php
+++ b/enrol/meta/version.php
@@ -17,8 +17,7 @@
 /**
  * Meta link enrolment plugin version specification.
  *
- * @package    enrol
- * @subpackage meta
+ * @package    enrol_meta
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/mnet/addinstance.php b/enrol/mnet/addinstance.php
index b7d75f4a423..9678b400bf5 100644
--- a/enrol/mnet/addinstance.php
+++ b/enrol/mnet/addinstance.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * Adds new instance of enrol_mnet into the specified course
  *
- * @package    enrol
- * @subpackage mnet
+ * @package    enrol_mnet
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/mnet/addinstance_form.php b/enrol/mnet/addinstance_form.php
index e6d13d12a82..436e92b0cf4 100644
--- a/enrol/mnet/addinstance_form.php
+++ b/enrol/mnet/addinstance_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * Form to add an instance of enrol_mnet plugin
  *
- * @package    enrol
- * @subpackage mnet
+ * @package    enrol_mnet
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/mnet/db/mnet.php b/enrol/mnet/db/mnet.php
index 495575b735a..01ad3abe1b1 100644
--- a/enrol/mnet/db/mnet.php
+++ b/enrol/mnet/db/mnet.php
@@ -21,8 +21,7 @@
  * just a declaration of xml-rpc methods that this plugin publishes.
  *
  * @since      2.0
- * @package    enrol
- * @subpackage mnet
+ * @package    enrol_mnet
  * @copyright  2010 Penny Leach
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/mnet/db/upgrade.php b/enrol/mnet/db/upgrade.php
index 76a1a325674..0d149155edd 100644
--- a/enrol/mnet/db/upgrade.php
+++ b/enrol/mnet/db/upgrade.php
@@ -18,8 +18,7 @@
 /**
  * Keeps track of upgrades to the enrol_mnet plugin
  *
- * @package    enrol
- * @subpackage mnet
+ * @package    enrol_mnet
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/mnet/enrol.php b/enrol/mnet/enrol.php
index 63966193804..78fd0b84762 100644
--- a/enrol/mnet/enrol.php
+++ b/enrol/mnet/enrol.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -26,8 +25,7 @@
  * be a common name of a plugin library containing functions/methods callable
  * via MNet framework.
  *
- * @package    enrol
- * @subpackage mnet
+ * @package    enrol_mnet
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/mnet/lang/en/enrol_mnet.php b/enrol/mnet/lang/en/enrol_mnet.php
index 9a98ed9db30..9f086d1f170 100644
--- a/enrol/mnet/lang/en/enrol_mnet.php
+++ b/enrol/mnet/lang/en/enrol_mnet.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * English strings for MNet enrolment plugin
+ * English strings for MNet enrolment plugin.
  *
- * @package    enrol
- * @subpackage mnet
+ * @package    enrol_mnet
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/mnet/lib.php b/enrol/mnet/lib.php
index 0a507293f71..28578a26c0a 100644
--- a/enrol/mnet/lib.php
+++ b/enrol/mnet/lib.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * MNet enrolment plugin
  *
- * @package    enrol
- * @subpackage mnet
+ * @package    enrol_mnet
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/mnet/settings.php b/enrol/mnet/settings.php
index fc022046dd0..fc7517faa89 100644
--- a/enrol/mnet/settings.php
+++ b/enrol/mnet/settings.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * Cohort enrolment plugin settings and default values
  *
- * @package    enrol
- * @subpackage mnet
+ * @package    enrol_mnet
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/mnet/version.php b/enrol/mnet/version.php
index af325f9a771..76782204e53 100644
--- a/enrol/mnet/version.php
+++ b/enrol/mnet/version.php
@@ -17,8 +17,7 @@
 /**
  * MNet enrolment plugin version specification.
  *
- * @package    enrol
- * @subpackage mnet
+ * @package    enrol_mnet
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/otherusers.php b/enrol/otherusers.php
index 4decf202765..063d5b4ec04 100644
--- a/enrol/otherusers.php
+++ b/enrol/otherusers.php
@@ -17,8 +17,7 @@
 /**
  * List and modify users that are not enrolled but still have a role in course.
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/paypal/db/upgrade.php b/enrol/paypal/db/upgrade.php
index 279dc974d86..01200081adf 100644
--- a/enrol/paypal/db/upgrade.php
+++ b/enrol/paypal/db/upgrade.php
@@ -17,8 +17,7 @@
 /**
  * This file keeps track of upgrades to the paypal enrolment plugin
  *
- * @package    enrol
- * @subpackage paypal
+ * @package    enrol_paypal
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/paypal/edit.php b/enrol/paypal/edit.php
index 081beb4195e..8955cb7d812 100644
--- a/enrol/paypal/edit.php
+++ b/enrol/paypal/edit.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -19,8 +18,7 @@
  * Adds new instance of enrol_paypal to specified course
  * or edits current instance.
  *
- * @package    enrol
- * @subpackage paypal
+ * @package    enrol_paypal
  * @copyright  2010 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/paypal/edit_form.php b/enrol/paypal/edit_form.php
index 4a7c05ca46a..9943a4c38e8 100644
--- a/enrol/paypal/edit_form.php
+++ b/enrol/paypal/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -19,8 +18,7 @@
  * Adds new instance of enrol_paypal to specified course
  * or edits current instance.
  *
- * @package    enrol
- * @subpackage paypal
+ * @package    enrol_paypal
  * @copyright  2010 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/paypal/ipn.php b/enrol/paypal/ipn.php
index 2a25472cdfc..b970ea01ae6 100644
--- a/enrol/paypal/ipn.php
+++ b/enrol/paypal/ipn.php
@@ -22,8 +22,7 @@
  * If PayPal verifies this then it sets up the enrolment for that
  * user.
  *
- * @package    enrol
- * @subpackage paypal
+ * @package    enrol_paypal
  * @copyright 2010 Eugene Venter
  * @author     Eugene Venter - based on code by others
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/paypal/lang/en/enrol_paypal.php b/enrol/paypal/lang/en/enrol_paypal.php
index 29b840477f4..e3f8e0b90b6 100644
--- a/enrol/paypal/lang/en/enrol_paypal.php
+++ b/enrol/paypal/lang/en/enrol_paypal.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'enrol_paypal', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'enrol_paypal', language 'en'.
  *
- * @package    enrol
- * @subpackage paypal
+ * @package    enrol_paypal
  * @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/enrol/paypal/lib.php b/enrol/paypal/lib.php
index b79dbe119f5..ef458599618 100644
--- a/enrol/paypal/lib.php
+++ b/enrol/paypal/lib.php
@@ -19,8 +19,7 @@
  *
  * This plugin allows you to set up paid courses.
  *
- * @package    enrol
- * @subpackage paypal
+ * @package    enrol_paypal
  * @copyright  2010 Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/paypal/return.php b/enrol/paypal/return.php
index e8a5c847695..6ee4f5e3166 100644
--- a/enrol/paypal/return.php
+++ b/enrol/paypal/return.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,9 +17,7 @@
 /**
  * Paypal utility script
  *
- * @package    enrol
- * @subpackage paypal
- * @subpackage file
+ * @package    enrol_paypal
  * @copyright  2004 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/paypal/settings.php b/enrol/paypal/settings.php
index aa026e0cd09..66e0ae4926b 100644
--- a/enrol/paypal/settings.php
+++ b/enrol/paypal/settings.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * Paypal enrolments plugin settings and presets.
  *
- * @package    enrol
- * @subpackage paypal
+ * @package    enrol_paypal
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter - based on code by Petr Skoda and others
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/paypal/unenrolself.php b/enrol/paypal/unenrolself.php
index c884733ee3d..8fd16d264c2 100644
--- a/enrol/paypal/unenrolself.php
+++ b/enrol/paypal/unenrolself.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * PayPal enrolment plugin - support for user self unenrolment.
  *
- * @package    enrol
- * @subpackage paypal
+ * @package    enrol_paypal
  * @copyright  2010 Petr Skoda  {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/paypal/version.php b/enrol/paypal/version.php
index d0c4b7ffe3f..575daa7b543 100644
--- a/enrol/paypal/version.php
+++ b/enrol/paypal/version.php
@@ -17,8 +17,7 @@
 /**
  * Paypal enrolment plugin version specification.
  *
- * @package    enrol
- * @subpackage paypal
+ * @package    enrol_paypal
  * @copyright  2010 Eugene Venter
  * @author     Eugene Venter
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/renderer.php b/enrol/renderer.php
index 3804a9f7ffb..9f7d8fad35a 100644
--- a/enrol/renderer.php
+++ b/enrol/renderer.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * This is the main renderer for the enrol section.
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2010 Sam Hemelryk
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/tests/enrollib_test.php b/enrol/tests/enrollib_test.php
index edbb97ee8b9..5505cb2c0ba 100644
--- a/enrol/tests/enrollib_test.php
+++ b/enrol/tests/enrollib_test.php
@@ -17,7 +17,7 @@
 /**
  * Test non-plugin enrollib parts.
  *
- * @package    core
+ * @package    core_enrol
  * @category   phpunit
  * @copyright  2012 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/unenroluser.php b/enrol/unenroluser.php
index 08a75f5ee52..99033919001 100644
--- a/enrol/unenroluser.php
+++ b/enrol/unenroluser.php
@@ -20,8 +20,7 @@
  * Please note when unenrolling a user all of their grades are removed as well,
  * most ppl actually expect enrolments to be suspended only...
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2011 Petr skoda
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/users.php b/enrol/users.php
index 4b46be4ec53..d8453fb1f80 100644
--- a/enrol/users.php
+++ b/enrol/users.php
@@ -17,8 +17,7 @@
 /**
  * Main course enrolment management UI, this is not compatible with frontpage course.
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/enrol/users_forms.php b/enrol/users_forms.php
index 4da04391230..6bdb5500b3b 100644
--- a/enrol/users_forms.php
+++ b/enrol/users_forms.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * Various enrol UI forms
  *
- * @package    core
- * @subpackage enrol
+ * @package    core_enrol
  * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */