diff --git a/core/modules/responsive_image/config/schema/responsive_image.schema.yml b/core/modules/responsive_image/config/schema/responsive_image.schema.yml
index 27acfa6..430dc47 100644
--- a/core/modules/responsive_image/config/schema/responsive_image.schema.yml
+++ b/core/modules/responsive_image/config/schema/responsive_image.schema.yml
@@ -14,9 +14,9 @@ responsive_image.mappings.*:
       type: sequence
       label: 'Mapping definitions'
       sequence:
-        - type: mapping_definition
+        - type: mapping
           label: 'Mapping definition'
-          mapping_definition:
+          mapping:
             # Image mapping type. Either 'sizes' (using the 'sizes' attribute)
             # or 'image_style' (using a single image style to map to this
             # breakpoint).
diff --git a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
index 5ed1e3b7..32c9eeb 100644
--- a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
+++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
@@ -198,7 +198,7 @@ public function viewElements(FieldItemListInterface $items) {
     $cache_tags = [];
     if ($responsive_image_mapping) {
       $cache_tags = Cache::mergeTags($cache_tags, $responsive_image_mapping->getCacheTags());
-      foreach ($responsive_image_mapping->getMappings() as $mapping) {
+      foreach ($responsive_image_mapping->getMappingDefinitions() as $mapping) {
         // Only image styles of non-empty mappings should be loaded.
         if (!$responsive_image_mapping::isEmptyMappingDefinition($mapping)) {
 
diff --git a/core/modules/responsive_image/src/ResponsiveImageMappingForm.php b/core/modules/responsive_image/src/ResponsiveImageMappingForm.php
index 6090495..2973413 100644
--- a/core/modules/responsive_image/src/ResponsiveImageMappingForm.php
+++ b/core/modules/responsive_image/src/ResponsiveImageMappingForm.php
@@ -148,11 +148,11 @@ public function save(array $form, FormStateInterface $form_state) {
     /** @var \Drupal\responsive_image\ResponsiveImageMappingInterface $responsive_image_mapping */
     $responsive_image_mapping = $this->entity;
     // Remove all the existing mappings and replace with submitted values.
-    $responsive_image_mapping->removeMappings();
+    $responsive_image_mapping->removeMappingDefinitions();
     if ($form_state->hasValue('keyed_mappings')) {
       foreach ($form_state->getValue('keyed_mappings') as $breakpoint_id => $multipliers) {
         foreach ($multipliers as $multiplier => $mapping) {
-          $responsive_image_mapping->addMapping($breakpoint_id, $multiplier, $mapping);
+          $responsive_image_mapping->addMappingDefinition($breakpoint_id, $multiplier, $mapping);
         }
       }
     }
@@ -163,7 +163,7 @@ public function save(array $form, FormStateInterface $form_state) {
 
     // Redirect to edit form after creating a new mapping or after selecting
     // another breakpoint group.
-    if (!$responsive_image_mapping->hasMappings()) {
+    if (!$responsive_image_mapping->hasMappingDefinitions()) {
       $form_state->setRedirect(
         'entity.responsive_image_mapping.edit_form',
         array('responsive_image_mapping' => $responsive_image_mapping->id())