diff --git a/BUCK b/BUCK
index 2f71002..0fd1df6 100644
--- a/BUCK
+++ b/BUCK
@@ -23,26 +23,27 @@
 
     '//protocols/rest/api:onos-protocols-rest-api',
     '//protocols/rest/ctl:onos-protocols-rest-ctl',
-    '//protocols/bgp/bgpio:onos-bgpio',
-    '//protocols/bgp/api:onos-bgp-api',
-    '//protocols/bgp/ctl:onos-bgp-ctl',
+    '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
+    '//protocols/bgp/api:onos-protocols-bgp-api',
+    '//protocols/bgp/ctl:onos-protocols-bgp-ctl',
     '//protocols/netconf/api:onos-protocols-netconf-api',
     '//protocols/netconf/ctl:onos-protocols-netconf-ctl',
-    '//protocols/openflow/api:onos-of-api',
-    '//protocols/openflow/ctl:onos-of-ctl',
-    '//protocols/ospf/api:onos-ospf-api',
-    '//protocols/ospf/protocol:onos-ospf-protocol',
-    '//protocols/ospf/ctl:onos-ospf-ctl',
-    '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
-    '//protocols/ovsdb/api:onos-ovsdb-api',
-    '//protocols/ovsdb/ctl:onos-ovsdb-ctl',
-    '//protocols/pcep/pcepio:onos-pcep-pcepio',
-    '//protocols/pcep/api:onos-pcep-controller-api',
-    '//protocols/pcep/ctl:onos-pcep-ctl',
-    '//protocols/snmp/api:onos-snmp-api',
-    '//protocols/snmp/ctl:onos-snmp-ctl',
-    '//protocols/isis:onos-isis-api',
-    '//protocols/isis:onos-isis-isisio',
+    '//protocols/openflow/api:onos-protocols-openflow-api',
+    '//protocols/openflow/ctl:onos-protocols-openflow-ctl',
+    '//protocols/ospf/api:onos-protocols-ospf-api',
+    '//protocols/ospf/protocol:onos-protocols-ospf-protocol',
+    '//protocols/ospf/ctl:onos-protocols-ospf-ctl',
+    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
+    '//protocols/ovsdb/ctl:onos-protocols-ovsdb-ctl',
+    '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
+    '//protocols/pcep/api:onos-protocols-pcep-api',
+    '//protocols/pcep/ctl:onos-protocols-pcep-ctl',
+    '//protocols/snmp/api:onos-protocols-snmp-api',
+    '//protocols/snmp/ctl:onos-protocols-snmp-ctl',
+    '//protocols/isis/api:onos-protocols-isis-api',
+    '//protocols/isis/ctl:onos-protocols-isis-ctl',
+    '//protocols/isis/isisio:onos-protocols-isis-isisio',
 
     '//drivers/utilities:onos-drivers-utilities',
     '//drivers/bti:onos-drivers-bti-oar',
@@ -64,6 +65,8 @@
     '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel',
     '//providers/rest/device:onos-providers-rest-device',
     '//providers/snmp/device:onos-providers-snmp-device',
+    '//providers/isis/cfg:onos-providers-isis-cfg',
+    '//providers/isis/device:onos-providers-isis-device',
 
     '//web/api:onos-rest',
     '//web/gui:onos-gui',
@@ -83,6 +86,7 @@
     '//providers/null:onos-providers-null-oar',
     '//providers/openflow/base:onos-providers-openflow-base-oar',
     '//providers/rest:onos-providers-rest-oar',
+    '//providers/isis:onos-providers-isis-oar',
 
     # Apps
     '//apps/dhcp:onos-apps-dhcp-oar',