diff --git a/modules/distribution/src/sketches/firealarm/FireAlarmEthernetAgent.h b/modules/distribution/src/sketches/firealarm/FireAlarmEthernetAgent.h
index bd4c28e5..ba97ed8a 100755
--- a/modules/distribution/src/sketches/firealarm/FireAlarmEthernetAgent.h
+++ b/modules/distribution/src/sketches/firealarm/FireAlarmEthernetAgent.h
@@ -30,7 +30,7 @@
 #define END_JSON "\"}"
 
 #define SERVICE_PORT 9763 
-#define SERVICE_EPOINT "/iotdevices/FireAlarmController/" 
+#define SERVICE_EPOINT "/firealarm/controller/"
                                         // pushalarmdata - application/json - {"owner":"","deviceId":"","replyMessage":"","time":"","key":"","value":""}
                                         // readcontrols/{owner}/{deviceId}
                                         // reply - application/json - {"owner":"","deviceId":"","replyMessage":""}
diff --git a/modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h b/modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h
index b71dcc0a..ef322104 100755
--- a/modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h
+++ b/modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h
@@ -26,7 +26,7 @@
 
 
 #define SERVICE_PORT 9763 
-#define SERVICE_EPOINT "/iotdevices/FireAlarmController/" 
+#define SERVICE_EPOINT "/firealarm/controller/"
                                         // pushalarmdata - application/json - {"owner":"","deviceId":"","replyMessage":"","time":"","key":"","value":""}
                                         // readcontrols/{owner}/{deviceId}
                                         // reply - application/json - {"owner":"","deviceId":"","replyMessage":""}
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 39c91c40..4c89536b 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -117,11 +117,7 @@
                                 </featureArtifactDef>
                                 <!-- End of Device Management Features -->
 
-                                <!-- Mobile Device Management Features -->
-                                <!--featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.mobile.device.mgt.version}
-                                </featureArtifactDef-->
-                                <!-- Mobile Device Management Features -->
+
 
                                 <!-- Carbon Deployment Features -->
                                 <featureArtifactDef>
@@ -300,9 +296,9 @@
                                     org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version}
                                 </featureArtifactDef>
 
-				<!--Device Cloud Features -->
-				<featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.feature:1.9.2-SNAPSHOT
+				                <!--Device Cloud Features -->
+				                <featureArtifactDef>
+                                    org.wso2.carbon.device.mgt.iot:org.wso2.carbon.device.mgt.iot.feature:1.0.0-SNAPSHOT
                                 </featureArtifactDef>
 
                             </featureArtifacts>
@@ -578,7 +574,7 @@
                                 </feature>
 				<feature>
                                     <id>org.wso2.carbon.device.mgt.iot.feature.group</id>
-                                    <version>1.9.2-SNAPSHOT</version>
+                                    <version>1.0.0-SNAPSHOT</version>
                                 </feature>
                             </features>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index 33d8415e..ee1fdd06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -784,8 +784,8 @@
         <carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[0.8.0, 2.0.0)</carbon.device.mgt.version.range>
 
-        <!-- Mobile Device Management -->
-        <carbon.iot.device.mgt.version>1.9.2-SNAPSHOT</carbon.iot.device.mgt.version>
+        <!-- IOT Device Management -->
+        <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
         <mdm.version>1.0.0-SNAPSHOT</mdm.version>
 
         <!-- API Management -->