diff --git a/.codegen/_openapi_sha b/.codegen/_openapi_sha
index f48ba3f2a..96b833e4b 100644
--- a/.codegen/_openapi_sha
+++ b/.codegen/_openapi_sha
@@ -1 +1 @@
-e3276ea2ed809710473b5dc06ed9e8fc177afb0f
\ No newline at end of file
+4d3e1d0c96e07651aa7da99ea34d2a1be014f3af
\ No newline at end of file
diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md
index 0691ed444..c2ca70c31 100644
--- a/NEXT_CHANGELOG.md
+++ b/NEXT_CHANGELOG.md
@@ -16,4 +16,10 @@
 
 ### API Changes
 * Add `pauseStatus` field for `com.databricks.sdk.service.jobs.TriggerStateProto`.
-* Add `directoryInfo` field for `com.databricks.sdk.service.workspace.ObjectInfo`.
\ No newline at end of file
+* Add `directoryInfo` field for `com.databricks.sdk.service.workspace.ObjectInfo`.
+* Add `groupId` field for `com.databricks.sdk.service.iamv2.Group`.
+* Add `servicePrincipalId` field for `com.databricks.sdk.service.iamv2.ServicePrincipal`.
+* Add `userId` field for `com.databricks.sdk.service.iamv2.User`.
+* [Breaking] Remove `internalId` field for `com.databricks.sdk.service.iamv2.Group`.
+* [Breaking] Remove `internalId` field for `com.databricks.sdk.service.iamv2.ServicePrincipal`.
+* [Breaking] Remove `internalId` field for `com.databricks.sdk.service.iamv2.User`.
\ No newline at end of file
diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/Group.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/Group.java
index bf8227eb0..aa30a1eae 100644
--- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/Group.java
+++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/Group.java
@@ -18,14 +18,14 @@ public class Group {
   @JsonProperty("external_id")
   private String externalId;
 
+  /** Internal group ID of the group in Databricks. */
+  @JsonProperty("group_id")
+  private String groupId;
+
   /** Display name of the group. */
   @JsonProperty("group_name")
   private String groupName;
 
-  /** Internal group ID of the group in Databricks. */
-  @JsonProperty("internal_id")
-  private String internalId;
-
   public Group setAccountId(String accountId) {
     this.accountId = accountId;
     return this;
@@ -44,22 +44,22 @@ public String getExternalId() {
     return externalId;
   }
 
-  public Group setGroupName(String groupName) {
-    this.groupName = groupName;
+  public Group setGroupId(String groupId) {
+    this.groupId = groupId;
     return this;
   }
 
-  public String getGroupName() {
-    return groupName;
+  public String getGroupId() {
+    return groupId;
   }
 
-  public Group setInternalId(String internalId) {
-    this.internalId = internalId;
+  public Group setGroupName(String groupName) {
+    this.groupName = groupName;
     return this;
   }
 
-  public String getInternalId() {
-    return internalId;
+  public String getGroupName() {
+    return groupName;
   }
 
   @Override
@@ -69,13 +69,13 @@ public boolean equals(Object o) {
     Group that = (Group) o;
     return Objects.equals(accountId, that.accountId)
         && Objects.equals(externalId, that.externalId)
-        && Objects.equals(groupName, that.groupName)
-        && Objects.equals(internalId, that.internalId);
+        && Objects.equals(groupId, that.groupId)
+        && Objects.equals(groupName, that.groupName);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(accountId, externalId, groupName, internalId);
+    return Objects.hash(accountId, externalId, groupId, groupName);
   }
 
   @Override
@@ -83,8 +83,8 @@ public String toString() {
     return new ToStringer(Group.class)
         .add("accountId", accountId)
         .add("externalId", externalId)
+        .add("groupId", groupId)
         .add("groupName", groupName)
-        .add("internalId", internalId)
         .toString();
   }
 }
diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/ServicePrincipal.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/ServicePrincipal.java
index 9750fb381..70458efbf 100644
--- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/ServicePrincipal.java
+++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/ServicePrincipal.java
@@ -31,8 +31,8 @@ public class ServicePrincipal {
   private String externalId;
 
   /** Internal service principal ID of the service principal in Databricks. */
-  @JsonProperty("internal_id")
-  private String internalId;
+  @JsonProperty("service_principal_id")
+  private String servicePrincipalId;
 
   public ServicePrincipal setAccountId(String accountId) {
     this.accountId = accountId;
@@ -79,13 +79,13 @@ public String getExternalId() {
     return externalId;
   }
 
-  public ServicePrincipal setInternalId(String internalId) {
-    this.internalId = internalId;
+  public ServicePrincipal setServicePrincipalId(String servicePrincipalId) {
+    this.servicePrincipalId = servicePrincipalId;
     return this;
   }
 
-  public String getInternalId() {
-    return internalId;
+  public String getServicePrincipalId() {
+    return servicePrincipalId;
   }
 
   @Override
@@ -98,13 +98,13 @@ public boolean equals(Object o) {
         && Objects.equals(applicationId, that.applicationId)
         && Objects.equals(displayName, that.displayName)
         && Objects.equals(externalId, that.externalId)
-        && Objects.equals(internalId, that.internalId);
+        && Objects.equals(servicePrincipalId, that.servicePrincipalId);
   }
 
   @Override
   public int hashCode() {
     return Objects.hash(
-        accountId, accountSpStatus, applicationId, displayName, externalId, internalId);
+        accountId, accountSpStatus, applicationId, displayName, externalId, servicePrincipalId);
   }
 
   @Override
@@ -115,7 +115,7 @@ public String toString() {
         .add("applicationId", applicationId)
         .add("displayName", displayName)
         .add("externalId", externalId)
-        .add("internalId", internalId)
+        .add("servicePrincipalId", servicePrincipalId)
         .toString();
   }
 }
diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/User.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/User.java
index 3595fd610..ff6b64207 100644
--- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/User.java
+++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/iamv2/User.java
@@ -27,8 +27,8 @@ public class User {
   private UserFullName fullName;
 
   /** Internal userId of the user in Databricks. */
-  @JsonProperty("internal_id")
-  private String internalId;
+  @JsonProperty("user_id")
+  private String userId;
 
   /** Username/email of the user. */
   @JsonProperty("username")
@@ -70,13 +70,13 @@ public UserFullName getFullName() {
     return fullName;
   }
 
-  public User setInternalId(String internalId) {
-    this.internalId = internalId;
+  public User setUserId(String userId) {
+    this.userId = userId;
     return this;
   }
 
-  public String getInternalId() {
-    return internalId;
+  public String getUserId() {
+    return userId;
   }
 
   public User setUsername(String username) {
@@ -97,13 +97,13 @@ public boolean equals(Object o) {
         && Objects.equals(accountUserStatus, that.accountUserStatus)
         && Objects.equals(externalId, that.externalId)
         && Objects.equals(fullName, that.fullName)
-        && Objects.equals(internalId, that.internalId)
+        && Objects.equals(userId, that.userId)
         && Objects.equals(username, that.username);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(accountId, accountUserStatus, externalId, fullName, internalId, username);
+    return Objects.hash(accountId, accountUserStatus, externalId, fullName, userId, username);
   }
 
   @Override
@@ -113,7 +113,7 @@ public String toString() {
         .add("accountUserStatus", accountUserStatus)
         .add("externalId", externalId)
         .add("fullName", fullName)
-        .add("internalId", internalId)
+        .add("userId", userId)
         .add("username", username)
         .toString();
   }