diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index 18bad21a85..7d352c0046 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -164,8 +164,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * To customize the layout of PlayerControlView throughout your app, or just for certain
  * configurations, you can define {@code exo_player_control_view.xml} layout files in your
  * application {@code res/layout*} directories. These layouts will override the one provided by the
- * ExoPlayer library, and will be inflated for use by PlayerControlView. The view identifies and
- * binds its children by looking for the following ids:
+ * library, and will be inflated for use by PlayerControlView. The view identifies and binds its
+ * children by looking for the following ids:
  *
  * <ul>
  *   <li><b>{@code exo_play}</b> - The play button.
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 53255ff69d..79e56a4d3d 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -47,7 +47,6 @@ import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ControlDispatcher;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ForwardingPlayer;
 import com.google.android.exoplayer2.MediaMetadata;
@@ -186,9 +185,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  *
  * To customize the layout of PlayerView throughout your app, or just for certain configurations,
  * you can define {@code exo_player_view.xml} layout files in your application {@code res/layout*}
- * directories. These layouts will override the one provided by the ExoPlayer library, and will be
- * inflated for use by PlayerView. The view identifies and binds its children by looking for the
- * following ids:
+ * directories. These layouts will override the one provided by the library, and will be inflated
+ * for use by PlayerView. The view identifies and binds its children by looking for the following
+ * ids:
  *
  * <ul>
  *   <li><b>{@code exo_content_frame}</b> - A frame whose aspect ratio is resized based on the video
@@ -935,7 +934,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
   /**
    * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead.
    *     You can also customize some operations when configuring the player (for example by using
-   *     {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}).
+   *     {@code ExoPlayer.Builder.setSeekBackIncrementMs(long)}).
    */
   @Deprecated
   public void setControlDispatcher(ControlDispatcher controlDispatcher) {
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java
index 20745563ad..367220aa92 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java
@@ -50,8 +50,7 @@ import java.util.regex.Pattern;
  * Utility class to convert from <a
  * href="https://developer.android.com/guide/topics/text/spans">span-styled text</a> to HTML.
  *
- * <p>Supports all of the spans used by ExoPlayer's subtitle decoders, including custom ones found
- * in {@link com.google.android.exoplayer2.text.span}.
+ * <p>Supports all of the spans used by subtitle decoders.
  */
 /* package */ final class SpannedToHtmlConverter {
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
index 69e9f6f516..05360bc2a4 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
@@ -199,9 +199,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * default animation implementation expects certain relative positions between children. See also <a
  * href="CustomLayout">Specifying a custom layout file</a>.
  *
- * <p>The layout files in your {@code res/layout*} will override the one provided by the ExoPlayer
- * library, and will be inflated for use by StyledPlayerControlView. The view identifies and binds
- * its children by looking for the following ids:
+ * <p>The layout files in your {@code res/layout*} will override the one provided by the library,
+ * and will be inflated for use by StyledPlayerControlView. The view identifies and binds its
+ * children by looking for the following ids:
  *
  * <ul>
  *   <li><b>{@code exo_play_pause}</b> - The play and pause button.
@@ -843,7 +843,7 @@ public class StyledPlayerControlView extends FrameLayout {
   /**
    * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead.
    *     You can also customize some operations when configuring the player (for example by using
-   *     {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}).
+   *     {@code ExoPlayer.Builder.setSeekBackIncrementMs(long)}).
    */
   @Deprecated
   public void setControlDispatcher(ControlDispatcher controlDispatcher) {
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
index 6a30814673..24bf154c77 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
@@ -48,7 +48,6 @@ import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ControlDispatcher;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ForwardingPlayer;
 import com.google.android.exoplayer2.MediaMetadata;
@@ -188,8 +187,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  * To customize the layout of StyledPlayerView throughout your app, or just for certain
  * configurations, you can define {@code exo_styled_player_view.xml} layout files in your
  * application {@code res/layout*} directories. These layouts will override the one provided by the
- * ExoPlayer library, and will be inflated for use by StyledPlayerView. The view identifies and
- * binds its children by looking for the following ids:
+ * library, and will be inflated for use by StyledPlayerView. The view identifies and binds its
+ * children by looking for the following ids:
  *
  * <ul>
  *   <li><b>{@code exo_content_frame}</b> - A frame whose aspect ratio is resized based on the video
@@ -952,7 +951,7 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
   /**
    * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead.
    *     You can also customize some operations when configuring the player (for example by using
-   *     {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}).
+   *     {@code ExoPlayer.Builder.setSeekBackIncrementMs(long)}).
    */
   @Deprecated
   public void setControlDispatcher(ControlDispatcher controlDispatcher) {