diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
index 82fd987089..b291d5afe8 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -395,7 +395,7 @@ public class PlayerActivity extends AppCompatActivity
     if (haveStartPosition) {
       player.seekTo(startWindow, startPosition);
     }
-    player.setMediaItem(mediaSource);
+    player.setMediaSource(mediaSource);
     player.prepare();
     updateButtonVisibility();
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 4d947e27cf..f02ec3dd43 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -358,12 +358,13 @@ public interface ExoPlayer extends Player {
   void prepare();
 
   /**
-   * @deprecated Use {@code setMediaItem(mediaSource, C.TIME_UNSET)} and {@link #prepare()} instead.
+   * @deprecated Use {@code setMediaSource(mediaSource, C.TIME_UNSET)} and {@link #prepare()}
+   *     instead.
    */
   @Deprecated
   void prepare(MediaSource mediaSource);
 
-  /** @deprecated Use {@link #setMediaItem(MediaSource, long)} and {@link #prepare()} instead. */
+  /** @deprecated Use {@link #setMediaSource(MediaSource, long)} and {@link #prepare()} instead. */
   @Deprecated
   void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState);
 
@@ -373,9 +374,9 @@ public interface ExoPlayer extends Player {
    * <p>Note: This is an intermediate implementation towards a larger change. Until then {@link
    * #prepare()} has to be called immediately after calling this method.
    *
-   * @param mediaItem The new {@link MediaSource}.
+   * @param mediaSource The new {@link MediaSource}.
    */
-  void setMediaItem(MediaSource mediaItem);
+  void setMediaSource(MediaSource mediaSource);
 
   /**
    * Sets the specified {@link MediaSource}.
@@ -391,13 +392,13 @@ public interface ExoPlayer extends Player {
    *     player.stop(true);
    *   }
    *   player.seekTo(0, startPositionMs);
-   *   player.setMediaItem(mediaItem);
+   *   player.setMediaSource(mediaSource);
    * </code></pre>
    *
-   * @param mediaItem The new {@link MediaSource}.
+   * @param mediaSource The new {@link MediaSource}.
    * @param startPositionMs The position in milliseconds to start playback from.
    */
-  void setMediaItem(MediaSource mediaItem, long startPositionMs);
+  void setMediaSource(MediaSource mediaSource, long startPositionMs);
 
   /**
    * Creates a message that can be sent to a {@link PlayerMessage.Target}. By default, the message
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index e79a61da9a..98eaaa0c2c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -236,14 +236,14 @@ import java.util.concurrent.TimeoutException;
   @Override
   @Deprecated
   public void prepare(MediaSource mediaSource) {
-    setMediaItem(mediaSource);
+    setMediaSource(mediaSource);
     prepareInternal(/* resetPosition= */ true, /* resetState= */ true);
   }
 
   @Override
   @Deprecated
   public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
-    setMediaItem(mediaSource);
+    setMediaSource(mediaSource);
     prepareInternal(resetPosition, resetState);
   }
 
@@ -254,17 +254,17 @@ import java.util.concurrent.TimeoutException;
   }
 
   @Override
-  public void setMediaItem(MediaSource mediaItem, long startPositionMs) {
+  public void setMediaSource(MediaSource mediaSource, long startPositionMs) {
     if (!getCurrentTimeline().isEmpty()) {
       stop(/* reset= */ true);
     }
     seekTo(/* windowIndex= */ 0, startPositionMs);
-    setMediaItem(mediaItem);
+    setMediaSource(mediaSource);
   }
 
   @Override
-  public void setMediaItem(MediaSource mediaItem) {
-    mediaSource = mediaItem;
+  public void setMediaSource(MediaSource mediaSource) {
+    this.mediaSource = mediaSource;
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 3ba9fd4564..3e73a0eb04 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -1185,7 +1185,7 @@ public class SimpleExoPlayer extends BasePlayer
   @Deprecated
   public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
     verifyApplicationThread();
-    setMediaItem(mediaSource);
+    setMediaSource(mediaSource);
     prepareInternal(resetPosition, resetState);
   }
 
@@ -1196,17 +1196,17 @@ public class SimpleExoPlayer extends BasePlayer
   }
 
   @Override
-  public void setMediaItem(MediaSource mediaItem, long startPositionMs) {
+  public void setMediaSource(MediaSource mediaSource, long startPositionMs) {
     verifyApplicationThread();
-    setMediaItemInternal(mediaItem);
-    player.setMediaItem(mediaItem, startPositionMs);
+    setMediaSourceInternal(mediaSource);
+    player.setMediaSource(mediaSource, startPositionMs);
   }
 
   @Override
-  public void setMediaItem(MediaSource mediaItem) {
+  public void setMediaSource(MediaSource mediaSource) {
     verifyApplicationThread();
-    setMediaItemInternal(mediaItem);
-    player.setMediaItem(mediaItem);
+    setMediaSourceInternal(mediaSource);
+    player.setMediaSource(mediaSource);
   }
 
   @Override
@@ -1463,13 +1463,13 @@ public class SimpleExoPlayer extends BasePlayer
     player.prepareInternal(resetPosition, resetState);
   }
 
-  private void setMediaItemInternal(MediaSource mediaItem) {
-    if (mediaSource != null) {
-      mediaSource.removeEventListener(analyticsCollector);
+  private void setMediaSourceInternal(MediaSource mediaSource) {
+    if (this.mediaSource != null) {
+      this.mediaSource.removeEventListener(analyticsCollector);
       analyticsCollector.resetForNewMediaSource();
     }
-    mediaSource = mediaItem;
-    mediaSource.addEventListener(eventHandler, analyticsCollector);
+    this.mediaSource = mediaSource;
+    this.mediaSource.addEventListener(eventHandler, analyticsCollector);
   }
 
   private void removeSurfaceCallbacks() {
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 c4f7ed32ad..f48c33ebda 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
@@ -3062,7 +3062,7 @@ public final class ExoPlayerTest {
                 new PlayerRunnable() {
                   @Override
                   public void run(SimpleExoPlayer player) {
-                    player.setMediaItem(mediaSource, /* startPositionMs= */ 5000);
+                    player.setMediaSource(mediaSource, /* startPositionMs= */ 5000);
                     player.prepare();
                   }
                 })
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
index a353efdf5b..cb5ef0fa0f 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
@@ -141,7 +141,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
       pendingSchedule = null;
     }
     DrmSessionManager<FrameworkMediaCrypto> drmSessionManager = buildDrmSessionManager(userAgent);
-    player.setMediaItem(buildSource(host, Util.getUserAgent(host, userAgent), drmSessionManager));
+    player.setMediaSource(buildSource(host, Util.getUserAgent(host, userAgent), drmSessionManager));
     player.prepare();
   }
 
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
index 23f9a0d5a4..4416ab0ef3 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
@@ -447,7 +447,7 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc
             if (actionSchedule != null) {
               actionSchedule.start(player, trackSelector, null, handler, ExoPlayerTestRunner.this);
             }
-            player.setMediaItem(mediaSource);
+            player.setMediaSource(mediaSource);
             player.prepare();
           } catch (Exception e) {
             handleException(e);
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
index 47f34712b9..81efb3ba78 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
@@ -112,12 +112,12 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
   }
 
   @Override
-  public void setMediaItem(MediaSource mediaItem) {
+  public void setMediaSource(MediaSource mediaSource) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public void setMediaItem(MediaSource mediaItem, long startPositionMs) {
+  public void setMediaSource(MediaSource mediaSource, long startPositionMs) {
     throw new UnsupportedOperationException();
   }