diff --git a/extensions/av1/README.md b/extensions/av1/README.md
index 54e27a3b87..2515a53f3b 100644
--- a/extensions/av1/README.md
+++ b/extensions/av1/README.md
@@ -109,19 +109,22 @@ To try out playback using the extension in the [demo application][], see
 There are two possibilities for rendering the output `Libgav1VideoRenderer`
 gets from the libgav1 decoder:
 
-* GL rendering using GL shader for color space conversion
-  * If you are using `SimpleExoPlayer` with `PlayerView`, enable this option by
-    setting `surface_type` of `PlayerView` to be
-    `video_decoder_gl_surface_view`.
-  * Otherwise, enable this option by sending `Libgav1VideoRenderer` a message
-    of type `C.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER` with an instance of
-    `VideoDecoderOutputBufferRenderer` as its object.
+*   GL rendering using GL shader for color space conversion
 
-* Native rendering using `ANativeWindow`
-  * If you are using `SimpleExoPlayer` with `PlayerView`, this option is enabled
-    by default.
-  * Otherwise, enable this option by sending `Libgav1VideoRenderer` a message of
-    type `C.MSG_SET_SURFACE` with an instance of `SurfaceView` as its object.
+    *   If you are using `SimpleExoPlayer` with `PlayerView`, enable this option
+        by setting `surface_type` of `PlayerView` to be
+        `video_decoder_gl_surface_view`.
+    *   Otherwise, enable this option by sending `Libgav1VideoRenderer` a
+        message of type `Renderer.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER`
+        with an instance of `VideoDecoderOutputBufferRenderer` as its object.
+
+*   Native rendering using `ANativeWindow`
+
+    *   If you are using `SimpleExoPlayer` with `PlayerView`, this option is
+        enabled by default.
+    *   Otherwise, enable this option by sending `Libgav1VideoRenderer` a
+        message of type `Renderer.MSG_SET_SURFACE` with an instance of
+        `SurfaceView` as its object.
 
 Note: Although the default option uses `ANativeWindow`, based on our testing the
 GL rendering mode has better performance, so should be preferred
diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 05628998ed..765cdbca3b 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -126,19 +126,22 @@ To try out playback using the extension in the [demo application][], see
 There are two possibilities for rendering the output `LibvpxVideoRenderer`
 gets from the libvpx decoder:
 
-* GL rendering using GL shader for color space conversion
-  * If you are using `SimpleExoPlayer` with `PlayerView`, enable this option by
-    setting `surface_type` of `PlayerView` to be
-    `video_decoder_gl_surface_view`.
-  * Otherwise, enable this option by sending `LibvpxVideoRenderer` a message of
-    type `C.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER` with an instance of
-    `VideoDecoderOutputBufferRenderer` as its object.
+*   GL rendering using GL shader for color space conversion
 
-* Native rendering using `ANativeWindow`
-  * If you are using `SimpleExoPlayer` with `PlayerView`, this option is enabled
-    by default.
-  * Otherwise, enable this option by sending `LibvpxVideoRenderer` a message of
-    type `C.MSG_SET_SURFACE` with an instance of `SurfaceView` as its object.
+    *   If you are using `SimpleExoPlayer` with `PlayerView`, enable this option
+        by setting `surface_type` of `PlayerView` to be
+        `video_decoder_gl_surface_view`.
+    *   Otherwise, enable this option by sending `LibvpxVideoRenderer` a message
+        of type `Renderer.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER` with an
+        instance of `VideoDecoderOutputBufferRenderer` as its object.
+
+*   Native rendering using `ANativeWindow`
+
+    *   If you are using `SimpleExoPlayer` with `PlayerView`, this option is
+        enabled by default.
+    *   Otherwise, enable this option by sending `LibvpxVideoRenderer` a message
+        of type `Renderer.MSG_SET_SURFACE` with an instance of `SurfaceView` as
+        its object.
 
 Note: Although the default option uses `ANativeWindow`, based on our testing the
 GL rendering mode has better performance, so should be preferred.
diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
index 210a5bbc8a..1786b6838e 100644
--- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
+++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
@@ -24,11 +24,11 @@ import android.os.Looper;
 import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.ProgressiveMediaSource;
@@ -125,7 +125,7 @@ public class VpxPlaybackTest {
               .createMediaSource(MediaItem.fromUri(uri));
       player
           .createMessage(videoRenderer)
-          .setType(C.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER)
+          .setType(Renderer.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER)
           .setPayload(new VideoDecoderGLSurfaceView(context).getVideoDecoderOutputBufferRenderer())
           .send();
       player.setMediaSource(mediaSource);
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
index a35383ec92..71ffb00982 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
@@ -25,7 +25,7 @@ import com.google.android.exoplayer2.util.Util;
  * android.media.AudioTrack}.
  *
  * <p>To set the audio attributes, create an instance using the {@link Builder} and either pass it
- * to the player or send a message of type {@link C#MSG_SET_AUDIO_ATTRIBUTES} to the audio
+ * to the player or send a message of type {@code Renderer#MSG_SET_AUDIO_ATTRIBUTES} to the audio
  * renderers.
  *
  * <p>This class is based on {@link android.media.AudioAttributes}, but can be used on all supported
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
index 3541806293..47b93e0120 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -311,9 +311,9 @@ public interface Player {
 
     /**
      * Sets the video decoder output buffer renderer. This is intended for use only with extension
-     * renderers that accept {@link C#MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER}. For most use
-     * cases, an output surface or view should be passed via {@link #setVideoSurface(Surface)} or
-     * {@link #setVideoSurfaceView(SurfaceView)} instead.
+     * renderers that accept {@link Renderer#MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER}. For most
+     * use cases, an output surface or view should be passed via {@link #setVideoSurface(Surface)}
+     * or {@link #setVideoSurfaceView(SurfaceView)} instead.
      *
      * @param videoDecoderOutputBufferRenderer The video decoder output buffer renderer, or {@code
      *     null} to clear the output buffer renderer.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 6959c5fe4b..d1a9d82ad4 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -2443,7 +2443,7 @@ public final class ExoPlayerTest {
         .start()
         .blockUntilActionScheduleFinished(TIMEOUT_MS)
         .blockUntilEnded(TIMEOUT_MS);
-    assertThat(Collections.frequency(rendererMessages, C.MSG_SET_SURFACE)).isEqualTo(2);
+    assertThat(Collections.frequency(rendererMessages, Renderer.MSG_SET_SURFACE)).isEqualTo(2);
   }
 
   @Test