diff --git a/pkg/probo/coredata/control.go b/pkg/probo/coredata/control.go
index 3b836fa33..e20fac6f2 100644
--- a/pkg/probo/coredata/control.go
+++ b/pkg/probo/coredata/control.go
@@ -50,7 +50,7 @@ func (c *Controls) LoadByFrameworkID(
 ) error {
 	q := `
 SELECT
-    control_id,
+    id,
     framework_id,
     name,
     description,
diff --git a/pkg/probo/coredata/framework.go b/pkg/probo/coredata/framework.go
index 099829bc4..467c5c3fb 100644
--- a/pkg/probo/coredata/framework.go
+++ b/pkg/probo/coredata/framework.go
@@ -49,7 +49,7 @@ func (f *Frameworks) LoadByOrganizationID(
 ) error {
 	q := `
 SELECT
-    framework_id,
+    id,
     organization_id,
     name,
     description,
@@ -100,7 +100,7 @@ func (f *Framework) LoadByID(
 ) error {
 	q := `
 SELECT
-    framework_id,
+    id,
     organization_id,
     name,
     description,
diff --git a/pkg/probo/coredata/organization.go b/pkg/probo/coredata/organization.go
index 9eb21e43c..fa94a7091 100644
--- a/pkg/probo/coredata/organization.go
+++ b/pkg/probo/coredata/organization.go
@@ -33,7 +33,7 @@ func (o *Organization) LoadByID(
 ) error {
 	q := `
 SELECT
-    organization_id,
+    id,
     name,
     created_at,
     updated_at
diff --git a/pkg/probo/coredata/task.go b/pkg/probo/coredata/task.go
index 7bf7c4c8d..27b09bae8 100644
--- a/pkg/probo/coredata/task.go
+++ b/pkg/probo/coredata/task.go
@@ -46,7 +46,7 @@ func (t *Tasks) LoadByControlID(
 ) error {
 	q := `
 SELECT
-    task_id,
+    id,
     control_id,
     content_ref,
     created_at,