diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 397de5db1..c56b9a3af 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -100,8 +100,8 @@
                 android:exported="false"/>
 
         <provider
-                android:authorities="${applicationId}.data.PackageProvider"
-                android:name="org.fdroid.fdroid.data.PackageProvider"
+                android:authorities="${applicationId}.data.PackageIdProvider"
+                android:name="org.fdroid.fdroid.data.PackageIdProvider"
                 android:exported="false"/>
 
         <provider
diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
index f2b7dd0a9..513530ede 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
@@ -928,7 +928,7 @@ public class AppProvider extends FDroidProvider {
 
     @Override
     public Uri insert(@NonNull Uri uri, ContentValues values) {
-        long packageId = PackageProvider.Helper.ensureExists(getContext(), values.getAsString(Cols.Package.PACKAGE_NAME));
+        long packageId = PackageIdProvider.Helper.ensureExists(getContext(), values.getAsString(Cols.Package.PACKAGE_NAME));
         values.remove(Cols.Package.PACKAGE_NAME);
         values.put(Cols.PACKAGE_ID, packageId);
 
diff --git a/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java
index 5ab21d636..c0551d298 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java
@@ -339,7 +339,7 @@ public class InstalledAppProvider extends FDroidProvider {
         }
 
         String packageName = values.getAsString(Cols.Package.NAME);
-        long packageId = PackageProvider.Helper.ensureExists(getContext(), packageName);
+        long packageId = PackageIdProvider.Helper.ensureExists(getContext(), packageName);
         values.remove(Cols.Package.NAME);
         values.put(Cols.PACKAGE_ID, packageId);
 
diff --git a/app/src/main/java/org/fdroid/fdroid/data/PackageProvider.java b/app/src/main/java/org/fdroid/fdroid/data/PackageIdProvider.java
similarity index 97%
rename from app/src/main/java/org/fdroid/fdroid/data/PackageProvider.java
rename to app/src/main/java/org/fdroid/fdroid/data/PackageIdProvider.java
index 197b53f35..fc6edccc9 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/PackageProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/PackageIdProvider.java
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import org.fdroid.fdroid.data.Schema.PackageTable;
 import org.fdroid.fdroid.data.Schema.PackageTable.Cols;
 
-public class PackageProvider extends FDroidProvider {
+public class PackageIdProvider extends FDroidProvider {
 
     public static final class Helper {
         private Helper() {
@@ -60,7 +60,7 @@ public class PackageProvider extends FDroidProvider {
         }
     }
 
-    private static final String PROVIDER_NAME = "PackageProvider";
+    private static final String PROVIDER_NAME = "PackageIdProvider";
 
     private static final UriMatcher MATCHER = new UriMatcher(-1);
 
@@ -105,7 +105,7 @@ public class PackageProvider extends FDroidProvider {
 
     @Override
     protected String getProviderName() {
-        return "PackageProvider";
+        return PROVIDER_NAME;
     }
 
     public static String getAuthority() {