diff --git a/blocks/community/communitycourse.php b/blocks/community/communitycourse.php
index cebfc3aa56c..ca55e373300 100644
--- a/blocks/community/communitycourse.php
+++ b/blocks/community/communitycourse.php
@@ -16,6 +16,8 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
+ * Controller for various actions of the block.
+ *
  * This page display the community course search form.
  * It also handles adding a course to the community block.
  * It also handles downloading a course template.
diff --git a/mod/assignment/type/offline/backup/moodle1/lib.php b/mod/assignment/type/offline/backup/moodle1/lib.php
index 2898f3092ef..12ca3e3bc7d 100644
--- a/mod/assignment/type/offline/backup/moodle1/lib.php
+++ b/mod/assignment/type/offline/backup/moodle1/lib.php
@@ -16,8 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package mod_assignment
- * @subpackage offline subplugin
+ * @package assignment_offline
  * @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 b6bae7a5347..cd6ac972472 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 mod_assignment
+ * @package assignment_offline
  * @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 56dfde846a0..952abf278a2 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 mod_assignment
+ * @package assignment_offline
  * @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 898e8c32cdb..4f25729f546 100644
--- a/mod/assignment/type/offline/lang/en/assignment_offline.php
+++ b/mod/assignment/type/offline/lang/en/assignment_offline.php
@@ -17,8 +17,7 @@
 /**
  * Strings for component 'assignment_offline', language 'en', branch 'master'
  *
- * @package    mod_assignment
- * @subpackage offline
+ * @package    assignment_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 ed23e528b4a..42fc24e6ee6 100644
--- a/mod/assignment/type/offline/version.php
+++ b/mod/assignment/type/offline/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    mod_assignment
- * @subpackage offline
+ * @package    assignment_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 0092a009781..73a9562ca77 100644
--- a/mod/assignment/type/online/backup/moodle1/lib.php
+++ b/mod/assignment/type/online/backup/moodle1/lib.php
@@ -16,8 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package mod_assignment
- * @subpackage online subplugin
+ * @package assignment_online
  * @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 324bf0999a5..1b1b604b0a7 100644
--- a/mod/assignment/type/online/lang/en/assignment_online.php
+++ b/mod/assignment/type/online/lang/en/assignment_online.php
@@ -17,8 +17,7 @@
 /**
  * Strings for component 'assignment_online', language 'en', branch 'master'
  *
- * @package    mod_assignment
- * @subpackage online
+ * @package    assignment_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 1142d8b672a..9152903f310 100644
--- a/mod/assignment/type/online/version.php
+++ b/mod/assignment/type/online/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    mod_assignment
- * @subpackage online
+ * @package    assignment_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 923e8f478c4..57cf4db0789 100644
--- a/mod/assignment/type/upload/backup/moodle1/lib.php
+++ b/mod/assignment/type/upload/backup/moodle1/lib.php
@@ -16,8 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package mod_assignment
- * @subpackage upload subplugin
+ * @package assignment_upload
  * @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 854383a3338..dc34e6782fb 100644
--- a/mod/assignment/type/upload/lang/en/assignment_upload.php
+++ b/mod/assignment/type/upload/lang/en/assignment_upload.php
@@ -17,8 +17,7 @@
 /**
  * Strings for component 'assignment_upload', language 'en', branch 'master'
  *
- * @package    mod_assignment
- * @subpackage upload
+ * @package    assignment_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 e8d5e0e4a6e..5e3e374f20c 100644
--- a/mod/assignment/type/upload/version.php
+++ b/mod/assignment/type/upload/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    mod_assignment
- * @subpackage upload
+ * @package    assignment_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 c9c47caba85..62e932256bf 100644
--- a/mod/assignment/type/uploadsingle/backup/moodle1/lib.php
+++ b/mod/assignment/type/uploadsingle/backup/moodle1/lib.php
@@ -16,8 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package mod_assignment
- * @subpackage uploadsingle subplugin
+ * @package assignment_uploadsingle
  * @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 2010456f41a..15afd1b3812 100644
--- a/mod/assignment/type/uploadsingle/lang/en/assignment_uploadsingle.php
+++ b/mod/assignment/type/uploadsingle/lang/en/assignment_uploadsingle.php
@@ -17,8 +17,7 @@
 /**
  * Strings for component 'assignment_uploadsingle', language 'en', branch 'master'
  *
- * @package    mod_assignment
- * @subpackage uploadsingle
+ * @package    assignment_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 ba03e6deee4..fd70b356236 100644
--- a/mod/assignment/type/uploadsingle/version.php
+++ b/mod/assignment/type/uploadsingle/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    mod_assignment
- * @subpackage uploadsingle
+ * @package    assignment_uploadsingle
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */