diff --git a/mod/quiz/report/default.php b/mod/quiz/report/default.php
index 1cbd44a0893..9bcf3cc8dbf 100644
--- a/mod/quiz/report/default.php
+++ b/mod/quiz/report/default.php
@@ -17,10 +17,9 @@
 /**
  * Base class for quiz report plugins.
  *
- * @package    mod
- * @subpackage quiz
- * @copyright  1999 onwards Martin Dougiamas and others {@link http://moodle.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   mod_quiz
+ * @copyright 1999 onwards Martin Dougiamas and others {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -39,8 +38,8 @@ defined('MOODLE_INTERNAL') || die();
  * to itself - all these will also be globally available.  You must
  * pass "id=$cm->id" or q=$quiz->id", and "mode=reportname".
  *
- * @copyright  1999 onwards Martin Dougiamas and others {@link http://moodle.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 1999 onwards Martin Dougiamas and others {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class quiz_default_report {
     const NO_GROUPS_ALLOWED = -2;
diff --git a/mod/quiz/report/grading/db/access.php b/mod/quiz/report/grading/db/access.php
index 08295db07df..26658c3ca58 100644
--- a/mod/quiz/report/grading/db/access.php
+++ b/mod/quiz/report/grading/db/access.php
@@ -17,9 +17,9 @@
 /**
  * Capability definitions for the quiz manual grading report.
  *
- * @package    quiz_grading
- * @copyright  2010 The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_grading
+ * @copyright 2010 The Open University
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/mod/quiz/report/grading/gradingsettings_form.php b/mod/quiz/report/grading/gradingsettings_form.php
index b54f03543d1..e29dd72cbe5 100644
--- a/mod/quiz/report/grading/gradingsettings_form.php
+++ b/mod/quiz/report/grading/gradingsettings_form.php
@@ -17,10 +17,9 @@
 /**
  * This file defines the setting form for the quiz grading report.
  *
- * @package    quiz
- * @subpackage grading
- * @copyright  2010 Tim Hunt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_grading
+ * @copyright 2010 Tim Hunt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -32,8 +31,8 @@ require_once($CFG->libdir . '/formslib.php');
 /**
  * Quiz grading report settings form.
  *
- * @copyright  2010 Tim Hunt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2010 Tim Hunt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_grading_settings_form extends moodleform {
     protected $includeauto;
diff --git a/mod/quiz/report/grading/lang/en/quiz_grading.php b/mod/quiz/report/grading/lang/en/quiz_grading.php
index 4aa1f9a3a39..01c38b8dc5d 100644
--- a/mod/quiz/report/grading/lang/en/quiz_grading.php
+++ b/mod/quiz/report/grading/lang/en/quiz_grading.php
@@ -17,10 +17,9 @@
 /**
  * Strings for component 'quiz_grading', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package    quiz
- * @subpackage grading
- * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_grading
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['alldoneredirecting'] = 'All selected attempts have been graded. Returning to the list of questions.';
diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index 7690e2104f5..3d9430ba11f 100644
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -17,10 +17,9 @@
 /**
  * This file defines the quiz manual grading report class.
  *
- * @package    quiz
- * @subpackage grading
- * @copyright  2006 Gustav Delius
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_grading
+ * @copyright 2006 Gustav Delius
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -36,8 +35,8 @@ require_once($CFG->dirroot . '/mod/quiz/report/grading/gradingsettings_form.php'
  * - List question that might need manual grading (or optionally all questions).
  * - Provide an efficient UI to grade all attempts at a particular question.
  *
- * @copyright  2006 Gustav Delius
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2006 Gustav Delius
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_grading_report extends quiz_default_report {
     const DEFAULT_PAGE_SIZE = 5;
diff --git a/mod/quiz/report/grading/version.php b/mod/quiz/report/grading/version.php
index b90550933a4..c9f8bd39f9c 100644
--- a/mod/quiz/report/grading/version.php
+++ b/mod/quiz/report/grading/version.php
@@ -17,10 +17,9 @@
 /**
  * Quiz grading report version information.
  *
- * @package    quiz
- * @subpackage grading
- * @copyright  2010 The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_grading
+ * @copyright 2010 The Open University
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/mod/quiz/report/overview/db/upgrade.php b/mod/quiz/report/overview/db/upgrade.php
index 69f821fe7d0..7f46e88922d 100644
--- a/mod/quiz/report/overview/db/upgrade.php
+++ b/mod/quiz/report/overview/db/upgrade.php
@@ -17,10 +17,9 @@
 /**
  * Quiz overview report upgrade script.
  *
- * @package    quiz
- * @subpackage overview
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_overview
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
diff --git a/mod/quiz/report/overview/lang/en/quiz_overview.php b/mod/quiz/report/overview/lang/en/quiz_overview.php
index 70af921df4f..f4b928f91f0 100644
--- a/mod/quiz/report/overview/lang/en/quiz_overview.php
+++ b/mod/quiz/report/overview/lang/en/quiz_overview.php
@@ -17,10 +17,9 @@
 /**
  * Strings for component 'quiz_overview', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package    quiz
- * @subpackage overview
- * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_overview
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['allattempts'] = 'Show all attempts';
diff --git a/mod/quiz/report/overview/overview_table.php b/mod/quiz/report/overview/overview_table.php
index f434003d4b7..13061a4be89 100644
--- a/mod/quiz/report/overview/overview_table.php
+++ b/mod/quiz/report/overview/overview_table.php
@@ -17,10 +17,9 @@
 /**
  * This file defines the quiz grades table.
  *
- * @package    quiz
- * @subpackage overview
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_overview
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -32,8 +31,8 @@ require_once($CFG->dirroot . '/mod/quiz/report/attemptsreport_table.php');
 /**
  * This is a table subclass for displaying the quiz grades report.
  *
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_overview_table extends quiz_attempt_report_table {
 
diff --git a/mod/quiz/report/overview/overviewgraph.php b/mod/quiz/report/overview/overviewgraph.php
index 4e78d4e9766..4f0c7633617 100644
--- a/mod/quiz/report/overview/overviewgraph.php
+++ b/mod/quiz/report/overview/overviewgraph.php
@@ -17,10 +17,9 @@
 /**
  * This file renders the quiz overview graph.
  *
- * @package    quiz
- * @subpackage overview
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_overview
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
diff --git a/mod/quiz/report/overview/overviewsettings_form.php b/mod/quiz/report/overview/overviewsettings_form.php
index 1ca6e4aa28a..ac656b63378 100644
--- a/mod/quiz/report/overview/overviewsettings_form.php
+++ b/mod/quiz/report/overview/overviewsettings_form.php
@@ -17,10 +17,9 @@
 /**
  * This file defines the setting form for the quiz overview report.
  *
- * @package    quiz
- * @subpackage overview
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_overview
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -32,8 +31,8 @@ require_once($CFG->libdir . '/formslib.php');
 /**
  * Quiz overview report settings form.
  *
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_overview_settings_form extends moodleform {
 
diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 2c66fa5d76f..2bd0cb4d601 100644
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -17,10 +17,9 @@
 /**
  * This file defines the quiz overview report class.
  *
- * @package    quiz
- * @subpackage overview
- * @copyright  1999 onwards Martin Dougiamas and others {@link http://moodle.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_overview
+ * @copyright 1999 onwards Martin Dougiamas and others {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -34,8 +33,8 @@ require_once($CFG->dirroot . '/mod/quiz/report/overview/overview_table.php');
 /**
  * Quiz report subclass for the overview (grades) report.
  *
- * @copyright  1999 onwards Martin Dougiamas and others {@link http://moodle.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 1999 onwards Martin Dougiamas and others {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_overview_report extends quiz_attempt_report {
 
diff --git a/mod/quiz/report/overview/version.php b/mod/quiz/report/overview/version.php
index 6f6ffc379ff..50d7ececeb9 100644
--- a/mod/quiz/report/overview/version.php
+++ b/mod/quiz/report/overview/version.php
@@ -17,10 +17,9 @@
 /**
  * Quiz overview report version information.
  *
- * @package    quiz
- * @subpackage overview
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_overview
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/mod/quiz/report/reportlib.php b/mod/quiz/report/reportlib.php
index 0fdddfa0465..b7944ece93a 100644
--- a/mod/quiz/report/reportlib.php
+++ b/mod/quiz/report/reportlib.php
@@ -17,10 +17,9 @@
 /**
  * Helper functions for the quiz reports.
  *
- * @package    mod
- * @subpackage quiz
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   mod_quiz
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
diff --git a/mod/quiz/report/responses/lang/en/quiz_responses.php b/mod/quiz/report/responses/lang/en/quiz_responses.php
index baa938dcb8d..997703cf78a 100644
--- a/mod/quiz/report/responses/lang/en/quiz_responses.php
+++ b/mod/quiz/report/responses/lang/en/quiz_responses.php
@@ -17,13 +17,11 @@
 /**
  * Strings for component 'quiz_responses', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package    quiz
- * @subpackage responses
- * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_responses
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 $string['cannotloadoptions'] = 'Could not load question options';
 $string['include'] = 'Include';
 $string['pagesize'] = 'Page size';
diff --git a/mod/quiz/report/responses/report.php b/mod/quiz/report/responses/report.php
index 9467e5651cd..e58fc70c875 100644
--- a/mod/quiz/report/responses/report.php
+++ b/mod/quiz/report/responses/report.php
@@ -17,10 +17,9 @@
 /**
  * This file defines the quiz responses report class.
  *
- * @package    quiz
- * @subpackage responses
- * @copyright  2006 Jean-Michel Vedrine
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_responses
+ * @copyright 2006 Jean-Michel Vedrine
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -42,8 +41,8 @@ require_once($CFG->dirroot . '/mod/quiz/report/responses/responses_table.php');
  * Like the overview report, there are options for showing students with/without
  * attempts, and for deleting selected attempts.
  *
- * @copyright  1999 onwards Martin Dougiamas and others {@link http://moodle.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 1999 onwards Martin Dougiamas and others {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_responses_report extends quiz_attempt_report {
 
diff --git a/mod/quiz/report/responses/responses_table.php b/mod/quiz/report/responses/responses_table.php
index ef16998e33d..b3d0ed64ba5 100644
--- a/mod/quiz/report/responses/responses_table.php
+++ b/mod/quiz/report/responses/responses_table.php
@@ -17,10 +17,9 @@
 /**
  * This file defines the quiz responses report class.
  *
- * @package    quiz
- * @subpackage responses
- * @copyright  2008 Jean-Michel Vedrine
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_responses
+ * @copyright 2008 Jean-Michel Vedrine
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -32,8 +31,8 @@ require_once($CFG->dirroot . '/mod/quiz/report/attemptsreport_table.php');
 /**
  * This is a table subclass for displaying the quiz responses report.
  *
- * @copyright  2008 Jean-Michel Vedrine
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2008 Jean-Michel Vedrine
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_responses_table extends quiz_attempt_report_table {
 
diff --git a/mod/quiz/report/responses/responsessettings_form.php b/mod/quiz/report/responses/responsessettings_form.php
index 9eac16a7fac..e100c042d67 100644
--- a/mod/quiz/report/responses/responsessettings_form.php
+++ b/mod/quiz/report/responses/responsessettings_form.php
@@ -17,10 +17,9 @@
 /**
  * This file defines the setting form for the quiz responses report.
  *
- * @package    quiz
- * @subpackage responses
- * @copyright  2008 Jean-Michel Vedrine
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_responses
+ * @copyright 2008 Jean-Michel Vedrine
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -32,8 +31,8 @@ require_once($CFG->libdir . '/formslib.php');
 /**
  * Quiz responses report settings form.
  *
- * @copyright  2008 Jean-Michel Vedrine
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2008 Jean-Michel Vedrine
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_responses_settings_form extends moodleform {
 
diff --git a/mod/quiz/report/responses/version.php b/mod/quiz/report/responses/version.php
index 95963c3dca6..05348226791 100644
--- a/mod/quiz/report/responses/version.php
+++ b/mod/quiz/report/responses/version.php
@@ -17,10 +17,9 @@
 /**
  * Quiz responses report version information.
  *
- * @package    quiz
- * @subpackage responses
- * @copyright  2011 Tim Hunt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_responses
+ * @copyright 2011 Tim Hunt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/mod/quiz/report/simpletest/testreportlib.php b/mod/quiz/report/simpletest/testreportlib.php
index 30348f0dae8..b779b9c30f1 100644
--- a/mod/quiz/report/simpletest/testreportlib.php
+++ b/mod/quiz/report/simpletest/testreportlib.php
@@ -17,10 +17,9 @@
 /**
  * Unit tests for (some of) mod/quiz/report/reportlib.php
  *
- * @package    mod
- * @subpackage quiz
- * @copyright  2008 Jamie Pratt me@jamiep.org
- * @license    http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package   mod_quiz
+ * @copyright 2008 Jamie Pratt me@jamiep.org
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 
@@ -34,8 +33,8 @@ require_once($CFG->dirroot . '/mod/quiz/report/reportlib.php'); // Include the c
 /**
  * This class contains the test cases for the functions in reportlib.php.
  *
- * @copyright  2008 Jamie Pratt me@jamiep.org
- * @license    http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @copyright 2008 Jamie Pratt me@jamiep.org
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 class mod_quiz_reportlib_test extends UnitTestCase {
     public static $includecoverage = array('mod/quiz/report/reportlib.php');
diff --git a/mod/quiz/report/statistics/db/access.php b/mod/quiz/report/statistics/db/access.php
index 234e1694716..cadcfc3aa61 100644
--- a/mod/quiz/report/statistics/db/access.php
+++ b/mod/quiz/report/statistics/db/access.php
@@ -17,9 +17,9 @@
 /**
  * Capability definitions for the quiz statistics report.
  *
- * @package    quiz_statistics
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/mod/quiz/report/statistics/db/install.php b/mod/quiz/report/statistics/db/install.php
index 24ab53f04e2..4a15c7d6c03 100644
--- a/mod/quiz/report/statistics/db/install.php
+++ b/mod/quiz/report/statistics/db/install.php
@@ -16,10 +16,9 @@
 
 /**
  * Post-install script for the quiz statistics report.
- * @package    quiz
- * @subpackage statistics
- * @copyright  2010 Petr Skoda (http://skodak.org)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2010 Petr Skoda (http://skodak.org)
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
diff --git a/mod/quiz/report/statistics/db/upgrade.php b/mod/quiz/report/statistics/db/upgrade.php
index 97762e5a273..487ce485b09 100644
--- a/mod/quiz/report/statistics/db/upgrade.php
+++ b/mod/quiz/report/statistics/db/upgrade.php
@@ -17,10 +17,9 @@
 /**
  * Post-install script for the quiz statistics report.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
diff --git a/mod/quiz/report/statistics/lang/en/quiz_statistics.php b/mod/quiz/report/statistics/lang/en/quiz_statistics.php
index 1ca0487d5ef..24db6f10127 100644
--- a/mod/quiz/report/statistics/lang/en/quiz_statistics.php
+++ b/mod/quiz/report/statistics/lang/en/quiz_statistics.php
@@ -17,13 +17,11 @@
 /**
  * Strings for component 'quiz_statistics', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 $string['actualresponse'] = 'Actual response';
 $string['allattempts'] = 'all attempts';
 $string['allattemptsavg'] = 'Average grade of all attempts';
diff --git a/mod/quiz/report/statistics/lib.php b/mod/quiz/report/statistics/lib.php
index 34026f851f4..484b5a7c886 100644
--- a/mod/quiz/report/statistics/lib.php
+++ b/mod/quiz/report/statistics/lib.php
@@ -17,10 +17,9 @@
 /**
  * Standard plugin entry points of the quiz statistics report.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2011 The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2011 The Open University
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
diff --git a/mod/quiz/report/statistics/qstats.php b/mod/quiz/report/statistics/qstats.php
index 857686eb00c..4c77fd072bc 100644
--- a/mod/quiz/report/statistics/qstats.php
+++ b/mod/quiz/report/statistics/qstats.php
@@ -17,10 +17,9 @@
 /**
  * Quiz statistics report calculations class.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -30,8 +29,8 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * This class has methods to compute the question statistics from the raw data.
  *
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_statistics_question_stats {
     public $questions;
diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php
index 74c0a7a2550..815aef0d7ba 100644
--- a/mod/quiz/report/statistics/report.php
+++ b/mod/quiz/report/statistics/report.php
@@ -17,10 +17,9 @@
 /**
  * Quiz statistics report class.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -38,8 +37,8 @@ require_once($CFG->dirroot . '/mod/quiz/report/statistics/responseanalysis.php')
  * a quiz, compared to the whole quiz. It also provides a drill-down to more
  * detailed information about each question.
  *
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_statistics_report extends quiz_default_report {
     /** @var integer Time after which statistics are automatically recomputed. */
diff --git a/mod/quiz/report/statistics/responseanalysis.php b/mod/quiz/report/statistics/responseanalysis.php
index 1c030f429c4..9239124c688 100644
--- a/mod/quiz/report/statistics/responseanalysis.php
+++ b/mod/quiz/report/statistics/responseanalysis.php
@@ -18,10 +18,9 @@
  * This file contains the code to analyse all the responses to a particular
  * question.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2010 The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2010 The Open University
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -32,8 +31,8 @@ defined('MOODLE_INTERNAL') || die();
  * This class can store and compute the analysis of the responses to a particular
  * question.
  *
- * @copyright  2010 The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2010 The Open University
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_statistics_response_analyser {
     /** @var object the data from the database that defines the question. */
diff --git a/mod/quiz/report/statistics/simpletest/test_qstats.php b/mod/quiz/report/statistics/simpletest/test_qstats.php
index 185ea2f5df5..386251ea360 100644
--- a/mod/quiz/report/statistics/simpletest/test_qstats.php
+++ b/mod/quiz/report/statistics/simpletest/test_qstats.php
@@ -17,10 +17,9 @@
 /**
  * Unit tests for (some of) mod/quiz/report/statistics/qstats.php.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -52,8 +51,8 @@ class testable_quiz_statistics_question_stats extends quiz_statistics_question_s
 /**
  * Unit tests for (some of) quiz_statistics_question_stats.
  *
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_statistics_question_stats_test extends UnitTestCase {
     public static $includecoverage = array('mod/quiz/report/reportlib.php');
diff --git a/mod/quiz/report/statistics/statistics_form.php b/mod/quiz/report/statistics/statistics_form.php
index 4a1ecb5f048..a583ea915b1 100644
--- a/mod/quiz/report/statistics/statistics_form.php
+++ b/mod/quiz/report/statistics/statistics_form.php
@@ -17,10 +17,9 @@
 /**
  * Quiz statistics settings form definition.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -32,8 +31,8 @@ require_once($CFG->libdir . '/formslib.php');
 /**
  * This is the settings form for the quiz statistics report.
  *
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_statistics_settings_form extends moodleform {
     protected function definition() {
diff --git a/mod/quiz/report/statistics/statistics_graph.php b/mod/quiz/report/statistics/statistics_graph.php
index 8a1569feba1..c7d7852fa05 100644
--- a/mod/quiz/report/statistics/statistics_graph.php
+++ b/mod/quiz/report/statistics/statistics_graph.php
@@ -23,10 +23,9 @@
  * It plots a bar graph showing certain question statistics plotted against
  * question number.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
diff --git a/mod/quiz/report/statistics/statistics_question_table.php b/mod/quiz/report/statistics/statistics_question_table.php
index 269adb5b1b5..133ee274bcb 100644
--- a/mod/quiz/report/statistics/statistics_question_table.php
+++ b/mod/quiz/report/statistics/statistics_question_table.php
@@ -17,10 +17,9 @@
 /**
  * Quiz statistics report, table for showing statistics about a particular question.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -37,8 +36,8 @@ require_once($CFG->libdir . '/tablelib.php');
  * The responses may be grouped, either by subpart of the question, or by the
  * answer they match.
  *
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_statistics_question_table extends flexible_table {
     /** @var object this question with a _stats field. */
diff --git a/mod/quiz/report/statistics/statistics_table.php b/mod/quiz/report/statistics/statistics_table.php
index 9118f3825f2..d680ab7f298 100644
--- a/mod/quiz/report/statistics/statistics_table.php
+++ b/mod/quiz/report/statistics/statistics_table.php
@@ -17,10 +17,9 @@
 /**
  * Quiz statistics report, table for showing statistics of each question in the quiz.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -33,8 +32,8 @@ require_once($CFG->libdir.'/tablelib.php');
  * This table has one row for each question in the quiz, with sub-rows when
  * random questions appear. There are columns for the various statistics.
  *
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_statistics_table extends flexible_table {
     /** @var object the quiz settings. */
diff --git a/mod/quiz/report/statistics/version.php b/mod/quiz/report/statistics/version.php
index e0675e1605b..602d68ec15f 100644
--- a/mod/quiz/report/statistics/version.php
+++ b/mod/quiz/report/statistics/version.php
@@ -17,10 +17,9 @@
 /**
  * Quiz statistics report version information.
  *
- * @package    quiz
- * @subpackage statistics
- * @copyright  2008 Jamie Pratt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   quiz_statistics
+ * @copyright 2008 Jamie Pratt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();