diff --git a/src/main/java/org/olat/course/assessment/bulk/_content/overview.html b/src/main/java/org/olat/course/assessment/bulk/_content/overview.html
index 4cced03a60514ef0d7f7dd21096d79b33a6a9ae1..82773d1aa112f64731d7bf2988fb82e60db48376 100644
--- a/src/main/java/org/olat/course/assessment/bulk/_content/overview.html
+++ b/src/main/java/org/olat/course/assessment/bulk/_content/overview.html
@@ -1,4 +1,4 @@
-$r.contextHelpWithWrapper("Using Course Tools#_bulkassessment")
+$r.contextHelpWithWrapper("... create a bulk assessment for submission tasks")
 <h2><i class="o_icon o_icon_group"> </i> $r.translate("bulk.wizard.title")</h2>
 <p>$r.translate("bulk.wizard.desc")</p>
 <p>$r.translate("bulk.wizard.start")</p>
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentSectionOptionsEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentSectionOptionsEditorController.java
index 9b67a4ecb88f7a86092aec572e7bb74c816f131c..09187a3e7c75e1b60b5d8bc9fb650076951f8b72 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentSectionOptionsEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentSectionOptionsEditorController.java
@@ -88,7 +88,7 @@ public class AssessmentSectionOptionsEditorController extends FormBasicControlle
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		formLayout.setElementCssClass("o_sel_assessment_section_options");
-		setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_section");
+		setFormContextHelp("Configure tests#testeditor_section");
 		if(!editable) {
 			setFormWarning("warning.alien.assessment.test");
 		}
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestOptionsEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestOptionsEditorController.java
index 7bac7c08b0ec69d79faf3f8aadf3451ad76a6780..d80dda49c84d5891fe43db80ef650fb48482f26c 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestOptionsEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestOptionsEditorController.java
@@ -71,7 +71,7 @@ public class AssessmentTestOptionsEditorController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_test");
+		setFormContextHelp("Configure tests");
 		
 		String title = assessmentTest.getTitle();
 		titleEl = uifactory.addTextElement("title", "form.metadata.title", 255, title, formLayout);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/DrawingEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/DrawingEditorController.java
index 63e4776ef40dc1294dcda9230ee2b595c3e3946f..06a945ed7b55512ebd5862566af20795ebfddbbc 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/DrawingEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/DrawingEditorController.java
@@ -112,7 +112,7 @@ public class DrawingEditorController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_drawing");
+		setFormContextHelp("Configure test questions");
 		
 		titleEl = uifactory.addTextElement("title", "form.imd.title", -1, itemBuilder.getTitle(), formLayout);
 		titleEl.setElementCssClass("o_sel_assessment_item_title");
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/EssayEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/EssayEditorController.java
index 451fcab5a07a1027db410662dddbdca72aedf48c..bde5a2dd3f39088978f480f61e55e0d084e6c1d3 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/EssayEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/EssayEditorController.java
@@ -80,7 +80,7 @@ public class EssayEditorController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_freetext");
+		setFormContextHelp("Configure test questions");
 		
 		titleEl = uifactory.addTextElement("title", "form.imd.title", -1, itemBuilder.getTitle(), formLayout);
 		titleEl.setElementCssClass("o_sel_assessment_item_title");
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBEditorController.java
index 1afbb0ca03d2d7d303a3f80ffc1d5b716279cb52..19741c22651cb7cccccb530e17927ffc563549d9 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBEditorController.java
@@ -96,6 +96,8 @@ public class FIBEditorController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		setFormContextHelp("Configure test questions");
+		
 		titleEl = uifactory.addTextElement("title", "form.imd.title", -1, itemBuilder.getTitle(), formLayout);
 		titleEl.setElementCssClass("o_sel_assessment_item_title");
 		titleEl.setMandatory(true);
@@ -123,11 +125,6 @@ public class FIBEditorController extends FormBasicController {
 				hasNumericals = true;
 			}
 		}
-		if(hasNumericals) {
-			setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_ni");
-		} else {
-			setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_fib");
-		}
 		richTextConfig.enableQTITools(true, true, false);
 		
 		// Submit Button
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotEditorController.java
index 779bf90b2df6c03714ab5c6c20668bb86232f451..b8fdfd28381830f146eb58f3c0e0b4e4597dd083 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotEditorController.java
@@ -143,7 +143,7 @@ public class HotspotEditorController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_hotspot");
+		setFormContextHelp("Configure test questions");
 		
 		titleEl = uifactory.addTextElement("title", "form.imd.title", -1, itemBuilder.getTitle(), formLayout);
 		titleEl.setElementCssClass("o_sel_assessment_item_title");
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HottextEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HottextEditorController.java
index 937d0d05b7c907ca03d4e01acb8b822e7167ab16..7f6bc33bef0faa38be54f5a667ede30b66b5f205 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HottextEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HottextEditorController.java
@@ -78,7 +78,8 @@ public class HottextEditorController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_hot");
+		setFormContextHelp("Configure test questions");
+	
 		titleEl = uifactory.addTextElement("title", "form.imd.title", -1, itemBuilder.getTitle(), formLayout);
 		titleEl.setElementCssClass("o_sel_assessment_item_title");
 		titleEl.setMandatory(true);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/KPrimEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/KPrimEditorController.java
index c92c183648ec58a331c62d76579a5915ec09c028..bb78ffdf1686be5dcf462141634d16a942662150 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/KPrimEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/KPrimEditorController.java
@@ -101,7 +101,7 @@ public class KPrimEditorController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		FormLayoutContainer metadata = FormLayoutContainer.createDefaultFormLayout("metadata", getTranslator());
-		metadata.setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_kprim");
+		metadata.setFormContextHelp("Configure test questions");
 		metadata.setRootForm(mainForm);
 		formLayout.add(metadata);
 		formLayout.add("metadata", metadata);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java
index 81dc605e408eb72ba82644f886af8dbbc5ffc2c8..5c0f56bb12ac83d7477e72cece430ef4c78ad5b4 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java
@@ -121,11 +121,7 @@ public class MatchEditorController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		FormLayoutContainer metadata = FormLayoutContainer.createDefaultFormLayout("metadata", getTranslator());
-		if (itemBuilder.getQuestionType() == QTI21QuestionType.matchdraganddrop) {
-			metadata.setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_draganddrop");
-		} else {
-			metadata.setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_match");
-		}
+		metadata.setFormContextHelp("Configure test questions");
 		metadata.setRootForm(mainForm);
 		formLayout.add(metadata);
 		formLayout.add("metadata", metadata);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MultipleChoiceEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MultipleChoiceEditorController.java
index 0bb1a9086c2190c933e99b4b859cfd8607cf422d..3564403ca7d65a4093c3a9111dcb58aba4e4ed68 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MultipleChoiceEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MultipleChoiceEditorController.java
@@ -111,7 +111,7 @@ public class MultipleChoiceEditorController extends FormBasicController implemen
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		FormLayoutContainer metadata = FormLayoutContainer.createDefaultFormLayout_2_10("metadata", getTranslator());
-		metadata.setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_mc");
+		metadata.setFormContextHelp("Configure test questions");
 		metadata.setRootForm(mainForm);
 		formLayout.add(metadata);
 		formLayout.add("metadata", metadata);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/SingleChoiceEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/SingleChoiceEditorController.java
index 8bcc458fc2cf24ae695c6d963b41d12d7378099f..4033edadd1bcbad456b115f003fc9fee0772a086 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/SingleChoiceEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/SingleChoiceEditorController.java
@@ -110,7 +110,7 @@ public class SingleChoiceEditorController extends FormBasicController implements
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		FormLayoutContainer metadata = FormLayoutContainer.createDefaultFormLayout_2_10("metadata", getTranslator());
-		metadata.setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_sc");
+		metadata.setFormContextHelp("Configure test questions");
 		metadata.setRootForm(mainForm);
 		formLayout.add(metadata);
 		formLayout.add("metadata", metadata);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/TrueFalseEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/TrueFalseEditorController.java
index 86917fb7bbe599deceabc105e5a8d03550789e01..3c414afd1cfe28b6f50fdcbcc046678c39de9088 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/TrueFalseEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/TrueFalseEditorController.java
@@ -111,11 +111,7 @@ public class TrueFalseEditorController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		FormLayoutContainer metadata = FormLayoutContainer.createDefaultFormLayout("metadata", getTranslator());
-		if (itemBuilder.getQuestionType() == QTI21QuestionType.matchdraganddrop) {
-			metadata.setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_draganddrop");
-		} else {
-			metadata.setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_match");
-		}
+		metadata.setFormContextHelp("Configure test questions");
 		metadata.setRootForm(mainForm);
 		formLayout.add(metadata);
 		formLayout.add("metadata", metadata);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/UploadEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/UploadEditorController.java
index 4a5b2cbfaefa7a66379c8f063c4b961172955b27..dd376a3555386d9db94c2411c32fc8384a0d5051 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/UploadEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/UploadEditorController.java
@@ -77,7 +77,7 @@ public class UploadEditorController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_fileupload");
+		setFormContextHelp("Configure test questions");
 		
 		titleEl = uifactory.addTextElement("title", "form.imd.title", -1, itemBuilder.getTitle(), formLayout);
 		titleEl.setElementCssClass("o_sel_assessment_item_title");