diff --git a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java
index 1c735cd4..7d3cc0af 100644
--- a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java
+++ b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.coffeeking.agent.datasense;
 
 import org.apache.commons.logging.Log;
diff --git a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java
index d520dc98..f4f33de4 100644
--- a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java
+++ b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.coffeeking.agent.datasense;
 
 import org.apache.commons.logging.Log;
diff --git a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java
index 797ddc3b..8804f715 100644
--- a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java
+++ b/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.coffeeking.agent.transport.mqtt;
 
 import org.apache.commons.logging.Log;
diff --git a/modules/samples/connectedcup/component/analytics/build.xml b/modules/samples/connectedcup/component/analytics/build.xml
index 9f8b8850..89289868 100644
--- a/modules/samples/connectedcup/component/analytics/build.xml
+++ b/modules/samples/connectedcup/component/analytics/build.xml
@@ -23,8 +23,8 @@
     <property name="target-dir" value="target/carbonapps"/>
     <property name="src-dir" value="src/main/resources/carbonapps"/>
 
-    <property name="ConnectedCup_dir" value="ConnectedCup"/>
-    <property name="CoffeeLevel_Sensor_dir" value="CoffeeLevel_Sensor"/>
+    <property name="ConnectedCup_dir" value="connected_cup"/>
+    <property name="CoffeeLevel_Sensor_dir" value="coffee_level"/>
 
     <target name="clean">
         <delete dir="${target-dir}" />
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventExecution_ConnectedCup_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventExecution_ConnectedCup_1.0.0/artifact.xml
deleted file mode 100644
index ea5b8630..00000000
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventExecution_ConnectedCup_1.0.0/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name="EventExecution_ConnectedCup" version="1.0.0" type="event/execution-plan" serverRole="DataAnalyticsServer">
-	<file>EventExecution_ConnectedCup.siddhiql</file>
-</artifact>
-
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/artifacts.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml
similarity index 57%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/artifacts.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml
index 86306d71..652aab82 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/artifacts.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml
@@ -18,10 +18,10 @@
   -->
 
 <artifacts>
-    <artifact name="ConnectedCup_CAPP" version="1.0.0" type="carbon/application">
-		<dependency artifact="EventStream_ConnectedCup" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-		<dependency artifact="EventReceiver_ConnectedCup" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="EventPublisher_ConnectedCup" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="EventExecution_ConnectedCup" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+    <artifact name="coffee_level" version="1.0.0" type="carbon/application">
+		<dependency artifact="coffee_level_stream" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="coffee_level_store" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="coffee_level_receiver" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="coffee_level_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
     </artifact>
 </artifacts>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml
similarity index 82%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml
index ab46c07d..ef5b1648 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml
@@ -17,6 +17,6 @@
   ~ under the License.
   -->
 
-<artifact name="Eventreceiver_coffeelevel" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
-    <file>EventReceiver_coffeelevel.xml</file>
+<artifact name="coffee_level_receiver" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
+    <file>coffee_level_receiver.xml</file>
 </artifact>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml
similarity index 92%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml
index f61865c5..ebe3b990 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 
-<eventReceiver name="EventReceiver_coffeelevel" statistics="disable" trace="disable"
+<eventReceiver name="coffee_level_receiver" statistics="disable" trace="disable"
                xmlns="http://wso2.org/carbon/eventreceiver">
     <from eventAdapterType="wso2event">
         <property name="events.duplicated.in.cluster">false</property>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml
similarity index 94%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml
index 0ed651a9..879a923d 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml
@@ -18,5 +18,5 @@
   -->
 
 <artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
-    <file>CoffeeLevel_Sensor_Script.xml</file>
+    <file>coffee_level_script.xml</file>
 </artifact>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/CoffeeLevel_Sensor_Script.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml
similarity index 97%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/CoffeeLevel_Sensor_Script.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml
index 84e3e693..f8f93781 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/CoffeeLevel_Sensor_Script.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml
@@ -18,7 +18,7 @@
   -->
 
 <Analytics>
-    <Name>CoffeeLevel_Sensor_Script</Name>
+    <Name>coffee_level_script</Name>
     <Script>
         CREATE TEMPORARY TABLE DeviceCoffeeLevelData USING CarbonAnalytics OPTIONS(tableName
         "ORG_WSO2_IOT_DEVICES_COFFEELEVEL");
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml
similarity index 87%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml
index 74bd1698..2aeb6edf 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml
@@ -17,6 +17,6 @@
   ~ under the License.
   -->
 
-<artifact name="Eventstore_coffeelevel" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
+<artifact name="coffee_level_store" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
     <file>org_wso2_iot_devices_coffeelevel.xml</file>
 </artifact>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/org_wso2_iot_devices_coffeelevel.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/org_wso2_iot_devices_coffeelevel.xml
similarity index 100%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/org_wso2_iot_devices_coffeelevel.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/org_wso2_iot_devices_coffeelevel.xml
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml
similarity index 87%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml
index 5af619c1..14ed35ee 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 
-<artifact name="Eventstream_coffeelevel" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
+<artifact name="coffee_level_stream" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
 	<file>org.wso2.iot.devices.coffeelevel_1.0.0.json</file>
 </artifact>
 
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/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
similarity index 100%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/org.wso2.iot.devices.coffeelevel_1.0.0.json
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/org.wso2.iot.devices.coffeelevel_1.0.0.json
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/artifacts.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml
similarity index 62%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/artifacts.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml
index 0269500e..f5ef3482 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/artifacts.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml
@@ -18,13 +18,10 @@
   -->
 
 <artifacts>
-    <artifact name="CoffeeLevel_CAPP" version="1.0.0" type="carbon/application">
-
-		<dependency artifact="Eventstream_coffeelevel" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-		<dependency artifact="Eventstore_coffeelevel" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-		<dependency artifact="Eventreceiver_coffeelevel" version="1.0.0" include="true"
-					serverRole="DataAnalyticsServer"/>
-
-		<dependency artifact="Sparkscripts" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+    <artifact name="connected_cup" version="1.0.0" type="carbon/application">
+		<dependency artifact="connected_cup_stream" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="connected_cup_receiver" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="connected_cup_publisher" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="connected_cup_execution" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
     </artifact>
 </artifacts>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventPublisher_ConnectedCup_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml
similarity index 81%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventPublisher_ConnectedCup_1.0.0/artifact.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml
index fc2dc057..b20dcc84 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventPublisher_ConnectedCup_1.0.0/artifact.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml
@@ -17,6 +17,7 @@
   ~ under the License.
   -->
 
-<artifact name="EventPublisher_ConnectedCup" version="1.0.0" type="event/publisher" serverRole="DataAnalyticsServer">
-    <file>EventPublisher_ConnectedCup.xml</file>
+<artifact name="connected_cup_execution" version="1.0.0" type="event/execution-plan" serverRole="DataAnalyticsServer">
+	<file>connected_cup_execution.siddhiql</file>
 </artifact>
+
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventExecution_ConnectedCup_1.0.0/EventExecution_ConnectedCup.siddhiql b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql
similarity index 90%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventExecution_ConnectedCup_1.0.0/EventExecution_ConnectedCup.siddhiql
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql
index 8983afbf..51552f2b 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventExecution_ConnectedCup_1.0.0/EventExecution_ConnectedCup.siddhiql
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql
@@ -1,8 +1,8 @@
 /* Enter a unique ExecutionPlan */
-@Plan:name('connectedcup_execution')
+@Plan:name('connected_cup_execution')
 
 /* Enter a unique description for ExecutionPlan */
--- @Plan:description('connectedcup_execution')
+-- @Plan:description('connected_cup_execution')
 
 /* define streams/tables and write queries here ... */
 
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventReceiver_ConnectedCup_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml
similarity index 81%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventReceiver_ConnectedCup_1.0.0/artifact.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml
index bbfbaceb..354893d8 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventReceiver_ConnectedCup_1.0.0/artifact.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml
@@ -17,6 +17,6 @@
   ~ under the License.
   -->
 
-<artifact name="EventReceiver_ConnectedCup" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
-    <file>EventReceiver_ConnectedCup.xml</file>
+<artifact name="connected_cup_publisher" version="1.0.0" type="event/publisher" serverRole="DataAnalyticsServer">
+    <file>connected_cup_publisher.xml</file>
 </artifact>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventPublisher_ConnectedCup_1.0.0/EventPublisher_ConnectedCup.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml
similarity index 87%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventPublisher_ConnectedCup_1.0.0/EventPublisher_ConnectedCup.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml
index 8a2615a5..58557f25 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventPublisher_ConnectedCup_1.0.0/EventPublisher_ConnectedCup.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 
-<eventPublisher name="EventPublisher_ConnectedCup" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventpublisher">
+<eventPublisher name="connected_cup_publisher" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventpublisher">
     <from streamName="org.wso2.iot.connectedcup" version="1.0.0"/>
     <mapping customMapping="disable" type="wso2event"/>
     <to eventAdapterType="iot-ui"/>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml
new file mode 100644
index 00000000..fc46f231
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<artifact name="connected_cup_receiver" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
+    <file>connected_cup_receiver.xml</file>
+</artifact>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventReceiver_ConnectedCup_1.0.0/EventReceiver_ConnectedCup.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
similarity index 65%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventReceiver_ConnectedCup_1.0.0/EventReceiver_ConnectedCup.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
index 94c1c435..ff9214e9 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventReceiver_ConnectedCup_1.0.0/EventReceiver_ConnectedCup.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
@@ -19,15 +19,15 @@
 
 <eventReceiver name="EventReceiver_ConnectedCup" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
     <from eventAdapterType="oauth-mqtt">
-        <property name="topic">wso2/carbon.super/connectedcup/#</property>
+        <property name="topic">carbon.super/connectedcup/#</property>
         <property name="username">admin</property>
-        <property name="contentValidationParams">device_id_json_path:event.metaData.deviceId,device_id_topic_hierarchy_index:3</property>
-        <property name="contentValidation">default</property>
-        <property name="dcrUrl">https://localhost:9443/dynamic-client-web/register</property>
-        <property name="url">tcp://localhost:1883</property>
+        <property name="contentValidatorParams">device_id_json_path:event.metaData.deviceId,device_id_topic_hierarchy_index:2</property>
+        <property name="contentValidator">org.wso2.carbon.device.mgt.iot.input.adapter.mqtt.util.MQTTContentValidator</property>
+        <property name="contentTransformer">default</property>
+        <property name="dcrUrl">https://localhost:${carbon.https.port}/dynamic-client-web/register</property>
+        <property name="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
         <property name="cleanSession">true</property>
     </from>
     <mapping customMapping="disable" type="json"/>
     <to streamName="org.wso2.iot.connectedcup" version="1.0.0"/>
-</eventReceiver>
-
+</eventReceiver>
\ No newline at end of file
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventStream_ConnectedCup_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml
similarity index 87%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventStream_ConnectedCup_1.0.0/artifact.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml
index b913ea40..7d5f267f 100644
--- a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventStream_ConnectedCup_1.0.0/artifact.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 
-<artifact name="EventStream_ConnectedCup" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
+<artifact name="connected_cup_stream" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
 	<file>org.wso2.iot.connectedcup_1.0.0.json</file>
 </artifact>
 
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventStream_ConnectedCup_1.0.0/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
similarity index 100%
rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/ConnectedCup/EventStream_ConnectedCup_1.0.0/org.wso2.iot.connectedcup_1.0.0.json
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json
diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupControllerService.java b/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupControllerService.java
index f89a405e..a41d44e2 100644
--- a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupControllerService.java
+++ b/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupControllerService.java
@@ -39,8 +39,7 @@ public interface ConnectedCupControllerService {
 
     @Path("device/ordercoffee")
     @POST
-    @Feature(code = "ordercoffee", name = "Order Coffee", type = "control",
-            description = "Order coffee cup")
+    @Feature(code = "ordercoffee", name = "Order Coffee", description = "Order coffee cup")
     Response orderCoffee(@QueryParam("deviceId") String deviceId);
 
     /**
diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java b/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java
index d7091bfe..08a3bc94 100644
--- a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java
+++ b/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.coffeeking.api.util;
 
 import org.apache.commons.logging.Log;
diff --git a/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/constants/ConnectedCupConstants.java b/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/constants/ConnectedCupConstants.java
index ac179ebc..8cfe4f0f 100644
--- a/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/constants/ConnectedCupConstants.java
+++ b/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/constants/ConnectedCupConstants.java
@@ -1,8 +1,22 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.coffeeking.connectedcup.plugin.constants;
 
-/**
- * Created by menaka on 1/11/16.
- */
 public class ConnectedCupConstants {
     public final static String DEVICE_TYPE = "connectedcup";
     public final static String DEVICE_PLUGIN_DEVICE_NAME = "DEVICE_NAME";
diff --git a/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java b/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java
index 296ea59b..8428559d 100644
--- a/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java
+++ b/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except