diff --git a/modules/samples/connectedcup/component/analytics/build.xml b/modules/samples/connectedcup/component/analytics/build.xml
index 89289868..2b91ec40 100644
--- a/modules/samples/connectedcup/component/analytics/build.xml
+++ b/modules/samples/connectedcup/component/analytics/build.xml
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 
-<project name="create-sample-sensor-capps" default="zip" basedir=".">
+<project name="create-connectedcup-capps" default="zip" basedir=".">
 
     <property name="project-name" value="${ant.project.name}"/>
     <property name="target-dir" value="target/carbonapps"/>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml
index 879a923d..e43343eb 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml
@@ -17,6 +17,6 @@
   ~ under the License.
   -->
 
-<artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
+<artifact name="coffee_level_script" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
     <file>coffee_level_script.xml</file>
 </artifact>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml
index f8f93781..15684e58 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml
@@ -20,18 +20,11 @@
 <Analytics>
     <Name>coffee_level_script</Name>
     <Script>
-        CREATE TEMPORARY TABLE DeviceCoffeeLevelData USING CarbonAnalytics OPTIONS(tableName
-        "ORG_WSO2_IOT_DEVICES_COFFEELEVEL");
+        CREATE TEMPORARY TABLE DeviceCoffeeLevelData USING CarbonAnalytics OPTIONS(tableName "ORG_WSO2_IOT_DEVICES_COFFEELEVEL");
 
-        CREATE TEMPORARY TABLE DeviceCoffeeLevelSummaryData USING CarbonAnalytics OPTIONS (tableName
-        "DEVICE_COFFEELEVEL_SUMMARY", schema "coffeelevel FLOAT, deviceType STRING -i, deviceId STRING -i, owner
-        STRING -i,
-        time LONG -i",primaryKeys "deviceType, deviceId, owner, time");
+        CREATE TEMPORARY TABLE DeviceCoffeeLevelSummaryData USING CarbonAnalytics OPTIONS (tableName "DEVICE_COFFEELEVEL_SUMMARY", schema "coffeelevel FLOAT, deviceType STRING -i, deviceId STRING -i, owner STRING -i, time LONG -i",primaryKeys "deviceType, deviceId, owner, time");
 
-        insert into table DeviceCoffeeLevelSummaryData select coffeelevel, meta_deviceType as deviceType,
-        meta_deviceId as deviceId, meta_owner as owner, cast(meta_time/1000 as BIGINT)as time from
-        DeviceCoffeeLevelData group by coffeelevel, meta_deviceType, meta_deviceId, meta_owner, cast(meta_time/1000 as
-        BIGINT);
+        insert into table DeviceCoffeeLevelSummaryData select coffeelevel, meta_deviceType as deviceType, meta_deviceId as deviceId, meta_owner as owner, cast(meta_time/1000 as BIGINT)as time from DeviceCoffeeLevelData group by coffeelevel, meta_deviceType, meta_deviceId, meta_owner, cast(meta_time/1000 as BIGINT);
     </Script>
-    <CronExpression>0 * * * * ?</CronExpression>
+    <CronExpression>0 0/5 * * * ?</CronExpression>
 </Analytics>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/org.wso2.iot.devices.coffeelevel_1.0.0.json b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/org.wso2.iot.devices.coffeelevel_1.0.0.json
index f9058d22..abcace4e 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/org.wso2.iot.devices.coffeelevel_1.0.0.json
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/org.wso2.iot.devices.coffeelevel_1.0.0.json
@@ -1,7 +1,7 @@
 {
   "name": "org.wso2.iot.devices.coffeelevel",
   "version": "1.0.0",
-  "nickName": "Coffee Level Data",
+  "nickName": "CoffeeLevel",
   "description": "Coffee Level data received from the Device",
   "metaData": [
     {"name":"owner","type":"STRING"},     
@@ -14,7 +14,4 @@
       "name": "coffeelevel","type": "FLOAT"
     }
   ]
-}
-	
-
-				                                    		
+}
\ No newline at end of file
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
index ff9214e9..cd9b0657 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 
-<eventReceiver name="EventReceiver_ConnectedCup" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
+<eventReceiver name="connected_cup_receiver" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
     <from eventAdapterType="oauth-mqtt">
         <property name="topic">carbon.super/connectedcup/#</property>
         <property name="username">admin</property>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json
index ebdc9f25..a93e29e0 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json
@@ -1,7 +1,7 @@
 {
   "name": "org.wso2.iot.connectedcup",
   "version": "1.0.0",
-  "nickName": "connectedcup stream",
+  "nickName": "connectedcup",
   "description": "This hold the device type stream of connectedcup",
   "metaData": [
     {"name": "owner", "type": "STRING"},
diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/devicetype-graph.js b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/devicetype-graph.js
index ae85f661..5b5b79e9 100644
--- a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/devicetype-graph.js
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/devicetype-graph.js
@@ -18,7 +18,7 @@
 
 var palette = new Rickshaw.Color.Palette({scheme: "classic9"});
 
-function drawGraph(from, to) {
+function drawGraph_connectedcup(from, to) {
     retrieveDataAndDrawLineGraph("temperature", from, to);
     retrieveDataAndDrawLineGraph("coffeelevel", from, to);
 }
diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/private/config.json b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/private/config.json
new file mode 100644
index 00000000..685ee7ff
--- /dev/null
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/private/config.json
@@ -0,0 +1,6 @@
+{
+  "deviceType": {
+    "label": "Connected Cup",
+    "category": "virtual"
+  }
+}
\ No newline at end of file