diff --git a/doc/eth-connector.md b/doc/eth-connector.md
index 56e8f07bc..d924198a5 100644
--- a/doc/eth-connector.md
+++ b/doc/eth-connector.md
@@ -22,12 +22,12 @@ $ near call <NEAR_ACC> new_eth_connector '{"prover_account": "<PROVER_NEAR_ACCOU
 
 ## ETH connector specific methods
 * new_eth_connector (call once)
-* deposit (mutable)  
+* deposit (mutable)
 * withdraw (mutable, payable)
-* finish_deposit_near (private, mutable)
+* finish_deposit (private, mutable)
 * ft_total_supply (view)
-* ft_total_supply_near (view)
-* ft_total_supply_eth (view)
+* ft_total_eth_supply_on_near (view)
+* ft_total_eth_supply_on_aurora (view)
 * ft_balance_of (view)
 * ft_balance_of_eth (view)
 * ft_transfer (mutable, payable)
diff --git a/src/connector.rs b/src/connector.rs
index fc3f347e0..244f728cc 100644
--- a/src/connector.rs
+++ b/src/connector.rs
@@ -228,29 +228,18 @@ impl EthConnectorContract {
         let predecessor_account_id = String::from_utf8(sdk::predecessor_account_id()).unwrap();
 
         // Finalize deposit
-        let promise1 = match self.parse_event_message(&event.recipient) {
+        let data = match self.parse_event_message(&event.recipient) {
             // Deposit to NEAR accounts
-            TokenMessageData::Near(account_id) => {
-                let data = FinishDepositCallArgs {
-                    new_owner_id: account_id,
-                    amount: event.amount.as_u128(),
-                    proof_key: proof.get_key(),
-                    relayer_id: predecessor_account_id,
-                    fee: event.fee.as_u128(),
-                    msg: None,
-                }
-                .try_to_vec()
-                .unwrap();
-
-                sdk::promise_then(
-                    promise0,
-                    &sdk::current_account_id(),
-                    b"finish_deposit_near",
-                    &data[..],
-                    NO_DEPOSIT,
-                    GAS_FOR_FINISH_DEPOSIT,
-                )
+            TokenMessageData::Near(account_id) => FinishDepositCallArgs {
+                new_owner_id: account_id,
+                amount: event.amount.as_u128(),
+                proof_key: proof.get_key(),
+                relayer_id: predecessor_account_id,
+                fee: event.fee.as_u128(),
+                msg: None,
             }
+            .try_to_vec()
+            .unwrap(),
             // Deposit to Eth accounts
             // fee is being minted in the `ft_on_transfer` callback method
             TokenMessageData::Eth { address, message } => {
@@ -267,7 +256,7 @@ impl EthConnectorContract {
 
                 let current_account_id = String::from_utf8(sdk::current_account_id()).unwrap();
                 // Send to self - current account id
-                let data = FinishDepositCallArgs {
+                FinishDepositCallArgs {
                     new_owner_id: current_account_id,
                     amount: event.amount.as_u128(),
                     proof_key: proof.get_key(),
@@ -276,32 +265,31 @@ impl EthConnectorContract {
                     msg: Some(transfer_data),
                 }
                 .try_to_vec()
-                .unwrap();
-
-                sdk::promise_then(
-                    promise0,
-                    &sdk::current_account_id(),
-                    b"finish_deposit_near",
-                    &data[..],
-                    NO_DEPOSIT,
-                    GAS_FOR_FINISH_DEPOSIT,
-                )
+                .unwrap()
             }
         };
 
+        let promise1 = sdk::promise_then(
+            promise0,
+            &sdk::current_account_id(),
+            b"finish_deposit",
+            &data[..],
+            NO_DEPOSIT,
+            GAS_FOR_FINISH_DEPOSIT,
+        );
         sdk::promise_return(promise1);
     }
 
-    /// Finish deposit NEAR (private method)
+    /// Finish deposit (private method)
     /// NOTE: we should `record_proof` only after `mint` operation. The reason
     /// is that in this case we only calculate the amount to be credited but
     /// do not save it, however, if an error occurs during the calculation,
     /// this will happen before `record_proof`. After that contract will save.
-    pub fn finish_deposit_near(&mut self) {
+    pub fn finish_deposit(&mut self) {
         sdk::assert_private_call();
         let data: FinishDepositCallArgs =
             FinishDepositCallArgs::try_from_slice(&sdk::read_input()).unwrap();
-        crate::log!(&format!("Finish deposit NEAR amount: {}", data.amount));
+        crate::log!(&format!("Finish deposit with the amount: {}", data.amount));
         assert_eq!(sdk::promise_results_count(), 1);
 
         // Check promise results
@@ -318,7 +306,7 @@ impl EthConnectorContract {
         // Mint tokens to recipient minus fee
         if let Some(msg) = data.msg {
             // Mint - calculate new balances
-            self.mint_near(data.new_owner_id, data.amount);
+            self.mint_eth_on_near(data.new_owner_id, data.amount);
             // Store proof only after `mint` calculations
             self.record_proof(&data.proof_key);
             // Save new contract data
@@ -327,8 +315,8 @@ impl EthConnectorContract {
             self.ft_transfer_call(transfer_call_args);
         } else {
             // Mint - calculate new balances
-            self.mint_near(data.new_owner_id.clone(), data.amount - data.fee);
-            self.mint_near(data.relayer_id, data.fee);
+            self.mint_eth_on_near(data.new_owner_id.clone(), data.amount - data.fee);
+            self.mint_eth_on_near(data.relayer_id, data.fee);
             // Store proof only after `mint` calculations
             self.record_proof(&data.proof_key);
             // Save new contract data
@@ -348,7 +336,7 @@ impl EthConnectorContract {
 
     /// Internal ETH withdraw ETH logic
     pub(crate) fn internal_remove_eth(&mut self, address: &Address, amount: &U256) {
-        self.burn_eth(address.0, amount.as_u128());
+        self.burn_eth_on_aurora(address.0, amount.as_u128());
         self.save_ft_contract();
     }
 
@@ -360,39 +348,39 @@ impl EthConnectorContract {
         self.save_used_event(key);
     }
 
-    ///  Mint NEAR tokens
-    fn mint_near(&mut self, owner_id: AccountId, amount: Balance) {
-        crate::log!(&format!("Mint NEAR {} tokens for: {}", amount, owner_id));
+    ///  Mint nETH tokens
+    fn mint_eth_on_near(&mut self, owner_id: AccountId, amount: Balance) {
+        crate::log!(&format!("Mint {} nETH tokens for: {}", amount, owner_id));
 
         if self.ft.accounts_get(&owner_id).is_none() {
             self.ft.accounts_insert(&owner_id, 0);
         }
-        self.ft.internal_deposit(&owner_id, amount);
+        self.ft.internal_deposit_eth_to_near(&owner_id, amount);
     }
 
     ///  Mint ETH tokens
-    fn mint_eth(&mut self, owner_id: EthAddress, amount: Balance) {
+    fn mint_eth_on_aurora(&mut self, owner_id: EthAddress, amount: Balance) {
         crate::log!(&format!(
-            "Mint ETH {} tokens for: {}",
+            "Mint {} ETH tokens for: {}",
             amount,
             hex::encode(owner_id)
         ));
-        self.ft.internal_deposit_eth(owner_id, amount);
+        self.ft.internal_deposit_eth_to_aurora(owner_id, amount);
     }
 
     /// Burn ETH tokens
-    fn burn_eth(&mut self, address: EthAddress, amount: Balance) {
+    fn burn_eth_on_aurora(&mut self, address: EthAddress, amount: Balance) {
         crate::log!(&format!(
-            "Burn ETH {} tokens for: {}",
+            "Burn {} ETH tokens for: {}",
             amount,
             hex::encode(address)
         ));
-        self.ft.internal_withdraw_eth(address, amount);
+        self.ft.internal_withdraw_eth_from_aurora(address, amount);
     }
 
-    /// Withdraw from NEAR accounts
+    /// Withdraw nETH from NEAR accounts
     /// NOTE: it should be without any log data
-    pub fn withdraw_near(&mut self) {
+    pub fn withdraw_eth_from_near(&mut self) {
         self.assert_not_paused(PAUSE_WITHDRAW);
 
         sdk::assert_one_yocto();
@@ -407,51 +395,48 @@ impl EthConnectorContract {
         // Burn tokens to recipient
         let predecessor_account_id = String::from_utf8(sdk::predecessor_account_id()).unwrap();
         self.ft
-            .internal_withdraw(&predecessor_account_id, args.amount);
+            .internal_withdraw_eth_from_near(&predecessor_account_id, args.amount);
         // Save new contract data
         self.save_ft_contract();
         sdk::return_output(&res[..]);
     }
 
-    /// Return total supply of NEAR + ETH
-    pub fn ft_total_supply(&self) {
-        let total_supply = self.ft.ft_total_supply();
+    /// Returns total ETH supply on NEAR (nETH as NEP-141 token)
+    pub fn ft_total_eth_supply_on_near(&self) {
+        let total_supply = self.ft.ft_total_eth_supply_on_near();
+        crate::log!(&format!("Total ETH supply on NEAR: {}", total_supply));
         sdk::return_output(total_supply.to_string().as_bytes());
-        crate::log!(&format!("Total supply: {}", total_supply));
     }
 
-    /// Return total supply of NEAR
-    pub fn ft_total_supply_near(&self) {
-        let total_supply = self.ft.ft_total_supply_near();
+    /// Returns total ETH supply on Aurora (ETH in Aurora EVM)
+    pub fn ft_total_eth_supply_on_aurora(&self) {
+        let total_supply = self.ft.ft_total_eth_supply_on_aurora();
+        crate::log!(&format!("Total ETH supply on Aurora: {}", total_supply));
         sdk::return_output(total_supply.to_string().as_bytes());
-        crate::log!(&format!("Total supply NEAR: {}", total_supply));
     }
 
-    /// Return total supply of ETH
-    pub fn ft_total_supply_eth(&self) {
-        let total_supply = self.ft.ft_total_supply_eth();
-        sdk::return_output(total_supply.to_string().as_bytes());
-        crate::log!(&format!("Total supply ETH: {}", total_supply));
-    }
-
-    /// Return balance of NEAR
+    /// Return balance of nETH (ETH on Near)
     pub fn ft_balance_of(&self) {
         let args = BalanceOfCallArgs::from(
             parse_json(&sdk::read_input()).expect_utf8(ERR_FAILED_PARSE.as_bytes()),
         );
+
         let balance = self.ft.ft_balance_of(&args.account_id);
-        sdk::return_output(balance.to_string().as_bytes());
         crate::log!(&format!(
-            "Balance of NEAR [{}]: {}",
+            "Balance of nETH [{}]: {}",
             args.account_id, balance
         ));
+
+        sdk::return_output(balance.to_string().as_bytes());
     }
 
-    /// Return balance of ETH
-    pub fn ft_balance_of_eth(&self) {
+    /// Return balance of ETH (ETH in Aurora EVM)
+    pub fn ft_balance_of_eth_on_aurora(&self) {
         let args =
             BalanceOfEthCallArgs::try_from_slice(&sdk::read_input()).expect(ERR_FAILED_PARSE);
-        let balance = self.ft.internal_unwrap_balance_of_eth(args.address);
+        let balance = self
+            .ft
+            .internal_unwrap_balance_of_eth_on_aurora(args.address);
         crate::log!(&format!(
             "Balance of ETH [{}]: {}",
             hex::encode(args.address),
@@ -515,10 +500,13 @@ impl EthConnectorContract {
         // Note: It can't overflow because the total supply doesn't change during transfer.
         let amount_for_check = self
             .ft
-            .internal_unwrap_balance_of_eth(message_data.recipient);
+            .internal_unwrap_balance_of_eth_on_aurora(message_data.recipient);
         assert!(amount_for_check.checked_add(args.amount).is_some());
-        assert!(self.ft.total_supply_eth.checked_add(args.amount).is_some());
-        assert!(self.ft.total_supply.checked_add(args.amount).is_some());
+        assert!(self
+            .ft
+            .total_eth_supply_on_aurora
+            .checked_add(args.amount)
+            .is_some());
 
         self.ft
             .ft_transfer_call(&args.receiver_id, args.amount, &args.memo, args.msg);
@@ -568,11 +556,11 @@ impl EthConnectorContract {
         // Mint fee to relayer
         let relayer = engine.get_relayer(message_data.relayer.as_bytes());
         if fee > 0 && relayer.is_some() {
-            self.mint_eth(message_data.recipient, args.amount - fee);
+            self.mint_eth_on_aurora(message_data.recipient, args.amount - fee);
             let evm_relayer_address: EthAddress = relayer.unwrap().0;
-            self.mint_eth(evm_relayer_address, fee);
+            self.mint_eth_on_aurora(evm_relayer_address, fee);
         } else {
-            self.mint_eth(message_data.recipient, args.amount);
+            self.mint_eth_on_aurora(message_data.recipient, args.amount);
         }
         self.save_ft_contract();
         sdk::return_output(0.to_string().as_bytes());
diff --git a/src/fungible_token.rs b/src/fungible_token.rs
index 901284925..a384579ca 100644
--- a/src/fungible_token.rs
+++ b/src/fungible_token.rs
@@ -17,11 +17,11 @@ const GAS_FOR_FT_ON_TRANSFER: Gas = 10_000_000_000_000;
 
 #[derive(Debug, Default, BorshDeserialize, BorshSerialize)]
 pub struct FungibleToken {
-    /// Total supply of the all token.
-    pub total_supply: Balance,
+    /// Total ETH supply on Near (nETH as NEP-141 token)
+    pub total_eth_supply_on_near: Balance,
 
-    /// Total supply of the all ETH token.
-    pub total_supply_eth: Balance,
+    /// Total ETH supply on Aurora (ETH in Aurora EVM)
+    pub total_eth_supply_on_aurora: Balance,
 
     /// The storage size in bytes for one account.
     pub account_storage_usage: StorageUsage,
@@ -33,28 +33,28 @@ impl FungibleToken {
         Self::default()
     }
 
-    /// Balance of NEAR tokens
-    pub fn internal_unwrap_balance_of(&self, account_id: &str) -> Balance {
+    /// Balance of nETH (ETH on NEAR token)
+    pub fn internal_unwrap_balance_of_eth_on_near(&self, account_id: &str) -> Balance {
         match self.accounts_get(account_id) {
             Some(balance) => u128::try_from_slice(&balance[..]).unwrap(),
             None => sdk::panic_utf8(b"ERR_ACCOUNT_NOT_EXIST"),
         }
     }
 
-    /// Balance of ETH tokens
-    pub fn internal_unwrap_balance_of_eth(&self, address: EthAddress) -> Balance {
+    /// Balance of ETH (ETH on Aurora)
+    pub fn internal_unwrap_balance_of_eth_on_aurora(&self, address: EthAddress) -> Balance {
         engine::Engine::get_balance(&prelude::Address(address))
             .raw()
             .as_u128()
     }
 
-    /// Internal deposit NEAR - NEP-141
-    pub fn internal_deposit(&mut self, account_id: &str, amount: Balance) {
-        let balance = self.internal_unwrap_balance_of(account_id);
+    /// Internal ETH deposit to NEAR - nETH (NEP-141)
+    pub fn internal_deposit_eth_to_near(&mut self, account_id: &str, amount: Balance) {
+        let balance = self.internal_unwrap_balance_of_eth_on_near(account_id);
         if let Some(new_balance) = balance.checked_add(amount) {
             self.accounts_insert(account_id, new_balance);
-            self.total_supply = self
-                .total_supply
+            self.total_eth_supply_on_near = self
+                .total_eth_supply_on_near
                 .checked_add(amount)
                 .expect("ERR_TOTAL_SUPPLY_OVERFLOW");
         } else {
@@ -62,20 +62,16 @@ impl FungibleToken {
         }
     }
 
-    /// Internal deposit ETH (nETH)
-    pub fn internal_deposit_eth(&mut self, address: EthAddress, amount: Balance) {
-        let balance = self.internal_unwrap_balance_of_eth(address);
+    /// Internal ETH deposit to Aurora
+    pub fn internal_deposit_eth_to_aurora(&mut self, address: EthAddress, amount: Balance) {
+        let balance = self.internal_unwrap_balance_of_eth_on_aurora(address);
         if let Some(new_balance) = balance.checked_add(amount) {
             engine::Engine::set_balance(
                 &prelude::Address(address),
                 &Wei::new(U256::from(new_balance)),
             );
-            self.total_supply_eth = self
-                .total_supply_eth
-                .checked_add(amount)
-                .expect("ERR_TOTAL_SUPPLY_OVERFLOW");
-            self.total_supply = self
-                .total_supply
+            self.total_eth_supply_on_aurora = self
+                .total_eth_supply_on_aurora
                 .checked_add(amount)
                 .expect("ERR_TOTAL_SUPPLY_OVERFLOW");
         } else {
@@ -85,17 +81,17 @@ impl FungibleToken {
 
     /// Needed by engine to update balances after a transaction (see ApplyBackend for Engine)
     pub(crate) fn internal_set_eth_balance(&mut self, address: EthAddress, new_balance: Balance) {
-        let current_balance = self.internal_unwrap_balance_of_eth(address);
+        let current_balance = self.internal_unwrap_balance_of_eth_on_aurora(address);
         match current_balance.cmp(&new_balance) {
             Ordering::Less => {
                 // current_balance is smaller, so we need to deposit
                 let diff = new_balance - current_balance;
-                self.internal_deposit_eth(address, diff);
+                self.internal_deposit_eth_to_aurora(address, diff);
             }
             Ordering::Greater => {
                 // current_balance is larger, so we need to withdraw
                 let diff = current_balance - new_balance;
-                self.internal_withdraw_eth(address, diff);
+                self.internal_withdraw_eth_from_aurora(address, diff);
             }
             // if the balances are equal then we do not need to do anything
             Ordering::Equal => (),
@@ -103,12 +99,12 @@ impl FungibleToken {
     }
 
     /// Withdraw NEAR tokens
-    pub fn internal_withdraw(&mut self, account_id: &str, amount: Balance) {
-        let balance = self.internal_unwrap_balance_of(account_id);
+    pub fn internal_withdraw_eth_from_near(&mut self, account_id: &str, amount: Balance) {
+        let balance = self.internal_unwrap_balance_of_eth_on_near(account_id);
         if let Some(new_balance) = balance.checked_sub(amount) {
             self.accounts_insert(account_id, new_balance);
-            self.total_supply = self
-                .total_supply
+            self.total_eth_supply_on_near = self
+                .total_eth_supply_on_near
                 .checked_sub(amount)
                 .expect("ERR_TOTAL_SUPPLY_OVERFLOW");
         } else {
@@ -117,19 +113,15 @@ impl FungibleToken {
     }
 
     /// Withdraw ETH tokens
-    pub fn internal_withdraw_eth(&mut self, address: EthAddress, amount: Balance) {
-        let balance = self.internal_unwrap_balance_of_eth(address);
+    pub fn internal_withdraw_eth_from_aurora(&mut self, address: EthAddress, amount: Balance) {
+        let balance = self.internal_unwrap_balance_of_eth_on_aurora(address);
         if let Some(new_balance) = balance.checked_sub(amount) {
             engine::Engine::set_balance(
                 &prelude::Address(address),
                 &Wei::new(U256::from(new_balance)),
             );
-            self.total_supply_eth = self
-                .total_supply_eth
-                .checked_sub(amount)
-                .expect("ERR_TOTAL_SUPPLY_OVERFLOW");
-            self.total_supply = self
-                .total_supply
+            self.total_eth_supply_on_aurora = self
+                .total_eth_supply_on_aurora
                 .checked_sub(amount)
                 .expect("ERR_TOTAL_SUPPLY_OVERFLOW");
         } else {
@@ -138,7 +130,7 @@ impl FungibleToken {
     }
 
     /// Transfer NEAR tokens
-    pub fn internal_transfer(
+    pub fn internal_transfer_eth_on_near(
         &mut self,
         sender_id: &str,
         receiver_id: &str,
@@ -150,8 +142,8 @@ impl FungibleToken {
             "Sender and receiver should be different"
         );
         assert!(amount > 0, "The amount should be a positive number");
-        self.internal_withdraw(sender_id, amount);
-        self.internal_deposit(receiver_id, amount);
+        self.internal_withdraw_eth_from_near(sender_id, amount);
+        self.internal_deposit_eth_to_near(receiver_id, amount);
         crate::log!(&format!(
             "Transfer {} from {} to {}",
             amount, sender_id, receiver_id
@@ -170,19 +162,15 @@ impl FungibleToken {
         sdk::assert_one_yocto();
         let predecessor_account_id = sdk::predecessor_account_id();
         let sender_id = str_from_slice(&predecessor_account_id);
-        self.internal_transfer(sender_id, receiver_id, amount, memo);
-    }
-
-    pub fn ft_total_supply(&self) -> u128 {
-        self.total_supply
+        self.internal_transfer_eth_on_near(sender_id, receiver_id, amount, memo);
     }
 
-    pub fn ft_total_supply_near(&self) -> u128 {
-        self.total_supply - self.total_supply_eth
+    pub fn ft_total_eth_supply_on_near(&self) -> u128 {
+        self.total_eth_supply_on_near
     }
 
-    pub fn ft_total_supply_eth(&self) -> u128 {
-        self.total_supply_eth
+    pub fn ft_total_eth_supply_on_aurora(&self) -> u128 {
+        self.total_eth_supply_on_aurora
     }
 
     pub fn ft_balance_of(&self, account_id: &str) -> u128 {
@@ -204,7 +192,7 @@ impl FungibleToken {
         let sender_id = str_from_slice(&predecessor_account_id);
         // Special case for Aurora transfer itself - we shouldn't transfer
         if sender_id != receiver_id {
-            self.internal_transfer(sender_id, receiver_id, amount, memo);
+            self.internal_transfer_eth_on_near(sender_id, receiver_id, amount, memo);
         }
         let data1: String = NEP141FtOnTransferArgs {
             amount,
@@ -299,7 +287,7 @@ impl FungibleToken {
                     (amount - refund_amount, 0)
                 } else {
                     // Sender's account was deleted, so we need to burn tokens.
-                    self.total_supply -= refund_amount;
+                    self.total_eth_supply_on_near -= refund_amount;
                     crate::log!("The account of the sender was deleted");
                     (amount, refund_amount)
                 };
@@ -330,7 +318,7 @@ impl FungibleToken {
             let balance = u128::try_from_slice(&balance[..]).unwrap();
             if balance == 0 || force {
                 self.accounts_remove(account_id);
-                self.total_supply -= balance;
+                self.total_eth_supply_on_near -= balance;
                 let amount = self.storage_balance_bounds().min + 1;
                 let promise0 = sdk::promise_batch_create(&account_id_key);
                 sdk::promise_batch_action_transfer(promise0, amount);
diff --git a/src/lib.rs b/src/lib.rs
index a377f917d..e964eee99 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -468,7 +468,7 @@ mod contract {
 
     #[no_mangle]
     pub extern "C" fn withdraw() {
-        EthConnectorContract::get_instance().withdraw_near()
+        EthConnectorContract::get_instance().withdraw_eth_from_near()
     }
 
     #[no_mangle]
@@ -477,8 +477,8 @@ mod contract {
     }
 
     #[no_mangle]
-    pub extern "C" fn finish_deposit_near() {
-        EthConnectorContract::get_instance().finish_deposit_near();
+    pub extern "C" fn finish_deposit() {
+        EthConnectorContract::get_instance().finish_deposit();
     }
 
     #[no_mangle]
@@ -492,17 +492,17 @@ mod contract {
 
     #[no_mangle]
     pub extern "C" fn ft_total_supply() {
-        EthConnectorContract::get_instance().ft_total_supply();
+        EthConnectorContract::get_instance().ft_total_eth_supply_on_near();
     }
 
     #[no_mangle]
-    pub extern "C" fn ft_total_supply_near() {
-        EthConnectorContract::get_instance().ft_total_supply_near();
+    pub extern "C" fn ft_total_eth_supply_on_near() {
+        EthConnectorContract::get_instance().ft_total_eth_supply_on_near();
     }
 
     #[no_mangle]
-    pub extern "C" fn ft_total_supply_eth() {
-        EthConnectorContract::get_instance().ft_total_supply_eth();
+    pub extern "C" fn ft_total_eth_supply_on_aurora() {
+        EthConnectorContract::get_instance().ft_total_eth_supply_on_aurora();
     }
 
     #[no_mangle]
@@ -512,7 +512,7 @@ mod contract {
 
     #[no_mangle]
     pub extern "C" fn ft_balance_of_eth() {
-        EthConnectorContract::get_instance().ft_balance_of_eth();
+        EthConnectorContract::get_instance().ft_balance_of_eth_on_aurora();
     }
 
     #[no_mangle]
diff --git a/src/test_utils/mod.rs b/src/test_utils/mod.rs
index 9b13d74bf..9f6bf6708 100644
--- a/src/test_utils/mod.rs
+++ b/src/test_utils/mod.rs
@@ -204,8 +204,7 @@ impl AuroraRunner {
                 .get(&ft_key)
                 .map(|bytes| FungibleToken::try_from_slice(&bytes).unwrap())
                 .unwrap_or_default();
-            current_ft.total_supply += init_balance.raw().as_u128();
-            current_ft.total_supply_eth += init_balance.raw().as_u128();
+            current_ft.total_eth_supply_on_aurora += init_balance.raw().as_u128();
             current_ft
         };
 
diff --git a/tests/test_connector.rs b/tests/test_connector.rs
index 71fe76bd2..db5cb03bb 100644
--- a/tests/test_connector.rs
+++ b/tests/test_connector.rs
@@ -130,7 +130,10 @@ fn validate_eth_address(address: &str) -> EthAddress {
     result
 }
 
-fn call_deposit_near(master_account: &UserAccount, contract: &str) -> Vec<Option<ExecutionResult>> {
+fn call_deposit_eth_to_near(
+    master_account: &UserAccount,
+    contract: &str,
+) -> Vec<Option<ExecutionResult>> {
     let proof: Proof = serde_json::from_str(PROOF_DATA_NEAR).unwrap();
     let res = master_account.call(
         contract.to_string(),
@@ -185,7 +188,7 @@ fn print_logs(logs: &Vec<String>) {
     }
 }
 
-fn call_deposit_eth(master_account: &UserAccount, contract: &str) {
+fn call_deposit_eth_to_aurora(master_account: &UserAccount, contract: &str) {
     let proof: Proof = serde_json::from_str(PROOF_DATA_ETH).unwrap();
     let res = master_account.call(
         contract.to_string(),
@@ -198,7 +201,7 @@ fn call_deposit_eth(master_account: &UserAccount, contract: &str) {
     //println!("{:#?}", res.promise_results());
 }
 
-fn get_near_balance(master_account: &UserAccount, acc: &str, contract: &str) -> u128 {
+fn get_eth_on_near_balance(master_account: &UserAccount, acc: &str, contract: &str) -> u128 {
     #[derive(BorshSerialize)]
     pub struct BalanceOfCallArgs {
         pub account_id: String,
@@ -240,16 +243,16 @@ fn total_supply(master_account: &UserAccount, contract: &str) -> u128 {
         .unwrap()
 }
 
-fn total_supply_near(master_account: &UserAccount, contract: &str) -> u128 {
-    let balance = master_account.view(contract.to_string(), "ft_total_supply_near", &[]);
+fn total_eth_supply_on_near(master_account: &UserAccount, contract: &str) -> u128 {
+    let balance = master_account.view(contract.to_string(), "ft_total_eth_supply_on_near", &[]);
     String::from_utf8(balance.unwrap())
         .unwrap()
         .parse()
         .unwrap()
 }
 
-fn total_supply_eth(master_account: &UserAccount, contract: &str) -> u128 {
-    let balance = master_account.view(contract.to_string(), "ft_total_supply_eth", &[]);
+fn total_eth_supply_on_aurora(master_account: &UserAccount, contract: &str) -> u128 {
+    let balance = master_account.view(contract.to_string(), "ft_total_eth_supply_on_aurora", &[]);
     String::from_utf8(balance.unwrap())
         .unwrap()
         .parse()
@@ -257,23 +260,23 @@ fn total_supply_eth(master_account: &UserAccount, contract: &str) -> u128 {
 }
 
 #[test]
-fn test_near_deposit_balance_total_supply() {
+fn test_deposit_eth_to_near_balance_total_supply() {
     let (master_account, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
-    let balance = get_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT - DEPOSITED_FEE);
 
-    let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_FEE);
 
     let balance = total_supply(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT);
 
-    let balance = total_supply_near(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_near(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT);
 
-    let balance = total_supply_eth(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_aurora(&master_account, CONTRACT_ACC);
     assert_eq!(balance, 0);
 }
 
@@ -283,7 +286,7 @@ pub struct RegisterRelayerCallArgs {
 }
 
 #[test]
-fn test_eth_deposit_balance_total_supply() {
+fn test_deposit_eth_to_aurora_balance_total_supply() {
     let (master_account, contract) = init(EVM_CUSTODIAN_ADDRESS);
     let res = contract.call(
         CONTRACT_ACC.to_string(),
@@ -298,7 +301,7 @@ fn test_eth_deposit_balance_total_supply() {
     );
     res.assert_success();
 
-    call_deposit_eth(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_aurora(&contract, CONTRACT_ACC);
     assert_proof_was_used(&contract, CONTRACT_ACC, PROOF_DATA_ETH);
 
     let balance = get_eth_balance(
@@ -316,19 +319,19 @@ fn test_eth_deposit_balance_total_supply() {
     assert_eq!(balance, DEPOSITED_EVM_FEE);
 
     let balance = total_supply(&master_account, CONTRACT_ACC);
-    assert_eq!(balance, DEPOSITED_EVM_AMOUNT * 2);
+    assert_eq!(balance, DEPOSITED_EVM_AMOUNT);
 
-    let balance = total_supply_eth(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_near(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_EVM_AMOUNT);
 
-    let balance = total_supply_near(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_aurora(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_EVM_AMOUNT);
 }
 
 #[test]
-fn test_withdraw_near() {
+fn test_withdraw_eth_from_near() {
     let (master_account, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
     let withdraw_amount = 100;
     let recipient_addr = validate_eth_address(RECIPIENT_ETH_ADDRESS);
@@ -359,10 +362,10 @@ fn test_withdraw_near() {
         _ => panic!(),
     }
 
-    let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_FEE - withdraw_amount as u128);
 
-    let balance = get_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT - DEPOSITED_FEE);
 
     let balance = total_supply(&master_account, CONTRACT_ACC);
@@ -372,7 +375,7 @@ fn test_withdraw_near() {
 #[test]
 fn test_ft_transfer() {
     let (master_account, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
     let transfer_amount = 70;
     let res = contract.call(
@@ -390,34 +393,34 @@ fn test_ft_transfer() {
     );
     res.assert_success();
 
-    let balance = get_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
     assert_eq!(
         balance,
         DEPOSITED_AMOUNT - DEPOSITED_FEE + transfer_amount as u128
     );
 
-    let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_FEE - transfer_amount as u128);
 
     let balance = total_supply(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT);
 
-    let balance = total_supply_eth(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_aurora(&master_account, CONTRACT_ACC);
     assert_eq!(balance, 0);
 
-    let balance = total_supply_near(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_near(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT);
 }
 
 #[test]
 fn test_ft_transfer_call_eth() {
     let (master_account, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
-    let balance = get_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT - DEPOSITED_FEE);
 
-    let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_FEE);
 
     let res = contract.call(
@@ -453,10 +456,10 @@ fn test_ft_transfer_call_eth() {
     );
     res.assert_success();
 
-    let balance = get_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT - DEPOSITED_FEE);
 
-    let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_FEE);
 
     let balance = get_eth_balance(
@@ -474,12 +477,12 @@ fn test_ft_transfer_call_eth() {
     assert_eq!(balance, fee);
 
     let balance = total_supply(&master_account, CONTRACT_ACC);
-    assert_eq!(balance, DEPOSITED_AMOUNT + transfer_amount);
+    assert_eq!(balance, DEPOSITED_AMOUNT);
 
-    let balance = total_supply_near(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_near(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT);
 
-    let balance = total_supply_eth(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_aurora(&master_account, CONTRACT_ACC);
     assert_eq!(balance, transfer_amount);
 }
 
@@ -489,7 +492,7 @@ fn test_deposit_with_same_proof() {
 
     assert_proof_was_not_used(&contract, CONTRACT_ACC, PROOF_DATA_NEAR);
 
-    let promises = call_deposit_near(&contract, CONTRACT_ACC);
+    let promises = call_deposit_eth_to_near(&contract, CONTRACT_ACC);
     for p in promises.iter() {
         assert!(p.is_some());
         let p = p.as_ref().unwrap();
@@ -498,7 +501,7 @@ fn test_deposit_with_same_proof() {
 
     assert_proof_was_used(&contract, CONTRACT_ACC, PROOF_DATA_NEAR);
 
-    let promises = call_deposit_near(&contract, CONTRACT_ACC);
+    let promises = call_deposit_eth_to_near(&contract, CONTRACT_ACC);
     let promise = &promises[promises.len() - 2];
     assert_execution_status_failure(
         promise.as_ref().unwrap().outcome().clone().status,
@@ -511,7 +514,7 @@ fn test_deposit_with_same_proof() {
 fn test_deposit_wrong_custodian_address() {
     let wrong_custodian_address = "0000000000000000000000000000000000000001";
     let (_master_account, contract) = init(wrong_custodian_address);
-    let promises = call_deposit_near(&contract, CONTRACT_ACC);
+    let promises = call_deposit_eth_to_near(&contract, CONTRACT_ACC);
     let promise = &promises[promises.len() - 2];
     assert_execution_status_failure(
         promise.as_ref().unwrap().outcome().clone().status,
@@ -525,12 +528,12 @@ fn test_deposit_wrong_custodian_address() {
 #[test]
 fn test_ft_transfer_call_without_relayer() {
     let (master_account, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
-    let balance = get_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT - DEPOSITED_FEE);
 
-    let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_FEE);
 
     let transfer_amount = 50;
@@ -554,10 +557,10 @@ fn test_ft_transfer_call_without_relayer() {
     );
     res.assert_success();
 
-    let balance = get_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT - DEPOSITED_FEE);
 
-    let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_FEE);
 
     let balance = get_eth_balance(
@@ -575,19 +578,19 @@ fn test_ft_transfer_call_without_relayer() {
     assert_eq!(balance, 0);
 
     let balance = total_supply(&master_account, CONTRACT_ACC);
-    assert_eq!(balance, DEPOSITED_AMOUNT + transfer_amount);
+    assert_eq!(balance, DEPOSITED_AMOUNT);
 
-    let balance = total_supply_near(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_near(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT);
 
-    let balance = total_supply_eth(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_aurora(&master_account, CONTRACT_ACC);
     assert_eq!(balance, transfer_amount);
 }
 
 #[test]
 fn test_ft_transfer_call_fee_greater_than_amount() {
     let (master_account, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
     let transfer_amount = 10;
     let fee = transfer_amount + 10;
@@ -613,10 +616,10 @@ fn test_ft_transfer_call_fee_greater_than_amount() {
         _ => panic!(),
     }
 
-    let balance = get_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT - DEPOSITED_FEE);
 
-    let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_FEE);
 
     let balance = get_eth_balance(
@@ -636,10 +639,10 @@ fn test_ft_transfer_call_fee_greater_than_amount() {
     let balance = total_supply(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT);
 
-    let balance = total_supply_near(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_near(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT);
 
-    let balance = total_supply_eth(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_aurora(&master_account, CONTRACT_ACC);
     assert_eq!(balance, 0);
 }
 
@@ -820,11 +823,11 @@ fn test_deposit_pausability() {
 }
 
 #[test]
-fn test_withdraw_near_pausability() {
+fn test_withdraw_from_near_pausability() {
     let (master_account, contract) = init(CUSTODIAN_ADDRESS);
     let user_account = create_user_account(&master_account);
 
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
     let withdraw_amount = 100;
     let recipient_addr = validate_eth_address(RECIPIENT_ETH_ADDRESS);
@@ -904,7 +907,7 @@ fn test_withdraw_near_pausability() {
 #[test]
 fn test_get_accounts_counter() {
     let (master_account, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
     let counter = master_account
         .view(CONTRACT_ACC.into(), "get_accounts_counter", &[])
@@ -915,7 +918,7 @@ fn test_get_accounts_counter() {
 #[test]
 fn test_get_accounts_counter_and_transfer() {
     let (master_account, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
     let counter = master_account
         .view(CONTRACT_ACC.into(), "get_accounts_counter", &[])
@@ -938,22 +941,22 @@ fn test_get_accounts_counter_and_transfer() {
     );
     res.assert_success();
 
-    let balance = get_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
     assert_eq!(
         balance,
         DEPOSITED_AMOUNT - DEPOSITED_FEE + transfer_amount as u128
     );
 
-    let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_FEE - transfer_amount as u128);
 
     let balance = total_supply(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT);
 
-    let balance = total_supply_eth(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_aurora(&master_account, CONTRACT_ACC);
     assert_eq!(balance, 0);
 
-    let balance = total_supply_near(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_near(&master_account, CONTRACT_ACC);
     assert_eq!(balance, DEPOSITED_AMOUNT);
 
     let counter = master_account
@@ -963,7 +966,7 @@ fn test_get_accounts_counter_and_transfer() {
 }
 
 #[test]
-fn test_deposit_near_with_zero_fee() {
+fn test_deposit_to_near_with_zero_fee() {
     let (master_account, contract) = init(CUSTODIAN_ADDRESS);
     let proof_str = r#"{"log_index":0,"log_entry_data":[248,251,148,9,109,233,194,184,165,184,194,44,238,50,137,177,1,246,150,13,104,229,30,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"receipt_index":0,"receipt_data":[249,2,6,1,130,106,249,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,253,248,251,148,9,109,233,194,184,165,184,194,44,238,50,137,177,1,246,150,13,104,229,30,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"header_data":[249,2,23,160,7,139,123,21,146,99,81,234,117,153,151,30,67,221,231,90,105,219,121,127,196,224,201,83,178,31,173,155,190,123,227,174,160,29,204,77,232,222,199,93,122,171,133,181,103,182,204,212,26,211,18,69,27,148,138,116,19,240,161,66,253,64,212,147,71,148,109,150,79,199,61,172,73,162,195,49,105,169,235,252,47,207,92,249,136,136,160,227,202,170,144,85,104,169,90,220,93,227,155,76,252,229,223,163,146,127,223,157,121,27,238,116,64,112,216,124,129,107,9,160,158,128,122,7,117,120,186,231,92,224,181,67,43,66,153,79,155,38,238,166,68,1,151,100,134,126,214,86,59,66,174,201,160,235,177,124,164,253,179,174,206,160,196,186,61,51,64,217,35,121,86,229,24,251,162,51,82,72,31,218,240,150,32,157,48,185,1,0,0,0,8,0,0,32,0,0,0,0,0,0,128,0,0,0,2,0,128,0,64,32,0,0,0,0,0,0,64,0,0,10,0,0,0,0,0,0,3,0,0,0,0,64,128,0,0,64,0,0,0,0,0,16,0,0,130,0,1,16,0,32,4,0,0,0,0,0,2,1,0,0,0,0,0,8,0,8,0,0,32,0,4,128,2,0,128,0,0,0,0,0,0,0,0,0,4,32,0,8,2,0,0,0,128,65,0,136,0,0,40,0,0,0,8,0,0,128,0,34,0,4,0,185,2,0,0,4,32,128,0,2,0,0,0,128,0,0,10,0,1,0,1,0,0,0,0,32,1,8,128,0,0,4,0,0,0,128,128,0,70,0,0,0,0,0,0,16,64,0,64,0,34,64,0,0,0,4,0,0,0,0,1,128,0,9,0,0,0,0,0,16,0,0,64,2,0,0,0,132,0,64,32,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,4,0,0,0,32,8,0,16,0,8,0,16,68,0,0,0,16,0,0,0,128,0,64,0,0,128,0,0,0,0,0,0,0,16,0,1,0,16,132,49,181,116,68,131,157,92,101,131,122,18,0,131,101,155,9,132,96,174,110,74,153,216,131,1,10,1,132,103,101,116,104,134,103,111,49,46,49,54,135,119,105,110,100,111,119,115,160,228,82,26,232,236,82,141,6,111,169,92,14,115,254,59,131,192,3,202,209,126,79,140,182,163,12,185,45,210,17,60,38,136,84,114,37,115,236,183,145,213],"proof":[[248,145,160,187,129,186,104,13,250,13,252,114,170,223,247,137,53,113,225,188,217,54,244,108,193,247,236,197,29,0,161,119,76,227,184,160,66,209,234,66,254,223,80,22,246,80,204,38,2,90,115,201,183,79,207,47,192,234,143,221,89,78,36,199,127,9,55,190,160,91,160,251,58,165,255,90,2,105,47,46,220,67,3,52,105,42,182,130,224,19,162,115,159,136,158,218,93,187,148,188,9,128,128,128,128,128,160,181,223,248,223,173,187,103,169,52,204,62,13,90,70,147,236,199,27,201,112,157,4,139,63,188,12,98,117,10,82,85,125,128,128,128,128,128,128,128,128],[249,2,13,48,185,2,9,249,2,6,1,130,106,249,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,253,248,251,148,9,109,233,194,184,165,184,194,44,238,50,137,177,1,246,150,13,104,229,30,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]}"#;
     let proof: Proof = serde_json::from_str(proof_str).unwrap();
@@ -980,24 +983,24 @@ fn test_deposit_near_with_zero_fee() {
 
     let deposited_amount = 3000;
 
-    let balance = get_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, DEPOSITED_RECIPIENT, CONTRACT_ACC);
     assert_eq!(balance, deposited_amount);
 
-    let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
+    let balance = get_eth_on_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
     assert_eq!(balance, 0);
 
     let balance = total_supply(&master_account, CONTRACT_ACC);
     assert_eq!(balance, deposited_amount);
 
-    let balance = total_supply_near(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_near(&master_account, CONTRACT_ACC);
     assert_eq!(balance, deposited_amount);
 
-    let balance = total_supply_eth(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_aurora(&master_account, CONTRACT_ACC);
     assert_eq!(balance, 0);
 }
 
 #[test]
-fn test_deposit_evm_with_zero_fee() {
+fn test_deposit_to_aurora_with_zero_fee() {
     let (master_account, contract) = init(EVM_CUSTODIAN_ADDRESS);
     let res = contract.call(
         CONTRACT_ACC.to_string(),
@@ -1042,17 +1045,17 @@ fn test_deposit_evm_with_zero_fee() {
     assert_eq!(balance, 0);
 
     let balance = total_supply(&master_account, CONTRACT_ACC);
-    assert_eq!(balance, deposited_amount * 2);
+    assert_eq!(balance, deposited_amount);
 
-    let balance = total_supply_eth(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_aurora(&master_account, CONTRACT_ACC);
     assert_eq!(balance, deposited_amount);
 
-    let balance = total_supply_near(&master_account, CONTRACT_ACC);
+    let balance = total_eth_supply_on_near(&master_account, CONTRACT_ACC);
     assert_eq!(balance, deposited_amount);
 }
 
 #[test]
-fn test_deposit_near_amount_less_fee() {
+fn test_deposit_to_near_amount_less_fee() {
     let custodian_address = "73c8931CA2aD746d97a59A7ABDDa0a9205F7ffF9";
     let (master_account, contract) = init(custodian_address);
     let proof_str = r#"{"log_index":0,"log_entry_data":[248,251,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"receipt_index":0,"receipt_data":[249,2,6,1,130,106,251,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,253,248,251,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"header_data":[249,2,10,160,139,92,51,142,163,95,21,160,61,29,148,206,54,147,187,96,77,109,244,8,130,155,249,198,206,30,173,216,144,176,252,123,160,29,204,77,232,222,199,93,122,171,133,181,103,182,204,212,26,211,18,69,27,148,138,116,19,240,161,66,253,64,212,147,71,148,124,28,230,160,8,239,64,193,62,78,177,68,166,204,116,240,224,174,172,126,160,218,9,209,192,173,39,133,109,141,57,2,146,184,12,94,217,6,138,173,67,121,185,24,179,133,189,219,40,81,210,73,106,160,219,108,244,199,44,203,84,71,126,74,82,240,203,255,238,20,226,29,239,51,7,19,144,34,156,137,232,159,71,30,164,29,160,209,61,241,33,17,103,192,203,57,156,112,250,18,166,26,237,248,153,226,185,87,220,156,93,249,17,39,190,125,96,247,239,185,1,0,0,0,8,0,0,0,0,0,0,0,0,1,0,0,0,0,0,128,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,32,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,32,0,0,0,0,8,0,0,2,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,8,0,0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0,0,0,0,144,4,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,132,91,80,110,139,131,157,118,104,131,122,18,0,131,30,4,87,132,96,175,154,220,140,115,112,105,100,101,114,49,48,1,2,9,64,160,80,163,212,151,183,11,70,219,178,190,167,172,64,187,47,14,29,226,253,132,116,145,81,143,54,249,121,123,193,241,120,249,136,244,120,239,134,243,43,177,139],"proof":[[248,81,160,164,35,68,182,184,52,174,73,6,81,4,92,187,190,187,106,255,124,123,24,244,168,161,247,60,181,75,29,192,175,96,140,128,128,128,128,128,128,128,160,169,157,199,164,106,205,109,88,111,183,255,180,108,15,155,137,126,163,108,44,117,125,138,221,3,188,93,85,146,129,19,139,128,128,128,128,128,128,128,128],[249,2,13,48,185,2,9,249,2,6,1,130,106,251,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,253,248,251,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]}"#;
@@ -1075,7 +1078,7 @@ fn test_deposit_near_amount_less_fee() {
 }
 
 #[test]
-fn test_deposit_evm_amount_less_fee() {
+fn test_deposit_to_aurora_amount_less_fee() {
     let custodian_address = "73c8931CA2aD746d97a59A7ABDDa0a9205F7ffF9";
     let (master_account, contract) = init(custodian_address);
     let proof_str = r#"{"log_index":0,"log_entry_data":[249,1,27,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,101,116,104,95,99,111,110,110,101,99,116,111,114,46,114,111,111,116,58,56,57,49,66,50,55,52,57,50,51,56,66,50,55,102,70,53,56,101,57,53,49,48,56,56,101,53,53,98,48,52,100,101,55,49,68,99,51,55,52,0,0,0,0,0],"receipt_index":0,"receipt_data":[249,2,40,1,130,121,119,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,1,30,249,1,27,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,101,116,104,95,99,111,110,110,101,99,116,111,114,46,114,111,111,116,58,56,57,49,66,50,55,52,57,50,51,56,66,50,55,102,70,53,56,101,57,53,49,48,56,56,101,53,53,98,48,52,100,101,55,49,68,99,51,55,52,0,0,0,0,0],"header_data":[249,2,10,160,234,97,221,132,104,51,119,219,129,206,197,27,130,197,14,113,167,32,152,214,207,205,156,210,35,213,198,227,116,42,51,224,160,29,204,77,232,222,199,93,122,171,133,181,103,182,204,212,26,211,18,69,27,148,138,116,19,240,161,66,253,64,212,147,71,148,124,28,230,160,8,239,64,193,62,78,177,68,166,204,116,240,224,174,172,126,160,15,150,233,184,181,140,226,81,205,139,229,87,226,149,49,207,117,33,36,83,124,8,75,199,231,48,13,23,189,217,179,12,160,241,37,169,74,233,62,231,112,0,207,95,228,68,240,108,254,57,199,255,130,142,158,161,180,243,50,255,222,77,251,252,126,160,31,111,236,60,142,91,35,119,195,92,158,134,65,138,8,247,98,122,229,21,226,85,38,130,141,139,168,60,83,90,63,244,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,128,0,0,0,0,128,0,0,0,32,0,0,0,0,0,0,64,0,0,10,0,0,0,0,0,0,1,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1,0,0,0,0,0,8,0,0,2,0,0,0,4,0,2,0,0,0,0,0,0,0,0,0,0,0,4,0,0,8,2,0,0,0,0,0,0,136,0,4,40,0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,0,0,32,0,0,10,0,0,0,0,0,0,10,0,1,0,0,0,0,0,0,32,0,0,128,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,16,0,0,64,0,34,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,128,2,0,0,0,128,0,1,32,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,4,0,0,0,32,128,0,0,0,0,0,16,0,0,0,0,0,0,0,0,128,0,0,0,0,128,0,0,0,0,0,0,0,16,0,1,0,16,132,91,127,63,197,131,157,118,142,131,122,18,0,131,25,25,181,132,96,175,156,157,140,115,112,105,100,101,114,49,48,1,2,9,64,160,68,227,115,157,18,184,21,217,93,74,196,34,230,228,210,239,61,26,221,245,191,46,44,135,134,2,20,53,95,18,128,54,136,162,198,27,59,153,146,63,16],"proof":[[248,113,160,204,110,241,220,150,206,51,121,104,130,125,127,249,35,9,242,107,45,164,62,147,221,93,116,73,79,49,96,226,92,235,247,160,43,215,154,177,148,177,15,202,141,217,45,114,108,33,74,0,144,126,189,26,78,152,232,105,119,103,203,51,79,45,113,124,128,128,128,128,128,128,160,74,177,164,103,85,250,153,17,105,68,205,207,176,48,89,230,100,35,20,167,34,117,11,115,14,107,128,214,48,17,53,209,128,128,128,128,128,128,128,128],[249,2,47,48,185,2,43,249,2,40,1,130,121,119,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,1,30,249,1,27,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,101,116,104,95,99,111,110,110,101,99,116,111,114,46,114,111,111,116,58,56,57,49,66,50,55,52,57,50,51,56,66,50,55,102,70,53,56,101,57,53,49,48,56,56,101,53,53,98,48,52,100,101,55,49,68,99,51,55,52,0,0,0,0,0]]}"#;
@@ -1098,7 +1101,7 @@ fn test_deposit_evm_amount_less_fee() {
 }
 
 #[test]
-fn test_deposit_near_amount_zero_fee_non_zero() {
+fn test_deposit_to_near_amount_zero_fee_non_zero() {
     let custodian_address = "73c8931CA2aD746d97a59A7ABDDa0a9205F7ffF9";
     let (master_account, contract) = init(custodian_address);
     let proof_str = r#"{"log_index":0,"log_entry_data":[248,251,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,244,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"receipt_index":0,"receipt_data":[249,2,6,1,130,106,251,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,253,248,251,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,244,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"header_data":[249,2,10,160,47,76,8,45,83,192,115,218,108,188,181,117,148,40,254,44,169,118,92,188,207,7,122,246,133,75,100,184,134,128,91,12,160,29,204,77,232,222,199,93,122,171,133,181,103,182,204,212,26,211,18,69,27,148,138,116,19,240,161,66,253,64,212,147,71,148,124,28,230,160,8,239,64,193,62,78,177,68,166,204,116,240,224,174,172,126,160,225,211,110,129,173,98,101,150,55,116,11,30,26,161,226,8,234,249,90,46,245,112,225,68,76,26,215,135,27,181,140,22,160,229,44,239,5,102,141,42,118,174,163,144,225,90,152,120,60,150,25,144,217,154,234,25,69,35,226,103,149,188,127,81,106,160,177,89,93,76,113,24,117,182,174,52,148,6,239,129,151,18,222,56,245,9,232,80,7,129,118,118,108,72,76,247,238,101,185,1,0,1,4,200,10,0,0,0,0,8,0,32,0,128,3,1,0,0,145,4,33,72,8,0,2,0,128,0,18,64,26,38,0,4,16,8,1,136,65,40,32,0,0,1,72,0,2,0,128,0,64,0,0,48,0,32,0,0,0,0,192,0,100,9,0,12,0,16,0,0,1,2,8,8,0,8,12,128,64,0,192,2,0,0,64,2,68,129,0,128,1,0,0,128,128,68,0,64,64,32,0,67,0,32,0,0,41,20,1,0,16,40,0,16,16,32,0,0,0,128,0,0,0,64,48,4,8,8,0,0,0,0,66,32,64,0,0,48,0,16,8,1,64,0,0,16,32,0,33,32,0,0,128,0,2,2,128,0,0,192,0,2,40,0,0,0,0,0,1,0,67,1,0,131,32,6,8,0,0,8,96,128,0,0,0,0,12,0,0,0,65,2,160,2,64,0,2,4,32,0,128,0,1,34,0,105,0,160,0,32,18,32,16,1,0,0,0,20,0,32,0,20,0,96,128,0,16,0,0,64,16,2,192,1,0,4,32,0,32,130,2,0,0,32,0,0,0,4,64,12,64,0,0,4,0,0,1,132,93,96,3,163,131,157,117,205,131,122,18,0,131,113,87,104,132,96,175,145,182,140,115,112,105,100,101,114,49,48,1,2,9,64,160,179,183,88,73,3,20,234,255,8,238,6,186,173,204,149,149,235,233,232,35,158,194,53,246,218,39,221,246,90,7,34,255,136,176,36,100,161,146,27,98,29],"proof":[[248,177,160,93,101,188,48,5,53,36,126,41,0,92,130,188,117,104,230,178,29,27,194,22,86,212,235,193,20,241,42,157,88,117,205,160,141,83,180,197,22,126,217,34,74,50,114,118,42,157,161,171,8,158,98,92,183,124,137,130,211,1,106,44,222,37,13,32,160,62,131,146,138,69,63,89,98,140,64,187,93,207,160,0,4,134,154,205,47,168,231,136,249,129,230,137,29,3,210,67,173,160,76,91,176,245,81,3,198,111,175,230,185,70,220,111,189,88,15,154,173,107,239,121,185,13,159,197,61,37,231,252,22,200,128,128,128,128,160,13,246,139,212,38,202,103,201,31,80,247,136,186,58,17,52,66,119,115,128,23,123,59,166,177,68,79,182,9,242,60,106,128,128,128,128,128,128,128,128],[249,2,13,48,185,2,9,249,2,6,1,130,106,251,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,253,248,251,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,244,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]}"#;
@@ -1121,7 +1124,7 @@ fn test_deposit_near_amount_zero_fee_non_zero() {
 }
 
 #[test]
-fn test_deposit_evm_amount_zero_fee_non_zero() {
+fn test_deposit_to_aurora_amount_zero_fee_non_zero() {
     let custodian_address = "73c8931CA2aD746d97a59A7ABDDa0a9205F7ffF9";
     let (master_account, contract) = init(custodian_address);
     let proof_str = r#"{"log_index":0,"log_entry_data":[249,1,27,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,101,116,104,95,99,111,110,110,101,99,116,111,114,46,114,111,111,116,58,56,57,49,66,50,55,52,57,50,51,56,66,50,55,102,70,53,56,101,57,53,49,48,56,56,101,53,53,98,48,52,100,101,55,49,68,99,51,55,52,0,0,0,0,0],"receipt_index":1,"receipt_data":[249,2,41,1,131,1,110,54,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,1,30,249,1,27,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,101,116,104,95,99,111,110,110,101,99,116,111,114,46,114,111,111,116,58,56,57,49,66,50,55,52,57,50,51,56,66,50,55,102,70,53,56,101,57,53,49,48,56,56,101,53,53,98,48,52,100,101,55,49,68,99,51,55,52,0,0,0,0,0],"header_data":[249,2,21,160,60,128,9,36,168,69,207,249,164,88,177,15,74,221,137,160,110,246,3,133,209,132,169,179,31,86,142,216,160,11,162,137,160,29,204,77,232,222,199,93,122,171,133,181,103,182,204,212,26,211,18,69,27,148,138,116,19,240,161,66,253,64,212,147,71,148,28,255,226,5,233,121,118,187,157,30,192,6,245,34,35,96,168,147,83,224,160,182,206,231,252,255,115,166,11,152,156,84,169,204,36,0,94,3,17,113,103,104,252,225,161,115,85,74,227,104,249,187,232,160,211,106,68,136,2,141,5,14,201,111,68,218,251,84,103,176,66,10,190,123,58,119,216,141,192,197,222,181,211,87,117,192,160,162,200,112,106,166,13,220,187,223,164,251,102,104,106,40,84,17,101,93,131,125,204,193,62,96,110,167,214,54,41,154,191,185,1,0,0,40,72,0,32,0,0,0,0,0,0,5,128,2,0,8,0,128,144,136,0,34,0,0,32,1,0,0,64,16,0,10,0,16,8,28,0,17,9,0,0,0,0,72,0,16,4,0,0,0,0,128,2,18,0,0,0,0,1,16,0,36,0,1,1,32,8,0,2,1,0,64,64,0,0,8,0,16,0,40,2,0,13,0,2,8,0,0,0,8,0,0,16,0,4,16,36,0,52,8,130,128,8,0,0,0,0,10,0,2,40,64,0,34,32,2,0,2,0,0,0,0,0,48,4,32,128,0,32,0,0,2,96,0,0,0,0,64,10,0,33,64,0,0,0,66,0,32,0,0,192,138,0,0,0,70,0,129,128,0,66,32,0,0,16,64,0,0,0,0,97,0,34,0,6,0,0,32,8,0,1,200,128,48,0,41,128,0,128,0,224,0,0,0,0,2,0,64,0,148,0,0,32,72,8,0,96,0,36,128,25,48,33,0,128,16,0,0,4,2,128,4,32,144,0,20,0,0,0,16,2,0,4,0,2,8,0,0,128,0,16,0,0,128,0,0,16,0,128,0,72,16,0,129,0,80,132,91,116,53,37,131,157,118,157,131,122,18,0,131,48,97,222,132,96,175,157,102,151,214,131,1,10,2,132,103,101,116,104,134,103,111,49,46,49,54,133,108,105,110,117,120,160,218,71,54,233,233,153,85,103,64,10,4,159,150,224,130,134,111,78,188,224,102,166,96,148,216,222,134,254,219,185,88,110,136,87,173,68,252,252,248,190,64],"proof":[[248,177,160,174,171,108,131,83,47,244,139,23,122,146,226,84,189,175,114,176,131,196,80,85,155,220,172,151,31,138,121,78,34,1,37,160,104,209,167,107,221,53,22,163,251,61,251,80,40,239,108,253,251,47,253,90,163,103,58,194,173,111,232,90,174,223,154,156,160,185,232,110,109,245,242,193,69,113,230,64,155,37,7,166,98,0,174,149,27,3,242,254,162,87,27,39,206,191,90,97,39,160,156,171,231,120,50,202,239,195,248,47,226,150,143,78,94,254,151,195,12,90,54,253,126,104,200,94,222,173,155,24,75,214,128,128,128,128,160,77,84,120,31,175,114,100,6,171,254,190,44,236,141,143,126,33,139,92,41,101,166,10,135,52,237,241,45,228,121,210,252,128,128,128,128,128,128,128,128],[249,1,241,128,160,112,174,178,81,116,140,64,238,179,40,62,38,72,120,77,248,199,242,3,227,104,227,174,247,54,169,115,176,134,87,216,196,160,208,65,39,69,237,92,207,141,20,26,113,245,146,250,71,165,184,6,221,105,202,34,201,192,206,144,30,169,82,146,191,130,160,250,127,168,75,47,196,128,16,232,187,94,131,103,164,17,74,154,178,32,193,229,188,234,15,63,149,127,95,2,85,36,38,160,9,173,49,32,69,145,114,254,67,59,110,57,126,204,241,26,85,145,117,55,165,249,149,252,11,213,14,224,142,203,167,165,160,49,16,36,243,207,150,120,119,173,146,213,84,201,84,33,132,103,245,138,209,190,215,89,31,100,50,79,241,11,27,117,232,160,38,102,178,111,249,250,245,239,103,241,97,55,179,25,194,214,51,83,145,244,160,76,255,88,140,94,66,211,135,147,231,233,160,86,244,54,180,248,80,19,60,89,82,142,50,237,41,148,80,99,93,184,17,160,129,174,200,175,79,56,156,152,116,246,19,160,141,144,121,114,242,95,79,178,182,13,237,0,226,45,215,70,186,238,115,124,4,185,167,106,170,121,37,27,22,90,85,154,160,38,169,214,240,80,51,77,173,121,227,163,72,68,190,21,194,23,235,129,2,183,83,211,21,67,152,206,246,236,168,183,65,160,220,198,172,57,188,229,136,230,231,56,249,171,3,156,137,119,188,173,183,120,220,15,214,253,121,102,45,164,53,244,173,237,160,222,126,139,114,159,32,8,38,110,8,161,127,50,42,173,124,148,83,169,13,252,160,28,62,186,159,153,201,217,244,7,198,160,29,57,238,34,65,21,193,24,140,71,159,181,152,57,184,3,168,102,8,32,23,158,117,205,137,200,143,228,205,234,96,193,160,58,189,88,46,177,57,9,115,13,24,65,37,199,71,182,207,65,18,246,93,175,169,131,142,153,178,213,138,143,236,72,168,160,182,214,186,170,95,22,45,113,224,141,88,205,33,22,49,65,219,4,25,205,180,125,40,18,42,158,62,30,25,244,226,104,160,123,14,60,111,154,53,84,127,228,3,253,5,6,81,188,37,133,89,45,219,175,223,9,211,254,199,3,74,27,75,37,136,128],[249,2,48,32,185,2,44,249,2,41,1,131,1,110,54,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,1,30,249,1,27,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,101,116,104,95,99,111,110,110,101,99,116,111,114,46,114,111,111,116,58,56,57,49,66,50,55,52,57,50,51,56,66,50,55,102,70,53,56,101,57,53,49,48,56,56,101,53,53,98,48,52,100,101,55,49,68,99,51,55,52,0,0,0,0,0]]}"#;
@@ -1144,7 +1147,7 @@ fn test_deposit_evm_amount_zero_fee_non_zero() {
 }
 
 #[test]
-fn test_deposit_near_amount_equal_fee_non_zero() {
+fn test_deposit_to_near_amount_equal_fee_non_zero() {
     let custodian_address = "73c8931CA2aD746d97a59A7ABDDa0a9205F7ffF9";
     let (master_account, contract) = init(custodian_address);
     let proof_str = r#"{"log_index":0,"log_entry_data":[248,251,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"receipt_index":0,"receipt_data":[249,2,6,1,130,106,251,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,253,248,251,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"header_data":[249,2,10,160,218,232,90,75,133,17,151,21,23,64,121,155,74,131,239,243,28,65,81,101,213,156,148,217,134,34,235,41,62,11,232,147,160,29,204,77,232,222,199,93,122,171,133,181,103,182,204,212,26,211,18,69,27,148,138,116,19,240,161,66,253,64,212,147,71,148,124,28,230,160,8,239,64,193,62,78,177,68,166,204,116,240,224,174,172,126,160,25,127,76,71,206,220,252,85,22,156,38,36,158,35,56,3,255,85,230,138,132,44,102,196,217,205,43,20,129,6,50,114,160,217,211,225,144,113,34,139,65,28,148,21,243,90,204,109,152,98,172,147,56,158,109,65,77,74,110,116,227,7,143,157,97,160,35,108,188,133,254,137,74,53,234,147,11,115,83,161,215,174,6,192,214,61,8,113,178,151,91,57,163,102,121,177,113,30,185,1,0,144,48,72,0,8,0,0,0,48,0,0,1,128,128,128,0,128,128,0,8,64,2,1,0,5,1,0,32,64,16,129,8,0,16,8,8,128,1,9,8,4,0,0,104,0,0,0,24,8,0,4,0,8,0,0,0,0,128,64,32,16,32,0,0,92,2,8,0,10,1,80,24,1,0,0,8,17,1,0,40,0,0,5,0,130,17,0,0,6,0,0,1,128,0,2,16,40,0,96,16,2,2,0,0,0,0,32,8,0,64,40,65,0,0,32,0,0,8,0,0,2,0,0,112,0,0,0,4,8,0,64,2,0,0,5,0,161,212,88,1,5,0,0,32,8,0,2,32,0,0,2,136,0,0,4,66,34,0,128,0,2,8,128,0,0,0,0,128,44,8,0,0,19,20,2,8,2,0,8,128,132,0,0,0,0,56,0,0,0,4,33,32,32,129,0,2,0,0,128,145,64,0,96,112,136,2,32,0,32,16,0,0,65,0,84,16,64,2,0,16,161,0,34,128,128,16,0,0,8,16,2,12,2,0,0,18,64,4,128,0,152,0,44,0,8,0,0,0,64,0,32,148,0,16,128,0,132,91,126,153,161,131,157,118,120,131,122,18,0,131,55,185,255,132,96,175,155,143,140,115,112,105,100,101,114,49,48,1,2,9,64,160,29,62,139,98,163,60,78,159,159,190,165,213,126,42,39,157,104,12,168,1,9,24,24,157,45,96,113,188,166,18,114,253,136,161,226,143,133,82,9,96,55],"proof":[[248,145,160,153,98,12,82,79,154,121,176,11,226,192,161,140,213,198,195,143,185,79,36,156,98,17,141,146,111,76,206,149,161,186,244,160,29,41,24,128,95,59,50,57,188,69,166,227,81,94,29,115,178,144,71,219,248,16,233,179,158,64,222,175,67,156,221,186,160,221,78,89,28,71,2,204,57,50,75,194,224,88,108,127,122,110,247,48,111,72,110,252,199,127,138,177,160,1,244,75,250,128,128,128,128,128,160,96,141,238,91,85,76,114,97,220,74,251,25,18,72,46,126,72,190,245,222,173,235,62,157,59,131,133,200,217,240,218,101,128,128,128,128,128,128,128,128],[249,2,13,48,185,2,9,249,2,6,1,130,106,251,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,253,248,251,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,101,116,104,95,114,101,99,105,112,105,101,110,116,46,114,111,111,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]}"#;
@@ -1167,7 +1170,7 @@ fn test_deposit_near_amount_equal_fee_non_zero() {
 }
 
 #[test]
-fn test_deposit_evm_amount_equal_fee_non_zero() {
+fn test_deposit_to_aurora_amount_equal_fee_non_zero() {
     let custodian_address = "73c8931CA2aD746d97a59A7ABDDa0a9205F7ffF9";
     let (master_account, contract) = init(custodian_address);
     let proof_str = r#"{"log_index":0,"log_entry_data":[249,1,27,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,101,116,104,95,99,111,110,110,101,99,116,111,114,46,114,111,111,116,58,56,57,49,66,50,55,52,57,50,51,56,66,50,55,102,70,53,56,101,57,53,49,48,56,56,101,53,53,98,48,52,100,101,55,49,68,99,51,55,52,0,0,0,0,0],"receipt_index":0,"receipt_data":[249,2,40,1,130,121,119,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,1,30,249,1,27,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,101,116,104,95,99,111,110,110,101,99,116,111,114,46,114,111,111,116,58,56,57,49,66,50,55,52,57,50,51,56,66,50,55,102,70,53,56,101,57,53,49,48,56,56,101,53,53,98,48,52,100,101,55,49,68,99,51,55,52,0,0,0,0,0],"header_data":[249,2,10,160,40,73,143,87,82,108,249,199,149,251,138,16,158,32,40,191,70,185,139,157,146,47,76,134,132,2,138,15,163,195,164,23,160,4,220,65,246,216,41,193,152,14,191,243,6,120,77,198,249,10,186,90,192,38,182,89,163,180,7,115,149,220,146,135,121,148,124,28,230,160,8,239,64,193,62,78,177,68,166,204,116,240,224,174,172,126,160,140,129,164,138,92,240,141,148,58,223,100,113,117,102,163,205,129,110,47,12,254,66,40,98,179,170,247,163,117,111,198,112,160,154,8,216,215,130,120,77,117,89,130,236,187,91,119,167,212,252,114,44,157,54,25,178,246,190,125,110,255,187,224,200,236,160,40,108,11,169,34,110,94,30,9,115,148,248,253,252,64,245,150,237,108,188,197,225,88,28,139,188,249,78,249,118,101,180,185,1,0,128,32,72,128,0,0,0,0,0,0,32,1,128,2,32,0,2,130,0,0,2,51,0,0,0,1,0,0,66,16,0,10,0,144,8,12,0,1,13,32,0,0,0,72,0,0,0,0,0,64,0,0,32,2,0,0,2,0,0,0,0,32,0,0,0,0,40,0,34,1,0,0,8,0,0,8,0,0,0,46,0,2,5,0,2,0,0,8,64,1,32,0,0,0,0,16,36,96,32,8,66,2,0,128,0,1,0,8,0,2,40,64,4,0,40,2,0,2,13,32,0,0,192,176,4,76,128,4,32,128,0,10,0,0,0,0,4,64,42,136,1,0,0,0,0,0,4,160,1,0,128,136,4,0,0,66,0,1,129,0,2,0,0,16,0,0,0,0,0,0,64,0,50,64,2,0,0,0,8,0,1,8,1,160,0,42,128,0,128,16,160,0,192,0,0,2,0,96,16,144,0,32,48,64,8,128,32,0,164,16,0,32,1,1,0,16,0,0,5,2,192,0,32,128,2,16,0,8,0,18,2,0,0,16,0,0,0,0,128,0,80,0,0,128,0,32,0,0,0,0,0,16,0,1,0,16,132,91,150,244,27,131,157,118,173,131,122,18,0,131,40,221,54,132,96,175,158,25,140,115,112,105,100,101,114,49,48,1,2,9,64,160,218,157,103,144,72,1,176,23,70,255,185,190,128,163,131,210,184,249,29,138,99,94,110,182,239,251,248,20,139,58,221,102,136,127,48,25,31,42,252,69,90],"proof":[[248,145,160,242,107,136,177,199,137,149,29,37,76,252,130,24,241,231,253,164,161,49,123,187,119,248,194,41,74,148,86,89,189,140,122,160,221,253,158,175,54,102,36,195,73,91,187,167,57,197,110,107,81,39,3,67,139,234,202,103,171,85,168,245,23,151,146,101,160,240,166,241,60,58,19,14,113,70,156,230,223,214,171,111,192,135,200,157,176,100,11,127,9,6,211,142,63,158,86,97,87,128,128,128,128,128,160,247,26,205,35,167,94,67,103,248,63,247,181,235,154,151,144,26,0,253,18,81,231,65,62,46,101,62,205,117,218,221,122,128,128,128,128,128,128,128,128],[249,2,47,48,185,2,43,249,2,40,1,130,121,119,185,1,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,1,30,249,1,27,148,115,200,147,28,162,173,116,109,151,165,154,122,189,218,10,146,5,247,255,249,248,66,160,209,66,67,156,39,142,37,218,217,165,7,102,241,83,208,227,210,215,191,43,209,111,194,120,28,75,212,148,178,177,90,157,160,0,0,0,0,0,0,0,0,0,0,0,0,121,24,63,219,216,14,45,138,234,26,202,162,246,123,251,138,54,212,10,141,184,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,101,116,104,95,99,111,110,110,101,99,116,111,114,46,114,111,111,116,58,56,57,49,66,50,55,52,57,50,51,56,66,50,55,102,70,53,56,101,57,53,49,48,56,56,101,53,53,98,48,52,100,101,55,49,68,99,51,55,52,0,0,0,0,0]]}"#;
@@ -1214,7 +1217,7 @@ fn assert_execution_status_failure(
 #[test]
 fn test_ft_transfer_max_value() {
     let (_, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
     let transfer_amount = u128::MAX;
     let res = contract.call(
@@ -1243,7 +1246,7 @@ fn test_ft_transfer_max_value() {
 #[test]
 fn test_ft_transfer_empty_value() {
     let (_, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
     let res = contract.call(
         CONTRACT_ACC.to_string(),
@@ -1271,7 +1274,7 @@ fn test_ft_transfer_empty_value() {
 #[test]
 fn test_ft_transfer_wrong_u128_json_type() {
     let (_, contract) = init(CUSTODIAN_ADDRESS);
-    call_deposit_near(&contract, CONTRACT_ACC);
+    call_deposit_eth_to_near(&contract, CONTRACT_ACC);
 
     let res = contract.call(
         CONTRACT_ACC.to_string(),