diff --git a/backend/infrahub/core/schema/definitions/core.py b/backend/infrahub/core/schema/definitions/core.py
index 67a74d6456..b2bc9613ea 100644
--- a/backend/infrahub/core/schema/definitions/core.py
+++ b/backend/infrahub/core/schema/definitions/core.py
@@ -1045,7 +1045,7 @@
                 },
                 {
                     "name": "threads",
-                    "peer": InfrahubKind.THREAD,
+                    "peer": "CoreThread",
                     "identifier": "proposedchange__thread",
                     "kind": "Component",
                     "optional": True,
@@ -1070,7 +1070,7 @@
             "include_in_menu": False,
             "label": "Change Thread",
             "branch": BranchSupportType.AGNOSTIC.value,
-            "inherit_from": [InfrahubKind.THREAD],
+            "inherit_from": ["CoreThread"],
             "generate_profile": False,
             "attributes": [],
             "relationships": [],
@@ -1082,7 +1082,7 @@
             "include_in_menu": False,
             "label": "Thread - File",
             "branch": BranchSupportType.AGNOSTIC.value,
-            "inherit_from": [InfrahubKind.THREAD],
+            "inherit_from": ["CoreThread"],
             "generate_profile": False,
             "attributes": [
                 {"name": "file", "kind": "Text", "optional": True},