diff --git a/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee b/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
index 5217385d80..9b8062d60d 100644
--- a/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
@@ -316,15 +316,15 @@ describe 'MarkdownEditingDescriptor', ->
         </multiplechoiceresponse>
         
         <p>Choice checks</p>
-        <multiplechoiceresponse>
-          <choicegroup type="MultipleChoiceChecks">
+        <choiceresponse>
+          <checkboxgroup direction="vertical">
             <choice correct="false">option1 [x]</choice>
             <choice correct="true">correct</choice>
             <choice correct="true">redundant</choice>
             <choice correct="false">distractor</choice>
             <choice correct="false">no space</choice>
-          </choicegroup>
-        </multiplechoiceresponse>
+          </checkboxgroup>
+        </choiceresponse>
         
         <p>Option with multiple correct ones</p>
         
diff --git a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
index 8e5f18ef05..2bfe483a7f 100644
--- a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
@@ -213,8 +213,8 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
 
       // group check answers
       xml = xml.replace(/(^\s*\[.?\].*?$\n*)+/gm, function(match, p) {
-        var groupString = '<multiplechoiceresponse>\n';
-        groupString += '  <choicegroup type="MultipleChoiceChecks">\n';
+        var groupString = '<choiceresponse>\n';
+        groupString += '  <checkboxgroup direction="vertical">\n';
         var options = match.split('\n');
         for(var i = 0; i < options.length; i++) {
           if(options[i].length > 0) {
@@ -223,8 +223,8 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
             groupString += '    <choice correct="' + correct + '">' + value + '</choice>\n';
           }
         }
-        groupString += '  </choicegroup>\n';
-        groupString += '</multiplechoiceresponse>\n\n';
+        groupString += '  </checkboxgroup>\n';
+        groupString += '</choiceresponse>\n\n';
         return groupString;
       });