diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_executionplan/Android-Gravity-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_executionplan/Android-Gravity-ExecutionPlan.siddhiql
index 051d8c18f..62313b131 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_executionplan/Android-Gravity-ExecutionPlan.siddhiql
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_executionplan/Android-Gravity-ExecutionPlan.siddhiql
@@ -2,10 +2,10 @@
 
 @Plan:description('Process gravity changes.')
 
-@Import('org.wso2.iot.android.gravity:1.0.0')
+@Import('iot.per.device.stream.android.gravity:1.0.0')
 define stream GravityStream (meta_owner string, meta_deviceId string, meta_timestamp long, x float, y float, z float);
 
-@Export('org.wso2.iot.android.gravity.stats:1.0.0')
+@Export('iot.per.device.stream.android.gravity.stats:1.0.0')
 define stream GravityStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, x
 float, y float, z float, year int, month int, day int, hour int, minute int);
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_stats_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_stats_event_sink/artifact.xml
index 5e6606c34..155f5ba31 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_stats_event_sink/artifact.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_stats_event_sink/artifact.xml
@@ -18,6 +18,6 @@
   -->
 
 <artifact name= "android_gravity_stats_event_sink" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
-	<file>org_wso2_iot_android_gravity_stats.xml</file>
+	<file>iot_per_device_stream_android_gravity_stats.xml</file>
 </artifact>
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_stats_streams/artifact.xml
index a1bcd3a44..de493e933 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_stats_streams/artifact.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_stats_streams/artifact.xml
@@ -19,6 +19,6 @@
 
 <artifact name= "android_gravity_stats_streams" version="1.0.0" type="event/stream"
 		  serverRole="DataAnalyticsServer">
-	<file>org.wso2.iot.android.gravity.stats_1.0.0.json</file>
+	<file>iot.per.device.stream.android.gravity.stats_1.0.0.json</file>
 </artifact>
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_streams/artifact.xml
index e15f70b7c..e8a1e6f11 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_streams/artifact.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_streams/artifact.xml
@@ -18,6 +18,6 @@
   -->
 
 <artifact name= "android_gravity_streams" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-	<file>org.wso2.iot.android.gravity_1.0.0.json</file>
+	<file>iot.per.device.stream.android.gravity_1.0.0.json</file>
 </artifact>