diff --git a/gooddata-dbt/gooddata_dbt/dbt/tables.py b/gooddata-dbt/gooddata_dbt/dbt/tables.py
index 9a78c5b63..89189eb51 100644
--- a/gooddata-dbt/gooddata_dbt/dbt/tables.py
+++ b/gooddata-dbt/gooddata_dbt/dbt/tables.py
@@ -298,7 +298,7 @@ def make_grain(self, table: DbtModelTable) -> List[Dict]:
         grain = []
         for column in table.columns.values():
             if self.is_primary_key(column):
-                grain.append({"id": column.gooddata_ldm_id, "type": "attribute"})
+                grain.append({"id": column.ldm_id, "type": "attribute"})
         return grain
 
     # TODO - constraints are stored in special nodes
@@ -342,9 +342,9 @@ def make_references(self, table: DbtModelTable, role_playing_tables: Dict) -> Li
                     if self.upper_case:
                         referenced_object_name = referenced_object_name.upper()
                     if referenced_object_name in role_playing_tables:
-                        referenced_object_id = f"{referenced_object_id}_{column.gooddata_ldm_id}"
+                        referenced_object_id = f"{referenced_object_id}_{column.ldm_id}"
             elif column.is_date():
-                referenced_object_id = column.gooddata_ldm_id
+                referenced_object_id = column.ldm_id
             if referenced_object_id is not None:
                 references.append(
                     {