diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/LocalAppConfigSource.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/LocalAppConfigSource.kt
index c6a015c9abec1077a8e01c3a17dc3dfd722b868e..d444101396f544a810e39a5b300f420f2c20a137 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/LocalAppConfigSource.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/LocalAppConfigSource.kt
@@ -19,14 +19,14 @@ class LocalAppConfigSource @Inject constructor(
     suspend fun getConfigData(): ConfigData? = withContext(dispatcherProvider.IO) {
         Timber.tag(TAG).v("retrieveConfig()")
 
-        val configDownload = storage.getStoredConfig()
-        if (configDownload == null) {
+        val internalConfigData = storage.getStoredConfig()
+        if (internalConfigData == null) {
             Timber.tag(TAG).d("No stored config available.")
             return@withContext null
         }
 
         return@withContext try {
-            configDownload.let {
+            internalConfigData.let {
                 ConfigDataContainer(
                     mappedConfig = parser.parse(it.rawData),
                     serverTime = it.serverTime,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt
index a0f7936a9711fb0a640ff6927b29ebad35845cc7..fb07dcbaef0e0ae6af55d59abc0e4393b00b9f8c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt
@@ -16,9 +16,9 @@ class InteroperabilityRepository @Inject constructor(
 ) {
 
     val countryList = appConfigProvider.currentConfig
-        .map {
+        .map { configData ->
             try {
-                appConfigProvider.getAppConfig()
+                configData
                     .supportedCountries
                     .mapNotNull { rawCode ->
                         val countryCode = rawCode.toLowerCase(Locale.ROOT)