diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index efebe7e..ca8341d 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -28,18 +28,18 @@
     out: [
         "android/hidl/memory/1.0/IAllocator.h",
         "android/hidl/memory/1.0/IHwAllocator.h",
-        "android/hidl/memory/1.0/BnAllocator.h",
-        "android/hidl/memory/1.0/BpAllocator.h",
+        "android/hidl/memory/1.0/BnHwAllocator.h",
+        "android/hidl/memory/1.0/BpHwAllocator.h",
         "android/hidl/memory/1.0/BsAllocator.h",
         "android/hidl/memory/1.0/IMapper.h",
         "android/hidl/memory/1.0/IHwMapper.h",
-        "android/hidl/memory/1.0/BnMapper.h",
-        "android/hidl/memory/1.0/BpMapper.h",
+        "android/hidl/memory/1.0/BnHwMapper.h",
+        "android/hidl/memory/1.0/BpHwMapper.h",
         "android/hidl/memory/1.0/BsMapper.h",
         "android/hidl/memory/1.0/IMemory.h",
         "android/hidl/memory/1.0/IHwMemory.h",
-        "android/hidl/memory/1.0/BnMemory.h",
-        "android/hidl/memory/1.0/BpMemory.h",
+        "android/hidl/memory/1.0/BnHwMemory.h",
+        "android/hidl/memory/1.0/BpHwMemory.h",
         "android/hidl/memory/1.0/BsMemory.h",
     ],
 }