diff --git a/mod/quiz/config.html b/mod/quiz/config.html
index b0bb8957b93..80bc8358353 100644
--- a/mod/quiz/config.html
+++ b/mod/quiz/config.html
@@ -170,11 +170,11 @@
 </tr>
 
 <tr valign="top">
-  <td align="right"><b><?php print_string("shuffleanswers", "quiz") ?>:</b></td>
+  <td align="right"><b><?php print_string("shufflewithin", "quiz") ?>:</b></td>
   <td>
     <?php
        choose_from_menu ($yesnooptions, "shuffleanswers", $form->shuffleanswers, "", "", "");
-       helpbutton("attempts", get_string("attemptsallowed","quiz"), "quiz");
+       helpbutton("shufflewithin", get_string("shufflewithin","quiz"), "quiz");
     ?>
   </td>
   <td align="center">
diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index 88019759acd..ef2f0d558f0 100644
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -231,11 +231,11 @@
 
 <?php if (!$CFG->quiz_fix_shuffleanswers) { ?>
     <tr valign="top">
-        <td align="right"><b><?php print_string("shuffleanswers", "quiz") ?>:</b></td>
+        <td align="right"><b><?php print_string("shufflewithin", "quiz") ?>:</b></td>
          <td align="left">
         <?php
             choose_from_menu($yesnooptions, "shuffleanswers", "$form->shuffleanswers", "");
-            helpbutton("shuffleanswers", get_string("shuffleanswers","quiz"), "quiz");
+            helpbutton("shufflewithin", get_string("shufflewithin","quiz"), "quiz");
          ?>
         </td>
     </tr>
@@ -485,11 +485,11 @@
 
 <?php if ($CFG->quiz_fix_shuffleanswers) { ?>
     <tr valign="top">
-        <td align="right"><b><?php print_string("shuffleanswers", "quiz") ?>:</b></td>
+        <td align="right"><b><?php print_string("shufflewithin", "quiz") ?>:</b></td>
          <td align="left">
         <?php
             choose_from_menu($yesnooptions, "shuffleanswers", "$form->shuffleanswers", "");
-            helpbutton("shuffleanswers", get_string("shuffleanswers","quiz"), "quiz");
+            helpbutton("shufflewithin", get_string("shufflewithin","quiz"), "quiz");
          ?>
         </td>
     </tr>
diff --git a/mod/quiz/questiontypes/match/editquestion.php b/mod/quiz/questiontypes/match/editquestion.php
index 38769615c2e..39a01781e0e 100644
--- a/mod/quiz/questiontypes/match/editquestion.php
+++ b/mod/quiz/questiontypes/match/editquestion.php
@@ -6,7 +6,7 @@
             $oldsubquestions = get_records_list("quiz_match_sub", "id", $options->subquestions);
         }
     } else {
-        $options->shuffleanswers = 0;
+        $options->shuffleanswers = 1;
     }
 
     $subquestions = array();
diff --git a/mod/quiz/questiontypes/match/match.html b/mod/quiz/questiontypes/match/match.html
index bbe525a61f4..ab5a6022df3 100644
--- a/mod/quiz/questiontypes/match/match.html
+++ b/mod/quiz/questiontypes/match/match.html
@@ -84,11 +84,11 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><b><?php print_string("shuffleanswers", "quiz") ?>:</b></td>
+    <td align="right"><b><?php print_string("shuffle", "quiz") ?>:</b></td>
      <td align="left">
     <?php
         choose_from_menu($yesnooptions, "shuffleanswers", "$options->shuffleanswers", "");
-        helpbutton("shuffleanswers", get_string("shuffleanswers","quiz"), "quiz");
+        helpbutton("matchshuffle", get_string("shuffle","quiz"), "quiz");
      ?>
     </td>
 </tr>
diff --git a/mod/quiz/questiontypes/multichoice/editquestion.php b/mod/quiz/questiontypes/multichoice/editquestion.php
index 11884d13f1c..6147f893ea2 100644
--- a/mod/quiz/questiontypes/multichoice/editquestion.php
+++ b/mod/quiz/questiontypes/multichoice/editquestion.php
@@ -4,7 +4,7 @@
         $options = get_record("quiz_multichoice", "question", $question->id);
     } else {
         $options->single = 1;
-        $options->shuffleanswers = 0;
+        $options->shuffleanswers = 1;
     }
     if (!empty($options->answers)) {
         $answersraw = get_records_list("quiz_answers", "id", $options->answers);
diff --git a/mod/quiz/questiontypes/multichoice/multichoice.html b/mod/quiz/questiontypes/multichoice/multichoice.html
index 7c7dae862a8..e401a957dfb 100644
--- a/mod/quiz/questiontypes/multichoice/multichoice.html
+++ b/mod/quiz/questiontypes/multichoice/multichoice.html
@@ -97,7 +97,7 @@
      <td align="left">
     <?php
         choose_from_menu($yesnooptions, "shuffleanswers", "$options->shuffleanswers", "");
-        helpbutton("shuffleanswers", get_string("shuffleanswers","quiz"), "quiz");
+        helpbutton("multichoiceshuffle", get_string("shuffleanswers","quiz"), "quiz");
      ?>
     </td>
 </tr>
diff --git a/mod/quiz/questiontypes/randomsamatch/editquestion.php b/mod/quiz/questiontypes/randomsamatch/editquestion.php
index 1df70792efe..c6f6dbfc27f 100644
--- a/mod/quiz/questiontypes/randomsamatch/editquestion.php
+++ b/mod/quiz/questiontypes/randomsamatch/editquestion.php
@@ -3,7 +3,7 @@
         $options = get_record("quiz_randomsamatch", "question", $question->id);
     } else {
         $options->choose = "";
-        $options->shuffleanswers = 0;
+        $options->shuffleanswers = 1;
     }
     $saquestions = $QUIZ_QTYPES[RANDOMSAMATCH]->get_sa_candidates($category->id);
     $numberavailable = count($saquestions);
diff --git a/mod/quiz/questiontypes/randomsamatch/randomsamatch.html b/mod/quiz/questiontypes/randomsamatch/randomsamatch.html
index 589ddcb2c6d..8244731cdff 100644
--- a/mod/quiz/questiontypes/randomsamatch/randomsamatch.html
+++ b/mod/quiz/questiontypes/randomsamatch/randomsamatch.html
@@ -95,11 +95,11 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><b><?php print_string("shuffleanswers", "quiz") ?>:</b></td>
+    <td align="right"><b><?php print_string("shuffle", "quiz") ?>:</b></td>
      <td align="left">
     <?php
         choose_from_menu($yesnooptions, "shuffleanswers", "$options->shuffleanswers", "");
-        helpbutton("shuffleanswers", get_string("shuffleanswers","quiz"), "quiz");
+        helpbutton("matchshuffle", get_string("shuffle","quiz"), "quiz");
      ?>
     </td>
 </tr>