diff --git a/cosmic-client/src/main/webapp/scripts/cloudStack.js b/cosmic-client/src/main/webapp/scripts/cloudStack.js
index 5fd266bb37..8ea52665de 100644
--- a/cosmic-client/src/main/webapp/scripts/cloudStack.js
+++ b/cosmic-client/src/main/webapp/scripts/cloudStack.js
@@ -135,7 +135,7 @@
                         g_allowUserExpungeRecoverVm = json.listcapabilitiesresponse.capability.allowuserexpungerecovervm;
                         g_userProjectsEnabled = json.listcapabilitiesresponse.capability.allowusercreateprojects;
 
-                        g_cloudstackversion = json.listcapabilitiesresponse.capability.cloudstackversion;
+                        g_cosmicversion = json.listcapabilitiesresponse.capability.cosmicversion;
 
                         if (json.listcapabilitiesresponse.capability.apilimitinterval != null && json.listcapabilitiesresponse.capability.apilimitmax != null) {
                             var intervalLimit = ((json.listcapabilitiesresponse.capability.apilimitinterval * 1000) / json.listcapabilitiesresponse.capability.apilimitmax) * 3; //multiply 3 to be on safe side
@@ -266,7 +266,7 @@
                                 g_allowUserExpungeRecoverVm = json.listcapabilitiesresponse.capability.allowuserexpungerecovervm;
                                 g_userProjectsEnabled = json.listcapabilitiesresponse.capability.allowusercreateprojects;
 
-                                g_cloudstackversion = json.listcapabilitiesresponse.capability.cloudstackversion;
+                                g_cosmicversion = json.listcapabilitiesresponse.capability.cosmicversion;
 
                                 if (json.listcapabilitiesresponse.capability.apilimitinterval != null && json.listcapabilitiesresponse.capability.apilimitmax != null) {
                                     var intervalLimit = ((json.listcapabilitiesresponse.capability.apilimitinterval * 1000) / json.listcapabilitiesresponse.capability.apilimitmax) * 3; //multiply 3 to be on safe side
@@ -348,7 +348,7 @@
                 });
             },
 
-            // Show cloudStack main UI widget
+            // Show cosmic main UI widget
             complete: function (args) {
                 var context = {
                     users: [args.user]
diff --git a/cosmic-client/src/main/webapp/scripts/sharedFunctions.js b/cosmic-client/src/main/webapp/scripts/sharedFunctions.js
index 809adab72e..e4ef7029d1 100644
--- a/cosmic-client/src/main/webapp/scripts/sharedFunctions.js
+++ b/cosmic-client/src/main/webapp/scripts/sharedFunctions.js
@@ -14,7 +14,7 @@ var g_kvmsnapshotenabled = null;
 var g_regionsecondaryenabled = null;
 var g_userPublicTemplateEnabled = "true";
 var g_allowUserExpungeRecoverVm = "false";
-var g_cloudstackversion = null;
+var g_cosmicversion = null;
 var g_queryAsyncJobResultInterval = 3000;
 var g_idpList = null;
 var g_appendIdpDomain = false;
diff --git a/cosmic-client/src/main/webapp/scripts/ui/core.js b/cosmic-client/src/main/webapp/scripts/ui/core.js
index 86e9ea21ac..d8eb87a953 100644
--- a/cosmic-client/src/main/webapp/scripts/ui/core.js
+++ b/cosmic-client/src/main/webapp/scripts/ui/core.js
@@ -318,7 +318,7 @@
             if (this == 'label.about.app') {
                 $link.addClass('about').click(function () {
                     var $logo = $('<div>').addClass('logo').text(_l('label.app.name')),
-                        $version = $('<div>').addClass('version').text(g_cloudstackversion),
+                        $version = $('<div>').addClass('version').text(g_cosmicversion),
                         $about = $('<div>').addClass('about').append($logo).append($version);
                     $about.dialog({
                         modal: true,
diff --git a/cosmic-core/api/src/main/java/com/cloud/api/command/user/config/ListCapabilitiesCmd.java b/cosmic-core/api/src/main/java/com/cloud/api/command/user/config/ListCapabilitiesCmd.java
index 43aa4dada4..acfd49a3b0 100644
--- a/cosmic-core/api/src/main/java/com/cloud/api/command/user/config/ListCapabilitiesCmd.java
+++ b/cosmic-core/api/src/main/java/com/cloud/api/command/user/config/ListCapabilitiesCmd.java
@@ -22,7 +22,7 @@ public class ListCapabilitiesCmd extends BaseCmd {
     public void execute() {
         final Map<String, Object> capabilities = _mgr.listCapabilities(this);
         final CapabilitiesResponse response = new CapabilitiesResponse();
-        response.setCloudStackVersion((String) capabilities.get("cloudStackVersion"));
+        response.setCosmicVersion((String) capabilities.get("cosmicVersion"));
         response.setCosmic((Boolean) true);
         response.setUserPublicTemplateEnabled((Boolean) capabilities.get("userPublicTemplateEnabled"));
         response.setSupportELB((String) capabilities.get("supportELB"));
diff --git a/cosmic-core/api/src/main/java/com/cloud/api/response/CapabilitiesResponse.java b/cosmic-core/api/src/main/java/com/cloud/api/response/CapabilitiesResponse.java
index d589a7db0d..3466b1af4a 100644
--- a/cosmic-core/api/src/main/java/com/cloud/api/response/CapabilitiesResponse.java
+++ b/cosmic-core/api/src/main/java/com/cloud/api/response/CapabilitiesResponse.java
@@ -11,6 +11,10 @@ public class CapabilitiesResponse extends BaseResponse {
     @Param(description = "version of the cloud stack")
     private String cloudStackVersion;
 
+    @SerializedName("cosmicversion")
+    @Param(description = "version of cosmic")
+    private String cosmicVersion;
+
     @SerializedName("cosmic")
     @Param(description = "Cosmic or not")
     private Boolean cosmic;
@@ -79,8 +83,9 @@ public void setKvmDeploymentsEnabled(final boolean kvmDeploymentsEnabled) {
         this.kvmDeploymentsEnabled = kvmDeploymentsEnabled;
     }
 
-    public void setCloudStackVersion(final String cloudStackVersion) {
-        this.cloudStackVersion = cloudStackVersion;
+    public void setCosmicVersion(final String cosmicVersion) {
+        this.cloudStackVersion = cosmicVersion;
+        this.cosmicVersion = cosmicVersion;
     }
 
     public void setCosmic(final Boolean cosmic) {
diff --git a/cosmic-core/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/cosmic-core/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index 1242d44b61..753a109434 100644
--- a/cosmic-core/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/cosmic-core/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -2349,7 +2349,7 @@ public Map<String, Object> listCapabilities(final ListCapabilitiesCmd cmd) {
         }
 
         capabilities.put("userPublicTemplateEnabled", userPublicTemplateEnabled);
-        capabilities.put("cloudStackVersion", getVersion());
+        capabilities.put("cosmicVersion", getVersion());
         capabilities.put("supportELB", supportELB);
         capabilities.put("projectInviteRequired", _projectMgr.projectInviteRequired());
         capabilities.put("allowusercreateprojects", _projectMgr.allowUserToCreateProject());