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',