diff --git a/providers/bgp/BUCK b/providers/bgp/BUCK
index c526f55..b29b52d 100644
--- a/providers/bgp/BUCK
+++ b/providers/bgp/BUCK
@@ -1,10 +1,10 @@
 BUNDLES = [
     '//providers/bgp/cfg:onos-providers-bgp-cfg',
-    '//providers/bgp/flow:onos-providers-bgp-flow',
+    #'//providers/bgp/flow:onos-providers-bgp-flow',
     '//providers/bgp/topology:onos-providers-bgp-topology',
-    '//protocols/bgp/api:onos-bgp-api',
-    '//protocols/bgp/ctl:onos-bgp-ctl',
-    '//protocols/bgp/bgpio:onos-bgpio',
+    '//protocols/bgp/api:onos-protocols-bgp-api',
+    '//protocols/bgp/ctl:onos-protocols-bgp-ctl',
+    '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
 ]
 
 onos_app (
diff --git a/providers/bgp/cfg/BUCK b/providers/bgp/cfg/BUCK
index 917fc34..431010a 100644
--- a/providers/bgp/cfg/BUCK
+++ b/providers/bgp/cfg/BUCK
@@ -1,6 +1,6 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//protocols/bgp/api:onos-bgp-api',
+    '//protocols/bgp/api:onos-protocols-bgp-api',
 ]
 
 osgi_jar_with_tests (
diff --git a/providers/bgp/topology/BUCK b/providers/bgp/topology/BUCK
index e4e7041..657ed56 100644
--- a/providers/bgp/topology/BUCK
+++ b/providers/bgp/topology/BUCK
@@ -1,7 +1,7 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//protocols/bgp/api:onos-bgp-api',
-    '//protocols/bgp/bgpio:onos-bgpio',
+    '//protocols/bgp/api:onos-protocols-bgp-api',
+    '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
     '//incubator/store:onos-incubator-store',
 ]
 
diff --git a/providers/bgpcep/flow/BUCK b/providers/bgpcep/flow/BUCK
index 28e1e81..b3468de 100644
--- a/providers/bgpcep/flow/BUCK
+++ b/providers/bgpcep/flow/BUCK
@@ -1,16 +1,18 @@
-SRC = 'src/main/java/org/onosproject/**/'
+# FIXME - BGCEP got moved
 
-CURRENT_NAME = 'onos-bgpcep-provider-flow'
-CURRENT_TARGET = ':' + CURRENT_NAME
+#SRC = 'src/main/java/org/onosproject/**/'
 
-COMPILE_DEPS = [
-    '//lib:CORE_DEPS',
-    '//protocols/bgp/api:onos-bgp-api',
-]
+#CURRENT_NAME = 'onos-bgpcep-provider-flow'
+#CURRENT_TARGET = ':' + CURRENT_NAME
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
-    deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
-)
+#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/isis/BUCK b/providers/isis/BUCK
new file mode 100644
index 0000000..1663d60
--- /dev/null
+++ b/providers/isis/BUCK
@@ -0,0 +1,16 @@
+BUNDLES = [
+    '//protocols/isis/api:onos-protocols-isis-api',
+    '//protocols/isis/ctl:onos-protocols-isis-ctl',
+    '//protocols/isis/isisio:onos-protocols-isis-isisio',
+    '//providers/isis/cfg:onos-providers-isis-cfg',
+    '//providers/isis/device:onos-providers-isis-device',
+]
+
+onos_app (
+    title = 'ISIS Provider',
+    category = 'Provider',
+    url = 'http://onosproject.org',
+    description = 'ONOS ISIS protocol adapters.',
+    included_bundles = BUNDLES,
+)
+
diff --git a/providers/isis/cfg/BUCK b/providers/isis/cfg/BUCK
new file mode 100644
index 0000000..6ff859a
--- /dev/null
+++ b/providers/isis/cfg/BUCK
@@ -0,0 +1,9 @@
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//protocols/isis/api:onos-protocols-isis-api',
+]
+
+osgi_jar_with_tests (
+    deps = COMPILE_DEPS,
+)
+
diff --git a/providers/isis/device/BUCK b/providers/isis/device/BUCK
new file mode 100644
index 0000000..6ff859a
--- /dev/null
+++ b/providers/isis/device/BUCK
@@ -0,0 +1,9 @@
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//protocols/isis/api:onos-protocols-isis-api',
+]
+
+osgi_jar_with_tests (
+    deps = COMPILE_DEPS,
+)
+
diff --git a/providers/openflow/base/BUCK b/providers/openflow/base/BUCK
index 2d3cbfa..a621b93 100644
--- a/providers/openflow/base/BUCK
+++ b/providers/openflow/base/BUCK
@@ -1,7 +1,7 @@
 BUNDLES = [
     '//lib:openflowj',
-    '//protocols/openflow/api:onos-of-api',
-    '//protocols/openflow/ctl:onos-of-ctl',
+    '//protocols/openflow/api:onos-protocols-openflow-api',
+    '//protocols/openflow/ctl:onos-protocols-openflow-ctl',
     '//providers/openflow/device:onos-providers-openflow-device',
     '//providers/openflow/packet:onos-providers-openflow-packet',
     '//providers/openflow/flow:onos-providers-openflow-flow',
diff --git a/providers/openflow/device/BUCK b/providers/openflow/device/BUCK
index 11599d5..b498b34 100644
--- a/providers/openflow/device/BUCK
+++ b/providers/openflow/device/BUCK
@@ -1,7 +1,7 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:openflowj',
-    '//protocols/openflow/api:onos-of-api',
+    '//protocols/openflow/api:onos-protocols-openflow-api',
 ]
 
 TEST_DEPS = [
diff --git a/providers/openflow/flow/BUCK b/providers/openflow/flow/BUCK
index d575458..cacd1b1 100644
--- a/providers/openflow/flow/BUCK
+++ b/providers/openflow/flow/BUCK
@@ -1,7 +1,7 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:openflowj',
-    '//protocols/openflow/api:onos-of-api',
+    '//protocols/openflow/api:onos-protocols-openflow-api',
 ]
 
 osgi_jar_with_tests (
diff --git a/providers/openflow/group/BUCK b/providers/openflow/group/BUCK
index 44ad141..e76cb53 100644
--- a/providers/openflow/group/BUCK
+++ b/providers/openflow/group/BUCK
@@ -1,7 +1,7 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:openflowj',
-    '//protocols/openflow/api:onos-of-api',
+    '//protocols/openflow/api:onos-protocols-openflow-api',
     '//providers/openflow/flow:onos-providers-openflow-flow',
 ]
 
diff --git a/providers/openflow/message/BUCK b/providers/openflow/message/BUCK
index 8e7da43..b9caae2 100644
--- a/providers/openflow/message/BUCK
+++ b/providers/openflow/message/BUCK
@@ -1,7 +1,7 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:openflowj',
-    '//protocols/openflow/api:onos-of-api',
+    '//protocols/openflow/api:onos-protocols-openflow-api',
     '//apps/cpman/api:onos-apps-cpman-api',
 ]
 
diff --git a/providers/openflow/meter/BUCK b/providers/openflow/meter/BUCK
index 6e986a7..a2e289d 100644
--- a/providers/openflow/meter/BUCK
+++ b/providers/openflow/meter/BUCK
@@ -1,7 +1,7 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:openflowj',
-    '//protocols/openflow/api:onos-of-api',
+    '//protocols/openflow/api:onos-protocols-openflow-api',
 ]
 
 osgi_jar_with_tests (
diff --git a/providers/openflow/packet/BUCK b/providers/openflow/packet/BUCK
index d575458..cacd1b1 100644
--- a/providers/openflow/packet/BUCK
+++ b/providers/openflow/packet/BUCK
@@ -1,7 +1,7 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:openflowj',
-    '//protocols/openflow/api:onos-of-api',
+    '//protocols/openflow/api:onos-protocols-openflow-api',
 ]
 
 osgi_jar_with_tests (
diff --git a/providers/ovsdb/device/BUCK b/providers/ovsdb/device/BUCK
index 7e1832f..58f5c86 100644
--- a/providers/ovsdb/device/BUCK
+++ b/providers/ovsdb/device/BUCK
@@ -6,8 +6,8 @@
 
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//protocols/ovsdb/api:onos-ovsdb-api',
-    '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
+    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
 ]
 
 TEST_DEPS = [
diff --git a/providers/ovsdb/host/BUCK b/providers/ovsdb/host/BUCK
index 2cfac8a..82aaf13 100644
--- a/providers/ovsdb/host/BUCK
+++ b/providers/ovsdb/host/BUCK
@@ -6,8 +6,8 @@
 
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//protocols/ovsdb/api:onos-ovsdb-api',
-    '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
+    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
 ]
 
 TEST_DEPS = [
diff --git a/providers/ovsdb/tunnel/BUCK b/providers/ovsdb/tunnel/BUCK
index b41d04f..a6087d0 100644
--- a/providers/ovsdb/tunnel/BUCK
+++ b/providers/ovsdb/tunnel/BUCK
@@ -6,8 +6,8 @@
 
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//protocols/ovsdb/api:onos-ovsdb-api',
-    '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
+    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
     '//incubator/api:onos-incubator-api',
 ]
 
diff --git a/providers/pcep/BUCK b/providers/pcep/BUCK
index e333fc9..8bf9406 100644
--- a/providers/pcep/BUCK
+++ b/providers/pcep/BUCK
@@ -1,8 +1,8 @@
 BUNDLES = [
     '//providers/pcep/topology:onos-providers-pcep-topology',
     '//providers/pcep/tunnel:onos-providers-pcep-tunnel',
-    '//protocols/pcep/api:onos-pcep-controller-api',
-    '//protocols/pcep/pcepio:onos-pcep-pcepio',
+    '//protocols/pcep/api:onos-protocols-pcep-api',
+    '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
 ]
 
 onos_app (
diff --git a/providers/pcep/topology/BUCK b/providers/pcep/topology/BUCK
index 306fff8..56ba605 100644
--- a/providers/pcep/topology/BUCK
+++ b/providers/pcep/topology/BUCK
@@ -1,7 +1,7 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//protocols/ovsdb/api:onos-ovsdb-api',
-    '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
+    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
     '//apps/pcep-api:onos-apps-pcep-api',
 ]
 
diff --git a/providers/pcep/tunnel/BUCK b/providers/pcep/tunnel/BUCK
index f794963..ce09ba2 100644
--- a/providers/pcep/tunnel/BUCK
+++ b/providers/pcep/tunnel/BUCK
@@ -1,11 +1,11 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//protocols/ovsdb/api:onos-ovsdb-api',
-    '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
+    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
     '//apps/pcep-api:onos-apps-pcep-api',
     '//incubator/api:onos-incubator-api',
-    '//protocols/pcep/pcepio:onos-pcep-pcepio',
-    '//protocols/pcep/api:onos-pcep-controller-api',
+    '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
+    '//protocols/pcep/api:onos-protocols-pcep-api',
 ]
 
 TEST_DEPS = [
diff --git a/providers/rest/device/BUCK b/providers/rest/device/BUCK
index 7a3667f..0538438 100644
--- a/providers/rest/device/BUCK
+++ b/providers/rest/device/BUCK
@@ -1,7 +1,7 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//protocols/ovsdb/api:onos-ovsdb-api',
-    '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
+    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
     '//apps/pcep-api:onos-apps-pcep-api',
     '//incubator/api:onos-incubator-api',
     '//protocols/rest/api:onos-protocols-rest-api',
diff --git a/providers/snmp/device/BUCK b/providers/snmp/device/BUCK
index 5d766f4..d222d2c 100644
--- a/providers/snmp/device/BUCK
+++ b/providers/snmp/device/BUCK
@@ -6,8 +6,8 @@
     '//lib:mibs-net-snmp',
     '//lib:mibs-rfc',
     '//incubator/api:onos-incubator-api',
-    '//protocols/snmp/api:onos-snmp-api',
-    '//protocols/snmp/ctl:onos-snmp-ctl',
+    '//protocols/snmp/api:onos-protocols-snmp-api',
+    '//protocols/snmp/ctl:onos-protocols-snmp-ctl',
 ]
 
 osgi_jar_with_tests (