diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 7e141722..66ee43f6 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1387,9 +1387,9 @@
         <!-- Adding IoT Analytics Dashboard and gadget CApps -->
         <file>
             <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/devicetypes/device_management/org_wso2_carbon_analytics_cdmf-1.0.0.car
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/devicetypes/org_wso2_carbon_device_mgt_cdmf_analytics-1.0.0.car
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/devicetypes/device_management/
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/devicetypes/
             </outputDirectory>
             <fileMode>644</fileMode>
         </file>
@@ -1750,7 +1750,7 @@
 
         <file>
             <source>
-                ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/devicetypes/device_management/org_wso2_carbon_analytics_cdmf-1.0.0.car
+                ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/devicetypes/org_wso2_carbon_device_mgt_cdmf_analytics-1.0.0.car
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/carbonapps/
             </outputDirectory>
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index 2739147b..af59e28c 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -116,7 +116,7 @@
                                 <!-- END - Analytics features -->
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version}
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.cdmf.analytics.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version}
@@ -489,10 +489,6 @@
                                     <id>org.wso2.carbon.dashboard.deployment.feature.group</id>
                                     <version>${carbon.dashboard.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.analytics.cdmf.feature.group</id>
-                                    <version>${cdmf.analytics.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
                                     <version>${carbon.analytics.das.version}</version>
@@ -813,8 +809,8 @@
 
                                 <!-- IoT Analytics Features -->
                                 <feature>
-                                    <id>org.wso2.carbon.analytics.cdmf.feature.group</id>
-                                    <version>${cdmf.analytics.version}</version>
+                                    <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.analytics.gadget.template.feature.group</id>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index a24cb545..3f9b871a 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -480,7 +480,7 @@
                                 <!-- End of Dashboards Features -->
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version}
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.cdmf.analytics.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.device.statistics.dashboard.feature:${carbon.device.mgt.plugin.version}
@@ -730,9 +730,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version}
-                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -1588,8 +1585,8 @@
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.analytics.cdmf.feature.group</id>
-                                    <version>${cdmf.analytics.version}</version>
+                                    <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                             </features>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index a1bc6ac8..9289ab85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1521,7 +1521,7 @@
 
         <!-- Carbon Device Management Plugins-->
 
-        <carbon.device.mgt.plugin.version>3.0.15</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.17-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>
@@ -1659,9 +1659,6 @@
         <!--mqtt version-->
         <eclipse.paho.version>1.0.2</eclipse.paho.version>
 
-        <!-- CDMF Analytics -->
-        <cdmf.analytics.version>1.0.4-SNAPSHOT</cdmf.analytics.version>
-
         <apache.httpmime.version>4.2.5</apache.httpmime.version>
         <apache.httpclient.version>4.5.2</apache.httpclient.version>
     </properties>