diff --git a/apps/l3vpn/pom.xml b/apps/l3vpn/pom.xml
index 9537fc3..a3e08f9 100644
--- a/apps/l3vpn/pom.xml
+++ b/apps/l3vpn/pom.xml
@@ -63,5 +63,16 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-pce-app</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-incubator-api</artifactId>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/apps/pce/app/pom.xml b/apps/pce/app/pom.xml
index 5f4a7e9..e2d54ed 100644
--- a/apps/pce/app/pom.xml
+++ b/apps/pce/app/pom.xml
@@ -20,10 +20,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-pce</artifactId>
+        <artifactId>onos-apps-pce</artifactId>
         <version>1.12.0-SNAPSHOT</version>
     </parent>
-    <artifactId>onos-app-pce</artifactId>
+    <artifactId>onos-apps-pce-app</artifactId>
     <packaging>bundle</packaging>
 
     <description>PCE as central controller</description>
@@ -103,7 +103,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pcep-api</artifactId>
+            <artifactId>onos-apps-pcep-api</artifactId>
         </dependency>
        <dependency>
            <groupId>org.easymock</groupId>
diff --git a/apps/pce/bandwidthmgmt/pom.xml b/apps/pce/bandwidthmgmt/pom.xml
index 533cf09..8cbe630 100644
--- a/apps/pce/bandwidthmgmt/pom.xml
+++ b/apps/pce/bandwidthmgmt/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-pce</artifactId>
+        <artifactId>onos-apps-pce</artifactId>
         <version>1.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>onos-app-bandwidthmgmt</artifactId>
@@ -39,7 +39,7 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pcep-api</artifactId>
+            <artifactId>onos-apps-pcep-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
diff --git a/apps/pce/pcerest/pom.xml b/apps/pce/pcerest/pom.xml
index 6e791e6..d195081 100644
--- a/apps/pce/pcerest/pom.xml
+++ b/apps/pce/pcerest/pom.xml
@@ -21,12 +21,12 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-pce</artifactId>
+        <artifactId>onos-apps-pce</artifactId>
         <version>1.12.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-app-pcerest</artifactId>
+    <artifactId>onos-apps-pce-pcerest</artifactId>
     <packaging>bundle</packaging>
     <properties>
         <web.context>/onos/pce</web.context>
@@ -94,7 +94,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pce</artifactId>
+            <artifactId>onos-apps-pce-app</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/apps/pce/pceweb/pom.xml b/apps/pce/pceweb/pom.xml
index 79ab569..f7821f2 100644
--- a/apps/pce/pceweb/pom.xml
+++ b/apps/pce/pceweb/pom.xml
@@ -21,11 +21,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-pce</artifactId>
+        <artifactId>onos-apps-pce</artifactId>
         <version>1.12.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>onos-app-pceweb</artifactId>
+    <artifactId>onos-apps-pce-pceweb</artifactId>
     <packaging>bundle</packaging>
 
     <description>PCE web application</description>
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pce</artifactId>
+            <artifactId>onos-apps-pce-app</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/apps/pce/pom.xml b/apps/pce/pom.xml
index e66949d..29d57af 100644
--- a/apps/pce/pom.xml
+++ b/apps/pce/pom.xml
@@ -24,7 +24,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onos-pce</artifactId>
+    <artifactId>onos-apps-pce</artifactId>
 
     <packaging>pom</packaging>
     <description>PCE as central controller</description>
diff --git a/apps/pcep-api/pom.xml b/apps/pcep-api/pom.xml
index 52f1a9e..a2d899d 100644
--- a/apps/pcep-api/pom.xml
+++ b/apps/pcep-api/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>onos-apps</artifactId>
         <version>1.12.0-SNAPSHOT</version>
     </parent>
-    <artifactId>onos-app-pcep-api</artifactId>
+    <artifactId>onos-apps-pcep-api</artifactId>
     <packaging>bundle</packaging>
 
     <description>PCEP protocol API</description>
diff --git a/pom.xml b/pom.xml
index 10e3215..579d9e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
             </dependency>
             <dependency>
                 <groupId>org.onosproject</groupId>
-                <artifactId>onos-app-pcep-api</artifactId>
+                <artifactId>onos-apps-pcep-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
diff --git a/protocols/pcep/server/api/pom.xml b/protocols/pcep/server/api/pom.xml
index 0861ad3..b4ff66a 100644
--- a/protocols/pcep/server/api/pom.xml
+++ b/protocols/pcep/server/api/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pcep-api</artifactId>
+            <artifactId>onos-apps-pcep-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
diff --git a/providers/bgp/app/app.xml b/providers/bgp/app/app.xml
index ae8e931..002e8a3 100644
--- a/providers/bgp/app/app.xml
+++ b/providers/bgp/app/app.xml
@@ -27,11 +27,11 @@
     <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-pcepio/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-pcep-api/${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>
     <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-app-pce/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-pceweb/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-pcerest/${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>
 </app>
diff --git a/providers/bgp/app/features.xml b/providers/bgp/app/features.xml
index bf1e82c..e43f009 100644
--- a/providers/bgp/app/features.xml
+++ b/providers/bgp/app/features.xml
@@ -26,12 +26,12 @@
         <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-pcepio/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-pcep-api/${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>
         <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-pce/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-pceweb/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-pcerest/${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-apps-pce-pcerest/${project.version}</bundle>
     </feature>
 </features>
diff --git a/providers/bgp/app/pom.xml b/providers/bgp/app/pom.xml
index 8e5bcef..d2266d4 100644
--- a/providers/bgp/app/pom.xml
+++ b/providers/bgp/app/pom.xml
@@ -53,17 +53,17 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pce</artifactId>
+            <artifactId>onos-apps-pce-app</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pceweb</artifactId>
+            <artifactId>onos-apps-pce-pceweb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pcerest</artifactId>
+            <artifactId>onos-apps-pce-pcerest</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/providers/bgp/topology/pom.xml b/providers/bgp/topology/pom.xml
index 843efaf..4cd58ce 100644
--- a/providers/bgp/topology/pom.xml
+++ b/providers/bgp/topology/pom.xml
@@ -30,7 +30,7 @@
                 </dependency>
             <dependency>
                 <groupId>org.onosproject</groupId>
-                <artifactId>onos-app-pcep-api</artifactId>
+                <artifactId>onos-apps-pcep-api</artifactId>
             </dependency>
         </dependencies>
 </project>
diff --git a/providers/bgpcep/app/app.xml b/providers/bgpcep/app/app.xml
index 4051c53..635a32b 100644
--- a/providers/bgpcep/app/app.xml
+++ b/providers/bgpcep/app/app.xml
@@ -23,7 +23,7 @@
     <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-pcepio/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-pcep-api/${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>
@@ -31,8 +31,8 @@
     <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-app-pce/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-pceweb/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-pcerest/${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>
 </app>
diff --git a/providers/bgpcep/app/features.xml b/providers/bgpcep/app/features.xml
index bad2534..d7a3363 100644
--- a/providers/bgpcep/app/features.xml
+++ b/providers/bgpcep/app/features.xml
@@ -25,14 +25,14 @@
         <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-pcepio/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-pcep-api/${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>
         <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-pce/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-pceweb/${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-app-pcerest/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-pce-pcerest/${project.version}</bundle>
 	<bundle>mvn:${project.groupId}/onos-app-bandwidthmgmt/${project.version}</bundle>
     </feature>
 </features>
diff --git a/providers/bgpcep/app/pom.xml b/providers/bgpcep/app/pom.xml
index 3aa3931..61401a7 100644
--- a/providers/bgpcep/app/pom.xml
+++ b/providers/bgpcep/app/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pcep-api</artifactId>
+            <artifactId>onos-apps-pcep-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
@@ -75,12 +75,12 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pce</artifactId>
+            <artifactId>onos-apps-pce-app</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pceweb</artifactId>
+            <artifactId>onos-apps-pce-pceweb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -90,7 +90,7 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pcerest</artifactId>
+            <artifactId>onos-apps-pce-pcerest</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/providers/pcep/app/app.xml b/providers/pcep/app/app.xml
index 00058f6..a5e4594 100644
--- a/providers/pcep/app/app.xml
+++ b/providers/pcep/app/app.xml
@@ -19,7 +19,7 @@
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-apps-pcep-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcepio/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-server-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-server-impl/${project.version}</artifact>
diff --git a/providers/pcep/app/features.xml b/providers/pcep/app/features.xml
index 77cbc77..08bb24f 100644
--- a/providers/pcep/app/features.xml
+++ b/providers/pcep/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-pcep-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-apps-pcep-api/${project.version}</bundle>
     <bundle>mvn:${project.groupId}/onos-pcepio/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-server-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-server-impl/${project.version}</bundle>
diff --git a/providers/pcep/app/pom.xml b/providers/pcep/app/pom.xml
index cb5989e..59f3158 100644
--- a/providers/pcep/app/pom.xml
+++ b/providers/pcep/app/pom.xml
@@ -31,7 +31,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pcep-api</artifactId>
+            <artifactId>onos-apps-pcep-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
diff --git a/providers/pcep/topology/pom.xml b/providers/pcep/topology/pom.xml
index 8421bd7..1edf688 100644
--- a/providers/pcep/topology/pom.xml
+++ b/providers/pcep/topology/pom.xml
@@ -26,7 +26,7 @@
      <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pcep-api</artifactId>
+            <artifactId>onos-apps-pcep-api</artifactId>
         </dependency>
         <dependency>
         <groupId>org.onosproject</groupId>
diff --git a/providers/pcep/tunnel/pom.xml b/providers/pcep/tunnel/pom.xml
index 3cf600b..3c5e4d8 100644
--- a/providers/pcep/tunnel/pom.xml
+++ b/providers/pcep/tunnel/pom.xml
@@ -27,7 +27,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-pcep-api</artifactId>
+            <artifactId>onos-apps-pcep-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>