diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 52d4c11e..8ce1b7ef 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -26,7 +26,7 @@
                 <exclude>**/client-truststore.jks</exclude>
                 <exclude>**/wso2carbon.jks</exclude>
                 <exclude>**/WSO2AM_DB.h2.db</exclude>
-                <exclude>**/ArduinoDM_DB.h2.db</exclude>
+                <exclude>**/FireAlarmDM_DB.h2.db</exclude>
                 <exclude>**/WSO2DM_DB.h2.db</exclude>
                 <exclude>**/conf/axis2/axis2_client.xml</exclude>
                 <exclude>**/conf/etc/launch.ini</exclude>
diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index b7dff9b0..45db91a5 100755
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -99,7 +99,7 @@
         </datasource>
 
 	<datasource>
-            <name>ArduinoDM_DS</name>
+            <name>FireAlarmDM_DS</name>
             <description>The datasource used for API Manager database</description>
             <jndiConfig>
                 <name>jdbc/FireAlarmDM_DB</name>
diff --git a/pom.xml b/pom.xml
index ee1fdd06..936ec921 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,10 +353,16 @@
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
 
-            <!--MDM dependencies-->
+            <!--IOT dependencies-->
             <dependency>
                 <groupId>org.wso2.carbon.iot</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.iot.impl</artifactId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.firealarm.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.iot</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
                 <version>${carbon.iot.device.mgt.version}</version>
             </dependency>