diff --git a/editors/demo/src/HHMI/layout/EditorElements.js b/editors/demo/src/HHMI/layout/EditorElements.js
index 537e7b9f87587090aaeaba83e67cc67cae42beb9..9e50d1c478584ab846f4dc7fb463619280391613 100644
--- a/editors/demo/src/HHMI/layout/EditorElements.js
+++ b/editors/demo/src/HHMI/layout/EditorElements.js
@@ -325,7 +325,8 @@ export default css`
   /* -- Multiple Choice ---------------------------------- */
 
   .multiple-choice,
-  .multiple-choice-single-correct {
+  .multiple-choice-single-correct,
+  .true-false {
     border: 3px solid #f5f5f7;
     counter-reset: question-item-multiple;
     margin: 38px;
@@ -334,7 +335,6 @@ export default css`
 
     &:before {
       bottom: 25px;
-      content: 'Answer Group ' counter(multiple-question) '.';
       counter-increment: multiple-question;
       position: relative;
       right: 20px;
@@ -346,6 +346,32 @@ export default css`
     }
   }
 
+  .multiple-choice {
+    &:before {
+      content: 'Answer Group ' counter(multiple-question) ' (multiple choice)';
+    }
+  }
+
+  .multiple-choice-single-correct {
+    &:before {
+      content: 'Answer Group ' counter(multiple-question)
+        ' (multiple choice single correct)';
+    }
+  }
+
+  .true-false {
+    &:before {
+      content: 'Answer Group ' counter(multiple-question) ' (true/false)';
+    }
+  }
+
+  .true-false-single-correct {
+    &:before {
+      content: 'Answer Group ' counter(multiple-question)
+        ' (true/false single correct)';
+    }
+  }
+
   /* -- Fill The Gap ---------------------------------- */
 
   .fill-the-gap {
diff --git a/wax-prosemirror-services/src/TrueFalseQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/TrueFalseQuestionService/components/SwitchComponent.js
index f0db85d5a853e9a4908b0acae999c8a7779ee2a8..78879f53d0593e1fd8c21e09e9edeea954fd4486 100644
--- a/wax-prosemirror-services/src/TrueFalseQuestionService/components/SwitchComponent.js
+++ b/wax-prosemirror-services/src/TrueFalseQuestionService/components/SwitchComponent.js
@@ -54,11 +54,11 @@ const CustomSwitch = ({ node, getPos }) => {
   return (
     <StyledSwitch
       checked={checked}
-      checkedChildren="YES"
-      label="Correct?"
+      checkedChildren="True"
+      label="True/false?"
       labelPosition="left"
       onChange={handleChange}
-      unCheckedChildren="NO"
+      unCheckedChildren="False"
     />
   );
 };
@@ -67,7 +67,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') {
       multipleChoiceNodes.push(node);
     }
   });