diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt b/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt
index c804fa1da..2264a6a48 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt
+++ b/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt
@@ -110,7 +110,7 @@ fun AddRepoIntroScreen(
         when (state) {
             None -> AddRepoIntroContent(paddingValues, onFetchRepo)
             is Fetching -> {
-                if (state.repo == null) {
+                if (state.receivedRepo == null) {
                     RepoProgressScreen(paddingValues, stringResource(R.string.repo_state_fetching))
                 } else {
                     RepoPreviewScreen(paddingValues, state, onAddRepo)
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt b/app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
index 7de2eefdb..edde449e2 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
+++ b/app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
@@ -96,7 +96,7 @@ fun RepoPreviewScreen(
                 }
             }
             items(items = state.apps, key = { it.packageName }) { app ->
-                RepoPreviewApp(state.repo ?: error("no repo"), app, localeList)
+                RepoPreviewApp(state.receivedRepo ?: error("no repo"), app, localeList)
             }
         }
     }
@@ -108,7 +108,7 @@ fun RepoPreviewHeader(
     onAddRepo: () -> Unit,
     localeList: LocaleListCompat,
 ) {
-    val repo = state.repo ?: error("repo was null")
+    val repo = state.receivedRepo ?: error("repo was null")
     val isDevPreview = LocalInspectionMode.current
     val context = LocalContext.current
 
diff --git a/libs/database/src/main/java/org/fdroid/repo/RepoAdder.kt b/libs/database/src/main/java/org/fdroid/repo/RepoAdder.kt
index 2a3ef013c..69ac54049 100644
--- a/libs/database/src/main/java/org/fdroid/repo/RepoAdder.kt
+++ b/libs/database/src/main/java/org/fdroid/repo/RepoAdder.kt
@@ -51,7 +51,7 @@ public object None : AddRepoState()
 
 public class Fetching(
     public val fetchUrl: String,
-    public val repo: Repository?,
+    public val receivedRepo: Repository?,
     public val apps: List<MinimalApp>,
     public val fetchResult: FetchResult?,
     /**
@@ -62,12 +62,12 @@ public class Fetching(
     /**
      * true if the repository can be added (be it as new [Repository] or new mirror).
      */
-    public val canAdd: Boolean = repo != null &&
+    public val canAdd: Boolean = receivedRepo != null &&
         fetchResult != null &&
         fetchResult !is FetchResult.IsExistingRepository &&
         fetchResult !is FetchResult.IsExistingMirror
 
-    public val isMirror: Boolean = repo != null &&
+    public val isMirror: Boolean = receivedRepo != null &&
         fetchResult != null &&
         (fetchResult is FetchResult.IsNewMirror ||
             fetchResult is FetchResult.IsExistingMirror ||
@@ -75,7 +75,7 @@ public class Fetching(
             )
 
     override fun toString(): String {
-        return "Fetching(fetchUrl=$fetchUrl, repo=${repo?.address}, apps=${apps.size}, " +
+        return "Fetching(fetchUrl=$fetchUrl, repo=${receivedRepo?.address}, apps=${apps.size}, " +
             "fetchResult=$fetchResult, done=$done, canAdd=$canAdd)"
     }
 }
@@ -276,7 +276,8 @@ internal class RepoAdder(
             ?: throw IllegalStateException("Unexpected state: ${addRepoState.value}")
         addRepoState.value = Adding
 
-        val repo = state.repo ?: throw IllegalStateException("No repo: ${addRepoState.value}")
+        val repo = state.receivedRepo
+            ?: throw IllegalStateException("No repo: ${addRepoState.value}")
         val fetchResult = state.fetchResult
             ?: throw IllegalStateException("No fetchResult: ${addRepoState.value}")
 
diff --git a/libs/database/src/test/java/org/fdroid/repo/RepoAdderIntegrationTest.kt b/libs/database/src/test/java/org/fdroid/repo/RepoAdderIntegrationTest.kt
index bfb4509dd..478470eb8 100644
--- a/libs/database/src/test/java/org/fdroid/repo/RepoAdderIntegrationTest.kt
+++ b/libs/database/src/test/java/org/fdroid/repo/RepoAdderIntegrationTest.kt
@@ -66,12 +66,12 @@ internal class RepoAdderIntegrationTest {
             assertEquals(None, awaitItem())
             val firstFetching = awaitItem()
             assertTrue(firstFetching is Fetching)
-            assertNull(firstFetching.repo)
+            assertNull(firstFetching.receivedRepo)
             assertTrue(firstFetching.apps.isEmpty())
 
             val secondFetching = awaitItem()
             assertTrue(secondFetching is Fetching, "$secondFetching")
-            val repo = secondFetching.repo
+            val repo = secondFetching.receivedRepo
             assertNotNull(repo)
             assertEquals("https://fdroid.fedilab.app/repo", repo.address)
             println(repo.getName(LocaleListCompat.getDefault()) ?: "null")
@@ -115,8 +115,8 @@ internal class RepoAdderIntegrationTest {
         assertTrue(state is Fetching, state.toString())
         assertTrue(state.apps.isNotEmpty())
 
-        println(state.repo?.getName(LocaleListCompat.getDefault()) ?: "null")
-        println(state.repo?.certificate)
+        println(state.receivedRepo?.getName(LocaleListCompat.getDefault()) ?: "null")
+        println(state.receivedRepo?.certificate)
         state.apps.forEach { app ->
             println("  ${app.packageName} ${app.summary}")
         }
diff --git a/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt b/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt
index 0fc6d68dd..a53988170 100644
--- a/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt
+++ b/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt
@@ -394,7 +394,7 @@ internal class RepoAdderTest {
 
             val state1 = awaitItem()
             assertIs<Fetching>(state1)
-            assertNull(state1.repo)
+            assertNull(state1.receivedRepo)
             assertTrue(state1.apps.isEmpty())
             assertFalse(state1.canAdd)
 
@@ -447,7 +447,7 @@ internal class RepoAdderTest {
 
             val state1 = awaitItem()
             assertIs<Fetching>(state1)
-            assertNull(state1.repo)
+            assertNull(state1.receivedRepo)
             assertTrue(state1.apps.isEmpty())
             assertFalse(state1.canAdd)
 
@@ -483,7 +483,7 @@ internal class RepoAdderTest {
 
             val state1 = awaitItem()
             assertIs<Fetching>(state1)
-            assertNull(state1.repo)
+            assertNull(state1.receivedRepo)
             assertTrue(state1.apps.isEmpty())
             assertFalse(state1.canAdd)
 
@@ -564,7 +564,7 @@ internal class RepoAdderTest {
 
             val state1 = awaitItem()
             assertIs<Fetching>(state1)
-            assertNull(state1.repo)
+            assertNull(state1.receivedRepo)
             assertTrue(state1.apps.isEmpty())
             assertFalse(state1.canAdd)
 
@@ -627,13 +627,13 @@ internal class RepoAdderTest {
 
             val state1 = awaitItem()
             assertIs<Fetching>(state1)
-            assertNull(state1.repo)
+            assertNull(state1.receivedRepo)
             assertTrue(state1.apps.isEmpty())
             assertFalse(state1.canAdd)
 
             val state2 = awaitItem()
             assertIs<Fetching>(state2)
-            assertEquals(repoAddress, state2.repo?.address)
+            assertEquals(repoAddress, state2.receivedRepo?.address)
             assertTrue(state2.canAdd)
             assertFalse(state2.done)
 
@@ -689,7 +689,7 @@ internal class RepoAdderTest {
 
             val state1 = awaitItem()
             assertIs<Fetching>(state1)
-            assertNull(state1.repo)
+            assertNull(state1.receivedRepo)
             assertTrue(state1.apps.isEmpty())
             assertFalse(state1.canAdd)
 
@@ -734,7 +734,7 @@ internal class RepoAdderTest {
 
             val state1 = awaitItem()
             assertIs<Fetching>(state1)
-            assertNull(state1.repo)
+            assertNull(state1.receivedRepo)
             assertTrue(state1.apps.isEmpty())
             assertFalse(state1.canAdd)
 
@@ -879,7 +879,7 @@ internal class RepoAdderTest {
             // early empty state
             val state1 = awaitItem()
             assertIs<Fetching>(state1)
-            assertNull(state1.repo)
+            assertNull(state1.receivedRepo)
             assertEquals(emptyList(), state1.apps)
             assertFalse(state1.canAdd)
             assertFalse(state1.done)
@@ -887,7 +887,7 @@ internal class RepoAdderTest {
             // onRepoReceived
             val state2 = awaitItem()
             assertIs<Fetching>(state2)
-            val repo = state2.repo ?: fail()
+            val repo = state2.receivedRepo ?: fail()
             assertEquals(TestDataMinV2.repo.address, repo.address)
             assertEquals(repoName, repo.getName(localeList))
             val result = state2.fetchResult ?: fail()