diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe18b20..976eaaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,6 @@ deploy:
   script:
     - mvn $MAVEN_CLI_OPTS deploy
   only:
-    - master@entgra/community-product
+    - master@entgra/product-uem-community
   tags:
     - OracleJDK1.8
diff --git a/README.md b/README.md
index 0fedf13..4e3f5b2 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
 
-[![pipeline status](https://builder.entgra.net/buildStatus/icon?job=community-product)](https://repository.entgra.net/community/community-product/commits/master)
+[![pipeline status](https://builder.entgra.net/buildStatus/icon?job=product-uem-community)](https://repository.entgra.net/community/product-uem-community/commits/master)
 
 Entgra IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner.
 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 3f57a26..e1cd5b1 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.community.uem.distribution</artifactId>
+    <artifactId>distribution</artifactId>
     <packaging>pom</packaging>
     <name>Entgra IoT - Distribution Module</name>
     <description>Entgra IoT Distribution Module</description>
diff --git a/distribution/uem-community/pom.xml b/distribution/uem-community/pom.xml
index e5571da..8fcdb57 100644
--- a/distribution/uem-community/pom.xml
+++ b/distribution/uem-community/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>io.entgra.community.uem</groupId>
-        <artifactId>io.entgra.community.uem.distribution</artifactId>
+        <artifactId>distribution</artifactId>
         <version>5.2.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml
index 65b4165..dcc30a8 100644
--- a/p2-profile/pom.xml
+++ b/p2-profile/pom.xml
@@ -77,10 +77,10 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
                                 <featureArtifactDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mobile.android.feature:${carbon.device.mgt.plugin.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mobile.android.feature:${io.entgra.device.mgt.plugins.version}
                                 </featureArtifactDef>
                                 <!--<featureArtifactDef>-->
-                                <!--io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.notification.listener.feature:${carbon.device.mgt.plugin.version}-->
+                                <!--io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.notification.listener.feature:${io.entgra.device.mgt.plugins.version}-->
                                 <!--</featureArtifactDef>-->
                             </featureArtifacts>
                         </configuration>
@@ -100,11 +100,11 @@
                             <features>
                                 <feature>
                                     <id>io.entgra.device.mgt.plugins.mobile.android.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                    <version>${io.entgra.device.mgt.plugins.version}</version>
                                 </feature>
                                 <!--<feature>-->
                                 <!--<id>io.entgra.device.mgt.plugins.notification.listener.feature.group</id>-->
-                                <!--<version>${carbon.device.mgt.plugin.version}</version>-->
+                                <!--<version>${io.entgra.device.mgt.plugins.version}</version>-->
                                 <!--</feature>-->
                             </features>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index 0d52569..ec6e1ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,49 +44,9 @@
         <dependencies>
             <!--CDM core dependencies-->
             <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.group.core</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.group.common</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <groupId>io.entgra.device.mgt.core</groupId>
+                <artifactId>io.entgra.device.mgt.core.device.mgt.oauth.extensions</artifactId>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
 
             <!--Orbit dependencies-->
@@ -359,17 +319,17 @@
         <wso2am>wso2am-4.0.0</wso2am>
 
         <entgra-uem-core>io.entgra.community.uem.core-${project.version}</entgra-uem-core>
-        <entgra-uem-community>product-uem-community-${project.version}</entgra-uem-community>
+        <entgra-uem-community>entgra-uem-community-${project.version}</entgra-uem-community>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>5.0.25</carbon.device.mgt.version>
+        <io.entgra.device.mgt.core.version>5.0.26-SNAPSHOT</io.entgra.device.mgt.core.version>
 
         <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
 
         <!--Orbit versions-->
         <orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version>
 
-        <carbon.device.mgt.plugin.version>6.0.17-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <io.entgra.device.mgt.plugins.version>6.0.17-SNAPSHOT</io.entgra.device.mgt.plugins.version>
 
         <!--Testing-->
         <google.gson.version>2.8.5</google.gson.version>
@@ -380,9 +340,9 @@
     </properties>
 
     <scm>
-        <url>https://repository.entgra.net/community/community-product.git</url>
-        <developerConnection>scm:git:https://repository.entgra.net/community/community-product.git</developerConnection>
-        <connection>scm:git:https://repository.entgra.net/community/community-product.git</connection>
+        <url>https://repository.entgra.net/community/product-uem-community.git</url>
+        <developerConnection>scm:git:https://repository.entgra.net/community/product-uem-community.git</developerConnection>
+        <connection>scm:git:https://repository.entgra.net/community/product-uem-community.git</connection>
         <tag>HEAD</tag>
     </scm>
 
diff --git a/uem-core/pom.xml b/uem-core/pom.xml
index 3cc92ce..03c6225 100644
--- a/uem-core/pom.xml
+++ b/uem-core/pom.xml
@@ -36,8 +36,8 @@
             <artifactId>h2</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
+            <groupId>io.entgra.device.mgt.core</groupId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.oauth.extensions</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.am</groupId>
@@ -110,14 +110,40 @@
                         </goals>
                         <configuration>
                             <target name="increase IDN_OAUTH2_ACCESS_TOKEN_SCOPE -&gt; TOKEN_SCOPE column size">
-                                <replace file="target/${wso2am}/dbscripts/apimgt/db2.sql" token="TOKEN_SCOPE VARCHAR (60) NOT NULL," value="TOKEN_SCOPE VARCHAR (255) NOT NULL," />
-                                <replace file="target/${wso2am}/dbscripts/apimgt/h2.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (255)," />
-                                <replace file="target/${wso2am}/dbscripts/apimgt/mssql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (255)," />
-                                <replace file="target/${wso2am}/dbscripts/apimgt/mysql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (255)," />
-                                <replace file="target/${wso2am}/dbscripts/apimgt/mysql_cluster.sql" token="TOKEN_SCOPE VARCHAR(60)," value="TOKEN_SCOPE VARCHAR(255)," />
-                                <replace file="target/${wso2am}/dbscripts/apimgt/oracle.sql" token="TOKEN_SCOPE VARCHAR2 (60)," value="TOKEN_SCOPE VARCHAR2 (255)," />
-                                <replace file="target/${wso2am}/dbscripts/apimgt/oracle_rac.sql" token="TOKEN_SCOPE VARCHAR2 (60)," value="TOKEN_SCOPE VARCHAR2 (60)," />
-                                <replace file="target/${wso2am}/dbscripts/apimgt/postgresql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (60)," />
+                                <replace file="target/${wso2am}/dbscripts/apimgt/db2.sql" token="TOKEN_SCOPE VARCHAR (60) NOT NULL," value="TOKEN_SCOPE VARCHAR (1000) NOT NULL," />
+                                <replace file="target/${wso2am}/dbscripts/apimgt/h2.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (1000)," />
+                                <replace file="target/${wso2am}/dbscripts/apimgt/mssql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (1000)," />
+                                <replace file="target/${wso2am}/dbscripts/apimgt/mysql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (1000)," />
+                                <replace file="target/${wso2am}/dbscripts/apimgt/mysql_cluster.sql" token="TOKEN_SCOPE VARCHAR(60)," value="TOKEN_SCOPE VARCHAR(1000)," />
+                                <replace file="target/${wso2am}/dbscripts/apimgt/oracle.sql" token="TOKEN_SCOPE VARCHAR2 (60)," value="TOKEN_SCOPE VARCHAR2 (1000)," />
+                                <replace file="target/${wso2am}/dbscripts/apimgt/oracle_rac.sql" token="TOKEN_SCOPE VARCHAR2 (60)," value="TOKEN_SCOPE VARCHAR2 (1000)," />
+                                <replace file="target/${wso2am}/dbscripts/apimgt/postgresql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (1000)," />
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <!--Alter Apimgt h2 db -->
+                        <id>alter-apimgt-h2-db</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <echo message="########### Alter apimgt H2 Schema ###########" />
+                                <property name="db.dir" value="target/${wso2am}/repository/database" />
+                                <property name="userid" value="wso2carbon" />
+                                <property name="password" value="wso2carbon" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2AM_DB;AUTO_SERVER=TRUE;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}/src/core/scripts/alter-apimgt-h2-db.sql" />
+                                </sql>
+                                <echo message="##################### END ####################" />
                             </target>
                         </configuration>
                     </execution>
@@ -245,122 +271,122 @@
                             <featureArtifacts>
                                 <!-- Device Management Features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.policy.mgt.server.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.api.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.certificate.mgt.api.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.cert.admin.api.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.certificate.mgt.server.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.webapp.publisher.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.identity.jwt.client.extension.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.keymgt.extension.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.email.sender.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    io.entgra.devicemgt:io.entgra.ui.request.interceptor.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.ui.request.interceptor.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.server.heart.beat.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.server.heart.beat.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <!-- End of Device Management Features -->
 
                                 <!-- Grafana Management Features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.analytics.mgt.grafana.proxy.server.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.analytics.mgt.grafana.proxy.api.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <!-- End of Grafana Management Features -->
 
                                 <!-- SMS Management Features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.server.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.api.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <!-- End of SMS Management Features -->
 
                                 <!-- App Manager Features-->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.application.mgt.api.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.api.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.application.mgt.server.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.server.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <!-- End of New App Manager Features-->
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.defaultrole.manager.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.logger.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.logger.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.stateengine.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
 
                                 <!-- Task Mgt Feature-->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.task.mgt.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <!-- End of Task Mgt Feature-->
 
                                 <!-- Notification Logger Feature-->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.notification.logger.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.notification.logger.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <!-- End of Notification Logger Feature-->
 
                                 <!-- APIM analytics extension feature-->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.device.mgt.core.apimgt.analytics.extension.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.analytics.extension.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <!-- End of APIM analytics extension feature-->
 
                                 <!-- Tenant Management Feature -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.tenant.mgt.server.feature:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.tenant.mgt.server.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <!-- End of Tenant Management Feature -->
                             </featureArtifacts>
@@ -381,170 +407,170 @@
                             <features>
                                 <!--Device Management Features-->
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.device.mgt.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.device.mgt.extensions.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--Grafana Management Features-->
                                 <feature>
-                                    <id>io.entgra.analytics.mgt.grafana.proxy.server.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>io.entgra.analytics.mgt.grafana.proxy.api.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <!--End of Grafana Management Features-->
 
                                 <!--App Manager Features-->
                                 <feature>
-                                    <id>io.entgra.application.mgt.api.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.application.mgt.api.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>io.entgra.application.mgt.server.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.application.mgt.server.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <!--End of App Manager Features-->
 
                                 <!--SMS Management Features-->
                                 <feature>
-                                    <id>io.entgra.transport.mgt.sms.handler.server.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>io.entgra.transport.mgt.sms.handler.api.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <!--End of SMS Management Features-->
 
                                 <!--Email Sender Feature-->
                                 <feature>
-                                    <id>org.wso2.carbon.email.sender.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.email.sender.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--Apimgt Extension Features -->
                                 <feature>
-                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.apimgt.application.extension.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.apimgt.webapp.publisher.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.apimgt.keymgt.extension.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.apimgt.keymgt.extension.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--Certificate Mgt Features-->
                                 <feature>
-                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.certificate.mgt.server.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.certificate.mgt.api.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--Device Mgt Extension Features-->
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--Heartbeat Mgt-->
                                 <feature>
-                                    <id>io.entgra.server.heart.beat.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.server.heart.beat.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--jwt client-->
                                 <feature>
-                                    <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.identity.jwt.client.extension.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--policy mgt-->
                                 <feature>
-                                    <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.policy.mgt.server.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--UI request interceptor-->
                                 <feature>
-                                    <id>io.entgra.ui.request.interceptor.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.ui.request.interceptor.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--Webapp authentication framework-->
                                 <feature>
-                                    <id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <feature>
-                                    <id>io.entgra.device.mgt.extensions.defaultrole.manager.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <feature>
-                                    <id>io.entgra.device.mgt.extensions.logger.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.device.mgt.extensions.logger.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <feature>
-                                    <id>io.entgra.device.mgt.extensions.stateengine.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--Task mgt-->
                                 <feature>
-                                    <id>io.entgra.task.mgt.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.task.mgt.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--Notification Logger-->
                                 <feature>
-                                    <id>io.entgra.notification.logger.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.notification.logger.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!--APIM Analytics extension-->
                                 <feature>
                                     <id>io.entgra.device.mgt.core.apimgt.analytics.extension.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
                                 <!-- Tenant Management -->
                                 <feature>
-                                    <id>io.entgra.tenant.mgt.server.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>io.entgra.device.mgt.core.tenant.mgt.server.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
                             </features>
                         </configuration>
diff --git a/uem-core/src/assembly/bin.xml b/uem-core/src/assembly/bin.xml
index f64e9db..daa8903 100644
--- a/uem-core/src/assembly/bin.xml
+++ b/uem-core/src/assembly/bin.xml
@@ -110,8 +110,8 @@
         <dependencySet>
             <outputDirectory>${entgra-uem-core}/repository/components/dropins</outputDirectory>
             <includes>
-                <include>org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions</include>
-                <include>org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.keymgt.extension</include>
+                <include>io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.oauth.extensions</include>
+                <include>io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension</include>
             </includes>
             <!--<useProjectArtifact>false</useProjectArtifact>-->
             <!--<useTransitiveDependencies>true</useTransitiveDependencies>-->
diff --git a/uem-core/src/core/scripts/alter-apimgt-h2-db.sql b/uem-core/src/core/scripts/alter-apimgt-h2-db.sql
new file mode 100644
index 0000000..bb46a9c
--- /dev/null
+++ b/uem-core/src/core/scripts/alter-apimgt-h2-db.sql
@@ -0,0 +1 @@
+ALTER TABLE IDN_OAUTH2_ACCESS_TOKEN_SCOPE ALTER COLUMN TOKEN_SCOPE VARCHAR(1000);
\ No newline at end of file