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>