diff --git a/BUCK b/BUCK
index 5eda6bf..90c49d5 100644
--- a/BUCK
+++ b/BUCK
@@ -21,8 +21,8 @@
 
     '//cli:onos-cli',
 
-    '//protocols/rest/api:onos-restsb-api',
-    '//protocols/rest/ctl:onos-restsb-ctl',
+    '//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',
@@ -62,8 +62,8 @@
     '//providers/openflow/meter:onos-providers-openflow-meter',
     '//providers/ovsdb/device:onos-ovsdb-provider-device',
     '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel',
-    '//providers/rest/device:onos-restsb-provider-device',
-    '//providers/snmp/device:onos-snmp-provider-device',
+    '//providers/rest/device:onos-providers-rest-device',
+    '//providers/snmp/device:onos-providers-snmp-device',
 
     '//web/api:onos-rest',
     '//web/gui:onos-gui',
@@ -82,6 +82,7 @@
     '//providers/pcep:onos-providers-pcep-oar',
     '//providers/null:onos-providers-null-oar',
     '//providers/openflow/base:onos-providers-openflow-base-oar',
+    '//providers/rest:onos-providers-rest-oar',
 
     # Apps
     '//apps/dhcp:onos-apps-dhcp-oar',
diff --git a/drivers/ciena/BUCK b/drivers/ciena/BUCK
index a366702..74c3cd8 100644
--- a/drivers/ciena/BUCK
+++ b/drivers/ciena/BUCK
@@ -8,7 +8,7 @@
     '//incubator/api:onos-incubator-api',
     '//utils/rest:onlab-rest',
     '//drivers/utilities:onos-drivers-utilities',
-    '//protocols/rest/api:onos-restsb-api',
+    '//protocols/rest/api:onos-protocols-rest-api',
 ]
 
 osgi_jar(
diff --git a/protocols/rest/api/BUCK b/protocols/rest/api/BUCK
index 509253b..95edc2e 100644
--- a/protocols/rest/api/BUCK
+++ b/protocols/rest/api/BUCK
@@ -1,17 +1,9 @@
-SRC = 'src/main/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-restsb-api'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
     '//utils/rest:onlab-rest',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
 )
diff --git a/protocols/rest/ctl/BUCK b/protocols/rest/ctl/BUCK
index 613ac99..c6ef03d 100644
--- a/protocols/rest/ctl/BUCK
+++ b/protocols/rest/ctl/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-restsb-ctl'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:jersey-client',
@@ -14,25 +9,14 @@
     '//lib:jersey-guava',
     '//lib:aopalliance-repackaged',
     '//lib:javax.inject',
-    '//protocols/rest/api:onos-restsb-api',
+    '//protocols/rest/api:onos-protocols-rest-api',
 ]
 
 TEST_DEPS = [
     '//lib:TEST',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
 )
 
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)
diff --git a/providers/rest/BUCK b/providers/rest/BUCK
new file mode 100644
index 0000000..187f8ae
--- /dev/null
+++ b/providers/rest/BUCK
@@ -0,0 +1,18 @@
+BUNDLES = [
+    '//providers/rest/device:onos-providers-rest-device',
+    '//protocols/rest/api:onos-protocols-rest-api',
+    '//protocols/rest/ctl:onos-protocols-rest-ctl',
+    '//lib:jersey-client',
+    '//lib:commons-io',
+    '//lib:httpclient-osgi',
+    '//lib:httpcore-osgi',
+]
+
+onos_app (
+    title = 'PCEP Provider',
+    category = 'Provider',
+    url = 'http://onosproject.org',
+    included_bundles = BUNDLES,
+    description = 'REST protocol southbound providers.',
+)
+
diff --git a/providers/rest/device/BUCK b/providers/rest/device/BUCK
index d5a1f7d..7a3667f 100644
--- a/providers/rest/device/BUCK
+++ b/providers/rest/device/BUCK
@@ -1,35 +1,13 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-restsb-provider-device'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//protocols/ovsdb/api:onos-ovsdb-api',
     '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
     '//apps/pcep-api:onos-apps-pcep-api',
     '//incubator/api:onos-incubator-api',
-    '//protocols/rest/api:onos-restsb-api',
+    '//protocols/rest/api:onos-protocols-rest-api',
     '//lib:javax.ws.rs-api',
 ]
 
-TEST_DEPS = [
-    '//lib:TEST',
-]
-
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
-)
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
 )
diff --git a/providers/snmp/device/BUCK b/providers/snmp/device/BUCK
index a0d0a69..5d766f4 100644
--- a/providers/snmp/device/BUCK
+++ b/providers/snmp/device/BUCK
@@ -1,9 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-snmp-provider-device'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:org.apache.servicemix.bundles.snmp4j',
@@ -16,22 +10,7 @@
     '//protocols/snmp/ctl:onos-snmp-ctl',
 ]
 
-TEST_DEPS = [
-    '//lib:TEST',
-]
-
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
 )
 
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)