diff --git a/models/gold/core/core__ez_token_transfers.sql b/models/gold/core/core__ez_token_transfers.sql
index 092f767..5394d6b 100644
--- a/models/gold/core/core__ez_token_transfers.sql
+++ b/models/gold/core/core__ez_token_transfers.sql
@@ -102,7 +102,7 @@ FROM
     ASOF JOIN hourly_prices p
     MATCH_CONDITION (t.block_timestamp >= p.HOUR)
     ON (t.contract_address = p.token_address)
-    LEFT JOIN {{ ref('silver__ft_contract_metadata') }} C ON (t.contract_address = C.token_id) 
+    LEFT JOIN {{ ref('silver__ft_contract_metadata') }} C ON (t.contract_address = C.asset_identifier) 
     {% if var("MANUAL_FIX") %}
     WHERE
         {{ partition_load_manual('no_buffer') }}
diff --git a/models/gold/defi/defi__ez_bridge_activity.sql b/models/gold/defi/defi__ez_bridge_activity.sql
index 700f03b..51b2384 100644
--- a/models/gold/defi/defi__ez_bridge_activity.sql
+++ b/models/gold/defi/defi__ez_bridge_activity.sql
@@ -31,7 +31,7 @@ WITH fact_bridging AS (
 ),
 labels AS (
     SELECT 
-        token_id AS contract_address,
+        asset_identifier AS contract_address,
         name,
         symbol,
         decimals 
diff --git a/models/gold/defi/defi__ez_dex_swaps.sql b/models/gold/defi/defi__ez_dex_swaps.sql
index 119decb..55d23dc 100644
--- a/models/gold/defi/defi__ez_dex_swaps.sql
+++ b/models/gold/defi/defi__ez_dex_swaps.sql
@@ -29,7 +29,7 @@ WITH dex_swaps AS (
 ),
 labels AS (
     SELECT
-        token_id AS contract_address,
+        asset_identifier AS contract_address,
         NAME,
         symbol,
         decimals
diff --git a/models/gold/defi/defi__ez_intents.sql b/models/gold/defi/defi__ez_intents.sql
index 5fe0e8b..d689767 100644
--- a/models/gold/defi/defi__ez_intents.sql
+++ b/models/gold/defi/defi__ez_intents.sql
@@ -142,10 +142,10 @@ labels AS (
         {{ ref('silver__defuse_tokens_metadata') }}
     UNION ALL
     SELECT
-        token_id AS contract_address_raw,
+        asset_identifier AS contract_address_raw,
         'near' AS ecosystem,
         '397' AS chain_id,
-        token_id AS contract_address,
+        asset_identifier AS contract_address,
         symbol,
         decimals
     FROM
diff --git a/models/gold/defi/defi__ez_lending.sql b/models/gold/defi/defi__ez_lending.sql
index 9e9c7c0..e56154e 100644
--- a/models/gold/defi/defi__ez_lending.sql
+++ b/models/gold/defi/defi__ez_lending.sql
@@ -26,7 +26,7 @@ WITH lending AS (
 ),
 labels AS (
     SELECT
-        token_id AS contract_address,
+        asset_identifier AS contract_address,
         NAME,
         symbol,
         IFF(
diff --git a/models/silver/defi/lending/silver__burrow_lending.sql b/models/silver/defi/lending/silver__burrow_lending.sql
index 3d887be..dfa27f8 100644
--- a/models/silver/defi/lending/silver__burrow_lending.sql
+++ b/models/silver/defi/lending/silver__burrow_lending.sql
@@ -6,7 +6,7 @@
 
 WITH metadata  AS (
     SELECT
-        token_id as contract_address,
+        asset_identifier as contract_address,
         NAME,
         symbol,
         decimals
diff --git a/models/silver/prices/silver__complete_token_prices.sql b/models/silver/prices/silver__complete_token_prices.sql
index 760c2ec..b845710 100644
--- a/models/silver/prices/silver__complete_token_prices.sql
+++ b/models/silver/prices/silver__complete_token_prices.sql
@@ -86,4 +86,4 @@ FROM
     complete_token_prices p
     LEFT JOIN {{ ref('silver__ft_contract_metadata') }}
     ft
-    ON p.token_address = ft.token_id
+    ON p.token_address = ft.asset_identifier
diff --git a/models/silver/transfers/bridging/silver__bridge_allbridge.sql b/models/silver/transfers/bridging/silver__bridge_allbridge.sql
index d5a13be..34afb26 100644
--- a/models/silver/transfers/bridging/silver__bridge_allbridge.sql
+++ b/models/silver/transfers/bridging/silver__bridge_allbridge.sql
@@ -41,7 +41,7 @@ WITH functioncall AS (
 ),
 metadata AS (
     SELECT
-        token_id as contract_address,
+        asset_identifier as contract_address,
         NAME,
         symbol,
         decimals