diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 3d5566c0..075a6732 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -277,7 +277,27 @@
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
             <includes>
-                <include>iotdevices.war</include>
+                <include>firealarm.war</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
+            <includes>
+                <include>sensebot.war</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
+            <includes>
+                <include>devicecloud.war</include>
             </includes>
         </fileSet>
 
diff --git a/modules/distribution/src/repository/jaggeryapps/iot/api/device-api.jag b/modules/distribution/src/repository/jaggeryapps/iot/api/device-api.jag
index e8a48ea0..a6132daa 100644
--- a/modules/distribution/src/repository/jaggeryapps/iot/api/device-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iot/api/device-api.jag
@@ -41,7 +41,7 @@ if (uriMatcher.match("/{context}/api/device/sketch/")) {
         exit();
     }
 
-	fireAlarmManagerService = carbonHttpsServletTransport + "/iotdevices/FireAlarmManager";
+	fireAlarmManagerService = carbonHttpsServletTransport + "/firealarm/manager";
 	sketchDownloadEndPoint = fireAlarmManagerService + "/downloadSketch";
     response.sendRedirect(sketchDownloadEndPoint + "?type="+sketchType+"&owner="+user.username);
 	exit();
@@ -57,7 +57,7 @@ if (uriMatcher.match("/{context}/api/devices/")) {
 		exit();
 	}
 
-	devicesManagerService = carbonHttpsServletTransport + "/iotdevices/DevicesManager";
+	devicesManagerService = carbonHttpsServletTransport + "/devicecloud/manager";
 	listAllDevicesEndPoint = devicesManagerService + "/getDevices";
 
 	var data = {};
diff --git a/modules/distribution/src/repository/jaggeryapps/sensebot/api/device-api.jag b/modules/distribution/src/repository/jaggeryapps/sensebot/api/device-api.jag
index 0a5c8ef4..034a4eee 100644
--- a/modules/distribution/src/repository/jaggeryapps/sensebot/api/device-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/sensebot/api/device-api.jag
@@ -33,7 +33,7 @@ if (uriMatcher.match("/{context}/api/device/sketch/")) {
     sketchType = request.getParameter("type");
     if(!sketchType){log.error("Sketch Type is empty");}
 
-	senseBotManagerService = "http://localhost:9763/iotdevices/SenseBotManager";
+	senseBotManagerService = "http://localhost:9763/sensebot/manager";
 	sketchDownloadEndPoint = senseBotManagerService + "/downloadSketch";
     response.sendRedirect(sketchDownloadEndPoint + "?type="+sketchType+"&owner=anonymous");
 	exit();
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":""}