Bump version to 6.0.0-SNAPSHOT

.github/stale.yml

@@ -1,15 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 10
-# Don't close isssues or pulls
-daysUntilClose: false
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - Resolution/Postponed
-# Label to use when marking an issue as stale
-staleLabel: Resolution/Stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.gitlab-ci.yml

@@ -1,28 +0,0 @@
-image: charithag/docker-mvn-jdk8:latest
-
-variables:
-  MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode"
-  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
-
-cache:
-  paths:
-    - .m2/repository/
-    - target/
-
-build:
-  stage: build
-  script:
-    - mvn $MAVEN_CLI_OPTS clean install -Dmaven.test.skip=true
-
-test:
-  stage: test
-  script:
-    - mvn $MAVEN_CLI_OPTS test
-
-deploy:
-  stage: deploy
-  script:
-    - mvn $MAVEN_CLI_OPTS deploy -Dmaven.test.skip=true
-  only:
-    - master@entgra/carbon-device-mgt
-    - kernel-4.6.x@entgra/carbon-device-mgt

.travis.yml

@@ -1,8 +0,0 @@
-language: java
-jdk:
-    - oraclejdk8
-cache:
-  directories:
-  - .autoconf
-  - $HOME/.m2
-script: mvn clean install

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api</artifactId>
     <packaging>war</packaging>
-    <name>Entgra - Grafana Proxy API</name>
+    <name>Entgra Device Management - Grafana Proxy API</name>
-    <description>Entgra - Grafana Proxy API</description>
+    <description>Entgra Device Management - Grafana Proxy API</description>
     <url>http://entgra.io</url>
 
     <build>

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra - Grafana API Handler Common</name>
+    <name>Entgra Device Management - Grafana API Handler Common</name>
-    <description>Entgra - Grafana API Handler Common</description>
+    <description>Entgra Device Management - Grafana API Handler Common</description>
     <url>http://entgra.io</url>
 
     <build>

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra - Grafana API Handler Core</name>
+    <name>Entgra Device Management - Grafana API Handler Core</name>
-    <description>Entgra - Grafana API Handler Core</description>
+    <description>Entgra Device Management - Grafana API Handler Core</description>
     <url>http://entgra.io</url>
 
     <build>

components/analytics-mgt/grafana-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>analytics-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grafana-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - Grafana API Handler Component</name>
+    <name>Entgra Device Management - Grafana API Handler Component</name>
     <url>http://entgra.io</url>
 
 

components/analytics-mgt/pom.xml

@@ -17,18 +17,19 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>analytics-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - Analytics Management Component</name>
+    <name>Entgra Device Management - Analytics Management Component</name>
     <url>http://entgra.io</url>
 
     <modules>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml

@@ -20,13 +20,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.analytics.extension</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra - API mgt analytics extension</name>
+    <name>Entgra Device Management - API mgt analytics extension</name>
     <url>https://entgra.io</url>
 
     <dependencies>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - API Management Annotations</name>
+    <name>Entgra Device Management - API Management Annotations</name>
-    <description>WSO2 Carbon - API Management Custom Annotation Module</description>
+    <description>Entgra Device Management - API Management Custom Annotation Module</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.application.extension.api</artifactId>
     <packaging>war</packaging>
-    <name>WSO2 Carbon - API Application Management API</name>
+    <name>Entgra Device Management - API Application Management API</name>
     <description>This module provides capability to create api manager application.</description>
     <url>https://entgra.io</url>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - API Application Management</name>
+    <name>Entgra Device Management - API Application Management</name>
     <description>This module provides capability to create api manager application.</description>
     <url>https://entgra.io</url>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.extension.rest.api</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra - Device Management Extension for APIM REST API</name>
+    <name>Entgra Device Management - Device Management Extension for APIM REST API</name>
-    <description>Entgra - Device Management Extension for APIM REST API</description>
+    <description>Entgra Device Management - Device Management Extension for APIM REST API</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension.api</artifactId>
     <packaging>war</packaging>
-    <name>WSO2 Carbon - API Key Management API</name>
+    <name>Entgra Device Management - API Key Management API</name>
     <description>This module extends the API manager's key management apis.</description>
     <url>https://entgra.io</url>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - API Key Management</name>
+    <name>Entgra Device Management - API Key Management</name>
     <description>This module extends the API manager's key management.</description>
     <url>https://entgra.io</url>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.webapp.publisher</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - API Management Webapp Publisher</name>
+    <name>Entgra Device Management - API Management Webapp Publisher</name>
-    <description>WSO2 Carbon - API Management Webapp Publisher</description>
+    <description>Entgra Device Management - API Management Webapp Publisher</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/apimgt-extensions/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apimgt-extensions</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - API Management Extensions Component</name>
+    <name>Entgra Device Management - API Management Extensions Component</name>
     <url>https://entgra.io</url>
 
     <modules>

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>application-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.application.mgt.common</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra - Application Management Common</name>
+    <name>Entgra Device Management - Application Management Common</name>
-    <description>Entgra - Application Management Common</description>
+    <description>Entgra Device Management - Application Management Common</description>
     <url>https://entgra.io</url>
 
     <build>

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>application-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.application.mgt.core</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra - Application Management Core</name>
+    <name>Entgra Device Management - Application Management Core</name>
-    <description>Entgra - Application Management Core</description>
+    <description>Entgra Device Management - Application Management Core</description>
     <url>https://entgra.io</url>
 
     <build>

components/application-mgt/pom.xml

@@ -21,16 +21,16 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>application-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Application Management Component</name>
+    <name>Entgra Device Management - Application Management Component</name>
-    <description>WSO2 Carbon - Application Management Component</description>
+    <description>Entgra Device Management - Application Management Component</description>
     <url>https://entgra.io</url>
 
     <modules>

components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.admin.api/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>cea-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.cea.mgt.admin.api</artifactId>
     <packaging>war</packaging>
-    <name>Entgra IoT - CEA Management Admin API</name>
+    <name>Entgra Device Management - CEA Management Admin API</name>
-    <description>Entgra IoT - Conditional Email Access Management Admin API</description>
+    <description>Entgra Device Management - Conditional Email Access Management Admin API</description>
 
     <build>
         <plugins>

components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.common/pom.xml

@@ -23,15 +23,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>cea-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.cea.mgt.common</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - CEA Management Common</name>
+    <name>Entgra Device Management - CEA Management Common</name>
-    <description>Entgra IoT - Conditional Email Access Management Common</description>
+    <description>Entgra Device Management - Conditional Email Access Management Common</description>
 
     <build>
         <plugins>

components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.core/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>cea-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.cea.mgt.core</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - CEA Management Core</name>
+    <name>Entgra Device Management - CEA Management Core</name>
-    <description>Entgra IoT - Conditional Email Access Management Core</description>
+    <description>Entgra Device Management - Conditional Email Access Management Core</description>
 
     <build>
         <plugins>

components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.enforce/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>cea-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>io.entgra.device.mgt.core.cea.mgt.enforce</artifactId>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - CEA Management Enforcement Service</name>
+    <name>Entgra Device Management - CEA Management Enforcement Service</name>
-    <description>Entgra IoT - Conditional Email Access Management Enforcement Service</description>
+    <description>Entgra Device Management - Conditional Email Access Management Enforcement Service</description>
 
     <build>
         <plugins>

components/cea-mgt/pom.xml

@@ -21,16 +21,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cea-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra IoT - CEA Management Component</name>
+    <name>Entgra Device Management - CEA Management Component</name>
-    <description>Entgra IoT - Conditional Email Access Management Component</description>
+    <description>Entgra Device Management - Conditional Email Access Management Component</description>
 
     <modules>
         <module>io.entgra.device.mgt.core.cea.mgt.core</module>

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.certificate.mgt.api</artifactId>
     <packaging>war</packaging>
-    <name>WSO2 Carbon - Certificate Management API</name>
+    <name>Entgra Device Management - Certificate Management API</name>
-    <description>WSO2 Carbon - Certificate Management API</description>
+    <description>Entgra Device Management - Certificate Management API</description>
     <url>https://entgra.io</url>
 
     <build>

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api</artifactId>
     <packaging>war</packaging>
-    <name>WSO2 Carbon - Admin Certificate Management API</name>
+    <name>Entgra Device Management - Admin Certificate Management API</name>
-    <description>WSO2 Carbon - Admin Certificate Management API</description>
+    <description>Entgra Device Management - Admin Certificate Management API</description>
     <url>https://entgra.io</url>
 
     <build>

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>certificate-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Certificate Management Core</name>
+    <name>Entgra Device Management - Certificate Management Core</name>
-    <description>WSO2 Carbon - Certificate Management Core</description>
+    <description>Entgra Device Management - Certificate Management Core</description>
     <url>https://entgra.io</url>
 
     <build>

components/certificate-mgt/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>certificate-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Certificate Management Component</name>
+    <name>Entgra Device Management - Certificate Management Component</name>
     <url>https://entgra.io</url>
 
     <modules>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - Default User Roles Management Module</name>
+    <name>Entgra Device Management - Default User Roles Management Module</name>
-    <description>Entgra IoT - Default User Roles Management Module Implementation</description>
+    <description>Entgra Device Management - Default User Roles Management Module Implementation</description>
     <url>http://entgra.io</url>
 
     <build>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api</artifactId>
     <packaging>war</packaging>
-    <name>Entgra IoT - API Device Organization Management API</name>
+    <name>Entgra Device Management - API Device Organization Management API</name>
     <description>This module extends the API manager's device organization management apis.</description>
     <url>http://entgra.io</url>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.device.organization</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - Device Organization Module</name>
+    <name>Entgra Device Management - Device Organization Module</name>
-    <description>Entgra IoT - Device Organization Module Implementation</description>
+    <description>Entgra Device Management - Device Organization Module Implementation</description>
     <url>http://entgra.io</url>
     <dependencies>
         <dependency>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Type Deployer</name>
+    <name>Entgra Device Management - Device Type Deployer</name>
-    <description>WSO2 Carbon - Device Type Deployer Implementation</description>
+    <description>Entgra Device Management - Device Type Deployer Implementation</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.logger</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - Logger Impl</name>
+    <name>Entgra Device Management - Logger Impl</name>
-    <description>Entgra IoT - Entgra Logger Implementation</description>
+    <description>Entgra Device Management - Entgra Logger Implementation</description>
     <url>http://entgra.io</url>
 
     <build>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.pull.notification</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Pull Notification Provider Implementation</name>
+    <name>Entgra Device Management - Pull Notification Provider Implementation</name>
-    <description>WSO2 Carbon - Pull Notification Provider Implementation</description>
+    <description>Entgra Device Management - Pull Notification Provider Implementation</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - FCM Based Push Notification Provider Implementation</name>
+    <name>Entgra Device Management - FCM Based Push Notification Provider Implementation</name>
-    <description>WSO2 Carbon - FCM Based Push Notification Provider Implementation</description>
+    <description>Entgra Device Management - FCM Based Push Notification Provider Implementation</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - HTTP Based Push Notification Provider Implementation</name>
+    <name>Entgra Device Management - HTTP Based Push Notification Provider Implementation</name>
-    <description>WSO2 Carbon - HTTP Based Push Notification Provider Implementation</description>
+    <description>Entgra Device Management - HTTP Based Push Notification Provider Implementation</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - MQTT Based Push Notification Provider Implementation</name>
+    <name>Entgra Device Management - MQTT Based Push Notification Provider Implementation</name>
-    <description>WSO2 Carbon - MQTT Based Push Notification Provider Implementation</description>
+    <description>Entgra Device Management - MQTT Based Push Notification Provider Implementation</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - XMPP Based Push Notification Provider Implementation</name>
+    <name>Entgra Device Management - XMPP Based Push Notification Provider Implementation</name>
-    <description>WSO2 Carbon - XMPP Based Push Notification Provider Implementation</description>
+    <description>Entgra Device Management - XMPP Based Push Notification Provider Implementation</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.stateengine</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - State Engine </name>
+    <name>Entgra Device Management - State Engine </name>
-    <description>Entgra IoT - State Engine Components</description>
+    <description>Entgra Device Management - State Engine Components</description>
     <url>http://entgra.io</url>
 
     <build>

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.userstore.role.mapper/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.userstore.role.mapper</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - User store role mapping Module</name>
+    <name>Entgra Device Management - User store role mapping Module</name>
-    <description>Entgra IoT - User store role mapping Module</description>
+    <description>Entgra Device Management - User store role mapping Module</description>
     <url>http://entgra.io</url>
 
     <build>

components/device-mgt-extensions/pom.xml

@@ -20,17 +20,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>device-mgt-extensions</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Management Extensions</name>
+    <name>Entgra Device Management - Device Management Extensions</name>
-    <description>WSO2 Carbon - Device Management Extensions</description>
+    <description>Entgra Device Management - Device Management Extensions</description>
     <url>https://entgra.io</url>
 
     <modules>

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.api</artifactId>
     <packaging>war</packaging>
-    <name>WSO2 Carbon - Mobile Device Management API</name>
+    <name>Entgra Device Management - Mobile Device Management API</name>
-    <description>WSO2 Carbon - Mobile Device Management API</description>
+    <description>Entgra Device Management - Mobile Device Management API</description>
     <url>https://entgra.io</url>
 
     <build>

components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Management Commons</name>
+    <name>Entgra Device Management - Device Management Commons</name>
-    <description>WSO2 Carbon - Device Management Commons</description>
+    <description>Entgra Device Management - Device Management Commons</description>
     <url>https://entgra.io</url>
 
     <build>

components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.config.api</artifactId>
     <packaging>war</packaging>
-    <name>Entgra Carbon - Mobile Device Management Configuration API</name>
+    <name>Entgra Device Management - Device Management Configuration API</name>
-    <description>Entgra Carbon - Mobile Device Management Configuration API</description>
+    <description>Entgra Device Management - Device Management Configuration API</description>
     <url>https://entgra.io</url>
 
     <build>

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Management Core</name>
+    <name>Entgra Device Management - Device Management Core</name>
-    <description>WSO2 Carbon - Device Management Core</description>
+    <description>Entgra Device Management - Device Management Core</description>
     <url>https://entgra.io</url>
 
     <build>

components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.extensions</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Management Extensions</name>
+    <name>Entgra Device Management - Device Management Extensions</name>
-    <description>WSO2 Carbon - Device Management Extensions</description>
+    <description>Entgra Device Management - Device Management Extensions</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml

@@ -23,15 +23,15 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.url.printer</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Management url printer</name>
+    <name>Entgra Device Management - Device Management url printer</name>
-    <description>WSO2 Carbon - Device Management url printer</description>
+    <description>Entgra Device Management - Device Management url printer</description>
     <url>https://entgra.io</url>
 
     <build>

components/device-mgt/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>device-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Management Component</name>
+    <name>Entgra Device Management - Device Management Component</name>
     <url>https://entgra.io</url>
 
     <modules>

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml

@@ -17,21 +17,22 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>heartbeat-management</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra - Heartbeat Beacon</name>
+    <name>Entgra Device Management - Heartbeat Beacon</name>
-    <description>Entgra - Server Startup and Heartbeat Monitoring Component</description>
+    <description>Entgra Server Startup and Heartbeat Monitoring Component</description>
-    <url>http://www.entgra.io</url>
+    <url>https://entgra.io</url>
 
     <build>
         <plugins>
@@ -53,7 +54,8 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${io.entgra.device.mgt.core.version}</Bundle-Version>
                         <Bundle-Description>Server Startup Heart Beat Beacon Bundle</Bundle-Description>
-                        <Private-Package>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal
+                        </Private-Package>
                         <Import-Package>
                             io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)",
                             io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)",

components/heartbeat-management/pom.xml

@@ -17,20 +17,21 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>heartbeat-management</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - Task Allocation Framework</name>
+    <name>Entgra Device Management - Task Allocation Framework</name>
-    <url>http://entgra.io</url>
+    <url>https://entgra.io</url>
 
     <modules>
         <module>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon</module>

components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.device.mgt.oauth.extensions</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - OAuth Extensions</name>
+    <name>Entgra Device Management - OAuth Extensions</name>
     <url>https://entgra.io</url>
 
     <dependencies>

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Management JWT Client Extensions</name>
+    <name>Entgra Device Management - Device Management JWT Client Extensions</name>
-    <description>WSO2 Carbon - Device Management JWT Client Extensions</description>
+    <description>Entgra Device Management - Device Management JWT Client Extensions</description>
     <url>https://entgra.io</url>
 
     <dependencies>

components/identity-extensions/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-extensions</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Identity Extensions Component</name>
+    <name>Entgra Device Management - Identity Extensions Component</name>
     <url>https://entgra.io</url>
 
     <modules>

components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml

@@ -23,11 +23,11 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>logger</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>io.entgra.device.mgt.core.notification.logger</artifactId>
-    <name>Entgra - Notification Logger</name>
+    <name>Entgra Device Management - Notification Logger</name>
     <packaging>bundle</packaging>
     <url>http://entgra.io</url>
 

components/logger/pom.xml

@@ -20,15 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>logger</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - Notification Logger Component</name>
+    <name>Entgra Device Management - Notification Logger Component</name>
     <url>http://entgra.io</url>
 
     <modules>

components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>operation-template-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.operation.template</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - Operation Template Core</name>
+    <name>Entgra Device Management - Operation Template Core</name>
-    <description>Entgra IoT - Operation Template Core</description>
+    <description>Entgra Device Management - Operation Template Core</description>
     <url>http://entgra.io</url>
 
     <build>

components/operation-template-mgt/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>operation-template-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra IoT - Operation Template Mgt Plugin</name>
+    <name>Entgra Device Management - Operation Template Mgt Plugin</name>
     <url>http://entgra.io</url>
 
     <modules>

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.policy.decision.point</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Policy Decision Point</name>
+    <name>Entgra Device Management - Policy Decision Point</name>
-    <description>WSO2 Carbon - Policy Decision Point</description>
+    <description>Entgra Device Management - Policy Decision Point</description>
     <url>https://entgra.io</url>
 
     <build>

components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -29,8 +29,8 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.policy.information.point</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Policy Information Point</name>
+    <name>Entgra Device Management - Policy Information Point</name>
-    <description>WSO2 Carbon - Policy Information Point</description>
+    <description>Entgra Device Management - Policy Information Point</description>
     <url>https://entgra.io</url>
 
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Policy Management Common</name>
+    <name>Entgra Device Management - Policy Management Common</name>
-    <description>WSO2 Carbon - Policy Management Common</description>
+    <description>Entgra Device Management - Policy Management Common</description>
     <url>https://entgra.io</url>
 
     <build>

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.policy.mgt.core</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Policy Management Core</name>
+    <name>Entgra Device Management - Policy Management Core</name>
-    <description>WSO2 Carbon - Policy Management Core</description>
+    <description>Entgra Device Management - Policy Management Core</description>
     <url>https://entgra.io</url>
 
     <build>

components/policy-mgt/pom.xml

@@ -22,15 +22,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>policy-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Policy Management Component</name>
+    <name>Entgra Device Management - Policy Management Component</name>
     <url>https://entgra.io</url>
 
     <modules>

components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml

@@ -20,15 +20,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>subtype-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.subtype.mgt</artifactId>
-    <name>Entgra IoT - Subtype Mgt Impl</name>
+    <name>Entgra Device Management - Subtype Mgt Impl</name>
     <packaging>bundle</packaging>
-    <description>Entgra IoT - Subtype Management Component Implementation</description>
+    <description>Entgra Device Management - Subtype Management Component Implementation</description>
     <url>http://entgra.io</url>
 
     <build>

components/subtype-mgt/pom.xml

@@ -19,15 +19,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>subtype-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra IoT - Subtype Mgt</name>
+    <name>Entgra Device Management - Subtype Mgt</name>
     <url>http://entgra.io</url>
 
     <modules>

components/task-mgt/pom.xml

@@ -20,15 +20,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>task-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra IoT - Task Management Component</name>
+    <name>Entgra Device Management - Task Management Component</name>
     <url>http://entgra.io</url>
 
     <modules>

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml

@@ -20,15 +20,15 @@
     <parent>
         <artifactId>task-manager</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.task.mgt.common</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - Task Management Common</name>
+    <name>Entgra Device Management - Task Management Common</name>
-    <description>Entgra IoT - Task Management Common</description>
+    <description>Entgra Device Management - Task Management Common</description>
     <url>https://entgra.io</url>
 
     <build>

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>task-manager</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.task.mgt.core</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - Task manager Core</name>
+    <name>Entgra Device Management - Task manager Core</name>
-    <description>Entgra IoT - Task manager Core</description>
+    <description>Entgra Device Management - Task manager Core</description>
     <url>http://entgra.io</url>
 
     <build>

components/task-mgt/task-manager/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>task-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>task-manager</artifactId>
-    <name>Entgra IoT - Task Manager Component</name>
+    <name>Entgra Device Management - Task Manager Component</name>
     <packaging>pom</packaging>
     <url>http://entgra.io</url>
 

components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>task-watcher</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.task.mgt.watcher</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra IoT - Task Watcher </name>
+    <name>Entgra Device Management - Task Watcher </name>
-    <description>Entgra IoT - Task Watcher</description>
+    <description>Entgra Device Management - Task Watcher</description>
     <url>http://entgra.io</url>
 
     <build>

components/task-mgt/task-watcher/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>task-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>task-watcher</artifactId>
-    <name>Entgra IoT - Task Watcher Component</name>
+    <name>Entgra Device Management - Task Watcher Component</name>
     <packaging>pom</packaging>
     <url>http://entgra.io</url>
 

components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/pom.xml

@@ -20,14 +20,14 @@
     <parent>
         <artifactId>tenant-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.tenant.mgt.common</artifactId>
-    <name>Entgra IoT - Tenant Manager Common</name>
+    <name>Entgra Device Management - Tenant Manager Common</name>
-    <description>Entgra IoT - Tenant Manager Common</description>
+    <description>Entgra Device Management - Tenant Manager Common</description>
     <packaging>bundle</packaging>
 
     <build>

components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml

@@ -20,14 +20,14 @@
     <parent>
         <artifactId>tenant-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.tenant.mgt.core</artifactId>
-    <name>Entgra IoT - Tenant Manager Core</name>
+    <name>Entgra Device Management - Tenant Manager Core</name>
-    <description>Entgra IoT - Tenant Manager Core</description>
+    <description>Entgra Device Management - Tenant Manager Core</description>
     <packaging>bundle</packaging>
 
     <build>

components/tenant-mgt/pom.xml

@@ -18,17 +18,17 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tenant-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra IoT - Tenant Management Component</name>
+    <name>Entgra Device Management - Tenant Management Component</name>
-    <description>Entgra IoT - Tenant Management Component</description>
+    <description>Entgra Device Management - Tenant Management Component</description>
 
     <modules>
         <module>io.entgra.device.mgt.core.tenant.mgt.core</module>

components/test-coverage/pom.xml

@@ -19,7 +19,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
         <version>4.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>test-coverage</artifactId>
-    <name>WSO2 Carbon - Unit Test Coverage Generation</name>
+    <name>Entgra Device Management - Unit Test Coverage Generation</name>
     <properties>
         <target>target</target>
         <coverge-report>coverage-reports</coverge-report>

components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>email-sender</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.transport.mgt.email.sender.core</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Email Sender Core</name>
+    <name>Entgra Device Management - Email Sender Core</name>
-    <description>WSO2 Carbon - Email Sender Core</description>
+    <description>Entgra Device Management - Email Sender Core</description>
     <url>https://entgra.io</url>
 
     <build>

components/transport-mgt/email-sender/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>transport-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>email-sender</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Email Sender Component</name>
+    <name>Entgra Device Management - Email Sender Component</name>
     <url>https://entgra.io</url>
 
     <modules>

components/transport-mgt/pom.xml

@@ -19,16 +19,16 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>transport-mgt</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - Transport Management Component</name>
+    <name>Entgra Device Management - Transport Management Component</name>
     <url>http://entgra.io</url>
 
     <modules>

components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>sms-handler</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.api</artifactId>
     <packaging>war</packaging>
-    <name>Entgra - SMS Handler API</name>
+    <name>Entgra Device Management - SMS Handler API</name>
-    <description>Entgra - SMS Handler API</description>
+    <description>Entgra Device Management - SMS Handler API</description>
     <url>http://entgra.io</url>
 
     <build>

components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>sms-handler</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.common</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra - SMS Handler Common</name>
+    <name>Entgra Device Management - SMS Handler Common</name>
-    <description>Entgra - SMS Handler Common</description>
+    <description>Entgra Device Management - SMS Handler Common</description>
     <url>http://entgra.io</url>
 
     <build>

components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>sms-handler</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.core</artifactId>
     <packaging>bundle</packaging>
-    <name>Entgra - SMS Handler Core</name>
+    <name>Entgra Device Management - SMS Handler Core</name>
-    <description>Entgra - SMS Handler Core</description>
+    <description>Entgra Device Management - SMS Handler Core</description>
     <url>http://entgra.io</url>
 
     <build>

components/transport-mgt/sms-handler/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>transport-mgt</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sms-handler</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - SMS Handler Component</name>
+    <name>Entgra Device Management - SMS Handler Component</name>
     <url>http://entgra.io</url>
 
 

components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>ui-request-interceptor</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>io.entgra.device.mgt.core.ui.request.interceptor</artifactId>
     <packaging>war</packaging>
-    <name>Entgra - Request Handling Proxy Servlet</name>
+    <name>Entgra Device Management - Request Handling Proxy Servlet</name>
     <description>Proxy Service for Request Handling in Entgra EMM/IOT Server.</description>
     <url>https://entgra.io</url>
 

components/ui-request-interceptor/pom.xml

@@ -19,15 +19,15 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ui-request-interceptor</artifactId>
-    <name>Entgra - UI Request Interceptor Servlet</name>
+    <name>Entgra Device Management - UI Request Interceptor Servlet</name>
     <description>
         Proxy servlet to handle requests generated from UI applications to communicate with backend
         APIs

components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>webapp-authenticator-framework</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.webapp.authenticator.framework</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Web Application Authenticator Framework Bundle</name>
+    <name>Entgra Device Management - Web Application Authenticator Framework Bundle</name>
-    <description>WSO2 Carbon - Web Application Authenticator Framework Bundle</description>
+    <description>Entgra Device Management - Web Application Authenticator Framework Bundle</description>
     <url>https://entgra.io</url>
 
     <build>

components/webapp-authenticator-framework/pom.xml

@@ -21,8 +21,8 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
     <groupId>io.entgra.device.mgt.core</groupId>
     <artifactId>webapp-authenticator-framework</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Webapp Authenticator Framework</name>
+    <name>Entgra Device Management - Webapp Authenticator Framework</name>
     <url>https://entgra.io</url>
 
     <modules>

features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - Grafana Proxy API Feature</name>
+    <name>Entgra Device Management - Grafana Proxy API Feature</name>
     <url>https://entgra.io</url>
     <description>This feature contains the APIs required for Grafana</description>
 

features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
     <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature</artifactId>
     <packaging>pom</packaging>
 
-    <name>Entgra - Grafana Management Server Feature</name>
+    <name>Entgra Device Management - Grafana Management Server Feature</name>
     <url>https://entgra.io</url>
     <description>This feature contains the core bundles required for Back-end Grafana Management functionality
     </description>

features/analytics-mgt/grafana-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>analytics-mgt-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grafana-mgt-feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - Grafana Management Feature</name>
+    <name>Entgra Device Management - Grafana Management Feature</name>
     <url>http://entgra.io</url>
 
     <modules>

features/analytics-mgt/pom.xml

@@ -19,16 +19,16 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>analytics-mgt-feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - Analytics Management Feature</name>
+    <name>Entgra Device Management - Analytics Management Feature</name>
     <url>http://entgra.io</url>
 
     <modules>

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension.feature/pom.xml

@@ -20,14 +20,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.analytics.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - APIM Analytics Extension Feature</name>
+    <name>Entgra Device Management - APIM Analytics Extension Feature</name>
     <url>http://entgra.io</url>
 
     <dependencies>

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.application.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - API Management Application Extension Feature</name>
+    <name>Entgra Device Management - API Management Application Extension Feature</name>
     <url>https://entgra.io</url>
     <description>This feature contains an implementation of a api application registration, which takes care of subscription
         and generating keys.

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.extension.rest.api.feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra - API management REST API feature</name>
+    <name>Entgra Device Management - API management REST API feature</name>
     <description>This feature contains an implementation of API manager REST API extension</description>
     <url>http://entgra.io</url>
 

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Api Key Mgt Extensions Feature</name>
+    <name>Entgra Device Management - Api Key Mgt Extensions Feature</name>
     <url>https://entgra.io</url>
     <description>This feature contains apimgt related key management extensions</description>
 

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.apimgt.webapp.publisher.feature</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - API Management Webapp Publisher Feature</name>
+    <name>Entgra Device Management - API Management Webapp Publisher Feature</name>
     <url>https://entgra.io</url>
     <description>This feature contains an implementation of a Tomcat lifecycle listener, which takes care of publishing
         JAX-RS web applications as 'Managed APIs'

features/apimgt-extensions/pom.xml

@@ -21,8 +21,8 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
     <groupId>io.entgra.device.mgt.core</groupId>
     <artifactId>apimgt-extensions-feature</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - API Management Extensions Feature</name>
+    <name>Entgra Device Management - API Management Extensions Feature</name>
     <url>https://entgra.io</url>
 
     <modules>

features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>application-mgt-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
     <artifactId>io.entgra.device.mgt.core.application.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
 
-    <name>Entgra - Application Management Server Feature</name>
+    <name>Entgra Device Management - Application Management Server Feature</name>
     <url>https://entgra.io</url>
     <description>This feature contains the core bundles required for Back-end Application Management functionality
     </description>

features/application-mgt/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <artifactId>io.entgra.device.mgt.core.parent</artifactId>
+        <artifactId>device-mgt-core</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>application-mgt-feature</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Application Management Feature</name>
+    <name>Entgra Device Management - Application Management Feature</name>
     <url>https://entgra.io</url>
 
     <modules>

features/cea-mgt-feature/io.entgra.device.mgt.core.cea.mgt.admin.api.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>cea-mgt-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.cea.mgt.admin.api.feature</artifactId>
-    <name>Entgra IoT - CEA Management Admin API Feature</name>
+    <name>Entgra Device Management - CEA Management Admin API Feature</name>
-    <description>Entgra IoT - Conditional Email Access Management Admin API Feature</description>
+    <description>Entgra Device Management - Conditional Email Access Management Admin API Feature</description>
 
     <build>
         <plugins>

features/cea-mgt-feature/io.entgra.device.mgt.core.cea.mgt.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>cea-mgt-feature</artifactId>
-        <version>5.2.4-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.core.cea.mgt.server.feature</artifactId>
-    <name>Entgra IoT - CEA Management Server Feature</name>
+    <name>Entgra Device Management - CEA Management Server Feature</name>
-    <description>Entgra IoT - Conditional Email Access Management Server Feature</description>
+    <description>Entgra Device Management - Conditional Email Access Management Server Feature</description>
 
     <dependencies>
         <dependency>