diff --git a/CleanSpec.mk b/CleanSpec.mk
index d0890fe..34d040e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -59,6 +59,12 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudiopolicymanager.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicyservice_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libaudiopolicymanager_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/liboboe.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/liboboe.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/liboboe*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/liboboe*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj_arm/STATIC_LIBRARIES/liboboe*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj_arm/SHARED_LIBRARIES/liboboe*)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/media/liboboe/Android.bp b/media/libaaudio/Android.bp
similarity index 92%
rename from media/liboboe/Android.bp
rename to media/libaaudio/Android.bp
index fd6591d..e41d62b 100644
--- a/media/liboboe/Android.bp
+++ b/media/libaaudio/Android.bp
@@ -21,8 +21,8 @@
 }
 
 ndk_library {
-    name: "liboboe.ndk",
-    symbol_file: "liboboe.map.txt",
+    name: "libaaudio.ndk",
+    symbol_file: "libaaudio.map.txt",
     first_version: "26",
     unversioned_until: "current",
 }
diff --git a/media/liboboe/Android.mk b/media/libaaudio/Android.mk
similarity index 100%
rename from media/liboboe/Android.mk
rename to media/libaaudio/Android.mk
diff --git a/media/libaaudio/README.md b/media/libaaudio/README.md
new file mode 100644
index 0000000..f059521
--- /dev/null
+++ b/media/libaaudio/README.md
@@ -0,0 +1 @@
+AAudio input/output API
diff --git a/media/liboboe/examples/Android.mk b/media/libaaudio/examples/Android.mk
similarity index 100%
rename from media/liboboe/examples/Android.mk
rename to media/libaaudio/examples/Android.mk
diff --git a/media/liboboe/examples/write_sine/Android.mk b/media/libaaudio/examples/write_sine/Android.mk
similarity index 100%
rename from media/liboboe/examples/write_sine/Android.mk
rename to media/libaaudio/examples/write_sine/Android.mk
diff --git a/media/liboboe/examples/write_sine/README.md b/media/libaaudio/examples/write_sine/README.md
similarity index 100%
rename from media/liboboe/examples/write_sine/README.md
rename to media/libaaudio/examples/write_sine/README.md
diff --git a/media/liboboe/examples/write_sine/jni/Android.mk b/media/libaaudio/examples/write_sine/jni/Android.mk
similarity index 100%
rename from media/liboboe/examples/write_sine/jni/Android.mk
rename to media/libaaudio/examples/write_sine/jni/Android.mk
diff --git a/media/liboboe/examples/write_sine/jni/Application.mk b/media/libaaudio/examples/write_sine/jni/Application.mk
similarity index 100%
rename from media/liboboe/examples/write_sine/jni/Application.mk
rename to media/libaaudio/examples/write_sine/jni/Application.mk
diff --git a/media/liboboe/examples/write_sine/src/SineGenerator.h b/media/libaaudio/examples/write_sine/src/SineGenerator.h
similarity index 100%
rename from media/liboboe/examples/write_sine/src/SineGenerator.h
rename to media/libaaudio/examples/write_sine/src/SineGenerator.h
diff --git a/media/liboboe/examples/write_sine/src/write_sine.cpp b/media/libaaudio/examples/write_sine/src/write_sine.cpp
similarity index 100%
rename from media/liboboe/examples/write_sine/src/write_sine.cpp
rename to media/libaaudio/examples/write_sine/src/write_sine.cpp
diff --git a/media/liboboe/examples/write_sine/src/write_sine_threaded.cpp b/media/libaaudio/examples/write_sine/src/write_sine_threaded.cpp
similarity index 100%
rename from media/liboboe/examples/write_sine/src/write_sine_threaded.cpp
rename to media/libaaudio/examples/write_sine/src/write_sine_threaded.cpp
diff --git a/media/liboboe/examples/write_sine/static/Android.mk b/media/libaaudio/examples/write_sine/static/Android.mk
similarity index 84%
rename from media/liboboe/examples/write_sine/static/Android.mk
rename to media/libaaudio/examples/write_sine/static/Android.mk
index 7c8d17c..139b70a 100644
--- a/media/liboboe/examples/write_sine/static/Android.mk
+++ b/media/libaaudio/examples/write_sine/static/Android.mk
@@ -4,7 +4,7 @@
 LOCAL_MODULE_TAGS := examples
 LOCAL_C_INCLUDES := \
     $(call include-path-for, audio-utils) \
-    frameworks/av/media/liboboe/include
+    frameworks/av/media/libaaudio/include
 
 # TODO reorganize folders to avoid using ../
 LOCAL_SRC_FILES:= ../src/write_sine.cpp
@@ -12,7 +12,7 @@
 LOCAL_SHARED_LIBRARIES := libaudioutils libmedia \
                           libbinder libcutils libutils \
                           libaudioclient liblog libtinyalsa
-LOCAL_STATIC_LIBRARIES := liboboe
+LOCAL_STATIC_LIBRARIES := libaaudio
 
 LOCAL_MODULE := write_sine
 include $(BUILD_EXECUTABLE)
@@ -21,14 +21,14 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_C_INCLUDES := \
     $(call include-path-for, audio-utils) \
-    frameworks/av/media/liboboe/include
+    frameworks/av/media/libaaudio/include
 
 LOCAL_SRC_FILES:= ../src/write_sine_threaded.cpp
 
 LOCAL_SHARED_LIBRARIES := libaudioutils libmedia \
                           libbinder libcutils libutils \
                           libaudioclient liblog libtinyalsa
-LOCAL_STATIC_LIBRARIES := liboboe
+LOCAL_STATIC_LIBRARIES := libaaudio
 
 LOCAL_MODULE := write_sine_threaded
 include $(BUILD_EXECUTABLE)
diff --git a/media/liboboe/examples/write_sine/static/README.md b/media/libaaudio/examples/write_sine/static/README.md
similarity index 100%
rename from media/liboboe/examples/write_sine/static/README.md
rename to media/libaaudio/examples/write_sine/static/README.md
diff --git a/media/liboboe/include/aaudio/AAudio.h b/media/libaaudio/include/aaudio/AAudio.h
similarity index 100%
rename from media/liboboe/include/aaudio/AAudio.h
rename to media/libaaudio/include/aaudio/AAudio.h
diff --git a/media/liboboe/include/aaudio/AAudioDefinitions.h b/media/libaaudio/include/aaudio/AAudioDefinitions.h
similarity index 100%
rename from media/liboboe/include/aaudio/AAudioDefinitions.h
rename to media/libaaudio/include/aaudio/AAudioDefinitions.h
diff --git a/media/liboboe/include/aaudio/NOTICE b/media/libaaudio/include/aaudio/NOTICE
similarity index 100%
rename from media/liboboe/include/aaudio/NOTICE
rename to media/libaaudio/include/aaudio/NOTICE
diff --git a/media/liboboe/include/aaudio/README.md b/media/libaaudio/include/aaudio/README.md
similarity index 100%
rename from media/liboboe/include/aaudio/README.md
rename to media/libaaudio/include/aaudio/README.md
diff --git a/media/liboboe/liboboe.map.txt b/media/libaaudio/libaaudio.map.txt
similarity index 100%
rename from media/liboboe/liboboe.map.txt
rename to media/libaaudio/libaaudio.map.txt
diff --git a/media/liboboe/scripts/convert_oboe_aaudio.sh b/media/libaaudio/scripts/convert_oboe_aaudio.sh
similarity index 100%
rename from media/liboboe/scripts/convert_oboe_aaudio.sh
rename to media/libaaudio/scripts/convert_oboe_aaudio.sh
diff --git a/media/liboboe/scripts/oboe_to_aaudio.sed b/media/libaaudio/scripts/oboe_to_aaudio.sed
similarity index 100%
rename from media/liboboe/scripts/oboe_to_aaudio.sed
rename to media/libaaudio/scripts/oboe_to_aaudio.sed
diff --git a/media/liboboe/scripts/revert_all_aaudio.sh b/media/libaaudio/scripts/revert_all_aaudio.sh
similarity index 100%
rename from media/liboboe/scripts/revert_all_aaudio.sh
rename to media/libaaudio/scripts/revert_all_aaudio.sh
diff --git a/media/liboboe/src/Android.mk b/media/libaaudio/src/Android.mk
similarity index 91%
rename from media/liboboe/src/Android.mk
rename to media/libaaudio/src/Android.mk
index a508be3..a016b49 100644
--- a/media/liboboe/src/Android.mk
+++ b/media/libaaudio/src/Android.mk
@@ -5,18 +5,18 @@
 # TODO Remove this target later, when not needed.
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := liboboe
+LOCAL_MODULE := libaaudio
 LOCAL_MODULE_TAGS := optional
 
-LIBAAUDIO_DIR := $(TOP)/frameworks/av/media/liboboe
+LIBAAUDIO_DIR := $(TOP)/frameworks/av/media/libaaudio
 LIBAAUDIO_SRC_DIR := $(LIBAAUDIO_DIR)/src
 
 LOCAL_C_INCLUDES := \
     $(call include-path-for, audio-utils) \
     frameworks/native/include \
     system/core/base/include \
-    frameworks/native/media/liboboe/include/include \
-    frameworks/av/media/liboboe/include \
+    frameworks/native/media/libaaudio/include/include \
+    frameworks/av/media/libaaudio/include \
     frameworks/native/include \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/binding \
@@ -59,15 +59,15 @@
 # ======================= SHARED LIBRARY ==========================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := liboboe
+LOCAL_MODULE := libaaudio
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_C_INCLUDES := \
     $(call include-path-for, audio-utils) \
     frameworks/native/include \
     system/core/base/include \
-    frameworks/native/media/liboboe/include/include \
-    frameworks/av/media/liboboe/include \
+    frameworks/native/media/libaaudio/include/include \
+    frameworks/av/media/libaaudio/include \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/binding \
     $(LOCAL_PATH)/client \
diff --git a/media/liboboe/src/binding/AAudioServiceDefinitions.h b/media/libaaudio/src/binding/AAudioServiceDefinitions.h
similarity index 100%
rename from media/liboboe/src/binding/AAudioServiceDefinitions.h
rename to media/libaaudio/src/binding/AAudioServiceDefinitions.h
diff --git a/media/liboboe/src/binding/AAudioServiceMessage.h b/media/libaaudio/src/binding/AAudioServiceMessage.h
similarity index 100%
rename from media/liboboe/src/binding/AAudioServiceMessage.h
rename to media/libaaudio/src/binding/AAudioServiceMessage.h
diff --git a/media/liboboe/src/binding/AAudioStreamConfiguration.cpp b/media/libaaudio/src/binding/AAudioStreamConfiguration.cpp
similarity index 100%
rename from media/liboboe/src/binding/AAudioStreamConfiguration.cpp
rename to media/libaaudio/src/binding/AAudioStreamConfiguration.cpp
diff --git a/media/liboboe/src/binding/AAudioStreamConfiguration.h b/media/libaaudio/src/binding/AAudioStreamConfiguration.h
similarity index 100%
rename from media/liboboe/src/binding/AAudioStreamConfiguration.h
rename to media/libaaudio/src/binding/AAudioStreamConfiguration.h
diff --git a/media/liboboe/src/binding/AAudioStreamRequest.cpp b/media/libaaudio/src/binding/AAudioStreamRequest.cpp
similarity index 100%
rename from media/liboboe/src/binding/AAudioStreamRequest.cpp
rename to media/libaaudio/src/binding/AAudioStreamRequest.cpp
diff --git a/media/liboboe/src/binding/AAudioStreamRequest.h b/media/libaaudio/src/binding/AAudioStreamRequest.h
similarity index 100%
rename from media/liboboe/src/binding/AAudioStreamRequest.h
rename to media/libaaudio/src/binding/AAudioStreamRequest.h
diff --git a/media/liboboe/src/binding/AudioEndpointParcelable.cpp b/media/libaaudio/src/binding/AudioEndpointParcelable.cpp
similarity index 100%
rename from media/liboboe/src/binding/AudioEndpointParcelable.cpp
rename to media/libaaudio/src/binding/AudioEndpointParcelable.cpp
diff --git a/media/liboboe/src/binding/AudioEndpointParcelable.h b/media/libaaudio/src/binding/AudioEndpointParcelable.h
similarity index 100%
rename from media/liboboe/src/binding/AudioEndpointParcelable.h
rename to media/libaaudio/src/binding/AudioEndpointParcelable.h
diff --git a/media/liboboe/src/binding/IAAudioService.cpp b/media/libaaudio/src/binding/IAAudioService.cpp
similarity index 100%
rename from media/liboboe/src/binding/IAAudioService.cpp
rename to media/libaaudio/src/binding/IAAudioService.cpp
diff --git a/media/liboboe/src/binding/IAAudioService.h b/media/libaaudio/src/binding/IAAudioService.h
similarity index 100%
rename from media/liboboe/src/binding/IAAudioService.h
rename to media/libaaudio/src/binding/IAAudioService.h
diff --git a/media/liboboe/src/binding/RingBufferParcelable.cpp b/media/libaaudio/src/binding/RingBufferParcelable.cpp
similarity index 100%
rename from media/liboboe/src/binding/RingBufferParcelable.cpp
rename to media/libaaudio/src/binding/RingBufferParcelable.cpp
diff --git a/media/liboboe/src/binding/RingBufferParcelable.h b/media/libaaudio/src/binding/RingBufferParcelable.h
similarity index 100%
rename from media/liboboe/src/binding/RingBufferParcelable.h
rename to media/libaaudio/src/binding/RingBufferParcelable.h
diff --git a/media/liboboe/src/binding/SharedMemoryParcelable.cpp b/media/libaaudio/src/binding/SharedMemoryParcelable.cpp
similarity index 100%
rename from media/liboboe/src/binding/SharedMemoryParcelable.cpp
rename to media/libaaudio/src/binding/SharedMemoryParcelable.cpp
diff --git a/media/liboboe/src/binding/SharedMemoryParcelable.h b/media/libaaudio/src/binding/SharedMemoryParcelable.h
similarity index 100%
rename from media/liboboe/src/binding/SharedMemoryParcelable.h
rename to media/libaaudio/src/binding/SharedMemoryParcelable.h
diff --git a/media/liboboe/src/binding/SharedRegionParcelable.cpp b/media/libaaudio/src/binding/SharedRegionParcelable.cpp
similarity index 100%
rename from media/liboboe/src/binding/SharedRegionParcelable.cpp
rename to media/libaaudio/src/binding/SharedRegionParcelable.cpp
diff --git a/media/liboboe/src/binding/SharedRegionParcelable.h b/media/libaaudio/src/binding/SharedRegionParcelable.h
similarity index 100%
rename from media/liboboe/src/binding/SharedRegionParcelable.h
rename to media/libaaudio/src/binding/SharedRegionParcelable.h
diff --git a/media/liboboe/src/client/AudioEndpoint.cpp b/media/libaaudio/src/client/AudioEndpoint.cpp
similarity index 100%
rename from media/liboboe/src/client/AudioEndpoint.cpp
rename to media/libaaudio/src/client/AudioEndpoint.cpp
diff --git a/media/liboboe/src/client/AudioEndpoint.h b/media/libaaudio/src/client/AudioEndpoint.h
similarity index 100%
rename from media/liboboe/src/client/AudioEndpoint.h
rename to media/libaaudio/src/client/AudioEndpoint.h
diff --git a/media/liboboe/src/client/AudioStreamInternal.cpp b/media/libaaudio/src/client/AudioStreamInternal.cpp
similarity index 100%
rename from media/liboboe/src/client/AudioStreamInternal.cpp
rename to media/libaaudio/src/client/AudioStreamInternal.cpp
diff --git a/media/liboboe/src/client/AudioStreamInternal.h b/media/libaaudio/src/client/AudioStreamInternal.h
similarity index 100%
rename from media/liboboe/src/client/AudioStreamInternal.h
rename to media/libaaudio/src/client/AudioStreamInternal.h
diff --git a/media/liboboe/src/client/IsochronousClockModel.cpp b/media/libaaudio/src/client/IsochronousClockModel.cpp
similarity index 100%
rename from media/liboboe/src/client/IsochronousClockModel.cpp
rename to media/libaaudio/src/client/IsochronousClockModel.cpp
diff --git a/media/liboboe/src/client/IsochronousClockModel.h b/media/libaaudio/src/client/IsochronousClockModel.h
similarity index 100%
rename from media/liboboe/src/client/IsochronousClockModel.h
rename to media/libaaudio/src/client/IsochronousClockModel.h
diff --git a/media/liboboe/src/core/AAudioAudio.cpp b/media/libaaudio/src/core/AAudioAudio.cpp
similarity index 100%
rename from media/liboboe/src/core/AAudioAudio.cpp
rename to media/libaaudio/src/core/AAudioAudio.cpp
diff --git a/media/liboboe/src/core/AudioStream.cpp b/media/libaaudio/src/core/AudioStream.cpp
similarity index 100%
rename from media/liboboe/src/core/AudioStream.cpp
rename to media/libaaudio/src/core/AudioStream.cpp
diff --git a/media/liboboe/src/core/AudioStream.h b/media/libaaudio/src/core/AudioStream.h
similarity index 100%
rename from media/liboboe/src/core/AudioStream.h
rename to media/libaaudio/src/core/AudioStream.h
diff --git a/media/liboboe/src/core/AudioStreamBuilder.cpp b/media/libaaudio/src/core/AudioStreamBuilder.cpp
similarity index 100%
rename from media/liboboe/src/core/AudioStreamBuilder.cpp
rename to media/libaaudio/src/core/AudioStreamBuilder.cpp
diff --git a/media/liboboe/src/core/AudioStreamBuilder.h b/media/libaaudio/src/core/AudioStreamBuilder.h
similarity index 100%
rename from media/liboboe/src/core/AudioStreamBuilder.h
rename to media/libaaudio/src/core/AudioStreamBuilder.h
diff --git a/media/liboboe/src/core/README.md b/media/libaaudio/src/core/README.md
similarity index 100%
rename from media/liboboe/src/core/README.md
rename to media/libaaudio/src/core/README.md
diff --git a/media/liboboe/src/core/VersionExperiment.txt b/media/libaaudio/src/core/VersionExperiment.txt
similarity index 100%
rename from media/liboboe/src/core/VersionExperiment.txt
rename to media/libaaudio/src/core/VersionExperiment.txt
diff --git a/media/liboboe/src/fifo/FifoBuffer.cpp b/media/libaaudio/src/fifo/FifoBuffer.cpp
similarity index 100%
rename from media/liboboe/src/fifo/FifoBuffer.cpp
rename to media/libaaudio/src/fifo/FifoBuffer.cpp
diff --git a/media/liboboe/src/fifo/FifoBuffer.h b/media/libaaudio/src/fifo/FifoBuffer.h
similarity index 100%
rename from media/liboboe/src/fifo/FifoBuffer.h
rename to media/libaaudio/src/fifo/FifoBuffer.h
diff --git a/media/liboboe/src/fifo/FifoController.h b/media/libaaudio/src/fifo/FifoController.h
similarity index 100%
rename from media/liboboe/src/fifo/FifoController.h
rename to media/libaaudio/src/fifo/FifoController.h
diff --git a/media/liboboe/src/fifo/FifoControllerBase.cpp b/media/libaaudio/src/fifo/FifoControllerBase.cpp
similarity index 100%
rename from media/liboboe/src/fifo/FifoControllerBase.cpp
rename to media/libaaudio/src/fifo/FifoControllerBase.cpp
diff --git a/media/liboboe/src/fifo/FifoControllerBase.h b/media/libaaudio/src/fifo/FifoControllerBase.h
similarity index 100%
rename from media/liboboe/src/fifo/FifoControllerBase.h
rename to media/libaaudio/src/fifo/FifoControllerBase.h
diff --git a/media/liboboe/src/fifo/FifoControllerIndirect.h b/media/libaaudio/src/fifo/FifoControllerIndirect.h
similarity index 100%
rename from media/liboboe/src/fifo/FifoControllerIndirect.h
rename to media/libaaudio/src/fifo/FifoControllerIndirect.h
diff --git a/media/liboboe/src/fifo/README.md b/media/libaaudio/src/fifo/README.md
similarity index 100%
rename from media/liboboe/src/fifo/README.md
rename to media/libaaudio/src/fifo/README.md
diff --git a/media/liboboe/src/legacy/AAudioLegacy.h b/media/libaaudio/src/legacy/AAudioLegacy.h
similarity index 100%
rename from media/liboboe/src/legacy/AAudioLegacy.h
rename to media/libaaudio/src/legacy/AAudioLegacy.h
diff --git a/media/liboboe/src/legacy/AudioStreamRecord.cpp b/media/libaaudio/src/legacy/AudioStreamRecord.cpp
similarity index 100%
rename from media/liboboe/src/legacy/AudioStreamRecord.cpp
rename to media/libaaudio/src/legacy/AudioStreamRecord.cpp
diff --git a/media/liboboe/src/legacy/AudioStreamRecord.h b/media/libaaudio/src/legacy/AudioStreamRecord.h
similarity index 100%
rename from media/liboboe/src/legacy/AudioStreamRecord.h
rename to media/libaaudio/src/legacy/AudioStreamRecord.h
diff --git a/media/liboboe/src/legacy/AudioStreamTrack.cpp b/media/libaaudio/src/legacy/AudioStreamTrack.cpp
similarity index 100%
rename from media/liboboe/src/legacy/AudioStreamTrack.cpp
rename to media/libaaudio/src/legacy/AudioStreamTrack.cpp
diff --git a/media/liboboe/src/legacy/AudioStreamTrack.h b/media/libaaudio/src/legacy/AudioStreamTrack.h
similarity index 100%
rename from media/liboboe/src/legacy/AudioStreamTrack.h
rename to media/libaaudio/src/legacy/AudioStreamTrack.h
diff --git a/media/liboboe/src/legacy/README.md b/media/libaaudio/src/legacy/README.md
similarity index 100%
rename from media/liboboe/src/legacy/README.md
rename to media/libaaudio/src/legacy/README.md
diff --git a/media/liboboe/src/utility/AAudioUtilities.cpp b/media/libaaudio/src/utility/AAudioUtilities.cpp
similarity index 100%
rename from media/liboboe/src/utility/AAudioUtilities.cpp
rename to media/libaaudio/src/utility/AAudioUtilities.cpp
diff --git a/media/liboboe/src/utility/AAudioUtilities.h b/media/libaaudio/src/utility/AAudioUtilities.h
similarity index 100%
rename from media/liboboe/src/utility/AAudioUtilities.h
rename to media/libaaudio/src/utility/AAudioUtilities.h
diff --git a/media/liboboe/src/utility/AudioClock.h b/media/libaaudio/src/utility/AudioClock.h
similarity index 100%
rename from media/liboboe/src/utility/AudioClock.h
rename to media/libaaudio/src/utility/AudioClock.h
diff --git a/media/liboboe/src/utility/HandleTracker.cpp b/media/libaaudio/src/utility/HandleTracker.cpp
similarity index 100%
rename from media/liboboe/src/utility/HandleTracker.cpp
rename to media/libaaudio/src/utility/HandleTracker.cpp
diff --git a/media/liboboe/src/utility/HandleTracker.h b/media/libaaudio/src/utility/HandleTracker.h
similarity index 100%
rename from media/liboboe/src/utility/HandleTracker.h
rename to media/libaaudio/src/utility/HandleTracker.h
diff --git a/media/liboboe/src/utility/MonotonicCounter.h b/media/libaaudio/src/utility/MonotonicCounter.h
similarity index 100%
rename from media/liboboe/src/utility/MonotonicCounter.h
rename to media/libaaudio/src/utility/MonotonicCounter.h
diff --git a/media/liboboe/src/utility/README.md b/media/libaaudio/src/utility/README.md
similarity index 100%
rename from media/liboboe/src/utility/README.md
rename to media/libaaudio/src/utility/README.md
diff --git a/media/liboboe/tests/Android.mk b/media/libaaudio/tests/Android.mk
similarity index 62%
rename from media/liboboe/tests/Android.mk
rename to media/libaaudio/tests/Android.mk
index 16279ec..24dad4a 100644
--- a/media/liboboe/tests/Android.mk
+++ b/media/libaaudio/tests/Android.mk
@@ -3,40 +3,40 @@
 include $(CLEAR_VARS)
 LOCAL_C_INCLUDES := \
     $(call include-path-for, audio-utils) \
-    frameworks/av/media/liboboe/include \
-    frameworks/av/media/liboboe/src/core \
-    frameworks/av/media/liboboe/src/utility
+    frameworks/av/media/libaaudio/include \
+    frameworks/av/media/libaaudio/src/core \
+    frameworks/av/media/libaaudio/src/utility
 LOCAL_SRC_FILES := test_aaudio_api.cpp
 LOCAL_SHARED_LIBRARIES := libaudioclient libaudioutils libbinder \
                           libcutils liblog libmedia libutils
-LOCAL_STATIC_LIBRARIES := liboboe
+LOCAL_STATIC_LIBRARIES := libaaudio
 LOCAL_MODULE := test_aaudio_api
 include $(BUILD_NATIVE_TEST)
 
 include $(CLEAR_VARS)
 LOCAL_C_INCLUDES := \
     $(call include-path-for, audio-utils) \
-    frameworks/av/media/liboboe/include \
-    frameworks/av/media/liboboe/src/core \
-    frameworks/av/media/liboboe/src/utility
+    frameworks/av/media/libaaudio/include \
+    frameworks/av/media/libaaudio/src/core \
+    frameworks/av/media/libaaudio/src/utility
 LOCAL_SRC_FILES:= test_handle_tracker.cpp
 LOCAL_SHARED_LIBRARIES := libaudioclient libaudioutils libbinder \
                           libcutils liblog libmedia libutils
-LOCAL_STATIC_LIBRARIES := liboboe
+LOCAL_STATIC_LIBRARIES := libaaudio
 LOCAL_MODULE := test_handle_tracker
 include $(BUILD_NATIVE_TEST)
 
 include $(CLEAR_VARS)
 LOCAL_C_INCLUDES := \
     $(call include-path-for, audio-utils) \
-    frameworks/av/media/liboboe/include \
-    frameworks/av/media/liboboe/src \
-    frameworks/av/media/liboboe/src/core \
-    frameworks/av/media/liboboe/src/fifo \
-    frameworks/av/media/liboboe/src/utility
+    frameworks/av/media/libaaudio/include \
+    frameworks/av/media/libaaudio/src \
+    frameworks/av/media/libaaudio/src/core \
+    frameworks/av/media/libaaudio/src/fifo \
+    frameworks/av/media/libaaudio/src/utility
 LOCAL_SRC_FILES:= test_marshalling.cpp
 LOCAL_SHARED_LIBRARIES := libaudioclient libaudioutils libbinder \
                           libcutils liblog libmedia libutils
-LOCAL_STATIC_LIBRARIES := liboboe
+LOCAL_STATIC_LIBRARIES := libaaudio
 LOCAL_MODULE := test_marshalling
 include $(BUILD_NATIVE_TEST)
diff --git a/media/liboboe/tests/test_aaudio_api.cpp b/media/libaaudio/tests/test_aaudio_api.cpp
similarity index 100%
rename from media/liboboe/tests/test_aaudio_api.cpp
rename to media/libaaudio/tests/test_aaudio_api.cpp
diff --git a/media/liboboe/tests/test_handle_tracker.cpp b/media/libaaudio/tests/test_handle_tracker.cpp
similarity index 100%
rename from media/liboboe/tests/test_handle_tracker.cpp
rename to media/libaaudio/tests/test_handle_tracker.cpp
diff --git a/media/liboboe/tests/test_marshalling.cpp b/media/libaaudio/tests/test_marshalling.cpp
similarity index 100%
rename from media/liboboe/tests/test_marshalling.cpp
rename to media/libaaudio/tests/test_marshalling.cpp
diff --git a/media/liboboe/README.md b/media/liboboe/README.md
deleted file mode 100644
index 9f2c249..0000000
--- a/media/liboboe/README.md
+++ /dev/null
@@ -1 +0,0 @@
-AAudio Audio input/output API
diff --git a/services/oboeservice/Android.mk b/services/oboeservice/Android.mk
index 68e43ed..5cd9121 100644
--- a/services/oboeservice/Android.mk
+++ b/services/oboeservice/Android.mk
@@ -3,28 +3,28 @@
 # AAudio Service
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := oboeservice
+LOCAL_MODULE := aaudioservice
 LOCAL_MODULE_TAGS := optional
 
-LIBAAUDIO_DIR := ../../media/liboboe
+LIBAAUDIO_DIR := ../../media/libaaudio
 LIBAAUDIO_SRC_DIR := $(LIBAAUDIO_DIR)/src
 
 LOCAL_C_INCLUDES := \
     $(call include-path-for, audio-utils) \
     frameworks/native/include \
     system/core/base/include \
-    $(TOP)/frameworks/native/media/liboboe/include/include \
-    $(TOP)/frameworks/av/media/liboboe/include \
+    $(TOP)/frameworks/native/media/libaaudio/include/include \
+    $(TOP)/frameworks/av/media/libaaudio/include \
     frameworks/native/include \
     $(TOP)/external/tinyalsa/include \
-    $(TOP)/frameworks/av/media/liboboe/src \
-    $(TOP)/frameworks/av/media/liboboe/src/binding \
-    $(TOP)/frameworks/av/media/liboboe/src/client \
-    $(TOP)/frameworks/av/media/liboboe/src/core \
-    $(TOP)/frameworks/av/media/liboboe/src/fifo \
-    $(TOP)/frameworks/av/media/liboboe/src/utility
+    $(TOP)/frameworks/av/media/libaaudio/src \
+    $(TOP)/frameworks/av/media/libaaudio/src/binding \
+    $(TOP)/frameworks/av/media/libaaudio/src/client \
+    $(TOP)/frameworks/av/media/libaaudio/src/core \
+    $(TOP)/frameworks/av/media/libaaudio/src/fifo \
+    $(TOP)/frameworks/av/media/libaaudio/src/utility
 
-# TODO These could be in a liboboe_common library
+# TODO These could be in a libaaudio_common library
 LOCAL_SRC_FILES += \
     $(LIBAAUDIO_SRC_DIR)/utility/HandleTracker.cpp \
     $(LIBAAUDIO_SRC_DIR)/utility/AAudioUtilities.cpp \