diff --git a/drivers/bti/BUCK b/drivers/bti/BUCK
index c7d6cf7..90ab148 100644
--- a/drivers/bti/BUCK
+++ b/drivers/bti/BUCK
@@ -1,6 +1,6 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//protocols/snmp/api:onos-snmp-api',
+    '//protocols/snmp/api:onos-protocols-snmp-api',
     '//incubator/api:onos-incubator-api',
     '//lib:org.apache.servicemix.bundles.snmp4j',
     '//lib:snmp-core',
diff --git a/drivers/default/BUCK b/drivers/default/BUCK
index 51f8552..f999454 100644
--- a/drivers/default/BUCK
+++ b/drivers/default/BUCK
@@ -2,7 +2,7 @@
     '//lib:CORE_DEPS',
     '//lib:openflowj',
     '//drivers/utilities:onos-drivers-utilities',
-    '//protocols/openflow/api:onos-of-api',
+    '//protocols/openflow/api:onos-protocols-openflow-api',
     '//core/store/serializers:onos-core-serializers',
 ]
 
@@ -13,6 +13,7 @@
 )
 
 onos_app (
+    app_name = 'org.onosproject.drivers',
     title = 'Default device drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
diff --git a/drivers/lumentum/BUCK b/drivers/lumentum/BUCK
index 620195e..768feac 100644
--- a/drivers/lumentum/BUCK
+++ b/drivers/lumentum/BUCK
@@ -2,7 +2,7 @@
     '//lib:CORE_DEPS',
     '//lib:org.apache.servicemix.bundles.snmp4j',
     '//drivers/utilities:onos-drivers-utilities',
-    '//protocols/snmp/api:onos-snmp-api',
+    '//protocols/snmp/api:onos-protocols-snmp-api',
     '//incubator/api:onos-incubator-api',
 ]
 
diff --git a/drivers/ovsdb/BUCK b/drivers/ovsdb/BUCK
index 56d3dea..a9c91ca 100644
--- a/drivers/ovsdb/BUCK
+++ b/drivers/ovsdb/BUCK
@@ -1,13 +1,13 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//drivers/utilities:onos-drivers-utilities',
-    '//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 = [
     '//lib:TEST_ADAPTERS',
-    '//protocols/ovsdb/api:onos-protocols-ovsdb-tests',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api-tests',
 ]
 
 osgi_jar_with_tests (