diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 9d0cc36a..625a7f70 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -122,89 +122,7 @@
 			     </tasks>
                         </configuration>
                     </execution>
-                    <!--execution-->
-                        <!-- Creating IOS Mobile Plugin Management schema -->
-                        <!--id>create-ios-mobile-plugin-mgt-schema</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo message="########### Create IOS Mobile plugin Management H2 Schema ###########" />
-
-                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
-                                <property name="userid" value="wso2carbon" />
-                                <property name="password" value="wso2carbon" />
-                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2MobileIOS_DB;DB_CLOSE_ON_EXIT=FALSE" />
-
-                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
-
-                                    <fileset
-                                            file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_ios.sql" />
-                                </sql>
-                                <echo message="##################### END ####################" />
-                            </tasks>
-                        </configuration>
-                    </execution-->
-                    <!--execution-->
-                        <!-- Creating Android Mobile Plugin Management schema -->
-                        <!--id>create-mobile-android-plugin-mgt-schema</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo message="########### Create ANDROID Mobile plugin Management H2 Schema ###########" />
-
-                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
-                                <property name="userid" value="wso2carbon" />
-                                <property name="password" value="wso2carbon" />
-                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE" />
-
-                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
 
-                                    <fileset
-                                            file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_android.sql" />
-                                </sql>
-                                <echo message="##################### END ####################" />
-                            </tasks>
-                        </configuration>
-                    </execution-->
-                    <!--execution-->
-                        <!-- Creating Windows Mobile Plugin Management schema -->
-                        <!--id>create-mobile-windows-plugin-mgt-schema</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo message="########### Create WINDOWS Mobile plugin Management H2 Schema ###########" />
-                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
-                                <property name="userid" value="wso2carbon" />
-                                <property name="password" value="wso2carbon" />
-                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2MobileWindows_DB;DB_CLOSE_ON_EXIT=FALSE" />
-
-                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
-
-                                    <fileset
-                                            file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_windows.sql" />
-                                </sql>
-                                <echo message="##################### END ####################" />
-                            </tasks>
-                        </configuration>
-                    </execution-->
                     <execution>
                         <!-- Creating IDP Management schema -->
                         <id>create-idp-mgt-schema</id>
@@ -345,7 +263,7 @@
 
                     <execution>
                         <!-- Creating IOT Management schema -->
-                        <id>create-android-schema</id>
+                        <id>create-android-sense-schema</id>
                         <phase>package</phase>
                         <goals>
                             <goal>run</goal>
@@ -357,13 +275,13 @@
                                 <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
                                 <property name="userid" value="wso2carbon" />
                                 <property name="password" value="wso2carbon" />
-                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/AndroidDM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/AndroidSenseDM_DB;DB_CLOSE_ON_EXIT=FALSE" />
 
                                 <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
                                     <classpath refid="maven.dependency.classpath" />
                                     <classpath refid="maven.compile.classpath" />
                                     <classpath refid="maven.runtime.classpath" />
-                                     <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_android.sql" />
+                                     <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_android_sense.sql" />
                                 </sql>
                                 <echo message="##################### END ####################" />
                             </tasks>
@@ -419,7 +337,7 @@
                                     <classpath refid="maven.compile.classpath" />
                                     <classpath refid="maven.runtime.classpath" />
                                     <!--fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberry.sql" /-->
-                                    <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_digitaldisplay.sql" />
+                                    <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_digital_display.sql" />
                                 </sql>
                                 <echo message="##################### END ####################" />
                             </tasks>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 2a09163b..267f8312 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -280,7 +280,7 @@
                 <include>devicecloud.war</include>
                 <include>firealarm.war</include>
                 <include>arduino.war</include>
-                <include>android.war</include>
+                <include>android_sense.war</include>
                 <include>sensebot.war</include>
                 <include>raspberrypi.war</include>
                 <include>digitaldisplay.war</include>
diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index 73bfe1cc..d0e734fc 100755
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -141,14 +141,14 @@
         </datasource>
 
         <datasource>
-            <name>AndroidDM_DS</name>
+            <name>AndroidSenseDM_DB</name>
             <description>The datasource used for Android database</description>
             <jndiConfig>
-                <name>jdbc/AndroidDM_DB</name>
+                <name>jdbc/AndroidSenseDM_DB</name>
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/AndroidDM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <url>jdbc:h2:repository/database/AndroidSenseDM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
diff --git a/modules/distribution/user-api-publisher-config.xml b/modules/distribution/user-api-publisher-config.xml
index 244f74b6..62d440ca 100644
--- a/modules/distribution/user-api-publisher-config.xml
+++ b/modules/distribution/user-api-publisher-config.xml
@@ -16,39 +16,39 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
 -->
-<APIPublisherConfig>
-        <APIs>
-            <API>
-               <Name>appmanager</Name>
-               <Owner>admin</Owner>
-               <Context>/devices</Context>
-               <Version>1.0.0</Version>
-               <Endpoint>http://localhost:9763/test/app</Endpoint>
-               <Transports>http,https</Transports>
-            </API>
-            <API>
-               <Name>enrol</Name>
-               <Owner>admin</Owner>
-               <Context>/enroll</Context>
-               <Version>1.0.0</Version>
-               <Endpoint>http://localhost:9763/cdm-android-api/enrollment</Endpoint>
-               <Transports>http,https</Transports>
-            </API>
-            <API>
-               <Name>license</Name>
-               <Owner>admin</Owner>
-               <Context>/license</Context>
-               <Version>1.0.0</Version>
-               <Endpoint>http://localhost:9763/cdm-android-api/devices/license</Endpoint>
-               <Transports>http,https</Transports>
-            </API>
-            <API>
-               <Name>operation</Name>
-               <Owner>admin</Owner>
-               <Context>/operation</Context>
-               <Version>1.0.0</Version>
-               <Endpoint>http://localhost:9763/cdm-android-ap/operation</Endpoint>
-               <Transports>http,https</Transports>
-            </API>
-         </APIs>
-</APIPublisherConfig>
+<!--<APIPublisherConfig>-->
+        <!--<APIs>-->
+            <!--<API>-->
+               <!--<Name>appmanager</Name>-->
+               <!--<Owner>admin</Owner>-->
+               <!--<Context>/devices</Context>-->
+               <!--<Version>1.0.0</Version>-->
+               <!--<Endpoint>http://localhost:9763/test/app</Endpoint>-->
+               <!--<Transports>http,https</Transports>-->
+            <!--</API>-->
+            <!--<API>-->
+               <!--<Name>enrol</Name>-->
+               <!--<Owner>admin</Owner>-->
+               <!--<Context>/enroll</Context>-->
+               <!--<Version>1.0.0</Version>-->
+               <!--<Endpoint>http://localhost:9763/cdm-android-api/enrollment</Endpoint>-->
+               <!--<Transports>http,https</Transports>-->
+            <!--</API>-->
+            <!--<API>-->
+               <!--<Name>license</Name>-->
+               <!--<Owner>admin</Owner>-->
+               <!--<Context>/license</Context>-->
+               <!--<Version>1.0.0</Version>-->
+               <!--<Endpoint>http://localhost:9763/cdm-android-api/devices/license</Endpoint>-->
+               <!--<Transports>http,https</Transports>-->
+            <!--</API>-->
+            <!--<API>-->
+               <!--<Name>operation</Name>-->
+               <!--<Owner>admin</Owner>-->
+               <!--<Context>/operation</Context>-->
+               <!--<Version>1.0.0</Version>-->
+               <!--<Endpoint>http://localhost:9763/cdm-android-ap/operation</Endpoint>-->
+               <!--<Transports>http,https</Transports>-->
+            <!--</API>-->
+         <!--</APIs>-->
+<!--</APIPublisherConfig>-->
diff --git a/pom.xml b/pom.xml
index e0e54177..c7fcf655 100644
--- a/pom.xml
+++ b/pom.xml
@@ -374,7 +374,7 @@
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.iot</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.iot.android.impl</artifactId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.android.sense.impl</artifactId>
                 <version>${carbon.iot.device.mgt.version}</version>
             </dependency>
             <dependency>
@@ -785,9 +785,7 @@
         <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
         <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
 
-        <!--MDM android Agent-->
 
-        <mdm.android.agent.archetype.version>1.0.0-SNAPSHOT</mdm.android.agent.archetype.version>
 
         <!--CXF properties-->
         <cxf.version>2.6.1</cxf.version>