diff --git a/apps/artemis/BUCK b/apps/artemis/BUCK
index e06097d..450f73e 100755
--- a/apps/artemis/BUCK
+++ b/apps/artemis/BUCK
@@ -2,8 +2,8 @@
     '//lib:CORE_DEPS',
     '//lib:JACKSON',
     '//lib:NETTY',
-    '//lib:netty',
-    '//lib:netty-transport',
+    '//lib:io_netty_netty',
+    '//lib:io_netty_netty_transport',
     '//lib:org.apache.karaf.shell.console',
     '//cli:onos-cli',
     '//apps/routing-api:onos-apps-routing-api',
diff --git a/apps/artemis/BUILD b/apps/artemis/BUILD
index 9634521..763a535 100755
--- a/apps/artemis/BUILD
+++ b/apps/artemis/BUILD
@@ -5,8 +5,8 @@
     "@io_socket_client//jar",
     "@json//jar",
     "@engine_io_client//jar",
-    "@netty//jar",
-    "@netty_transport//jar",
+    "@io_netty_netty//jar",
+    "@io_netty_netty_transport//jar",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/routing/common:onos-apps-routing-common",
     "//protocols/ovsdb/api:onos-protocols-ovsdb-api",
diff --git a/apps/flowspec-api/flowapi/BUCK b/apps/flowspec-api/flowapi/BUCK
index 2596ffb..835b939 100644
--- a/apps/flowspec-api/flowapi/BUCK
+++ b/apps/flowspec-api/flowapi/BUCK
@@ -2,7 +2,7 @@
     '//utils/osgi:onlab-osgi',
     '//utils/misc:onlab-misc',
     '//lib:commons-io',
-    '//lib:guava',
+    '//lib:com_google_guava_guava',
     '//lib:kryo',
     '//lib:slf4j-api',
 ]
diff --git a/apps/influxdbmetrics/BUCK b/apps/influxdbmetrics/BUCK
index b9686ef..ed47e12 100644
--- a/apps/influxdbmetrics/BUCK
+++ b/apps/influxdbmetrics/BUCK
@@ -11,7 +11,7 @@
     '//lib:okio',
     '//lib:moshi',
     '//lib:converter-moshi',
-    '//lib:gson',
+    '//lib:com_google_code_gson_gson',
     '//cli:onos-cli',
 ]
 
@@ -22,7 +22,7 @@
     '//lib:retrofit',
     '//lib:okhttp',
     '//lib:logging-interceptor',
-    '//lib:gson',
+    '//lib:com_google_code_gson_gson',
     '//lib:okio',
     '//lib:moshi',
     '//lib:converter-moshi',
diff --git a/apps/influxdbmetrics/BUILD b/apps/influxdbmetrics/BUILD
index 278e4cf..1dc5de8 100644
--- a/apps/influxdbmetrics/BUILD
+++ b/apps/influxdbmetrics/BUILD
@@ -8,7 +8,7 @@
     "@okio//jar",
     "@moshi//jar",
     "@converter_moshi//jar",
-    "@gson//jar",
+    "@com_google_code_gson_gson//jar",
 ]
 
 EXCLUDED_BUNDLES = [
@@ -18,7 +18,7 @@
     "@retrofit//jar",
     "@okhttp//jar",
     "@logging_interceptor//jar",
-    "@gson//jar",
+    "@com_google_code_gson_gson//jar",
     "@okio//jar",
     "@moshi//jar",
     "@converter_moshi//jar",
diff --git a/apps/ofagent/BUCK b/apps/ofagent/BUCK
index 893b0c9..1283bad 100644
--- a/apps/ofagent/BUCK
+++ b/apps/ofagent/BUCK
@@ -8,10 +8,10 @@
     '//incubator/api:onos-incubator-api',
     '//cli:onos-cli',
     '//lib:org.apache.karaf.shell.console',
-    '//lib:netty-transport',
-    '//lib:netty-buffer',
-    '//lib:netty-codec',
-    '//lib:netty-handler',
+    '//lib:io_netty_netty_transport',
+    '//lib:io_netty_netty_buffer',
+    '//lib:io_netty_netty_codec',
+    '//lib:io_netty_netty_handler',
     '//lib:openflowj',
     '//lib:javax.ws.rs-api',
     '//utils/rest:onlab-rest',
diff --git a/apps/ofagent/BUILD b/apps/ofagent/BUILD
index 2cf8f09..e15e9c8 100644
--- a/apps/ofagent/BUILD
+++ b/apps/ofagent/BUILD
@@ -1,7 +1,7 @@
 COMPILE_DEPS = CORE_DEPS + NETTY + JACKSON + KRYO + CLI + REST + [
-    "@netty_transport//jar",
-    "@netty_codec//jar",
-    "@netty_handler//jar",
+    "@io_netty_netty_transport//jar",
+    "@io_netty_netty_codec//jar",
+    "@io_netty_netty_handler//jar",
     "@openflowj//jar",
     "//core/store/serializers:onos-core-serializers",
     "//core/common:onos-core-common",
diff --git a/apps/openstacktelemetry/BUCK b/apps/openstacktelemetry/BUCK
index fd9d942..2368ebe 100644
--- a/apps/openstacktelemetry/BUCK
+++ b/apps/openstacktelemetry/BUCK
@@ -7,7 +7,7 @@
     '//lib:retrofit',
     '//lib:okhttp',
     '//lib:logging-interceptor',
-    '//lib:gson',
+    '//lib:com_google_code_gson_gson',
     '//lib:okio',
     '//lib:moshi',
     '//lib:converter-moshi',
diff --git a/apps/openstacktelemetry/BUILD b/apps/openstacktelemetry/BUILD
index 134dc51..da45a1e 100644
--- a/apps/openstacktelemetry/BUILD
+++ b/apps/openstacktelemetry/BUILD
@@ -5,13 +5,12 @@
     "@retrofit//jar",
     "@okhttp//jar",
     "@logging_interceptor//jar",
-    "@gson//jar",
+    "@com_google_code_gson_gson//jar",
     "@okio//jar",
     "@moshi//jar",
     "@converter_moshi//jar",
-    "@protobuf_java_3_2_0//jar",
-    "@google_instrumentation_0_3_0//jar",
-    "@grpc_core_1_3_1//jar",
+    "@com_google_protobuf//:protobuf_java",
+    "@io_grpc_grpc_java//core",
     "//apps/openstacktelemetry/api:onos-apps-openstacktelemetry-api",
     "//apps/openstacktelemetry/app:onos-apps-openstacktelemetry-app",
 ]
diff --git a/apps/openstacktelemetry/app/BUILD b/apps/openstacktelemetry/app/BUILD
index 434c13c..c3f3b36 100644
--- a/apps/openstacktelemetry/app/BUILD
+++ b/apps/openstacktelemetry/app/BUILD
@@ -1,13 +1,13 @@
-COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + REST + CLI + GRPC_1_3 + [
+COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + REST + CLI + [
     "@kafka_clients//jar",
     "@jersey_client//jar",
     "@influxdb_java//jar",
-    "@grpc_core_1_3_1//jar",
+    "@io_grpc_grpc_java//core",
+    "@io_grpc_grpc_java//protobuf-lite",
     "//core/store/serializers:onos-core-serializers",
     "//apps/openstacknode/api:onos-apps-openstacknode-api",
     "//apps/openstacknetworking/api:onos-apps-openstacknetworking-api",
     "//apps/openstacktelemetry/api:onos-apps-openstacktelemetry-api",
-    "@grpc_protobuf_lite_1_3_1//jar",
 ]
 
 TEST_DEPS = TEST_ADAPTERS + TEST_REST + [
diff --git a/apps/rabbitmq/BUCK b/apps/rabbitmq/BUCK
index a1f5135..c283951 100644
--- a/apps/rabbitmq/BUCK
+++ b/apps/rabbitmq/BUCK
@@ -1,8 +1,8 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
-    '//lib:guava',
-    '//lib:gson',
+    '//lib:com_google_guava_guava',
+    '//lib:com_google_code_gson_gson',
     '//lib:amqp-client',
 ]
 
@@ -11,7 +11,7 @@
 ]
 
 BUNDLES = [
-    '//lib:gson',
+    '//lib:com_google_code_gson_gson',
     '//lib:amqp-client',
     '//apps/rabbitmq:onos-apps-rabbitmq',
 ]
diff --git a/apps/rabbitmq/BUILD b/apps/rabbitmq/BUILD
index 4111cd6..bbf846a 100644
--- a/apps/rabbitmq/BUILD
+++ b/apps/rabbitmq/BUILD
@@ -1,11 +1,11 @@
 COMPILE_DEPS = CORE_DEPS + [
-    "@gson//jar",
+    "@com_google_code_gson_gson//jar",
     "@amqp_client//jar",
     "//incubator/api:onos-incubator-api",
 ]
 
 BUNDLES = [
-    "@gson//jar",
+    "@com_google_code_gson_gson//jar",
     "@amqp_client//jar",
     "//apps/rabbitmq:onos-apps-rabbitmq",
 ]
diff --git a/apps/routing/common/BUCK b/apps/routing/common/BUCK
index 7e5d6cb..2bd6aec 100644
--- a/apps/routing/common/BUCK
+++ b/apps/routing/common/BUCK
@@ -9,7 +9,7 @@
     '//apps/routing-api:onos-apps-routing-api',
     '//apps/route-service/api:onos-apps-route-service-api',
     '//core/common:onos-core-common',
-    '//lib:netty',
+    '//lib:io_netty_netty',
 ]
 
 TEST_DEPS = [
diff --git a/apps/routing/common/BUILD b/apps/routing/common/BUILD
index 0792ed9..1d5b4d4 100644
--- a/apps/routing/common/BUILD
+++ b/apps/routing/common/BUILD
@@ -1,5 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + NETTY + JACKSON + CLI + [
-    "@netty//jar",
+    "@io_netty_netty//jar",
     "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/route-service/api:onos-apps-route-service-api",
diff --git a/apps/routing/fpm/app/BUCK b/apps/routing/fpm/app/BUCK
index da7b8e5..adf50c3 100644
--- a/apps/routing/fpm/app/BUCK
+++ b/apps/routing/fpm/app/BUCK
@@ -9,7 +9,7 @@
     '//apps/route-service/api:onos-apps-route-service-api',
     '//core/store/serializers:onos-core-serializers',
     '//apps/routing/fpm/api:onos-apps-routing-fpm-api',
-    '//lib:netty',
+    '//lib:io_netty_netty',
 ]
 
 TEST_DEPS = [
diff --git a/apps/routing/fpm/app/BUILD b/apps/routing/fpm/app/BUILD
index 7dc29f6..9622b2b 100644
--- a/apps/routing/fpm/app/BUILD
+++ b/apps/routing/fpm/app/BUILD
@@ -1,5 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + NETTY + KRYO + CLI + [
-    "@netty//jar",
+    "@io_netty_netty//jar",
     "//incubator/api:onos-incubator-api",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/route-service/api:onos-apps-route-service-api",