diff --git a/infrahub_sdk/protocols.py b/infrahub_sdk/protocols.py
index 7f2816ce..048ec982 100644
--- a/infrahub_sdk/protocols.py
+++ b/infrahub_sdk/protocols.py
@@ -204,6 +204,16 @@ class CoreAccount(LineageOwner, LineageSource, CoreGenericAccount):
     pass
 
 
+class CoreAccountGroup(CoreGroup):
+    roles: RelationshipManager
+
+
+class CoreAccountRole(CoreNode):
+    name: String
+    groups: RelationshipManager
+    permissions: RelationshipManager
+
+
 class CoreArtifact(CoreTaskTarget):
     name: String
     status: Enum
@@ -445,16 +455,6 @@ class CoreTransformPython(CoreTransformation):
     class_name: String
 
 
-class CoreUserGroup(CoreGroup):
-    roles: RelationshipManager
-
-
-class CoreUserRole(CoreNode):
-    name: String
-    groups: RelationshipManager
-    permissions: RelationshipManager
-
-
 class CoreUserValidator(CoreValidator):
     check_definition: RelatedNode
     repository: RelatedNode
@@ -649,6 +649,16 @@ class CoreAccountSync(LineageOwnerSync, LineageSourceSync, CoreGenericAccountSyn
     pass
 
 
+class CoreAccountGroupSync(CoreGroupSync):
+    roles: RelationshipManagerSync
+
+
+class CoreAccountRoleSync(CoreNodeSync):
+    name: String
+    groups: RelationshipManagerSync
+    permissions: RelationshipManagerSync
+
+
 class CoreArtifactSync(CoreTaskTargetSync):
     name: String
     status: Enum
@@ -890,16 +900,6 @@ class CoreTransformPythonSync(CoreTransformationSync):
     class_name: String
 
 
-class CoreUserGroupSync(CoreGroupSync):
-    roles: RelationshipManagerSync
-
-
-class CoreUserRoleSync(CoreNodeSync):
-    name: String
-    groups: RelationshipManagerSync
-    permissions: RelationshipManagerSync
-
-
 class CoreUserValidatorSync(CoreValidatorSync):
     check_definition: RelatedNodeSync
     repository: RelatedNodeSync