diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 91163b8..f2c62f9 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -64,7 +64,7 @@
         </activity>
 
         <activity
-            android:name="com.nononsenseapps.filepicker.sample.ImagePickerActivity"
+            android:name=".MultimediaPickerActivity"
             android:label="@string/title_activity_no_nonsense_file_picker"
             android:theme="@style/SampleTheme">
             <intent-filter>
@@ -74,7 +74,7 @@
         </activity>
 
         <activity
-            android:name="com.nononsenseapps.filepicker.sample.ImagePickerActivity2"
+            android:name=".MultimediaPickerActivity2"
             android:label="@string/title_activity_no_nonsense_file_picker"
             android:theme="@style/SampleThemeLight">
             <intent-filter>
diff --git a/sample/src/main/java/com/nononsenseapps/filepicker/sample/ImagePickerActivity.java b/sample/src/main/java/com/nononsenseapps/filepicker/sample/MultimediaPickerActivity.java
similarity index 88%
rename from sample/src/main/java/com/nononsenseapps/filepicker/sample/ImagePickerActivity.java
rename to sample/src/main/java/com/nononsenseapps/filepicker/sample/MultimediaPickerActivity.java
index 48895a3..3e63283 100644
--- a/sample/src/main/java/com/nononsenseapps/filepicker/sample/ImagePickerActivity.java
+++ b/sample/src/main/java/com/nononsenseapps/filepicker/sample/MultimediaPickerActivity.java
@@ -27,9 +27,9 @@ import java.io.File;
 /**
  * All this class does is return a suitable fragment.
  */
-public class ImagePickerActivity extends AbstractFilePickerActivity {
+public class MultimediaPickerActivity extends AbstractFilePickerActivity {
 
-    public ImagePickerActivity() {
+    public MultimediaPickerActivity() {
         super();
     }
 
@@ -37,7 +37,7 @@ public class ImagePickerActivity extends AbstractFilePickerActivity {
     protected AbstractFilePickerFragment<File> getFragment(
             final String startPath, final int mode, final boolean allowMultiple,
             final boolean allowCreateDir) {
-        AbstractFilePickerFragment<File> fragment = new ImagePickerFragment();
+        AbstractFilePickerFragment<File> fragment = new MultimediaPickerFragment();
         // startPath is allowed to be null. In that case, default folder should be SD-card and not "/"
         fragment.setArgs(startPath != null ? startPath : Environment.getExternalStorageDirectory().getPath(),
                 mode, allowMultiple, allowCreateDir);
diff --git a/sample/src/main/java/com/nononsenseapps/filepicker/sample/ImagePickerActivity2.java b/sample/src/main/java/com/nononsenseapps/filepicker/sample/MultimediaPickerActivity2.java
similarity index 91%
rename from sample/src/main/java/com/nononsenseapps/filepicker/sample/ImagePickerActivity2.java
rename to sample/src/main/java/com/nononsenseapps/filepicker/sample/MultimediaPickerActivity2.java
index c1a11c7..6c92ab3 100644
--- a/sample/src/main/java/com/nononsenseapps/filepicker/sample/ImagePickerActivity2.java
+++ b/sample/src/main/java/com/nononsenseapps/filepicker/sample/MultimediaPickerActivity2.java
@@ -20,5 +20,5 @@ package com.nononsenseapps.filepicker.sample;
 /**
  * Duplicate to allow second theme to be used.
  */
-public class ImagePickerActivity2 extends ImagePickerActivity {
+public class MultimediaPickerActivity2 extends MultimediaPickerActivity {
 }
diff --git a/sample/src/main/java/com/nononsenseapps/filepicker/sample/ImagePickerFragment.java b/sample/src/main/java/com/nononsenseapps/filepicker/sample/MultimediaPickerFragment.java
similarity index 100%
rename from sample/src/main/java/com/nononsenseapps/filepicker/sample/ImagePickerFragment.java
rename to sample/src/main/java/com/nononsenseapps/filepicker/sample/MultimediaPickerFragment.java
diff --git a/sample/src/main/java/com/nononsenseapps/filepicker/sample/NoNonsenseFilePicker.java b/sample/src/main/java/com/nononsenseapps/filepicker/sample/NoNonsenseFilePicker.java
index e70b5ef..471831c 100644
--- a/sample/src/main/java/com/nononsenseapps/filepicker/sample/NoNonsenseFilePicker.java
+++ b/sample/src/main/java/com/nononsenseapps/filepicker/sample/NoNonsenseFilePicker.java
@@ -118,10 +118,10 @@ public class NoNonsenseFilePicker extends Activity {
 
                         if (checkLightTheme.isChecked()) {
                             i = new Intent(NoNonsenseFilePicker.this,
-                                    ImagePickerActivity2.class);
+                                    MultimediaPickerActivity2.class);
                         } else {
                             i = new Intent(NoNonsenseFilePicker.this,
-                                    ImagePickerActivity.class);
+                                    MultimediaPickerActivity.class);
                         }
                         i.setAction(Intent.ACTION_GET_CONTENT);