diff --git a/core/modules/media/src/Entity/Media.php b/core/modules/media/src/Entity/Media.php
index 32e6efbcf4..a20c1919a5 100644
--- a/core/modules/media/src/Entity/Media.php
+++ b/core/modules/media/src/Entity/Media.php
@@ -96,7 +96,8 @@ public function getType() {
    * {@inheritdoc}
    */
   public function getName() {
-    return $this->get('name')->value;
+    $media_source = $this->getSource();
+    return !empty($this->get('name')->value) ? $this->get('name')->value : $media_source->getMetadata($this, $media_source->getPluginDefinition()['default_name_metadata_attribute']);
   }
 
   /**
diff --git a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
index a7f2197108..74ac67c20e 100644
--- a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
+++ b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
@@ -156,10 +156,10 @@ public function testMediaWithMultipleMediaTypes() {
     $this->drupalGet('media/add');
 
     // Checks for the first media type.
-    $assert_session->pageTextContains($first_media_type->getName());
+    $assert_session->pageTextContains($first_media_type->label());
     $assert_session->pageTextContains($first_media_type->getDescription());
     // Checks for the second media type.
-    $assert_session->pageTextContains($second_media_type->getName());
+    $assert_session->pageTextContains($second_media_type->label());
     $assert_session->pageTextContains($second_media_type->getDescription());
 
     // Continue testing media type filter.
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
index 3c4f975ad0..38a6227440 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
@@ -161,7 +161,7 @@ public function testMediaTypes() {
       ->getStorage('media_type')
       ->load($this->testMediaType->id());
     $this->assertEquals($loaded_media_type->id(), $this->testMediaType->id());
-    $this->assertEquals($loaded_media_type->getName(), $new_name);
+    $this->assertEquals($loaded_media_type->label(), $new_name);
     $this->assertEquals($loaded_media_type->getDescription(), $new_description);
     $this->assertEquals($loaded_media_type->getSource()->getPluginId(), 'test');
     $this->assertEquals($loaded_media_type->getSource()->getConfiguration()['test_config_value'], 'This is new config value.');
@@ -192,7 +192,7 @@ public function testMediaTypes() {
     // Test that the system for preventing the deletion of media types works
     // (they cannot be deleted if there is media content of that type/bundle).
     $media_type2 = $this->createMediaType();
-    $label2 = $media_type2->getName();
+    $label2 = $media_type2->label();
     $media = Media::create(['name' => 'lorem ipsum', 'bundle' => $media_type2->id()]);
     $media->save();
     $this->drupalGet('admin/structure/media/manage/' . $media_type2->id());
diff --git a/core/modules/media/tests/src/Kernel/MediaSourceTest.php b/core/modules/media/tests/src/Kernel/MediaSourceTest.php
index a5159a31f1..e40db38f39 100644
--- a/core/modules/media/tests/src/Kernel/MediaSourceTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaSourceTest.php
@@ -25,8 +25,9 @@ public function testDefaultName() {
     $media_source = $media->getSource();
     $this->assertEquals('default_name', $media_source->getPluginDefinition()['default_name_metadata_attribute'], 'Default metadata attribute is not used for the default name.');
     $this->assertEquals('media:' . $media->getType() . ':' . $media->uuid(), $media_source->getMetadata($media, 'default_name'), 'Value of the default name metadata attribute does not look correct.');
+    $this->assertEquals('media:' . $media->getType() . ':' . $media->uuid(), $media->getName(), 'Default name was not used correctly by getName().');
     $media->save();
-    $this->assertEquals('media:' . $media->getType() . ':' . $media->uuid(), $media->getName(), 'Default name was not set correctly.');
+    $this->assertEquals('media:' . $media->getType() . ':' . $media->uuid(), $media->getName(), 'Default name was not saved correctly.');
 
     // Make sure that the user-supplied name is used.
     /** @var \Drupal\media\MediaInterface $media */