diff --git a/modules/distribution/src/core/samples/sampledevice-deployer.xml b/modules/distribution/src/core/samples/sampledevice-deployer.xml
index fd9dc107..9af92088 100644
--- a/modules/distribution/src/core/samples/sampledevice-deployer.xml
+++ b/modules/distribution/src/core/samples/sampledevice-deployer.xml
@@ -51,13 +51,13 @@
                             <goal>p2-repo-gen</goal>
                         </goals>
                         <configuration>
-                            <metadataRepository>file:${basedir}/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/p2-repo</artifactRepository>
+                            <metadataRepository>file:\${basedir}/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/p2-repo</artifactRepository>
                             <publishArtifacts>true</publishArtifacts>
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.sampledevice.feature:1.0.0
+                                    org.wso2.carbon:org.wso2.iot.sampledevice.feature:1.0.0
                                 </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
@@ -70,13 +70,13 @@
                         </goals>
                         <configuration>
                             <profile>default</profile>
-                            <metadataRepository>file:${basedir}/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/p2-repo</artifactRepository>
-                            <destination>${basedir}/../wso2/components</destination>
+                            <metadataRepository>file:\${basedir}/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/p2-repo</artifactRepository>
+                            <destination>\${basedir}/../wso2/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
                                 <feature>
-                                    <id>org.wso2.carbon.sampledevice.feature.group</id>
+                                    <id>org.wso2.iot.sampledevice.feature.group</id>
                                     <version>1.0.0</version>
                                 </feature>
                             </features>
diff --git a/modules/distribution/src/core/samples/sampledevice/component/analytics/pom.xml b/modules/distribution/src/core/samples/sampledevice/component/analytics/pom.xml
index e032eaa4..7cedab9c 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/analytics/pom.xml
+++ b/modules/distribution/src/core/samples/sampledevice/component/analytics/pom.xml
@@ -26,10 +26,10 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>${groupId}.sampledevice.analytics</artifactId>
+    <artifactId>${project-base-package}.analytics</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>
-    <name>${groupId}.sampledevice.analytics</name>
+    <name>${project-base-package}.analytics</name>
     <url>http://wso2.org</url>
     <build>
         <plugins>
diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/DeviceTypeService.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/DeviceTypeService.java
similarity index 99%
rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/DeviceTypeService.java
rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/DeviceTypeService.java
index 43299c99..e8bcc467 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/DeviceTypeService.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/DeviceTypeService.java
@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.sampledevice.api;
+package org.wso2.iot.sampledevice.api;
 
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Extension;
diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/DeviceTypeServiceImpl.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/DeviceTypeServiceImpl.java
similarity index 96%
rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/DeviceTypeServiceImpl.java
rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/DeviceTypeServiceImpl.java
index d492be15..98f0d3da 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/DeviceTypeServiceImpl.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/DeviceTypeServiceImpl.java
@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.sampledevice.api;
+package org.wso2.iot.sampledevice.api;
 
 
 import org.apache.commons.io.FileUtils;
@@ -41,12 +41,12 @@ import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
 import org.wso2.carbon.identity.jwt.client.extension.JWTClient;
 import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
 import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException;
-import org.wso2.carbon.sampledevice.api.dto.DeviceJSON;
-import org.wso2.carbon.sampledevice.api.dto.SensorRecord;
-import org.wso2.carbon.sampledevice.api.util.APIUtil;
-import org.wso2.carbon.sampledevice.api.util.ZipArchive;
-import org.wso2.carbon.sampledevice.api.util.ZipUtil;
-import org.wso2.carbon.sampledevice.plugin.constants.DeviceTypeConstants;
+import org.wso2.iot.sampledevice.api.dto.DeviceJSON;
+import org.wso2.iot.sampledevice.api.dto.SensorRecord;
+import org.wso2.iot.sampledevice.api.util.APIUtil;
+import org.wso2.iot.sampledevice.api.util.ZipArchive;
+import org.wso2.iot.sampledevice.api.util.ZipUtil;
+import org.wso2.iot.sampledevice.plugin.constants.DeviceTypeConstants;
 import org.wso2.carbon.user.api.UserStoreException;
 
 import java.io.IOException;
@@ -114,7 +114,7 @@ public class DeviceTypeServiceImpl implements DeviceTypeService {
                                  @Context HttpServletResponse response) {
         try {
             if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized(new DeviceIdentifier(deviceId,
-                    DeviceTypeConstants.DEVICE_TYPE))) {
+                                                                                                     DeviceTypeConstants.DEVICE_TYPE))) {
                 return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build();
             }
             String sensorState = state.toUpperCase();
diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/dto/DeviceJSON.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/dto/DeviceJSON.java
similarity index 96%
rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/dto/DeviceJSON.java
rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/dto/DeviceJSON.java
index b360fb78..a0349bc0 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/dto/DeviceJSON.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/dto/DeviceJSON.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.api.dto;
+package org.wso2.iot.sampledevice.api.dto;
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 
diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/dto/SensorRecord.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/dto/SensorRecord.java
similarity index 97%
rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/dto/SensorRecord.java
rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/dto/SensorRecord.java
index bd84b2b4..e93c4145 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/dto/SensorRecord.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/dto/SensorRecord.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.api.dto;
+package org.wso2.iot.sampledevice.api.dto;
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 
diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/exception/DeviceTypeException.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/exception/DeviceTypeException.java
similarity index 96%
rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/exception/DeviceTypeException.java
rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/exception/DeviceTypeException.java
index f65830da..7e47b2d1 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/exception/DeviceTypeException.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/exception/DeviceTypeException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.api.exception;
+package org.wso2.iot.sampledevice.api.exception;
 
 /**
  * Device specific exception handler.
diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/APIUtil.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/util/APIUtil.java
similarity index 98%
rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/APIUtil.java
rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/util/APIUtil.java
index 7ad92215..2c2facc6 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/APIUtil.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/util/APIUtil.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.api.util;
+package org.wso2.iot.sampledevice.api.util;
 
 
 import org.apache.commons.logging.Log;
@@ -34,7 +34,7 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
-import org.wso2.carbon.sampledevice.api.dto.SensorRecord;
+import org.wso2.iot.sampledevice.api.dto.SensorRecord;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/ZipArchive.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/util/ZipArchive.java
similarity index 95%
rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/ZipArchive.java
rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/util/ZipArchive.java
index c6fb7d82..d3e886f8 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/ZipArchive.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/util/ZipArchive.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.api.util;
+package org.wso2.iot.sampledevice.api.util;
 
 
 import java.io.File;
diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/ZipUtil.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/util/ZipUtil.java
similarity index 99%
rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/ZipUtil.java
rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/util/ZipUtil.java
index 7be74c97..95e0b792 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/ZipUtil.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/iot/sampledevice/api/util/ZipUtil.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.api.util;
+package org.wso2.iot.sampledevice.api.util;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
index d5c5b7c6..66165807 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -27,7 +27,7 @@
     <jaxrs:server id="sampledevice" address="/">
         <jaxrs:serviceBeans>
             <bean id="DeviceTypeService"
-                  class="org.wso2.carbon.sampledevice.api.DeviceTypeServiceImpl">
+                  class="org.wso2.iot.sampledevice.api.DeviceTypeServiceImpl">
             </bean>
         </jaxrs:serviceBeans>
         <jaxrs:providers>
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/constants/DeviceTypeConstants.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/constants/DeviceTypeConstants.java
similarity index 98%
rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/constants/DeviceTypeConstants.java
rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/constants/DeviceTypeConstants.java
index 03466b2b..4e763086 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/constants/DeviceTypeConstants.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/constants/DeviceTypeConstants.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.plugin.constants;
+package org.wso2.iot.sampledevice.plugin.constants;
 
 import org.wso2.carbon.utils.CarbonUtils;
 
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/exception/DeviceMgtPluginException.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/exception/DeviceMgtPluginException.java
similarity index 96%
rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/exception/DeviceMgtPluginException.java
rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/exception/DeviceMgtPluginException.java
index e0fe4b9b..9a7856cc 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/exception/DeviceMgtPluginException.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/exception/DeviceMgtPluginException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.plugin.exception;
+package org.wso2.iot.sampledevice.plugin.exception;
 
 /**
  * Device type plugin exception handler.
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManager.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/DeviceTypeManager.java
similarity index 97%
rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManager.java
rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/DeviceTypeManager.java
index fa62356b..5482feb0 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManager.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/DeviceTypeManager.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.plugin.impl;
+package org.wso2.iot.sampledevice.plugin.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -29,9 +29,9 @@ import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
-import org.wso2.carbon.sampledevice.plugin.exception.DeviceMgtPluginException;
-import org.wso2.carbon.sampledevice.plugin.impl.dao.DeviceTypeDAO;
-import org.wso2.carbon.sampledevice.plugin.impl.feature.DeviceTypeFeatureManager;
+import org.wso2.iot.sampledevice.plugin.exception.DeviceMgtPluginException;
+import org.wso2.iot.sampledevice.plugin.impl.dao.DeviceTypeDAO;
+import org.wso2.iot.sampledevice.plugin.impl.feature.DeviceTypeFeatureManager;
 
 import java.util.List;
 
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManagerService.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/DeviceTypeManagerService.java
similarity index 97%
rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManagerService.java
rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/DeviceTypeManagerService.java
index 9ecb5311..725f4379 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManagerService.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/DeviceTypeManagerService.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.plugin.impl;
+package org.wso2.iot.sampledevice.plugin.impl;
 
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
@@ -30,7 +30,7 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
-import org.wso2.carbon.sampledevice.plugin.constants.DeviceTypeConstants;
+import org.wso2.iot.sampledevice.plugin.constants.DeviceTypeConstants;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/dao/DeviceTypeDAO.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/dao/DeviceTypeDAO.java
similarity index 93%
rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/dao/DeviceTypeDAO.java
rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/dao/DeviceTypeDAO.java
index 6b2b5098..779e0e81 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/dao/DeviceTypeDAO.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/dao/DeviceTypeDAO.java
@@ -16,13 +16,13 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.plugin.impl.dao;
+package org.wso2.iot.sampledevice.plugin.impl.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.sampledevice.plugin.constants.DeviceTypeConstants;
-import org.wso2.carbon.sampledevice.plugin.exception.DeviceMgtPluginException;
-import org.wso2.carbon.sampledevice.plugin.impl.dao.impl.DeviceTypeDAOImpl;
+import org.wso2.iot.sampledevice.plugin.constants.DeviceTypeConstants;
+import org.wso2.iot.sampledevice.plugin.exception.DeviceMgtPluginException;
+import org.wso2.iot.sampledevice.plugin.impl.dao.impl.DeviceTypeDAOImpl;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
similarity index 95%
rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
index 529b7a27..b298f34a 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
@@ -16,15 +16,15 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.plugin.impl.dao.impl;
+package org.wso2.iot.sampledevice.plugin.impl.dao.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
-import org.wso2.carbon.sampledevice.plugin.constants.DeviceTypeConstants;
-import org.wso2.carbon.sampledevice.plugin.exception.DeviceMgtPluginException;
-import org.wso2.carbon.sampledevice.plugin.impl.dao.DeviceTypeDAO;
-import org.wso2.carbon.sampledevice.plugin.impl.util.DeviceTypeUtils;
+import org.wso2.iot.sampledevice.plugin.constants.DeviceTypeConstants;
+import org.wso2.iot.sampledevice.plugin.exception.DeviceMgtPluginException;
+import org.wso2.iot.sampledevice.plugin.impl.dao.DeviceTypeDAO;
+import org.wso2.iot.sampledevice.plugin.impl.util.DeviceTypeUtils;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java
similarity index 98%
rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java
rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java
index 0215df11..f63a2731 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.wso2.carbon.sampledevice.plugin.impl.feature;
+package org.wso2.iot.sampledevice.plugin.impl.feature;
 
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.Feature;
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java
similarity index 97%
rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java
rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java
index 5cd1d095..02db735c 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.plugin.impl.util;
+package org.wso2.iot.sampledevice.plugin.impl.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/util/DeviceTypeUtils.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/util/DeviceTypeUtils.java
similarity index 93%
rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/util/DeviceTypeUtils.java
rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/util/DeviceTypeUtils.java
index 71c77354..2a6588fc 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/util/DeviceTypeUtils.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/impl/util/DeviceTypeUtils.java
@@ -16,15 +16,15 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.plugin.impl.util;
+package org.wso2.iot.sampledevice.plugin.impl.util;
 
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.base.ServerConfiguration;
 import org.wso2.carbon.core.util.Utils;
-import org.wso2.carbon.sampledevice.plugin.constants.DeviceTypeConstants;
-import org.wso2.carbon.sampledevice.plugin.exception.DeviceMgtPluginException;
+import org.wso2.iot.sampledevice.plugin.constants.DeviceTypeConstants;
+import org.wso2.iot.sampledevice.plugin.exception.DeviceMgtPluginException;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -41,7 +41,7 @@ import javax.sql.DataSource;
  */
 public class DeviceTypeUtils {
 
-    private static Log log = LogFactory.getLog(org.wso2.carbon.sampledevice.plugin.impl.util.DeviceTypeUtils.class);
+    private static Log log = LogFactory.getLog(DeviceTypeUtils.class);
 
     public static void cleanupResources(Connection conn, PreparedStatement stmt, ResultSet rs) {
         if (rs != null) {
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/internal/ServiceComponent.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/internal/ServiceComponent.java
similarity index 92%
rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/internal/ServiceComponent.java
rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/internal/ServiceComponent.java
index bc87d848..c7984654 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/internal/ServiceComponent.java
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/iot/sampledevice/plugin/internal/ServiceComponent.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.sampledevice.plugin.internal;
+package org.wso2.iot.sampledevice.plugin.internal;
 
 
 import org.apache.commons.logging.Log;
@@ -25,9 +25,9 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
-import org.wso2.carbon.sampledevice.plugin.exception.DeviceMgtPluginException;
-import org.wso2.carbon.sampledevice.plugin.impl.DeviceTypeManagerService;
-import org.wso2.carbon.sampledevice.plugin.impl.util.DeviceTypeUtils;
+import org.wso2.iot.sampledevice.plugin.exception.DeviceMgtPluginException;
+import org.wso2.iot.sampledevice.plugin.impl.DeviceTypeManagerService;
+import org.wso2.iot.sampledevice.plugin.impl.util.DeviceTypeUtils;
 
 /**
  * @scr.component name="org.wso2.carbon.sampledevice.plugin.internal.ServiceComponent"
diff --git a/modules/distribution/src/core/samples/sampledevice/feature/feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/sampledevice/feature/feature/src/main/resources/p2.inf
index 080a8eb1..78c27a1e 100644
--- a/modules/distribution/src/core/samples/sampledevice/feature/feature/src/main/resources/p2.inf
+++ b/modules/distribution/src/core/samples/sampledevice/feature/feature/src/main/resources/p2.inf
@@ -1,19 +1,19 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.sampledevice_${feature.version}/webapps/,target:${installFolder}/../../../repository/deployment/server/webapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.iot.sampledevice_${feature.version}/webapps/,target:${installFolder}/../../../repository/deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../resources/sketches/);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../resources/sketches/sampledevice/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.sampledevice_${feature.version}/agent/,target:${installFolder}/../../../repository/resources/sketches/sampledevice/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.sampledevice_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/sampledevice,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.sampledevice_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.iot.sampledevice_${feature.version}/agent/,target:${installFolder}/../../../repository/resources/sketches/sampledevice/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.iot.sampledevice_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/sampledevice,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.iot.sampledevice_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.sampledevice_${feature.version}/jaggeryapps/,target:${installFolder}/../../../repository/deployment/server/jaggeryapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.iot.sampledevice_${feature.version}/jaggeryapps/,target:${installFolder}/../../../repository/deployment/server/jaggeryapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/database/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.sampledevice_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.iot.sampledevice_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/carbonapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.sampledevice_${feature.version}/carbonapps/,target:${installFolder}/../../../repository/deployment/server/carbonapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.iot.sampledevice_${feature.version}/carbonapps/,target:${installFolder}/../../../repository/deployment/server/carbonapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/devicetypes/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.sampledevice_${feature.version}/devicetypes/,target:${installFolder}/../../../repository/deployment/server/devicetypes/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.iot.sampledevice_${feature.version}/devicetypes/,target:${installFolder}/../../../repository/deployment/server/devicetypes/,overwrite:true);\
 
 
 
diff --git a/modules/distribution/src/core/samples/sampledevice/pom.xml b/modules/distribution/src/core/samples/sampledevice/pom.xml
index deeff3ae..8605058c 100644
--- a/modules/distribution/src/core/samples/sampledevice/pom.xml
+++ b/modules/distribution/src/core/samples/sampledevice/pom.xml
@@ -39,13 +39,13 @@
             <dependency>
                 <groupId>org.eclipse.osgi</groupId>
                 <artifactId>org.eclipse.osgi</artifactId>
-                <version>${eclipse.osgi.version}</version>
+                <version>\${eclipse.osgi.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.equinox</groupId>
                 <artifactId>org.eclipse.equinox.common</artifactId>
-                <version>${eclipse.equinox.common.version}</version>
+                <version>\${eclipse.equinox.common.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -57,7 +57,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version}</version>
+                <version>\${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -78,33 +78,33 @@
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-frontend-jaxws</artifactId>
-                <version>${cxf.version}</version>
+                <version>\${cxf.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-                <version>${cxf.version}</version>
+                <version>\${cxf.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-transports-http</artifactId>
-                <version>${cxf.version}</version>
+                <version>\${cxf.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.paho</groupId>
                 <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-                <version>${paho.mqtt.version}</version>
+                <version>\${paho.mqtt.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-core-asl</artifactId>
-                <version>${jackson.version}</version>
+                <version>\${jackson.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-jaxrs</artifactId>
-                <version>${jackson.version}</version>
+                <version>\${jackson.version}</version>
             </dependency>
             <dependency>
                 <groupId>javax</groupId>
@@ -115,24 +115,24 @@
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>jsr311-api</artifactId>
-                <version>${javax.ws.rs.version}</version>
+                <version>\${javax.ws.rs.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpasyncclient</artifactId>
-                <version>${org.apache.httpcomponents.version}</version>
+                <version>\${org.apache.httpcomponents.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
-                <artifactId>${project-base-package}.plugin</artifactId>
+                <artifactId>\${project-base-package}.plugin</artifactId>
                 <version>1.0.0</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version}</version>
+                <version>\${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -142,62 +142,62 @@
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <version>\${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <version>\${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <version>\${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <version>\${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <version>\${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.extensions</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <version>\${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.analytics</groupId>
                 <artifactId>org.wso2.carbon.analytics.api</artifactId>
-                <version>${carbon.analytics.version}</version>
+                <version>\${carbon.analytics.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.analytics</groupId>
                 <artifactId>org.wso2.carbon.analytics.datasource.commons</artifactId>
-                <version>${carbon.analytics.version}</version>
+                <version>\${carbon.analytics.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.analytics</groupId>
                 <artifactId>org.wso2.carbon.analytics.dataservice.commons</artifactId>
-                <version>${carbon.analytics.version}</version>
+                <version>\${carbon.analytics.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.analytics</groupId>
                 <artifactId>org.wso2.carbon.analytics.dataservice.core</artifactId>
-                <version>${carbon.analytics.version}</version>
+                <version>\${carbon.analytics.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-httpclient.wso2</groupId>
                 <artifactId>commons-httpclient</artifactId>
-                <version>${commons-httpclient.orbit.version}</version>
+                <version>\${commons-httpclient.orbit.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version}</version>
+                <version>\${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
@@ -260,32 +260,32 @@
             <dependency>
                 <groupId>org.igniterealtime.smack.wso2</groupId>
                 <artifactId>smack</artifactId>
-                <version>${smack.wso2.version}</version>
+                <version>\${smack.wso2.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.igniterealtime.smack.wso2</groupId>
                 <artifactId>smackx</artifactId>
-                <version>${smackx.wso2.version}</version>
+                <version>\${smackx.wso2.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.json.wso2</groupId>
                 <artifactId>json</artifactId>
-                <version>${commons-json.version}</version>
+                <version>\${commons-json.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.extensions</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <version>\${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <version>\${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <version>\${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.h2database.wso2</groupId>
@@ -295,17 +295,17 @@
             <dependency>
                 <groupId>org.wso2.carbon.analytics-common</groupId>
                 <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
-                <version>${carbon.analytics.common.version}</version>
+                <version>\${carbon.analytics.common.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.extensions</artifactId>
-                <version>${carbon.device.mgt.version}</version>
+                <version>\${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-codec.wso2</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>${commons-codec.wso2.version}</version>
+                <version>\${commons-codec.wso2.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>