diff --git a/editors/demo/src/HHMI/config/config.js b/editors/demo/src/HHMI/config/config.js
index 942f33dff3aed5badbae8072176bb7d2b10308d7..6bccceac3d3174a198098fb70c9dca1d896ce8a1 100644
--- a/editors/demo/src/HHMI/config/config.js
+++ b/editors/demo/src/HHMI/config/config.js
@@ -21,7 +21,7 @@ import {
   EditorInfoToolGroupServices,
   BottomInfoService,
   MultipleChoiceQuestionService,
-  QuestionsToolGroupService,
+  MultipleChoiceToolGroupService,
 } from 'wax-prosemirror-services';
 
 import { DefaultSchema } from 'wax-prosemirror-utilities';
@@ -51,7 +51,7 @@ export default {
         'Lists',
         'Images',
         'Tables',
-        'Questions',
+        'MultipleChoice',
         'FillTheGap',
         'FullScreen',
       ],
@@ -72,7 +72,7 @@ export default {
     new FillTheGapQuestionService(),
     new FillTheGapToolGroupService(),
     new MultipleChoiceQuestionService(),
-    new QuestionsToolGroupService(),
+    new MultipleChoiceToolGroupService(),
     new ListsService(),
     new LinkService(),
     new InlineAnnotationsService(),
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index 0ea0ee27c545724d96c6ff5edc46a48556521b24..0e2ade71e55640153a98817d1933aa2cf3fdea24 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -70,4 +70,4 @@ export { default as TrackOptionsToolGroupService } from './src/WaxToolGroups/Tra
 export { default as TrackCommentOptionsToolGroupService } from './src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService';
 export { default as CustomTagInlineToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagInlineToolGroupService/CustomTagInlineToolGroupService';
 export { default as CustomTagBlockToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagBlockToolGroupService/CustomTagBlockToolGroupService';
-export { default as QuestionsToolGroupService } from './src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService';
+export { default as MultipleChoiceToolGroupService } from './src/WaxToolGroups/MultipleChoiceToolGroupService/MultipleChoiceToolGroupService';
diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/Questions.js b/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/Questions.js
deleted file mode 100644
index 8b9b9eada607a08c6bc9937f5257a696b57d98af..0000000000000000000000000000000000000000
--- a/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/Questions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { injectable, inject } from 'inversify';
-import ToolGroup from '../../lib/ToolGroup';
-
-@injectable()
-class Questions extends ToolGroup {
-  tools = [];
-  constructor(@inject('MultipleChoiceQuestion') multipleChoiceQuestion) {
-    super();
-    this.tools = [multipleChoiceQuestion];
-  }
-}
-
-export default Questions;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService.js
deleted file mode 100644
index f5b68c449e652bc226bad710d132b21c55ec9277..0000000000000000000000000000000000000000
--- a/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Service from '../../Service';
-import Questions from './Questions';
-
-class QuestionsToolGroupService extends Service {
-  register() {
-    this.container.bind('Questions').to(Questions);
-  }
-}
-
-export default QuestionsToolGroupService;