diff --git a/Client/src/main/java/org/xdi/oxauth/client/RegisterRequest.java b/Client/src/main/java/org/xdi/oxauth/client/RegisterRequest.java
index 30eb101d0f..3dc7df2da0 100644
--- a/Client/src/main/java/org/xdi/oxauth/client/RegisterRequest.java
+++ b/Client/src/main/java/org/xdi/oxauth/client/RegisterRequest.java
@@ -953,7 +953,7 @@ public Map<String, String> getParameters() {
             parameters.put(SCOPES.toString(), toJSONArray(scopes).toString());
         }
         if (clientSecretExpiresAt != null) {
-            parameters.put(CLIENT_SECRET_EXPIRES_AT.toString(), Long.toString(clientSecretExpiresAt.getTime()));
+            parameters.put(CLIENT_SECRET_EXPIRES_AT_.toString(), Long.toString(clientSecretExpiresAt.getTime()));
         }
         // Federation params
         if (!StringUtils.isBlank(federationUrl)) {
@@ -1087,9 +1087,9 @@ public static RegisterRequest fromJson(String p_json) throws JSONException {
         }
 
         Date clientSecretExpiresAt = null;
-        if (requestObject.has(CLIENT_SECRET_EXPIRES_AT.getName())) {
-            if (requestObject.optLong(CLIENT_SECRET_EXPIRES_AT.getName()) > 0) {
-                clientSecretExpiresAt = new Date(requestObject.optLong(CLIENT_SECRET_EXPIRES_AT.getName()));
+        if (requestObject.has(CLIENT_SECRET_EXPIRES_AT_.getName())) {
+            if (requestObject.optLong(CLIENT_SECRET_EXPIRES_AT_.getName()) > 0) {
+                clientSecretExpiresAt = new Date(requestObject.optLong(CLIENT_SECRET_EXPIRES_AT_.getName()));
             }
         }
 
@@ -1263,7 +1263,7 @@ public JSONObject getJSONParameters() throws JSONException {
             parameters.put(FEDERATION_METADATA_ID.toString(), federationId);
         }
         if (clientSecretExpiresAt != null) {
-            parameters.put(CLIENT_SECRET_EXPIRES_AT.toString(), clientSecretExpiresAt.getTime());
+            parameters.put(CLIENT_SECRET_EXPIRES_AT_.toString(), clientSecretExpiresAt.getTime());
         }
         // Custom params
         if (customAttributes != null && !customAttributes.isEmpty()) {
diff --git a/Model/src/main/java/org/xdi/oxauth/model/register/RegisterRequestParam.java b/Model/src/main/java/org/xdi/oxauth/model/register/RegisterRequestParam.java
index f1001b4532..d613a3cd5f 100644
--- a/Model/src/main/java/org/xdi/oxauth/model/register/RegisterRequestParam.java
+++ b/Model/src/main/java/org/xdi/oxauth/model/register/RegisterRequestParam.java
@@ -211,7 +211,7 @@ public enum RegisterRequestParam {
 
     SCOPES("scopes"),
 
-    CLIENT_SECRET_EXPIRES_AT("client_secret_expires_at"),
+    CLIENT_SECRET_EXPIRES_AT_("client_secret_expires_at"),
 
     // Federation Params
     FEDERATION_METADATA_URL("federation_metadata_url"),