diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 09b7ddc8ee9..ce84e697109 100644
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -23,8 +23,8 @@ login=15
 logout=15
 
 ### SAML SSO/SLO commands
-samlsso=15
-samlslo=15
+samlSso=15
+samlSlo=15
 getSPMetadata=15
 
 ### Account commands
diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java
index 0f316a8a763..c838ece15cc 100644
--- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java
+++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java
@@ -73,7 +73,7 @@ import java.security.PrivateKey;
 import java.util.List;
 import java.util.Map;
 
-@APICommand(name = "samlsso", description = "SP initiated SAML Single Sign On", requestHasSensitiveInfo = true, responseObject = LoginCmdResponse.class, entityType = {})
+@APICommand(name = "samlSso", description = "SP initiated SAML Single Sign On", requestHasSensitiveInfo = true, responseObject = LoginCmdResponse.class, entityType = {})
 public class SAML2LoginAPIAuthenticatorCmd extends BaseCmd implements APIAuthenticator {
     public static final Logger s_logger = Logger.getLogger(SAML2LoginAPIAuthenticatorCmd.class.getName());
     private static final String s_name = "loginresponse";
diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java
index cdc24e0e10a..7b1c36725d8 100644
--- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java
+++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java
@@ -51,7 +51,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-@APICommand(name = "samlslo", description = "SAML Global Log Out API", responseObject = LogoutCmdResponse.class, entityType = {})
+@APICommand(name = "samlSlo", description = "SAML Global Log Out API", responseObject = LogoutCmdResponse.class, entityType = {})
 public class SAML2LogoutAPIAuthenticatorCmd extends BaseCmd implements APIAuthenticator {
     public static final Logger s_logger = Logger.getLogger(SAML2LogoutAPIAuthenticatorCmd.class.getName());
     private static final String s_name = "logoutresponse";
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 71f5c5b6da3..517c76c6272 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -1423,7 +1423,7 @@ public enum Config {
             ManagementServer.class,
             String.class,
             "saml2.sp.sso.url",
-            "http://localhost:8080/client/api?command=samlsso",
+            "http://localhost:8080/client/api?command=samlSso",
             "SAML2 CloudStack Service Provider Single Sign On URL",
             null),
     SAMLServiceProviderSingleLogOutURL(
@@ -1431,7 +1431,7 @@ public enum Config {
             ManagementServer.class,
             String.class,
             "saml2.sp.slo.url",
-            "http://localhost:8080/client/api?command=samlslo",
+            "http://localhost:8080/client/api?command=samlSlo",
             "SAML2 CloudStack Service Provider Single Log Out URL",
             null),
     SAMLIdentityProviderID(