diff --git a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepDpid.java b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepDpid.java
index e736090..5e8d5bd 100644
--- a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepDpid.java
+++ b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepDpid.java
@@ -25,7 +25,7 @@
  */
 public final class PcepDpid {
 
-    private static final String SCHEME = "pcep";
+    private static final String SCHEME = "l3";
     private static final long UNKNOWN = 0;
     private long nodeId;
 
diff --git a/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java
index aadbee1..8baa5f0 100644
--- a/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java
+++ b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java
@@ -39,7 +39,7 @@
 public final class BgpDpid {
     private static final Logger log = LoggerFactory.getLogger(BgpDpid.class);
 
-    private static final String SCHEME = "bgp";
+    private static final String SCHEME = "l3";
     private static final long UNKNOWN = 0;
     private StringBuilder stringBuilder;
     public static final int NODE_DESCRIPTOR_LOCAL = 1;
diff --git a/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java
index 557beed..2d5ebba 100644
--- a/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java
+++ b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java
@@ -30,7 +30,7 @@
  */
 public final class BgpId extends Identifier<IpAddress> {
 
-    private static final String SCHEME = "bgp";
+    private static final String SCHEME = "l3";
     private static final long UNKNOWN = 0;
 
     /**
diff --git a/protocols/pcep/api/src/main/java/org/onosproject/pcep/controller/PccId.java b/protocols/pcep/api/src/main/java/org/onosproject/pcep/controller/PccId.java
old mode 100755
new mode 100644
index 278b82d..7af4261
--- a/protocols/pcep/api/src/main/java/org/onosproject/pcep/controller/PccId.java
+++ b/protocols/pcep/api/src/main/java/org/onosproject/pcep/controller/PccId.java
@@ -29,7 +29,7 @@
  */
 public final class PccId extends Identifier<IpAddress> {
 
-    private static final String SCHEME = "pcep";
+    private static final String SCHEME = "l3";
     private static final long UNKNOWN = 0;
 
     /**
diff --git a/providers/bgp/flow/BUCK b/providers/bgp/flow/BUCK
deleted file mode 100644
index 917fc34..0000000
--- a/providers/bgp/flow/BUCK
+++ /dev/null
@@ -1,8 +0,0 @@
-COMPILE_DEPS = [
-    '//lib:CORE_DEPS',
-    '//protocols/bgp/api:onos-bgp-api',
-]
-
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
-)
diff --git a/providers/bgp/flow/src/main/java/org/onosproject/provider/bgp/flow/impl/BgpFlowRuleProvider.java b/providers/bgp/flow/src/main/java/org/onosproject/provider/bgp/flow/impl/BgpFlowRuleProvider.java
deleted file mode 100755
index 8482e38..0000000
--- a/providers/bgp/flow/src/main/java/org/onosproject/provider/bgp/flow/impl/BgpFlowRuleProvider.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2016-present 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.
- */
-package org.onosproject.provider.bgp.flow.impl;
-
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onosproject.bgp.controller.BgpController;
-import org.onosproject.cfg.ComponentConfigService;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flow.FlowRuleBatchOperation;
-import org.onosproject.net.flow.FlowRuleProvider;
-import org.onosproject.net.flow.FlowRuleProviderRegistry;
-import org.onosproject.net.flow.FlowRuleProviderService;
-import org.onosproject.net.provider.AbstractProvider;
-import org.onosproject.net.provider.ProviderId;
-import org.osgi.service.component.ComponentContext;
-import org.slf4j.Logger;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Bgp Flow provider.
- */
-@Component(immediate = true)
-public class BgpFlowRuleProvider extends AbstractProvider
-        implements FlowRuleProvider {
-
-    private final Logger log = getLogger(getClass());
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected FlowRuleProviderRegistry providerRegistry;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ComponentConfigService cfgService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected BgpController bgpController;
-
-    private FlowRuleProviderService providerService;
-
-    /**
-     * Creates an BgpFlow host provider.
-     */
-    public BgpFlowRuleProvider() {
-        super(new ProviderId("bgp", "org.onosproject.provider.bgp"));
-    }
-
-    @Activate
-    public void activate(ComponentContext context) {
-        cfgService.registerProperties(getClass());
-        providerService = providerRegistry.register(this);
-    }
-
-    @Deactivate
-    public void deactivate(ComponentContext context) {
-        cfgService.unregisterProperties(getClass(), false);
-        providerRegistry.unregister(this);
-        providerService = null;
-    }
-
-    @Override
-    public void applyFlowRule(FlowRule... flowRules) {
-        for (FlowRule flowRule : flowRules) {
-            applyRule(flowRule);
-        }
-    }
-
-    private void applyRule(FlowRule flowRule) {
-        //TODO
-    }
-
-    @Override
-    public void removeFlowRule(FlowRule... flowRules) {
-        for (FlowRule flowRule : flowRules) {
-            removeRule(flowRule);
-        }
-    }
-
-    private void removeRule(FlowRule flowRule) {
-        //TODO
-    }
-
-    @Override
-    public void removeRulesById(ApplicationId id, FlowRule... flowRules) {
-        // TODO
-        removeFlowRule(flowRules);
-    }
-
-    @Override
-    public void executeBatch(FlowRuleBatchOperation batch) {
-    //TODO
-    }
-}
diff --git a/providers/bgp/pom.xml b/providers/bgp/pom.xml
index 5764f7d..4264c52 100755
--- a/providers/bgp/pom.xml
+++ b/providers/bgp/pom.xml
@@ -25,10 +25,9 @@
   <packaging>pom</packaging>
   <description>BGP-LS protocol providers root</description>
   <modules>
-  	<module>topology</module>
+        <module>topology</module>
         <module>cfg</module>
-  	<module>app</module>
-        <module>flow</module>
+        <module>app</module>
   </modules>
     <dependencies>
 
diff --git a/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java b/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java
old mode 100755
new mode 100644
index 82af9a9..0ac494c
--- a/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java
+++ b/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java
@@ -79,8 +79,11 @@
 @Component(immediate = true)
 public class BgpTopologyProvider extends AbstractProvider implements DeviceProvider, LinkProvider {
 
+    /**
+     * Creates an instance of BGP topology provider.
+     */
     public BgpTopologyProvider() {
-        super(new ProviderId("bgp", "org.onosproject.provider.bgp"));
+        super(new ProviderId("l3", "org.onosproject.provider.bgp"));
     }
 
     private static final Logger log = LoggerFactory.getLogger(BgpTopologyProvider.class);
diff --git a/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java b/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java
old mode 100755
new mode 100644
index d212fb4..7401fa5
--- a/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java
+++ b/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java
@@ -70,9 +70,9 @@
  * Test for BGP topology provider.
  */
 public class BgpTopologyProviderTest {
-    private static final DeviceId DID2 = DeviceId.deviceId("bgp:rd=0::routinguniverse=0:asn=10");
+    private static final DeviceId DID2 = DeviceId.deviceId("l3:rd=0::routinguniverse=0:asn=10");
     private static final String UNKNOWN = new String("unknown");
-    public static ProviderId providerId = new ProviderId("bgp", "foo");
+    public static ProviderId providerId = new ProviderId("l3", "foo");
 
     private final BgpTopologyProvider provider = new BgpTopologyProvider();
     private final TestDeviceRegistry nodeRegistry = new TestDeviceRegistry();
diff --git a/providers/bgpcep/flow/BUCK b/providers/bgpcep/flow/BUCK
new file mode 100644
index 0000000..28e1e81
--- /dev/null
+++ b/providers/bgpcep/flow/BUCK
@@ -0,0 +1,16 @@
+SRC = 'src/main/java/org/onosproject/**/'
+
+CURRENT_NAME = 'onos-bgpcep-provider-flow'
+CURRENT_TARGET = ':' + CURRENT_NAME
+
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//protocols/bgp/api:onos-bgp-api',
+]
+
+osgi_jar(
+    name = CURRENT_NAME,
+    srcs = glob([SRC + '/*.java']),
+    deps = COMPILE_DEPS,
+    visibility = ['PUBLIC'],
+)
diff --git a/providers/bgp/flow/pom.xml b/providers/bgpcep/flow/pom.xml
old mode 100755
new mode 100644
similarity index 87%
rename from providers/bgp/flow/pom.xml
rename to providers/bgpcep/flow/pom.xml
index c901115..55c65a1
--- a/providers/bgp/flow/pom.xml
+++ b/providers/bgpcep/flow/pom.xml
@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-bgp-providers</artifactId>
+        <artifactId>onos-bgpcep-providers</artifactId>
         <version>1.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-bgp-provider-flow</artifactId>
+    <artifactId>onos-bgpcep-provider-flow</artifactId>
     <packaging>bundle</packaging>
 
-    <description>ONOS BGP protocol flow provider</description>
+    <description>ONOS BGP-PCEP protocol flow provider</description>
 
     <dependencies>
         <dependency>
diff --git a/providers/bgpcep/flow/src/main/java/org/onosproject/provider/bgpcep/flow/impl/BgpcepFlowRuleProvider.java b/providers/bgpcep/flow/src/main/java/org/onosproject/provider/bgpcep/flow/impl/BgpcepFlowRuleProvider.java
new file mode 100644
index 0000000..3afbec4
--- /dev/null
+++ b/providers/bgpcep/flow/src/main/java/org/onosproject/provider/bgpcep/flow/impl/BgpcepFlowRuleProvider.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2016-present 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.
+ */
+package org.onosproject.provider.bgpcep.flow.impl;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.onosproject.bgp.controller.BgpController;
+import org.onosproject.cfg.ComponentConfigService;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.FlowRuleProvider;
+import org.onosproject.net.flow.FlowRuleProviderRegistry;
+import org.onosproject.net.flow.FlowRuleProviderService;
+import org.onosproject.net.flow.criteria.Criterion;
+import org.onosproject.net.provider.AbstractProvider;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.resource.ResourceService;
+import org.onosproject.pcep.controller.PcepClient;
+import org.onosproject.pcep.controller.PcepClientController;
+import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Implementation of BGP-PCEP flow provider.
+ */
+@Component(immediate = true)
+public class BgpcepFlowRuleProvider extends AbstractProvider
+        implements FlowRuleProvider {
+
+    private final Logger log = getLogger(getClass());
+
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected FlowRuleProviderRegistry providerRegistry;
+
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected ComponentConfigService cfgService;
+
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected BgpController bgpController;
+
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected PcepClientController pcepController;
+
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected ResourceService resourceService;
+
+    private FlowRuleProviderService providerService;
+
+    /**
+     * Creates a BgpFlow host provider.
+     */
+    public BgpcepFlowRuleProvider() {
+        super(new ProviderId("l3", "org.onosproject.provider.bgpcep"));
+    }
+
+    @Activate
+    public void activate(ComponentContext context) {
+        cfgService.registerProperties(getClass());
+        providerService = providerRegistry.register(this);
+        log.info("Started");
+    }
+
+    @Deactivate
+    public void deactivate(ComponentContext context) {
+        cfgService.unregisterProperties(getClass(), false);
+        providerRegistry.unregister(this);
+        providerService = null;
+        log.info("Stopped");
+    }
+
+    @Override
+    public void applyFlowRule(FlowRule... flowRules) {
+        for (FlowRule flowRule : flowRules) {
+            applyRule(flowRule);
+        }
+    }
+
+    private void applyRule(FlowRule flowRule) {
+        flowRule.selector().criteria()
+                .forEach(c -> {
+                    // If Criterion type is MPLS_LABEL, push labels through PCEP client
+                        if (c.type() == Criterion.Type.MPLS_LABEL) {
+                            PcepClient pcc;
+                            /** PCC client session is based on LSR ID, get the LSR ID for a specific device to
+                            push the flows */
+
+                            //TODO: commented code has dependency with other patch
+                     /*     Set<TeRouterId> lrsIds = resourceService.getAvailableResourceValues(Resources
+                                    .discrete(flowRule.deviceId()).id(), TeRouterId.class);
+
+                            lrsIds.forEach(lsrId ->
+                            {
+                                if (pcepController.getClient(PccId.pccId(lsrId)) != null) {
+                                    pcc = pcepController.getClient(PccId.pccId(lsrId));
+                                }
+                            });*/
+                            // TODO: Build message and send the PCEP label message via PCEP client
+                        } else {
+                            // TODO: Get the BGP peer based on deviceId and send the message
+                        }
+                    });
+    }
+
+    @Override
+    public void removeFlowRule(FlowRule... flowRules) {
+        for (FlowRule flowRule : flowRules) {
+            removeRule(flowRule);
+        }
+    }
+
+    private void removeRule(FlowRule flowRule) {
+        flowRule.selector().criteria()
+        .forEach(c -> {
+            // If Criterion type is MPLS_LABEL, remove the specified flow rules
+                if (c.type() == Criterion.Type.MPLS_LABEL) {
+                    PcepClient pcc;
+                    /** PCC client session is based on LSR ID, get the LSR ID for a specific device to
+                    push the flows */
+
+                    //TODO: commented code has dependency with other patch
+             /*     Set<TeRouterId> lrsIds = resourceService.getAvailableResourceValues(Resources
+                            .discrete(flowRule.deviceId()).id(), TeRouterId.class);
+
+                    lrsIds.forEach(lsrId ->
+                    {
+                        if (pcepController.getClient(PccId.pccId(lsrId)) != null) {
+                            pcc = pcepController.getClient(PccId.pccId(lsrId));
+                        }
+                    });*/
+                    // TODO: Build message and send the PCEP label message via PCEP client
+                } else {
+                    // TODO: Get the BGP peer based on deviceId and send the message
+                }
+            });
+    }
+
+    @Override
+    public void removeRulesById(ApplicationId id, FlowRule... flowRules) {
+        // TODO
+        removeFlowRule(flowRules);
+    }
+
+    @Override
+    public void executeBatch(FlowRuleBatchOperation batch) {
+    //TODO
+    }
+}
diff --git a/providers/bgp/flow/src/main/java/org/onosproject/provider/bgp/flow/impl/package-info.java b/providers/bgpcep/flow/src/main/java/org/onosproject/provider/bgpcep/flow/impl/package-info.java
old mode 100755
new mode 100644
similarity index 86%
rename from providers/bgp/flow/src/main/java/org/onosproject/provider/bgp/flow/impl/package-info.java
rename to providers/bgpcep/flow/src/main/java/org/onosproject/provider/bgpcep/flow/impl/package-info.java
index bacbbec..2faf4f0
--- a/providers/bgp/flow/src/main/java/org/onosproject/provider/bgp/flow/impl/package-info.java
+++ b/providers/bgpcep/flow/src/main/java/org/onosproject/provider/bgpcep/flow/impl/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * Bgp Flow provider.
+ * Representation of BGP-PCEP flow provider.
  */
-package org.onosproject.provider.bgp.flow.impl;
+package org.onosproject.provider.bgpcep.flow.impl;
diff --git a/providers/bgpcep/pom.xml b/providers/bgpcep/pom.xml
new file mode 100644
index 0000000..aace6ff
--- /dev/null
+++ b/providers/bgpcep/pom.xml
@@ -0,0 +1,47 @@
+<!--
+  ~ Copyright 2016-present 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.
+  -->
+<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>
+  <parent>
+    <groupId>org.onosproject</groupId>
+    <artifactId>onos-providers</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>onos-bgpcep-providers</artifactId>
+  <packaging>pom</packaging>
+
+  <description>BGPCEP providers root</description>
+
+  <modules>
+        <module>flow</module>
+  </modules>
+
+  <dependencies>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-pcep-controller-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-bgp-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+  </dependencies>
+
+</project>
diff --git a/providers/pcep/topology/src/main/java/org/onosproject/provider/pcep/topology/impl/PcepTopologyProvider.java b/providers/pcep/topology/src/main/java/org/onosproject/provider/pcep/topology/impl/PcepTopologyProvider.java
index c5257eb..75a53f3 100644
--- a/providers/pcep/topology/src/main/java/org/onosproject/provider/pcep/topology/impl/PcepTopologyProvider.java
+++ b/providers/pcep/topology/src/main/java/org/onosproject/provider/pcep/topology/impl/PcepTopologyProvider.java
@@ -81,8 +81,11 @@
 public class PcepTopologyProvider extends AbstractProvider
         implements LinkProvider, DeviceProvider {
 
+    /**
+     * Creates instance of PCEP topology provider.
+     */
     public PcepTopologyProvider() {
-        super(new ProviderId("pcep", "org.onosproject.provider.pcep"));
+        super(new ProviderId("l3", "org.onosproject.provider.pcep"));
     }
 
     private static final Logger log = LoggerFactory
diff --git a/providers/pom.xml b/providers/pom.xml
index 20f51ec..c7e8f86 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -40,6 +40,7 @@
         <module>pcep</module>
         <module>ovsdb</module>
         <module>bgp</module>
+        <module>bgpcep</module>
         <module>snmp</module>
         <module>rest</module>
         <module>lldpcommon</module>