diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/model/constraint/MeetingExistsConstraint.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/model/constraint/MeetingExistsConstraint.java
index 6f1773fe06..727f8ecae3 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/model/constraint/MeetingExistsConstraint.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/model/constraint/MeetingExistsConstraint.java
@@ -16,7 +16,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Retention(RUNTIME)
 public @interface MeetingExistsConstraint {
 
-    String key() default "meetingNotFound";
+    String key() default "notFound";
     String message() default "A meeting with that ID does not exist";
     Class<?>[] groups() default {};
     Class<? extends Payload>[] payload() default {};
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/model/constraint/UserSessionConstraint.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/model/constraint/UserSessionConstraint.java
index 75b4067e70..d6b193faf7 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/model/constraint/UserSessionConstraint.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/model/constraint/UserSessionConstraint.java
@@ -16,7 +16,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Retention(RUNTIME)
 public @interface UserSessionConstraint {
 
-    String key() default "sessionMissing";
+    String key() default "missingSession";
     String message() default "Invalid session token";
     Class<?>[] groups() default {};
     Class<? extends Payload>[] payload() default {};
diff --git a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
index 551b8ef8c0..862eba2466 100755
--- a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
@@ -211,7 +211,7 @@ class JoinHandler extends Component {
       }, 'User successfully went through main.joinRouteHandler');
     } else {
 
-      if(['sessionMissing','meetingForciblyEnded','meetingNotFound'].includes(response.messageKey)) {
+      if(['missingSession','meetingForciblyEnded','notFound'].includes(response.messageKey)) {
         JoinHandler.setError('410');
         Session.set('errorMessageDescription', 'meeting_ended');
       } else if(response.messageKey == "guestDeny") {
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
index abb81d6400..beeead61d2 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -801,7 +801,7 @@ class ApiController {
     log.debug CONTROLLER_NAME + "#${API_CALL}"
 
     String respMessage = "Session not found."
-    String respMessageKey = "sessionMissing"
+    String respMessageKey = "missingSession"
     boolean reject = false;
 
     String sessionToken
@@ -1831,7 +1831,7 @@ class ApiController {
 
       if(apiCall == ValidationService.ApiCall.ENTER) {
         //Check if error exist following an order (to avoid showing guestDeny when the meeting doesn't even exist)
-        String[] enterConstraintsKeys = new String[] {"sessionMissing","meetingForciblyEnded","meetingNotFound","guestDeny"}
+        String[] enterConstraintsKeys = new String[] {"missingSession","meetingForciblyEnded","notFound","guestDeny"}
         for (String constraintKey : enterConstraintsKeys) {
           if(violations.containsKey(constraintKey)) {
             response = new AbstractMap.SimpleEntry<String, String>(constraintKey, violations.get(constraintKey))