diff --git a/apps/dhcprelay/pom.xml b/apps/dhcprelay/pom.xml
index b3d879e..782e1b0 100644
--- a/apps/dhcprelay/pom.xml
+++ b/apps/dhcprelay/pom.xml
@@ -116,8 +116,15 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-route-service-api</artifactId>
+            <artifactId>onos-apps-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-route-service-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
     </dependencies>
 </project>
diff --git a/apps/evpnopenflow/pom.xml b/apps/evpnopenflow/pom.xml
index 02a5baa..43cca85 100755
--- a/apps/evpnopenflow/pom.xml
+++ b/apps/evpnopenflow/pom.xml
@@ -107,7 +107,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-route-service-api</artifactId>
+            <artifactId>onos-apps-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/pim/pom.xml b/apps/pim/pom.xml
index 4ceef0e..d674ba8 100644
--- a/apps/pim/pom.xml
+++ b/apps/pim/pom.xml
@@ -87,7 +87,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-route-service-api</artifactId>
+            <artifactId>onos-apps-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/route-service/api/pom.xml b/apps/route-service/api/pom.xml
index f136855..6d048da 100644
--- a/apps/route-service/api/pom.xml
+++ b/apps/route-service/api/pom.xml
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>onos-app-route-service</artifactId>
+        <artifactId>onos-apps-route-service</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.11.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-route-service-api</artifactId>
+    <artifactId>onos-apps-route-service-api</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
diff --git a/apps/route-service/app/app.xml b/apps/route-service/app/app.xml
index a561826..e01e0f8 100644
--- a/apps/route-service/app/app.xml
+++ b/apps/route-service/app/app.xml
@@ -20,5 +20,5 @@
      features="${project.artifactId}">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-route-service-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-route-service-api/${project.version}</artifact>
 </app>
diff --git a/apps/route-service/app/features.xml b/apps/route-service/app/features.xml
index 4cc99bd..165bee4 100644
--- a/apps/route-service/app/features.xml
+++ b/apps/route-service/app/features.xml
@@ -18,7 +18,7 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-app-route-service-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-route-service/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-route-service-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-route-service/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/route-service/app/pom.xml b/apps/route-service/app/pom.xml
index 9428fb2..07b82d5 100644
--- a/apps/route-service/app/pom.xml
+++ b/apps/route-service/app/pom.xml
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>onos-app-route-service</artifactId>
+        <artifactId>onos-apps-route-service</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.11.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-route-service-app</artifactId>
+    <artifactId>onos-apps-route-service-app</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-route-service-api</artifactId>
+            <artifactId>onos-apps-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/route-service/pom.xml b/apps/route-service/pom.xml
index d9383df..4d3c00e 100644
--- a/apps/route-service/pom.xml
+++ b/apps/route-service/pom.xml
@@ -25,7 +25,7 @@
         <version>1.11.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-route-service</artifactId>
+    <artifactId>onos-apps-route-service</artifactId>
     <packaging>pom</packaging>
 
     <description>Route Service Application</description>
diff --git a/apps/routing/common/pom.xml b/apps/routing/common/pom.xml
index 47840c9..8e9a42e 100644
--- a/apps/routing/common/pom.xml
+++ b/apps/routing/common/pom.xml
@@ -88,7 +88,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-route-service-api</artifactId>
+            <artifactId>onos-apps-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/routing/fibinstaller/pom.xml b/apps/routing/fibinstaller/pom.xml
index 91213f7..8f1d613 100644
--- a/apps/routing/fibinstaller/pom.xml
+++ b/apps/routing/fibinstaller/pom.xml
@@ -26,12 +26,21 @@
 
     <artifactId>onos-apps-routing-fibinstaller</artifactId>
     <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-route-service-api</artifactId>
+            <artifactId>onos-apps-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-route-service-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
     </dependencies>
 
 
diff --git a/apps/routing/fpm/pom.xml b/apps/routing/fpm/pom.xml
index 37c81d8..6301265 100644
--- a/apps/routing/fpm/pom.xml
+++ b/apps/routing/fpm/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-route-service-api</artifactId>
+            <artifactId>onos-apps-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/sdnip/pom.xml b/apps/sdnip/pom.xml
index 4bbbf5b..d21e654 100644
--- a/apps/sdnip/pom.xml
+++ b/apps/sdnip/pom.xml
@@ -90,6 +90,14 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-route-service-api</artifactId>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
             <artifactId>onos-cli</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/apps/segmentrouting/pom.xml b/apps/segmentrouting/pom.xml
index 50149a0..ab0b62e 100644
--- a/apps/segmentrouting/pom.xml
+++ b/apps/segmentrouting/pom.xml
@@ -109,7 +109,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-route-service-api</artifactId>
+            <artifactId>onos-apps-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>