diff --git a/features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml b/features/extensions-feature/org.wso2.extension.siddhi.device.feature/pom.xml
similarity index 92%
rename from features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml
rename to features/extensions-feature/org.wso2.extension.siddhi.device.feature/pom.xml
index 5f5d31507..50aeb0941 100644
--- a/features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.extension.siddhi.device.feature/pom.xml
@@ -24,7 +24,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>org.wso2.extension.siddhi.devicegroup.feature</artifactId>
+    <artifactId>org.wso2.extension.siddhi.device.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Siddhi Execution Extension - Device Group Feature</name>
     <url>http://wso2.org</url>
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-            <artifactId>org.wso2.extension.siddhi.devicegroup</artifactId>
+            <artifactId>org.wso2.extension.siddhi.device</artifactId>
         </dependency>
     </dependencies>
 
@@ -51,7 +51,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.extension.siddhi.devicegroup</id>
+                            <id>org.wso2.extension.siddhi.device</id>
                             <propertiesFile>../../etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>
@@ -61,7 +61,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.devicegroup:${carbon.devicemgt.plugins.version}
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.device:${carbon.devicemgt.plugins.version}
                                 </bundleDef>
                             </bundles>
                         </configuration>
diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml
index f919f23f7..970b76db8 100644
--- a/features/extensions-feature/pom.xml
+++ b/features/extensions-feature/pom.xml
@@ -39,7 +39,7 @@
         <module>org.wso2.carbon.device.mgt.adapter.feature</module>
         <module>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature</module>
         <module>org.wso2.carbon.andes.extensions.device.mgt.api.feature</module>
-        <module>org.wso2.extension.siddhi.devicegroup.feature</module>
+        <module>org.wso2.extension.siddhi.device.feature</module>
         <module>org.wso2.extension.siddhi.execution.json.feature</module>
 		<module>org.wso2.carbon.device.mgt.notification.listener.feature</module>
         <module>org.wso2.gpl.siddhi.extension.geo.script.feature</module>
diff --git a/pom.xml b/pom.xml
index fff364f81..792a61d4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,7 +412,7 @@
             <!--IoT Server specific dependencies-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-                <artifactId>org.wso2.extension.siddhi.devicegroup</artifactId>
+                <artifactId>org.wso2.extension.siddhi.device</artifactId>
                 <version>${carbon.devicemgt.plugins.version}</version>
             </dependency>
             <dependency>