diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java b/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
index da038e71da..27ec5bb6d1 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
@@ -29,7 +29,7 @@ import com.google.android.exoplayer.demo.player.DemoPlayer;
 import com.google.android.exoplayer.demo.ui.TrackSelectionHelper;
 import com.google.android.exoplayer.drm.UnsupportedDrmException;
 import com.google.android.exoplayer.extractor.ExtractorSampleSource;
-import com.google.android.exoplayer.hls.HlsSampleSource2;
+import com.google.android.exoplayer.hls.HlsSampleSource;
 import com.google.android.exoplayer.metadata.id3.GeobFrame;
 import com.google.android.exoplayer.metadata.id3.Id3Frame;
 import com.google.android.exoplayer.metadata.id3.PrivFrame;
@@ -278,7 +278,7 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
         return new DashSampleSource(uri, dataSourceFactory, player.getBandwidthMeter(),
             player.getMainHandler(), player);
       case Util.TYPE_HLS:
-        return new HlsSampleSource2(uri, dataSourceFactory, player.getBandwidthMeter(),
+        return new HlsSampleSource(uri, dataSourceFactory, player.getBandwidthMeter(),
             player.getMainHandler(), player);
       case Util.TYPE_OTHER:
         Allocator allocator = new DefaultAllocator(C.DEFAULT_BUFFER_SEGMENT_SIZE);
diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource2.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
similarity index 98%
rename from library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource2.java
rename to library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
index 708e0a0105..8faae31324 100644
--- a/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource2.java
+++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
@@ -46,7 +46,7 @@ import java.util.List;
 /**
  * A {@link SampleSource} for HLS streams.
  */
-public final class HlsSampleSource2 implements SampleSource {
+public final class HlsSampleSource implements SampleSource {
 
   private final ManifestFetcher<HlsPlaylist> manifestFetcher;
   private final HlsTrackStreamWrapper[] trackStreamWrappers;
@@ -59,7 +59,7 @@ public final class HlsSampleSource2 implements SampleSource {
   private TrackGroupArray trackGroups;
   private HlsTrackStreamWrapper[] enabledTrackStreamWrappers;
 
-  public HlsSampleSource2(Uri uri, DataSourceFactory dataSourceFactory,
+  public HlsSampleSource(Uri uri, DataSourceFactory dataSourceFactory,
       BandwidthMeter bandwidthMeter, Handler eventHandler,
       ChunkTrackStreamEventListener eventListener) {
     HlsPlaylistParser parser = new HlsPlaylistParser();