diff --git a/catalyst-gateway/bin/src/db/index/block/rbac509/cql/insert_rbac509.cql b/catalyst-gateway/bin/src/db/index/block/rbac509/cql/insert_rbac509.cql
index d2d2f0b18d..f5a870604d 100644
--- a/catalyst-gateway/bin/src/db/index/block/rbac509/cql/insert_rbac509.cql
+++ b/catalyst-gateway/bin/src/db/index/block/rbac509/cql/insert_rbac509.cql
@@ -1,5 +1,5 @@
--- Index CIP-509 Registrations (Valid)
-INSERT INTO cip509_registration (
+-- Index RBAC 509 Registrations (Valid)
+INSERT INTO RBAC509_registration (
     chain_root,
     transaction_id,
     purpose,
diff --git a/catalyst-gateway/bin/src/db/index/block/rbac509/insert_rbac509.rs b/catalyst-gateway/bin/src/db/index/block/rbac509/insert_rbac509.rs
index 0569b17ec5..eec819a75d 100644
--- a/catalyst-gateway/bin/src/db/index/block/rbac509/insert_rbac509.rs
+++ b/catalyst-gateway/bin/src/db/index/block/rbac509/insert_rbac509.rs
@@ -10,7 +10,7 @@ use crate::{db::index::queries::SizedBatch, settings::CassandraEnvVars};
 
 /// RBAC Registration Indexing query
 #[allow(dead_code)]
-const INSERT_RBAC_QUERY: &str = include_str!("./cql/insert_rbac509.cql");
+const INSERT_RBAC509_QUERY: &str = include_str!("./cql/insert_rbac509.cql");
 
 /// Insert RBAC Registration Query Parameters
 #[derive(SerializeRow, Debug)]
diff --git a/catalyst-gateway/bin/src/db/index/schema/cql/rbac509_registration.cql b/catalyst-gateway/bin/src/db/index/schema/cql/rbac509_registration.cql
index 44f51ce867..77b1ca3b43 100644
--- a/catalyst-gateway/bin/src/db/index/schema/cql/rbac509_registration.cql
+++ b/catalyst-gateway/bin/src/db/index/schema/cql/rbac509_registration.cql
@@ -1,5 +1,5 @@
 -- Index of RBAC 509 registrations. Valid. 
-CREATE TABLE IF NOT EXISTS rbac509_registration (
+CREATE TABLE IF NOT EXISTS RBAC509_registration (
     -- Primary Key Data
     chain_root          blob,           -- 32 Bytes of Chain Root.
     transaction_id      blob,           -- 32 Bytes of Transaction Hash.