diff --git a/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/state/RepeatButtonStateTest.kt b/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/state/RepeatButtonStateTest.kt
index 1e861eb255..c5b90f2e6c 100644
--- a/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/state/RepeatButtonStateTest.kt
+++ b/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/state/RepeatButtonStateTest.kt
@@ -48,7 +48,7 @@ class RepeatButtonStateTest {
   }
 
   @Test
-  fun buttonClicked_withLimitedNumberOfModes_playerShuffleModeChangedToNextInSequence() {
+  fun buttonClicked_withLimitedNumberOfModes_playerRepeatModeChangedToNextInSequence() {
     val player = TestPlayer()
     val state = RepeatButtonState(player, listOf(Player.REPEAT_MODE_OFF, Player.REPEAT_MODE_ONE))
     assertThat(state.repeatModeState).isEqualTo(Player.REPEAT_MODE_OFF)
diff --git a/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/state/ShuffleButtonStateTest.kt b/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/state/ShuffleButtonStateTest.kt
index 371b8d716f..6ca2978b3e 100644
--- a/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/state/ShuffleButtonStateTest.kt
+++ b/libraries/ui_compose/src/test/java/androidx/media3/ui/compose/state/ShuffleButtonStateTest.kt
@@ -60,9 +60,9 @@ class ShuffleButtonStateTest {
   @Test
   fun playerSetShuffleModeAndOnClick_inTheSameHandlerMessage_uiStateSynchronises() {
     // The UDF model of Compose relies on holding the Player as the single source of truth with
-    // RepeatButtonState changing its state in sync with the relevant Player events. This means that
-    // we should never find ourselves in a situation where a button's icon (here: determined by
-    // RepeatButtonState.repeatModeState) is out of sync with the Player's repeat mode. It can cause
+    // ShuffleButtonState changing its state in sync with the relevant Player events. This means
+    // that we should never find ourselves in a situation where a button's icon (here: determined by
+    // ShuffleButtonState.shuffleOn) is out of sync with the Player's shuffle mode. It can cause
     // confusion for a human user whose intent to toggle the mode will not be fulfilled. The
     // following test tries to simulate this scenario by squeezing the 2 actions together (setter +
     // onClick) into a single Looper iteration. This is a practically unlikely scenario for a human