diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 18999e9307..19c69f9aa0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -178,8 +178,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
     // Note: The documentation for Process.THREAD_PRIORITY_AUDIO that states "Applications can
     // not normally change to this priority" is incorrect.
-    internalPlaybackThread =
-        new HandlerThread("ExoPlayerImplInternal:Handler", Process.THREAD_PRIORITY_AUDIO);
+    internalPlaybackThread = new HandlerThread("ExoPlayer:Playback", Process.THREAD_PRIORITY_AUDIO);
     internalPlaybackThread.start();
     handler = clock.createHandler(internalPlaybackThread.getLooper(), this);
     deliverPendingMessageAtStartPositionRequired = true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
index 538cc10344..8f660c4c24 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
@@ -66,7 +66,7 @@ public abstract class SimpleDecoder<
       availableOutputBuffers[i] = createOutputBuffer();
     }
     decodeThread =
-        new Thread("SimpleDecoder:Decode") {
+        new Thread("ExoPlayer:SimpleDecoder") {
           @Override
           public void run() {
             SimpleDecoder.this.run();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index bc017061d5..8e50d70020 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -993,7 +993,7 @@ public final class DownloadHelper {
       @SuppressWarnings("methodref.receiver.bound.invalid")
       Handler downloadThreadHandler = Util.createHandler(this::handleDownloadHelperCallbackMessage);
       this.downloadHelperHandler = downloadThreadHandler;
-      mediaSourceThread = new HandlerThread("DownloadHelper");
+      mediaSourceThread = new HandlerThread("ExoPlayer:DownloadHelper");
       mediaSourceThread.start();
       mediaSourceHandler = Util.createHandler(mediaSourceThread.getLooper(), /* callback= */ this);
       mediaSourceHandler.sendEmptyMessage(MESSAGE_PREPARE_SOURCE);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 0b912b6539..721dac4d4e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -259,7 +259,7 @@ public final class SimpleCache implements Cache {
 
     // Start cache initialization.
     final ConditionVariable conditionVariable = new ConditionVariable();
-    new Thread("SimpleCache.initialize()") {
+    new Thread("ExoPlayer:SimpleCacheInit") {
       @Override
       public void run() {
         synchronized (SimpleCache.this) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/PlayerMessageTest.java b/library/core/src/test/java/com/google/android/exoplayer2/PlayerMessageTest.java
index a7ef451752..874a8c5a5a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/PlayerMessageTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/PlayerMessageTest.java
@@ -53,7 +53,7 @@ public class PlayerMessageTest {
     initMocks(this);
     PlayerMessage.Sender sender = (message) -> {};
     PlayerMessage.Target target = (messageType, payload) -> {};
-    handlerThread = new HandlerThread("TestHandlerThread");
+    handlerThread = new HandlerThread("TestHandler");
     handlerThread.start();
     Handler handler = new Handler(handlerThread.getLooper());
     message =
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java
index 8ef6f7e709..f816d1d11b 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java
@@ -48,7 +48,7 @@ public class AsynchronousMediaCodecAdapterTest {
 
   @Before
   public void setUp() throws IOException {
-    handlerThread = new HandlerThread("TestHandlerThread");
+    handlerThread = new HandlerThread("TestHandler");
     handlerThread.start();
     looper = handlerThread.getLooper();
     codec = MediaCodec.createByCodecName("h264");
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
index f9d1d9ce8c..610995b53a 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
@@ -71,7 +71,7 @@ public class MediaSourceTestRunner {
   public MediaSourceTestRunner(MediaSource mediaSource, Allocator allocator) {
     this.mediaSource = mediaSource;
     this.allocator = allocator;
-    playbackThread = new HandlerThread("PlaybackThread");
+    playbackThread = new HandlerThread("TestHandler");
     playbackThread.start();
     Looper playbackLooper = playbackThread.getLooper();
     playbackHandler = new Handler(playbackLooper);
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
index c82980d7a4..666e45c568 100644
--- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
+++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
@@ -89,7 +89,7 @@ public final class FakeClockTest {
 
   @Test
   public void testPostDelayed() {
-    HandlerThread handlerThread = new HandlerThread("FakeClockTest thread");
+    HandlerThread handlerThread = new HandlerThread("FakeClockTest");
     handlerThread.start();
     FakeClock fakeClock = new FakeClock(0);
     HandlerWrapper handler =