diff --git a/BUCK b/BUCK
index 71efbd2..3336d39 100644
--- a/BUCK
+++ b/BUCK
@@ -26,8 +26,8 @@
     '//protocols/bgp/bgpio:onos-bgpio',
     '//protocols/bgp/api:onos-bgp-api',
     '//protocols/bgp/ctl:onos-bgp-ctl',
-    '//protocols/netconf/api:onos-netconf-api',
-    '//protocols/netconf/ctl:onos-netconf-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',
@@ -54,24 +54,13 @@
     '//drivers/netconf:onos-drivers-netconf',
     '//drivers/ovsdb:onos-drivers-ovsdb',
 
-    '//providers/bgp/cfg:onos-bgp-provider-cfg',
-    '//providers/bgp/flow:onos-bgp-provider-flow',
-    '//providers/bgp/topology:onos-bgp-provider-topology',
-    '//providers/host:onos-host-provider',
-    '//providers/lldpcommon:onos-lldp-provider-common',
-    '//providers/netcfglinks:onos-netcfg-links-provider',
-    '//providers/lldp:onos-lldp-provider',
-    '//providers/netconf/device:onos-netconf-provider-device',
-    '//providers/netcfghost:onos-netcfg-links-provider',
-    '//providers/null:onos-null-providers',
-    '//providers/openflow/device:onos-of-provider-device',
-    '//providers/openflow/flow:onos-of-provider-flow',
-    '//providers/openflow/group:onos-of-provider-group',
-    '//providers/openflow/message:onos-of-provider-message',
-    '//providers/openflow/meter:onos-of-provider-meter',
-    '//providers/openflow/packet:onos-of-provider-packet',
+    '//providers/netconf/device:onos-providers-netconf-device',
+    '//providers/openflow/device:onos-providers-openflow-device',
+    '//providers/openflow/packet:onos-providers-openflow-packet',
+    '//providers/openflow/flow:onos-providers-openflow-flow',
+    '//providers/openflow/group:onos-providers-openflow-group',
+    '//providers/openflow/meter:onos-providers-openflow-meter',
     '//providers/ovsdb/device:onos-ovsdb-provider-device',
-    '//providers/ovsdb/host:onos-ovsdb-provider-host',
     '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel',
     '//providers/rest/device:onos-restsb-provider-device',
     '//providers/snmp/device:onos-snmp-provider-device',
@@ -81,8 +70,20 @@
 ]
 
 APPS = [
-    '//providers/pcep:onos-providers-pcep-oar',
+    # Providers
+    '//providers/bgp:onos-providers-bgp-oar',
+    '//providers/host:onos-providers-host-oar',
+    '//providers/lldp:onos-providers-lldp-oar',
+    '//providers/netcfghost:onos-providers-netcfghost-oar',
+    '//providers/netcfglinks:onos-providers-netcfglinks-oar',
+    '//providers/netconf:onos-providers-netconf-oar',
+    '//providers/openflow/message:onos-providers-openflow-message-oar',
     '//providers/ovsdb:onos-providers-ovsdb-oar',
+    '//providers/pcep:onos-providers-pcep-oar',
+    '//providers/null:onos-providers-null-oar',
+    '//providers/openflow/base:onos-providers-openflow-base-oar',
+
+    # Apps
     '//apps/dhcp:onos-apps-dhcp-oar',
     '//apps/fwd:onos-apps-fwd-oar',
     '//apps/aaa:onos-apps-aaa-oar',
@@ -117,11 +118,11 @@
     '//apps/vtn:onos-apps-vtn-oar',
     '//apps/faultmanagement:onos-apps-faultmanagement-oar',
     '//apps/openstacknode:onos-apps-openstacknode-oar',
+    '//apps/cpman/app:onos-apps-cpman-app-oar',
 ]
 
 APP_JARS = [
-    '//apps/cpman/api:onos-app-cpman-api',
-    '//apps/cpman/app:onos-app-cpman-app',
+    '//apps/cpman/api:onos-apps-cpman-api',
     '//apps/routing-api:onos-apps-routing-api',
     '//apps/cip:onos-app-cip',
     '//apps/dhcp/api:onos-apps-dhcp-api',