diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index fc34cf54..30bb5158 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -314,6 +314,7 @@
             </outputDirectory>
             <excludes>
                 <exclude>store/extensions/app/store-device/*</exclude>
+                <exclude>store/themes/store/partials/product-title.hbs</exclude>
                 <exclude>publisher/config/publisher-tenant.json</exclude>
             </excludes>
         </fileSet>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag
index 5920c4f5..d9928699 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag
@@ -117,9 +117,9 @@ if (uriMatcher.match("/{context}/api/device/sketch/download/{downloadId}")) {
 		exit();//stop execution
 	}
 
-	//URL: https://localhost:9443/devicecloud/manager/devices/username/{username}
+	//URL: https://localhost:9443/devicecloud/device_manager/device/user/{username}/all
 	deviceCloudService = carbonHttpsServletTransport + "/common/device_manager";
-	listAllDevicesEndPoint = deviceCloudService + "/devices/username/" + user.username;
+	listAllDevicesEndPoint = deviceCloudService + "/device/user/" + user.username + "/all";
 	result = get(listAllDevicesEndPoint, {}, "json");
 	var ownDevices = result.data;
 
@@ -160,9 +160,9 @@ if (uriMatcher.match("/{context}/api/device/sketch/download/{downloadId}")) {
 		exit();//stop execution
 	}
 
-	//URL: https://localhost:9443/devicecloud/manager/devices/username/{username}
+	//URL: https://localhost:9443/devicecloud/device_manager/device/user/{username}/all/count
 	deviceCloudService = carbonHttpsServletTransport + "/common/device_manager";
-	listAllDevicesEndPoint = deviceCloudService + "/devices/username/" + user.username;
+	listAllDevicesEndPoint = deviceCloudService + "/device/user/" + user.username + "/all/count";
 	result = get(listAllDevicesEndPoint, {}, "json");
 	var ownDevices = result.data;
 
diff --git a/modules/distribution/src/repository/jaggeryapps/store/extensions/app/store-device/apis/stats-api.jag b/modules/distribution/src/repository/jaggeryapps/store/extensions/app/store-device/apis/stats-api.jag
index 55932fbd..a62d8578 100644
--- a/modules/distribution/src/repository/jaggeryapps/store/extensions/app/store-device/apis/stats-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/store/extensions/app/store-device/apis/stats-api.jag
@@ -74,8 +74,8 @@ if (!user) {
 }
 
 function getDeviceData(deviceType, deviceId) {
-	//URL: GET https://localhost:9443/devicecloud/group_manager/group/id/{groupId}/device/all
-	var endPoint = deviceCloudDeviceService + "/devices/" + deviceType + "/" + deviceId;
+	//URL: GET https://localhost:9443/devicecloud/device_manager/device/type/{type}/identifier/{identifier}
+	var endPoint = deviceCloudDeviceService + "/device/type/" + deviceType + "/identifier/" + deviceId;
 	var data = {"username": user.username};
 	var device = get(endPoint, data, "json").data;
 	if (!device) {
diff --git a/modules/distribution/src/repository/jaggeryapps/store/themes/store/partials/product-title.hbs b/modules/distribution/src/repository/jaggeryapps/store/themes/store/partials/product-title.hbs
new file mode 100644
index 00000000..7cb9933b
--- /dev/null
+++ b/modules/distribution/src/repository/jaggeryapps/store/themes/store/partials/product-title.hbs
@@ -0,0 +1,2 @@
+<h2 class="app-title hidden-xs-320" style="text-transform: none !important;">{{t "IoT Server"}}</h2>
+<h2 class="app-title visible-xs-320">{{t "ES"}}</h2>
\ No newline at end of file