diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt
index e49a87d61a..cb9490bdc8 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt
@@ -69,7 +69,7 @@ internal class YieldBalancesConverter(
 
     private fun getRewardBlockType(): Pair<RewardBlockType, Boolean> {
         val cryptoCurrencyStatus = cryptoCurrencyStatusProvider()
-        val networkId = cryptoCurrencyStatus.currency.network.id.value
+        val blockchainId = cryptoCurrencyStatus.currency.network.id.value
         val yieldBalance = cryptoCurrencyStatus.value.yieldBalance as? YieldBalance.Data
         val rewards = yieldBalance?.balance?.items
             ?.filter { it.type == BalanceType.REWARDS && !it.amount.isZero() }
@@ -78,7 +78,7 @@ internal class YieldBalancesConverter(
         val isRewardsClaimable = rewards?.isNotEmpty() == true
 
         return when {
-            isSolana(networkId) || isBSC(networkId) -> RewardBlockType.RewardUnavailable to false
+            isSolana(blockchainId) || isBSC(blockchainId) -> RewardBlockType.RewardUnavailable to false
             isRewardsClaimable -> RewardBlockType.Rewards to isActionable
             else -> RewardBlockType.NoRewards to false
         }
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
index e7766f15e8..676cff23f2 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
@@ -318,9 +318,9 @@ internal class TokenDetailsLoadedBalanceConverter(
     }
 
     private fun getRewardText(status: CryptoCurrencyStatus, stakingRewardAmount: BigDecimal?): TextReference {
-        val networkId = status.currency.network.id.value
+        val blockchainId = status.currency.network.id.value
         val rewardBlockType = when {
-            isSolana(networkId) || isBSC(networkId) -> RewardBlockType.RewardUnavailable
+            isSolana(blockchainId) || isBSC(blockchainId) -> RewardBlockType.RewardUnavailable
             stakingRewardAmount.isNullOrZero() -> RewardBlockType.NoRewards
             else -> RewardBlockType.Rewards
         }
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt
index fe67dcf443..c2205435c2 100644
--- a/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt
@@ -21,8 +21,8 @@ object BlockchainUtils {
     private const val XRP_X_ADDRESS = 'X'
 
     /** Decodes XRP Blockchain address */
-    fun decodeRippleXAddress(xAddress: String, networkId: String): XrpTaggedAddress? {
-        return if (networkId == Blockchain.XRP.id && xAddress.firstOrNull() == XRP_X_ADDRESS) {
+    fun decodeRippleXAddress(xAddress: String, blockchainId: String): XrpTaggedAddress? {
+        return if (blockchainId == Blockchain.XRP.id && xAddress.firstOrNull() == XRP_X_ADDRESS) {
             val decodedAddress = XrpAddressService.decodeXAddress(xAddress)
             return decodedAddress?.let(XrpTaggedAddressConverter()::convert)
         } else {
@@ -31,65 +31,65 @@ object BlockchainUtils {
     }
 
     /** If current [networkId] is Bitcoin */
-    fun isBitcoin(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    fun isBitcoin(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.Bitcoin || blockchain == Blockchain.BitcoinTestnet
     }
 
-    /** If current [networkId] is Tezos */
-    fun isTezos(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    /** If current [blockchainId] is Tezos */
+    fun isTezos(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.Tezos
     }
 
-    fun isCardano(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    fun isCardano(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.Cardano
     }
 
-    /** If current [networkId] is BeaconChain */
-    fun isBeaconChain(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    /** If current [blockchainId] is BeaconChain */
+    fun isBeaconChain(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.Binance || blockchain == Blockchain.BinanceTestnet
     }
 
-    /** If current [networkId] is Polygon */
-    fun isPolygonChain(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    /** If current [blockchainId] is Polygon */
+    fun isPolygonChain(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.Polygon || blockchain == Blockchain.PolygonTestnet
     }
 
-    fun isTron(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    fun isTron(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.Tron || blockchain == Blockchain.TronTestnet
     }
 
-    fun isSupportedNetworkId(networkId: String): Boolean {
-        return Blockchain.fromNetworkId(networkId)?.isSupportedInApp() ?: false
+    fun isSupportedNetworkId(blockchainId: String): Boolean {
+        return Blockchain.fromNetworkId(blockchainId)?.isSupportedInApp() ?: false
     }
 
-    fun isArbitrum(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    fun isArbitrum(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.Arbitrum
     }
 
-    fun isSolana(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    fun isSolana(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.Solana
     }
 
-    fun isPolkadot(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    fun isPolkadot(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.Polkadot || blockchain == Blockchain.PolkadotTestnet
     }
 
-    fun isCosmos(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    fun isCosmos(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.Cosmos || blockchain == Blockchain.CosmosTestnet
     }
 
-    fun isBSC(networkId: String): Boolean {
-        val blockchain = Blockchain.fromId(networkId)
+    fun isBSC(blockchainId: String): Boolean {
+        val blockchain = Blockchain.fromId(blockchainId)
         return blockchain == Blockchain.BSC || blockchain == Blockchain.BSCTestnet
     }