diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.common/pom.xml b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/pom.xml
similarity index 93%
rename from components/tenant-mgt/io.entgra.tenant.mgt.common/pom.xml
rename to components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/pom.xml
index bdb3195212..ec1848fc1b 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.common/pom.xml
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.tenant.mgt.common</artifactId>
+    <artifactId>io.entgra.device.mgt.core.tenant.mgt.common</artifactId>
     <name>Entgra IoT - Tenant Manager Common</name>
     <description>Entgra IoT - Tenant Manager Common</description>
     <packaging>bundle</packaging>
@@ -46,7 +46,7 @@
                             org.apache.commons.logging,
                             org.wso2.carbon.stratos.common.beans
                         </Import-Package>
-                        <Export-Package>io.entgra.tenant.mgt.common.*</Export-Package>
+                        <Export-Package>io.entgra.device.mgt.core.tenant.mgt.common.*</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.common/src/main/java/io/entgra/tenant/mgt/common/exception/TenantMgtException.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/src/main/java/io/entgra/device/mgt/core/tenant/mgt/common/exception/TenantMgtException.java
similarity index 93%
rename from components/tenant-mgt/io.entgra.tenant.mgt.common/src/main/java/io/entgra/tenant/mgt/common/exception/TenantMgtException.java
rename to components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/src/main/java/io/entgra/device/mgt/core/tenant/mgt/common/exception/TenantMgtException.java
index 1470f07f63..f6116854d0 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.common/src/main/java/io/entgra/tenant/mgt/common/exception/TenantMgtException.java
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/src/main/java/io/entgra/device/mgt/core/tenant/mgt/common/exception/TenantMgtException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.tenant.mgt.common.exception;
+package io.entgra.device.mgt.core.tenant.mgt.common.exception;
 
 public class TenantMgtException extends Exception {
 
diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.common/src/main/java/io/entgra/tenant/mgt/common/spi/TenantManagerService.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/src/main/java/io/entgra/device/mgt/core/tenant/mgt/common/spi/TenantManagerService.java
similarity index 87%
rename from components/tenant-mgt/io.entgra.tenant.mgt.common/src/main/java/io/entgra/tenant/mgt/common/spi/TenantManagerService.java
rename to components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/src/main/java/io/entgra/device/mgt/core/tenant/mgt/common/spi/TenantManagerService.java
index 472b1b7cb1..d9b4c237fc 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.common/src/main/java/io/entgra/tenant/mgt/common/spi/TenantManagerService.java
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/src/main/java/io/entgra/device/mgt/core/tenant/mgt/common/spi/TenantManagerService.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.tenant.mgt.common.spi;
+package io.entgra.device.mgt.core.tenant.mgt.common.spi;
 
-import io.entgra.tenant.mgt.common.exception.TenantMgtException;
+import io.entgra.device.mgt.core.tenant.mgt.common.exception.TenantMgtException;
 import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
 
 public interface TenantManagerService {
diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.core/pom.xml b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml
similarity index 91%
rename from components/tenant-mgt/io.entgra.tenant.mgt.core/pom.xml
rename to components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml
index 23c168d692..c73ac3c9ee 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.core/pom.xml
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.tenant.mgt.core</artifactId>
+    <artifactId>io.entgra.device.mgt.core.tenant.mgt.core</artifactId>
     <name>Entgra IoT - Tenant Manager Core</name>
     <description>Entgra IoT - Tenant Manager Core</description>
     <packaging>bundle</packaging>
@@ -46,7 +46,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Tenant Management Core Bundle</Bundle-Description>
-                        <Private-Package>io.entgra.tenant.mgt.core.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.tenant.mgt.core.internal</Private-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
@@ -56,7 +56,7 @@
                             org.wso2.carbon.device.mgt.core,
                             org.wso2.carbon.user.api,
                             org.wso2.carbon.registry.core.exceptions,
-                            io.entgra.tenant.mgt.common.*,
+                            io.entgra.device.mgt.core.tenant.mgt.common.*,
                             org.wso2.carbon.stratos.common.beans,
                             org.wso2.carbon.stratos.common.exception,
                             org.wso2.carbon.stratos.common.listeners,
@@ -70,8 +70,8 @@
                             org.wso2.carbon.context
                         </Import-Package>
                         <Export-Package>
-                            !io.entgra.tenant.mgt.core.internal,
-                            io.entgra.tenant.mgt.core.*
+                            !io.entgra.device.mgt.core.tenant.mgt.core.internal,
+                            io.entgra.device.mgt.core.tenant.mgt.core.*
                         </Export-Package>
                     </instructions>
                 </configuration>
@@ -123,7 +123,7 @@
         </dependency>
         <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>io.entgra.tenant.mgt.common</artifactId>
+                <artifactId>io.entgra.device.mgt.core.tenant.mgt.common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/TenantManager.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/TenantManager.java
similarity index 92%
rename from components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/TenantManager.java
rename to components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/TenantManager.java
index ab9b8b2290..9257b6cbd2 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/TenantManager.java
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/TenantManager.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.tenant.mgt.core;
+package io.entgra.device.mgt.core.tenant.mgt.core;
 
-import io.entgra.tenant.mgt.common.exception.TenantMgtException;
+import io.entgra.device.mgt.core.tenant.mgt.common.exception.TenantMgtException;
 import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
 
 public interface TenantManager {
diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/impl/TenantManagerImpl.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/impl/TenantManagerImpl.java
similarity index 95%
rename from components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/impl/TenantManagerImpl.java
rename to components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/impl/TenantManagerImpl.java
index 4089b4bffa..f7cd187668 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/impl/TenantManagerImpl.java
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/impl/TenantManagerImpl.java
@@ -15,14 +15,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.tenant.mgt.core.impl;
+package io.entgra.device.mgt.core.tenant.mgt.core.impl;
 
 import io.entgra.application.mgt.common.exception.ApplicationManagementException;
 import io.entgra.application.mgt.core.config.ConfigurationManager;
 import io.entgra.application.mgt.common.services.ApplicationManager;
-import io.entgra.tenant.mgt.core.TenantManager;
-import io.entgra.tenant.mgt.common.exception.TenantMgtException;
-import io.entgra.tenant.mgt.core.internal.TenantMgtDataHolder;
+import io.entgra.device.mgt.core.tenant.mgt.core.TenantManager;
+import io.entgra.device.mgt.core.tenant.mgt.common.exception.TenantMgtException;
+import io.entgra.device.mgt.core.tenant.mgt.core.internal.TenantMgtDataHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/impl/TenantManagerServiceImpl.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/impl/TenantManagerServiceImpl.java
similarity index 80%
rename from components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/impl/TenantManagerServiceImpl.java
rename to components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/impl/TenantManagerServiceImpl.java
index e15d105fbf..9013d534d9 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/impl/TenantManagerServiceImpl.java
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/impl/TenantManagerServiceImpl.java
@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.tenant.mgt.core.impl;
+package io.entgra.device.mgt.core.tenant.mgt.core.impl;
 
-import io.entgra.tenant.mgt.common.spi.TenantManagerService;
-import io.entgra.tenant.mgt.common.exception.TenantMgtException;
-import io.entgra.tenant.mgt.core.internal.TenantMgtDataHolder;
+import io.entgra.device.mgt.core.tenant.mgt.common.spi.TenantManagerService;
+import io.entgra.device.mgt.core.tenant.mgt.common.exception.TenantMgtException;
+import io.entgra.device.mgt.core.tenant.mgt.core.internal.TenantMgtDataHolder;
 import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
 
 public class TenantManagerServiceImpl implements TenantManagerService {
diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtDataHolder.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtDataHolder.java
similarity index 94%
rename from components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtDataHolder.java
rename to components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtDataHolder.java
index d28862d410..d168bb9bd7 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtDataHolder.java
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtDataHolder.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.tenant.mgt.core.internal;
+package io.entgra.device.mgt.core.tenant.mgt.core.internal;
 
 import io.entgra.application.mgt.common.services.ApplicationManager;
-import io.entgra.tenant.mgt.core.TenantManager;
+import io.entgra.device.mgt.core.tenant.mgt.core.TenantManager;
 import org.wso2.carbon.device.mgt.common.metadata.mgt.WhiteLabelManagementService;
 import org.wso2.carbon.user.core.service.RealmService;
 
diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtServiceComponent.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java
similarity index 90%
rename from components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtServiceComponent.java
rename to components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java
index cab03921c0..a335f27546 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtServiceComponent.java
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/internal/TenantMgtServiceComponent.java
@@ -15,14 +15,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.tenant.mgt.core.internal;
+package io.entgra.device.mgt.core.tenant.mgt.core.internal;
 
 import io.entgra.application.mgt.common.services.ApplicationManager;
-import io.entgra.tenant.mgt.common.spi.TenantManagerService;
-import io.entgra.tenant.mgt.core.TenantManager;
-import io.entgra.tenant.mgt.core.impl.TenantManagerImpl;
-import io.entgra.tenant.mgt.core.impl.TenantManagerServiceImpl;
-import io.entgra.tenant.mgt.core.listener.DeviceMgtTenantListener;
+import io.entgra.device.mgt.core.tenant.mgt.common.spi.TenantManagerService;
+import io.entgra.device.mgt.core.tenant.mgt.core.TenantManager;
+import io.entgra.device.mgt.core.tenant.mgt.core.impl.TenantManagerImpl;
+import io.entgra.device.mgt.core.tenant.mgt.core.impl.TenantManagerServiceImpl;
+import io.entgra.device.mgt.core.tenant.mgt.core.listener.DeviceMgtTenantListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
@@ -32,7 +32,7 @@ import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
 import org.wso2.carbon.user.core.service.RealmService;
 
 /**
- * @scr.component name="org.wso2.carbon.devicemgt.tenant.manager" immediate="true"
+ * @scr.component name="io.entgra.device.mgt.core.tenant.manager" immediate="true"
  * @scr.reference name="org.wso2.carbon.application.mgt.service"
  * interface="io.entgra.application.mgt.common.services.ApplicationManager"
  * cardinality="1..1"
diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/listener/DeviceMgtTenantListener.java b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/listener/DeviceMgtTenantListener.java
similarity index 91%
rename from components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/listener/DeviceMgtTenantListener.java
rename to components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/listener/DeviceMgtTenantListener.java
index a272585bf7..baaef87785 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/listener/DeviceMgtTenantListener.java
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/src/main/java/io/entgra/device/mgt/core/tenant/mgt/core/listener/DeviceMgtTenantListener.java
@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.tenant.mgt.core.listener;
+package io.entgra.device.mgt.core.tenant.mgt.core.listener;
 
-import io.entgra.tenant.mgt.core.TenantManager;
-import io.entgra.tenant.mgt.common.exception.TenantMgtException;
-import io.entgra.tenant.mgt.core.internal.TenantMgtDataHolder;
+import io.entgra.device.mgt.core.tenant.mgt.core.TenantManager;
+import io.entgra.device.mgt.core.tenant.mgt.common.exception.TenantMgtException;
+import io.entgra.device.mgt.core.tenant.mgt.core.internal.TenantMgtDataHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
diff --git a/components/tenant-mgt/pom.xml b/components/tenant-mgt/pom.xml
index 2f1dbe9de3..d809b23eec 100644
--- a/components/tenant-mgt/pom.xml
+++ b/components/tenant-mgt/pom.xml
@@ -31,8 +31,8 @@
     <description>Entgra IoT - Tenant Management Component</description>
 
     <modules>
-        <module>io.entgra.tenant.mgt.core</module>
-        <module>io.entgra.tenant.mgt.common</module>
+        <module>io.entgra.device.mgt.core.tenant.mgt.core</module>
+        <module>io.entgra.device.mgt.core.tenant.mgt.common</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml b/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml
index 0fa4ed6dce..943bbd4774 100644
--- a/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml
+++ b/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml
@@ -33,11 +33,11 @@
     <dependencies>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.tenant.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.tenant.mgt.core</artifactId>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.tenant.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.tenant.mgt.common</artifactId>
         </dependency>
     </dependencies>
 
@@ -93,10 +93,10 @@
                             <bundles>
                                 <!--<bundleDef>{groupId}:{artifactId}:{version}</bundleDef>-->
                                 <bundleDef>
-                                    io.entgra.device.mgt.core:io.entgra.tenant.mgt.core:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.tenant.mgt.core:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    io.entgra.device.mgt.core:io.entgra.tenant.mgt.common:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.tenant.mgt.common:${carbon.device.mgt.version}
                                 </bundleDef>
                             </bundles>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index 7f616b4043..9891f33f0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 <!--        <module>components/logger</module>-->
 <!--        <module>components/task-mgt</module>-->
 <!--        <module>components/subtype-mgt</module>-->
-<!--        <module>components/tenant-mgt</module>-->
+        <module>components/tenant-mgt</module>
         <module>components/operation-template-mgt</module>
 <!--        <module>features/device-mgt</module>-->
 <!--        <module>features/apimgt-extensions</module>-->
@@ -66,7 +66,7 @@
 <!--        <module>features/logger</module>-->
 <!--        <module>features/task-mgt</module>-->
 <!--        <module>features/subtype-mgt</module>-->
-<!--        <module>features/tenant-mgt</module>-->
+        <module>features/tenant-mgt</module>
         <module>features/operation-template-mgt-plugin-feature</module>
 
     </modules>
@@ -355,12 +355,12 @@
             <!-- Tenant Management dependencies -->
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>io.entgra.tenant.mgt.common</artifactId>
+                <artifactId>io.entgra.device.mgt.core.tenant.mgt.common</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>io.entgra.tenant.mgt.core</artifactId>
+                <artifactId>io.entgra.device.mgt.core.tenant.mgt.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>