diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java b/library/common/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java
rename to library/common/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java b/library/common/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
similarity index 92%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
rename to library/common/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
index 2bb5f260ba..2d6130400e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
@@ -19,12 +19,12 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 
 /**
- * Provides {@link SQLiteDatabase} instances to ExoPlayer components, which may read and write
+ * Provides {@link SQLiteDatabase} instances to media library components, which may read and write
  * tables prefixed with {@link #TABLE_PREFIX}.
  */
 public interface DatabaseProvider {
 
-  /** Prefix for tables that can be read and written by ExoPlayer components. */
+  /** Prefix for tables that can be read and written by media library components. */
   String TABLE_PREFIX = "ExoPlayer";
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java b/library/common/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
rename to library/common/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/library/common/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
similarity index 91%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
rename to library/common/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
index 32dda5965c..4996c7e17d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
@@ -23,15 +23,16 @@ import android.database.sqlite.SQLiteOpenHelper;
 import com.google.android.exoplayer2.util.Log;
 
 /**
- * An {@link SQLiteOpenHelper} that provides instances of a standalone ExoPlayer database.
+ * An {@link SQLiteOpenHelper} that provides instances of a standalone database.
  *
  * <p>Suitable for use by applications that do not already have their own database, or that would
- * prefer to keep ExoPlayer tables isolated in their own database. Other applications should prefer
- * to use {@link DefaultDatabaseProvider} with their own {@link SQLiteOpenHelper}.
+ * prefer to keep tables used by media library components isolated in their own database. Other
+ * applications should prefer to use {@link DefaultDatabaseProvider} with their own {@link
+ * SQLiteOpenHelper}.
  */
 public final class ExoDatabaseProvider extends SQLiteOpenHelper implements DatabaseProvider {
 
-  /** The file name used for the standalone ExoPlayer database. */
+  /** The file name used for the standalone database. */
   public static final String DATABASE_NAME = "exoplayer_internal.db";
 
   private static final int VERSION = 1;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java b/library/common/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
similarity index 97%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
rename to library/common/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
index e69b9576dd..d6d2a1cb7d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
@@ -26,8 +26,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * Utility methods for accessing versions of ExoPlayer database components. This allows them to be
- * versioned independently to the version of the containing database.
+ * Utility methods for accessing versions of media library database components. This allows them to
+ * be versioned independently to the version of the containing database.
  */
 public final class VersionTable {
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/database/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/package-info.java
rename to library/common/src/main/java/com/google/android/exoplayer2/database/package-info.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java b/library/common/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
rename to library/common/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java