diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 5e0c35ff..a59519b9 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>**/ArduinoDM_DB.h2.db</exclude>
                 <exclude>**/WSO2DM_DB.h2.db</exclude>
                 <exclude>**/conf/axis2/axis2_client.xml</exclude>
                 <exclude>**/conf/etc/launch.ini</exclude>
@@ -606,7 +606,7 @@
                 target/wso2carbon-core-${carbon.kernel.version}/repository/database/FireAlarmDM_DB.h2.db
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
-            <destName>ArduinoDM_DB.h2.db</destName>
+            <destName>FireAlarmDM_DB.h2.db</destName>
             <fileMode>644</fileMode>
         </file>
 
diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index 1f08b5c8..54c9d384 100755
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -102,11 +102,11 @@
             <name>ArduinoDM_DS</name>
             <description>The datasource used for API Manager database</description>
             <jndiConfig>
-                <name>jdbc/ArduinoDM_DB</name>
+                <name>jdbc/FireAlarmDM_DB</name>
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/ArduinoDM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <url>jdbc:h2:repository/database/FireAlarmDM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>