diff --git a/F-Droid/src/org/fdroid/fdroid/data/Apk.java b/F-Droid/src/org/fdroid/fdroid/data/Apk.java
index 9c7d84523..807c55182 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/Apk.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/Apk.java
@@ -64,7 +64,7 @@ public class Apk extends ValueObject implements Comparable<Apk> {
                 case ApkProvider.DataColumns.FEATURES:
                     features = Utils.CommaSeparatedList.make(cursor.getString(i));
                     break;
-                case ApkProvider.DataColumns.APK_ID:
+                case ApkProvider.DataColumns.PACKAGE_NAME:
                     id = cursor.getString(i);
                     break;
                 case ApkProvider.DataColumns.IS_COMPATIBLE:
@@ -123,7 +123,7 @@ public class Apk extends ValueObject implements Comparable<Apk> {
 
     public ContentValues toContentValues() {
         ContentValues values = new ContentValues();
-        values.put(ApkProvider.DataColumns.APK_ID, id);
+        values.put(ApkProvider.DataColumns.PACKAGE_NAME, id);
         values.put(ApkProvider.DataColumns.VERSION, version);
         values.put(ApkProvider.DataColumns.VERSION_CODE, vercode);
         values.put(ApkProvider.DataColumns.REPO_ID, repo);
diff --git a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java
index 75e45158c..80417840f 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java
@@ -194,7 +194,7 @@ public class ApkProvider extends FDroidProvider {
 
         String _COUNT_DISTINCT_ID = "countDistinct";
 
-        String APK_ID          = "id";
+        String PACKAGE_NAME    = "id";
         String VERSION         = "version";
         String REPO_ID         = "repo";
         String HASH            = "hash";
@@ -216,7 +216,7 @@ public class ApkProvider extends FDroidProvider {
         String REPO_ADDRESS    = "repoAddress";
 
         String[] ALL = {
-            _ID, APK_ID, VERSION, REPO_ID, HASH, VERSION_CODE, NAME, SIZE,
+            _ID, PACKAGE_NAME, VERSION, REPO_ID, HASH, VERSION_CODE, NAME, SIZE,
             SIGNATURE, SOURCE_NAME, MIN_SDK_VERSION, MAX_SDK_VERSION,
             PERMISSIONS, FEATURES, NATIVE_CODE, HASH_TYPE, ADDED_DATE,
             IS_COMPATIBLE, REPO_VERSION, REPO_ADDRESS, INCOMPATIBLE_REASONS,
@@ -395,7 +395,7 @@ public class ApkProvider extends FDroidProvider {
     }
 
     private QuerySelection queryApp(String appId) {
-        final String selection = DataColumns.APK_ID + " = ? ";
+        final String selection = DataColumns.PACKAGE_NAME + " = ? ";
         final String[] args = {appId};
         return new QuerySelection(selection, args);
     }
@@ -418,7 +418,7 @@ public class ApkProvider extends FDroidProvider {
     }
 
     private QuerySelection queryRepoApps(long repoId, String appIds) {
-        return queryRepo(repoId).add(AppProvider.queryApps(appIds, DataColumns.APK_ID));
+        return queryRepo(repoId).add(AppProvider.queryApps(appIds, DataColumns.PACKAGE_NAME));
     }
 
     protected QuerySelection queryApks(String apkKeys) {
@@ -512,7 +512,7 @@ public class ApkProvider extends FDroidProvider {
             getContext().getContentResolver().notifyChange(uri, null);
         }
         return getContentUri(
-            values.getAsString(DataColumns.APK_ID),
+            values.getAsString(DataColumns.PACKAGE_NAME),
             values.getAsInteger(DataColumns.VERSION_CODE));
 
     }
diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java
index 02f131a9e..c483eaaf5 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/App.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/App.java
@@ -124,7 +124,7 @@ public class App extends ValueObject implements Comparable<App> {
                 case AppProvider.DataColumns.IS_COMPATIBLE:
                     compatible = cursor.getInt(i) == 1;
                     break;
-                case AppProvider.DataColumns.APP_ID:
+                case AppProvider.DataColumns.PACKAGE_NAME:
                     id = cursor.getString(i);
                     break;
                 case AppProvider.DataColumns.NAME:
@@ -369,7 +369,7 @@ public class App extends ValueObject implements Comparable<App> {
     public ContentValues toContentValues() {
 
         final ContentValues values = new ContentValues();
-        values.put(AppProvider.DataColumns.APP_ID, id);
+        values.put(AppProvider.DataColumns.PACKAGE_NAME, id);
         values.put(AppProvider.DataColumns.NAME, name);
         values.put(AppProvider.DataColumns.SUMMARY, summary);
         values.put(AppProvider.DataColumns.ICON, icon);
diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
index e30fcfb61..55d218710 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
@@ -173,7 +173,7 @@ public class AppProvider extends FDroidProvider {
         String _ID = "rowid as _id"; // Required for CursorLoaders
         String _COUNT = "_count";
         String IS_COMPATIBLE = "compatible";
-        String APP_ID = "id";
+        String PACKAGE_NAME = "id";
         String NAME = "name";
         String SUMMARY = "summary";
         String ICON = "icon";
@@ -211,7 +211,7 @@ public class AppProvider extends FDroidProvider {
         }
 
         String[] ALL = {
-            _ID, IS_COMPATIBLE, APP_ID, NAME, SUMMARY, ICON, DESCRIPTION,
+            _ID, IS_COMPATIBLE, PACKAGE_NAME, NAME, SUMMARY, ICON, DESCRIPTION,
             LICENSE, WEB_URL, TRACKER_URL, SOURCE_URL, CHANGELOG_URL, DONATE_URL,
             BITCOIN_ADDR, LITECOIN_ADDR, FLATTR_ID,
             UPSTREAM_VERSION, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
@@ -851,7 +851,7 @@ public class AppProvider extends FDroidProvider {
         if (!isApplyingBatch()) {
             getContext().getContentResolver().notifyChange(uri, null);
         }
-        return getContentUri(values.getAsString(DataColumns.APP_ID));
+        return getContentUri(values.getAsString(DataColumns.PACKAGE_NAME));
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java
index bc2e914db..6fdd45733 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java
@@ -161,7 +161,7 @@ public class RepoPersister {
      */
     private ArrayList<ContentProviderOperation> insertOrUpdateApks(List<Apk> packages) {
         String[] projection = new String[]{
-            ApkProvider.DataColumns.APK_ID,
+            ApkProvider.DataColumns.PACKAGE_NAME,
             ApkProvider.DataColumns.VERSION_CODE,
         };
         List<Apk> existingApks = ApkProvider.Helper.knownApks(context, packages, projection);
@@ -216,7 +216,7 @@ public class RepoPersister {
      * array.
      */
     private boolean isAppInDatabase(App app) {
-        String[] fields = {AppProvider.DataColumns.APP_ID};
+        String[] fields = {AppProvider.DataColumns.PACKAGE_NAME};
         App found = AppProvider.Helper.findById(context.getContentResolver(), app.id, fields);
         return found != null;
     }
@@ -247,7 +247,7 @@ public class RepoPersister {
      */
     @Nullable
     private ContentProviderOperation deleteOrphanedApks(List<App> apps, Map<String, List<Apk>> packages) {
-        String[] projection = new String[]{ApkProvider.DataColumns.APK_ID, ApkProvider.DataColumns.VERSION_CODE};
+        String[] projection = new String[]{ApkProvider.DataColumns.PACKAGE_NAME, ApkProvider.DataColumns.VERSION_CODE};
         List<Apk> existing = ApkProvider.Helper.find(context, repo, apps, projection);
         List<Apk> toDelete = new ArrayList<>();
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
index 143684d2d..ac24f55bb 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
@@ -35,7 +35,7 @@ public abstract class AppListFragment extends ListFragment implements
 
     public static final String[] APP_PROJECTION = {
         AppProvider.DataColumns._ID, // Required for cursor loader to work.
-        AppProvider.DataColumns.APP_ID,
+        AppProvider.DataColumns.PACKAGE_NAME,
         AppProvider.DataColumns.NAME,
         AppProvider.DataColumns.SUMMARY,
         AppProvider.DataColumns.IS_COMPATIBLE,
diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java
index e0808bda7..a2fd1e8a5 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java
@@ -56,7 +56,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
         Collections.addAll(apksToCheck, unknown);
 
         String[] projection = {
-            ApkProvider.DataColumns.APK_ID,
+            ApkProvider.DataColumns.PACKAGE_NAME,
             ApkProvider.DataColumns.VERSION_CODE,
         };
 
@@ -183,7 +183,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
         assertEquals("a hash type", apk.hashType);
 
         String[] projection = {
-            ApkProvider.DataColumns.APK_ID,
+            ApkProvider.DataColumns.PACKAGE_NAME,
             ApkProvider.DataColumns.HASH,
         };
 
diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java
index 8339f158d..0d3810f77 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java
@@ -251,7 +251,7 @@ public class ApkProviderTest extends BaseApkProviderTest {
 
         // And now we should be able to recover these values from the apk
         // value object (because the queryAllApks() helper asks for VERSION_CODE and
-        // APK_ID.
+        // PACKAGE_NAME.
         cursor.moveToFirst();
         Apk toCheck = new Apk(cursor);
         cursor.close();
diff --git a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java
index 05ecaa1d1..6b6dfacf2 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java
@@ -37,7 +37,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
     @Override
     protected String[] getMinimalProjection() {
         return new String[] {
-            AppProvider.DataColumns.APP_ID,
+            AppProvider.DataColumns.PACKAGE_NAME,
             AppProvider.DataColumns.NAME,
         };
     }
@@ -209,7 +209,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
 
         assertResultCount(10, AppProvider.getContentUri());
 
-        String[] projection = {AppProvider.DataColumns.APP_ID};
+        String[] projection = {AppProvider.DataColumns.PACKAGE_NAME};
         List<App> ignoredApps = AppProvider.Helper.findIgnored(getMockContext(), projection);
 
         String[] expectedIgnored = {
@@ -278,7 +278,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
 
         // And now we should be able to recover these values from the app
         // value object (because the queryAllApps() helper asks for NAME and
-        // APP_ID.
+        // PACKAGE_NAME.
         cursor.moveToFirst();
         App app = new App(cursor);
         cursor.close();
diff --git a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java
index c242a03cb..641732963 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java
@@ -26,7 +26,7 @@ abstract class BaseApkProviderTest extends FDroidProviderTest<ApkProvider> {
     @Override
     protected String[] getMinimalProjection() {
         return new String[] {
-            ApkProvider.DataColumns.APK_ID,
+            ApkProvider.DataColumns.PACKAGE_NAME,
             ApkProvider.DataColumns.VERSION_CODE,
             ApkProvider.DataColumns.NAME,
             ApkProvider.DataColumns.REPO_ID,
diff --git a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java
index 680221dee..57b2e946f 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java
@@ -71,7 +71,7 @@ public class InstalledAppCacheTest extends FDroidProviderTest<InstalledAppProvid
 
     private String[] getInstalledAppIdsFromProvider() {
         Uri uri = InstalledAppProvider.getContentUri();
-        String[] projection = { InstalledAppProvider.DataColumns.APP_ID };
+        String[] projection = { InstalledAppProvider.DataColumns.PACKAGE_NAME };
         Cursor result = getMockContext().getContentResolver().query(uri, projection, null, null, null);
         if (result == null) {
             return new String[0];
@@ -81,7 +81,7 @@ public class InstalledAppCacheTest extends FDroidProviderTest<InstalledAppProvid
         result.moveToFirst();
         int i = 0;
         while (!result.isAfterLast()) {
-            installedAppIds[i] = result.getString(result.getColumnIndex(InstalledAppProvider.DataColumns.APP_ID));
+            installedAppIds[i] = result.getString(result.getColumnIndex(InstalledAppProvider.DataColumns.PACKAGE_NAME));
             result.moveToNext();
             i ++;
         }
diff --git a/F-Droid/test/src/org/fdroid/fdroid/TestUtils.java b/F-Droid/test/src/org/fdroid/fdroid/TestUtils.java
index 3843cee83..de26341ca 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/TestUtils.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/TestUtils.java
@@ -101,7 +101,7 @@ public class TestUtils {
     public static void insertApp(ContentResolver resolver, String id, String name, ContentValues additionalValues) {
 
         ContentValues values = new ContentValues();
-        values.put(AppProvider.DataColumns.APP_ID, id);
+        values.put(AppProvider.DataColumns.PACKAGE_NAME, id);
         values.put(AppProvider.DataColumns.NAME, name);
 
         // Required fields (NOT NULL in the database).
@@ -127,7 +127,7 @@ public class TestUtils {
 
         ContentValues values = new ContentValues();
 
-        values.put(ApkProvider.DataColumns.APK_ID, id);
+        values.put(ApkProvider.DataColumns.PACKAGE_NAME, id);
         values.put(ApkProvider.DataColumns.VERSION_CODE, versionCode);
 
         // Required fields (NOT NULL in the database).