diff --git a/core/modules/media_entity/config/schema/media_entity.schema.yml b/core/modules/media_entity/config/schema/media_entity.schema.yml
index b31a3b5ea753f41ca6c02256fcb6a820eb205ff7..68f5962fb21b39ca2705e29f3cb40aafd7a8a290 100644
--- a/core/modules/media_entity/config/schema/media_entity.schema.yml
+++ b/core/modules/media_entity/config/schema/media_entity.schema.yml
@@ -36,9 +36,9 @@ media_entity.bundle.*:
       sequence:
         type: string
 
-media_entity.bundle.type.document:
+media_entity.bundle.type.file:
   type: mapping
-  label: 'Document type configuration'
+  label: 'File handler configuration'
   mapping:
     source_field:
       type: string
diff --git a/core/modules/media_entity/src/Plugin/MediaEntity/Type/Document.php b/core/modules/media_entity/src/Plugin/MediaEntity/Type/File.php
similarity index 92%
rename from core/modules/media_entity/src/Plugin/MediaEntity/Type/Document.php
rename to core/modules/media_entity/src/Plugin/MediaEntity/Type/File.php
index 18d06d01dccab0363762deb6f507f47a6cbe12e5..8933daa2258e7e1d365cd6a4740df06ef226c7a9 100644
--- a/core/modules/media_entity/src/Plugin/MediaEntity/Type/Document.php
+++ b/core/modules/media_entity/src/Plugin/MediaEntity/Type/File.php
@@ -5,19 +5,18 @@
 use Drupal\media_entity\MediaBundleInterface;
 use Drupal\media_entity\MediaInterface;
 use Drupal\media_entity\MediaTypeBase;
-use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Provides media type plugin for Document.
+ * Provides the media handler plugin for Files.
  *
  * @MediaType(
- *   id = "document",
- *   label = @Translation("Document"),
- *   description = @Translation("Provides business logic and metadata for local documents."),
+ *   id = "file",
+ *   label = @Translation("File"),
+ *   description = @Translation("Provides business logic and metadata for local files and documents."),
  *   allowed_field_types = {"file"},
  * )
  */
-class Document extends MediaTypeBase {
+class File extends MediaTypeBase {
 
   /**
    * {@inheritdoc}
@@ -35,7 +34,7 @@ public function providedFields() {
   public function getField(MediaInterface $media, $name) {
     $source_field = $this->configuration['source_field'];
 
-    // Get the file document.
+    // Get the file.
     /** @var \Drupal\file\FileInterface $file */
     $file = $media->{$source_field}->entity;
 
diff --git a/core/modules/media_entity/tests/src/FunctionalJavascript/DocumentTest.php b/core/modules/media_entity/tests/src/FunctionalJavascript/FileTest.php
similarity index 81%
rename from core/modules/media_entity/tests/src/FunctionalJavascript/DocumentTest.php
rename to core/modules/media_entity/tests/src/FunctionalJavascript/FileTest.php
index c82a61944445724a03ffd65e13d1ab1e2d283af5..51af1a73bf92a3794d40db49a7dcf51f71342012 100644
--- a/core/modules/media_entity/tests/src/FunctionalJavascript/DocumentTest.php
+++ b/core/modules/media_entity/tests/src/FunctionalJavascript/FileTest.php
@@ -2,30 +2,29 @@
 
 namespace Drupal\Tests\media_entity\FunctionalJavascript;
 
-use Drupal\field\Entity\FieldConfig;
 use Drupal\media_entity\Entity\Media;
 
 /**
- * Tests the document type plugin.
+ * Tests the file handler plugin.
  *
  * @group media_entity
  */
-class DocumentTest extends MediaTypeTestBase {
+class FileTest extends MediaHandlerTestBase {
 
   /**
-   * Tests the document type.
+   * Tests the file handler.
    */
-  public function testDocumentType() {
+  public function testFileHandler() {
     $session = $this->getSession();
     $page = $session->getPage();
     $assert_session = $this->assertSession();
 
     // We rely on an automatic source field being created at this point.
     // @see MediaTypeBase::getSourceFieldName().
-    $source_field_name = 'field_media_document';
+    $source_field_name = 'field_media_file';
     $bundle_name = strtolower($this->randomMachineName(12));
     $provided_fields = ['mime', 'size'];
-    $bundle = $this->createMediaBundleTest($bundle_name, 'document', $provided_fields);
+    $bundle = $this->createMediaBundleTest($bundle_name, 'file', $provided_fields);
     // Adjust the allowed extensions on the source field.
     \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
     $bundle->getType()
diff --git a/core/modules/media_entity/tests/src/FunctionalJavascript/MediaTypeTestBase.php b/core/modules/media_entity/tests/src/FunctionalJavascript/MediaHandlerTestBase.php
similarity index 65%
rename from core/modules/media_entity/tests/src/FunctionalJavascript/MediaTypeTestBase.php
rename to core/modules/media_entity/tests/src/FunctionalJavascript/MediaHandlerTestBase.php
index 821c0f2708cd12d855fee46070fe68427e24ad40..c74b2bf2b8a2c85bfa6942464796abbfe0a815b2 100644
--- a/core/modules/media_entity/tests/src/FunctionalJavascript/MediaTypeTestBase.php
+++ b/core/modules/media_entity/tests/src/FunctionalJavascript/MediaHandlerTestBase.php
@@ -2,59 +2,12 @@
 
 namespace Drupal\Tests\media_entity\FunctionalJavascript;
 
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\media_entity\Entity\MediaBundle;
 
 /**
  * A base test class for plugin types.
  */
-abstract class MediaTypeTestBase extends MediaEntityJavascriptTestBase {
-
-  /**
-   * Create storage and field instance, attached to a given media bundle.
-   *
-   * @param string $field_name
-   *   The field name.
-   * @param string $field_type
-   *   The field storage type.
-   * @param string $bundle_name
-   *   The media bundle machine name.
-   */
-  protected function createMediaField($field_name, $field_type, $bundle_name) {
-    $storage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'media',
-      'type' => $field_type,
-    ]);
-    $storage->save();
-    $instance = FieldConfig::create([
-      'field_storage' => $storage,
-      'bundle' => $bundle_name,
-    ]);
-    $instance->save();
-    // Make the field visible in the form display.
-    /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display */
-    $component = \Drupal::service('plugin.manager.field.widget')
-      ->prepareConfiguration($field_type, []);
-    entity_get_form_display('media', $bundle_name, 'default')
-      ->setComponent($field_name, $component)
-      ->save();
-  }
-
-  /**
-   * Helper to create a set of fields in a bundle.
-   *
-   * @param array $fields
-   *   An associative array where keys are field names and values field types.
-   * @param string $bundle_name
-   *   The bundle machine name.
-   */
-  protected function createMediaFields(array $fields, $bundle_name) {
-    foreach ($fields as $field_name => $field_type) {
-      $this->createMediaField($field_name, $field_type, $bundle_name);
-    }
-  }
+abstract class MediaHandlerTestBase extends MediaEntityJavascriptTestBase {
 
   /**
    * Hide a component from the default form display config.
diff --git a/core/profiles/standard/config/optional/media_entity.bundle.document.yml b/core/profiles/standard/config/optional/media_entity.bundle.file.yml
similarity index 51%
rename from core/profiles/standard/config/optional/media_entity.bundle.document.yml
rename to core/profiles/standard/config/optional/media_entity.bundle.file.yml
index 0812e8ab82e1ddd8ffc7b1917256fee8c93962ef..acdf44e1c24f29001215c4e68a353a3e3f412148 100644
--- a/core/profiles/standard/config/optional/media_entity.bundle.document.yml
+++ b/core/profiles/standard/config/optional/media_entity.bundle.file.yml
@@ -3,12 +3,12 @@ status: true
 dependencies:
   module:
     - media_entity
-id: document
-label: Document
-description: 'Use Document for uploading document files.'
-type: document
+id: file
+label: File
+description: 'Use the "File" media type for uploading local files.'
+type: file
 queue_thumbnail_downloads: false
 new_revision: false
 type_configuration:
-  source_field: field_media_source_document
+  source_field: field_media_file
 field_map: { }