diff --git a/pkg/policies/opa/rego/gcp/github_repository/accurics.gcp.IAM.145.json b/pkg/policies/opa/rego/gcp/github_repository/AC-GC-IA-GR-M-0001.json
similarity index 66%
rename from pkg/policies/opa/rego/gcp/github_repository/accurics.gcp.IAM.145.json
rename to pkg/policies/opa/rego/gcp/github_repository/AC-GC-IA-GR-M-0001.json
index 21c35a144..dcb041922 100755
--- a/pkg/policies/opa/rego/gcp/github_repository/accurics.gcp.IAM.145.json
+++ b/pkg/policies/opa/rego/gcp/github_repository/AC-GC-IA-GR-M-0001.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Repository is Not Private.",
-    "reference_id": "accurics.gcp.IAM.145",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-GR-M-0001",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_bigquery_dataset/accurics.gcp.IAM.106.json b/pkg/policies/opa/rego/gcp/google_bigquery_dataset/AC-GC-IA-BQ-H-0002.json
similarity index 71%
rename from pkg/policies/opa/rego/gcp/google_bigquery_dataset/accurics.gcp.IAM.106.json
rename to pkg/policies/opa/rego/gcp/google_bigquery_dataset/AC-GC-IA-BQ-H-0002.json
index 169e6f627..83942b0c1 100755
--- a/pkg/policies/opa/rego/gcp/google_bigquery_dataset/accurics.gcp.IAM.106.json
+++ b/pkg/policies/opa/rego/gcp/google_bigquery_dataset/AC-GC-IA-BQ-H-0002.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "BigQuery datasets may be anonymously or publicly accessible.",
-    "reference_id": "accurics.gcp.IAM.106",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-BQ-H-0002",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_disk/accurics.gcp.EKM.131.json b/pkg/policies/opa/rego/gcp/google_compute_disk/AC-GC-DP-CD-M-0003.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_compute_disk/accurics.gcp.EKM.131.json
rename to pkg/policies/opa/rego/gcp/google_compute_disk/AC-GC-DP-CD-M-0003.json
index 34323cf4e..d0a8dc504 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_disk/accurics.gcp.EKM.131.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_disk/AC-GC-DP-CD-M-0003.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure VM disks for critical VMs are encrypted with Customer Supplied Encryption Keys (CSEK) .",
-    "reference_id": "accurics.gcp.EKM.131",
-    "category": "Encryption \u0026 Key Management",
+    "reference_id": "AC-GC-DP-CD-M-0003",
+    "category": "Data Protection",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.EKM.132.json b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-DP-CI-M-0196.json
similarity index 74%
rename from pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.EKM.132.json
rename to pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-DP-CI-M-0196.json
index 19817f097..0c1da3466 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.EKM.132.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-DP-CI-M-0196.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "VM disks attached to a compute instance should be encrypted with Customer Supplied Encryption Keys (CSEK) .",
-    "reference_id": "accurics.gcp.EKM.132",
-    "category": "Encryption \u0026 Key Management",
+    "reference_id": "AC-GC-DP-CI-M-0196",
+    "category": "Data Protection",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.IAM.124.json b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IA-CI-M-0191.json
similarity index 74%
rename from pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.IAM.124.json
rename to pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IA-CI-M-0191.json
index bfa478fa3..689dbc260 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.IAM.124.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IA-CI-M-0191.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Instances may have been configured to use the default service account with full access to all Cloud APIs",
-    "reference_id": "accurics.gcp.IAM.124",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-CI-M-0191",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.IAM.128.json b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IA-CI-M-0193.json
similarity index 77%
rename from pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.IAM.128.json
rename to pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IA-CI-M-0193.json
index 962bdb0c4..746e89f24 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.IAM.128.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IA-CI-M-0193.json
@@ -7,7 +7,7 @@
     },
     "severity": "MEDIUM",
     "description": "Ensure that no instance in the project overrides the project setting for enabling OSLogin",
-    "reference_id": "accurics.gcp.IAM.128",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-CI-M-0193",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.125.json b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-H-0190.json
similarity index 77%
rename from pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.125.json
rename to pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-H-0190.json
index 42d58ee89..b0e353532 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.125.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-H-0190.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Instances may have been configured to use the default service account with full access to all Cloud APIs",
-    "reference_id": "accurics.gcp.NS.125",
-    "category": "Access Control",
+    "reference_id": "AC-GC-IS-CI-H-0190",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.126.json b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0192.json
similarity index 79%
rename from pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.126.json
rename to pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0192.json
index a9204e7cc..0d1181f1c 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.126.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0192.json
@@ -7,7 +7,7 @@
     },
     "severity": "MEDIUM",
     "description": "Ensure 'Block Project-wide SSH keys' is enabled for VM instances.",
-    "reference_id": "accurics.gcp.NS.126",
-    "category": "Network Security",
+    "reference_id": "AC-GC-IS-CI-M-0192",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.129.json b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0194.json
similarity index 79%
rename from pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.129.json
rename to pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0194.json
index 8ab435948..22c0ad9bd 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.129.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0194.json
@@ -7,7 +7,7 @@
     },
     "severity": "MEDIUM",
     "description": "Ensure 'Enable connecting to serial ports' is not enabled for VM instances.",
-    "reference_id": "accurics.gcp.NS.129",
-    "category": "Network Security",
+    "reference_id": "AC-GC-IS-CI-M-0194",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.130.json b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0195.json
similarity index 77%
rename from pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.130.json
rename to pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0195.json
index 65f10a5d6..f6b3236fb 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.130.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0195.json
@@ -8,7 +8,7 @@
     },
     "severity": "MEDIUM",
     "description": "Ensure IP forwarding is not enabled on Instances.",
-    "reference_id": "accurics.gcp.NS.130",
-    "category": "Network Security",
+    "reference_id": "AC-GC-IS-CI-M-0195",
+    "category": "Infrastructure Security",
     "version": 1
-}
+}
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.133.json b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0197.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.133.json
rename to pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0197.json
index a0155b5c5..02e3eabb3 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_instance/accurics.gcp.NS.133.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_instance/AC-GC-IS-CI-M-0197.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure Compute instances are launched with Shielded VM enabled.",
-    "reference_id": "accurics.gcp.NS.133",
-    "category": "Network Security ",
+    "reference_id": "AC-GC-IS-CI-M-0197",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_ssl_policy/accurics.gcp.EKM.134.json b/pkg/policies/opa/rego/gcp/google_compute_ssl_policy/AC-GC-IS-CP-M-0198.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_compute_ssl_policy/accurics.gcp.EKM.134.json
rename to pkg/policies/opa/rego/gcp/google_compute_ssl_policy/AC-GC-IS-CP-M-0198.json
index 5111a107f..4a8c675ee 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_ssl_policy/accurics.gcp.EKM.134.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_ssl_policy/AC-GC-IS-CP-M-0198.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure no HTTPS or SSL proxy load balancers permit SSL policies with weak cipher suites.",
-    "reference_id": "accurics.gcp.EKM.134",
-    "category": "Encryption \u0026 Key Management",
+    "reference_id": "AC-GC-IS-CP-M-0198",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_compute_subnetwork/accurics.gcp.LOG.118.json b/pkg/policies/opa/rego/gcp/google_compute_subnetwork/AC-GC-LM-CS-M-0199.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_compute_subnetwork/accurics.gcp.LOG.118.json
rename to pkg/policies/opa/rego/gcp/google_compute_subnetwork/AC-GC-LM-CS-M-0199.json
index 3e7cf548f..ec2c9e4af 100755
--- a/pkg/policies/opa/rego/gcp/google_compute_subnetwork/accurics.gcp.LOG.118.json
+++ b/pkg/policies/opa/rego/gcp/google_compute_subnetwork/AC-GC-LM-CS-M-0199.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure that VPC Flow Logs is enabled for every subnet in a VPC Network.",
-    "reference_id": "accurics.gcp.LOG.118",
-    "category": "Logging ",
+    "reference_id": "AC-GC-LM-CS-M-0199",
+    "category": "Logging and Monitoring",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.OPS.115.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-CV-CC-H-0207.json
similarity index 72%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.OPS.115.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-CV-CC-H-0207.json
index 4e3355e4b..ebc458cd0 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.OPS.115.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-CV-CC-H-0207.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure Kubernetes Cluster is created with Alias IP ranges enabled",
-    "reference_id": "accurics.gcp.OPS.115",
-    "category": "Operational Efficiency",
+    "reference_id": "AC-GC-CV-CC-H-0207",
+    "category": "Compliance Validation",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.OPS.116.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-CV-CC-H-0210.json
similarity index 75%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.OPS.116.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-CV-CC-H-0210.json
index 7280c676f..e1bb98cff 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.OPS.116.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-CV-CC-H-0210.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure PodSecurityPolicy controller is enabled on the Kubernetes Engine Clusters.",
-    "reference_id": "accurics.gcp.OPS.116",
-    "category": "Operational Efficiency",
+    "reference_id": "AC-GC-CV-CC-H-0210",
+    "category": "Compliance Validation",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.OPS.113.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-CV-CC-H-0213.json
similarity index 72%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.OPS.113.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-CV-CC-H-0213.json
index 7c13f89bd..4bdabdbad 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.OPS.113.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-CV-CC-H-0213.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure Kubernetes Clusters are configured with Labels.",
-    "reference_id": "accurics.gcp.OPS.113",
-    "category": "Operational Efficiency",
+    "reference_id": "AC-GC-CV-CC-H-0213",
+    "category": "Compliance Validation",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.IAM.142.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IA-CC-H-0204.json
similarity index 71%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.IAM.142.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IA-CC-H-0204.json
index 1c82938ca..4c640e5dd 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.IAM.142.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IA-CC-H-0204.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure Legacy Authorization is set to disabled on Kubernetes Engine Clusters.",
-    "reference_id": "accurics.gcp.IAM.142",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-CC-H-0204",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.IAM.104.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IA-CC-H-0208.json
similarity index 71%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.IAM.104.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IA-CC-H-0208.json
index 1bf1c0c0a..1bb434d62 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.IAM.104.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IA-CC-H-0208.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure Kubernetes Cluster is created with Client Certificate disabled.",
-    "reference_id": "accurics.gcp.IAM.104",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-CC-H-0208",
+    "category": "Identity and Access Management",
     "version": 1
-}
+}
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.IAM.110.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IA-CC-H-0211.json
similarity index 67%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.IAM.110.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IA-CC-H-0211.json
index f7c746f2e..ebcc5465e 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.IAM.110.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IA-CC-H-0211.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure GKE basic auth is disabled.",
-    "reference_id": "accurics.gcp.IAM.110",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-CC-H-0211",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.112.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0205.json
similarity index 74%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.112.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0205.json
index 3469d7179..6a6c9d6bc 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.112.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0205.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure Master Authentication is set to enabled on Kubernetes Engine Clusters.",
-    "reference_id": "accurics.gcp.NS.112",
-    "category": "Network Security",
+    "reference_id": "AC-GC-IS-CC-H-0205",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.103.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0206.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.103.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0206.json
index 4bdb34d97..48d0099e1 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.103.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0206.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure Network policy is enabled on Kubernetes Engine Clusters.",
-    "reference_id": "accurics.gcp.NS.103",
-    "category": "Network Security",
+    "reference_id": "AC-GC-IS-CC-H-0206",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.109.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0209.json
similarity index 71%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.109.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0209.json
index 9d86bed43..f291642db 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.109.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0209.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure GKE Control Plane is not public.",
-    "reference_id": "accurics.gcp.NS.109",
-    "category": "Network Security",
+    "reference_id": "AC-GC-IS-CC-H-0209",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.117.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0212.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.117.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0212.json
index 83fc5878e..a5a35cc95 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.NS.117.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-IS-CC-H-0212.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure Kubernetes Cluster is created with Private cluster enabled.",
-    "reference_id": "accurics.gcp.NS.117",
-    "category": "Network Security",
+    "reference_id": "AC-GC-IS-CC-H-0212",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.LOG.100.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-LM-CC-H-0202.json
similarity index 79%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.LOG.100.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-LM-CC-H-0202.json
index ce8850846..933510b99 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.LOG.100.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-LM-CC-H-0202.json
@@ -7,7 +7,7 @@
     },
     "severity": "HIGH",
     "description": "Ensure Stackdriver Logging is enabled on Kubernetes Engine Clusters.",
-    "reference_id": "accurics.gcp.LOG.100",
-    "category": "Logging",
+    "reference_id": "AC-GC-LM-CC-H-0202",
+    "category": "Logging and Monitoring",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.MON.143.json b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-LM-CC-H-0203.json
similarity index 80%
rename from pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.MON.143.json
rename to pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-LM-CC-H-0203.json
index 3160108d7..335e41e15 100755
--- a/pkg/policies/opa/rego/gcp/google_container_cluster/accurics.gcp.MON.143.json
+++ b/pkg/policies/opa/rego/gcp/google_container_cluster/AC-GC-LM-CC-H-0203.json
@@ -7,7 +7,7 @@
     },
     "severity": "HIGH",
     "description": "Ensure Stackdriver Monitoring is enabled on Kubernetes Engine Clusters.",
-    "reference_id": "accurics.gcp.MON.143",
-    "category": "Monitoring",
+    "reference_id": "AC-GC-LM-CC-H-0203",
+    "category": "Logging and Monitoring",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_node_pool/accurics.gcp.OPS.114.json b/pkg/policies/opa/rego/gcp/google_container_node_pool/AC-GC-CV-CN-H-0216.json
similarity index 74%
rename from pkg/policies/opa/rego/gcp/google_container_node_pool/accurics.gcp.OPS.114.json
rename to pkg/policies/opa/rego/gcp/google_container_node_pool/AC-GC-CV-CN-H-0216.json
index b871a33f3..95d76359a 100755
--- a/pkg/policies/opa/rego/gcp/google_container_node_pool/accurics.gcp.OPS.114.json
+++ b/pkg/policies/opa/rego/gcp/google_container_node_pool/AC-GC-CV-CN-H-0216.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure Container-Optimized OS (cos) is used for Kubernetes Engine Clusters Node image.",
-    "reference_id": "accurics.gcp.OPS.114",
-    "category": "Operational Efficiency",
+    "reference_id": "AC-GC-CV-CN-H-0216",
+    "category": "Compliance Validation",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_node_pool/accurics.gcp.OPS.101.json b/pkg/policies/opa/rego/gcp/google_container_node_pool/AC-GC-SP-CN-H-0215.json
similarity index 78%
rename from pkg/policies/opa/rego/gcp/google_container_node_pool/accurics.gcp.OPS.101.json
rename to pkg/policies/opa/rego/gcp/google_container_node_pool/AC-GC-SP-CN-H-0215.json
index 62ec43385..8258afa04 100755
--- a/pkg/policies/opa/rego/gcp/google_container_node_pool/accurics.gcp.OPS.101.json
+++ b/pkg/policies/opa/rego/gcp/google_container_node_pool/AC-GC-SP-CN-H-0215.json
@@ -7,7 +7,7 @@
     },
     "severity": "HIGH",
     "description": "Ensure 'Automatic node upgrade' is enabled for Kubernetes Clusters.",
-    "reference_id": "accurics.gcp.OPS.101",
-    "category": "Operational Efficiency",
+    "reference_id": "AC-GC-SP-CN-H-0215",
+    "category": "Security Best Practices",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_container_node_pool/accurics.gcp.OPS.144.json b/pkg/policies/opa/rego/gcp/google_container_node_pool/AC-GC-SP-CN-M-0217.json
similarity index 78%
rename from pkg/policies/opa/rego/gcp/google_container_node_pool/accurics.gcp.OPS.144.json
rename to pkg/policies/opa/rego/gcp/google_container_node_pool/AC-GC-SP-CN-M-0217.json
index 434faa6c0..2f7d36589 100755
--- a/pkg/policies/opa/rego/gcp/google_container_node_pool/accurics.gcp.OPS.144.json
+++ b/pkg/policies/opa/rego/gcp/google_container_node_pool/AC-GC-SP-CN-M-0217.json
@@ -7,7 +7,7 @@
     },
     "severity": "MEDIUM",
     "description": "Ensure 'Automatic node repair' is enabled for Kubernetes Clusters.",
-    "reference_id": "accurics.gcp.OPS.144",
-    "category": "Operational Efficiency",
+    "reference_id": "AC-GC-SP-CN-M-0217",
+    "category": "Security Best Practices",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_dns_managed_zone/accurics.gcp.NS.107.json b/pkg/policies/opa/rego/gcp/google_dns_managed_zone/AC-GC-IS-DZ-H-0218.json
similarity index 70%
rename from pkg/policies/opa/rego/gcp/google_dns_managed_zone/accurics.gcp.NS.107.json
rename to pkg/policies/opa/rego/gcp/google_dns_managed_zone/AC-GC-IS-DZ-H-0218.json
index 4de57e66c..374cbdb2b 100755
--- a/pkg/policies/opa/rego/gcp/google_dns_managed_zone/accurics.gcp.NS.107.json
+++ b/pkg/policies/opa/rego/gcp/google_dns_managed_zone/AC-GC-IS-DZ-H-0218.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure that DNSSEC is enabled for Cloud DNS.",
-    "reference_id": "accurics.gcp.NS.107",
-    "category": "Network Security",
+    "reference_id": "AC-GC-IS-DZ-H-0218",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_dns_managed_zone/accurics.gcp.EKM.108.json b/pkg/policies/opa/rego/gcp/google_dns_managed_zone/AC-GC-IS-DZ-H-0219.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_dns_managed_zone/accurics.gcp.EKM.108.json
rename to pkg/policies/opa/rego/gcp/google_dns_managed_zone/AC-GC-IS-DZ-H-0219.json
index f676e85b3..391f71fb9 100755
--- a/pkg/policies/opa/rego/gcp/google_dns_managed_zone/accurics.gcp.EKM.108.json
+++ b/pkg/policies/opa/rego/gcp/google_dns_managed_zone/AC-GC-IS-DZ-H-0219.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure that RSASHA1 is not used for the zone-signing and key-signing keys in Cloud DNS DNSSEC.",
-    "reference_id": "accurics.gcp.EKM.108",
-    "category": "Encryption \u0026 Key Management",
+    "reference_id": "AC-GC-IS-DZ-H-0219",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_kms_crypto_key/accurics.gcp.EKM.007.json b/pkg/policies/opa/rego/gcp/google_kms_crypto_key/AC-GC-SP-KC-H-0220.json
similarity index 70%
rename from pkg/policies/opa/rego/gcp/google_kms_crypto_key/accurics.gcp.EKM.007.json
rename to pkg/policies/opa/rego/gcp/google_kms_crypto_key/AC-GC-SP-KC-H-0220.json
index 3387471ac..e59572036 100755
--- a/pkg/policies/opa/rego/gcp/google_kms_crypto_key/accurics.gcp.EKM.007.json
+++ b/pkg/policies/opa/rego/gcp/google_kms_crypto_key/AC-GC-SP-KC-H-0220.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure Encryption keys are rotated within a period of 365 days.",
-    "reference_id": "accurics.gcp.EKM.007",
-    "category": "Encryption \u0026 Key Management",
+    "reference_id": "AC-GC-SP-KC-H-0220",
+    "category": "Security Best Practices",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_kms_crypto_key/accurics.gcp.EKM.139.json b/pkg/policies/opa/rego/gcp/google_kms_crypto_key/AC-GC-SP-KC-M-0221.json
similarity index 70%
rename from pkg/policies/opa/rego/gcp/google_kms_crypto_key/accurics.gcp.EKM.139.json
rename to pkg/policies/opa/rego/gcp/google_kms_crypto_key/AC-GC-SP-KC-M-0221.json
index 01ee2db34..5479dfb30 100755
--- a/pkg/policies/opa/rego/gcp/google_kms_crypto_key/accurics.gcp.EKM.139.json
+++ b/pkg/policies/opa/rego/gcp/google_kms_crypto_key/AC-GC-SP-KC-M-0221.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure Encryption keys are rotated within a period of 90 days.",
-    "reference_id": "accurics.gcp.EKM.139",
-    "category": "Encryption \u0026 Key Management",
+    "reference_id": "AC-GC-SP-KC-M-0221",
+    "category": "Security Best Practices",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_project/accurics.gcp.NS.119.json b/pkg/policies/opa/rego/gcp/google_project/AC-GC-IS-PR-M-0222.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_project/accurics.gcp.NS.119.json
rename to pkg/policies/opa/rego/gcp/google_project/AC-GC-IS-PR-M-0222.json
index 6b28b7a08..3a07396b1 100755
--- a/pkg/policies/opa/rego/gcp/google_project/accurics.gcp.NS.119.json
+++ b/pkg/policies/opa/rego/gcp/google_project/AC-GC-IS-PR-M-0222.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure that the default network does not exist in a project.",
-    "reference_id": "accurics.gcp.NS.119",
-    "category": "Network Security",
+    "reference_id": "AC-GC-IS-PR-M-0222",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_project_iam_audit_config/accurics.gcp.LOG.010.json b/pkg/policies/opa/rego/gcp/google_project_iam_audit_config/AC-GC-LM-PA-H-0223.json
similarity index 76%
rename from pkg/policies/opa/rego/gcp/google_project_iam_audit_config/accurics.gcp.LOG.010.json
rename to pkg/policies/opa/rego/gcp/google_project_iam_audit_config/AC-GC-LM-PA-H-0223.json
index 66abdca78..a85b8b75d 100755
--- a/pkg/policies/opa/rego/gcp/google_project_iam_audit_config/accurics.gcp.LOG.010.json
+++ b/pkg/policies/opa/rego/gcp/google_project_iam_audit_config/AC-GC-LM-PA-H-0223.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure that Cloud Audit Logging is configured properly across all services and all users from a project.",
-    "reference_id": "accurics.gcp.LOG.010",
-    "category": "Logging",
+    "reference_id": "AC-GC-LM-PA-H-0223",
+    "category": "Logging and Monitoring",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_project_iam_binding/accurics.gcp.IAM.150.json b/pkg/policies/opa/rego/gcp/google_project_iam_binding/AC-GC-IA-PB-H-0224.json
similarity index 86%
rename from pkg/policies/opa/rego/gcp/google_project_iam_binding/accurics.gcp.IAM.150.json
rename to pkg/policies/opa/rego/gcp/google_project_iam_binding/AC-GC-IA-PB-H-0224.json
index bfed380e9..171060ca6 100755
--- a/pkg/policies/opa/rego/gcp/google_project_iam_binding/accurics.gcp.IAM.150.json
+++ b/pkg/policies/opa/rego/gcp/google_project_iam_binding/AC-GC-IA-PB-H-0224.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure that corporate login credentials are used instead of Gmail accounts.",
-    "reference_id": "accurics.gcp.IAM.150",
+    "reference_id": "AC-GC-IA-PB-H-0224",
     "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_project_iam_binding/accurics.gcp.IAM.136.json b/pkg/policies/opa/rego/gcp/google_project_iam_binding/AC-GC-IA-PB-M-0225.json
similarity index 75%
rename from pkg/policies/opa/rego/gcp/google_project_iam_binding/accurics.gcp.IAM.136.json
rename to pkg/policies/opa/rego/gcp/google_project_iam_binding/AC-GC-IA-PB-M-0225.json
index d7c6fee0d..dc3b9853b 100755
--- a/pkg/policies/opa/rego/gcp/google_project_iam_binding/accurics.gcp.IAM.136.json
+++ b/pkg/policies/opa/rego/gcp/google_project_iam_binding/AC-GC-IA-PB-M-0225.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure that IAM users are not assigned the Service Account User or Service Account Token Creator roles at project level.",
-    "reference_id": "accurics.gcp.IAM.136",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-PB-M-0225",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_project_iam_member/accurics.gcp.IAM.137.json b/pkg/policies/opa/rego/gcp/google_project_iam_member/AC-GC-IA-PM-M-0226.json
similarity index 75%
rename from pkg/policies/opa/rego/gcp/google_project_iam_member/accurics.gcp.IAM.137.json
rename to pkg/policies/opa/rego/gcp/google_project_iam_member/AC-GC-IA-PM-M-0226.json
index bbcd89885..1e8cc602d 100755
--- a/pkg/policies/opa/rego/gcp/google_project_iam_member/accurics.gcp.IAM.137.json
+++ b/pkg/policies/opa/rego/gcp/google_project_iam_member/AC-GC-IA-PM-M-0226.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure that IAM users are not assigned the Service Account User or Service Account Token Creator roles at project level.",
-    "reference_id": "accurics.gcp.IAM.137",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-PM-M-0226",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_project_iam_member/accurics.gcp.IAM.138.json b/pkg/policies/opa/rego/gcp/google_project_iam_member/AC-GC-IA-PM-M-0227.json
similarity index 71%
rename from pkg/policies/opa/rego/gcp/google_project_iam_member/accurics.gcp.IAM.138.json
rename to pkg/policies/opa/rego/gcp/google_project_iam_member/AC-GC-IA-PM-M-0227.json
index c5da6a6bf..cb18c702b 100755
--- a/pkg/policies/opa/rego/gcp/google_project_iam_member/accurics.gcp.IAM.138.json
+++ b/pkg/policies/opa/rego/gcp/google_project_iam_member/AC-GC-IA-PM-M-0227.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure that Service Account has no Admin privileges.",
-    "reference_id": "accurics.gcp.IAM.138",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-PM-M-0227",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_sql_database_instance/accurics.gcp.EKM.141.json b/pkg/policies/opa/rego/gcp/google_sql_database_instance/AC-GC-IS-SQ-H-0229.json
similarity index 72%
rename from pkg/policies/opa/rego/gcp/google_sql_database_instance/accurics.gcp.EKM.141.json
rename to pkg/policies/opa/rego/gcp/google_sql_database_instance/AC-GC-IS-SQ-H-0229.json
index 25e5366e6..a6f377208 100755
--- a/pkg/policies/opa/rego/gcp/google_sql_database_instance/accurics.gcp.EKM.141.json
+++ b/pkg/policies/opa/rego/gcp/google_sql_database_instance/AC-GC-IS-SQ-H-0229.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure that Cloud SQL database instance requires all incoming connections to use SSL",
-    "reference_id": "accurics.gcp.EKM.141",
-    "category": "Encryption \u0026 Key Management",
+    "reference_id": "AC-GC-IS-SQ-H-0229",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_sql_database_instance/accurics.gcp.NS.102.json b/pkg/policies/opa/rego/gcp/google_sql_database_instance/AC-GC-IS-SQ-H-0230.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_sql_database_instance/accurics.gcp.NS.102.json
rename to pkg/policies/opa/rego/gcp/google_sql_database_instance/AC-GC-IS-SQ-H-0230.json
index 9fb0f171c..bdc760e23 100755
--- a/pkg/policies/opa/rego/gcp/google_sql_database_instance/accurics.gcp.NS.102.json
+++ b/pkg/policies/opa/rego/gcp/google_sql_database_instance/AC-GC-IS-SQ-H-0230.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure that Cloud SQL database Instances are not open to the world.",
-    "reference_id": "accurics.gcp.NS.102",
-    "category": "Network Security",
+    "reference_id": "AC-GC-IS-SQ-H-0230",
+    "category": "Infrastructure Security",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_sql_database_instance/accurics.gcp.BDR.105.json b/pkg/policies/opa/rego/gcp/google_sql_database_instance/AC-GC-RE-SQ-H-0231.json
similarity index 71%
rename from pkg/policies/opa/rego/gcp/google_sql_database_instance/accurics.gcp.BDR.105.json
rename to pkg/policies/opa/rego/gcp/google_sql_database_instance/AC-GC-RE-SQ-H-0231.json
index ed655f3c5..e92991c43 100755
--- a/pkg/policies/opa/rego/gcp/google_sql_database_instance/accurics.gcp.BDR.105.json
+++ b/pkg/policies/opa/rego/gcp/google_sql_database_instance/AC-GC-RE-SQ-H-0231.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure all Cloud SQL database instance have backup configuration enabled.",
-    "reference_id": "accurics.gcp.BDR.105",
-    "category": "Backup \u0026 Disaster Recovery",
+    "reference_id": "AC-GC-RE-SQ-H-0231",
+    "category": "Resilience",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_storage_bucket/accurics.gcp.IAM.122.json b/pkg/policies/opa/rego/gcp/google_storage_bucket/AC-GC-IA-SB-M-0234.json
similarity index 71%
rename from pkg/policies/opa/rego/gcp/google_storage_bucket/accurics.gcp.IAM.122.json
rename to pkg/policies/opa/rego/gcp/google_storage_bucket/AC-GC-IA-SB-M-0234.json
index d20464950..beea6a2d9 100755
--- a/pkg/policies/opa/rego/gcp/google_storage_bucket/accurics.gcp.IAM.122.json
+++ b/pkg/policies/opa/rego/gcp/google_storage_bucket/AC-GC-IA-SB-M-0234.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure that Cloud Storage buckets have uniform bucket-level access enabled.",
-    "reference_id": "accurics.gcp.IAM.122",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-SB-M-0234",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_storage_bucket/accurics.gcp.LOG.146.json b/pkg/policies/opa/rego/gcp/google_storage_bucket/AC-GC-LM-SB-H-0232.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_storage_bucket/accurics.gcp.LOG.146.json
rename to pkg/policies/opa/rego/gcp/google_storage_bucket/AC-GC-LM-SB-H-0232.json
index a77d9686d..85e65283a 100755
--- a/pkg/policies/opa/rego/gcp/google_storage_bucket/accurics.gcp.LOG.146.json
+++ b/pkg/policies/opa/rego/gcp/google_storage_bucket/AC-GC-LM-SB-H-0232.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure that object versioning is enabled on log-buckets.",
-    "reference_id": "accurics.gcp.LOG.146",
-    "category": "Logging",
+    "reference_id": "AC-GC-LM-SB-H-0232",
+    "category": "Logging and Monitoring",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_storage_bucket/accurics.gcp.LOG.147.json b/pkg/policies/opa/rego/gcp/google_storage_bucket/AC-GC-LM-SB-H-0233.json
similarity index 73%
rename from pkg/policies/opa/rego/gcp/google_storage_bucket/accurics.gcp.LOG.147.json
rename to pkg/policies/opa/rego/gcp/google_storage_bucket/AC-GC-LM-SB-H-0233.json
index 948f146cc..bb67765fb 100755
--- a/pkg/policies/opa/rego/gcp/google_storage_bucket/accurics.gcp.LOG.147.json
+++ b/pkg/policies/opa/rego/gcp/google_storage_bucket/AC-GC-LM-SB-H-0233.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure that logging is enabled for Cloud storage buckets.",
-    "reference_id": "accurics.gcp.LOG.147",
-    "category": "Logging",
+    "reference_id": "AC-GC-LM-SB-H-0233",
+    "category": "Logging and Monitoring",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_storage_bucket_iam_binding/accurics.gcp.IAM.121.json b/pkg/policies/opa/rego/gcp/google_storage_bucket_iam_binding/AC-GC-IA-SI-M-0237.json
similarity index 72%
rename from pkg/policies/opa/rego/gcp/google_storage_bucket_iam_binding/accurics.gcp.IAM.121.json
rename to pkg/policies/opa/rego/gcp/google_storage_bucket_iam_binding/AC-GC-IA-SI-M-0237.json
index b7ea5d6fb..843dc6c40 100755
--- a/pkg/policies/opa/rego/gcp/google_storage_bucket_iam_binding/accurics.gcp.IAM.121.json
+++ b/pkg/policies/opa/rego/gcp/google_storage_bucket_iam_binding/AC-GC-IA-SI-M-0237.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "MEDIUM",
     "description": "Ensure that Cloud Storage bucket is not anonymously or publicly accessible.",
-    "reference_id": "accurics.gcp.IAM.121",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-SI-M-0237",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file
diff --git a/pkg/policies/opa/rego/gcp/google_storage_bucket_iam_member/accurics.gcp.IAM.120.json b/pkg/policies/opa/rego/gcp/google_storage_bucket_iam_member/AC-GC-IA-SM-H-0238.json
similarity index 71%
rename from pkg/policies/opa/rego/gcp/google_storage_bucket_iam_member/accurics.gcp.IAM.120.json
rename to pkg/policies/opa/rego/gcp/google_storage_bucket_iam_member/AC-GC-IA-SM-H-0238.json
index 7a9a6000f..cecf9f3cc 100755
--- a/pkg/policies/opa/rego/gcp/google_storage_bucket_iam_member/accurics.gcp.IAM.120.json
+++ b/pkg/policies/opa/rego/gcp/google_storage_bucket_iam_member/AC-GC-IA-SM-H-0238.json
@@ -4,7 +4,7 @@
     "template_args": null,
     "severity": "HIGH",
     "description": "Ensure that Cloud Storage bucket is not anonymously or publicly Accessible.",
-    "reference_id": "accurics.gcp.IAM.120",
-    "category": "Identity \u0026 Access Management",
+    "reference_id": "AC-GC-IA-SM-H-0238",
+    "category": "Identity and Access Management",
     "version": 1
 }
\ No newline at end of file