diff --git a/Android.bp b/Android.bp
index 864e38d..0f910c6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,9 +47,9 @@
     "src/ipc/unix_socket.cc",
     "src/process_stats/file_utils.cc",
     "src/process_stats/procfs_utils.cc",
+    "src/protozero/message.cc",
+    "src/protozero/message_handle.cc",
     "src/protozero/proto_utils.cc",
-    "src/protozero/protozero_message.cc",
-    "src/protozero/protozero_message_handle.cc",
     "src/protozero/scattered_stream_writer.cc",
     "src/traced/probes/probes.cc",
     "src/traced/probes/probes_producer.cc",
@@ -118,9 +118,9 @@
     "src/ipc/host_impl.cc",
     "src/ipc/service_proxy.cc",
     "src/ipc/unix_socket.cc",
+    "src/protozero/message.cc",
+    "src/protozero/message_handle.cc",
     "src/protozero/proto_utils.cc",
-    "src/protozero/protozero_message.cc",
-    "src/protozero/protozero_message_handle.cc",
     "src/protozero/scattered_stream_writer.cc",
     "src/traced/perfetto_cmd/main.cc",
     "src/traced/perfetto_cmd/perfetto_cmd.cc",
@@ -231,9 +231,9 @@
     "src/ipc/unix_socket.cc",
     "src/process_stats/file_utils.cc",
     "src/process_stats/procfs_utils.cc",
+    "src/protozero/message.cc",
+    "src/protozero/message_handle.cc",
     "src/protozero/proto_utils.cc",
-    "src/protozero/protozero_message.cc",
-    "src/protozero/protozero_message_handle.cc",
     "src/protozero/scattered_stream_writer.cc",
     "src/traced/probes/probes_producer.cc",
     "src/tracing/core/chunked_protobuf_input_stream.cc",
@@ -1815,9 +1815,9 @@
     "src/ipc/host_impl.cc",
     "src/ipc/service_proxy.cc",
     "src/ipc/unix_socket.cc",
+    "src/protozero/message.cc",
+    "src/protozero/message_handle.cc",
     "src/protozero/proto_utils.cc",
-    "src/protozero/protozero_message.cc",
-    "src/protozero/protozero_message_handle.cc",
     "src/protozero/scattered_stream_writer.cc",
     "src/tracing/core/chunked_protobuf_input_stream.cc",
     "src/tracing/core/data_source_config.cc",
@@ -1939,12 +1939,12 @@
     "src/ipc/test/ipc_integrationtest.cc",
     "src/ipc/unix_socket.cc",
     "src/ipc/unix_socket_unittest.cc",
+    "src/protozero/message.cc",
+    "src/protozero/message_handle.cc",
+    "src/protozero/message_handle_unittest.cc",
+    "src/protozero/message_unittest.cc",
     "src/protozero/proto_utils.cc",
     "src/protozero/proto_utils_unittest.cc",
-    "src/protozero/protozero_message.cc",
-    "src/protozero/protozero_message_handle.cc",
-    "src/protozero/protozero_message_handle_unittest.cc",
-    "src/protozero/protozero_message_unittest.cc",
     "src/protozero/scattered_stream_writer.cc",
     "src/protozero/scattered_stream_writer_unittest.cc",
     "src/protozero/test/fake_scattered_buffer.cc",