diff --git a/macros/business_kpis_configuration.sql b/macros/business_kpis_configuration.sql
index 0245aac..0bc7e4e 100644
--- a/macros/business_kpis_configuration.sql
+++ b/macros/business_kpis_configuration.sql
@@ -124,7 +124,7 @@ Provides a general assignemnt for the Dimensions available for each KPI
         ] %}
     {% endif %}
 
-    {% if entity_name == "PAYMENT_DATE_ATTRIBUTED_GUEST_PAYMENTS" %}
+    {% if entity_name == "GUEST_PAYMENTS" %}
         {% set additional_dimensions = additional_dimensions + [
             dim_has_id_check(),
         ] %}
diff --git a/models/intermediate/kpis/int_kpis__agg_monthly_guest_payments.sql b/models/intermediate/kpis/int_kpis__agg_monthly_guest_payments.sql
index 5fef258..431ecb5 100644
--- a/models/intermediate/kpis/int_kpis__agg_monthly_guest_payments.sql
+++ b/models/intermediate/kpis/int_kpis__agg_monthly_guest_payments.sql
@@ -1,6 +1,4 @@
-{% set dimensions = get_kpi_dimensions_per_model(
-    "PAYMENT_DATE_ATTRIBUTED_GUEST_PAYMENTS"
-) %}
+{% set dimensions = get_kpi_dimensions_per_model("GUEST_PAYMENTS") %}
 
 {{
     config(
diff --git a/models/intermediate/kpis/int_kpis__agg_mtd_guest_payments.sql b/models/intermediate/kpis/int_kpis__agg_mtd_guest_payments.sql
index 17c82c1..c5684e4 100644
--- a/models/intermediate/kpis/int_kpis__agg_mtd_guest_payments.sql
+++ b/models/intermediate/kpis/int_kpis__agg_mtd_guest_payments.sql
@@ -1,6 +1,4 @@
-{% set dimensions = get_kpi_dimensions_per_model(
-    "PAYMENT_DATE_ATTRIBUTED_GUEST_PAYMENTS"
-) %}
+{% set dimensions = get_kpi_dimensions_per_model("GUEST_PAYMENTS") %}
 
 {{
     config(
diff --git a/models/intermediate/kpis/int_kpis__agg_weekly_guest_payments.sql b/models/intermediate/kpis/int_kpis__agg_weekly_guest_payments.sql
index 26a6fc2..71f6654 100644
--- a/models/intermediate/kpis/int_kpis__agg_weekly_guest_payments.sql
+++ b/models/intermediate/kpis/int_kpis__agg_weekly_guest_payments.sql
@@ -1,6 +1,4 @@
-{% set dimensions = get_kpi_dimensions_per_model(
-    "PAYMENT_DATE_ATTRIBUTED_GUEST_PAYMENTS"
-) %}
+{% set dimensions = get_kpi_dimensions_per_model("GUEST_PAYMENTS") %}
 
 {{
     config(