diff --git a/java-api/src/main/java/com/sap/cloud/security/token/TokenClaims.java b/java-api/src/main/java/com/sap/cloud/security/token/TokenClaims.java
index 3ecf0a99d8..e9f792de2f 100644
--- a/java-api/src/main/java/com/sap/cloud/security/token/TokenClaims.java
+++ b/java-api/src/main/java/com/sap/cloud/security/token/TokenClaims.java
@@ -38,7 +38,7 @@ private TokenClaims() {
 	/**
 	 * @deprecated Use {@link TokenClaims#SAP_GLOBAL_APP_TID} instead.
 	 */
-	@Deprecated
+	@Deprecated(forRemoval = true)
 	public static final String SAP_GLOBAL_ZONE_ID = "zone_uuid"; // legacy claim
 	public static final String SAP_GLOBAL_APP_TID = "app_tid"; // tenant GUID
 
@@ -54,7 +54,7 @@ private XSUAA() {
 
 		public static final String ORIGIN = "origin";
 		public static final String GRANT_TYPE = "grant_type"; // OAuth grant type used for token creation
-		public static final String ZONE_ID = "zid"; // tenant GUID -> SAP_GLOBAL_ZONE_ID
+		public static final String ZONE_ID = "zid"; // tenant GUID same value as SAP_GLOBAL_APP_TID
 		public static final String CLIENT_ID = "cid"; // avoid using directly, make use of Token#getClientId() instead
 		public static final String SCOPES = "scope"; // list of scopes including app id, e.g. "my-app!t123.Display"
 		public static final String ISSUED_AT = "iat";