diff --git a/protocols/gnmi/ctl/BUILD b/protocols/gnmi/ctl/BUILD
index a82dafd..405701d 100644
--- a/protocols/gnmi/ctl/BUILD
+++ b/protocols/gnmi/ctl/BUILD
@@ -3,18 +3,18 @@
     "//protocols/gnmi/stub:onos-protocols-gnmi-stub",
     "//protocols/grpc/api:onos-protocols-grpc-api",
     "//protocols/grpc/ctl:onos-protocols-grpc-ctl",
-    "//lib:io_grpc_grpc_api_context",
-    "//lib:com_google_protobuf_protobuf_java",
-    "//lib:io_grpc_grpc_netty",
-    "//lib:io_grpc_grpc_protobuf_lite",
-    "//lib:io_grpc_grpc_stub",
+    "//deps:io_grpc_grpc_api_context",
+    "//deps:com_google_protobuf_protobuf_java",
+    "//deps:io_grpc_grpc_netty",
+    "//deps:io_grpc_grpc_protobuf_lite",
+    "//deps:io_grpc_grpc_stub",
     "@com_google_api_grpc_proto_google_common_protos//jar",
 ]
 
 TEST_DEPS = TEST + [
     "@minimal_json//jar",
-    "//lib:io_grpc_grpc_api_context",
-    "//lib:io_grpc_grpc_protobuf_lite",
+    "//deps:io_grpc_grpc_api_context",
+    "//deps:io_grpc_grpc_protobuf_lite",
 ]
 
 osgi_jar_with_tests(
diff --git a/protocols/gnoi/ctl/BUILD b/protocols/gnoi/ctl/BUILD
index d3659d3..6befde7 100644
--- a/protocols/gnoi/ctl/BUILD
+++ b/protocols/gnoi/ctl/BUILD
@@ -3,18 +3,18 @@
     "//protocols/gnoi/stub:onos-protocols-gnoi-stub",
     "//protocols/grpc/api:onos-protocols-grpc-api",
     "//protocols/grpc/ctl:onos-protocols-grpc-ctl",
-    "//lib:io_grpc_grpc_api_context",
-    "//lib:com_google_protobuf_protobuf_java",
-    "//lib:io_grpc_grpc_netty",
-    "//lib:io_grpc_grpc_protobuf_lite",
-    "//lib:io_grpc_grpc_stub",
+    "//deps:io_grpc_grpc_api_context",
+    "//deps:com_google_protobuf_protobuf_java",
+    "//deps:io_grpc_grpc_netty",
+    "//deps:io_grpc_grpc_protobuf_lite",
+    "//deps:io_grpc_grpc_stub",
     "@com_google_api_grpc_proto_google_common_protos//jar",
 ]
 
 TEST_DEPS = TEST + [
     "@minimal_json//jar",
-    "//lib:io_grpc_grpc_api_context",
-    "//lib:io_grpc_grpc_protobuf_lite",
+    "//deps:io_grpc_grpc_api_context",
+    "//deps:io_grpc_grpc_protobuf_lite",
 ]
 
 osgi_jar_with_tests(
diff --git a/protocols/grpc/BUILD b/protocols/grpc/BUILD
index 3fa5169..ed61365 100644
--- a/protocols/grpc/BUILD
+++ b/protocols/grpc/BUILD
@@ -3,17 +3,17 @@
     "//protocols/grpc/ctl:onos-protocols-grpc-ctl",
     "//protocols/grpc/utils:onos-protocols-grpc-utils",
     # gRPC dependencies (with patched core)
-    "//lib:io_grpc_grpc_api_context",
-    "//lib:io_grpc_grpc_core_internal",
-    "//lib:io_grpc_grpc_core_inprocess",
-    "//lib:io_grpc_grpc_core_util",
-    "//lib:io_grpc_grpc_core_perfmark",
-    "//lib:io_grpc_grpc_stub",
-    "//lib:io_grpc_grpc_netty",
-    "//lib:io_grpc_grpc_auth",
-    "//lib:io_grpc_grpc_protobuf",
-    "//lib:io_grpc_grpc_protobuf_lite",
-    "//lib:com_google_protobuf_protobuf_java",
+    "//deps:io_grpc_grpc_api_context",
+    "//deps:io_grpc_grpc_core_internal",
+    "//deps:io_grpc_grpc_core_inprocess",
+    "//deps:io_grpc_grpc_core_util",
+    "//deps:io_grpc_grpc_core_perfmark",
+    "//deps:io_grpc_grpc_stub",
+    "//deps:io_grpc_grpc_netty",
+    "//deps:io_grpc_grpc_auth",
+    "//deps:io_grpc_grpc_protobuf",
+    "//deps:io_grpc_grpc_protobuf_lite",
+    "//deps:com_google_protobuf_protobuf_java",
     "@com_google_api_grpc_proto_google_common_protos//jar",
     "@com_google_errorprone_error_prone_annotations//jar",
     "@com_google_auth_google_auth_library_credentials//jar",
diff --git a/protocols/grpc/api/BUILD b/protocols/grpc/api/BUILD
index 3247fcd..8b1157e 100644
--- a/protocols/grpc/api/BUILD
+++ b/protocols/grpc/api/BUILD
@@ -1,3 +1,3 @@
 osgi_jar(
-    deps = CORE_DEPS + ["//lib:io_grpc_grpc_api_context"],
+    deps = CORE_DEPS + ["//deps:io_grpc_grpc_api_context"],
 )
diff --git a/protocols/grpc/ctl/BUILD b/protocols/grpc/ctl/BUILD
index 77239e4..b81258f 100644
--- a/protocols/grpc/ctl/BUILD
+++ b/protocols/grpc/ctl/BUILD
@@ -1,10 +1,10 @@
 COMPILE_DEPS = CORE_DEPS + [
     "//protocols/grpc/api:onos-protocols-grpc-api",
-    "//lib:io_grpc_grpc_api_context",
-    "//lib:io_grpc_grpc_core_internal",
-    "//lib:io_grpc_grpc_netty",
-    "//lib:io_grpc_grpc_protobuf_lite",
-    "//lib:com_google_protobuf_protobuf_java",
+    "//deps:io_grpc_grpc_api_context",
+    "//deps:io_grpc_grpc_core_internal",
+    "//deps:io_grpc_grpc_netty",
+    "//deps:io_grpc_grpc_protobuf_lite",
+    "//deps:com_google_protobuf_protobuf_java",
     "@com_google_api_grpc_proto_google_common_protos//jar",
     "@io_netty_netty_handler//jar",
 ]
diff --git a/protocols/grpc/utils/BUILD b/protocols/grpc/utils/BUILD
index c3e6e77..2627aad 100644
--- a/protocols/grpc/utils/BUILD
+++ b/protocols/grpc/utils/BUILD
@@ -1,6 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + [
     "//protocols/grpc/api:onos-protocols-grpc-api",
-    "//lib:io_grpc_grpc_api_context",
+    "//deps:io_grpc_grpc_api_context",
 ]
 
 osgi_jar(
diff --git a/protocols/p4runtime/api/BUILD b/protocols/p4runtime/api/BUILD
index b958045..28d48a3 100644
--- a/protocols/p4runtime/api/BUILD
+++ b/protocols/p4runtime/api/BUILD
@@ -1,6 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + [
     "//protocols/grpc/api:onos-protocols-grpc-api",
-    "//lib:io_grpc_grpc_api_context",
+    "//deps:io_grpc_grpc_api_context",
 ]
 
 TEST_DEPS = TEST + [
diff --git a/protocols/p4runtime/ctl/BUILD b/protocols/p4runtime/ctl/BUILD
index 5f8db80..5fbbd68 100644
--- a/protocols/p4runtime/ctl/BUILD
+++ b/protocols/p4runtime/ctl/BUILD
@@ -4,20 +4,20 @@
     "//protocols/grpc/ctl:onos-protocols-grpc-ctl",
     "//protocols/p4runtime/api:onos-protocols-p4runtime-api",
     "//protocols/p4runtime/proto:onos-protocols-p4runtime-proto",
-    "//lib:com_google_protobuf_protobuf_java",
-    "//lib:io_grpc_grpc_api_context",
-    "//lib:io_grpc_grpc_netty",
-    "//lib:io_grpc_grpc_protobuf_lite",
-    "//lib:io_grpc_grpc_stub",
+    "//deps:com_google_protobuf_protobuf_java",
+    "//deps:io_grpc_grpc_api_context",
+    "//deps:io_grpc_grpc_netty",
+    "//deps:io_grpc_grpc_protobuf_lite",
+    "//deps:io_grpc_grpc_stub",
     "@com_google_api_grpc_proto_google_common_protos//jar",
 ]
 
 TEST_DEPS = TEST + [
     "@minimal_json//jar",
-    "//lib:io_grpc_grpc_api_context",
-    "//lib:io_grpc_grpc_core_internal",
-    "//lib:io_grpc_grpc_core_inprocess",
-    "//lib:io_grpc_grpc_protobuf_lite",
+    "//deps:io_grpc_grpc_api_context",
+    "//deps:io_grpc_grpc_core_internal",
+    "//deps:io_grpc_grpc_core_inprocess",
+    "//deps:io_grpc_grpc_protobuf_lite",
 ]
 
 osgi_jar_with_tests(
diff --git a/protocols/p4runtime/model/BUILD b/protocols/p4runtime/model/BUILD
index 9e36b6d..a521bbb 100644
--- a/protocols/p4runtime/model/BUILD
+++ b/protocols/p4runtime/model/BUILD
@@ -1,6 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + [
     "//protocols/p4runtime/proto:onos-protocols-p4runtime-proto",
-    "//lib:com_google_protobuf_protobuf_java",
+    "//deps:com_google_protobuf_protobuf_java",
 ]
 
 osgi_jar_with_tests(