diff --git a/github/data_source_github_organization_role_teams.go b/github/data_source_github_organization_role_teams.go
index f6f9c18073..0d0ebedb49 100644
--- a/github/data_source_github_organization_role_teams.go
+++ b/github/data_source_github_organization_role_teams.go
@@ -92,7 +92,7 @@ func dataSourceGithubOrganizationRoleTeamsRead(ctx context.Context, d *schema.Re
 
 		for _, team := range teams {
 			t := map[string]any{
-				"id":         team.GetID(),
+				"team_id":    team.GetID(),
 				"slug":       team.GetSlug(),
 				"name":       team.GetName(),
 				"permission": team.GetPermission(),
diff --git a/github/data_source_github_organization_role_teams_test.go b/github/data_source_github_organization_role_teams_test.go
index 00f3f0e55b..7d891f3193 100644
--- a/github/data_source_github_organization_role_teams_test.go
+++ b/github/data_source_github_organization_role_teams_test.go
@@ -41,7 +41,7 @@ func TestAccDataSourceGithubOrganizationRoleTeams(t *testing.T) {
 					Check: resource.ComposeTestCheckFunc(
 						resource.TestCheckResourceAttrSet("data.github_organization_role_teams.test", "teams.#"),
 						resource.TestCheckResourceAttr("data.github_organization_role_teams.test", "teams.#", "1"),
-						resource.TestCheckResourceAttrPair("data.github_organization_role_teams.test", "teams.0.team_id", "github_team.test", "id"),
+						resource.TestCheckResourceAttrPair("data.github_organization_role_teams.test", "teams.0.team_id", "github_team.test", "team_id"),
 						resource.TestCheckResourceAttrPair("data.github_organization_role_teams.test", "teams.0.slug", "github_team.test", "slug"),
 						resource.TestCheckResourceAttrPair("data.github_organization_role_teams.test", "teams.0.name", "github_team.test", "name"),
 					),
diff --git a/github/data_source_github_organization_role_users.go b/github/data_source_github_organization_role_users.go
index 2e2af025e9..80d225b948 100644
--- a/github/data_source_github_organization_role_users.go
+++ b/github/data_source_github_organization_role_users.go
@@ -82,8 +82,8 @@ func dataSourceGithubOrganizationRoleUsersRead(ctx context.Context, d *schema.Re
 
 		for _, user := range users {
 			u := map[string]any{
-				"id":    user.GetID(),
-				"login": user.GetLogin(),
+				"user_id": user.GetID(),
+				"login":   user.GetLogin(),
 			}
 			allUsers = append(allUsers, u)
 		}