diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/AppServerCommands.java b/src/firefly/java/edu/caltech/ipac/firefly/server/AppServerCommands.java
index e3a1db27de..163cabfde3 100644
--- a/src/firefly/java/edu/caltech/ipac/firefly/server/AppServerCommands.java
+++ b/src/firefly/java/edu/caltech/ipac/firefly/server/AppServerCommands.java
@@ -167,7 +167,10 @@ public String doCommand(SrvParam params) throws Exception {
                 }
                 versionData = versionMap;
             }
-            return Serializer.getJsonMapper().writeValueAsString(versionData);
+            Map<String, Object> result = new LinkedHashMap<>();
+            result.put("success", true);
+            result.put("data", versionData);
+            return Serializer.getJsonMapper().writeValueAsString(result);
         }
     }
 
diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/util/VersionUtil.java b/src/firefly/java/edu/caltech/ipac/firefly/server/util/VersionUtil.java
index ab6455d50c..a340ecb394 100644
--- a/src/firefly/java/edu/caltech/ipac/firefly/server/util/VersionUtil.java
+++ b/src/firefly/java/edu/caltech/ipac/firefly/server/util/VersionUtil.java
@@ -132,12 +132,11 @@ public static List<KeyVal<String, String>> getVersionInfo() {
         Version v = getAppVersion();
 
         List<KeyVal<String, String>> versionInfo = new ArrayList<>(6);
-        versionInfo.add(new KeyVal<>("Version", getVersionStr(v)));
+        versionInfo.add(new KeyVal<>("Application Version", getVersionStr(v)));
         versionInfo.add(new KeyVal<>("Built On", v.getBuildTime()));
         versionInfo.add(new KeyVal<>("Git commit", v.getBuildCommit()));
 
-        if (v.getMajor()>0)
-            versionInfo.add(new KeyVal<>("Firefly Library Version", getFireflyVersionStr(v)));
+        versionInfo.add(new KeyVal<>("Firefly Version", getFireflyVersionStr(v)));
         if (!StringUtils.isEmpty(v.getBuildCommitFirefly()))
             versionInfo.add(new KeyVal<>("Firefly Git Commit", v.getBuildCommitFirefly()));
         if (!StringUtils.isEmpty(v.getBuildFireflyTag()))