diff --git a/core/modules/media/src/Annotation/MediaSource.php b/core/modules/media/src/Annotation/MediaSource.php
index fe1735d9090e4bc6f8d5dbfa726599ddb7ac5098..2f7bdad23d400bda035e781fe0d5f44f92e2e253 100644
--- a/core/modules/media/src/Annotation/MediaSource.php
+++ b/core/modules/media/src/Annotation/MediaSource.php
@@ -91,7 +91,7 @@ class MediaSource extends Plugin {
   /**
    * (optional) The metadata attribute name to provide the thumbnail title.
    *
-   * The name of the media entity will be used if the attribute name is not
+   * The name of the media item will be used if the attribute name is not
    * provided.
    *
    * @var string|null
diff --git a/core/modules/media/src/MediaAccessControlHandler.php b/core/modules/media/src/MediaAccessControlHandler.php
index b631da8360cd4f59a82d083c96c81e83d86c1a5c..d4203728e55e952a663d24b00da2ff8e1a67831a 100644
--- a/core/modules/media/src/MediaAccessControlHandler.php
+++ b/core/modules/media/src/MediaAccessControlHandler.php
@@ -8,7 +8,7 @@
 use Drupal\Core\Session\AccountInterface;
 
 /**
- * Defines an access control handler for the media entity.
+ * Defines an access control handler for media items.
  */
 class MediaAccessControlHandler extends EntityAccessControlHandler {
 
diff --git a/core/modules/media/src/Plugin/Field/FieldFormatter/MediaThumbnailFormatter.php b/core/modules/media/src/Plugin/Field/FieldFormatter/MediaThumbnailFormatter.php
index 8ef7792d6b69f26002df949a5bd8d06a3f037feb..dbceaf8a11208918d29111a544a3198f9b7444e9 100644
--- a/core/modules/media/src/Plugin/Field/FieldFormatter/MediaThumbnailFormatter.php
+++ b/core/modules/media/src/Plugin/Field/FieldFormatter/MediaThumbnailFormatter.php
@@ -100,7 +100,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
 
     $link_types = [
       'content' => $this->t('Content'),
-      'media' => $this->t('Media entity'),
+      'media' => $this->t('Media item'),
     ];
     $element['image_link']['#options'] = $link_types;
 
diff --git a/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php b/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php
index 8da814b9d3a195dd5f389c0e6efb60cd367d4f6b..e1b6cf7ef1b54329565626348280ee0119bdfbd9 100644
--- a/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php
+++ b/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php
@@ -7,7 +7,7 @@
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
 
 /**
- * Tests the media entity's cache tags.
+ * Tests the media items cache tags.
  *
  * @group media
  */
diff --git a/core/modules/media/tests/src/Functional/MediaFunctionalTestTrait.php b/core/modules/media/tests/src/Functional/MediaFunctionalTestTrait.php
index 9ce3934e7d4edbb1e900735ee2fd3a9de9564f48..224bb426e38227c62e683e5e49ea48f248754692 100644
--- a/core/modules/media/tests/src/Functional/MediaFunctionalTestTrait.php
+++ b/core/modules/media/tests/src/Functional/MediaFunctionalTestTrait.php
@@ -13,7 +13,7 @@ trait MediaFunctionalTestTrait {
    * @var array
    */
   protected static $adminUserPermissions = [
-    // Media entity permissions.
+    // Media module permissions.
     'administer media',
     'administer media fields',
     'administer media form display',
diff --git a/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php b/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php
index fa39962c362db9dacc2baec5d89e016f5dbae83c..c00dc3d1de4462633229a997ec861d3b801a3724 100644
--- a/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php
+++ b/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php
@@ -109,7 +109,7 @@ protected function createMediaType($media_source_name) {
   }
 
   /**
-   * Helper to generate media entity.
+   * Helper to generate a media item.
    *
    * @param string $filename
    *   String filename with extension.
@@ -117,7 +117,7 @@ protected function createMediaType($media_source_name) {
    *   The the media type.
    *
    * @return \Drupal\media\Entity\Media
-   *   A media entity.
+   *   A media item.
    */
   protected function generateMedia($filename, MediaTypeInterface $media_type) {
     vfsStream::setup('drupal_root');
diff --git a/core/modules/media/tests/src/Kernel/MediaLinkRelationsTest.php b/core/modules/media/tests/src/Kernel/MediaLinkRelationsTest.php
index 164df60e7256be79288ad5cb7d9c8dc900833ebf..c3b508c6eaec58acf6335a41efe038f0d129a356 100644
--- a/core/modules/media/tests/src/Kernel/MediaLinkRelationsTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaLinkRelationsTest.php
@@ -5,7 +5,7 @@
 use Drupal\media\Entity\Media;
 
 /**
- * Tests link relationships for Media entity.
+ * Tests link relationships for media items.
  *
  * @group media
  */
@@ -20,7 +20,7 @@ public function testExistLinkRelationships() {
     $media = Media::create(['bundle' => $this->testMediaType->id()]);
     $media->save();
     foreach ($media->uriRelationships() as $relation_name) {
-      $this->assertTrue($link_relation_type_manager->hasDefinition($relation_name), "Link relationship '{$relation_name}' for Media entity");
+      $this->assertTrue($link_relation_type_manager->hasDefinition($relation_name), "Link relationship '{$relation_name}' for a media item");
     }
   }
 
diff --git a/core/modules/media/tests/src/Kernel/MediaSourceTest.php b/core/modules/media/tests/src/Kernel/MediaSourceTest.php
index ffde236906bdafa958876e1d9936660be60c8f1d..37434e56958d2da2bc1bec9794ea7039dddbaf20 100644
--- a/core/modules/media/tests/src/Kernel/MediaSourceTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaSourceTest.php
@@ -161,7 +161,7 @@ public function testThumbnail() {
     file_put_contents('public://thumbnail1.jpg', '');
     file_put_contents('public://thumbnail2.jpg', '');
 
-    // Save a media entity and make sure thumbnail was added.
+    // Save a media item and make sure thumbnail was added.
     \Drupal::state()->set('media_source_test_attributes', [
       'thumbnail_uri' => ['title' => 'Thumbnail', 'value' => 'public://thumbnail1.jpg'],
     ]);
@@ -174,7 +174,7 @@ public function testThumbnail() {
     $media_source = $media->getSource();
     $this->assertEquals('public://thumbnail1.jpg', $media_source->getMetadata($media, 'thumbnail_uri'), 'Value of the thumbnail metadata attribute is not correct.');
     $media->save();
-    $this->assertEquals('public://thumbnail1.jpg', $media->thumbnail->entity->getFileUri(), 'Thumbnail was not added to the media entity.');
+    $this->assertEquals('public://thumbnail1.jpg', $media->thumbnail->entity->getFileUri(), 'Thumbnail was not added to the media item.');
     $this->assertEquals('Mr. Jones', $media->thumbnail->title, 'Title text was not set on the thumbnail.');
     $this->assertEquals('Thumbnail', $media->thumbnail->alt, 'Alt text was not set on the thumbnail.');
 
@@ -193,7 +193,7 @@ public function testThumbnail() {
     $media->thumbnail->target_id = NULL;
     $this->assertEquals('public://thumbnail2.jpg', $media_source->getMetadata($media, 'thumbnail_uri'), 'Value of the thumbnail metadata attribute is not correct.');
     $media->save();
-    $this->assertEquals('public://thumbnail2.jpg', $media->thumbnail->entity->getFileUri(), 'New thumbnail was not added to the media entity.');
+    $this->assertEquals('public://thumbnail2.jpg', $media->thumbnail->entity->getFileUri(), 'New thumbnail was not added to the media item.');
     $this->assertEquals('Mr. Jones', $media->thumbnail->title, 'Title text was not set on the thumbnail.');
     $this->assertEquals('Thumbnail', $media->thumbnail->alt, 'Alt text was not set on the thumbnail.');
 
@@ -205,7 +205,7 @@ public function testThumbnail() {
     $media->field_media_test->value = 'some_new_value';
     $this->assertEquals('public://thumbnail1.jpg', $media_source->getMetadata($media, 'thumbnail_uri'), 'Value of the thumbnail metadata attribute is not correct.');
     $media->save();
-    $this->assertEquals('public://thumbnail1.jpg', $media->thumbnail->entity->getFileUri(), 'New thumbnail was not added to the media entity.');
+    $this->assertEquals('public://thumbnail1.jpg', $media->thumbnail->entity->getFileUri(), 'New thumbnail was not added to the media item.');
     $this->assertEquals('Mr. Jones', $media->thumbnail->title, 'Title text was not set on the thumbnail.');
     $this->assertEquals('Thumbnail', $media->thumbnail->alt, 'Alt text was not set on the thumbnail.');
 
@@ -282,13 +282,13 @@ public function testThumbnail() {
       'field_media_test' => 'some_value',
     ]);
     $media->save();
-    $this->assertEquals('Boxer', $media->getName(), 'Correct name was not set on the media entity.');
+    $this->assertEquals('Boxer', $media->getName(), 'Correct name was not set on the media item.');
     $this->assertEquals('This will be title.', $media->thumbnail->title, 'Title text was not set on the thumbnail.');
     $this->assertEquals('This will be alt.', $media->thumbnail->alt, 'Alt text was not set on the thumbnail.');
   }
 
   /**
-   * Tests the media entity constraints functionality.
+   * Tests the media item constraints functionality.
    */
   public function testConstraints() {
     // Test entity constraints.
diff --git a/core/modules/media/tests/src/Kernel/MediaTest.php b/core/modules/media/tests/src/Kernel/MediaTest.php
index df48a9bf764d1e2e3a2bf99808d86d7b48f02e9e..ea76a2e6738309a201286b7135cc82a0e39592eb 100644
--- a/core/modules/media/tests/src/Kernel/MediaTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaTest.php
@@ -12,7 +12,7 @@
 class MediaTest extends MediaKernelTestBase {
 
   /**
-   * Tests various aspects of a Media entity.
+   * Tests various aspects of a media item.
    */
   public function testEntity() {
     $media = Media::create(['bundle' => $this->testMediaType->id()]);