diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
index 2055078646..b3095ded69 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
@@ -18,14 +18,14 @@ internal class DefaultOnrampRepository(
     private val currencyConverter = CurrencyConverter()
     private val countryConverter = CountryConverter(currencyConverter)
 
-    override suspend fun fetchCurrencies(): List<OnrampCurrency> = withContext(dispatchers.io) {
-        return@withContext onrampApi.getCurrencies()
+    override suspend fun getCurrencies(): List<OnrampCurrency> = withContext(dispatchers.io) {
+        onrampApi.getCurrencies()
             .getOrThrow()
             .map(currencyConverter::convert)
     }
 
-    override suspend fun fetchCountries(): List<OnrampCountry> = withContext(dispatchers.io) {
-        return@withContext onrampApi.getCountries()
+    override suspend fun getCountries(): List<OnrampCountry> = withContext(dispatchers.io) {
+        onrampApi.getCountries()
             .getOrThrow()
             .map(countryConverter::convert)
     }
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/converters/CountryConverter.kt b/data/onramp/src/main/java/com/tangem/data/onramp/converters/CountryConverter.kt
index 9bfa63a421..2102fd647d 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/converters/CountryConverter.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/converters/CountryConverter.kt
@@ -4,7 +4,7 @@ import com.tangem.datasource.api.onramp.models.response.model.OnrampCountryDTO
 import com.tangem.domain.onramp.model.OnrampCountry
 import com.tangem.utils.converter.Converter
 
-class CountryConverter(
+internal class CountryConverter(
     private val currencyConverter: CurrencyConverter,
 ) : Converter<OnrampCountryDTO, OnrampCountry> {
 
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/converters/CurrencyConverter.kt b/data/onramp/src/main/java/com/tangem/data/onramp/converters/CurrencyConverter.kt
index db7f4bce7b..01e8ee6309 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/converters/CurrencyConverter.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/converters/CurrencyConverter.kt
@@ -4,7 +4,7 @@ import com.tangem.datasource.api.onramp.models.response.model.OnrampCurrencyDTO
 import com.tangem.domain.onramp.model.OnrampCurrency
 import com.tangem.utils.converter.Converter
 
-class CurrencyConverter : Converter<OnrampCurrencyDTO, OnrampCurrency> {
+internal class CurrencyConverter : Converter<OnrampCurrencyDTO, OnrampCurrency> {
 
     override fun convert(value: OnrampCurrencyDTO) = OnrampCurrency(
         name = value.name,
diff --git a/domain/onramp/build.gradle.kts b/domain/onramp/build.gradle.kts
index 260d1467b0..3cb7a6f636 100644
--- a/domain/onramp/build.gradle.kts
+++ b/domain/onramp/build.gradle.kts
@@ -17,8 +17,4 @@ dependencies {
 
     implementation(projects.domain.tokens.models)
     implementation(projects.domain.wallets.models)
-
-    implementation(deps.tangem.blockchain) {
-        exclude(module = "joda-time")
-    }
 }
\ No newline at end of file
diff --git a/domain/onramp/src/main/java/com/tangem/domain/onramp/repositories/OnrampRepository.kt b/domain/onramp/src/main/java/com/tangem/domain/onramp/repositories/OnrampRepository.kt
index 8b0cc5db43..8b251a9d47 100644
--- a/domain/onramp/src/main/java/com/tangem/domain/onramp/repositories/OnrampRepository.kt
+++ b/domain/onramp/src/main/java/com/tangem/domain/onramp/repositories/OnrampRepository.kt
@@ -4,6 +4,6 @@ import com.tangem.domain.onramp.model.OnrampCountry
 import com.tangem.domain.onramp.model.OnrampCurrency
 
 interface OnrampRepository {
-    suspend fun fetchCurrencies(): List<OnrampCurrency>
-    suspend fun fetchCountries(): List<OnrampCountry>
+    suspend fun getCurrencies(): List<OnrampCurrency>
+    suspend fun getCountries(): List<OnrampCountry>
 }
\ No newline at end of file