diff --git a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
index c9a79d28ad..97e4f532ec 100644
--- a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
+++ b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
@@ -64,7 +64,7 @@ public class AndroidSenseService {
     private static final String PRESSURE_STREAM_DEFINITION = "org.wso2.iot.devices.pressure";
     private static final String GRAVITY_STREAM_DEFINITION = "org.wso2.iot.devices.gravity";
     private static final String ROTATION_STREAM_DEFINITION = "org.wso2.iot.devices.rotation";
-    private static final String PROXIMITY_STREAM_DEFINITION = "org.wso2.iot.device.proximity";
+    private static final String PROXIMITY_STREAM_DEFINITION = "org.wso2.iot.devices.proximity";
 
     private static final String SENSOR_ACCELEROMETER = "accelerometer";
     private static final String SENSOR_GYROSCOPE = "gyroscope";
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics/Light/Eventstream_light_1.0.0/org.wso2.iot.devices.light_1.0.0.json b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics/Light/Eventstream_light_1.0.0/org.wso2.iot.devices.light_1.0.0.json
index f9da446f8a..253f0b0c0d 100644
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics/Light/Eventstream_light_1.0.0/org.wso2.iot.devices.light_1.0.0.json
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics/Light/Eventstream_light_1.0.0/org.wso2.iot.devices.light_1.0.0.json
@@ -1,8 +1,8 @@
 {
   "name": "org.wso2.iot.devices.light",
   "version": "1.0.0",
-  "nickName": "Light Data",
-  "description": "Light data received from the Device",
+  "nickName": "light Data",
+  "description": "light data received from the Device",
   "metaData": [
     {"name":"owner","type":"STRING"},     
     {"name":"deviceType","type":"STRING"},