diff --git a/mod/quiz/report/overview/overview_table.php b/mod/quiz/report/overview/overview_table.php
index 89214d5dbc9..3f9e77f0166 100644
--- a/mod/quiz/report/overview/overview_table.php
+++ b/mod/quiz/report/overview/overview_table.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2008 Jamie Pratt
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class quiz_report_overview_table extends quiz_attempt_report_table {
+class quiz_overview_table extends quiz_attempt_report_table {
 
     protected $regradedqs = array();
 
diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 0b82f201bb0..a85b8f00200 100644
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -128,7 +128,7 @@ class quiz_overview_report extends quiz_attempt_report {
         // Load the required questions.
         $questions = quiz_report_get_significant_questions($quiz);
 
-        $table = new quiz_report_overview_table($quiz, $this->context, $qmsubselect,
+        $table = new quiz_overview_table($quiz, $this->context, $qmsubselect,
                 $qmfilter, $attemptsmode, $groupstudents, $students, $detailedmarks,
                 $questions, $includecheckboxes, $reporturl, $displayoptions);
         $filename = quiz_report_download_filename(get_string('overviewfilename', 'quiz_overview'),
diff --git a/mod/quiz/report/responses/report.php b/mod/quiz/report/responses/report.php
index 5282d3c7074..a215f2a3dac 100644
--- a/mod/quiz/report/responses/report.php
+++ b/mod/quiz/report/responses/report.php
@@ -145,7 +145,7 @@ class quiz_responses_report extends quiz_attempt_report {
         $displaycourseshortname = format_string($COURSE->shortname, true,
                 array('context' => $displaycoursecontext));
 
-        $table = new quiz_report_responses_table($quiz, $this->context, $qmsubselect,
+        $table = new quiz_responses_table($quiz, $this->context, $qmsubselect,
                 $qmfilter, $attemptsmode, $groupstudents, $students, $questions,
                 $includecheckboxes, $reporturl, $displayoptions);
         $filename = quiz_report_download_filename(get_string('responsesfilename', 'quiz_responses'),
diff --git a/mod/quiz/report/responses/responses_table.php b/mod/quiz/report/responses/responses_table.php
index cb2a48d4a8a..f4b02bf2f1c 100644
--- a/mod/quiz/report/responses/responses_table.php
+++ b/mod/quiz/report/responses/responses_table.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2008 Jean-Michel Vedrine
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class quiz_report_responses_table extends quiz_attempt_report_table {
+class quiz_responses_table extends quiz_attempt_report_table {
 
     public function __construct($quiz, $context, $qmsubselect, $qmfilter,
             $attemptsmode, $groupstudents, $students,
diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php
index 40f15539663..3df206a2ba7 100644
--- a/mod/quiz/report/statistics/report.php
+++ b/mod/quiz/report/statistics/report.php
@@ -112,7 +112,7 @@ class quiz_statistics_report extends quiz_default_report {
         }
 
         // Set up the main table.
-        $this->table = new quiz_report_statistics_table();
+        $this->table = new quiz_statistics_table();
         if ($everything) {
             $report = get_string('completestatsfilename', 'quiz_statistics');
         } else {
@@ -364,7 +364,7 @@ class quiz_statistics_report extends quiz_default_report {
             return;
         }
 
-        $qtable = new quiz_report_statistics_question_table($question->id);
+        $qtable = new quiz_statistics_question_table($question->id);
         $exportclass = $this->table->export_class_instance();
         $qtable->export_class_instance($exportclass);
         if (!$this->table->is_downloading()) {
diff --git a/mod/quiz/report/statistics/statistics_question_table.php b/mod/quiz/report/statistics/statistics_question_table.php
index 7ac4eb82cfd..269adb5b1b5 100644
--- a/mod/quiz/report/statistics/statistics_question_table.php
+++ b/mod/quiz/report/statistics/statistics_question_table.php
@@ -40,7 +40,7 @@ require_once($CFG->libdir . '/tablelib.php');
  * @copyright  2008 Jamie Pratt
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class quiz_report_statistics_question_table extends flexible_table {
+class quiz_statistics_question_table extends flexible_table {
     /** @var object this question with a _stats field. */
     protected $questiondata;
 
diff --git a/mod/quiz/report/statistics/statistics_table.php b/mod/quiz/report/statistics/statistics_table.php
index 566da5a7118..9118f3825f2 100644
--- a/mod/quiz/report/statistics/statistics_table.php
+++ b/mod/quiz/report/statistics/statistics_table.php
@@ -36,7 +36,7 @@ require_once($CFG->libdir.'/tablelib.php');
  * @copyright  2008 Jamie Pratt
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class quiz_report_statistics_table extends flexible_table {
+class quiz_statistics_table extends flexible_table {
     /** @var object the quiz settings. */
     protected $quiz;