diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 48a415ec7f..e973b70204 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -998,8 +998,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         ((DedicatedThreadAsyncMediaCodecAdapter) codecAdapter).start();
       } else if (mediaCodecOperationMode == OPERATION_MODE_ASYNCHRONOUS_DEDICATED_THREAD_MULTI_LOCK
           && Util.SDK_INT >= 23) {
-        codecAdapter = new MultiLockAsynchMediaCodecAdapter(codec, getTrackType());
-        ((MultiLockAsynchMediaCodecAdapter) codecAdapter).start();
+        codecAdapter = new MultiLockAsyncMediaCodecAdapter(codec, getTrackType());
+        ((MultiLockAsyncMediaCodecAdapter) codecAdapter).start();
       } else {
         codecAdapter = new SynchronousMediaCodecAdapter(codec, getDequeueOutputBufferTimeoutUs());
       }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsynchMediaCodecAdapter.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java
similarity index 97%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsynchMediaCodecAdapter.java
rename to library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java
index 7d00d15947..56f503c71a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsynchMediaCodecAdapter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java
@@ -51,7 +51,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
  * <p>After creating an instance, you need to call {@link #start()} to start the internal Thread.
  */
 @RequiresApi(23)
-/* package */ final class MultiLockAsynchMediaCodecAdapter extends MediaCodec.Callback
+/* package */ final class MultiLockAsyncMediaCodecAdapter extends MediaCodec.Callback
     implements MediaCodecAdapter {
 
   @IntDef({STATE_CREATED, STATE_STARTED, STATE_SHUT_DOWN})
@@ -97,12 +97,12 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   private Runnable onCodecStart;
 
   /** Creates a new instance that wraps the specified {@link MediaCodec}. */
-  /* package */ MultiLockAsynchMediaCodecAdapter(MediaCodec codec, int trackType) {
+  /* package */ MultiLockAsyncMediaCodecAdapter(MediaCodec codec, int trackType) {
     this(codec, new HandlerThread(createThreadLabel(trackType)));
   }
 
   @VisibleForTesting
-  /* package */ MultiLockAsynchMediaCodecAdapter(MediaCodec codec, HandlerThread handlerThread) {
+  /* package */ MultiLockAsyncMediaCodecAdapter(MediaCodec codec, HandlerThread handlerThread) {
     this.codec = codec;
     inputBufferLock = new Object();
     outputBufferLock = new Object();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java
index 815d6ab3da..b984d28914 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java
@@ -38,10 +38,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.shadows.ShadowLooper;
 
-/** Unit tests for {@link MultiLockAsynchMediaCodecAdapter}. */
+/** Unit tests for {@link MultiLockAsyncMediaCodecAdapter}. */
 @RunWith(AndroidJUnit4.class)
 public class MultiLockAsyncMediaCodecAdapterTest {
-  private MultiLockAsynchMediaCodecAdapter adapter;
+  private MultiLockAsyncMediaCodecAdapter adapter;
   private MediaCodec codec;
   private MediaCodec.BufferInfo bufferInfo = null;
   private MediaCodecAsyncCallback mediaCodecAsyncCallbackSpy;
@@ -51,7 +51,7 @@ public class MultiLockAsyncMediaCodecAdapterTest {
   public void setup() throws IOException {
     codec = MediaCodec.createByCodecName("h264");
     handlerThread = new TestHandlerThread("TestHandlerThread");
-    adapter = new MultiLockAsynchMediaCodecAdapter(codec, handlerThread);
+    adapter = new MultiLockAsyncMediaCodecAdapter(codec, handlerThread);
     bufferInfo = new MediaCodec.BufferInfo();
   }