diff --git a/models/silver/transfers/silver_evm__bridge_layerzero_s.sql b/models/silver/transfers/silver_evm__bridge_stargate_s.sql
similarity index 97%
rename from models/silver/transfers/silver_evm__bridge_layerzero_s.sql
rename to models/silver/transfers/silver_evm__bridge_stargate_s.sql
index 47b8c91..5e19f90 100644
--- a/models/silver/transfers/silver_evm__bridge_layerzero_s.sql
+++ b/models/silver/transfers/silver_evm__bridge_stargate_s.sql
@@ -3,7 +3,7 @@
     incremental_strategy = 'delete+insert',
     cluster_by = ['_inserted_timestamp::date'],
     unique_key = 'tx_id',
-    tags = ['bridge', 'scheduled', 'streamline_scheduled', 'scheduled_non_core']
+    tags = ['bridge', 'scheduled', 'streamline_scheduled', 'scheduled_non_core', 'stargate']
 ) }}
 
 {% if execute %}
@@ -69,7 +69,7 @@ oft_sent_events AS (
         30362 AS src_endpoint_id,
         event_data:guid::STRING AS transfer_guid,
         'outbound' AS direction,
-        'layerzero' AS bridge,
+        'stargate' AS bridge,
         _inserted_timestamp
     FROM
         events
@@ -93,7 +93,7 @@ oft_received_events AS (
         event_data:srcEid::NUMBER AS src_endpoint_id,
         event_data:guid::STRING AS transfer_guid,
         'inbound' AS direction,
-        'layerzero' AS bridge,
+        'stargate' AS bridge,
         _inserted_timestamp
     FROM
         events
@@ -197,7 +197,7 @@ final AS (
         '{{ invocation_id }}' AS _invocation_id
     FROM
         combined_events ce
-        LEFT JOIN token_transfers tt ON ce.tx_id = tt.tx_id AND tt.rn = 1
+        LEFT JOIN token_transfers tt ON ce.tx_id = tt.tx_id AND ce.gross_amount = tt.amount
         LEFT JOIN endpoint_ids src ON src.endpoint_id = ce.src_endpoint_id
         LEFT JOIN endpoint_ids dst ON dst.endpoint_id = ce.dst_endpoint_id
 )
diff --git a/models/silver/transfers/silver_evm__bridge_layerzero_s.yml b/models/silver/transfers/silver_evm__bridge_stargate_s.yml
similarity index 90%
rename from models/silver/transfers/silver_evm__bridge_layerzero_s.yml
rename to models/silver/transfers/silver_evm__bridge_stargate_s.yml
index 4083d5a..ee4fdb1 100644
--- a/models/silver/transfers/silver_evm__bridge_layerzero_s.yml
+++ b/models/silver/transfers/silver_evm__bridge_stargate_s.yml
@@ -1,9 +1,9 @@
 version: 2
 
 models:
-  - name: silver_evm__bridge_layerzero_s
+  - name: silver_evm__bridge_stargate_s
     description: |-
-      This table parses transactions where tokens are bridged to or from the Flow EVM network using LayerZero messaging protocol.
+      This table parses transactions where tokens are bridged to or from the Flow EVM network using the Stargate (LayerZero) messaging protocol.
     tests:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:
@@ -36,7 +36,7 @@ models:
                 - FLOAT
 
       - name: bridge_address
-        description: "The LayerZero endpoint contract address"
+        description: "The Stargate endpoint contract address"
         tests:
           - not_null
           - dbt_expectations.expect_column_values_to_be_in_type_list:
@@ -88,7 +88,7 @@ models:
                 - VARCHAR
 
       - name: source_chain
-        description: "Source blockchain for the message, mapped using LayerZero endpoint IDs seed."
+        description: "Source blockchain for the message, mapped using Stargate endpoint IDs seed."
         tests:
           - dbt_expectations.expect_column_values_to_be_in_type_list:
               column_type_list:
@@ -96,7 +96,7 @@ models:
                 - VARCHAR
 
       - name: destination_chain
-        description: "Destination blockchain for the message, mapped using LayerZero endpoint IDs seed."
+        description: "Destination blockchain for the message, mapped using Stargate endpoint IDs seed."
         tests:
           - dbt_expectations.expect_column_values_to_be_in_type_list:
               column_type_list:
@@ -112,7 +112,7 @@ models:
                 - VARCHAR
 
       - name: platform
-        description: "Bridge platform name (always 'layerzero')"
+        description: "Bridge platform name (always 'stargate')"
         tests:
           - not_null
           - dbt_expectations.expect_column_values_to_be_in_type_list:
@@ -121,7 +121,7 @@ models:
                 - VARCHAR
 
       - name: transfer_guid
-        description: "Unique transfer identifier from LayerZero event logs"
+        description: "Unique transfer identifier from Stargate event logs"
         tests:
           - dbt_expectations.expect_column_values_to_be_in_type_list:
               column_type_list:
@@ -135,7 +135,7 @@ models:
               column_type_list:
                 - TIMESTAMP_NTZ
 
-      - name: bridge_layerzero_id
+      - name: bridge_stargate_id
         description: "Unique identifier for this record (surrogate key)"
         tests:
           - not_null