diff --git a/incubator/grpc-dependencies/BUCK b/incubator/grpc-dependencies/BUCK
index e36dc17..99d74cc 100644
--- a/incubator/grpc-dependencies/BUCK
+++ b/incubator/grpc-dependencies/BUCK
@@ -9,7 +9,7 @@
     repkg_deps = [
         '//lib:COMPILE',
         '//lib:google-instrumentation-0.3.0',
-        "//lib:google-errorprone-2.0.19"
+        '//lib:google-errorprone-2.0.19'
     ]
     remote_file(
         name = "grpc-src-zip-131",
diff --git a/incubator/protobuf/models/BUCK b/incubator/protobuf/models/BUCK
index 2fc2d4b..04f71b0 100644
--- a/incubator/protobuf/models/BUCK
+++ b/incubator/protobuf/models/BUCK
@@ -11,7 +11,7 @@
 GRPC_DEPS = [
     '//lib:GRPC_1.3',
     '//lib:protobuf-java-3.2.0',
-    '//lib:guava',
+    '//lib:com_google_guava_guava',
     '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER
 ]
 
diff --git a/incubator/protobuf/services/nb/BUCK b/incubator/protobuf/services/nb/BUCK
index c1733d3..f05f448 100644
--- a/incubator/protobuf/services/nb/BUCK
+++ b/incubator/protobuf/services/nb/BUCK
@@ -22,7 +22,7 @@
     '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
     '//incubator/protobuf/models:onos-incubator-protobuf-models-proto',
     '//lib:protobuf-java-3.2.0',
-    '//lib:guava',
+    '//lib:com_google_guava_guava',
 ]
 
 BUNDLES = [
@@ -31,7 +31,7 @@
     ':onos-incubator-protobuf-services-nb',
     ':onos-incubator-protobuf-services-nb-proto',
     '//lib:protobuf-java-3.2.0',
-    '//lib:guava',
+    '//lib:com_google_guava_guava',
     '//lib:grpc-core-' + GRPC_VER,
     '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
     '//lib:grpc-protobuf-' + GRPC_VER,
@@ -41,14 +41,14 @@
     '//lib:grpc-context-' + GRPC_VER,
     '//lib:google-truth-0.28',
     '//core/api:onos-api',
-    '//lib:netty-transport',
-    '//lib:netty-buffer',
-    '//lib:netty-resolver',
-    '//lib:netty-common',
-    '//lib:netty-codec',
-    '//lib:netty-handler',
-    '//lib:netty-codec-http2',
-    '//lib:netty-codec-http',
+    '//lib:io_netty_netty_transport',
+    '//lib:io_netty_netty_buffer',
+    '//lib:io_netty_netty_resolver',
+    '//lib:io_netty_netty_common',
+    '//lib:io_netty_netty_codec',
+    '//lib:io_netty_netty_handler',
+    '//lib:io_netty_netty_codec-http2',
+    '//lib:io_netty_netty_codec-http',
     "//lib:google-instrumentation-0.3.0",
 ]