diff --git a/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java b/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java
index e0a77226c3..dbc5a75e82 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java
@@ -242,17 +242,17 @@ import java.util.concurrent.CopyOnWriteArrayList;
  *         <li>Type: {@link ImageView}
  *         <li>Note: StyledPlayerControlView will programmatically set the drawable on the repeat
  *             toggle button according to the player's current repeat mode. The drawables used are
- *             {@code exo_controls_repeat_off}, {@code exo_controls_repeat_one} and {@code
- *             exo_controls_repeat_all}. See the section above for information on overriding these
- *             drawables.
+ *             {@code exo_styled_controls_repeat_off}, {@code exo_styled_controls_repeat_one} and
+ *             {@code exo_styled_controls_repeat_all}. See the section above for information on
+ *             overriding these drawables.
  *       </ul>
  *   <li><b>{@code exo_shuffle}</b> - The shuffle button.
  *       <ul>
  *         <li>Type: {@link ImageView}
  *         <li>Note: StyledPlayerControlView will programmatically set the drawable on the shuffle
  *             button according to the player's current repeat mode. The drawables used are {@code
- *             exo_controls_shuffle_off} and {@code exo_controls_shuffle_on}. See the section above
- *             for information on overriding these drawables.
+ *             exo_styled_controls_shuffle_off} and {@code exo_styled_controls_shuffle_on}. See the
+ *             section above for information on overriding these drawables.
  *       </ul>
  *   <li><b>{@code exo_vr}</b> - The VR mode button.
  *       <ul>
diff --git a/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerView.java b/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerView.java
index 62ac7f19f4..46d8558de7 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerView.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerView.java
@@ -501,7 +501,7 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
     if (customController != null) {
       this.controller = customController;
     } else if (controllerPlaceholder != null) {
-      // Propagate attrs as playbackAttrs so that PlayerControlView's custom attributes are
+      // Propagate attrs as playbackAttrs so that StyledPlayerControlView's custom attributes are
       // transferred, but standard attributes (e.g. background) are not.
       this.controller = new StyledPlayerControlView(context, null, 0, attrs);
       controller.setId(R.id.exo_controller);