diff --git a/editors/demo/src/HHMI/layout/EditorElements.js b/editors/demo/src/HHMI/layout/EditorElements.js
index 9e50d1c478584ab846f4dc7fb463619280391613..65f8294b55907923cda2f6c2d467c62f43518158 100644
--- a/editors/demo/src/HHMI/layout/EditorElements.js
+++ b/editors/demo/src/HHMI/layout/EditorElements.js
@@ -326,7 +326,8 @@ export default css`
 
   .multiple-choice,
   .multiple-choice-single-correct,
-  .true-false {
+  .true-false,
+  .true-false-single-correct {
     border: 3px solid #f5f5f7;
     counter-reset: question-item-multiple;
     margin: 38px;
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/QuestionComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/QuestionComponent.js
index 1fb3cca3d7489a1a3c00529244e13dc237922a05..7f14fd96d7a80aa64e1425b767bc21ad9959620f 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/QuestionComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/QuestionComponent.js
@@ -92,7 +92,7 @@ export default ({ node, view, getPos }) => {
   const addOption = nodeId => {
     const newAnswerId = uuidv4();
     context.view.main.state.doc.descendants((editorNode, index) => {
-      if (editorNode.type.name === 'multiple_choice_single_correct') {
+      if (editorNode.type.name === 'true_false_single_correct') {
         if (editorNode.attrs.id === nodeId) {
           context.view.main.dispatch(
             context.view.main.state.tr.setSelection(
@@ -104,7 +104,7 @@ export default ({ node, view, getPos }) => {
             ),
           );
 
-          const answerOption = context.view.main.state.config.schema.nodes.multiple_choice_single_correct.create(
+          const answerOption = context.view.main.state.config.schema.nodes.true_false_single_correct.create(
             { id: newAnswerId },
             Fragment.empty,
           );
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js
index e9110f8f34ca4c96aa609c5ba83983de21910798..434a544c5d13070af63d4ba9c4e20094eca0272b 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js
@@ -41,13 +41,13 @@ const CustomSwitch = ({ node, getPos }) => {
     );
     const parentContainer = findParentOfType(
       main.state,
-      main.state.config.schema.nodes.multiple_choice_single_correct_container,
+      main.state.config.schema.nodes.true_false_single_correct_container,
     );
     let parentPosition = 0;
 
     main.state.doc.descendants((parentNode, parentPos) => {
       if (
-        parentNode.type.name === 'multiple_choice_single_correct_container' &&
+        parentNode.type.name === 'true_false_single_correct_container' &&
         parentNode.attrs.id === parentContainer.attrs.id
       ) {
         parentPosition = parentPos;
@@ -58,7 +58,7 @@ const CustomSwitch = ({ node, getPos }) => {
 
     parentContainer.descendants((element, position) => {
       if (
-        element.type.name === 'multiple_choice_single_correct' &&
+        element.type.name === 'true_false_single_correct' &&
         element.attrs.id === node.attrs.id
       ) {
         tr.setNodeMarkup(getPos(), undefined, {
@@ -66,7 +66,7 @@ const CustomSwitch = ({ node, getPos }) => {
           correct: !checked,
         });
       } else if (
-        element.type.name === 'multiple_choice_single_correct' &&
+        element.type.name === 'true_false_single_correct' &&
         element.attrs.correct
       ) {
         tr.setNodeMarkup(parentPosition + position + 1, undefined, {
@@ -95,7 +95,7 @@ const getNodes = view => {
   const allNodes = DocumentHelpers.findBlockNodes(view.state.doc);
   const multipleChoiceNodes = [];
   allNodes.forEach(node => {
-    if (node.node.type.name === 'multiple_choice_single_correct') {
+    if (node.node.type.name === 'true_false_single_correct') {
       multipleChoiceNodes.push(node);
     }
   });
diff --git a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js b/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
index 3972ed034961e816df572d57590ab42ce00913af..85e8e266cf82a3ef39f7819d57e7d1f561bd0355 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
@@ -69,7 +69,6 @@ class MultipleDropDown extends ToolGroup {
       view: { main },
     } = context;
     const { state } = view;
-    console.log(this._tools);
     const dropDownOptions = [
       {
         label: 'Multiple Choice',