diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/data/CloudRepository.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/data/CloudRepository.java
index a2b7095bec..6fc1febed6 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/data/CloudRepository.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/data/CloudRepository.java
@@ -438,11 +438,11 @@ public class CloudRepository {
           langName = languageObj.getString("name");
         }
 
-        String modelID = model.getString("id");
-        String modelName = model.getString("name");
-        String modelVersion = model.getString("version");
+        String modelID = model.getString(KMManager.KMKey_ID);
+        String modelName = model.getString(KMManager.KMKey_Name);
+        String modelVersion = model.getString(KMManager.KMKey_LexicalModelVersion);
 
-        String isCustom = model.optString("CustomModel", "N");
+        String isCustom = model.optString(KMManager.KMKey_CustomModel, "N");
         String icon = "0";
 
         HashMap<String, String> hashMap = new HashMap<String, String>();
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/packages/JSONUtils.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/packages/JSONUtils.java
index b14b08f920..e7aca31936 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/packages/JSONUtils.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/packages/JSONUtils.java
@@ -208,6 +208,7 @@ public class JSONUtils {
           try {
             String packageID = pkg.getName();
             JSONObject kmp = parser.getJSONObjectFromFile(file);
+            String packageVersion = PackageProcessor.getPackageVersion(kmp);
             JSONArray kmpModels = kmp.getJSONArray("lexicalModels");
 
             // Determine if kmp contains welcome.htm help file
@@ -218,7 +219,6 @@ public class JSONUtils {
               JSONObject kmpModelObj = kmpModels.getJSONObject(i);
               String modelName = kmpModelObj.getString(KMManager.KMKey_Name);
               String modelID = kmpModelObj.getString(KMManager.KMKey_ID);
-              String modelVersion = kmpModelObj.getString("version");
               String modelFilename = pkg.getName() + "/" + modelID + FileUtils.LEXICALMODEL;
 
               // Merge languages
@@ -230,10 +230,10 @@ public class JSONUtils {
 
                 JSONObject modelObj = new JSONObject();
                 modelObj.put(KMManager.KMKey_PackageID, packageID);
-                modelObj.put("id", modelID);
+                modelObj.put(KMManager.KMKey_ID, modelID);
                 modelObj.put(KMManager.KMKey_Name, modelName);
                 modelObj.put("filename", modelFilename);
-                modelObj.put(KMManager.KMKey_KeyboardVersion, modelVersion);
+                modelObj.put(KMManager.KMKey_LexicalModelVersion, packageVersion);
                 modelObj.put(KMManager.KMKey_CustomModel, "Y");
                 if (containsHelp) {
                   File welcomeFile = new File(pkg, "welcome.htm");
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/packages/PackageProcessor.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/packages/PackageProcessor.java
index 8cffa673a6..e6c065a68f 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/packages/PackageProcessor.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/packages/PackageProcessor.java
@@ -215,7 +215,7 @@ public class PackageProcessor {
    * @param json The metadata JSONObject for the package.
    * @return The version number (via String)
    */
-  public String getPackageVersion(JSONObject json) {
+  public static String getPackageVersion(JSONObject json) {
     try {
       return json.getJSONObject("info").getJSONObject("version").getString("description");
     } catch (Exception e) {