diff --git a/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java b/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java
index 7a47c2ba8..474a42a9a 100644
--- a/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java
@@ -204,10 +204,10 @@ public class RepoXMLHandler extends DefaultHandler {
                     curapp.lastUpdated = Utils.parseDate(str, null);
                     break;
                 case "marketversion":
-                    curapp.upstreamVersion = str;
+                    curapp.upstreamVersionName = str;
                     break;
                 case "marketvercode":
-                    curapp.upstreamVercode = Utils.parseInt(str, -1);
+                    curapp.upstreamVersionCode = Utils.parseInt(str, -1);
                     break;
                 case "categories":
                     curapp.categories = Utils.CommaSeparatedList.make(str);
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index cfee9607b..7490c3ea3 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -59,8 +59,8 @@ public class App extends ValueObject implements Comparable<App> {
 
     public String flattrID;
 
-    public String upstreamVersion;
-    public int upstreamVercode;
+    public String upstreamVersionName;
+    public int upstreamVersionCode;
 
     /**
      * Unlike other public fields, this is only accessible via a getter, to
@@ -180,10 +180,10 @@ public class App extends ValueObject implements Comparable<App> {
                     suggestedVersionCode = cursor.getInt(i);
                     break;
                 case AppProvider.DataColumns.UPSTREAM_VERSION_CODE:
-                    upstreamVercode = cursor.getInt(i);
+                    upstreamVersionCode = cursor.getInt(i);
                     break;
-                case AppProvider.DataColumns.UPSTREAM_VERSION:
-                    upstreamVersion = cursor.getString(i);
+                case AppProvider.DataColumns.UPSTREAM_VERSION_NAME:
+                    upstreamVersionName = cursor.getString(i);
                     break;
                 case AppProvider.DataColumns.ADDED:
                     added = Utils.parseDate(cursor.getString(i), null);
@@ -404,8 +404,8 @@ public class App extends ValueObject implements Comparable<App> {
         values.put(AppProvider.DataColumns.ADDED, Utils.formatDate(added, ""));
         values.put(AppProvider.DataColumns.LAST_UPDATED, Utils.formatDate(lastUpdated, ""));
         values.put(AppProvider.DataColumns.SUGGESTED_VERSION_CODE, suggestedVersionCode);
-        values.put(AppProvider.DataColumns.UPSTREAM_VERSION, upstreamVersion);
-        values.put(AppProvider.DataColumns.UPSTREAM_VERSION_CODE, upstreamVercode);
+        values.put(AppProvider.DataColumns.UPSTREAM_VERSION_NAME, upstreamVersionName);
+        values.put(AppProvider.DataColumns.UPSTREAM_VERSION_CODE, upstreamVersionCode);
         values.put(AppProvider.DataColumns.CATEGORIES, Utils.CommaSeparatedList.str(categories));
         values.put(AppProvider.DataColumns.ANTI_FEATURES, Utils.CommaSeparatedList.str(antiFeatures));
         values.put(AppProvider.DataColumns.REQUIREMENTS, Utils.CommaSeparatedList.str(requirements));
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 c9e30dde7..98d9b7406 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
@@ -191,7 +191,7 @@ public class AppProvider extends FDroidProvider {
         String LITECOIN_ADDR = "litecoinAddr";
         String FLATTR_ID = "flattrID";
         String SUGGESTED_VERSION_CODE = "suggestedVercode";
-        String UPSTREAM_VERSION = "upstreamVersion";
+        String UPSTREAM_VERSION_NAME = "upstreamVersion";
         String UPSTREAM_VERSION_CODE = "upstreamVercode";
         String ADDED = "added";
         String LAST_UPDATED = "lastUpdated";
@@ -217,7 +217,7 @@ public class AppProvider extends FDroidProvider {
             _ID, IS_COMPATIBLE, PACKAGE_NAME, NAME, SUMMARY, ICON, DESCRIPTION,
             LICENSE, AUTHOR, EMAIL, WEB_URL, TRACKER_URL, SOURCE_URL,
             CHANGELOG_URL, DONATE_URL, BITCOIN_ADDR, LITECOIN_ADDR, FLATTR_ID,
-            UPSTREAM_VERSION, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
+            UPSTREAM_VERSION_NAME, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
             CATEGORIES, ANTI_FEATURES, REQUIREMENTS, IGNORE_ALLUPDATES,
             IGNORE_THISUPDATE, ICON_URL, ICON_URL_LARGE,
             SUGGESTED_VERSION_CODE, SuggestedApk.VERSION,