diff --git a/res/values/default_repo.xml b/res/values/default_repo.xml
index a7f32dbaf..83656c933 100644
--- a/res/values/default_repo.xml
+++ b/res/values/default_repo.xml
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="default_repo_count">2</integer>
 
-    <string name="default_repo_name1" formatted="false">F-Droid</string>
-    <integer name="default_repo_inuse1">1</integer>
-    <integer name="default_repo_priority1">10</integer>
-    <string name="default_repo_address1" formatted="false">https://f-droid.org/repo</string>
-    <string name="default_repo_description1" formatted="false">The official FDroid repository. Applications in this repository are mostly built directory from the source code. Some are official binaries built by the original application developers - these will be replaced by source-built versions over time.</string>
-    <string name="default_repo_pubkey1" formatted="false">3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef</string>
+    <!-- 1 - https://f-droid.org/repo -->
+    <string name="fdroid_repo_name" formatted="false">F-Droid</string>
 
-    <string name="default_repo_name2" formatted="false">F-Droid Archive</string>
-    <integer name="default_repo_inuse2">0</integer>
-    <integer name="default_repo_priority2">20</integer>
-    <string name="default_repo_address2" formatted="false">https://f-droid.org/archive</string>
-    <string name="default_repo_description2" formatted="false">The archive repository of the F-Droid client. This contains older versions of applications from the main repository.</string>
-    <string name="default_repo_pubkey2" formatted="false">3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef</string>
+    <integer name="fdroid_repo_inuse">1</integer>
+    <integer name="fdroid_repo_priority">10</integer>
+
+    <string name="fdroid_repo_address" formatted="false">https://f-droid.org/repo</string>
+    <string name="fdroid_repo_description" formatted="false">The official FDroid repository. Applications in this repository are mostly built directory from the source code. Some are official binaries built by the original application developers - these will be replaced by source-built versions over time.</string>
+    <string name="fdroid_repo_pubkey" formatted="false">3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef</string>
+
+    <!-- 2 - https://f-droid.org/archive -->
+    <string name="fdroid_archive_name" formatted="false">F-Droid Archive</string>
+
+    <integer name="fdroid_archive_inuse">0</integer>
+    <integer name="fdroid_archive_priority">20</integer>
+
+    <string name="fdroid_archive_address" formatted="false">https://f-droid.org/archive</string>
+    <string name="fdroid_archive_description" formatted="false">The archive repository of the F-Droid client. This contains older versions of applications from the main repository.</string>
+    <string name="fdroid_archive_pubkey" formatted="false">3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef</string>
 
     <!-- https://guardianproject.info/fdroid/repo -->
     <string name="guardianproject_repo_name" formatted="false">Guardian Project</string>
diff --git a/src/org/fdroid/fdroid/data/DBHelper.java b/src/org/fdroid/fdroid/data/DBHelper.java
index 8cb679aec..a162f736d 100644
--- a/src/org/fdroid/fdroid/data/DBHelper.java
+++ b/src/org/fdroid/fdroid/data/DBHelper.java
@@ -193,22 +193,22 @@ public class DBHelper extends SQLiteOpenHelper {
 
         insertRepo(
             db,
-            context.getString(R.string.default_repo_name1),
-            context.getString(R.string.default_repo_address1),
-            context.getString(R.string.default_repo_description1),
-            context.getString(R.string.default_repo_pubkey1),
-            context.getResources().getInteger(R.integer.default_repo_inuse1),
-            context.getResources().getInteger(R.integer.default_repo_priority1)
+            context.getString(R.string.fdroid_repo_name),
+            context.getString(R.string.fdroid_repo_address),
+            context.getString(R.string.fdroid_repo_description),
+            context.getString(R.string.fdroid_repo_pubkey),
+            context.getResources().getInteger(R.integer.fdroid_repo_inuse),
+            context.getResources().getInteger(R.integer.fdroid_repo_priority)
         );
 
         insertRepo(
             db,
-            context.getString(R.string.default_repo_name2),
-            context.getString(R.string.default_repo_address2),
-            context.getString(R.string.default_repo_description2),
-            context.getString(R.string.default_repo_pubkey2),
-            context.getResources().getInteger(R.integer.default_repo_inuse2),
-            context.getResources().getInteger(R.integer.default_repo_priority2)
+            context.getString(R.string.fdroid_archive_name),
+            context.getString(R.string.fdroid_archive_address),
+            context.getString(R.string.fdroid_archive_description),
+            context.getString(R.string.fdroid_archive_pubkey),
+            context.getResources().getInteger(R.integer.fdroid_archive_inuse),
+            context.getResources().getInteger(R.integer.fdroid_archive_priority)
         );
 
         insertRepo(
@@ -336,10 +336,10 @@ public class DBHelper extends SQLiteOpenHelper {
                 db.execSQL("alter table " + TABLE_REPO + " add column name text");
             if (!descriptionExists)
                 db.execSQL("alter table " + TABLE_REPO + " add column description text");
-            insertNameAndDescription(db, R.string.default_repo_address1,
-                    R.string.default_repo_name1, R.string.default_repo_description1);
-            insertNameAndDescription(db, R.string.default_repo_address2,
-                    R.string.default_repo_name2, R.string.default_repo_description2);
+            insertNameAndDescription(db, R.string.fdroid_repo_address,
+                    R.string.fdroid_repo_name, R.string.fdroid_repo_description);
+            insertNameAndDescription(db, R.string.fdroid_archive_address,
+                    R.string.fdroid_archive_name, R.string.fdroid_archive_description);
             insertNameAndDescription(db, R.string.guardianproject_repo_address,
                     R.string.guardianproject_repo_name, R.string.guardianproject_repo_description);
             insertNameAndDescription(db, R.string.guardianproject_archive_address,
diff --git a/test/src/mock/MockFDroidResources.java b/test/src/mock/MockFDroidResources.java
index c2b716d2f..96b6a01d9 100644
--- a/test/src/mock/MockFDroidResources.java
+++ b/test/src/mock/MockFDroidResources.java
@@ -20,13 +20,13 @@ public class MockFDroidResources extends MockResources {
 
     @Override
     public int getInteger(int id) {
-        if (id == R.integer.default_repo_inuse1) {
+        if (id == R.integer.fdroid_repo_inuse) {
             return 1;
-        } else if (id == R.integer.default_repo_inuse2) {
+        } else if (id == R.integer.fdroid_archive_inuse) {
             return 0;
-        } else if (id == R.integer.default_repo_priority1) {
+        } else if (id == R.integer.fdroid_repo_priority) {
             return 10;
-        } else if (id == R.integer.default_repo_priority2) {
+        } else if (id == R.integer.fdroid_archive_priority) {
             return 20;
         } else {
             return 0;