diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 8dab2191..a28eeb79 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -27,10 +27,10 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>wso2iot</artifactId>
+	<artifactId>entgra-iot</artifactId>
 	<packaging>pom</packaging>
-	<name>WSO2 IoT - Distribution</name>
-	<description>WSO2 IoT Distribution</description>
+	<name>Entgra IoT - Distribution</name>
+	<description>Entgra IoT Distribution</description>
 
 	<dependencies>
 		<dependency>
diff --git a/modules/distribution/src/core/README b/modules/distribution/src/core/README
index 72baa2cf..a34b0c4a 100644
--- a/modules/distribution/src/core/README
+++ b/modules/distribution/src/core/README
@@ -20,7 +20,7 @@ Installation & Running
 
 Running the IoT server
 ==================================
-1. Extract  wso2iot-@product.version@.zip and go to the extracted directory/bin.
+1. Extract entgra-iot-@product.version@.zip and go to the extracted directory/bin.
 2. Run iot-server.sh or iot-server.bat.
 3. Point your favourite browser to  https://localhost:9443/devicemgt in order to see the available device types and operations.
 4. Use the following username and password to login
@@ -33,7 +33,7 @@ Running the IoT server
 Running all runtimes (IoT, Analytics, Broker)
 ==================================================================
 
-1. Extract  wso2iot-@product.version@.zip and go to the extracted directory/bin.
+1. Extract entgra-iot-@product.version@.zip and go to the extracted directory/bin.
 2. Run broker.sh (or broker.bat), then the iot-server.sh (iot-server.bat) and finally analytics.sh (or analytics.bat).
 3. Access appropriate url for the related runtime. (For example, use  https://localhost:9443/devicemgt for the IoT Server runtime)
 
diff --git a/modules/distribution/src/core/bin/profile-creator.bat b/modules/distribution/src/core/bin/profile-creator.bat
index db9db21a..3d489084 100644
--- a/modules/distribution/src/core/bin/profile-creator.bat
+++ b/modules/distribution/src/core/bin/profile-creator.bat
@@ -19,7 +19,7 @@ REM Profile creator tool for EI
 REM ---------------------------------------------------------------------------
 
 set DIR=%~dp0
-set DISTRIBUTION=wso2iot-@product.version@
+set DISTRIBUTION=entgra-iot-@product.version@
 REM get the desired profile
 echo This tool will erase all the files which are not required for the selected profile
 echo and provide you a light weight package for the target profile.
diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh
index bcfc8480..575ca5cd 100644
--- a/modules/distribution/src/core/bin/profile-creator.sh
+++ b/modules/distribution/src/core/bin/profile-creator.sh
@@ -22,7 +22,7 @@
 
 
 DIR="$(dirname "${BASH_SOURCE[0]}")"
-DISTRIBUTION="wso2iot-@product.version@"
+DISTRIBUTION="entgra-iot-@product.version@"
 ALLPROF=0
 BINDIR=$(pwd)
 #get the desired profile
diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java
index f641d227..4ae72945 100644
--- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java
+++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java
@@ -146,7 +146,7 @@ public class CustomTestServerManager {
                     File[] carbonServerFiles = subFile.listFiles();
                     if (carbonServerFiles != null) {
                         for (File file : carbonServerFiles) {
-                            if (file.getName().startsWith("wso2iot")) {
+                            if (file.getName().startsWith("entgra-iot")) {
                                 return file.getAbsolutePath();
                             }
                         }
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index 78faa616..6e8e6bbd 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -57,7 +57,7 @@
                         <property>
                             <name>carbon.zip</name>
                             <value>
-                                ${basedir}/../../distribution/target/wso2iot-${project.version}.zip
+                                ${basedir}/../../distribution/target/entgra-iot-${project.version}.zip
                             </value>
                         </property>
                         <property>
@@ -125,7 +125,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.wso2.iot</groupId>
-                                    <artifactId>wso2iot</artifactId>
+                                    <artifactId>entgra-iot</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
@@ -165,7 +165,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/
+                                        ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/resources/security/
                                     </directory>
                                     <includes>
                                         <include>**/*.jks</include>
@@ -186,7 +186,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/
+                                        ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/resources/security/
                                     </directory>
                                     <includes>
                                         <include>**/*.jks</include>
@@ -207,7 +207,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/conf/axis2/
+                                        ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/conf/axis2/
                                     </directory>
                                     <includes>
                                         <include>**/*.xml</include>
@@ -228,7 +228,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/deployment/client/modules
+                                        ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/deployment/client/modules
                                     </directory>
                                     <includes>
                                         <include>**/*.mar</include>
diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml
index 328b01b6..825f1fb9 100644
--- a/modules/integration/tests-iot-web-ui/pom.xml
+++ b/modules/integration/tests-iot-web-ui/pom.xml
@@ -60,7 +60,7 @@
                         <property>
                             <name>carbon.zip</name>
                             <value>
-                                ${basedir}/../../distribution/target/wso2iot-${project.version}.zip
+                                ${basedir}/../../distribution/target/entgra-iot-${project.version}.zip
                             </value>
                         </property>
                         <property>
@@ -115,7 +115,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.wso2.iot</groupId>
-                                    <artifactId>wso2iot</artifactId>
+                                    <artifactId>entgra-iot</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
@@ -155,7 +155,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/
+                                        ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/resources/security/
                                     </directory>
                                     <includes>
                                         <include>**/*.jks</include>
@@ -176,7 +176,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/
+                                        ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/resources/security/
                                     </directory>
                                     <includes>
                                         <include>**/*.jks</include>
@@ -197,7 +197,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/conf/axis2/
+                                        ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/conf/axis2/
                                     </directory>
                                     <includes>
                                         <include>**/*.xml</include>
@@ -218,7 +218,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/deployment/client/modules
+                                        ${basedir}/target/tobeCopied/entgra-iot-${project.version}/repository/deployment/client/modules
                                     </directory>
                                     <includes>
                                         <include>**/*.mar</include>
diff --git a/pom.xml b/pom.xml
index 5193ab25..84670ed8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1528,14 +1528,14 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.2.2-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.2.2</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>4.2.2-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.2.2</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>
@@ -1640,7 +1640,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.5.2</appmgt.feature.version>
+        <appmgt.feature.version>1.5.3</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.5.1</carbon.store.version>