diff --git a/tools/package/features/BUCK b/tools/package/features/BUCK
index 4b5ecd7..5acf69c 100644
--- a/tools/package/features/BUCK
+++ b/tools/package/features/BUCK
@@ -17,15 +17,15 @@
     '//lib:commons-text',
     '//lib:commons-configuration',
     '//lib:fast-classpath-scanner',
-    '//lib:guava',
-    '//lib:netty',
-    '//lib:netty-common',
-    '//lib:netty-buffer',
-    '//lib:netty-transport',
-    '//lib:netty-handler',
-    '//lib:netty-codec',
-    '//lib:netty-transport-native-epoll',
-    '//lib:netty-resolver',
+    '//lib:com_google_guava_guava',
+    '//lib:io_netty_netty',
+    '//lib:io_netty_netty_common',
+    '//lib:io_netty_netty_buffer',
+    '//lib:io_netty_netty_transport',
+    '//lib:io_netty_netty_handler',
+    '//lib:io_netty_netty_codec',
+    '//lib:io_netty_netty_transport-native-epoll',
+    '//lib:io_netty_netty_resolver',
     '//lib:commons-pool',
     '//lib:commons-math3',
     '//lib:joda-time',
@@ -61,7 +61,7 @@
   required_features = [ 'war', 'onos-thirdparty-base' ],
   included_bundles = [
     '//lib:jersey-common',
-    '//lib:javax.annotation-api',
+    '//lib:javax.annotation-api-mvn',
     '//lib:javax.ws.rs-api',
     '//lib:hk2-api',
     '//lib:hk2-locator',
diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index 44b5f5f..9ec8005 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -15,15 +15,16 @@
         "@commons_lang3//jar",
         "@commons_text//jar",
         "@commons_configuration//jar",
-        "@guava//jar",
-        "@netty//jar",
-        "@netty_common//jar",
-        "@netty_buffer//jar",
-        "@netty_transport//jar",
-        "@netty_handler//jar",
-        "@netty_codec//jar",
-        "@netty_transport_native_epoll//jar",
-        "@netty_resolver//jar",
+        "@com_google_guava_guava//jar",
+        "@io_netty_netty//jar",
+        "@io_netty_netty_common//jar",
+        "@io_netty_netty_buffer//jar",
+        "@io_netty_netty_transport//jar",
+        "@io_netty_netty_handler//jar",
+        "@io_netty_netty_codec//jar",
+        "@io_netty_netty_transport_native_epoll//jar",
+        "@io_netty_netty_transport_native_unix_common//jar",
+        "@io_netty_netty_resolver//jar",
         "@commons_pool//jar",
         "@commons_math3//jar",
         "@joda_time//jar",
@@ -58,7 +59,7 @@
     description = "ONOS 3rd party dependencies for web apps",
     included_bundles = [
         "@jersey_common//jar",
-        "@javax_annotation_api//jar",
+        "@javax_annotation_api_mvn//jar",
         "@javax_ws_rs_api//jar",
         "@hk2_api//jar",
         "@hk2_locator//jar",