diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
index 552a5e727..8e9900cae 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
@@ -437,7 +437,7 @@ public class DefaultUserInfo implements UserInfo {
 			obj.addProperty("picture", this.getPicture());
 			obj.addProperty("website", this.getWebsite());
 			obj.addProperty("gender", this.getGender());
-			obj.addProperty("zone_info", this.getZoneinfo());
+			obj.addProperty("zoneinfo", this.getZoneinfo());
 			obj.addProperty("locale", this.getLocale());
 			obj.addProperty("updated_at", this.getUpdatedTime());
 			obj.addProperty("birthdate", this.getBirthdate());
@@ -489,7 +489,7 @@ public class DefaultUserInfo implements UserInfo {
 		ui.setPicture(nullSafeGetString(obj, "picture"));
 		ui.setWebsite(nullSafeGetString(obj, "website"));
 		ui.setGender(nullSafeGetString(obj, "gender"));
-		ui.setZoneinfo(nullSafeGetString(obj, "zone_info"));
+		ui.setZoneinfo(nullSafeGetString(obj, "zoneinfo"));
 		ui.setLocale(nullSafeGetString(obj, "locale"));
 		ui.setUpdatedTime(nullSafeGetString(obj, "updated_at"));
 		ui.setBirthdate(nullSafeGetString(obj, "birthdate"));
diff --git a/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java b/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java
index 1fb9f4ca0..3d42aaeb4 100644
--- a/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java
@@ -338,7 +338,7 @@ public class DiscoveryEndpoint {
 				"picture",
 				"website",
 				"gender",
-				"zone_info",
+				"zoneinfo",
 				"locale",
 				"updated_at",
 				"birthdate",
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultScopeClaimTranslationService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultScopeClaimTranslationService.java
index c400bcea1..5c546b355 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultScopeClaimTranslationService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultScopeClaimTranslationService.java
@@ -54,7 +54,7 @@ public class DefaultScopeClaimTranslationService implements ScopeClaimTranslatio
 		scopesToClaims.put("profile", "picture");
 		scopesToClaims.put("profile", "website");
 		scopesToClaims.put("profile", "gender");
-		scopesToClaims.put("profile", "zone_info");
+		scopesToClaims.put("profile", "zoneinfo");
 		scopesToClaims.put("profile", "locale");
 		scopesToClaims.put("profile", "updated_at");
 		scopesToClaims.put("profile", "birthdate");