diff --git a/modules/distribution/src/analytics/samples/connected-cup/pom.xml b/modules/distribution/src/analytics/samples/connected-cup/pom.xml
index 4e6e89ef..88b2323b 100644
--- a/modules/distribution/src/analytics/samples/connected-cup/pom.xml
+++ b/modules/distribution/src/analytics/samples/connected-cup/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>iot-devicetype-analytics-samples</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>
-    <name>Installing Connected Cup Device Types - Analytics</name>
+    <name>Install Connected Cup Device Types - Analytics</name>
     <url>http://wso2.org</url>
 
     <build>
diff --git a/modules/distribution/src/analytics/samples/device-plugins/pom.xml b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
index 6ae63c0e..9cd693f4 100644
--- a/modules/distribution/src/analytics/samples/device-plugins/pom.xml
+++ b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>analytics-devicetype-feature-installation</artifactId>
     <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - Analytics</name>
+    <name>Install Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - Analytics</name>
     <url>http://wso2.org</url>
 
 
diff --git a/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
index b17b154f..4cd18ad4 100644
--- a/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
+++ b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
@@ -34,7 +34,7 @@
     <artifactId>iot-devicetype-samples</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>
-    <name>Installing Connected Cup Device Types - IoT Core</name>
+    <name>Install Connected Cup Device Types - IoT Core</name>
     <url>http://wso2.org</url>
 
     <build>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf
index d23ed547..c32c08eb 100644
--- a/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf
+++ b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf
@@ -1,6 +1,6 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../conf/device-types/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/configs/,target:${installFolder}/../../../conf/device-types/,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.coffeeking.connectedcup.backend_${feature.version}/configs/,target:${installFolder}/../../../repository/deployment/server/devicetypes/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/webapps/,target:${installFolder}/../../../repository/deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup,overwrite:true);\
@@ -9,7 +9,7 @@ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../r
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
 
 instructions.unconfigure = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/device-types/connectedcup.xml);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/devicetypes/connectedcup.xml);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup.war);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connected-cup-agent.war);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup);\
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf
index 27366c97..3a0f2765 100644
--- a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf
+++ b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf
@@ -1,6 +1,6 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../conf/device-types/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/configs/,target:${installFolder}/../../../conf/device-types/,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.coffeeking.connectedcup.ui_${feature.version}/configs/,target:${installFolder}/../../../repository/deployment/server/devicetypes/,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.coffeeking.connectedcup.ui_${feature.version}/jaggeryapps/,target:${installFolder}/../../../repository/deployment/server/jaggeryapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup,overwrite:true);\
@@ -10,7 +10,7 @@ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../featur
 
 
 instructions.unconfigure = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/device-types/connectedcup.xml);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/devicetypes/connectedcup.xml);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/datasources/connectedcup-datasources.xml);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/database/ConnectedCupDM_DB.h2.db);\
diff --git a/modules/distribution/src/core/samples/device-plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml
index 7aa00660..53b9d60e 100644
--- a/modules/distribution/src/core/samples/device-plugins-deployer.xml
+++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml
@@ -29,7 +29,7 @@
     <artifactId>iot-devicetype-feature-installation</artifactId>
     <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - IoT Core</name>
+    <name>Install Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - IoT Core</name>
     <url>http://wso2.org</url>
 
     <modules>