diff --git a/benchmarks/msgq/1.0/Android.bp b/benchmarks/msgq/1.0/Android.bp
index c2c8d0e..b6f4bfd 100644
--- a/benchmarks/msgq/1.0/Android.bp
+++ b/benchmarks/msgq/1.0/Android.bp
@@ -22,8 +22,8 @@
     out: [
         "android/hardware/benchmarks/msgq/1.0/IBenchmarkMsgQ.h",
         "android/hardware/benchmarks/msgq/1.0/IHwBenchmarkMsgQ.h",
-        "android/hardware/benchmarks/msgq/1.0/BnBenchmarkMsgQ.h",
-        "android/hardware/benchmarks/msgq/1.0/BpBenchmarkMsgQ.h",
+        "android/hardware/benchmarks/msgq/1.0/BnHwBenchmarkMsgQ.h",
+        "android/hardware/benchmarks/msgq/1.0/BpHwBenchmarkMsgQ.h",
         "android/hardware/benchmarks/msgq/1.0/BsBenchmarkMsgQ.h",
     ],
 }
diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp
index 492e624..7928fb6 100644
--- a/bluetooth/1.0/Android.bp
+++ b/bluetooth/1.0/Android.bp
@@ -29,13 +29,13 @@
         "android/hardware/bluetooth/1.0/types.h",
         "android/hardware/bluetooth/1.0/IBluetoothHci.h",
         "android/hardware/bluetooth/1.0/IHwBluetoothHci.h",
-        "android/hardware/bluetooth/1.0/BnBluetoothHci.h",
-        "android/hardware/bluetooth/1.0/BpBluetoothHci.h",
+        "android/hardware/bluetooth/1.0/BnHwBluetoothHci.h",
+        "android/hardware/bluetooth/1.0/BpHwBluetoothHci.h",
         "android/hardware/bluetooth/1.0/BsBluetoothHci.h",
         "android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.h",
         "android/hardware/bluetooth/1.0/IHwBluetoothHciCallbacks.h",
-        "android/hardware/bluetooth/1.0/BnBluetoothHciCallbacks.h",
-        "android/hardware/bluetooth/1.0/BpBluetoothHciCallbacks.h",
+        "android/hardware/bluetooth/1.0/BnHwBluetoothHciCallbacks.h",
+        "android/hardware/bluetooth/1.0/BpHwBluetoothHciCallbacks.h",
         "android/hardware/bluetooth/1.0/BsBluetoothHciCallbacks.h",
     ],
 }
diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp
index 266ef4d..8e62c89 100644
--- a/boot/1.0/Android.bp
+++ b/boot/1.0/Android.bp
@@ -26,8 +26,8 @@
         "android/hardware/boot/1.0/types.h",
         "android/hardware/boot/1.0/IBootControl.h",
         "android/hardware/boot/1.0/IHwBootControl.h",
-        "android/hardware/boot/1.0/BnBootControl.h",
-        "android/hardware/boot/1.0/BpBootControl.h",
+        "android/hardware/boot/1.0/BnHwBootControl.h",
+        "android/hardware/boot/1.0/BpHwBootControl.h",
         "android/hardware/boot/1.0/BsBootControl.h",
     ],
 }
diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp
index 9badd6f..3a8fceb 100644
--- a/ir/1.0/Android.bp
+++ b/ir/1.0/Android.bp
@@ -26,8 +26,8 @@
         "android/hardware/ir/1.0/types.h",
         "android/hardware/ir/1.0/IConsumerIr.h",
         "android/hardware/ir/1.0/IHwConsumerIr.h",
-        "android/hardware/ir/1.0/BnConsumerIr.h",
-        "android/hardware/ir/1.0/BpConsumerIr.h",
+        "android/hardware/ir/1.0/BnHwConsumerIr.h",
+        "android/hardware/ir/1.0/BpHwConsumerIr.h",
         "android/hardware/ir/1.0/BsConsumerIr.h",
     ],
 }
diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp
index af571f3..0fda103 100644
--- a/nfc/1.0/Android.bp
+++ b/nfc/1.0/Android.bp
@@ -29,13 +29,13 @@
         "android/hardware/nfc/1.0/types.h",
         "android/hardware/nfc/1.0/INfc.h",
         "android/hardware/nfc/1.0/IHwNfc.h",
-        "android/hardware/nfc/1.0/BnNfc.h",
-        "android/hardware/nfc/1.0/BpNfc.h",
+        "android/hardware/nfc/1.0/BnHwNfc.h",
+        "android/hardware/nfc/1.0/BpHwNfc.h",
         "android/hardware/nfc/1.0/BsNfc.h",
         "android/hardware/nfc/1.0/INfcClientCallback.h",
         "android/hardware/nfc/1.0/IHwNfcClientCallback.h",
-        "android/hardware/nfc/1.0/BnNfcClientCallback.h",
-        "android/hardware/nfc/1.0/BpNfcClientCallback.h",
+        "android/hardware/nfc/1.0/BnHwNfcClientCallback.h",
+        "android/hardware/nfc/1.0/BpHwNfcClientCallback.h",
         "android/hardware/nfc/1.0/BsNfcClientCallback.h",
     ],
 }
diff --git a/radio/1.0/Android.bp b/radio/1.0/Android.bp
index a02a632..e17d949 100644
--- a/radio/1.0/Android.bp
+++ b/radio/1.0/Android.bp
@@ -38,28 +38,28 @@
         "android/hardware/radio/1.0/types.h",
         "android/hardware/radio/1.0/IRadio.h",
         "android/hardware/radio/1.0/IHwRadio.h",
-        "android/hardware/radio/1.0/BnRadio.h",
-        "android/hardware/radio/1.0/BpRadio.h",
+        "android/hardware/radio/1.0/BnHwRadio.h",
+        "android/hardware/radio/1.0/BpHwRadio.h",
         "android/hardware/radio/1.0/BsRadio.h",
         "android/hardware/radio/1.0/IRadioIndication.h",
         "android/hardware/radio/1.0/IHwRadioIndication.h",
-        "android/hardware/radio/1.0/BnRadioIndication.h",
-        "android/hardware/radio/1.0/BpRadioIndication.h",
+        "android/hardware/radio/1.0/BnHwRadioIndication.h",
+        "android/hardware/radio/1.0/BpHwRadioIndication.h",
         "android/hardware/radio/1.0/BsRadioIndication.h",
         "android/hardware/radio/1.0/IRadioResponse.h",
         "android/hardware/radio/1.0/IHwRadioResponse.h",
-        "android/hardware/radio/1.0/BnRadioResponse.h",
-        "android/hardware/radio/1.0/BpRadioResponse.h",
+        "android/hardware/radio/1.0/BnHwRadioResponse.h",
+        "android/hardware/radio/1.0/BpHwRadioResponse.h",
         "android/hardware/radio/1.0/BsRadioResponse.h",
         "android/hardware/radio/1.0/ISap.h",
         "android/hardware/radio/1.0/IHwSap.h",
-        "android/hardware/radio/1.0/BnSap.h",
-        "android/hardware/radio/1.0/BpSap.h",
+        "android/hardware/radio/1.0/BnHwSap.h",
+        "android/hardware/radio/1.0/BpHwSap.h",
         "android/hardware/radio/1.0/BsSap.h",
         "android/hardware/radio/1.0/ISapCallback.h",
         "android/hardware/radio/1.0/IHwSapCallback.h",
-        "android/hardware/radio/1.0/BnSapCallback.h",
-        "android/hardware/radio/1.0/BpSapCallback.h",
+        "android/hardware/radio/1.0/BnHwSapCallback.h",
+        "android/hardware/radio/1.0/BpHwSapCallback.h",
         "android/hardware/radio/1.0/BsSapCallback.h",
     ],
 }
diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp
index e4c79fa..cad655c 100644
--- a/tests/bar/1.0/Android.bp
+++ b/tests/bar/1.0/Android.bp
@@ -28,18 +28,18 @@
     out: [
         "android/hardware/tests/bar/1.0/IBar.h",
         "android/hardware/tests/bar/1.0/IHwBar.h",
-        "android/hardware/tests/bar/1.0/BnBar.h",
-        "android/hardware/tests/bar/1.0/BpBar.h",
+        "android/hardware/tests/bar/1.0/BnHwBar.h",
+        "android/hardware/tests/bar/1.0/BpHwBar.h",
         "android/hardware/tests/bar/1.0/BsBar.h",
         "android/hardware/tests/bar/1.0/IComplicated.h",
         "android/hardware/tests/bar/1.0/IHwComplicated.h",
-        "android/hardware/tests/bar/1.0/BnComplicated.h",
-        "android/hardware/tests/bar/1.0/BpComplicated.h",
+        "android/hardware/tests/bar/1.0/BnHwComplicated.h",
+        "android/hardware/tests/bar/1.0/BpHwComplicated.h",
         "android/hardware/tests/bar/1.0/BsComplicated.h",
         "android/hardware/tests/bar/1.0/IImportTypes.h",
         "android/hardware/tests/bar/1.0/IHwImportTypes.h",
-        "android/hardware/tests/bar/1.0/BnImportTypes.h",
-        "android/hardware/tests/bar/1.0/BpImportTypes.h",
+        "android/hardware/tests/bar/1.0/BnHwImportTypes.h",
+        "android/hardware/tests/bar/1.0/BpHwImportTypes.h",
         "android/hardware/tests/bar/1.0/BsImportTypes.h",
     ],
 }
diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp
index 9caf809..4106838 100644
--- a/tests/baz/1.0/Android.bp
+++ b/tests/baz/1.0/Android.bp
@@ -32,18 +32,18 @@
         "android/hardware/tests/baz/1.0/types.h",
         "android/hardware/tests/baz/1.0/IBase.h",
         "android/hardware/tests/baz/1.0/IHwBase.h",
-        "android/hardware/tests/baz/1.0/BnBase.h",
-        "android/hardware/tests/baz/1.0/BpBase.h",
+        "android/hardware/tests/baz/1.0/BnHwBase.h",
+        "android/hardware/tests/baz/1.0/BpHwBase.h",
         "android/hardware/tests/baz/1.0/BsBase.h",
         "android/hardware/tests/baz/1.0/IBaz.h",
         "android/hardware/tests/baz/1.0/IHwBaz.h",
-        "android/hardware/tests/baz/1.0/BnBaz.h",
-        "android/hardware/tests/baz/1.0/BpBaz.h",
+        "android/hardware/tests/baz/1.0/BnHwBaz.h",
+        "android/hardware/tests/baz/1.0/BpHwBaz.h",
         "android/hardware/tests/baz/1.0/BsBaz.h",
         "android/hardware/tests/baz/1.0/IBazCallback.h",
         "android/hardware/tests/baz/1.0/IHwBazCallback.h",
-        "android/hardware/tests/baz/1.0/BnBazCallback.h",
-        "android/hardware/tests/baz/1.0/BpBazCallback.h",
+        "android/hardware/tests/baz/1.0/BnHwBazCallback.h",
+        "android/hardware/tests/baz/1.0/BpHwBazCallback.h",
         "android/hardware/tests/baz/1.0/BsBazCallback.h",
     ],
 }
diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp
index 80c4b3e..bb7aedd 100644
--- a/tests/expression/1.0/Android.bp
+++ b/tests/expression/1.0/Android.bp
@@ -25,13 +25,13 @@
     out: [
         "android/hardware/tests/expression/1.0/IExpression.h",
         "android/hardware/tests/expression/1.0/IHwExpression.h",
-        "android/hardware/tests/expression/1.0/BnExpression.h",
-        "android/hardware/tests/expression/1.0/BpExpression.h",
+        "android/hardware/tests/expression/1.0/BnHwExpression.h",
+        "android/hardware/tests/expression/1.0/BpHwExpression.h",
         "android/hardware/tests/expression/1.0/BsExpression.h",
         "android/hardware/tests/expression/1.0/IExpressionExt.h",
         "android/hardware/tests/expression/1.0/IHwExpressionExt.h",
-        "android/hardware/tests/expression/1.0/BnExpressionExt.h",
-        "android/hardware/tests/expression/1.0/BpExpressionExt.h",
+        "android/hardware/tests/expression/1.0/BnHwExpressionExt.h",
+        "android/hardware/tests/expression/1.0/BpHwExpressionExt.h",
         "android/hardware/tests/expression/1.0/BsExpressionExt.h",
     ],
 }
diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp
index 171ea84..8294c65 100644
--- a/tests/foo/1.0/Android.bp
+++ b/tests/foo/1.0/Android.bp
@@ -38,28 +38,28 @@
         "android/hardware/tests/foo/1.0/types.h",
         "android/hardware/tests/foo/1.0/IFoo.h",
         "android/hardware/tests/foo/1.0/IHwFoo.h",
-        "android/hardware/tests/foo/1.0/BnFoo.h",
-        "android/hardware/tests/foo/1.0/BpFoo.h",
+        "android/hardware/tests/foo/1.0/BnHwFoo.h",
+        "android/hardware/tests/foo/1.0/BpHwFoo.h",
         "android/hardware/tests/foo/1.0/BsFoo.h",
         "android/hardware/tests/foo/1.0/IFooCallback.h",
         "android/hardware/tests/foo/1.0/IHwFooCallback.h",
-        "android/hardware/tests/foo/1.0/BnFooCallback.h",
-        "android/hardware/tests/foo/1.0/BpFooCallback.h",
+        "android/hardware/tests/foo/1.0/BnHwFooCallback.h",
+        "android/hardware/tests/foo/1.0/BpHwFooCallback.h",
         "android/hardware/tests/foo/1.0/BsFooCallback.h",
         "android/hardware/tests/foo/1.0/IMyTypes.h",
         "android/hardware/tests/foo/1.0/IHwMyTypes.h",
-        "android/hardware/tests/foo/1.0/BnMyTypes.h",
-        "android/hardware/tests/foo/1.0/BpMyTypes.h",
+        "android/hardware/tests/foo/1.0/BnHwMyTypes.h",
+        "android/hardware/tests/foo/1.0/BpHwMyTypes.h",
         "android/hardware/tests/foo/1.0/BsMyTypes.h",
         "android/hardware/tests/foo/1.0/ISimple.h",
         "android/hardware/tests/foo/1.0/IHwSimple.h",
-        "android/hardware/tests/foo/1.0/BnSimple.h",
-        "android/hardware/tests/foo/1.0/BpSimple.h",
+        "android/hardware/tests/foo/1.0/BnHwSimple.h",
+        "android/hardware/tests/foo/1.0/BpHwSimple.h",
         "android/hardware/tests/foo/1.0/BsSimple.h",
         "android/hardware/tests/foo/1.0/ITheirTypes.h",
         "android/hardware/tests/foo/1.0/IHwTheirTypes.h",
-        "android/hardware/tests/foo/1.0/BnTheirTypes.h",
-        "android/hardware/tests/foo/1.0/BpTheirTypes.h",
+        "android/hardware/tests/foo/1.0/BnHwTheirTypes.h",
+        "android/hardware/tests/foo/1.0/BpHwTheirTypes.h",
         "android/hardware/tests/foo/1.0/BsTheirTypes.h",
     ],
 }
diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp
index 2a6860b..4389147 100644
--- a/tests/inheritance/1.0/Android.bp
+++ b/tests/inheritance/1.0/Android.bp
@@ -31,23 +31,23 @@
     out: [
         "android/hardware/tests/inheritance/1.0/IChild.h",
         "android/hardware/tests/inheritance/1.0/IHwChild.h",
-        "android/hardware/tests/inheritance/1.0/BnChild.h",
-        "android/hardware/tests/inheritance/1.0/BpChild.h",
+        "android/hardware/tests/inheritance/1.0/BnHwChild.h",
+        "android/hardware/tests/inheritance/1.0/BpHwChild.h",
         "android/hardware/tests/inheritance/1.0/BsChild.h",
         "android/hardware/tests/inheritance/1.0/IFetcher.h",
         "android/hardware/tests/inheritance/1.0/IHwFetcher.h",
-        "android/hardware/tests/inheritance/1.0/BnFetcher.h",
-        "android/hardware/tests/inheritance/1.0/BpFetcher.h",
+        "android/hardware/tests/inheritance/1.0/BnHwFetcher.h",
+        "android/hardware/tests/inheritance/1.0/BpHwFetcher.h",
         "android/hardware/tests/inheritance/1.0/BsFetcher.h",
         "android/hardware/tests/inheritance/1.0/IGrandparent.h",
         "android/hardware/tests/inheritance/1.0/IHwGrandparent.h",
-        "android/hardware/tests/inheritance/1.0/BnGrandparent.h",
-        "android/hardware/tests/inheritance/1.0/BpGrandparent.h",
+        "android/hardware/tests/inheritance/1.0/BnHwGrandparent.h",
+        "android/hardware/tests/inheritance/1.0/BpHwGrandparent.h",
         "android/hardware/tests/inheritance/1.0/BsGrandparent.h",
         "android/hardware/tests/inheritance/1.0/IParent.h",
         "android/hardware/tests/inheritance/1.0/IHwParent.h",
-        "android/hardware/tests/inheritance/1.0/BnParent.h",
-        "android/hardware/tests/inheritance/1.0/BpParent.h",
+        "android/hardware/tests/inheritance/1.0/BnHwParent.h",
+        "android/hardware/tests/inheritance/1.0/BpHwParent.h",
         "android/hardware/tests/inheritance/1.0/BsParent.h",
     ],
 }
diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp
index 8730665..8c27225 100644
--- a/tests/libhwbinder/1.0/Android.bp
+++ b/tests/libhwbinder/1.0/Android.bp
@@ -22,8 +22,8 @@
     out: [
         "android/hardware/tests/libhwbinder/1.0/IBenchmark.h",
         "android/hardware/tests/libhwbinder/1.0/IHwBenchmark.h",
-        "android/hardware/tests/libhwbinder/1.0/BnBenchmark.h",
-        "android/hardware/tests/libhwbinder/1.0/BpBenchmark.h",
+        "android/hardware/tests/libhwbinder/1.0/BnHwBenchmark.h",
+        "android/hardware/tests/libhwbinder/1.0/BpHwBenchmark.h",
         "android/hardware/tests/libhwbinder/1.0/BsBenchmark.h",
     ],
 }
diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp
index 155677f..d8fe811 100644
--- a/tests/memory/1.0/Android.bp
+++ b/tests/memory/1.0/Android.bp
@@ -22,8 +22,8 @@
     out: [
         "android/hardware/tests/memory/1.0/IMemoryTest.h",
         "android/hardware/tests/memory/1.0/IHwMemoryTest.h",
-        "android/hardware/tests/memory/1.0/BnMemoryTest.h",
-        "android/hardware/tests/memory/1.0/BpMemoryTest.h",
+        "android/hardware/tests/memory/1.0/BnHwMemoryTest.h",
+        "android/hardware/tests/memory/1.0/BpHwMemoryTest.h",
         "android/hardware/tests/memory/1.0/BsMemoryTest.h",
     ],
 }
diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp
index f2e257b..669722e 100644
--- a/tests/msgq/1.0/Android.bp
+++ b/tests/msgq/1.0/Android.bp
@@ -22,8 +22,8 @@
     out: [
         "android/hardware/tests/msgq/1.0/ITestMsgQ.h",
         "android/hardware/tests/msgq/1.0/IHwTestMsgQ.h",
-        "android/hardware/tests/msgq/1.0/BnTestMsgQ.h",
-        "android/hardware/tests/msgq/1.0/BpTestMsgQ.h",
+        "android/hardware/tests/msgq/1.0/BnHwTestMsgQ.h",
+        "android/hardware/tests/msgq/1.0/BpHwTestMsgQ.h",
         "android/hardware/tests/msgq/1.0/BsTestMsgQ.h",
     ],
 }
diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp
index d1ffda6..be7f873 100644
--- a/tests/pointer/1.0/Android.bp
+++ b/tests/pointer/1.0/Android.bp
@@ -25,13 +25,13 @@
     out: [
         "android/hardware/tests/pointer/1.0/IGraph.h",
         "android/hardware/tests/pointer/1.0/IHwGraph.h",
-        "android/hardware/tests/pointer/1.0/BnGraph.h",
-        "android/hardware/tests/pointer/1.0/BpGraph.h",
+        "android/hardware/tests/pointer/1.0/BnHwGraph.h",
+        "android/hardware/tests/pointer/1.0/BpHwGraph.h",
         "android/hardware/tests/pointer/1.0/BsGraph.h",
         "android/hardware/tests/pointer/1.0/IPointer.h",
         "android/hardware/tests/pointer/1.0/IHwPointer.h",
-        "android/hardware/tests/pointer/1.0/BnPointer.h",
-        "android/hardware/tests/pointer/1.0/BpPointer.h",
+        "android/hardware/tests/pointer/1.0/BnHwPointer.h",
+        "android/hardware/tests/pointer/1.0/BpHwPointer.h",
         "android/hardware/tests/pointer/1.0/BsPointer.h",
     ],
 }
diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp
index f031183..049d5d7 100644
--- a/wifi/1.0/Android.bp
+++ b/wifi/1.0/Android.bp
@@ -62,68 +62,68 @@
         "android/hardware/wifi/1.0/types.h",
         "android/hardware/wifi/1.0/IWifi.h",
         "android/hardware/wifi/1.0/IHwWifi.h",
-        "android/hardware/wifi/1.0/BnWifi.h",
-        "android/hardware/wifi/1.0/BpWifi.h",
+        "android/hardware/wifi/1.0/BnHwWifi.h",
+        "android/hardware/wifi/1.0/BpHwWifi.h",
         "android/hardware/wifi/1.0/BsWifi.h",
         "android/hardware/wifi/1.0/IWifiApIface.h",
         "android/hardware/wifi/1.0/IHwWifiApIface.h",
-        "android/hardware/wifi/1.0/BnWifiApIface.h",
-        "android/hardware/wifi/1.0/BpWifiApIface.h",
+        "android/hardware/wifi/1.0/BnHwWifiApIface.h",
+        "android/hardware/wifi/1.0/BpHwWifiApIface.h",
         "android/hardware/wifi/1.0/BsWifiApIface.h",
         "android/hardware/wifi/1.0/IWifiChip.h",
         "android/hardware/wifi/1.0/IHwWifiChip.h",
-        "android/hardware/wifi/1.0/BnWifiChip.h",
-        "android/hardware/wifi/1.0/BpWifiChip.h",
+        "android/hardware/wifi/1.0/BnHwWifiChip.h",
+        "android/hardware/wifi/1.0/BpHwWifiChip.h",
         "android/hardware/wifi/1.0/BsWifiChip.h",
         "android/hardware/wifi/1.0/IWifiChipEventCallback.h",
         "android/hardware/wifi/1.0/IHwWifiChipEventCallback.h",
-        "android/hardware/wifi/1.0/BnWifiChipEventCallback.h",
-        "android/hardware/wifi/1.0/BpWifiChipEventCallback.h",
+        "android/hardware/wifi/1.0/BnHwWifiChipEventCallback.h",
+        "android/hardware/wifi/1.0/BpHwWifiChipEventCallback.h",
         "android/hardware/wifi/1.0/BsWifiChipEventCallback.h",
         "android/hardware/wifi/1.0/IWifiEventCallback.h",
         "android/hardware/wifi/1.0/IHwWifiEventCallback.h",
-        "android/hardware/wifi/1.0/BnWifiEventCallback.h",
-        "android/hardware/wifi/1.0/BpWifiEventCallback.h",
+        "android/hardware/wifi/1.0/BnHwWifiEventCallback.h",
+        "android/hardware/wifi/1.0/BpHwWifiEventCallback.h",
         "android/hardware/wifi/1.0/BsWifiEventCallback.h",
         "android/hardware/wifi/1.0/IWifiIface.h",
         "android/hardware/wifi/1.0/IHwWifiIface.h",
-        "android/hardware/wifi/1.0/BnWifiIface.h",
-        "android/hardware/wifi/1.0/BpWifiIface.h",
+        "android/hardware/wifi/1.0/BnHwWifiIface.h",
+        "android/hardware/wifi/1.0/BpHwWifiIface.h",
         "android/hardware/wifi/1.0/BsWifiIface.h",
         "android/hardware/wifi/1.0/IWifiNanIface.h",
         "android/hardware/wifi/1.0/IHwWifiNanIface.h",
-        "android/hardware/wifi/1.0/BnWifiNanIface.h",
-        "android/hardware/wifi/1.0/BpWifiNanIface.h",
+        "android/hardware/wifi/1.0/BnHwWifiNanIface.h",
+        "android/hardware/wifi/1.0/BpHwWifiNanIface.h",
         "android/hardware/wifi/1.0/BsWifiNanIface.h",
         "android/hardware/wifi/1.0/IWifiNanIfaceEventCallback.h",
         "android/hardware/wifi/1.0/IHwWifiNanIfaceEventCallback.h",
-        "android/hardware/wifi/1.0/BnWifiNanIfaceEventCallback.h",
-        "android/hardware/wifi/1.0/BpWifiNanIfaceEventCallback.h",
+        "android/hardware/wifi/1.0/BnHwWifiNanIfaceEventCallback.h",
+        "android/hardware/wifi/1.0/BpHwWifiNanIfaceEventCallback.h",
         "android/hardware/wifi/1.0/BsWifiNanIfaceEventCallback.h",
         "android/hardware/wifi/1.0/IWifiP2pIface.h",
         "android/hardware/wifi/1.0/IHwWifiP2pIface.h",
-        "android/hardware/wifi/1.0/BnWifiP2pIface.h",
-        "android/hardware/wifi/1.0/BpWifiP2pIface.h",
+        "android/hardware/wifi/1.0/BnHwWifiP2pIface.h",
+        "android/hardware/wifi/1.0/BpHwWifiP2pIface.h",
         "android/hardware/wifi/1.0/BsWifiP2pIface.h",
         "android/hardware/wifi/1.0/IWifiRttController.h",
         "android/hardware/wifi/1.0/IHwWifiRttController.h",
-        "android/hardware/wifi/1.0/BnWifiRttController.h",
-        "android/hardware/wifi/1.0/BpWifiRttController.h",
+        "android/hardware/wifi/1.0/BnHwWifiRttController.h",
+        "android/hardware/wifi/1.0/BpHwWifiRttController.h",
         "android/hardware/wifi/1.0/BsWifiRttController.h",
         "android/hardware/wifi/1.0/IWifiRttControllerEventCallback.h",
         "android/hardware/wifi/1.0/IHwWifiRttControllerEventCallback.h",
-        "android/hardware/wifi/1.0/BnWifiRttControllerEventCallback.h",
-        "android/hardware/wifi/1.0/BpWifiRttControllerEventCallback.h",
+        "android/hardware/wifi/1.0/BnHwWifiRttControllerEventCallback.h",
+        "android/hardware/wifi/1.0/BpHwWifiRttControllerEventCallback.h",
         "android/hardware/wifi/1.0/BsWifiRttControllerEventCallback.h",
         "android/hardware/wifi/1.0/IWifiStaIface.h",
         "android/hardware/wifi/1.0/IHwWifiStaIface.h",
-        "android/hardware/wifi/1.0/BnWifiStaIface.h",
-        "android/hardware/wifi/1.0/BpWifiStaIface.h",
+        "android/hardware/wifi/1.0/BnHwWifiStaIface.h",
+        "android/hardware/wifi/1.0/BpHwWifiStaIface.h",
         "android/hardware/wifi/1.0/BsWifiStaIface.h",
         "android/hardware/wifi/1.0/IWifiStaIfaceEventCallback.h",
         "android/hardware/wifi/1.0/IHwWifiStaIfaceEventCallback.h",
-        "android/hardware/wifi/1.0/BnWifiStaIfaceEventCallback.h",
-        "android/hardware/wifi/1.0/BpWifiStaIfaceEventCallback.h",
+        "android/hardware/wifi/1.0/BnHwWifiStaIfaceEventCallback.h",
+        "android/hardware/wifi/1.0/BpHwWifiStaIfaceEventCallback.h",
         "android/hardware/wifi/1.0/BsWifiStaIfaceEventCallback.h",
     ],
 }
diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp
index 3100391..261d940 100644
--- a/wifi/supplicant/1.0/Android.bp
+++ b/wifi/supplicant/1.0/Android.bp
@@ -59,63 +59,63 @@
         "android/hardware/wifi/supplicant/1.0/types.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicant.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicant.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicant.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicant.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicant.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicant.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicant.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantCallback.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantCallback.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantCallback.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantCallback.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantCallback.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantCallback.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantCallback.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantIface.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantIface.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantIface.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantIface.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantIface.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantIface.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantIface.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantNetwork.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantNetwork.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantNetwork.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantNetwork.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantNetwork.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantNetwork.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantP2pIface.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pIface.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantP2pIface.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantP2pIface.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantP2pIface.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantP2pIface.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pIface.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pIfaceCallback.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantP2pIfaceCallback.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantP2pIfaceCallback.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantP2pIfaceCallback.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantP2pIfaceCallback.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pIfaceCallback.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetwork.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pNetwork.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantP2pNetwork.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantP2pNetwork.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantP2pNetwork.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantP2pNetwork.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pNetwork.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pNetworkCallback.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantP2pNetworkCallback.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantP2pNetworkCallback.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantP2pNetworkCallback.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantP2pNetworkCallback.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pNetworkCallback.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantStaIface.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaIface.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantStaIface.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantStaIface.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantStaIface.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantStaIface.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantStaIface.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaIfaceCallback.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantStaIfaceCallback.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantStaIfaceCallback.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantStaIfaceCallback.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantStaIfaceCallback.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantStaIfaceCallback.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantStaNetwork.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaNetwork.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantStaNetwork.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantStaNetwork.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantStaNetwork.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantStaNetwork.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantStaNetwork.h",
         "android/hardware/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.h",
         "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaNetworkCallback.h",
-        "android/hardware/wifi/supplicant/1.0/BnSupplicantStaNetworkCallback.h",
-        "android/hardware/wifi/supplicant/1.0/BpSupplicantStaNetworkCallback.h",
+        "android/hardware/wifi/supplicant/1.0/BnHwSupplicantStaNetworkCallback.h",
+        "android/hardware/wifi/supplicant/1.0/BpHwSupplicantStaNetworkCallback.h",
         "android/hardware/wifi/supplicant/1.0/BsSupplicantStaNetworkCallback.h",
     ],
 }