diff --git a/question/type/gapselect/lang/en/qtype_gapselect.php b/question/type/gapselect/lang/en/qtype_gapselect.php
index 69c44865455..796874c2caa 100644
--- a/question/type/gapselect/lang/en/qtype_gapselect.php
+++ b/question/type/gapselect/lang/en/qtype_gapselect.php
@@ -23,20 +23,21 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['addinggapselect'] = 'Adding a select missing words question';
 $string['addmorechoiceblanks'] = 'Blanks for {no} more choices';
 $string['answer'] = 'Answer';
 $string['choices'] = 'Choices';
 $string['choicex'] = 'Choice {no}';
 $string['correctansweris'] = 'The correct answer is: {$a}';
-$string['editinggapselect'] = 'Editing a select missing words question';
 $string['errorblankchoice'] = 'Please check the Choices: Choice {$a} is empty.';
 $string['errormissingchoice'] = 'Please check the Question text: {$a} was not found in Choices! Only the choice numbers that exist in choices are allowed to be used a place holders.';
 $string['errornoslots'] = 'The question text must contain placeholders like [[1]] to show where the missing words go.';
 $string['errorquestiontextblank'] = 'You must enter some question text.';
-$string['gapselect'] = 'Select missing words';
-$string['gapselect_help'] = 'Type in some question text like "The [[1]] jumped over the [[2]]", then enter the possible words to go in gaps 1 and 2 underneath.';
-$string['gapselectsummary'] = 'Missing words in some text are filled in using dropdown menus.';
 $string['group'] = 'Group';
 $string['pleaseputananswerineachbox'] = 'Please put an answer in each box.';
+$string['pluginname'] = 'Select missing words';
+$string['pluginname_help'] = 'Type in some question text like "The [[1]] jumped over the [[2]]", then enter the possible words to go in gaps 1 and 2 underneath.';
+$string['pluginname_link'] = 'question/type/gapselect';
+$string['pluginnameadding'] = 'Adding a select missing words question';
+$string['pluginnameediting'] = 'Editing a select missing words question';
+$string['pluginnamesummary'] = 'Missing words in some text are filled in using dropdown menus.';
 $string['shuffle'] = 'Shuffle';
diff --git a/question/type/gapselect/simpletest/testquestiontype.php b/question/type/gapselect/simpletest/testquestiontype.php
index 4b81229978f..c3e14acd678 100644
--- a/question/type/gapselect/simpletest/testquestiontype.php
+++ b/question/type/gapselect/simpletest/testquestiontype.php
@@ -180,11 +180,11 @@ class qtype_gapselect_test extends UnitTestCase {
       <text>Gamma</text>
       <group>1</group>
     </selectoption>
-    <hint>
+    <hint format="moodle_auto_format">
       <text>Try again.</text>
       <shownumcorrect />
     </hint>
-    <hint>
+    <hint format="moodle_auto_format">
       <text>These are the first three letters of the Greek alphabet.</text>
       <shownumcorrect />
       <clearwrong />
@@ -228,7 +228,6 @@ class qtype_gapselect_test extends UnitTestCase {
                         'format' => FORMAT_MOODLE, 'files' => array()));
         $expectedq->hintshownumcorrect = array(true, true);
         $expectedq->hintclearwrong = array(false, true);
-
         $this->assert(new CheckSpecifiedFieldsExpectation($expectedq), $q);
         $this->assertEqual($expectedq->hint, $q->hint);
     }