diff --git a/mod/lti/TrivialStore.php b/mod/lti/TrivialStore.php
index afe686c3b8f..73c3ad5a248 100644
--- a/mod/lti/TrivialStore.php
+++ b/mod/lti/TrivialStore.php
@@ -50,7 +50,7 @@
 /**
  * This file contains a Trivial memory-based store - no support for tokens
  *
- * @package lti
+ * @package mod_lti
  * @copyright IMS Global Learning Consortium
  *
  * @author Charles Severance csev@umich.edu
diff --git a/mod/lti/backup/moodle1/lib.php b/mod/lti/backup/moodle1/lib.php
index b798f465f4f..75b638d36c7 100644
--- a/mod/lti/backup/moodle1/lib.php
+++ b/mod/lti/backup/moodle1/lib.php
@@ -17,8 +17,7 @@
 /**
  * 1.9 to 2.0 backup format converter. (Also currently used in common cartridge import process)
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @author     Darko Miletic
diff --git a/mod/lti/backup/moodle2/backup_lti_stepslib.php b/mod/lti/backup/moodle2/backup_lti_stepslib.php
index 2c0b038fb51..8a7ac39bb1c 100644
--- a/mod/lti/backup/moodle2/backup_lti_stepslib.php
+++ b/mod/lti/backup/moodle2/backup_lti_stepslib.php
@@ -36,8 +36,7 @@
  * This file contains all the backup steps that will be used
  * by the backup_lti_activity_task
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/backup/moodle2/restore_lti_activity_task.class.php b/mod/lti/backup/moodle2/restore_lti_activity_task.class.php
index 773fe2db4d0..61113e00ed2 100644
--- a/mod/lti/backup/moodle2/restore_lti_activity_task.class.php
+++ b/mod/lti/backup/moodle2/restore_lti_activity_task.class.php
@@ -35,8 +35,7 @@
 /**
  * This file contains the lti module restore class
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/backup/moodle2/restore_lti_stepslib.php b/mod/lti/backup/moodle2/restore_lti_stepslib.php
index 2a76b529754..042ac9f20f0 100644
--- a/mod/lti/backup/moodle2/restore_lti_stepslib.php
+++ b/mod/lti/backup/moodle2/restore_lti_stepslib.php
@@ -36,8 +36,7 @@
  * This file contains all the restore steps that will be used
  * by the restore_lti_activity_task
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/db/upgrade.php b/mod/lti/db/upgrade.php
index f51f82e8efd..2435b9cbdba 100644
--- a/mod/lti/db/upgrade.php
+++ b/mod/lti/db/upgrade.php
@@ -35,8 +35,7 @@
 /**
  * This file keeps track of upgrades to the lti module
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/edit_form.php b/mod/lti/edit_form.php
index cdc801b9e77..558c1b4f76d 100644
--- a/mod/lti/edit_form.php
+++ b/mod/lti/edit_form.php
@@ -35,8 +35,7 @@
 /**
  * This file defines de main basiclti configuration form
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/grade.php b/mod/lti/grade.php
index eace2cac38d..c3c063d41dc 100644
--- a/mod/lti/grade.php
+++ b/mod/lti/grade.php
@@ -35,8 +35,7 @@
 /**
  * This file contains submissions-specific code for the lti module
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/index.php b/mod/lti/index.php
index 65b9ad7e9f0..9e931f0b437 100644
--- a/mod/lti/index.php
+++ b/mod/lti/index.php
@@ -35,8 +35,7 @@
 /**
  * This page lists all the instances of lti in a particular course
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/instructor_edit_tool_type.php b/mod/lti/instructor_edit_tool_type.php
index 3a700512f16..2a2cefbaebb 100644
--- a/mod/lti/instructor_edit_tool_type.php
+++ b/mod/lti/instructor_edit_tool_type.php
@@ -17,8 +17,7 @@
 /**
  * This page allows instructors to configure course level tool providers.
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @author     Chris Scribner
diff --git a/mod/lti/lang/en/lti.php b/mod/lti/lang/en/lti.php
index af2b9695da4..da8bf221dfd 100644
--- a/mod/lti/lang/en/lti.php
+++ b/mod/lti/lang/en/lti.php
@@ -35,8 +35,7 @@
 /**
  * This file contains en_utf8 translation of the Basic LTI module
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/launch.php b/mod/lti/launch.php
index de31c7a098b..67e88ab1382 100644
--- a/mod/lti/launch.php
+++ b/mod/lti/launch.php
@@ -35,8 +35,7 @@
 /**
  * This file contains all necessary code to view a lti activity instance
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/lib.php b/mod/lti/lib.php
index 895532acf81..0e761e1bf26 100644
--- a/mod/lti/lib.php
+++ b/mod/lti/lib.php
@@ -35,8 +35,7 @@
 /**
  * This file contains a library of functions and constants for the lti module
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/localadminlib.php b/mod/lti/localadminlib.php
index 7aee7dbdbeb..1ccb4247cac 100644
--- a/mod/lti/localadminlib.php
+++ b/mod/lti/localadminlib.php
@@ -36,8 +36,7 @@
  * This file contains some functions and classes used by the lti
  * module administration
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/locallib.php b/mod/lti/locallib.php
index f0fdcf68b25..4397d3b47af 100644
--- a/mod/lti/locallib.php
+++ b/mod/lti/locallib.php
@@ -35,8 +35,7 @@
 /**
  * This file contains the library of functions and constants for the lti module
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/mod_form.php b/mod/lti/mod_form.php
index fe517aec804..67b1cfc0a96 100644
--- a/mod/lti/mod_form.php
+++ b/mod/lti/mod_form.php
@@ -35,8 +35,7 @@
 /**
  * This file defines the main lti configuration form
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/request_tool.php b/mod/lti/request_tool.php
index ed3bb2ead68..d929e739ac4 100644
--- a/mod/lti/request_tool.php
+++ b/mod/lti/request_tool.php
@@ -17,8 +17,7 @@
 /**
  * Submits a request to administrators to add a tool configuration for the requested site.
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @author     Chris Scribner
diff --git a/mod/lti/return.php b/mod/lti/return.php
index b0940bbff95..d4f198009b3 100644
--- a/mod/lti/return.php
+++ b/mod/lti/return.php
@@ -17,8 +17,7 @@
 /**
  * Handle the return back to Moodle from the tool provider
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @author     Chris Scribner
diff --git a/mod/lti/service.php b/mod/lti/service.php
index 3150bbb2a37..cdf3148a766 100644
--- a/mod/lti/service.php
+++ b/mod/lti/service.php
@@ -17,8 +17,7 @@
 /**
  * LTI web service endpoints
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @author     Chris Scribner
diff --git a/mod/lti/servicelib.php b/mod/lti/servicelib.php
index 3a5dcf3f11d..3d7cc0eb180 100644
--- a/mod/lti/servicelib.php
+++ b/mod/lti/servicelib.php
@@ -17,8 +17,7 @@
 /**
  * Utility code for LTI service handling.
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @author     Chris Scribner
diff --git a/mod/lti/settings.php b/mod/lti/settings.php
index 46e5bb08596..ad754376956 100644
--- a/mod/lti/settings.php
+++ b/mod/lti/settings.php
@@ -35,8 +35,7 @@
 /**
  * This file defines the global lti administration form
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/typessettings.php b/mod/lti/typessettings.php
index d9c8d9b6a8c..ab5895a2488 100644
--- a/mod/lti/typessettings.php
+++ b/mod/lti/typessettings.php
@@ -36,8 +36,7 @@
  * This file contains the script used to clone Moodle admin setting page.
  * It is used to create a new form used to pre-configure lti activities
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/version.php b/mod/lti/version.php
index 479538af978..fc8079db61c 100644
--- a/mod/lti/version.php
+++ b/mod/lti/version.php
@@ -35,8 +35,7 @@
 /**
  * This file defines the version of lti
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu
diff --git a/mod/lti/view.php b/mod/lti/view.php
index b4a80d9c507..d61632eaa61 100644
--- a/mod/lti/view.php
+++ b/mod/lti/view.php
@@ -35,8 +35,7 @@
 /**
  * This file contains all necessary code to view a lti activity instance
  *
- * @package    mod
- * @subpackage lti
+ * @package mod_lti
  * @copyright  2009 Marc Alier, Jordi Piguillem, Nikolas Galanis
  *  marc.alier@upc.edu
  * @copyright  2009 Universitat Politecnica de Catalunya http://www.upc.edu