diff --git a/group_members_test.go b/group_members_test.go
index c6e536503..652d6345c 100644
--- a/group_members_test.go
+++ b/group_members_test.go
@@ -335,7 +335,7 @@ func TestGetGroupMemberCustomRole(t *testing.T) {
 		AccessLevel: AccessLevelValue(30),
 		MemberRole: &MemberRole{
 			ID:                 1,
-			GroupId:            2,
+			GroupID:            2,
 			Name:               "TestingCustomRole",
 			Description:        "",
 			BaseAccessLevel:    AccessLevelValue(30),
diff --git a/member_roles.go b/member_roles.go
index c81675d3e..4d791a913 100644
--- a/member_roles.go
+++ b/member_roles.go
@@ -20,7 +20,7 @@ type MemberRole struct {
 	ID                         int              `json:"id"`
 	Name                       string           `json:"name"`
 	Description                string           `json:"description,omitempty"`
-	GroupId                    int              `json:"group_id"`
+	GroupID                    int              `json:"group_id"`
 	BaseAccessLevel            AccessLevelValue `json:"base_access_level"`
 	AdminCICDVariables         bool             `json:"admin_cicd_variables,omitempty"`
 	AdminComplianceFramework   bool             `json:"admin_compliance_framework,omitempty"`
diff --git a/member_roles_test.go b/member_roles_test.go
index 894784fdb..5661e0748 100644
--- a/member_roles_test.go
+++ b/member_roles_test.go
@@ -25,7 +25,7 @@ func TestListMemberRoles(t *testing.T) {
 			ID:              1,
 			Name:            "GuestCodeReader",
 			Description:     "A Guest user that can read code",
-			GroupId:         1,
+			GroupID:         1,
 			BaseAccessLevel: 10, // Guest Base Level
 			ReadCode:        true,
 		},
@@ -33,7 +33,7 @@ func TestListMemberRoles(t *testing.T) {
 			ID:                2,
 			Name:              "GuestVulnerabilityReader",
 			Description:       "A Guest user that can read vulnerabilities",
-			GroupId:           1,
+			GroupID:           1,
 			BaseAccessLevel:   10, // Guest Base Level
 			ReadVulnerability: true,
 		},
@@ -84,7 +84,7 @@ func TestCreateMemberRole(t *testing.T) {
 		Name:                       "Custom guest",
 		Description:                "a sample custom role",
 		BaseAccessLevel:            GuestPermissions,
-		GroupId:                    84,
+		GroupID:                    84,
 		AdminCICDVariables:         false,
 		AdminComplianceFramework:   false,
 		AdminGroupMembers:          false,
diff --git a/resource_iteration_events.go b/resource_iteration_events.go
index 7ad354a7b..142cb9e6e 100644
--- a/resource_iteration_events.go
+++ b/resource_iteration_events.go
@@ -50,7 +50,7 @@ type Iteration struct {
 	ID          int        `json:"id"`
 	IID         int        `json:"iid"`
 	Sequence    int        `json:"sequence"`
-	GroupId     int        `json:"group_id"`
+	GroupID     int        `json:"group_id"`
 	Title       string     `json:"title"`
 	Description string     `json:"description"`
 	State       int        `json:"state"`
diff --git a/resource_iteration_events_test.go b/resource_iteration_events_test.go
index f4c707bcd..fc0942ac1 100644
--- a/resource_iteration_events_test.go
+++ b/resource_iteration_events_test.go
@@ -88,7 +88,7 @@ func TestListIssueIterationEventsService_ListIssueIterationEvents(t *testing.T)
 			ID:          133,
 			IID:         1,
 			Sequence:    1,
-			GroupId:     153,
+			GroupID:     153,
 			Title:       "Iteration 1",
 			Description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
 			State:       1,
@@ -167,7 +167,7 @@ func TestListIssueIterationEventsService_GetIssueIterationEvent(t *testing.T) {
 			ID:          133,
 			IID:         1,
 			Sequence:    1,
-			GroupId:     153,
+			GroupID:     153,
 			Title:       "Iteration 1",
 			Description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
 			State:       1,