diff --git a/bbb-lti/grails-app/controllers/ToolController.groovy b/bbb-lti/grails-app/controllers/ToolController.groovy
index 0584815a20abee65a6fa2a3675d38213d93c8d0c..5ff8ce97f43d979e90279aba67faec4ad0b4b6a4 100644
--- a/bbb-lti/grails-app/controllers/ToolController.groovy
+++ b/bbb-lti/grails-app/controllers/ToolController.groovy
@@ -66,7 +66,7 @@ class ToolController {
                         result = doJoinMeeting(params)
                     } else {
                         log.debug  "LTI service running in extended mode."
-                        if ( !Boolean.parseBoolean(params.get(Parameter.CUSTOM_BBB_RECORD)) ) {
+                        if ( !Boolean.parseBoolean(params.get(Parameter.CUSTOM_RECORD)) ) {
                             log.debug  "No bbb_record parameter was sent; immediately redirecting to BBB session!"
                             result = doJoinMeeting(params)
                         }
@@ -230,8 +230,8 @@ class ToolController {
         log.debug "Localized default welcome message: [" + welcome + "]"
 
 		// Check for [custom_]welcome parameter being passed from the LTI
-		if (params.get(Parameter.CUSTOM_BBB_WELCOME) != null) {
-			welcome = params.get(Parameter.CUSTOM_BBB_WELCOME)
+		if (params.get(Parameter.CUSTOM_WELCOME) != null) {
+			welcome = params.get(Parameter.CUSTOM_WELCOME)
 			log.debug "Overriding default welcome message with: [" + welcome + "]"
 		}
            
diff --git a/bbb-lti/grails-app/services/BigbluebuttonService.groovy b/bbb-lti/grails-app/services/BigbluebuttonService.groovy
index acbfea0b3f22155e59b846c980ee2373384c32a1..8bab7e24006ffb81fdc36060446d6c17e3dcb85c 100644
--- a/bbb-lti/grails-app/services/BigbluebuttonService.groovy
+++ b/bbb-lti/grails-app/services/BigbluebuttonService.groovy
@@ -91,9 +91,9 @@ class BigbluebuttonService {
         String record = false
         Integer duration = 0
         if( "extended".equals(mode) ){
-            voiceBridge = getValidatedBBBVoiceBridge(params.get(Parameter.CUSTOM_BBB_VOICEBRIDGE))
-            record = getValidatedBBBRecord(params.get(Parameter.CUSTOM_BBB_RECORD))
-            duration = getValidatedBBBDuration(params.get(Parameter.CUSTOM_BBB_DURATION))
+            voiceBridge = getValidatedBBBVoiceBridge(params.get(Parameter.CUSTOM_VOICEBRIDGE))
+            record = getValidatedBBBRecord(params.get(Parameter.CUSTOM_RECORD))
+            duration = getValidatedBBBDuration(params.get(Parameter.CUSTOM_DURATION))
         }
         
         String[] values = [meetingName, courseTitle]
diff --git a/bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java b/bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java
index 8bdaaf8d25cc130656cf5f027f421b7cce65a428..9f2429ceb9b08a253e0db78c86ad65db47f9ceb0 100644
--- a/bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java
+++ b/bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java
@@ -49,10 +49,11 @@ public class Parameter {
     public static final String CUSTOM_USER_ID = "custom_lis_person_sourcedid";
     
     //BigBlueButton custom parameters
-    public static final String CUSTOM_BBB_RECORD = "custom_bbb_recording";
-    public static final String CUSTOM_BBB_VOICEBRIDGE = "custom_bbb_voicebridge";
-    public static final String CUSTOM_BBB_DURATION = "custom_bbb_duration";
-    public static final String CUSTOM_BBB_WELCOME = "custom_bbb_welcome";
+    public static final String CUSTOM_RECORD = "custom_record";
+    public static final String CUSTOM_VOICEBRIDGE = "custom_voicebridge";
+    public static final String CUSTOM_DURATION = "custom_duration";
+    public static final String CUSTOM_WELCOME = "custom_welcome";
+    public static final String CUSTOM_MODE = "custom_mode";
     
     ///BigBlueButton internal parameters
     public static final String BBB_RECORDING_ID = "bbb_recording_id";