diff --git a/protocols/xmpp/core/api/pom.xml b/protocols/xmpp/core/api/pom.xml
index a53c3df..1351238 100644
--- a/protocols/xmpp/core/api/pom.xml
+++ b/protocols/xmpp/core/api/pom.xml
@@ -3,20 +3,19 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>onos-xmpp-core</artifactId>
+        <artifactId>onos-protocols-xmpp-core</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.13.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-xmpp-core-api</artifactId>
+    <artifactId>onos-protocols-xmpp-core-api</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.igniterealtime</groupId>
             <artifactId>tinder</artifactId>
-            <version>RELEASE</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -31,14 +30,6 @@
             <artifactId>netty-handler</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-xmpp-ctl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
@@ -58,4 +49,4 @@
     </build>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/protocols/xmpp/core/ctl/pom.xml b/protocols/xmpp/core/ctl/pom.xml
index cd8dbcd..278222d 100644
--- a/protocols/xmpp/core/ctl/pom.xml
+++ b/protocols/xmpp/core/ctl/pom.xml
@@ -3,19 +3,23 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>onos-xmpp-core</artifactId>
+        <artifactId>onos-protocols-xmpp-core</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.13.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-xmpp-core-ctl</artifactId>
+    <artifactId>onos-protocols-xmpp-core-ctl</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS XMPP controller subsystem API</description>
 
     <dependencies>
         <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-api</artifactId>
+        </dependency>
+        <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
         </dependency>
@@ -43,12 +47,13 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-xmpp-core-api</artifactId>
+            <artifactId>onos-protocols-xmpp-core-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -71,4 +76,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/protocols/xmpp/core/pom.xml b/protocols/xmpp/core/pom.xml
index a330e96..6b9b67e 100644
--- a/protocols/xmpp/core/pom.xml
+++ b/protocols/xmpp/core/pom.xml
@@ -3,18 +3,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>onos-xmpp</artifactId>
+        <artifactId>onos-protocols-xmpp</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.13.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-xmpp-core</artifactId>
-    <packaging>bundle</packaging>
+    <artifactId>onos-protocols-xmpp-core</artifactId>
+    <packaging>pom</packaging>
 
     <modules>
-        <module>onos-xmpp-core-api</module>
-        <module>onos-xmpp-core-ctl</module>
+        <module>api</module>
+        <module>ctl</module>
     </modules>
 
 
@@ -26,5 +26,23 @@
             </plugin>
         </plugins>
     </build>
-    
-</project>
\ No newline at end of file
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>org.igniterealtime</groupId>
+                <artifactId>tinder</artifactId>
+                <version>1.3.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fasterxml</groupId>
+                <artifactId>aalto-xml</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+</project>
diff --git a/protocols/xmpp/pom.xml b/protocols/xmpp/pom.xml
index af048c52..1037027 100644
--- a/protocols/xmpp/pom.xml
+++ b/protocols/xmpp/pom.xml
@@ -9,11 +9,12 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-xmpp</artifactId>
+    <artifactId>onos-protocols-xmpp</artifactId>
     <description>ONOS XMPP Protocol subsystem</description>
+    <packaging>pom</packaging>
 
     <modules>
-        <module>onos-xmpp-core</module>
+        <module>core</module>
     </modules>
 
 
@@ -34,4 +35,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/providers/xmpp/device/pom.xml b/providers/xmpp/device/pom.xml
index ec84565..48e08da 100644
--- a/providers/xmpp/device/pom.xml
+++ b/providers/xmpp/device/pom.xml
@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-xmpp-providers</artifactId>
+        <artifactId>onos-providers-xmpp</artifactId>
         <version>1.13.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-xmpp-provider-device</artifactId>
+    <artifactId>onos-providers-xmpp-device</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS XMPP protocol Device provider</description>
@@ -41,8 +41,8 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-xmpp-core-api</artifactId>
-            <version>1.13.0-SNAPSHOT</version>
+            <artifactId>onos-protocols-xmpp-core-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/providers/xmpp/device/src/test/java/org/onosproject/provider/xmpp/device/impl/XmppDeviceProviderTest.java b/providers/xmpp/device/src/test/java/org/onosproject/provider/xmpp/device/impl/XmppDeviceProviderTest.java
index f5ca6b6..f87694d 100644
--- a/providers/xmpp/device/src/test/java/org/onosproject/provider/xmpp/device/impl/XmppDeviceProviderTest.java
+++ b/providers/xmpp/device/src/test/java/org/onosproject/provider/xmpp/device/impl/XmppDeviceProviderTest.java
@@ -111,7 +111,7 @@
     public void deactivate() throws Exception {
         provider.deactivate();
         assertNull("Device listener should be removed", xmppController.listener);
-        assertFalse("Provider should not be registered", deviceRegistry.getProviders().contains(provider));
+        assertFalse("Provider should not be registered", deviceRegistry.getProviders().contains(provider.id()));
         assertNull("Provider service should be null", provider.providerService);
     }
 
diff --git a/providers/xmpp/pom.xml b/providers/xmpp/pom.xml
index 3ce40d1..2b15f99 100644
--- a/providers/xmpp/pom.xml
+++ b/providers/xmpp/pom.xml
@@ -9,10 +9,11 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-xmpp-providers</artifactId>
+    <artifactId>onos-providers-xmpp</artifactId>
+    <packaging>pom</packaging>
 
     <modules>
-        <module>onos-xmpp-provider-device</module>
+        <module>device</module>
     </modules>
 
-</project>
\ No newline at end of file
+</project>