diff --git a/question/questiontypes/datasetdependent/abstractqtype.php b/question/questiontypes/datasetdependent/abstractqtype.php
index c91903ab709..539229b6222 100644
--- a/question/questiontypes/datasetdependent/abstractqtype.php
+++ b/question/questiontypes/datasetdependent/abstractqtype.php
@@ -10,7 +10,7 @@ define("LITERAL", "1");
 define("FILE", "2");
 define("LINK", "3");
 
-class question_dataset_dependent_questiontype extends quiz_default_questiontype {
+class question_dataset_dependent_questiontype extends default_questiontype {
 
     var $virtualqtype = false;
 
diff --git a/question/questiontypes/description/questiontype.php b/question/questiontypes/description/questiontype.php
index eec8bbc1539..c8a4141195e 100644
--- a/question/questiontypes/description/questiontype.php
+++ b/question/questiontypes/description/questiontype.php
@@ -11,7 +11,7 @@
 // and it therefore often sticks to some kind of odd behaviour
 //
 
-class quiz_description_qtype extends quiz_default_questiontype {
+class quiz_description_qtype extends default_questiontype {
 
     function name() {
         return 'description';
diff --git a/question/questiontypes/essay/questiontype.php b/question/questiontypes/essay/questiontype.php
index e641ecc4ee7..8deeee2f100 100644
--- a/question/questiontypes/essay/questiontype.php
+++ b/question/questiontypes/essay/questiontype.php
@@ -5,7 +5,7 @@
 /////////////////
 
 /// QUESTION TYPE CLASS //////////////////
-class question_essay_qtype extends quiz_default_questiontype {
+class question_essay_qtype extends default_questiontype {
 
     function name() {
         return 'essay';
diff --git a/question/questiontypes/match/questiontype.php b/question/questiontypes/match/questiontype.php
index 29045ceb664..8ffdfbf7888 100644
--- a/question/questiontypes/match/questiontype.php
+++ b/question/questiontypes/match/questiontype.php
@@ -5,7 +5,7 @@
 /////////////
 
 /// QUESTION TYPE CLASS //////////////////
-class question_match_qtype extends quiz_default_questiontype {
+class question_match_qtype extends default_questiontype {
 
     function name() {
         return 'match';
diff --git a/question/questiontypes/multianswer/questiontype.php b/question/questiontypes/multianswer/questiontype.php
index f4e08373b0e..1dd24a9d80f 100644
--- a/question/questiontypes/multianswer/questiontype.php
+++ b/question/questiontypes/multianswer/questiontype.php
@@ -13,7 +13,7 @@
 ///
 
 /// QUESTION TYPE CLASS //////////////////
-class quiz_embedded_cloze_qtype extends quiz_default_questiontype {
+class quiz_embedded_cloze_qtype extends default_questiontype {
 
     function name() {
         return 'multianswer';
diff --git a/question/questiontypes/multichoice/questiontype.php b/question/questiontypes/multichoice/questiontype.php
index a0476f17e21..17b4218e766 100644
--- a/question/questiontypes/multichoice/questiontype.php
+++ b/question/questiontypes/multichoice/questiontype.php
@@ -11,7 +11,7 @@
 /// question type embeddable within a multianswer (cloze) question
 ///
 
-class question_multichoice_qtype extends quiz_default_questiontype {
+class question_multichoice_qtype extends default_questiontype {
 
     function name() {
         return 'multichoice';
diff --git a/question/questiontypes/questiontype.php b/question/questiontypes/questiontype.php
index 648944551ae..e833a60306a 100644
--- a/question/questiontypes/questiontype.php
+++ b/question/questiontypes/questiontype.php
@@ -13,7 +13,7 @@
 
 /// Question type class //////////////////////////////////////////////
 
-class quiz_default_questiontype {
+class default_questiontype {
 
     /**
     * Name of the question type
diff --git a/question/questiontypes/random/questiontype.php b/question/questiontypes/random/questiontype.php
index 697a6c43155..77e8e7547e2 100644
--- a/question/questiontypes/random/questiontype.php
+++ b/question/questiontypes/random/questiontype.php
@@ -5,7 +5,7 @@
 //////////////
 
 /// QUESTION TYPE CLASS //////////////////
-class quiz_random_qtype extends quiz_default_questiontype {
+class quiz_random_qtype extends default_questiontype {
 
     var $excludedtypes = array(RANDOM, RANDOMSAMATCH, ESSAY, DESCRIPTION);
 
diff --git a/question/questiontypes/rqp/questiontype.php b/question/questiontypes/rqp/questiontype.php
index 8b18c7982d5..4244cd574d6 100644
--- a/question/questiontypes/rqp/questiontype.php
+++ b/question/questiontypes/rqp/questiontype.php
@@ -16,7 +16,7 @@ require_once($CFG->dirroot . '/question/questiontypes/rqp/remote.php');
 /**
 * RQP question type class
 */
-class question_rqp_qtype extends quiz_default_questiontype {
+class question_rqp_qtype extends default_questiontype {
 
     /**
     * Name of the rqp question type
diff --git a/question/questiontypes/shortanswer/questiontype.php b/question/questiontypes/shortanswer/questiontype.php
index d20b31f44f8..6c9628d61bc 100644
--- a/question/questiontypes/shortanswer/questiontype.php
+++ b/question/questiontypes/shortanswer/questiontype.php
@@ -11,7 +11,7 @@
 /// question type embeddable within a multianswer (cloze) question
 ///
 
-class question_shortanswer_qtype extends quiz_default_questiontype {
+class question_shortanswer_qtype extends default_questiontype {
 
     function name() {
         return 'shortanswer';
diff --git a/question/questiontypes/truefalse/questiontype.php b/question/questiontypes/truefalse/questiontype.php
index 07775d1cc6c..57ffb74015b 100644
--- a/question/questiontypes/truefalse/questiontype.php
+++ b/question/questiontypes/truefalse/questiontype.php
@@ -5,7 +5,7 @@
 /////////////////
 
 /// QUESTION TYPE CLASS //////////////////
-class question_truefalse_qtype extends quiz_default_questiontype {
+class question_truefalse_qtype extends default_questiontype {
 
     function name() {
         return 'truefalse';