diff --git a/apps/imr/api/pom.xml b/apps/imr/api/pom.xml
index 590342a..73f2f23 100644
--- a/apps/imr/api/pom.xml
+++ b/apps/imr/api/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-imr</artifactId>
+        <artifactId>onos-apps-imr</artifactId>
         <version>1.13.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-imr-api</artifactId>
+    <artifactId>onos-apps-imr-api</artifactId>
     <packaging>bundle</packaging>
 
     <description>Intent Monitoring and Rerouting application REST</description>
@@ -43,14 +43,13 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-imr-app</artifactId>
+            <artifactId>onos-apps-imr-app</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.0.1</version>
         </dependency>
 
         <dependency>
@@ -81,12 +80,10 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-api</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet-core</artifactId>
@@ -104,7 +101,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-cli</artifactId>
-            <version>1.13.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>
diff --git a/apps/imr/app/pom.xml b/apps/imr/app/pom.xml
index b66ebc6..421a2b8 100644
--- a/apps/imr/app/pom.xml
+++ b/apps/imr/app/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-apps</artifactId>
+        <artifactId>onos-apps-imr</artifactId>
         <version>1.13.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-imr-app</artifactId>
+    <artifactId>onos-apps-imr-app</artifactId>
     <packaging>bundle</packaging>
 
     <description>Intent Monitoring and Rerouting application</description>
@@ -52,29 +52,17 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
             <artifactId>onos-incubator-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-imr-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
             <artifactId>onos-core-net</artifactId>
-            <version>1.13.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/apps/imr/pom.xml b/apps/imr/pom.xml
index ae5dc00..fa880c6 100644
--- a/apps/imr/pom.xml
+++ b/apps/imr/pom.xml
@@ -25,7 +25,7 @@
         <version>1.13.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-imr</artifactId>
+    <artifactId>onos-apps-imr</artifactId>
     <packaging>pom</packaging>
 
     <description>Intent Monitoring and Rerouting application</description>
diff --git a/drivers/pom.xml b/drivers/pom.xml
index 4bc4cc7..7be6acf 100644
--- a/drivers/pom.xml
+++ b/drivers/pom.xml
@@ -32,7 +32,7 @@
 
     <modules>
         <module>default</module>
-        <module>ciena</module>
+        <module>ciena/waveserver</module>
         <module>fujitsu</module>
         <module>cisco</module>
         <module>netconf</module>