diff --git a/library/common/src/test/java/com/google/android/exoplayer2/ExoPlaybackExceptionTest.java b/library/common/src/test/java/com/google/android/exoplayer2/ExoPlaybackExceptionTest.java
index 0a12305059..1721ce807a 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/ExoPlaybackExceptionTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/ExoPlaybackExceptionTest.java
@@ -28,14 +28,14 @@ import org.junit.runner.RunWith;
 public class ExoPlaybackExceptionTest {
 
   @Test
-  public void roundtripViaBundle_ofExoPlaybackExceptionTypeRemote_yieldsEqualInstance() {
+  public void roundTripViaBundle_ofExoPlaybackExceptionTypeRemote_yieldsEqualInstance() {
     ExoPlaybackException before = ExoPlaybackException.createForRemote(/* message= */ "test");
     ExoPlaybackException after = ExoPlaybackException.CREATOR.fromBundle(before.toBundle());
     assertThat(areEqual(before, after)).isTrue();
   }
 
   @Test
-  public void roundtripViaBundle_ofExoPlaybackExceptionTypeRenderer_yieldsEqualInstance() {
+  public void roundTripViaBundle_ofExoPlaybackExceptionTypeRenderer_yieldsEqualInstance() {
     ExoPlaybackException before =
         ExoPlaybackException.createForRenderer(
             new IllegalStateException("ExoPlaybackExceptionTest"),
@@ -51,7 +51,7 @@ public class ExoPlaybackExceptionTest {
 
   @Test
   public void
-      roundtripViaBundle_ofExoPlaybackExceptionTypeRendererWithPrivateCause_yieldsRemoteExceptionWithSameMessage() {
+      roundTripViaBundle_ofExoPlaybackExceptionTypeRendererWithPrivateCause_yieldsRemoteExceptionWithSameMessage() {
     ExoPlaybackException before =
         ExoPlaybackException.createForRenderer(
             new Exception(/* message= */ "anonymous exception that class loader cannot know") {});
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/MediaItemTest.java b/library/common/src/test/java/com/google/android/exoplayer2/MediaItemTest.java
index 0654eb1c70..8ebadc17e0 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/MediaItemTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/MediaItemTest.java
@@ -395,7 +395,7 @@ public class MediaItemTest {
   }
 
   @Test
-  public void roundtripViaBundle_withoutPlaybackProperties_yieldsEqualInstance() {
+  public void roundTripViaBundle_withoutPlaybackProperties_yieldsEqualInstance() {
     MediaItem mediaItem =
         new MediaItem.Builder()
             .setMediaId("mediaId")
@@ -417,7 +417,7 @@ public class MediaItemTest {
   }
 
   @Test
-  public void roundtripViaBundle_withPlaybackProperties_dropsPlaybackProperties() {
+  public void roundTripViaBundle_withPlaybackProperties_dropsPlaybackProperties() {
     MediaItem mediaItem = new MediaItem.Builder().setUri(URI_STRING).build();
 
     assertThat(mediaItem.playbackProperties).isNotNull();
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/MediaMetadataTest.java b/library/common/src/test/java/com/google/android/exoplayer2/MediaMetadataTest.java
index 0fe0821977..f208d5069e 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/MediaMetadataTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/MediaMetadataTest.java
@@ -44,7 +44,7 @@ public class MediaMetadataTest {
   }
 
   @Test
-  public void roundtripViaBundle_yieldsEqualInstance() {
+  public void roundTripViaBundle_yieldsEqualInstance() {
     MediaMetadata mediaMetadata = new MediaMetadata.Builder().setTitle("title").build();
 
     assertThat(MediaMetadata.CREATOR.fromBundle(mediaMetadata.toBundle())).isEqualTo(mediaMetadata);
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/PlaybackParametersTest.java b/library/common/src/test/java/com/google/android/exoplayer2/PlaybackParametersTest.java
index 8d255da0e7..004ac57d4b 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/PlaybackParametersTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/PlaybackParametersTest.java
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
 public class PlaybackParametersTest {
 
   @Test
-  public void roundtripViaBundle_ofPlaybackParameters_yieldsEqualInstance() {
+  public void roundTripViaBundle_ofPlaybackParameters_yieldsEqualInstance() {
     PlaybackParameters playbackParameters =
         new PlaybackParameters(/* speed= */ 2.9f, /* pitch= */ 1.2f);
 
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/PositionInfoTest.java b/library/common/src/test/java/com/google/android/exoplayer2/PositionInfoTest.java
index c86bd0ae38..7b7cfb0f37 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/PositionInfoTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/PositionInfoTest.java
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
 public class PositionInfoTest {
 
   @Test
-  public void roundtripViaBundle_ofPositionInfoWithoutObjectFields_yieldsEqualInstance() {
+  public void roundTripViaBundle_ofPositionInfoWithoutObjectFields_yieldsEqualInstance() {
     PositionInfo positionInfo =
         new PositionInfo(
             /* windowUid= */ null,
@@ -43,7 +43,7 @@ public class PositionInfoTest {
   }
 
   @Test
-  public void roundtripViaBundle_ofPositionInfoWithWindowUid_yieldsNullWindowUid() {
+  public void roundTripViaBundle_ofPositionInfoWithWindowUid_yieldsNullWindowUid() {
     PositionInfo positionInfo =
         new PositionInfo(
             /* windowUid= */ new Object(),
@@ -60,7 +60,7 @@ public class PositionInfoTest {
   }
 
   @Test
-  public void roundtripViaBundle_ofPositionInfoWithPeriodUid_yieldsNullPeriodUid() {
+  public void roundTripViaBundle_ofPositionInfoWithPeriodUid_yieldsNullPeriodUid() {
     PositionInfo positionInfo =
         new PositionInfo(
             /* windowUid= */ null,
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/TimelineTest.java b/library/common/src/test/java/com/google/android/exoplayer2/TimelineTest.java
index 9d38387fc5..689716bb25 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/TimelineTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/TimelineTest.java
@@ -209,7 +209,7 @@ public class TimelineTest {
   }
 
   @Test
-  public void roundtripViaBundle_ofTimeline_yieldsEqualInstanceExceptIdsAndManifest() {
+  public void roundTripViaBundle_ofTimeline_yieldsEqualInstanceExceptIdsAndManifest() {
     Timeline timeline =
         new FakeTimeline(
             new TimelineWindowDefinition(
@@ -244,7 +244,7 @@ public class TimelineTest {
   }
 
   @Test
-  public void roundtripViaBundle_ofTimeline_preservesWindowIndices() {
+  public void roundTripViaBundle_ofTimeline_preservesWindowIndices() {
     int windowCount = 10;
     FakeTimeline timeline = new FakeTimeline(windowCount);
 
@@ -285,12 +285,12 @@ public class TimelineTest {
   }
 
   @Test
-  public void roundtripViaBundle_ofEmptyTimeline_returnsEmptyTimeline() {
+  public void roundTripViaBundle_ofEmptyTimeline_returnsEmptyTimeline() {
     TimelineAsserts.assertEmpty(Timeline.CREATOR.fromBundle(Timeline.EMPTY.toBundle()));
   }
 
   @Test
-  public void roundtripViaBundle_ofWindow_yieldsEqualInstanceExceptUidAndManifest() {
+  public void roundTripViaBundle_ofWindow_yieldsEqualInstanceExceptUidAndManifest() {
     Timeline.Window window = new Timeline.Window();
     window.uid = new Object();
     window.mediaItem = new MediaItem.Builder().setMediaId("mediaId").build();
@@ -322,7 +322,7 @@ public class TimelineTest {
   }
 
   @Test
-  public void roundtripViaBundle_ofPeriod_yieldsEqualInstanceExceptIds() {
+  public void roundTripViaBundle_ofPeriod_yieldsEqualInstanceExceptIds() {
     Timeline.Period period = new Timeline.Period();
     period.id = new Object();
     period.uid = new Object();
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/audio/AudioAttributesTest.java b/library/common/src/test/java/com/google/android/exoplayer2/audio/AudioAttributesTest.java
index 7435eba047..9296f60dd7 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/audio/AudioAttributesTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/audio/AudioAttributesTest.java
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
 public class AudioAttributesTest {
 
   @Test
-  public void roundtripViaBundle_yieldsEqualInstance() {
+  public void roundTripViaBundle_yieldsEqualInstance() {
     AudioAttributes audioAttributes =
         new AudioAttributes.Builder()
             .setContentType(C.CONTENT_TYPE_SONIFICATION)
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/device/DeviceInfoTest.java b/library/common/src/test/java/com/google/android/exoplayer2/device/DeviceInfoTest.java
index 536987b4de..922c38d046 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/device/DeviceInfoTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/device/DeviceInfoTest.java
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
 public class DeviceInfoTest {
 
   @Test
-  public void roundtripViaBundle_yieldsEqualInstance() {
+  public void roundTripViaBundle_yieldsEqualInstance() {
     DeviceInfo deviceInfo =
         new DeviceInfo(DeviceInfo.PLAYBACK_TYPE_REMOTE, /* minVolume= */ 1, /* maxVolume= */ 9);
 
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java b/library/common/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
index 6ac7cb6dc1..948cbe2c69 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
@@ -150,7 +150,7 @@ public class AdPlaybackStateTest {
   }
 
   @Test
-  public void roundtripViaBundle_yieldsEqualFieldsExceptAdsId() {
+  public void roundTripViaBundle_yieldsEqualFieldsExceptAdsId() {
     AdPlaybackState originalState =
         state
             .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
@@ -176,7 +176,7 @@ public class AdPlaybackStateTest {
   }
 
   @Test
-  public void roundtripViaBundle_ofAdGroup_yieldsEqualInstance() {
+  public void roundTripViaBundle_ofAdGroup_yieldsEqualInstance() {
     AdPlaybackState.AdGroup adGroup =
         new AdPlaybackState.AdGroup()
             .withAdCount(2)