diff --git a/apps/acl/pom.xml b/apps/acl/pom.xml
index a764c38..a24c676 100644
--- a/apps/acl/pom.xml
+++ b/apps/acl/pom.xml
@@ -29,7 +29,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-acl</artifactId>
+    <artifactId>onos-apps-acl</artifactId>
     <version>1.14.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
diff --git a/apps/actn-mdsc/actn-mdscapp/features.xml b/apps/actn-mdsc/actn-mdscapp/features.xml
index 0cb3d9d..7466bc9 100644
--- a/apps/actn-mdsc/actn-mdscapp/features.xml
+++ b/apps/actn-mdsc/actn-mdscapp/features.xml
@@ -18,8 +18,8 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <feature>onos-app-tetopology</feature>
-        <feature>onos-app-tetunnel</feature>
+        <feature>onos-apps-tetopology-app</feature>
+        <feature>onos-apps-tetunnel-app</feature>
         <bundle>mvn:${project.groupId}/onos-actn-mdsc-tetunnel-pce/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-actn-mdsc-tetunnel-ctl/${project.version}</bundle>
     </feature>
diff --git a/apps/actn-mdsc/tetunnel-ctl/pom.xml b/apps/actn-mdsc/tetunnel-ctl/pom.xml
index 3ab260a..ef20bba 100644
--- a/apps/actn-mdsc/tetunnel-ctl/pom.xml
+++ b/apps/actn-mdsc/tetunnel-ctl/pom.xml
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetunnel-api</artifactId>
+            <artifactId>onos-apps-tetunnel-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/actn-mdsc/tetunnel-pce/pom.xml b/apps/actn-mdsc/tetunnel-pce/pom.xml
index 04819a7..8c615bf 100644
--- a/apps/actn-mdsc/tetunnel-pce/pom.xml
+++ b/apps/actn-mdsc/tetunnel-pce/pom.xml
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetunnel-api</artifactId>
+            <artifactId>onos-apps-tetunnel-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/bgprouter/app.xml b/apps/bgprouter/app.xml
index 88b38df..c1c2aa7 100644
--- a/apps/bgprouter/app.xml
+++ b/apps/bgprouter/app.xml
@@ -20,6 +20,6 @@
      features="${project.artifactId}" apps="fibinstaller">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-routing-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-routing/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-routing-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-routing-common/${project.version}</artifact>
 </app>
diff --git a/apps/bgprouter/features.xml b/apps/bgprouter/features.xml
index fe1c0cd..aeba2fd 100644
--- a/apps/bgprouter/features.xml
+++ b/apps/bgprouter/features.xml
@@ -18,9 +18,9 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-app-routing-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-proxyarp/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-bgprouter/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-routing/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-routing-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-proxyarp/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-bgprouter/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-routing-common/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/bgprouter/pom.xml b/apps/bgprouter/pom.xml
index 407e369..89ee89c 100644
--- a/apps/bgprouter/pom.xml
+++ b/apps/bgprouter/pom.xml
@@ -23,7 +23,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>onos-app-bgprouter</artifactId>
+    <artifactId>onos-apps-bgprouter</artifactId>
 
     <packaging>bundle</packaging>
     <description>BGP router application</description>
@@ -31,13 +31,13 @@
     <dependencies>
       <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing</artifactId>
+            <artifactId>onos-apps-routing-common</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing-api</artifactId>
+            <artifactId>onos-apps-routing-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -58,7 +58,7 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-proxyarp</artifactId>
+            <artifactId>onos-apps-proxyarp</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/apps/castor/app.xml b/apps/castor/app.xml
index 5e6a427..fe1aab7 100644
--- a/apps/castor/app.xml
+++ b/apps/castor/app.xml
@@ -20,6 +20,6 @@
      features="${project.artifactId}">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-routing-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-routing/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-routing-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-routing-common/${project.version}</artifact>
 </app>
diff --git a/apps/castor/features.xml b/apps/castor/features.xml
index 5478f5d..0ddd35b 100644
--- a/apps/castor/features.xml
+++ b/apps/castor/features.xml
@@ -15,11 +15,11 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-    <feature name="onos-app-castor" version="${project.version}"
+    <feature name="onos-apps-castor" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-app-castor/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-routing-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-routing/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-castor/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-routing-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-routing-common/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/cfm/pom.xml b/apps/cfm/pom.xml
index 5ca7ab3..811e45a 100644
--- a/apps/cfm/pom.xml
+++ b/apps/cfm/pom.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Copyright 2017 Open Networking Laboratory ~ ~ Licensed under the Apache
-    License, Version 2.0 (the "License"); ~ you may not use this file except
-    in compliance with the License. ~ You may obtain a copy of the License at
-    ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable
-    law or agreed to in writing, software ~ distributed under the License is
-    distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. ~ See the License for the specific language
-    governing permissions and ~ limitations under the License. -->
+<!--
+  ~ Copyright 2017-present Open Networking Foundation
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
diff --git a/apps/cip/pom.xml b/apps/cip/pom.xml
index f342faf..fbf38c3 100644
--- a/apps/cip/pom.xml
+++ b/apps/cip/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-cip</artifactId>
+    <artifactId>onos-apps-cip</artifactId>
     <packaging>bundle</packaging>
 
     <description>Cluster IP alias</description>
diff --git a/apps/cpman/api/pom.xml b/apps/cpman/api/pom.xml
index d9cedf2..5cd72ea 100644
--- a/apps/cpman/api/pom.xml
+++ b/apps/cpman/api/pom.xml
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>onos-cpman</artifactId>
+        <artifactId>onos-apps-cpman</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-cpman-api</artifactId>
+    <artifactId>onos-apps-cpman-api</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
diff --git a/apps/cpman/app/app.xml b/apps/cpman/app/app.xml
index 0185280..6e602ad 100644
--- a/apps/cpman/app/app.xml
+++ b/apps/cpman/app/app.xml
@@ -19,6 +19,6 @@
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}" apps="org.onosproject.openflow-message">
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-app-cpman/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-cpman-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-cpman-app/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-cpman-api/${project.version}</artifact>
 </app>
diff --git a/apps/cpman/app/features.xml b/apps/cpman/app/features.xml
index 9151fe2..5e845e5 100644
--- a/apps/cpman/app/features.xml
+++ b/apps/cpman/app/features.xml
@@ -18,8 +18,8 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-app-cpman-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-cpman/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-cpman-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-cpman/${project.version}</bundle>
         <bundle>wrap:mvn:org.rrd4j/rrd4j/3.1$Bundle-SymbolicName=rrd4j&amp;Bundle-Version=3.1</bundle>
     </feature>
 </features>
diff --git a/apps/cpman/app/pom.xml b/apps/cpman/app/pom.xml
index 860fdae..6647e81 100644
--- a/apps/cpman/app/pom.xml
+++ b/apps/cpman/app/pom.xml
@@ -20,11 +20,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-cpman</artifactId>
+        <artifactId>onos-apps-cpman</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-cpman</artifactId>
+    <artifactId>onos-apps-cpman-app</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
@@ -44,7 +44,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-cpman-api</artifactId>
+            <artifactId>onos-apps-cpman-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/cpman/pom.xml b/apps/cpman/pom.xml
index 8a6b66a..ec7627c 100644
--- a/apps/cpman/pom.xml
+++ b/apps/cpman/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-cpman</artifactId>
+    <artifactId>onos-apps-cpman</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS CPMan applications</description>
diff --git a/apps/dhcp/api/pom.xml b/apps/dhcp/api/pom.xml
index 72e1a1e..326e5f8 100644
--- a/apps/dhcp/api/pom.xml
+++ b/apps/dhcp/api/pom.xml
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>onos-dhcp</artifactId>
+        <artifactId>onos-apps-dhcp</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-dhcp-api</artifactId>
+    <artifactId>onos-apps-dhcp-api</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
diff --git a/apps/dhcp/app/app.xml b/apps/dhcp/app/app.xml
index 3fe4eff..575ed41 100644
--- a/apps/dhcp/app/app.xml
+++ b/apps/dhcp/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-dhcp-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-dhcp-api/${project.version}</artifact>
 </app>
diff --git a/apps/dhcp/app/features.xml b/apps/dhcp/app/features.xml
index f73d53c..11a6a7e 100644
--- a/apps/dhcp/app/features.xml
+++ b/apps/dhcp/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-dhcp-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-dhcp/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-dhcp-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-dhcp/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/dhcp/app/pom.xml b/apps/dhcp/app/pom.xml
index e500ad8..8d9fcde 100644
--- a/apps/dhcp/app/pom.xml
+++ b/apps/dhcp/app/pom.xml
@@ -19,12 +19,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>onos-dhcp</artifactId>
+        <artifactId>onos-apps-dhcp</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-dhcp</artifactId>
+    <artifactId>onos-apps-dhcp-app</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
@@ -44,7 +44,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-dhcp-api</artifactId>
+            <artifactId>onos-apps-dhcp-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/dhcp/pom.xml b/apps/dhcp/pom.xml
index 3ffc83c..36178c9 100644
--- a/apps/dhcp/pom.xml
+++ b/apps/dhcp/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-dhcp</artifactId>
+    <artifactId>onos-apps-dhcp</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS sample applications</description>
diff --git a/apps/dhcprelay/pom.xml b/apps/dhcprelay/pom.xml
index 383ecdd..8d68296 100644
--- a/apps/dhcprelay/pom.xml
+++ b/apps/dhcprelay/pom.xml
@@ -24,7 +24,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-app-dhcprelay</artifactId>
+    <artifactId>onos-apps-dhcprelay</artifactId>
     <packaging>bundle</packaging>
 
     <description>DHCP Relay Agent</description>
diff --git a/apps/drivermatrix/pom.xml b/apps/drivermatrix/pom.xml
index c3110b8..591d142 100644
--- a/apps/drivermatrix/pom.xml
+++ b/apps/drivermatrix/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-drivermatrix</artifactId>
+    <artifactId>onos-apps-drivermatrix</artifactId>
     <packaging>bundle</packaging>
 
     <description>Driver behaviour support matrix</description>
diff --git a/apps/evpn-route-service/api/pom.xml b/apps/evpn-route-service/api/pom.xml
index 1e28818..7d554d7 100644
--- a/apps/evpn-route-service/api/pom.xml
+++ b/apps/evpn-route-service/api/pom.xml
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>onos-app-evpn-route-service</artifactId>
+        <artifactId>onos-apps-evpn-route-service</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-evpn-route-service-api</artifactId>
+    <artifactId>onos-apps-evpn-route-service-api</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
diff --git a/apps/evpn-route-service/app/pom.xml b/apps/evpn-route-service/app/pom.xml
index 489b028..185dd07 100644
--- a/apps/evpn-route-service/app/pom.xml
+++ b/apps/evpn-route-service/app/pom.xml
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>onos-app-evpn-route-service</artifactId>
+        <artifactId>onos-apps-evpn-route-service</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-evpn-route-service-app</artifactId>
+    <artifactId>onos-apps-evpn-route-service-app</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-evpn-route-service-api</artifactId>
+            <artifactId>onos-apps-evpn-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/apps/evpn-route-service/pom.xml b/apps/evpn-route-service/pom.xml
index 3db3a15..4b9515a 100644
--- a/apps/evpn-route-service/pom.xml
+++ b/apps/evpn-route-service/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-evpn-route-service</artifactId>
+    <artifactId>onos-apps-evpn-route-service</artifactId>
     <packaging>pom</packaging>
 
     <description>EVPN Routing Application</description>
diff --git a/apps/evpnopenflow/pom.xml b/apps/evpnopenflow/pom.xml
index d5cdbb4..4e41468 100644
--- a/apps/evpnopenflow/pom.xml
+++ b/apps/evpnopenflow/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-evpnopenflow</artifactId>
+    <artifactId>onos-apps-evpnopenflow</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS EVPN application</description>
@@ -96,12 +96,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-gluon</artifactId>
+            <artifactId>onos-apps-gluon</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-vtn-rsc</artifactId>
+            <artifactId>onos-apps-vtn-vtnrsc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -111,7 +111,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-evpn-route-service-api</artifactId>
+            <artifactId>onos-apps-evpn-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/faultmanagement/app/app.xml b/apps/faultmanagement/app/app.xml
index d152314..33c2653 100644
--- a/apps/faultmanagement/app/app.xml
+++ b/apps/faultmanagement/app/app.xml
@@ -19,8 +19,8 @@
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-app-fm-mgr/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-fm-web/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-fm-gui/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-fm-cli/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-faultmanagement-fmmgr/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-faultmanagement-fmweb/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-faultmanagement-fmgui/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-faultmanagement-fmcli/${project.version}</artifact>
 </app>
diff --git a/apps/faultmanagement/app/features.xml b/apps/faultmanagement/app/features.xml
index da75d4a..313e46d 100644
--- a/apps/faultmanagement/app/features.xml
+++ b/apps/faultmanagement/app/features.xml
@@ -19,9 +19,9 @@
              description="${project.description}">
         <feature>onos-api</feature>
         <feature>onos-drivers-default</feature>
-        <bundle>mvn:${project.groupId}/onos-app-fm-mgr/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-fm-web/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-fm-gui/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-fm-cli/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-faultmanagement-fmmgr/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-faultmanagement-fmweb/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-faultmanagement-fmgui/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-faultmanagement-fmcli/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/faultmanagement/app/pom.xml b/apps/faultmanagement/app/pom.xml
index 380cd7d..0e22423 100644
--- a/apps/faultmanagement/app/pom.xml
+++ b/apps/faultmanagement/app/pom.xml
@@ -20,11 +20,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-fm</artifactId>
+        <artifactId>onos-apps-faultmanagement</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-fm-onosfw</artifactId>
+    <artifactId>onos-apps-faultmanagement-app</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS fault management application</description>
@@ -32,22 +32,22 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-fm-web</artifactId>
+            <artifactId>onos-apps-faultmanagement-fmweb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-fm-mgr</artifactId>
+            <artifactId>onos-apps-faultmanagement-fmmgr</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-fm-gui</artifactId>
+            <artifactId>onos-apps-faultmanagement-fmgui</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-fm-cli</artifactId>
+            <artifactId>onos-apps-faultmanagement-fmcli</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/faultmanagement/fmcli/pom.xml b/apps/faultmanagement/fmcli/pom.xml
index cc504d4..2b186ba 100644
--- a/apps/faultmanagement/fmcli/pom.xml
+++ b/apps/faultmanagement/fmcli/pom.xml
@@ -23,11 +23,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-fm</artifactId>
+        <artifactId>onos-apps-faultmanagement</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-fm-cli</artifactId>
+    <artifactId>onos-apps-faultmanagement-fmcli</artifactId>
     <packaging>bundle</packaging>
     <dependencies>
         <dependency>
diff --git a/apps/faultmanagement/fmgui/pom.xml b/apps/faultmanagement/fmgui/pom.xml
index 347772c..f9b7e08 100644
--- a/apps/faultmanagement/fmgui/pom.xml
+++ b/apps/faultmanagement/fmgui/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-fm</artifactId>
+        <artifactId>onos-apps-faultmanagement</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-fm-gui</artifactId>
+    <artifactId>onos-apps-faultmanagement-fmgui</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/apps/faultmanagement/fmmgr/pom.xml b/apps/faultmanagement/fmmgr/pom.xml
index c3a4c4a..abe5520 100644
--- a/apps/faultmanagement/fmmgr/pom.xml
+++ b/apps/faultmanagement/fmmgr/pom.xml
@@ -21,11 +21,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-fm</artifactId>
+        <artifactId>onos-apps-faultmanagement</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-fm-mgr</artifactId>
+    <artifactId>onos-apps-faultmanagement-fmmgr</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/apps/faultmanagement/fmweb/pom.xml b/apps/faultmanagement/fmweb/pom.xml
index d8c8e6c..ade9199 100644
--- a/apps/faultmanagement/fmweb/pom.xml
+++ b/apps/faultmanagement/fmweb/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-fm</artifactId>
+        <artifactId>onos-apps-faultmanagement</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
 
-    <artifactId>onos-app-fm-web</artifactId>
+    <artifactId>onos-apps-faultmanagement-fmweb</artifactId>
     <packaging>bundle</packaging>
     <properties>
         <web.context>/onos/v1/fm</web.context>
diff --git a/apps/faultmanagement/pom.xml b/apps/faultmanagement/pom.xml
index b7f54bc..981e587 100644
--- a/apps/faultmanagement/pom.xml
+++ b/apps/faultmanagement/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-fm</artifactId>
+    <artifactId>onos-apps-faultmanagement</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS framework applications</description>
diff --git a/apps/flowanalyzer/pom.xml b/apps/flowanalyzer/pom.xml
index a56a684..770ff64 100644
--- a/apps/flowanalyzer/pom.xml
+++ b/apps/flowanalyzer/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-flowanalyzer</artifactId>
+    <artifactId>onos-apps-flowanalyzer</artifactId>
     <packaging>bundle</packaging>
 
     <description>Simple flow space analyzer</description>
diff --git a/apps/flowspec-api/flowapi/pom.xml b/apps/flowspec-api/flowapi/pom.xml
index c6c84a1..fc2313f 100644
--- a/apps/flowspec-api/flowapi/pom.xml
+++ b/apps/flowspec-api/flowapi/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-flowspec-api</artifactId>
+        <artifactId>onos-apps-flowspec-api</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-flowspec-api-flowapi</artifactId>
+    <artifactId>onos-apps-flowspec-api-flowapi</artifactId>
     <packaging>bundle</packaging>
 
     <description>api bundle to be accessible across the layers</description>
diff --git a/apps/flowspec-api/pom.xml b/apps/flowspec-api/pom.xml
index aa6390e..9ee10d2 100644
--- a/apps/flowspec-api/pom.xml
+++ b/apps/flowspec-api/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-flowspec-api</artifactId>
+    <artifactId>onos-apps-flowspec-api</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS flow spec applications</description>
diff --git a/apps/fwd/pom.xml b/apps/fwd/pom.xml
index 4839672..902213c 100644
--- a/apps/fwd/pom.xml
+++ b/apps/fwd/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-fwd</artifactId>
+    <artifactId>onos-apps-fwd</artifactId>
     <packaging>bundle</packaging>
 
     <description>Reactive forwarding application using flow subsystem</description>
diff --git a/apps/gangliametrics/features.xml b/apps/gangliametrics/features.xml
index 98b6fb4..07a5d42 100644
--- a/apps/gangliametrics/features.xml
+++ b/apps/gangliametrics/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-ganglia/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-gangliametrics/${project.version}</bundle>
         <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.2</bundle>
         <bundle>mvn:io.dropwizard.metrics/metrics-ganglia/3.1.2</bundle>
         <bundle>mvn:info.ganglia.gmetric4j/gmetric4j/1.0.10</bundle>
diff --git a/apps/gangliametrics/pom.xml b/apps/gangliametrics/pom.xml
index 3d058eb..9ee27f3 100644
--- a/apps/gangliametrics/pom.xml
+++ b/apps/gangliametrics/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-ganglia</artifactId>
+    <artifactId>onos-apps-gangliametrics</artifactId>
     <packaging>bundle</packaging>
 
     <description>Performance metric service reporter</description>
diff --git a/apps/gluon/pom.xml b/apps/gluon/pom.xml
index cedde11..74f43a1 100644
--- a/apps/gluon/pom.xml
+++ b/apps/gluon/pom.xml
@@ -24,7 +24,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-gluon</artifactId>
+    <artifactId>onos-apps-gluon</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS GLUON application</description>
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.app.name>onos-app-gluon</onos.app.name>
+        <onos.app.name>onos-apps-gluon</onos.app.name>
         <onos.app.origin>Huawei Technology India Pvt Ltd</onos.app.origin>
         <onos.app.title>Gluon App</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/apps/graphitemetrics/features.xml b/apps/graphitemetrics/features.xml
index 7394e12..12a9934 100644
--- a/apps/graphitemetrics/features.xml
+++ b/apps/graphitemetrics/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-graphite/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-graphitemetrics/${project.version}</bundle>
         <bundle>mvn:io.dropwizard.metrics/metrics-core/3.2.2</bundle>
         <bundle>mvn:io.dropwizard.metrics/metrics-graphite/3.2.2</bundle>
     </feature>
diff --git a/apps/graphitemetrics/pom.xml b/apps/graphitemetrics/pom.xml
index b0237bb..366d4e6 100644
--- a/apps/graphitemetrics/pom.xml
+++ b/apps/graphitemetrics/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-graphite</artifactId>
+    <artifactId>onos-apps-graphitemetrics</artifactId>
     <packaging>bundle</packaging>
 
     <description>Performance metric service reporter and retriever for graphite</description>
diff --git a/apps/influxdbmetrics/features.xml b/apps/influxdbmetrics/features.xml
index 6806637..5cd8850 100644
--- a/apps/influxdbmetrics/features.xml
+++ b/apps/influxdbmetrics/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-influxdb/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-influxdbmetrics/${project.version}</bundle>
         <bundle>wrap:mvn:com.izettle/metrics-influxdb/1.1.1$Bundle-SymbolicName=metrics-influxdb&amp;Bundle-Version=1.1.1</bundle>
         <bundle>mvn:commons-codec/commons-codec/1.10</bundle>
         <bundle>wrap:mvn:org.influxdb/influxdb-java/2.1$Bundle-SymbolicName=influxdb-java&amp;Bundle-Version=2.1</bundle>
diff --git a/apps/influxdbmetrics/pom.xml b/apps/influxdbmetrics/pom.xml
index 979f368..76b76c8 100644
--- a/apps/influxdbmetrics/pom.xml
+++ b/apps/influxdbmetrics/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-influxdb</artifactId>
+    <artifactId>onos-apps-influxdbmetrics</artifactId>
     <packaging>bundle</packaging>
 
     <description>Performance metric service reporter and retriever for influxDB</description>
diff --git a/apps/iptopology-api/pom.xml b/apps/iptopology-api/pom.xml
index 9c0809d..01f3e57 100644
--- a/apps/iptopology-api/pom.xml
+++ b/apps/iptopology-api/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>onos-apps</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
-    <artifactId>onos-app-iptopology-api</artifactId>
+    <artifactId>onos-apps-iptopology-api</artifactId>
     <packaging>bundle</packaging>
 
     <description>IP Layer Topology API</description>
diff --git a/apps/kafka-integration/api/pom.xml b/apps/kafka-integration/api/pom.xml
index 8257cf4..23d8a20 100644
--- a/apps/kafka-integration/api/pom.xml
+++ b/apps/kafka-integration/api/pom.xml
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>onos-kafka</artifactId>
+        <artifactId>onos-apps-kafka-integration</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-kafka-api</artifactId>
+    <artifactId>onos-apps-kafka-integration-api</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
diff --git a/apps/kafka-integration/app/app.xml b/apps/kafka-integration/app/app.xml
index 96b5458..1cfbf18 100644
--- a/apps/kafka-integration/app/app.xml
+++ b/apps/kafka-integration/app/app.xml
@@ -19,7 +19,7 @@
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}" apps="org.onosproject.incubator.protobuf">
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-app-kafka-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-kafka-app/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-kafka-integration-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-kafka-integration-app/${project.version}</artifact>
     <artifact>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/0.8.2.2_1</artifact>
 </app>
diff --git a/apps/kafka-integration/app/features.xml b/apps/kafka-integration/app/features.xml
index c615f60..924d868 100644
--- a/apps/kafka-integration/app/features.xml
+++ b/apps/kafka-integration/app/features.xml
@@ -18,8 +18,8 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-app-kafka-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-kafka-app/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-kafka-integration-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-kafka-integration-app/${project.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/0.8.2.2_1</bundle>
     </feature>
 </features>
diff --git a/apps/kafka-integration/app/pom.xml b/apps/kafka-integration/app/pom.xml
index bfc134a..8fb7640 100644
--- a/apps/kafka-integration/app/pom.xml
+++ b/apps/kafka-integration/app/pom.xml
@@ -20,12 +20,12 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-kafka</artifactId>
+        <artifactId>onos-apps-kafka-integration</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-app-kafka-app</artifactId>
+    <artifactId>onos-apps-kafka-integration-app</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-kafka-api</artifactId>
+            <artifactId>onos-apps-kafka-integration-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/apps/kafka-integration/pom.xml b/apps/kafka-integration/pom.xml
index 1337c50..b697a66 100644
--- a/apps/kafka-integration/pom.xml
+++ b/apps/kafka-integration/pom.xml
@@ -24,7 +24,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-kafka</artifactId>
+    <artifactId>onos-apps-kafka-integration</artifactId>
 
     <packaging>pom</packaging>
     <description>Kafka Integration Application</description>
diff --git a/apps/layout/pom.xml b/apps/layout/pom.xml
index 6b54e46..2e6630e 100644
--- a/apps/layout/pom.xml
+++ b/apps/layout/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-layout</artifactId>
+    <artifactId>onos-apps-layout</artifactId>
     <packaging>bundle</packaging>
 
     <description>Lays out topology views</description>
diff --git a/apps/mappingmanagement/api/pom.xml b/apps/mappingmanagement/api/pom.xml
index f5b3c73..9827026 100644
--- a/apps/mappingmanagement/api/pom.xml
+++ b/apps/mappingmanagement/api/pom.xml
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>onos-mapping</artifactId>
+        <artifactId>onos-apps-mappingmanagement</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-mapping-api</artifactId>
+    <artifactId>onos-apps-mappingmanagement-api</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
diff --git a/apps/mappingmanagement/app/app.xml b/apps/mappingmanagement/app/app.xml
index cab9f68..78ac759 100644
--- a/apps/mappingmanagement/app/app.xml
+++ b/apps/mappingmanagement/app/app.xml
@@ -19,8 +19,8 @@
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-mapping-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-mapping-mgr/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-mapping-web/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-mapping-cli/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-mappingmanagement-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-mappingmanagement-mgr/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-mappingmanagement-web/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-mappingmanagement-cli/${project.version}</artifact>
 </app>
diff --git a/apps/mappingmanagement/app/features.xml b/apps/mappingmanagement/app/features.xml
index 8fd5e28..a3deefd 100644
--- a/apps/mappingmanagement/app/features.xml
+++ b/apps/mappingmanagement/app/features.xml
@@ -18,9 +18,9 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-mapping-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-mapping-mgr/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-mapping-web/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-mapping-cli/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-mappingmanagement-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-mappingmanagement-mgr/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-mappingmanagement-web/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-mappingmanagement-cli/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/mappingmanagement/app/pom.xml b/apps/mappingmanagement/app/pom.xml
index 28b618b..5b6ec88 100644
--- a/apps/mappingmanagement/app/pom.xml
+++ b/apps/mappingmanagement/app/pom.xml
@@ -20,11 +20,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-mapping</artifactId>
+        <artifactId>onos-apps-mappingmanagement</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-mapping</artifactId>
+    <artifactId>onos-apps-mappingmanagement-app</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS LISP mapping management application</description>
@@ -32,22 +32,22 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-mapping-api</artifactId>
+            <artifactId>onos-apps-mappingmanagement-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-mapping-web</artifactId>
+            <artifactId>onos-apps-mappingmanagement-web</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-mapping-mgr</artifactId>
+            <artifactId>onos-apps-mappingmanagement-mgr</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-mapping-cli</artifactId>
+            <artifactId>onos-apps-mappingmanagement-cli</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/mappingmanagement/cli/pom.xml b/apps/mappingmanagement/cli/pom.xml
index 572f1d5..56c971e 100644
--- a/apps/mappingmanagement/cli/pom.xml
+++ b/apps/mappingmanagement/cli/pom.xml
@@ -23,16 +23,16 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-mapping</artifactId>
+        <artifactId>onos-apps-mappingmanagement</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-mapping-cli</artifactId>
+    <artifactId>onos-apps-mappingmanagement-cli</artifactId>
     <packaging>bundle</packaging>
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-mapping-api</artifactId>
+            <artifactId>onos-apps-mappingmanagement-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/mappingmanagement/mgr/pom.xml b/apps/mappingmanagement/mgr/pom.xml
index efd7916..e69e3b2 100644
--- a/apps/mappingmanagement/mgr/pom.xml
+++ b/apps/mappingmanagement/mgr/pom.xml
@@ -21,17 +21,17 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-mapping</artifactId>
+        <artifactId>onos-apps-mappingmanagement</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-mapping-mgr</artifactId>
+    <artifactId>onos-apps-mappingmanagement-mgr</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-mapping-api</artifactId>
+            <artifactId>onos-apps-mappingmanagement-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/mappingmanagement/pom.xml b/apps/mappingmanagement/pom.xml
index 75fd4f0..3387dd2 100644
--- a/apps/mappingmanagement/pom.xml
+++ b/apps/mappingmanagement/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-mapping</artifactId>
+    <artifactId>onos-apps-mappingmanagement</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS LISP Mapping Management application.</description>
diff --git a/apps/mappingmanagement/web/pom.xml b/apps/mappingmanagement/web/pom.xml
index 1d6f886..4618465 100644
--- a/apps/mappingmanagement/web/pom.xml
+++ b/apps/mappingmanagement/web/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-mapping</artifactId>
+        <artifactId>onos-apps-mappingmanagement</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
 
-    <artifactId>onos-app-mapping-web</artifactId>
+    <artifactId>onos-apps-mappingmanagement-web</artifactId>
     <packaging>bundle</packaging>
     <properties>
         <web.context>/onos/v1/mm</web.context>
@@ -41,7 +41,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-mapping-api</artifactId>
+            <artifactId>onos-apps-mappingmanagement-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/metrics/pom.xml b/apps/metrics/pom.xml
index a5a8be7..2207615 100644
--- a/apps/metrics/pom.xml
+++ b/apps/metrics/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-metrics</artifactId>
+    <artifactId>onos-apps-metrics</artifactId>
     <packaging>bundle</packaging>
 
     <description>Performance metrics collection</description>
diff --git a/apps/mfwd/pom.xml b/apps/mfwd/pom.xml
index 5dbd06b..c7a8966 100644
--- a/apps/mfwd/pom.xml
+++ b/apps/mfwd/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-mfwd</artifactId>
+    <artifactId>onos-apps-mfwd</artifactId>
     <packaging>bundle</packaging>
 
     <description>Multicast forwarding application</description>
diff --git a/apps/mlb/pom.xml b/apps/mlb/pom.xml
index 7242788..fb36576 100644
--- a/apps/mlb/pom.xml
+++ b/apps/mlb/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-mlb</artifactId>
+    <artifactId>onos-apps-mlb</artifactId>
     <packaging>bundle</packaging>
 
     <description>Balances mastership among nodes</description>
diff --git a/apps/mobility/pom.xml b/apps/mobility/pom.xml
index d10483d..7447d90 100644
--- a/apps/mobility/pom.xml
+++ b/apps/mobility/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-mobility</artifactId>
+    <artifactId>onos-apps-mobility</artifactId>
     <packaging>bundle</packaging>
 
     <description>Host mobility application</description>
diff --git a/apps/newoptical/pom.xml b/apps/newoptical/pom.xml
index 3af755e..a8319ce 100644
--- a/apps/newoptical/pom.xml
+++ b/apps/newoptical/pom.xml
@@ -23,7 +23,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-newoptical</artifactId>
+    <artifactId>onos-apps-newoptical</artifactId>
     <packaging>bundle</packaging>
 
     <description>Application for setup optical network</description>
diff --git a/apps/ofagent/pom.xml b/apps/ofagent/pom.xml
index 90a00d9..d488967 100644
--- a/apps/ofagent/pom.xml
+++ b/apps/ofagent/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-ofagent</artifactId>
+    <artifactId>onos-apps-ofagent</artifactId>
     <packaging>bundle</packaging>
 
     <description>OpenFlow agent for virtual subsystem</description>
diff --git a/apps/packet-stats/pom.xml b/apps/packet-stats/pom.xml
index 1417779..13e7f4b 100644
--- a/apps/packet-stats/pom.xml
+++ b/apps/packet-stats/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-packet-stats</artifactId>
+    <artifactId>onos-apps-packet-stats</artifactId>
     <packaging>bundle</packaging>
 
     <description>Packet Statistics application using flow subsystem</description>
diff --git a/apps/pathpainter/pom.xml b/apps/pathpainter/pom.xml
index d131eb2..cbce0ce 100644
--- a/apps/pathpainter/pom.xml
+++ b/apps/pathpainter/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-pp</artifactId>
+    <artifactId>onos-apps-pathpainter</artifactId>
     <packaging>bundle</packaging>
 
     <description>Path visualization application</description>
diff --git a/apps/pce/app/pom.xml b/apps/pce/app/pom.xml
index b81279d..83c7690 100644
--- a/apps/pce/app/pom.xml
+++ b/apps/pce/app/pom.xml
@@ -112,7 +112,7 @@
        </dependency>
        <dependency>
            <groupId>org.onosproject</groupId>
-           <artifactId>onos-app-bandwidthmgmt</artifactId>
+           <artifactId>onos-apps-pce-bandwidthmgmt</artifactId>
            <version>${project.version}</version>
        </dependency>
    </dependencies>
diff --git a/apps/pce/bandwidthmgmt/pom.xml b/apps/pce/bandwidthmgmt/pom.xml
index b6a8e8a..8bda14f 100644
--- a/apps/pce/bandwidthmgmt/pom.xml
+++ b/apps/pce/bandwidthmgmt/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>onos-apps-pce</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
-    <artifactId>onos-app-bandwidthmgmt</artifactId>
+    <artifactId>onos-apps-pce-bandwidthmgmt</artifactId>
     <packaging>bundle</packaging>
 
     <description>PCE Bandwidth management</description>
diff --git a/apps/pim/pom.xml b/apps/pim/pom.xml
index b2c4df3..d843bc3 100644
--- a/apps/pim/pom.xml
+++ b/apps/pim/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-pim</artifactId>
+    <artifactId>onos-apps-pim</artifactId>
     <packaging>bundle</packaging>
 
     <description>Protocol Independent Multicast Emulation</description>
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing-api</artifactId>
+            <artifactId>onos-apps-routing-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/apps/pom.xml b/apps/pom.xml
index 5588fc5..eb60235 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -104,6 +104,7 @@
         <module>mcast</module>
         <module>layout</module>
         <module>imr</module>
+        <module>t3</module>
     </modules>
 
     <properties>
diff --git a/apps/proxyarp/pom.xml b/apps/proxyarp/pom.xml
index c7078a5..55a9fb0 100644
--- a/apps/proxyarp/pom.xml
+++ b/apps/proxyarp/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-proxyarp</artifactId>
+    <artifactId>onos-apps-proxyarp</artifactId>
     <packaging>bundle</packaging>
 
     <description>Proxy ARP/NDP application</description>
diff --git a/apps/rabbitmq/pom.xml b/apps/rabbitmq/pom.xml
index 124ca8b..3033418 100644
--- a/apps/rabbitmq/pom.xml
+++ b/apps/rabbitmq/pom.xml
@@ -15,7 +15,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>onos-app-rabbitmq</artifactId>
+    <artifactId>onos-apps-rabbitmq</artifactId>
     <packaging>bundle</packaging>
     <description>Rabbit MQ application</description>
     <properties>
diff --git a/apps/reactive-routing/features.xml b/apps/reactive-routing/features.xml
index 86a308e..2158a68 100644
--- a/apps/reactive-routing/features.xml
+++ b/apps/reactive-routing/features.xml
@@ -15,11 +15,11 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-    <feature name="onos-app-reactive-routing" version="${project.version}"
+    <feature name="onos-apps-reactive-routing" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-app-reactive-routing/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-routing-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-routing/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-reactive-routing/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-routing-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-routing-common/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/reactive-routing/pom.xml b/apps/reactive-routing/pom.xml
index 77ae35d..1f0490e 100644
--- a/apps/reactive-routing/pom.xml
+++ b/apps/reactive-routing/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-reactive-routing</artifactId>
+    <artifactId>onos-apps-reactive-routing</artifactId>
     <packaging>bundle</packaging>
 
     <description>SDN-IP reactive routing application</description>
@@ -41,13 +41,13 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing-api</artifactId>
+            <artifactId>onos-apps-routing-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing</artifactId>
+            <artifactId>onos-apps-routing-common</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/apps/restconf/api/pom.xml b/apps/restconf/api/pom.xml
index 3f98697..1d76dac 100644
--- a/apps/restconf/api/pom.xml
+++ b/apps/restconf/api/pom.xml
@@ -21,12 +21,12 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-restconf-parent</artifactId>
+        <artifactId>onos-apps-restconf</artifactId>
         <version>1.14.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-app-restconf-api</artifactId>
+    <artifactId>onos-apps-restconf-api</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/apps/restconf/app/app.xml b/apps/restconf/app/app.xml
index 52fd0af..ca7f79b 100644
--- a/apps/restconf/app/app.xml
+++ b/apps/restconf/app/app.xml
@@ -19,6 +19,6 @@
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}" >
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-app-restconf-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-restconf-restconfmanager/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-restconf-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-restconf-restconfmgr/${project.version}</artifact>
 </app>
diff --git a/apps/restconf/app/features.xml b/apps/restconf/app/features.xml
index c65e30b..cf84a3e 100644
--- a/apps/restconf/app/features.xml
+++ b/apps/restconf/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-restconf-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-restconf-restconfmanager/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-restconf-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-restconf-restconfmgr/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/restconf/app/pom.xml b/apps/restconf/app/pom.xml
index fc9a6af..664e3ec 100644
--- a/apps/restconf/app/pom.xml
+++ b/apps/restconf/app/pom.xml
@@ -21,12 +21,12 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-restconf-parent</artifactId>
+        <artifactId>onos-apps-restconf</artifactId>
         <version>1.14.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-app-restconf</artifactId>
+    <artifactId>onos-apps-restconf-app</artifactId>
     <packaging>pom</packaging>
 
     <properties>
@@ -38,12 +38,12 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-restconf-api</artifactId>
+            <artifactId>onos-apps-restconf-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-restconf-restconfmanager</artifactId>
+            <artifactId>onos-apps-restconf-restconfmgr</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/restconf/pom.xml b/apps/restconf/pom.xml
index 662da9d..7ec80bf 100644
--- a/apps/restconf/pom.xml
+++ b/apps/restconf/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-restconf-parent</artifactId>
+    <artifactId>onos-apps-restconf</artifactId>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/apps/restconf/restconfmgr/pom.xml b/apps/restconf/restconfmgr/pom.xml
index f56d1b7..3a569e4 100644
--- a/apps/restconf/restconfmgr/pom.xml
+++ b/apps/restconf/restconfmgr/pom.xml
@@ -19,13 +19,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-restconf-parent</artifactId>
+        <artifactId>onos-apps-restconf</artifactId>
         <version>1.14.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-app-restconf-restconfmanager</artifactId>
+    <artifactId>onos-apps-restconf-restconfmgr</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-restconf-utils</artifactId>
+            <artifactId>onos-apps-restconf-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-restconf-api</artifactId>
+            <artifactId>onos-apps-restconf-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/restconf/utils/pom.xml b/apps/restconf/utils/pom.xml
index 1779384..967ccb8 100644
--- a/apps/restconf/utils/pom.xml
+++ b/apps/restconf/utils/pom.xml
@@ -18,14 +18,14 @@
          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-restconf-parent</artifactId>
+        <artifactId>onos-apps-restconf</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-app-restconf-utils</artifactId>
+    <artifactId>onos-apps-restconf-utils</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-restconf-api</artifactId>
+            <artifactId>onos-apps-restconf-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -49,12 +49,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms-api</artifactId>
+            <artifactId>onos-apps-yms-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms</artifactId>
+            <artifactId>onos-apps-yms</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/routeradvertisement/pom.xml b/apps/routeradvertisement/pom.xml
index e1d549b..933f14a 100644
--- a/apps/routeradvertisement/pom.xml
+++ b/apps/routeradvertisement/pom.xml
@@ -30,7 +30,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-routeradvertisement</artifactId>
+    <artifactId>onos-apps-routeradvertisement</artifactId>
     <version>1.14.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
diff --git a/apps/routing-api/pom.xml b/apps/routing-api/pom.xml
index cd4036f..aba13f8 100644
--- a/apps/routing-api/pom.xml
+++ b/apps/routing-api/pom.xml
@@ -24,7 +24,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-app-routing-api</artifactId>
+    <artifactId>onos-apps-routing-api</artifactId>
 
     <packaging>bundle</packaging>
     <description>API for routing applications</description>
diff --git a/apps/routing/common/pom.xml b/apps/routing/common/pom.xml
index 0b26b1f..c28a6ae 100644
--- a/apps/routing/common/pom.xml
+++ b/apps/routing/common/pom.xml
@@ -18,25 +18,25 @@
          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-app-routing-parent</artifactId>
+        <artifactId>onos-apps-routing</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-app-routing</artifactId>
+    <artifactId>onos-apps-routing-common</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing-api</artifactId>
+            <artifactId>onos-apps-routing-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing-api</artifactId>
+            <artifactId>onos-apps-routing-api</artifactId>
             <scope>test</scope>
             <classifier>tests</classifier>
             <version>${project.version}</version>
diff --git a/apps/routing/cpr/pom.xml b/apps/routing/cpr/pom.xml
index 37497b4..f82dfc6 100644
--- a/apps/routing/cpr/pom.xml
+++ b/apps/routing/cpr/pom.xml
@@ -18,7 +18,7 @@
          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-app-routing-parent</artifactId>
+        <artifactId>onos-apps-routing</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
diff --git a/apps/routing/fibinstaller/pom.xml b/apps/routing/fibinstaller/pom.xml
index a0275de..e1dc0fa 100644
--- a/apps/routing/fibinstaller/pom.xml
+++ b/apps/routing/fibinstaller/pom.xml
@@ -18,7 +18,7 @@
          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-app-routing-parent</artifactId>
+        <artifactId>onos-apps-routing</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
diff --git a/apps/routing/fpm/api/pom.xml b/apps/routing/fpm/api/pom.xml
index 7d899f7..11e0e71 100644
--- a/apps/routing/fpm/api/pom.xml
+++ b/apps/routing/fpm/api/pom.xml
@@ -18,7 +18,7 @@
          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-apps-fpm</artifactId>
+        <artifactId>onos-apps-routing-fpm</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
diff --git a/apps/routing/fpm/app/pom.xml b/apps/routing/fpm/app/pom.xml
index 408fc5a..6ada87a 100644
--- a/apps/routing/fpm/app/pom.xml
+++ b/apps/routing/fpm/app/pom.xml
@@ -18,7 +18,7 @@
          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-apps-fpm</artifactId>
+        <artifactId>onos-apps-routing-fpm</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
diff --git a/apps/routing/fpm/pom.xml b/apps/routing/fpm/pom.xml
index 6f78056..c68c5cb 100644
--- a/apps/routing/fpm/pom.xml
+++ b/apps/routing/fpm/pom.xml
@@ -18,13 +18,13 @@
          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-app-routing-parent</artifactId>
+        <artifactId>onos-apps-routing</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-apps-fpm</artifactId>
+    <artifactId>onos-apps-routing-fpm</artifactId>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/apps/routing/pom.xml b/apps/routing/pom.xml
index 02a26da..bd9b77c 100644
--- a/apps/routing/pom.xml
+++ b/apps/routing/pom.xml
@@ -24,7 +24,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-app-routing-parent</artifactId>
+    <artifactId>onos-apps-routing</artifactId>
 
     <packaging>pom</packaging>
     <description>Libraries for routing applications</description>
@@ -38,13 +38,13 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing-api</artifactId>
+            <artifactId>onos-apps-routing-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing-api</artifactId>
+            <artifactId>onos-apps-routing-api</artifactId>
             <scope>test</scope>
             <classifier>tests</classifier>
             <version>${project.version}</version>
diff --git a/apps/scalablegateway/pom.xml b/apps/scalablegateway/pom.xml
index 6e06c94..9d3fefe 100644
--- a/apps/scalablegateway/pom.xml
+++ b/apps/scalablegateway/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-scalablegateway</artifactId>
+    <artifactId>onos-apps-scalablegateway</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS Scalable Gateway applications</description>
diff --git a/apps/sdnip/app.xml b/apps/sdnip/app.xml
index 3911d3f..24ce985 100644
--- a/apps/sdnip/app.xml
+++ b/apps/sdnip/app.xml
@@ -20,6 +20,6 @@
      features="${project.artifactId}" apps="intentsynchronizer">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-routing-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-routing/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-routing-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-routing-common/${project.version}</artifact>
 </app>
diff --git a/apps/sdnip/features.xml b/apps/sdnip/features.xml
index 795fc47..4304447 100644
--- a/apps/sdnip/features.xml
+++ b/apps/sdnip/features.xml
@@ -15,11 +15,11 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-    <feature name="onos-app-sdnip" version="${project.version}"
+    <feature name="onos-apps-sdnip" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-app-sdnip/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-routing-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-routing/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-sdnip/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-routing-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-routing-common/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/sdnip/pom.xml b/apps/sdnip/pom.xml
index c8562a0..dcb2375 100644
--- a/apps/sdnip/pom.xml
+++ b/apps/sdnip/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-sdnip</artifactId>
+    <artifactId>onos-apps-sdnip</artifactId>
     <packaging>bundle</packaging>
 
     <description>SDN-IP peering application</description>
@@ -70,19 +70,19 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing</artifactId>
+            <artifactId>onos-apps-routing-common</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing-api</artifactId>
+            <artifactId>onos-apps-routing-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing-api</artifactId>
+            <artifactId>onos-apps-routing-api</artifactId>
             <scope>test</scope>
             <classifier>tests</classifier>
             <version>${project.version}</version>
diff --git a/apps/simplefabric/features.xml b/apps/simplefabric/features.xml
index fd67ef1..c9ac9f5 100644
--- a/apps/simplefabric/features.xml
+++ b/apps/simplefabric/features.xml
@@ -15,9 +15,9 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-    <feature name="onos-app-simplefabric" version="${project.version}"
+    <feature name="onos-apps-simplefabric" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-app-simplefabric/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-simplefabric/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/simplefabric/pom.xml b/apps/simplefabric/pom.xml
index 567287f..61a6c3c 100644
--- a/apps/simplefabric/pom.xml
+++ b/apps/simplefabric/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-simplefabric</artifactId>
+    <artifactId>onos-apps-simplefabric</artifactId>
     <packaging>bundle</packaging>
 
     <description>Simple Fabric Application for Leaf-Spine L2/L3 Network</description>
diff --git a/apps/t3/pom.xml b/apps/t3/pom.xml
new file mode 100644
index 0000000..59a91be
--- /dev/null
+++ b/apps/t3/pom.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2018-present Open Networking Foundation
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onosproject</groupId>
+        <artifactId>onos-apps</artifactId>
+        <version>1.14.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>onos-apps-t3</artifactId>
+    <packaging>bundle</packaging>
+
+    <description>Trellis Troubleshooting Toolkit</description>
+
+    <properties>
+        <onos.app.title>Trellis Troubleshooting Toolkit</onos.app.title>
+        <onos.app.category>Utilities</onos.app.category>
+        <onos.app.url>http://onosproject.org</onos.app.url>
+        <onos.app.readme>Static analysis of flows and groups to determine paths of packets.</onos.app.readme>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-mcast-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <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>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-segmentrouting-app</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-core-serializers</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-api</artifactId>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-core-primitives</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-cli</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.console</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-drivers-default</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onlab-misc</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/apps/tenbi/pom.xml b/apps/tenbi/pom.xml
index edd42ba..c5bf5d7 100644
--- a/apps/tenbi/pom.xml
+++ b/apps/tenbi/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-app-tenbi</artifactId>
+    <artifactId>onos-apps-tenbi</artifactId>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/apps/tenbi/topology/app.xml b/apps/tenbi/topology/app.xml
index 1f2ac9f..84d3a60 100644
--- a/apps/tenbi/topology/app.xml
+++ b/apps/tenbi/topology/app.xml
@@ -19,6 +19,6 @@
      features="${project.artifactId}">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-tenbi-yangmodel/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-tenbi-yangmodel/${project.version}</artifact>
 </app>
 
diff --git a/apps/tenbi/topology/features.xml b/apps/tenbi/topology/features.xml
index 601f9be..cf4a7f5 100644
--- a/apps/tenbi/topology/features.xml
+++ b/apps/tenbi/topology/features.xml
@@ -15,13 +15,13 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-    <repository>mvn:${project.groupId}/onos-app-tenbi-yangmodel/${project.version}/xml/features</repository>
+    <repository>mvn:${project.groupId}/onos-apps-tenbi-yangmodel/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}" description="${project.description}">
         <feature>onos-api</feature>
-        <feature>onos-app-tenbi-yangmodel</feature>
+        <feature>onos-apps-tenbi-yangmodel</feature>
         <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-tetopology/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-yms-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-tenbi-utils/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tetopology/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-yms-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tenbi-utils/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/tenbi/topology/pom.xml b/apps/tenbi/topology/pom.xml
index 9010802..b4b41e5 100644
--- a/apps/tenbi/topology/pom.xml
+++ b/apps/tenbi/topology/pom.xml
@@ -19,12 +19,12 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-tenbi</artifactId>
+        <artifactId>onos-apps-tenbi</artifactId>
         <version>1.14.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-app-tenbi-topology</artifactId>
+    <artifactId>onos-apps-tenbi-topology</artifactId>
     <packaging>bundle</packaging>
 
     <description>IETF TE Topology NBI</description>
@@ -37,12 +37,12 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tenbi-yangmodel</artifactId>
+            <artifactId>onos-apps-tenbi-yangmodel</artifactId>
             <version>${project.version}</version>
         </dependency>
          <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tenbi-utils</artifactId>
+            <artifactId>onos-apps-tenbi-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -52,12 +52,12 @@
         </dependency>
          <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetopology-api</artifactId>
+            <artifactId>onos-apps-tetopology-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms-api</artifactId>
+            <artifactId>onos-apps-yms-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/tenbi/tunnel/app.xml b/apps/tenbi/tunnel/app.xml
index b217e050..8df84d4 100644
--- a/apps/tenbi/tunnel/app.xml
+++ b/apps/tenbi/tunnel/app.xml
@@ -21,6 +21,6 @@
      features="${project.artifactId}">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-tenbi-yangmodel/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-tenbi-yangmodel/${project.version}</artifact>
 </app>
 
diff --git a/apps/tenbi/tunnel/features.xml b/apps/tenbi/tunnel/features.xml
index 03d4966..d8fa1b4 100644
--- a/apps/tenbi/tunnel/features.xml
+++ b/apps/tenbi/tunnel/features.xml
@@ -17,14 +17,14 @@
   ~  */
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-    <repository>mvn:${project.groupId}/onos-app-tenbi-yangmodel/${project.version}/xml/features</repository>
+    <repository>mvn:${project.groupId}/onos-apps-tenbi-yangmodel/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}" description="${project.description}">
         <feature>onos-api</feature>
-        <feature>onos-app-tenbi-yangmodel</feature>
-        <bundle>mvn:${project.groupId}/onos-app-tetopology-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-yms-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-tetunnel-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-tenbi-utils/${project.version}</bundle>
+        <feature>onos-apps-tenbi-yangmodel</feature>
+        <bundle>mvn:${project.groupId}/onos-apps-tetopology-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-yms-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tetunnel-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tenbi-utils/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/tenbi/tunnel/pom.xml b/apps/tenbi/tunnel/pom.xml
index 0d607d4..580bea6 100644
--- a/apps/tenbi/tunnel/pom.xml
+++ b/apps/tenbi/tunnel/pom.xml
@@ -21,30 +21,30 @@
          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-app-tenbi</artifactId>
+        <artifactId>onos-apps-tenbi</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-app-tenbi-tunnel</artifactId>
+    <artifactId>onos-apps-tenbi-tunnel</artifactId>
     <packaging>bundle</packaging>
     <description>IETF TE Tunnel NBI</description>
 
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tenbi-yangmodel</artifactId>
+            <artifactId>onos-apps-tenbi-yangmodel</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tenbi-utils</artifactId>
+            <artifactId>onos-apps-tenbi-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms-api</artifactId>
+            <artifactId>onos-apps-yms-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -54,12 +54,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetunnel-api</artifactId>
+            <artifactId>onos-apps-tetunnel-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetopology-api</artifactId>
+            <artifactId>onos-apps-tetopology-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/tenbi/utils/pom.xml b/apps/tenbi/utils/pom.xml
index 13fc7a6..b0b5db3 100644
--- a/apps/tenbi/utils/pom.xml
+++ b/apps/tenbi/utils/pom.xml
@@ -19,12 +19,12 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-tenbi</artifactId>
+        <artifactId>onos-apps-tenbi</artifactId>
         <version>1.14.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-app-tenbi-utils</artifactId>
+    <artifactId>onos-apps-tenbi-utils</artifactId>
     <packaging>bundle</packaging>
 
     <description>IETF TE NBI Utilities</description>
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tenbi-yangmodel</artifactId>
+            <artifactId>onos-apps-tenbi-yangmodel</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -42,12 +42,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetopology-api</artifactId>
+            <artifactId>onos-apps-tetopology-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetunnel-api</artifactId>
+            <artifactId>onos-apps-tetunnel-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/tenbi/yangmodel/pom.xml b/apps/tenbi/yangmodel/pom.xml
index 79b408f..6197e4c 100644
--- a/apps/tenbi/yangmodel/pom.xml
+++ b/apps/tenbi/yangmodel/pom.xml
@@ -19,12 +19,12 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-tenbi</artifactId>
+        <artifactId>onos-apps-tenbi</artifactId>
         <version>1.14.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-app-tenbi-yangmodel</artifactId>
+    <artifactId>onos-apps-tenbi-yangmodel</artifactId>
     <packaging>bundle</packaging>
 
     <description>IETF TE YANG models</description>
diff --git a/apps/test/demo/pom.xml b/apps/test/demo/pom.xml
index 7cf030a..892285d 100644
--- a/apps/test/demo/pom.xml
+++ b/apps/test/demo/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-demo</artifactId>
+    <artifactId>onos-apps-test-demo</artifactId>
     <packaging>bundle</packaging>
 
     <description>Flow throughput test application</description>
diff --git a/apps/test/distributed-primitives/pom.xml b/apps/test/distributed-primitives/pom.xml
index 8b0f8e5..c89c279 100644
--- a/apps/test/distributed-primitives/pom.xml
+++ b/apps/test/distributed-primitives/pom.xml
@@ -26,7 +26,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-distributed-primitives</artifactId>
+    <artifactId>onos-apps-test-distributed-primitives</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS app to test distributed primitives</description>
diff --git a/apps/test/election/pom.xml b/apps/test/election/pom.xml
index eb307e4..67b3913 100644
--- a/apps/test/election/pom.xml
+++ b/apps/test/election/pom.xml
@@ -26,7 +26,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-election</artifactId>
+    <artifactId>onos-apps-test-election</artifactId>
     <packaging>bundle</packaging>
 
     <description>Master election test application</description>
diff --git a/apps/test/flow-perf/pom.xml b/apps/test/flow-perf/pom.xml
index d3c5d54..5c02b78 100644
--- a/apps/test/flow-perf/pom.xml
+++ b/apps/test/flow-perf/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-flow-perf</artifactId>
+    <artifactId>onos-apps-test-flow-perf</artifactId>
     <packaging>bundle</packaging>
 
     <description>Messaging performance test application</description>
diff --git a/apps/test/intent-perf/pom.xml b/apps/test/intent-perf/pom.xml
index ef017ee..384964f 100644
--- a/apps/test/intent-perf/pom.xml
+++ b/apps/test/intent-perf/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-intent-perf</artifactId>
+    <artifactId>onos-apps-test-intent-perf</artifactId>
     <packaging>bundle</packaging>
 
     <description>Intent performance test application</description>
diff --git a/apps/test/loadtest/pom.xml b/apps/test/loadtest/pom.xml
index 47989a2..23daa88 100644
--- a/apps/test/loadtest/pom.xml
+++ b/apps/test/loadtest/pom.xml
@@ -26,7 +26,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-loadtest</artifactId>
+    <artifactId>onos-apps-test-loadtest</artifactId>
     <packaging>bundle</packaging>
 
     <description>Distributed consensus load test application</description>
diff --git a/apps/test/messaging-perf/pom.xml b/apps/test/messaging-perf/pom.xml
index a5b001a..5df7cd5 100644
--- a/apps/test/messaging-perf/pom.xml
+++ b/apps/test/messaging-perf/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-messaging-perf</artifactId>
+    <artifactId>onos-apps-test-messaging-perf</artifactId>
     <packaging>bundle</packaging>
 
     <description>Messaging performance test application</description>
diff --git a/apps/test/netcfg-monitor/pom.xml b/apps/test/netcfg-monitor/pom.xml
index 6712047..ba1002d 100644
--- a/apps/test/netcfg-monitor/pom.xml
+++ b/apps/test/netcfg-monitor/pom.xml
@@ -26,7 +26,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-netcfg-monitor</artifactId>
+    <artifactId>onos-apps-test-netcfg-monitor</artifactId>
     <packaging>bundle</packaging>
 
     <description>Network configuration monitor test application</description>
diff --git a/apps/test/primitive-perf/pom.xml b/apps/test/primitive-perf/pom.xml
index e152e95..c421187 100644
--- a/apps/test/primitive-perf/pom.xml
+++ b/apps/test/primitive-perf/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-primitive-perf</artifactId>
+    <artifactId>onos-apps-test-primitive-perf</artifactId>
     <packaging>bundle</packaging>
 
     <description>Primitive performance test application</description>
diff --git a/apps/test/transaction-perf/pom.xml b/apps/test/transaction-perf/pom.xml
index c6acac6..623414e 100644
--- a/apps/test/transaction-perf/pom.xml
+++ b/apps/test/transaction-perf/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-transaction-perf</artifactId>
+    <artifactId>onos-apps-test-transaction-perf</artifactId>
     <packaging>bundle</packaging>
 
     <description>Transaction performance test application</description>
diff --git a/apps/tetopology/api/pom.xml b/apps/tetopology/api/pom.xml
index 0233988..89c64e0 100644
--- a/apps/tetopology/api/pom.xml
+++ b/apps/tetopology/api/pom.xml
@@ -19,12 +19,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>onos-tetopology</artifactId>
+        <artifactId>onos-apps-tetopology</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-tetopology-api</artifactId>
+    <artifactId>onos-apps-tetopology-api</artifactId>
     <version>1.14.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     
diff --git a/apps/tetopology/app/features.xml b/apps/tetopology/app/features.xml
index 90962da..41af7ce 100644
--- a/apps/tetopology/app/features.xml
+++ b/apps/tetopology/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-tetopology-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-tetopology/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tetopology-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tetopology/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/tetopology/app/pom.xml b/apps/tetopology/app/pom.xml
index c8a872b..d823710 100644
--- a/apps/tetopology/app/pom.xml
+++ b/apps/tetopology/app/pom.xml
@@ -20,11 +20,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-tetopology</artifactId>
+        <artifactId>onos-apps-tetopology</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-tetopology</artifactId>
+    <artifactId>onos-apps-tetopology-app</artifactId>
     <version>1.14.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
@@ -34,7 +34,7 @@
  
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetopology-api</artifactId>
+            <artifactId>onos-apps-tetopology-api</artifactId>
             <version>${project.version}</version>
         </dependency>
          <dependency>
diff --git a/apps/tetopology/pom.xml b/apps/tetopology/pom.xml
index 23fad3a..59ac0e1 100644
--- a/apps/tetopology/pom.xml
+++ b/apps/tetopology/pom.xml
@@ -24,7 +24,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-tetopology</artifactId>
+    <artifactId>onos-apps-tetopology</artifactId>
     <packaging>pom</packaging>
 
     <description>IETF TE Topology management</description>
diff --git a/apps/tetunnel/api/pom.xml b/apps/tetunnel/api/pom.xml
index 829ec68..bbdd11b 100644
--- a/apps/tetunnel/api/pom.xml
+++ b/apps/tetunnel/api/pom.xml
@@ -19,19 +19,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>onos-tetunnel</artifactId>
+        <artifactId>onos-apps-tetunnel</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-tetunnel-api</artifactId>
+    <artifactId>onos-apps-tetunnel-api</artifactId>
     <packaging>bundle</packaging>
     <description>IETF TE Tunnel attributes management API</description>
 
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetopology-api</artifactId>
+            <artifactId>onos-apps-tetopology-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/tetunnel/app/app.xml b/apps/tetunnel/app/app.xml
index 7db1a11..6f0ab72 100644
--- a/apps/tetunnel/app/app.xml
+++ b/apps/tetunnel/app/app.xml
@@ -20,6 +20,6 @@
      features="${project.artifactId}"
      apps="org.onosproject.tetopology">
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-app-tetunnel-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-tetunnel-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
 </app>
\ No newline at end of file
diff --git a/apps/tetunnel/app/features.xml b/apps/tetunnel/app/features.xml
index ac90d95..545cdfd 100644
--- a/apps/tetunnel/app/features.xml
+++ b/apps/tetunnel/app/features.xml
@@ -19,8 +19,8 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-app-tetopology-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-tetunnel-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tetopology-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tetunnel-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
     </feature>
 </features>
\ No newline at end of file
diff --git a/apps/tetunnel/app/pom.xml b/apps/tetunnel/app/pom.xml
index e3d0aae3..2dda6da 100644
--- a/apps/tetunnel/app/pom.xml
+++ b/apps/tetunnel/app/pom.xml
@@ -19,19 +19,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>onos-tetunnel</artifactId>
+        <artifactId>onos-apps-tetunnel</artifactId>
         <groupId>org.onosproject</groupId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-tetunnel</artifactId>
+    <artifactId>onos-apps-tetunnel-app</artifactId>
     <packaging>bundle</packaging>
     <description>IETF TE Tunnel attributes management implementation</description>
 
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetunnel-api</artifactId>
+            <artifactId>onos-apps-tetunnel-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/tetunnel/pom.xml b/apps/tetunnel/pom.xml
index a40c39e..753afe9 100644
--- a/apps/tetunnel/pom.xml
+++ b/apps/tetunnel/pom.xml
@@ -24,7 +24,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-tetunnel</artifactId>
+    <artifactId>onos-apps-tetunnel</artifactId>
     <packaging>pom</packaging>
 
     <description>IETF TE Tunnel attributes management</description>
diff --git a/apps/virtualbng/features.xml b/apps/virtualbng/features.xml
index fb4978a..88d6934 100644
--- a/apps/virtualbng/features.xml
+++ b/apps/virtualbng/features.xml
@@ -18,7 +18,7 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <bundle>mvn:org.glassfish.jersey.core/jersey-client/2.26</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-virtualbng/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-virtualbng/${project.version}</bundle>
         <feature>onos-thirdparty-web</feature>
     </feature>
 </features>
diff --git a/apps/virtualbng/pom.xml b/apps/virtualbng/pom.xml
index 6cbb950..39bd68f 100644
--- a/apps/virtualbng/pom.xml
+++ b/apps/virtualbng/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-virtualbng</artifactId>
+    <artifactId>onos-apps-virtualbng</artifactId>
     <packaging>bundle</packaging>
 
     <description>A virtual Broadband Network Gateway(BNG) application</description>
diff --git a/apps/vpls/pom.xml b/apps/vpls/pom.xml
index 573a327..1884f39 100644
--- a/apps/vpls/pom.xml
+++ b/apps/vpls/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-vpls</artifactId>
+    <artifactId>onos-apps-vpls</artifactId>
     <packaging>bundle</packaging>
 
     <description>Application to create L2 broadcast network using VLAN</description>
diff --git a/apps/vrouter/pom.xml b/apps/vrouter/pom.xml
index 32010fd..6463035 100644
--- a/apps/vrouter/pom.xml
+++ b/apps/vrouter/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <groupId>org.onosproject</groupId>
-    <artifactId>onos-app-vrouter</artifactId>
+    <artifactId>onos-apps-vrouter</artifactId>
     <version>1.14.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
@@ -43,7 +43,7 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-routing-api</artifactId>
+            <artifactId>onos-apps-routing-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/apps/vtn/app/app.xml b/apps/vtn/app/app.xml
index 180e099..270e274 100644
--- a/apps/vtn/app/app.xml
+++ b/apps/vtn/app/app.xml
@@ -19,9 +19,9 @@
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-app-vtn-mgr/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-sfc-mgr/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-vtn-web/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-vtn-rsc/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-sfc-web/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-vtn-vtnmgr/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-vtn-sfcmgr/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-vtn-vtnweb/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-vtn-vtnrsc/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-vtn-sfcweb/${project.version}</artifact>
 </app>
diff --git a/apps/vtn/app/features.xml b/apps/vtn/app/features.xml
index 934b923..374102c 100644
--- a/apps/vtn/app/features.xml
+++ b/apps/vtn/app/features.xml
@@ -19,10 +19,10 @@
              description="${project.description}">
         <feature>onos-api</feature>
         <feature>onos-drivers-default</feature>
-        <bundle>mvn:${project.groupId}/onos-app-vtn-mgr/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-sfc-mgr/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-vtn-web/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-vtn-rsc/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-sfc-web/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-vtn-vtnmgr/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-vtn-sfcmgr/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-vtn-vtnweb/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-vtn-vtnrsc/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-vtn-sfcweb/${project.version}</bundle>
     </feature>
 </features>
diff --git a/apps/vtn/app/pom.xml b/apps/vtn/app/pom.xml
index 42e8de3..f8f59ab 100644
--- a/apps/vtn/app/pom.xml
+++ b/apps/vtn/app/pom.xml
@@ -20,11 +20,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-vtn</artifactId>
+        <artifactId>onos-apps-vtn</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-vtn-onosfw</artifactId>
+    <artifactId>onos-apps-vtn-app</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS framework applications</description>
@@ -32,27 +32,27 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-vtn-rsc</artifactId>
+            <artifactId>onos-apps-vtn-vtnrsc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-vtn-web</artifactId>
+            <artifactId>onos-apps-vtn-vtnweb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-sfc-web</artifactId>
+            <artifactId>onos-apps-vtn-sfcweb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-vtn-mgr</artifactId>
+            <artifactId>onos-apps-vtn-vtnmgr</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-sfc-mgr</artifactId>
+            <artifactId>onos-apps-vtn-sfcmgr</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/vtn/pom.xml b/apps/vtn/pom.xml
index ea07cb7..c29d856 100644
--- a/apps/vtn/pom.xml
+++ b/apps/vtn/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-vtn</artifactId>
+    <artifactId>onos-apps-vtn</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS framework applications</description>
diff --git a/apps/vtn/sfcmgr/pom.xml b/apps/vtn/sfcmgr/pom.xml
index d800600..9392787 100644
--- a/apps/vtn/sfcmgr/pom.xml
+++ b/apps/vtn/sfcmgr/pom.xml
@@ -20,11 +20,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.onosproject</groupId>
-		<artifactId>onos-app-vtn</artifactId>
+		<artifactId>onos-apps-vtn</artifactId>
 		<version>1.14.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>onos-app-sfc-mgr</artifactId>
+	<artifactId>onos-apps-vtn-sfcmgr</artifactId>
 	<packaging>bundle</packaging>
 
 	<dependencies>
@@ -43,7 +43,7 @@
 		</dependency>
                 <dependency>
                     <groupId>org.onosproject</groupId>
-                    <artifactId>onos-app-vtn-rsc</artifactId>
+                    <artifactId>onos-apps-vtn-vtnrsc</artifactId>
                     <version>${project.version}</version>
                 </dependency>
 	</dependencies>
diff --git a/apps/vtn/sfcweb/pom.xml b/apps/vtn/sfcweb/pom.xml
index fe0c61a..44b93a6 100644
--- a/apps/vtn/sfcweb/pom.xml
+++ b/apps/vtn/sfcweb/pom.xml
@@ -20,11 +20,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-vtn</artifactId>
+        <artifactId>onos-apps-vtn</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-sfc-web</artifactId>
+    <artifactId>onos-apps-vtn-sfcweb</artifactId>
     <packaging>bundle</packaging>
 
     <description>SFC web application</description>
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-vtn-rsc</artifactId>
+            <artifactId>onos-apps-vtn-vtnrsc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/vtn/vtnmgr/pom.xml b/apps/vtn/vtnmgr/pom.xml
index 18c2ed4..f1fcb9b 100644
--- a/apps/vtn/vtnmgr/pom.xml
+++ b/apps/vtn/vtnmgr/pom.xml
@@ -21,11 +21,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-vtn</artifactId>
+        <artifactId>onos-apps-vtn</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-vtn-mgr</artifactId>
+    <artifactId>onos-apps-vtn-vtnmgr</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-vtn-rsc</artifactId>
+            <artifactId>onos-apps-vtn-vtnrsc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/vtn/vtnrsc/pom.xml b/apps/vtn/vtnrsc/pom.xml
index 5585205..0ca6524 100644
--- a/apps/vtn/vtnrsc/pom.xml
+++ b/apps/vtn/vtnrsc/pom.xml
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-vtn</artifactId>
+        <artifactId>onos-apps-vtn</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
 
-    <artifactId>onos-app-vtn-rsc</artifactId>
+    <artifactId>onos-apps-vtn-vtnrsc</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/apps/vtn/vtnweb/pom.xml b/apps/vtn/vtnweb/pom.xml
index 6d8e2c0..cdbd0a6 100644
--- a/apps/vtn/vtnweb/pom.xml
+++ b/apps/vtn/vtnweb/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-vtn</artifactId>
+        <artifactId>onos-apps-vtn</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
 
-    <artifactId>onos-app-vtn-web</artifactId>
+    <artifactId>onos-apps-vtn-vtnweb</artifactId>
     <packaging>bundle</packaging>
     <properties>
         <web.context>/onos/vtn</web.context>
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-vtn-rsc</artifactId>
+            <artifactId>onos-apps-vtn-vtnrsc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/yms/api/pom.xml b/apps/yms/api/pom.xml
index 4bcf029..04c742a 100644
--- a/apps/yms/api/pom.xml
+++ b/apps/yms/api/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-yms-api</artifactId>
+    <artifactId>onos-apps-yms-api</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
diff --git a/apps/yms/app/app.xml b/apps/yms/app/app.xml
index 1d5a360..bedcf30 100644
--- a/apps/yms/app/app.xml
+++ b/apps/yms/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-yms-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-yms-api/${project.version}</artifact>
 </app>
diff --git a/apps/yms/app/features.xml b/apps/yms/app/features.xml
index 42872e1..ae1e094 100644
--- a/apps/yms/app/features.xml
+++ b/apps/yms/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-yms-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-yms-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5</bundle>
     </feature>
diff --git a/apps/yms/app/pom.xml b/apps/yms/app/pom.xml
index 1ab9c81..b04f6d2 100644
--- a/apps/yms/app/pom.xml
+++ b/apps/yms/app/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-yms</artifactId>
+    <artifactId>onos-apps-yms</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms-api</artifactId>
+            <artifactId>onos-apps-yms-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apps/yms/ut/pom.xml b/apps/yms/ut/pom.xml
index 5d74050..d88e862 100644
--- a/apps/yms/ut/pom.xml
+++ b/apps/yms/ut/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-yms-ut</artifactId>
+    <artifactId>onos-apps-yms-ut</artifactId>
     <packaging>bundle</packaging>
 
     <url>http://onosproject.org</url>
@@ -35,12 +35,12 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms-api</artifactId>
+            <artifactId>onos-apps-yms-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms</artifactId>
+            <artifactId>onos-apps-yms</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/drivers/flowspec/pom.xml b/drivers/flowspec/pom.xml
index 74b98ad..f572dd1 100644
--- a/drivers/flowspec/pom.xml
+++ b/drivers/flowspec/pom.xml
@@ -44,7 +44,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-flowspec-api-flowapi</artifactId>
+            <artifactId>onos-apps-flowspec-api-flowapi</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/drivers/huawei/driver/pom.xml b/drivers/huawei/driver/pom.xml
index 0d3a9fe..579f809 100644
--- a/drivers/huawei/driver/pom.xml
+++ b/drivers/huawei/driver/pom.xml
@@ -41,12 +41,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-l3vpn-netl3vpn</artifactId>
+            <artifactId>onos-apps-l3vpn-netl3vpn</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-l3vpn-yangmodel</artifactId>
+            <artifactId>onos-apps-l3vpn-yangmodel</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -66,7 +66,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yang</artifactId>
+            <artifactId>onos-apps-yang</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/drivers/lisp/pom.xml b/drivers/lisp/pom.xml
index 6f96021..012f861 100644
--- a/drivers/lisp/pom.xml
+++ b/drivers/lisp/pom.xml
@@ -49,12 +49,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-mapping-api</artifactId>
+            <artifactId>onos-apps-mappingmanagement-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-mapping-api</artifactId>
+            <artifactId>onos-apps-mappingmanagement-api</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
diff --git a/pom.xml b/pom.xml
index 4ed2313..e46f7ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,18 +223,18 @@
             </dependency>
             <dependency>
                 <groupId>org.onosproject</groupId>
-                <artifactId>onos-bgpio</artifactId>
+                <artifactId>onos-protocols-bgp-bgpio</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.onosproject</groupId>
-                <artifactId>onos-bgp-api</artifactId>
+                <artifactId>onos-protocols-bgp-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.onosproject</groupId>
-                <artifactId>onos-app-bgp-api</artifactId>
+                <artifactId>onos-apps-bgp-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
diff --git a/protocols/bgp/api/pom.xml b/protocols/bgp/api/pom.xml
index 77339c2..8f83610 100644
--- a/protocols/bgp/api/pom.xml
+++ b/protocols/bgp/api/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-bgp</artifactId>
+        <artifactId>onos-protocols-bgp</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-bgp-api</artifactId>
+    <artifactId>onos-protocols-bgp-api</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS BGP controller subsystem API</description>
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgpio</artifactId>
+            <artifactId>onos-protocols-bgp-bgpio</artifactId>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
diff --git a/protocols/bgp/bgpio/pom.xml b/protocols/bgp/bgpio/pom.xml
index 6a82393..586939f 100644
--- a/protocols/bgp/bgpio/pom.xml
+++ b/protocols/bgp/bgpio/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-bgp</artifactId>
+        <artifactId>onos-protocols-bgp</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-bgpio</artifactId>
+    <artifactId>onos-protocols-bgp-bgpio</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS BGPio Protocol subsystem</description>
diff --git a/protocols/bgp/ctl/pom.xml b/protocols/bgp/ctl/pom.xml
index 0b15c99..c38ed5c 100644
--- a/protocols/bgp/ctl/pom.xml
+++ b/protocols/bgp/ctl/pom.xml
@@ -20,11 +20,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-bgp</artifactId>
+        <artifactId>onos-protocols-bgp</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-bgp-ctl</artifactId>
+    <artifactId>onos-protocols-bgp-ctl</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS BGP controller subsystem API</description>
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-api</artifactId>
+            <artifactId>onos-protocols-bgp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
diff --git a/protocols/bgp/pom.xml b/protocols/bgp/pom.xml
index c9e9561..f9a1bc5 100644
--- a/protocols/bgp/pom.xml
+++ b/protocols/bgp/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-bgp</artifactId>
+    <artifactId>onos-protocols-bgp</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS BGP Protocol subsystem</description>
diff --git a/protocols/lisp/api/pom.xml b/protocols/lisp/api/pom.xml
index 4b04aee..7964099 100644
--- a/protocols/lisp/api/pom.xml
+++ b/protocols/lisp/api/pom.xml
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-mapping-api</artifactId>
+            <artifactId>onos-apps-mappingmanagement-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/protocols/restconf/server/rpp/pom.xml b/protocols/restconf/server/rpp/pom.xml
index 0be42e5..08cbe24f 100644
--- a/protocols/restconf/server/rpp/pom.xml
+++ b/protocols/restconf/server/rpp/pom.xml
@@ -42,7 +42,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-restconf-api</artifactId>
+            <artifactId>onos-apps-restconf-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -81,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-dhcp-api</artifactId>
+            <artifactId>onos-apps-dhcp-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/providers/bgp/app/app.xml b/providers/bgp/app/app.xml
index 002e8a3..139805c 100644
--- a/providers/bgp/app/app.xml
+++ b/providers/bgp/app/app.xml
@@ -19,13 +19,13 @@
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-bgpio/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-bgp-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-bgp-ctl/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-protocols-bgp-bgpio/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-protocols-bgp-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-protocols-bgp-ctl/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-server-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-bgp-provider-topology/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-bgp-provider-cfg/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-bgp-provider-cli/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-providers-bgp-topology/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-providers-bgp-cfg/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-providers-bgp-cli/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcepio/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-apps-pcep-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-server-impl/${project.version}</artifact>
diff --git a/providers/bgp/app/features.xml b/providers/bgp/app/features.xml
index e43f009..18622fb 100644
--- a/providers/bgp/app/features.xml
+++ b/providers/bgp/app/features.xml
@@ -18,13 +18,13 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-bgpio/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-bgp-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-bgp-ctl/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-protocols-bgp-bgpio/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-protocols-bgp-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-protocols-bgp-ctl/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-server-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-bgp-provider-topology/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-bgp-provider-cli/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-bgp-provider-cfg/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-providers-bgp-topology/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-providers-bgp-cli/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-providers-bgp-cfg/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcepio/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-apps-pcep-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-server-impl/${project.version}</bundle>
diff --git a/providers/bgp/app/pom.xml b/providers/bgp/app/pom.xml
index 88d19f2..ab61489 100644
--- a/providers/bgp/app/pom.xml
+++ b/providers/bgp/app/pom.xml
@@ -19,36 +19,36 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-bgp-providers</artifactId>
+        <artifactId>onos-providers-bgp</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-bgp-app</artifactId>
+    <artifactId>onos-providers-bgp-app</artifactId>
     <packaging>pom</packaging>
     <description>BGP protocol southbound providers</description>
 
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgpio</artifactId>
+            <artifactId>onos-protocols-bgp-bgpio</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-api</artifactId>
+            <artifactId>onos-protocols-bgp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-ctl</artifactId>
+            <artifactId>onos-protocols-bgp-ctl</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-provider-topology</artifactId>
+            <artifactId>onos-providers-bgp-topology</artifactId>
             <version>${project.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-provider-cli</artifactId>
+            <artifactId>onos-providers-bgp-cli</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -66,5 +66,11 @@
             <artifactId>onos-apps-pce-pcerest</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-pcep-provider-tunnel</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/providers/bgp/cfg/pom.xml b/providers/bgp/cfg/pom.xml
index 178842d..ac09587 100644
--- a/providers/bgp/cfg/pom.xml
+++ b/providers/bgp/cfg/pom.xml
@@ -18,10 +18,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-bgp-providers</artifactId>
+        <artifactId>onos-providers-bgp</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
-    <artifactId>onos-bgp-provider-cfg</artifactId>
+    <artifactId>onos-providers-bgp-cfg</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-api</artifactId>
+            <artifactId>onos-protocols-bgp-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/providers/bgp/cli/pom.xml b/providers/bgp/cli/pom.xml
index 9b96ef9..4016151 100644
--- a/providers/bgp/cli/pom.xml
+++ b/providers/bgp/cli/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-bgp-providers</artifactId>
+        <artifactId>onos-providers-bgp</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-bgp-provider-cli</artifactId>
+    <artifactId>onos-providers-bgp-cli</artifactId>
     <packaging>bundle</packaging>
 
     <description>BGP cli implementation</description>
@@ -38,12 +38,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-api</artifactId>
+            <artifactId>onos-protocols-bgp-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-provider-cfg</artifactId>
+            <artifactId>onos-providers-bgp-cfg</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-ctl</artifactId>
+            <artifactId>onos-protocols-bgp-ctl</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/providers/bgp/pom.xml b/providers/bgp/pom.xml
index daa03ce..8e441e7 100644
--- a/providers/bgp/pom.xml
+++ b/providers/bgp/pom.xml
@@ -20,7 +20,7 @@
     <artifactId>onos-providers</artifactId>
     <version>1.14.0-SNAPSHOT</version>
   </parent>
-  <artifactId>onos-bgp-providers</artifactId>
+  <artifactId>onos-providers-bgp</artifactId>
   <packaging>pom</packaging>
   <description>BGP-LS protocol providers root</description>
   <modules>
@@ -34,11 +34,11 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-api</artifactId>
+            <artifactId>onos-protocols-bgp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgpio</artifactId>
+            <artifactId>onos-protocols-bgp-bgpio</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
diff --git a/providers/bgp/route/pom.xml b/providers/bgp/route/pom.xml
index 0a16b1a..d1c7e1a 100644
--- a/providers/bgp/route/pom.xml
+++ b/providers/bgp/route/pom.xml
@@ -19,10 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-bgp-providers</artifactId>
+        <artifactId>onos-providers-bgp</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
-    <artifactId>onos-bgp-provider-route</artifactId>
+    <artifactId>onos-providers-bgp-route</artifactId>
     <packaging>bundle</packaging>
     <description>BGP route provider</description>
     <dependencies>
@@ -40,11 +40,11 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-api</artifactId>
+            <artifactId>onos-protocols-bgp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-evpn-route-service-api</artifactId>
+            <artifactId>onos-apps-evpn-route-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/providers/bgp/topology/pom.xml b/providers/bgp/topology/pom.xml
index 2943e0b..bb4b9ca 100644
--- a/providers/bgp/topology/pom.xml
+++ b/providers/bgp/topology/pom.xml
@@ -17,16 +17,16 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onosproject</groupId>
-    <artifactId>onos-bgp-providers</artifactId>
+    <artifactId>onos-providers-bgp</artifactId>
     <version>1.14.0-SNAPSHOT</version>
   </parent>
-  <artifactId>onos-bgp-provider-topology</artifactId>
+  <artifactId>onos-providers-bgp-topology</artifactId>
   <packaging>bundle</packaging>
   <description>BGP topology provider</description>
         <dependencies>
                 <dependency>
                         <groupId>org.onosproject</groupId>
-                        <artifactId>onos-bgp-api</artifactId>
+                        <artifactId>onos-protocols-bgp-api</artifactId>
                 </dependency>
             <dependency>
                 <groupId>org.onosproject</groupId>
diff --git a/providers/bgpcep/app/app.xml b/providers/bgpcep/app/app.xml
index 635a32b..28afaad 100644
--- a/providers/bgpcep/app/app.xml
+++ b/providers/bgpcep/app/app.xml
@@ -19,20 +19,20 @@
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-bgpio/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-bgp-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-bgp-ctl/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-protocols-bgp-bgpio/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-protocols-bgp-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-protocols-bgp-ctl/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcepio/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-apps-pcep-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-server-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-bgp-provider-topology/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-bgp-provider-cfg/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-providers-bgp-topology/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-providers-bgp-cfg/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-server-impl/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-bgpcep-provider-flow/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-providers-bgpcep-flow/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-apps-pce-app/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-apps-pce-pceweb/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-apps-pce-pcerest/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-bandwidthmgmt/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-pce-bandwidthmgmt/${project.version}</artifact>
 </app>
diff --git a/providers/bgpcep/app/features.xml b/providers/bgpcep/app/features.xml
index d7a3363..378205b 100644
--- a/providers/bgpcep/app/features.xml
+++ b/providers/bgpcep/app/features.xml
@@ -18,12 +18,12 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-bgpio/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-bgp-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-bgp-ctl/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-protocols-bgp-bgpio/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-protocols-bgp-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-protocols-bgp-ctl/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-server-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-bgp-provider-topology/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-bgp-provider-cfg/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-providers-bgp-topology/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-providers-bgp-cfg/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcepio/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-apps-pcep-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-server-impl/${project.version}</bundle>
@@ -31,8 +31,8 @@
         <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-apps-pce-app/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-apps-pce-pceweb/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-bgpcep-provider-flow/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-providers-bgpcep-flow/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-apps-pce-pcerest/${project.version}</bundle>
-	<bundle>mvn:${project.groupId}/onos-app-bandwidthmgmt/${project.version}</bundle>
+	<bundle>mvn:${project.groupId}/onos-apps-pce-bandwidthmgmt/${project.version}</bundle>
     </feature>
 </features>
diff --git a/providers/bgpcep/app/pom.xml b/providers/bgpcep/app/pom.xml
index ccb79af..106b5aa 100644
--- a/providers/bgpcep/app/pom.xml
+++ b/providers/bgpcep/app/pom.xml
@@ -19,26 +19,26 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-bgpcep-providers</artifactId>
+        <artifactId>onos-providers-bgpcep</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-bgpcep-app</artifactId>
+    <artifactId>onos-providers-bgpcep-app</artifactId>
     <packaging>pom</packaging>
     <description>BGP PCEP protocol southbound providers</description>
 
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgpio</artifactId>
+            <artifactId>onos-protocols-bgp-bgpio</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-api</artifactId>
+            <artifactId>onos-protocols-bgp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-ctl</artifactId>
+            <artifactId>onos-protocols-bgp-ctl</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-provider-cfg</artifactId>
+            <artifactId>onos-providers-bgp-cfg</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -85,7 +85,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-bandwidthmgmt</artifactId>
+            <artifactId>onos-apps-pce-bandwidthmgmt</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -95,12 +95,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-provider-topology</artifactId>
+            <artifactId>onos-providers-bgp-topology</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgpcep-provider-flow</artifactId>
+            <artifactId>onos-providers-bgpcep-flow</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/providers/bgpcep/flow/pom.xml b/providers/bgpcep/flow/pom.xml
index 8c51bf5..6969776 100644
--- a/providers/bgpcep/flow/pom.xml
+++ b/providers/bgpcep/flow/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-bgpcep-providers</artifactId>
+        <artifactId>onos-providers-bgpcep</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-bgpcep-provider-flow</artifactId>
+    <artifactId>onos-providers-bgpcep-flow</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS BGP-PCEP protocol flow provider</description>
diff --git a/providers/bgpcep/pom.xml b/providers/bgpcep/pom.xml
index f7729a0..029dc72 100644
--- a/providers/bgpcep/pom.xml
+++ b/providers/bgpcep/pom.xml
@@ -23,7 +23,7 @@
     <version>1.14.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>onos-bgpcep-providers</artifactId>
+  <artifactId>onos-providers-bgpcep</artifactId>
   <packaging>pom</packaging>
 
   <description>BGPCEP providers root</description>
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-bgp-api</artifactId>
+            <artifactId>onos-protocols-bgp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
diff --git a/providers/general/app/app.xml b/providers/general/app/app.xml
index 7de3055..3e9c4e9 100644
--- a/providers/general/app/app.xml
+++ b/providers/general/app/app.xml
@@ -20,6 +20,6 @@
      features="${project.artifactId}">
     <description>${project.description}</description>
 
-    <artifact>mvn:${project.groupId}/onos-general-provider-device/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-providers-general-device/${project.version}</artifact>
 
 </app>
diff --git a/providers/general/app/features.xml b/providers/general/app/features.xml
index 210c2d7..45ff1f0 100644
--- a/providers/general/app/features.xml
+++ b/providers/general/app/features.xml
@@ -19,7 +19,7 @@
              description="${project.description}">
         <feature>onos-api</feature>
 
-        <bundle>mvn:${project.groupId}/onos-general-provider-device/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-providers-general-device/${project.version}</bundle>
     </feature>
 </features>
 
diff --git a/providers/general/app/pom.xml b/providers/general/app/pom.xml
index a35954d..846722c 100644
--- a/providers/general/app/pom.xml
+++ b/providers/general/app/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-general-providers</artifactId>
+        <artifactId>onos-providers-general</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-general-provider-app</artifactId>
+    <artifactId>onos-providers-general-app</artifactId>
     <packaging>bundle</packaging>
 
     <properties>
@@ -43,7 +43,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-general-provider-device</artifactId>
+            <artifactId>onos-providers-general-device</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!-- Add other dependencies here as more bundles are added to the app -->
diff --git a/providers/general/device/pom.xml b/providers/general/device/pom.xml
index 0b4be9f..31a39e3 100644
--- a/providers/general/device/pom.xml
+++ b/providers/general/device/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-general-providers</artifactId>
+        <artifactId>onos-providers-general</artifactId>
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-general-provider-device</artifactId>
+    <artifactId>onos-providers-general-device</artifactId>
     <packaging>bundle</packaging>
 
     <description>ONOS general device provider that uses drivers as a mean of
diff --git a/providers/general/pom.xml b/providers/general/pom.xml
index 2089ca2..fb6c4ce 100644
--- a/providers/general/pom.xml
+++ b/providers/general/pom.xml
@@ -25,7 +25,7 @@
         <version>1.14.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-general-providers</artifactId>
+    <artifactId>onos-providers-general</artifactId>
     <packaging>pom</packaging>
 
     <description>ONOS general device provider</description>
diff --git a/providers/ietfte/app/app.xml b/providers/ietfte/app/app.xml
index 4f37510..ecda3bf 100644
--- a/providers/ietfte/app/app.xml
+++ b/providers/ietfte/app/app.xml
@@ -25,5 +25,5 @@
     <artifact>mvn:${project.groupId}/onos-ietfte-provider-utils/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-ietfte-provider-topology/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-ietfte-provider-tunnel/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-tenbi-yangmodel/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-tenbi-yangmodel/${project.version}</artifact>
 </app>
diff --git a/providers/ietfte/app/features.xml b/providers/ietfte/app/features.xml
index fe5181c..21d17eb 100644
--- a/providers/ietfte/app/features.xml
+++ b/providers/ietfte/app/features.xml
@@ -15,11 +15,11 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-    <repository>mvn:${project.groupId}/onos-app-tenbi-yangmodel/${project.version}/xml/features</repository>
+    <repository>mvn:${project.groupId}/onos-apps-tenbi-yangmodel/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <feature>onos-app-tenbi-yangmodel</feature>
+        <feature>onos-apps-tenbi-yangmodel</feature>
         <bundle>mvn:${project.groupId}/onos-restsb-api/${project.version}</bundle>
         <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.5.1</bundle>
         <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/4.4.4</bundle>
@@ -27,10 +27,10 @@
         <bundle>mvn:${project.groupId}/onos-restconf-client-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-restconf-client-ctl/${project.version}</bundle>
 
-        <bundle>mvn:${project.groupId}/onos-app-tetunnel-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-tetopology/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-yms-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-tenbi-utils/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tetunnel-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tetopology/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-yms-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-tenbi-utils/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-restconf-server-utils/${project.version}</bundle>
 
         <bundle>mvn:${project.groupId}/onos-ietfte-provider-utils/${project.version}</bundle>
diff --git a/providers/ietfte/pom.xml b/providers/ietfte/pom.xml
index 19ded50..e6da4fc 100644
--- a/providers/ietfte/pom.xml
+++ b/providers/ietfte/pom.xml
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms-api</artifactId>
+            <artifactId>onos-apps-yms-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/providers/ietfte/topology/pom.xml b/providers/ietfte/topology/pom.xml
index f332f05..6993796 100644
--- a/providers/ietfte/topology/pom.xml
+++ b/providers/ietfte/topology/pom.xml
@@ -56,22 +56,22 @@
         </dependency>
         <dependency>
         	<groupId>org.onosproject</groupId>
-        	<artifactId>onos-app-tetopology-api</artifactId>
+        	<artifactId>onos-apps-tetopology-api</artifactId>
         	<version>${project.version}</version>
         </dependency>
          <dependency>
         	<groupId>org.onosproject</groupId>
-        	<artifactId>onos-app-tenbi-yangmodel</artifactId>
+        	<artifactId>onos-apps-tenbi-yangmodel</artifactId>
         	<version>${project.version}</version>
         </dependency>
         <dependency>
         	<groupId>org.onosproject</groupId>
-        	<artifactId>onos-app-tenbi-utils</artifactId>
+        	<artifactId>onos-apps-tenbi-utils</artifactId>
         	<version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms-api</artifactId>
+            <artifactId>onos-apps-yms-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/providers/ietfte/tunnel/pom.xml b/providers/ietfte/tunnel/pom.xml
index 3d72c07..2c07e71 100644
--- a/providers/ietfte/tunnel/pom.xml
+++ b/providers/ietfte/tunnel/pom.xml
@@ -46,12 +46,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms-api</artifactId>
+            <artifactId>onos-apps-yms-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tetunnel-api</artifactId>
+            <artifactId>onos-apps-tetunnel-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -61,12 +61,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tenbi-yangmodel</artifactId>
+            <artifactId>onos-apps-tenbi-yangmodel</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-tenbi-utils</artifactId>
+            <artifactId>onos-apps-tenbi-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/providers/ietfte/utils/pom.xml b/providers/ietfte/utils/pom.xml
index 0deb610..c5513f9 100644
--- a/providers/ietfte/utils/pom.xml
+++ b/providers/ietfte/utils/pom.xml
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-yms-api</artifactId>
+            <artifactId>onos-apps-yms-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/providers/lisp/mapping/pom.xml b/providers/lisp/mapping/pom.xml
index e8c4a34..b602da4 100644
--- a/providers/lisp/mapping/pom.xml
+++ b/providers/lisp/mapping/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-mapping-api</artifactId>
+            <artifactId>onos-apps-mappingmanagement-api</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
diff --git a/providers/lisp/pom.xml b/providers/lisp/pom.xml
index d2584f1..553ca3e 100644
--- a/providers/lisp/pom.xml
+++ b/providers/lisp/pom.xml
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-mapping-api</artifactId>
+            <artifactId>onos-apps-mappingmanagement-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/providers/openflow/message/features.xml b/providers/openflow/message/features.xml
index e806839..d7b42fc 100644
--- a/providers/openflow/message/features.xml
+++ b/providers/openflow/message/features.xml
@@ -19,6 +19,6 @@
              description="${project.description}">
         <feature>onos-api</feature>
         <bundle>mvn:${project.groupId}/onos-providers-openflow-message/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-cpman-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-cpman-api/${project.version}</bundle>
     </feature>
 </features>
diff --git a/providers/openflow/message/pom.xml b/providers/openflow/message/pom.xml
index 1f5c9b8..e6eeb11 100644
--- a/providers/openflow/message/pom.xml
+++ b/providers/openflow/message/pom.xml
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-cpman-api</artifactId>
+            <artifactId>onos-apps-cpman-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>