diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index fb91de4328..f0bc0ce50a 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -76,19 +76,17 @@
       </intent-filter>
     </activity>
 
-    <activity android:name=".DownloaderActivity"/>
+    <activity android:name="com.google.android.exoplayer2.demo.DownloadActivity"/>
 
-    <service
-        android:exported="false"
-        android:name=".DemoDownloadService">
+    <service android:name="com.google.android.exoplayer2.demo.DemoDownloadService"
+        android:exported="false">
       <intent-filter>
         <action android:name="com.google.android.exoplayer.downloadService.action.INIT"/>
         <category android:name="android.intent.category.DEFAULT"/>
       </intent-filter>
     </service>
 
-    <service
-        android:name="com.google.android.exoplayer2.scheduler.PlatformScheduler$PlatformSchedulerService"
+    <service android:name="com.google.android.exoplayer2.scheduler.PlatformScheduler$PlatformSchedulerService"
         android:permission="android.permission.BIND_JOB_SERVICE"
         android:exported="true"/>
 
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index dc5898756e..5d4532765d 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -31,7 +31,7 @@ import com.google.android.exoplayer2.ui.DownloadNotificationUtil;
 import com.google.android.exoplayer2.ui.NotificationUtil;
 import com.google.android.exoplayer2.util.ErrorMessageProvider;
 
-/** Demo DownloadService implementation. */
+/** A service for downloading media. */
 public class DemoDownloadService extends DownloadService {
 
   private static final String CHANNEL_ID = "download_channel";
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloaderActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadActivity.java
similarity index 99%
rename from demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloaderActivity.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadActivity.java
index be41f8064f..0a556c22e3 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloaderActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadActivity.java
@@ -50,8 +50,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-/** An activity that downloads streams. */
-public class DownloaderActivity extends Activity {
+/** An activity for downloading media. */
+public class DownloadActivity extends Activity {
 
   public static final String PLAYER_INTENT = "player_intent";
   public static final String SAMPLE_NAME = "sample_name";
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
index f6d9afc768..416c2e4377 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@@ -49,9 +49,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * An activity for selecting from a list of samples.
- */
+/** An activity for selecting from a list of media samples. */
 public class SampleChooserActivity extends Activity {
 
   private static final String TAG = "SampleChooserActivity";
@@ -128,9 +126,9 @@ public class SampleChooserActivity extends Activity {
           .show();
       return;
     }
-    Intent intent = new Intent(this, DownloaderActivity.class);
-    intent.putExtra(DownloaderActivity.SAMPLE_NAME, sample.name);
-    intent.putExtra(DownloaderActivity.PLAYER_INTENT, sample.buildIntent(this));
+    Intent intent = new Intent(this, DownloadActivity.class);
+    intent.putExtra(DownloadActivity.SAMPLE_NAME, sample.name);
+    intent.putExtra(DownloadActivity.PLAYER_INTENT, sample.buildIntent(this));
     startActivity(intent);
   }