diff --git a/modules/distribution/src/analytics/samples/pom.xml b/modules/distribution/src/analytics/samples/pom.xml
index c8f3d8d5..509f552e 100644
--- a/modules/distribution/src/analytics/samples/pom.xml
+++ b/modules/distribution/src/analytics/samples/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>analytics-devicetype-feature-installation</artifactId>
     <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Device Type Plugins - Analytics</name>
+    <name>Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - Analytics</name>
     <url>http://wso2.org</url>
 
 
diff --git a/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java b/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java
index 605b92cd..7b868612 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java
+++ b/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java
@@ -50,7 +50,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "connectedcup", description = "")
+                @Tag(name = "connectedcup,device_management", description = "")
         }
 )
 @Scopes(
diff --git a/modules/distribution/src/core/samples/device-plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml
index 5bdb1247..23b5509a 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>Device Type Plugins - IoT Core</name>
+    <name>Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - IoT Core</name>
     <url>http://wso2.org</url>
 
     <modules>