diff --git a/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.hbs b/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.hbs
index dfeb700d..09067e4c 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.hbs
+++ b/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.hbs
@@ -17,26 +17,26 @@
 }}
 {{unit "cdmf.unit.lib.rickshaw-graph"}}
 
-<div id="div-chart" data-websocketurl="{{websocketEndpoint1}}" data-sensorType="temperature">
+<div id="div-chartTemperature" data-websocketurl="{{websocketEndpointTemperature}}" data-sensorType="temperature">
     <div class="chartWrapper" id="chartWrapper">
-        <div id="y_axis" class="custom_y_axis" style="margin-top: -20px;">Temperature</div>
+        <div id="y_axisTemperature" class="custom_y_axis" style="margin-top: -20px;">Temperature</div>
         <div class="legend_container">
             <div id="smoother" title="Smoothing"></div>
             <div id="legend"></div>
         </div>
-        <div id="chart" class="custom_rickshaw_graph"></div>
+        <div id="chartTemperature" class="custom_rickshaw_graph"></div>
         <div class="custom_x_axis">Time</div>
     </div>
 </div>
 
-<div id="div-chart2" data-websocketurl="{{websocketEndpoint2}}" data-sensorType="coffeelevel">
+<div id="div-chartCoffeeLevel" data-websocketurl="{{websocketEndpointCoffeeLevel}}" data-sensorType="coffeelevel">
     <div class="chartWrapper" id="chartWrapper">
-        <div id="y_axis2" class="custom_y_axis" style="margin-top: -20px;">Coffee Level</div>
+        <div id="y_axisCoffeeLevel" class="custom_y_axis" style="margin-top: -20px;">Coffee Level</div>
         <div class="legend_container">
             <div id="smoother" title="Smoothing"></div>
             <div id="legend2"></div>
         </div>
-        <div id="chart2" class="custom_rickshaw_graph"></div>
+        <div id="chartCoffeeLevel" class="custom_rickshaw_graph"></div>
         <div class="custom_x_axis">Time</div>
     </div>
 </div>
diff --git a/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.js b/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.js
index 6f9583d2..2ef444f6 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.js
+++ b/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.js
@@ -35,16 +35,16 @@ function onRequest(context) {
         if (tokenPair) {
             token = tokenPair.accessToken;
         }
-        websocketEndpoint1 = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
+        websocketEndpointTemperature = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
             + "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type+ "&websocketToken=" + token;
-        websocketEndpoint2 = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.coffeelevel/1.0.0?"
+        websocketEndpointCoffeeLevel = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.coffeelevel/1.0.0?"
             + "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type+ "&websocketToken=" + token;
         var websocketToken= {'name':'websocket-token','value': token, 'path':'/', "maxAge":18000};
         response.addCookie(websocketToken);
     }
     return {
         "device": device,
-        "websocketEndpoint1": websocketEndpoint1,
-        "websocketEndpoint2": websocketEndpoint2
+        "websocketEndpointTemperature": websocketEndpointTemperature,
+        "websocketEndpointCoffeeLevel": websocketEndpointCoffeeLevel
     };
 }
\ No newline at end of file
diff --git a/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/device-stats.js b/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/device-stats.js
index dc8240c1..17381ee5 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/device-stats.js
+++ b/modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/device-stats.js
@@ -16,25 +16,25 @@
  * under the License.
  */
 
-var wsConnection1;
-var wsConnection2;
-var graphForSensorType1;
-var graphForSensorType2;
-var chartDataSensorType1 = [];
-var chartDataSensorType2 = [];
+var wsConnectionTemperature;
+var wsConnectionCoffeeLevel;
+var graphForSensorTypeTemperature;
+var graphForSensorTypeCoffeeLevel;
+var chartDataSensorTypeTemperature = [];
+var chartDataSensorTypeCoffeeLevel = [];
 
 var palette = new Rickshaw.Color.Palette({scheme: "classic9"});
 
 $(window).load(function () {
-    drawGraph(wsConnection1, "#div-chart", "y_axis", "chart", chartDataSensorType1
-        , graphForSensorType1);
-    drawGraph(wsConnection2, "#div-chart2", "y_axis2", "chart2", chartDataSensorType2
-        , graphForSensorType2);
+    drawGraph(wsConnectionTemperature, "#div-chartTemperature", "y_axisTemperature", "chartTemperature", chartDataSensorTypeTemperature
+        , graphForSensorTypeTemperature);
+    drawGraph(wsConnectionCoffeeLevel, "#div-chartCoffeeLevel", "y_axisCoffeeLevel", "chartCoffeeLevel", chartDataSensorTypeCoffeeLevel
+        , graphForSensorTypeCoffeeLevel);
 });
 
 window.onbeforeunload = function() {
-    disconnect(wsConnection1);
-    disconnect(wsConnection2);
+    disconnect(wsConnectionTemperature);
+    disconnect(wsConnectionCoffeeLevel);
 };
 
 function drawGraph(wsConnection, placeHolder, yAxis, chat, chartData, graph) {