diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
index aa164edda..1722ccde5 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
@@ -59,7 +59,7 @@
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
 					</descriptorRefs>
-					<finalName>wso2-firealarm-virtual-agent</finalName>
+					<finalName>firealarm-virtual-agent</finalName>
 					<appendAssemblyId>false</appendAssemblyId>
 				</configuration>
 				<executions>
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentUtilOperations.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentUtilOperations.java
index e90ebbf5e..0038080de 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentUtilOperations.java
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentUtilOperations.java
@@ -86,7 +86,7 @@ public class AgentUtilOperations {
 
             if (path != null) {
                 log.info(AgentConstants.LOG_APPENDER + path);
-                rootPath = path.getPath().replace("wso2-firealarm-virtual-agent.jar!/deviceConfig.properties", "")
+                rootPath = path.getPath().replace("firealarm-virtual-agent.jar!/deviceConfig.properties", "")
                         .replace("jar:", "").replace("file:", "");
 
                 rootPath = URLDecoder.decode(rootPath, StandardCharsets.UTF_8.toString());
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/nbproject/private/private.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/nbproject/private/private.xml
index 9009411f0..24fbe7f17 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/nbproject/private/private.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/nbproject/private/private.xml
@@ -3,7 +3,7 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/home/lahiru/WSO2IOT/carbon-device-mgt-plugins/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/VirtualAgentUI.java</file>
+            <file>file:/home/lahiru/WSO2IOT/carbon-device-mgt-plugins/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/VirtualAgentUI.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/nbproject/project.properties b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/nbproject/project.properties
index fb798f614..0840cc8a6 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/nbproject/project.properties
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/nbproject/project.properties
@@ -53,7 +53,7 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
-main.class=org.wso2.carbon.device.mgt.iot.agent.virtual.VirtualAgentUI
+main.class=io.entgra.device.mgt.plugins.iot.agent.virtual.VirtualAgentUI
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/VirtualAgentUI.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/VirtualAgentUI.java
index a2aa2116a..95dbbfa4e 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/VirtualAgentUI.java
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/VirtualAgentUI.java
@@ -3,11 +3,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.wso2.carbon.device.mgt.iot.agent.virtual;
+package io.entgra.device.mgt.plugins.iot.agent.virtual;
 
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-import org.wso2.carbon.device.mgt.iot.agent.virtual.ui.AgentUI;
+import io.entgra.device.mgt.plugins.iot.agent.virtual.ui.AgentUI;
 
 /**
  *
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.java
index e3b4e89f6..ee94f1926 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.java
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.wso2.carbon.device.mgt.iot.agent.virtual.ui;
+package io.entgra.device.mgt.plugins.iot.agent.virtual.ui;
 
 /**
  *
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmServiceImpl.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmServiceImpl.java
index 6b7959a53..da849d8b6 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmServiceImpl.java
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmServiceImpl.java
@@ -262,7 +262,7 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService {
         status = XmppServerClient.createAccount(newXmppAccount);
         if (!status) {
             String msg = "XMPP Account was not created for device - " + deviceId + " of owner - " + owner +
-                    ".XMPP might have been disabled in org.wso2.carbon.device.mgt.iot" +
+                    ".XMPP might have been disabled in io.entgra.device.mgt.plugins.iot" +
                     ".common.config.server.configs";
             throw new DeviceManagementException(msg);
         }
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/HTTPEventAdapterFactory.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/HTTPEventAdapterFactory.java
index c7eed8b89..fa0e6c621 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/HTTPEventAdapterFactory.java
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/HTTPEventAdapterFactory.java
@@ -34,7 +34,7 @@ import java.util.ResourceBundle;
 public class HTTPEventAdapterFactory extends InputEventAdapterFactory {
 
 	private ResourceBundle resourceBundle =
-			ResourceBundle.getBundle("org.wso2.carbon.device.mgt.input.adapter.http.i18n.Resources", Locale.getDefault());
+			ResourceBundle.getBundle("io.entgra.device.mgt.plugins.input.adapter.http.i18n.Resources", Locale.getDefault());
 	private int httpPort;
 	private int httpsPort;
 
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/MQTTEventAdapterFactory.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/MQTTEventAdapterFactory.java
index f2e086694..0987956c2 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/MQTTEventAdapterFactory.java
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/MQTTEventAdapterFactory.java
@@ -28,7 +28,7 @@ import java.util.*;
 public class MQTTEventAdapterFactory extends InputEventAdapterFactory {
 
     private ResourceBundle resourceBundle = ResourceBundle.getBundle
-            ("org.wso2.carbon.device.mgt.input.adapter.mqtt.i18n.Resources", Locale.getDefault());
+            ("io.entgra.device.mgt.plugins.input.adapter.mqtt.i18n.Resources", Locale.getDefault());
 
     @Override
     public String getType() {
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/input/adapter/xmpp/XMPPEventAdapterFactory.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/input/adapter/xmpp/XMPPEventAdapterFactory.java
index ca3c0e7fd..8e9ccf30e 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/input/adapter/xmpp/XMPPEventAdapterFactory.java
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/input/adapter/xmpp/XMPPEventAdapterFactory.java
@@ -36,7 +36,7 @@ import java.util.ResourceBundle;
 public class XMPPEventAdapterFactory extends InputEventAdapterFactory {
 
     private ResourceBundle resourceBundle = ResourceBundle.getBundle
-            ("org.wso2.carbon.device.mgt.input.adapter.xmpp.i18n.Resources", Locale.getDefault());
+            ("io.entgra.device.mgt.plugins.input.adapter.xmpp.i18n.Resources", Locale.getDefault());
 
     @Override
     public String getType() {
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
index bc18bdd74..aaa6624be 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
@@ -29,7 +29,7 @@
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Device Management Output HTTP adapter Module</name>
     <description>
-        org.wso2.carbon.device.mgt.output.adapter.http provides the back-end functionality of oauth http event adapter
+        io.entgra.device.mgt.plugins.output.adapter.http provides the back-end functionality of oauth http event adapter
     </description>
     <url>http://wso2.org</url>
 
@@ -99,7 +99,7 @@
                         <Export-Package>
                             !io.entgra.device.mgt.plugins.output.adapter.http.internal,
                             !io.entgra.device.mgt.plugins.output.adapter.http.internal.*,
-                            org.wso2.carbon.device.mgt.output.adapter.http.*
+                            io.entgra.device.mgt.plugins.output.adapter.http.*
                         </Export-Package>
                         <Import-Package>
                             org.wso2.carbon.event.output.adapter.core,
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/HTTPEventAdapterFactory.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/HTTPEventAdapterFactory.java
index 72c8c92d4..66e2391cb 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/HTTPEventAdapterFactory.java
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/HTTPEventAdapterFactory.java
@@ -35,7 +35,7 @@ import java.util.ResourceBundle;
  */
 public class HTTPEventAdapterFactory extends OutputEventAdapterFactory {
     private ResourceBundle resourceBundle =
-            ResourceBundle.getBundle("org.wso2.carbon.device.mgt.output.adapter.http.i18n.Resources", Locale.getDefault());
+            ResourceBundle.getBundle("io.entgra.device.mgt.plugins.output.adapter.http.i18n.Resources", Locale.getDefault());
 
     @Override
     public String getType() {
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
index 270b6a477..eb26dd588 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
@@ -28,7 +28,7 @@
 
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Device Mgt Output MQTT Adaptor Module</name>
-    <description>org.wso2.carbon.device.mgt.output.adapter.mqtt provides the back-end functionality of mqtt adaptor
+    <description>io.entgra.device.mgt.plugins.output.adapter.mqtt provides the back-end functionality of mqtt adaptor
     </description>
     <url>http://wso2.org</url>
 
@@ -112,7 +112,7 @@
                         <Export-Package>
                             !io.entgra.device.mgt.plugins.output.adapter.mqtt.internal,
                             !io.entgra.device.mgt.plugins.output.adapter.mqtt.internal.*,
-                            org.wso2.carbon.device.mgt.output.adapter.mqtt.*,
+                            io.entgra.device.mgt.plugins.output.adapter.mqtt.*,
                         </Export-Package>
                         <Import-Package>
                             org.wso2.carbon.event.output.adapter.core,
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java
index df7d5068b..dbea53923 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java
@@ -27,7 +27,7 @@ import java.util.*;
  */
 public class MQTTEventAdapterFactory extends OutputEventAdapterFactory {
     private ResourceBundle resourceBundle =
-            ResourceBundle.getBundle("org.wso2.carbon.device.mgt.output.adapter.mqtt.i18n.Resources", Locale.getDefault());
+            ResourceBundle.getBundle("io.entgra.device.mgt.plugins.output.adapter.mqtt.i18n.Resources", Locale.getDefault());
 
     @Override
     public String getType() {
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/WebsocketEventAdapterFactory.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/WebsocketEventAdapterFactory.java
index bdbaffbed..f2803e347 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/WebsocketEventAdapterFactory.java
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/WebsocketEventAdapterFactory.java
@@ -43,7 +43,7 @@ import java.util.ResourceBundle;
  */
 public class WebsocketEventAdapterFactory extends OutputEventAdapterFactory {
 
-    private ResourceBundle resourceBundle = ResourceBundle.getBundle("org.wso2.carbon.device.mgt.output.adapter.websocket.i18n" +
+    private ResourceBundle resourceBundle = ResourceBundle.getBundle("io.entgra.device.mgt.plugins.output.adapter.websocket.i18n" +
             ".Resources", Locale.getDefault());
     private BundleContext bundleContext;
     private boolean isAuthInitialized = false;
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
index a99f72e45..fe35d0cdb 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
@@ -29,7 +29,7 @@
 
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Device Mgt Output XMPP Adaptor Module</name>
-    <description>org.wso2.carbon.device.mgt.output.adapter.xmpp provides the back-end functionality of xmpp adaptor
+    <description>io.entgra.device.mgt.plugins.output.adapter.xmpp provides the back-end functionality of xmpp adaptor
     </description>
     <url>http://wso2.org</url>
 
@@ -89,7 +89,7 @@
                         <Export-Package>
                             !io.entgra.device.mgt.plugins.output.adapter.xmpp.internal,
                             !io.entgra.device.mgt.plugins.output.adapter.xmpp.internal.*,
-                            org.wso2.carbon.device.mgt.output.adapter.xmpp.*,
+                            io.entgra.device.mgt.plugins.output.adapter.xmpp.*,
                         </Export-Package>
                         <Import-Package>
                             org.wso2.carbon.event.output.adapter.core,
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/XMPPEventAdapterFactory.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/XMPPEventAdapterFactory.java
index 666d6d115..7adad752b 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/XMPPEventAdapterFactory.java
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/XMPPEventAdapterFactory.java
@@ -27,7 +27,7 @@ import java.util.*;
  */
 public class XMPPEventAdapterFactory extends OutputEventAdapterFactory {
     private ResourceBundle resourceBundle =
-            ResourceBundle.getBundle("org.wso2.carbon.device.mgt.output.adapter.xmpp.i18n.Resources", Locale.getDefault());
+            ResourceBundle.getBundle("io.entgra.device.mgt.plugins.output.adapter.xmpp.i18n.Resources", Locale.getDefault());
 
     @Override
     public String getType() {
diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index 7262c117b..4edeb572a 100644
--- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -39,7 +39,7 @@
     <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource"/>
 
     <bean id="swaggerConfig" class="io.swagger.jaxrs.config.BeanConfig">
-        <property name="resourcePackage" value="org.wso2.carbon.device.mgt.jaxrs"/>
+        <property name="resourcePackage" value="io.entgra.device.mgt.plugins.jaxrs"/>
         <property name="version" value="1.0"/>
         <property name="host" value="localhost:9443"/>
         <property name="schemes" value="https"/>
diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
index 386490e7d..ad7831ea0 100644
--- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
+++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
@@ -83,7 +83,7 @@
                         <Bundle-Description>MQTT Pull Notification Provider Bundle</Bundle-Description>
                         <Export-Package>
                             !io.entgra.device.mgt.plugins.mqtt.notification.listener.internal,
-                            org.wso2.carbon.device.mgt.mqtt.notification.listener.*
+                            io.entgra.device.mgt.plugins.mqtt.notification.listener.*
                         </Export-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
index a019dfa43..7308f28a1 100644
--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
+++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
@@ -185,7 +185,7 @@
                             org.wso2.siddhi.query.api.*,
                             io.entgra.device.mgt.core.device.mgt.core.*,
                             io.entgra.device.mgt.core.device.mgt.common.*,
-                            org.wso2.carbon.identity.jwt.client.*,
+                            io.entgra.device.mgt.core.identity.jwt.client.*,
                             org.apache.commons.logging,
                             org.wso2.carbon.context,
                             android.util;resolution:=optional,
diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index b45bf2622..8f0d3ab2e 100644
--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -32,7 +32,7 @@
         <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
         <PushNotificationProviders>
             <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
-            <!--<Provider>org.wso2.carbon.device.mgt.mobile.impl.ios.apns.APNSBasedPushNotificationProvider</Provider>-->
+            <!--<Provider>io.entgra.device.mgt.plugins.mobile.impl.ios.apns.APNSBasedPushNotificationProvider</Provider>-->
             <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
 			<Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
             <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
diff --git a/components/test-coverage/pom.xml b/components/test-coverage/pom.xml
index 47082a7e7..2c5860409 100644
--- a/components/test-coverage/pom.xml
+++ b/components/test-coverage/pom.xml
@@ -43,31 +43,31 @@
         <!-- cdmf-transport adapters-->
         <cdmf.adapters>${extensions}/cdmf-transport-adapters</cdmf.adapters>
         <input.extension>
-            ${basedir}/../${cdmf.adapters}/input/org.wso2.carbon.device.mgt.input.adapter.extension
+            ${basedir}/../${cdmf.adapters}/input/io.entgra.device.mgt.plugins.input.adapter.extension
         </input.extension>
         <input.http>
-            ${basedir}/../${cdmf.adapters}/input/org.wso2.carbon.device.mgt.input.adapter.http
+            ${basedir}/../${cdmf.adapters}/input/io.entgra.device.mgt.plugins.input.adapter.http
         </input.http>
         <input.mqtt>
-            ${basedir}/../${cdmf.adapters}/input/org.wso2.carbon.device.mgt.input.adapter.mqtt
+            ${basedir}/../${cdmf.adapters}/input/io.entgra.device.mgt.plugins.input.adapter.mqtt
         </input.mqtt>
         <input.thrift>
-            ${basedir}/../${cdmf.adapters}/input/org.wso2.carbon.device.mgt.input.adapter.thrift
+            ${basedir}/../${cdmf.adapters}/input/io.entgra.device.mgt.plugins.input.adapter.thrift
         </input.thrift>
         <input.xmpp>
-            ${basedir}/../${cdmf.adapters}/input/org.wso2.carbon.device.mgt.input.adapter.xmpp
+            ${basedir}/../${cdmf.adapters}/input/io.entgra.device.mgt.plugins.input.adapter.xmpp
         </input.xmpp>
         <output.mqtt>
-            ${basedir}/../${cdmf.adapters}/output/org.wso2.carbon.device.mgt.output.adapter.mqtt
+            ${basedir}/../${cdmf.adapters}/output/io.entgra.device.mgt.plugins.output.adapter.mqtt
         </output.mqtt>
         <output.websocket>
-            ${basedir}/../${cdmf.adapters}/output/org.wso2.carbon.device.mgt.output.adapter.websocket
+            ${basedir}/../${cdmf.adapters}/output/io.entgra.device.mgt.plugins.output.adapter.websocket
         </output.websocket>
         <output.websocket.endpoint>
-            ${basedir}/../${cdmf.adapters}/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint
+            ${basedir}/../${cdmf.adapters}/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint
         </output.websocket.endpoint>
         <output.xmpp>
-            ${basedir}/../${cdmf.adapters}/output/org.wso2.carbon.device.mgt.output.adapter.xmpp
+            ${basedir}/../${cdmf.adapters}/output/io.entgra.device.mgt.plugins.output.adapter.xmpp
         </output.xmpp>
 
         <mb.extensions>${extensions}/mb-extensions</mb.extensions>
@@ -77,14 +77,14 @@
         </mb.authorization>
 
         <pull.notification.listener>
-            ${basedir}/../${extensions}/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener
+            ${basedir}/../${extensions}/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener
         </pull.notification.listener>
 
         <!-- mobile-plugins component -->
         <mobile.plugins>mobile-plugins</mobile.plugins>
         <android.plugin>${mobile.plugins}/android-plugin</android.plugin>
-        <android.mobile>${basedir}/../${android.plugin}/org.wso2.carbon.device.mgt.mobile.android</android.mobile>
-        <android.api>${basedir}/../${android.plugin}/org.wso2.carbon.device.mgt.mobile.android.api</android.api>
+        <android.mobile>${basedir}/../${android.plugin}/io.entgra.device.mgt.plugins.mobile.android</android.mobile>
+        <android.api>${basedir}/../${android.plugin}/io.entgra.device.mgt.plugins.mobile.android.api</android.api>
     </properties>
 
     <build>
@@ -123,7 +123,7 @@
                                                 <group name="extensions">
                                                     <group name="cdmf-transport-adapters">
                                                         <group name="input">
-                                                            <group name="org.wso2.carbon.device.mgt.input.adapter.extension">
+                                                            <group name="io.entgra.device.mgt.plugins.input.adapter.extension">
                                                                 <classfiles>
                                                                     <fileset dir="${input.extension}/${target}/${classes}" />
                                                                 </classfiles>
@@ -131,7 +131,7 @@
                                                                     <fileset dir="${input.extension}/${source}" />
                                                                 </sourcefiles>
                                                             </group>
-                                                            <group name="org.wso2.carbon.device.mgt.input.adapter.http">
+                                                            <group name="io.entgra.device.mgt.plugins.input.adapter.http">
                                                                 <classfiles>
                                                                     <fileset dir="${input.http}/${target}/${classes}" />
                                                                 </classfiles>
@@ -139,7 +139,7 @@
                                                                     <fileset dir="${input.http}/${source}" />
                                                                 </sourcefiles>
                                                             </group>
-                                                            <group name="org.wso2.carbon.device.mgt.input.adapter.mqtt">
+                                                            <group name="io.entgra.device.mgt.plugins.input.adapter.mqtt">
                                                                 <classfiles>
                                                                     <fileset dir="${input.mqtt}/${target}/${classes}" />
                                                                 </classfiles>
@@ -147,7 +147,7 @@
                                                                     <fileset dir="${input.mqtt}/${source}" />
                                                                 </sourcefiles>
                                                             </group>
-                                                            <group name="org.wso2.carbon.device.mgt.input.adapter.thrift">
+                                                            <group name="io.entgra.device.mgt.plugins.input.adapter.thrift">
                                                                 <classfiles>
                                                                     <fileset dir="${input.thrift}/${target}/${classes}" />
                                                                 </classfiles>
@@ -158,7 +158,7 @@
                                                         </group>
 
                                                         <group name="output">
-                                                            <group name="org.wso2.carbon.device.mgt.output.adapter.mqtt">
+                                                            <group name="io.entgra.device.mgt.plugins.output.adapter.mqtt">
                                                                 <classfiles>
                                                                     <fileset dir="${output.mqtt}/${target}/${classes}" />
                                                                 </classfiles>
@@ -166,7 +166,7 @@
                                                                     <fileset dir="${output.mqtt}/${source}" />
                                                                 </sourcefiles>
                                                             </group>
-                                                            <group name="org.wso2.carbon.device.mgt.output.adapter.websocket">
+                                                            <group name="io.entgra.device.mgt.plugins.output.adapter.websocket">
                                                                 <classfiles>
                                                                     <fileset dir="${output.websocket}/${target}/${classes}" />
                                                                 </classfiles>
@@ -174,7 +174,7 @@
                                                                     <fileset dir="${output.websocket}/${source}" />
                                                                 </sourcefiles>
                                                             </group>
-                                                            <group name="org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint">
+                                                            <group name="io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint">
                                                                 <classfiles>
                                                                     <fileset dir="${output.websocket.endpoint}/${target}/${classes}" />
                                                                 </classfiles>
@@ -182,7 +182,7 @@
                                                                     <fileset dir="${output.websocket.endpoint}/${source}" />
                                                                 </sourcefiles>
                                                             </group>
-                                                            <group name="org.wso2.carbon.device.mgt.output.adapter.xmpp">
+                                                            <group name="io.entgra.device.mgt.plugins.output.adapter.xmpp">
                                                                 <classfiles>
                                                                     <fileset dir="${output.xmpp}/${target}/${classes}" />
                                                                 </classfiles>
@@ -221,7 +221,7 @@
                                                 </group>
                                                 <group name="mobile-plugins">
                                                     <group name="android-plugin">
-                                                        <group name="org.wso2.carbon.device.mgt.mobile.android">
+                                                        <group name="io.entgra.device.mgt.plugins.mobile.android">
                                                             <classfiles>
                                                                 <fileset dir="${android.mobile}/${target}/${classes}" />
                                                             </classfiles>
@@ -229,7 +229,7 @@
                                                                 <fileset dir="${android.mobile}/${source}" />
                                                             </sourcefiles>
                                                         </group>
-                                                        <group name="org.wso2.carbon.device.mgt.mobile.android.api">
+                                                        <group name="io.entgra.device.mgt.plugins.mobile.android.api">
                                                             <classfiles>
                                                                 <fileset dir="${android.api}/${target}/${classes}" />
                                                             </classfiles>
diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
index f254e06ad..a72332e47 100644
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
@@ -50,7 +50,7 @@
 <!--                            <artifactItems>-->
 <!--                                <artifactItem>-->
 <!--                                    <groupId>io.entgra.device.mgt.plugins</groupId>-->
-<!--                                    <artifactId>org.wso2.carbon.device.mgt.iot.analytics</artifactId>-->
+<!--                                    <artifactId>io.entgra.device.mgt.plugins.iot.analytics</artifactId>-->
 <!--                                    <version>${project.version}</version>-->
 <!--                                    <type>zip</type>-->
 <!--                                    <overWrite>true</overWrite>-->
diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/IoT-DeviceInfo-Receiver_1.0.0.xml
similarity index 83%
rename from features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml
rename to features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/IoT-DeviceInfo-Receiver_1.0.0.xml
index 008c07951..8d9c82f2b 100644
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/IoT-DeviceInfo-Receiver_1.0.0.xml
@@ -17,10 +17,10 @@
   ~ under the License.
   -->
 
-<eventReceiver name="WSO2IoT-DeviceInfo-Receiver" xmlns="http://wso2.org/carbon/eventreceiver">
+<eventReceiver name="Iot-DeviceInfo-Receiver" xmlns="http://wso2.org/carbon/eventreceiver">
     <from eventAdapterType="iot-event">
         <property name="events.duplicated.in.cluster">false</property>
     </from>
     <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="org.wso2.iot.DeviceInfoStream" version="1.0.0"/>
+    <to streamName="io.entgra.iot.DeviceInfoStream" version="1.0.0"/>
 </eventReceiver>
\ No newline at end of file
diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/IoT-OperationResponse-Receiver_1.0.0.xml
similarity index 82%
rename from features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml
rename to features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/IoT-OperationResponse-Receiver_1.0.0.xml
index 8523077ce..0fb836b34 100644
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventreceivers/IoT-OperationResponse-Receiver_1.0.0.xml
@@ -17,10 +17,10 @@
   ~ under the License.
   -->
 
-<eventReceiver name="WSO2IoT-OperationResponse-Receiver" xmlns="http://wso2.org/carbon/eventreceiver">
+<eventReceiver name="IoT-OperationResponse-Receiver" xmlns="http://wso2.org/carbon/eventreceiver">
     <from eventAdapterType="iot-event">
         <property name="events.duplicated.in.cluster">false</property>
     </from>
     <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="org.wso2.iot.OperationResponseStream" version="1.0.0"/>
+    <to streamName="io.entgra.iot.OperationResponseStream" version="1.0.0"/>
 </eventReceiver>
\ No newline at end of file
diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/io.entgra.iot.DeviceInfoStream_1.0.0.json
similarity index 97%
rename from features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json
rename to features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/io.entgra.iot.DeviceInfoStream_1.0.0.json
index 129b96c72..d95594120 100644
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/io.entgra.iot.DeviceInfoStream_1.0.0.json
@@ -1,5 +1,5 @@
 {
-  "name": "org.wso2.iot.DeviceInfoStream",
+  "name": "io.entgra.iot.DeviceInfoStream",
   "version": "1.0.0",
   "nickName": "",
   "description": "IoT Server Device Info Stream",
diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/io.entgra.iot.OperationResponseStream_1.0.0.json
similarity index 92%
rename from features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json
rename to features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/io.entgra.iot.OperationResponseStream_1.0.0.json
index dba03623f..767230b47 100644
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/io.entgra.iot.OperationResponseStream_1.0.0.json
@@ -1,5 +1,5 @@
 {
-  "name": "org.wso2.iot.OperationResponseStream",
+  "name": "io.entgra.iot.OperationResponseStream",
   "version": "1.0.0",
   "nickName": "",
   "description": "IoT Server Operation Response Stream",
diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/io.entgra.iot.operation_1.0.0.json
similarity index 93%
rename from features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json
rename to features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/io.entgra.iot.operation_1.0.0.json
index 08e4ee11a..446a0e640 100755
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/eventstreams/io.entgra.iot.operation_1.0.0.json
@@ -1,5 +1,5 @@
 {
-  "name": "org.wso2.iot.operation",
+  "name": "io.entgra.iot.operation",
   "version": "1.0.0",
   "nickName": "Operation Stream",
   "description": "Operation stream for Entgra IoT Devices",
diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/executionplans/IoT-Operation-ExecutionPlan.siddhiql
similarity index 68%
rename from features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql
rename to features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/executionplans/IoT-Operation-ExecutionPlan.siddhiql
index a6030d9b9..f5df16470 100644
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/deployment/server/executionplans/IoT-Operation-ExecutionPlan.siddhiql
@@ -1,14 +1,14 @@
 /* Enter a unique ExecutionPlan */
-@Plan:name('WSO2IoT-Operation-ExecutionPlan')
+@Plan:name('IoT-Operation-ExecutionPlan')
 
 /* Enter a unique description for ExecutionPlan */
-@Plan:description('Publish operations to devices coming from org.wso2.iot.operation stream')
+@Plan:description('Publish operations to devices coming from io.entgra.iot.operation stream')
 
 /* define streams/tables and write queries here ... */
 
 @Plan:trace('false')
 
-@Import('org.wso2.iot.operation:1.0.0')
+@Import('io.entgra.iot.operation:1.0.0')
 define stream dataIn (meta_deviceIdentifiers string, meta_deviceType string, code string, type string, isEnabled bool, payLoad string);
 
 from dataIn#device:addOperation(meta_deviceIdentifiers, meta_deviceType, code, type, isEnabled, payLoad)
diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/p2.inf b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/p2.inf
index 94d615597..c441fe736 100644
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/p2.inf
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/src/main/resources/p2.inf
@@ -1,16 +1,16 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/carbonapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml,target:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml,target:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql,target:${installFolder}/../../deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventreceivers/IoT-DeviceInfo-Receiver_1.0.0.xml,target:${installFolder}/../../deployment/server/eventreceivers/IoT-DeviceInfo-Receiver_1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventreceivers/IoT-OperationResponse-Receiver_1.0.0.xml,target:${installFolder}/../../deployment/server/eventreceivers/IoT-OperationResponse-Receiver_1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/io.entgra.iot.DeviceInfoStream_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.DeviceInfoStream_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/io.entgra.iot.operation_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.operation_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/io.entgra.iot.OperationResponseStream_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.OperationResponseStream_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/executionplans/IoT-Operation-ExecutionPlan.siddhiql,target:${installFolder}/../../deployment/server/executionplans/IoT-Operation-ExecutionPlan.siddhiql,overwrite:true);\
 
 instructions.uninstall = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventreceivers/IoT-DeviceInfo-Receiver_1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventreceivers/IoT-OperationResponse-Receiver_1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.DeviceInfoStream_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.operation_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.OperationResponseStream_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/executionplans/IoT-Operation-ExecutionPlan.siddhiql,overwrite:true);\
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
index 2027e3e43..b9190464c 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
@@ -119,7 +119,7 @@
 									</artifactId>
 									<overWrite>true</overWrite>
 									<outputDirectory>${project.build.directory}/maven-shared-archive-resources/agent/</outputDirectory>
-									<destFileName>wso2-firealarm-virtual-agent.jar</destFileName>
+									<destFileName>firealarm-virtual-agent.jar</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.bat b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.bat
index f19520f14..ebbddf896 100755
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.bat
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.bat
@@ -1,7 +1,7 @@
 @echo off
 echo.
-echo.WSO2 IOT Sample
+echo.Entgra IOT Sample
 echo.Virtual Fire Alarm
 echo.initializing agent
 echo.
-java -jar wso2-firealarm-virtual-agent.jar
\ No newline at end of file
+java -jar firealarm-virtual-agent.jar
\ No newline at end of file
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.sh b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.sh
index 37853c9b1..eb4cea51f 100755
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.sh
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "----------------------------------------------------------------"
-echo "|		WSO2 IOT Sample				"
+echo "|		Entgra IOT Sample				"
 echo "|	   Virtual RaspiAlarm			"
 echo "|	       ----------------				"
 echo "|    ....initializing startup-script	"
@@ -17,7 +17,7 @@ echo "----------------------------------------------------------------"
 #done
 #
 #while true; do
-#    read -p "Whats the time-interval (in seconds) between successive Data-Pushes to the WSO2-IoT-Server (ex: '60' indicates 1 minute) > " interval
+#    read -p "Whats the time-interval (in seconds) between successive Data-Pushes to the IoT-Server (ex: '60' indicates 1 minute) > " interval
 #
 #    if [ $interval -eq $interval 2>/dev/null ]
 #    then
@@ -31,7 +31,7 @@ echo "----------------------------------------------------------------"
 #done
 
 
-java -jar wso2-firealarm-virtual-agent.jar
+java -jar firealarm-virtual-agent.jar
 
 #while true; do
 #    read -p "Do you wish to run 'apt-get update' and continue? [Yes/No] " yn
diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/android-datasources.xml.j2 b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/android-datasources.xml.j2
index fd8ba5576..bf545082c 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/android-datasources.xml.j2
+++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/android-datasources.xml.j2
@@ -45,7 +45,7 @@
                 <{{property_name}}>{{property_value}}</{{property_name}}>
                 {% endfor %}
             {% else %}
-                <url>jdbc:h2:./repository/database/WSO2MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                <url>jdbc:h2:./repository/database/MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE</url>
                 <username>wso2carbon</username>
                 <password>wso2carbon</password>
                 <driverClassName>org.h2.Driver</driverClassName>
diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/datasources/android-datasources.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/datasources/android-datasources.xml
index 1b879009c..d83a17bab 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/datasources/android-datasources.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/datasources/android-datasources.xml
@@ -30,7 +30,7 @@
 			</jndiConfig>
 			<definition type="RDBMS">
 				<configuration>
-					<url>jdbc:h2:./repository/database/WSO2MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+					<url>jdbc:h2:./repository/database/MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE</url>
 					<username>wso2carbon</username>
 					<password>wso2carbon</password>
 					<driverClassName>org.h2.Driver</driverClassName>
diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/p2.inf b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/p2.inf
index 35fc8f2dd..00e915f92 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/p2.inf
+++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/src/main/resources/p2.inf
@@ -29,5 +29,5 @@ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../dep
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:$${installFolder}/../../../repository/resources/email-templates/android-enrollment-invitation.vm);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/android);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../database/WSO2MobileAndroid_DB.h2.db);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../database/MobileAndroid_DB.h2.db);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/devicetypes/android.xml);\
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6c426c576..6985fdf34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -434,7 +434,7 @@
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.iot.api</artifactId>
+                <artifactId>io.entgra.device.mgt.plugins.iot.api</artifactId>
                 <version>${io.entgra.device.mgt.plugins.version}</version>
                 <type>war</type>
             </dependency>
@@ -457,17 +457,17 @@
             <!--MDM dependencies-->
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.mobile</artifactId>
+                <artifactId>io.entgra.device.mgt.plugins.mobile</artifactId>
                 <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.mobile.api</artifactId>
+                <artifactId>io.entgra.device.mgt.plugins.mobile.api</artifactId>
                 <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.mobile.url.printer</artifactId>
+                <artifactId>io.entgra.device.mgt.plugins.mobile.url.printer</artifactId>
                 <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>