diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationListUiTest.php
index 03ba59b..1a3bd62 100644
--- a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationListUiTest.php
+++ b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationListUiTest.php
@@ -372,7 +372,7 @@ public function doPictureListTest() {
     $edit['id'] = strtolower($edit['label']);
 
     $this->drupalPostForm('admin/config/media/picturemapping/add', $edit, t('Save'));
-    $this->assertRaw(t('Picture mapping %label saved.', array('%label' => $edit['label'])));
+    $this->assertRaw(t('Responsive image mapping %label saved.', array('%label' => $edit['label'])));
 
     // Get the picture mapping listing.
     $this->drupalGet('admin/config/media/picturemapping');
diff --git a/core/modules/picture/config/schema/picture.schema.yml b/core/modules/picture/config/schema/picture.schema.yml
index c1e7d64..07eaa6f 100644
--- a/core/modules/picture/config/schema/picture.schema.yml
+++ b/core/modules/picture/config/schema/picture.schema.yml
@@ -2,7 +2,7 @@
 
 picture.mappings.*:
   type: mapping
-  label: 'Picture mapping'
+  label: 'Responsive image mapping'
   mapping:
     id:
       type: string
@@ -40,7 +40,7 @@ picture.mappings.*:
 
 entity_view_display.field.picture:
   type: entity_field_view_display_base
-  label: 'Picture list format settings'
+  label: 'Responsive image list format settings'
   mapping:
     settings:
       type: mapping
@@ -48,7 +48,7 @@ entity_view_display.field.picture:
       mapping:
         picture_mapping:
           type: string
-          label: 'Picture mapping'
+          label: 'Responsive image mapping'
         fallback_image_style:
           type: string
           label: 'Fallback image style'
diff --git a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
index 05ff927..8f1ee1a 100644
--- a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
+++ b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
@@ -15,7 +15,7 @@
  *
  * @EntityType(
  *   id = "picture_mapping",
- *   label = @Translation("Picture mapping"),
+ *   label = @Translation("Responsive image mapping"),
  *   controllers = {
  *     "storage" = "Drupal\Core\Config\Entity\ConfigStorageController",
  *     "list" = "Drupal\picture\PictureMappingListController",
diff --git a/core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php b/core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php
index ba47dd0..507bf8e 100644
--- a/core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php
+++ b/core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php
@@ -15,7 +15,7 @@ class PictureMappingDeleteForm extends EntityConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return t('Are you sure you want to delete the picture_mapping %title?', array('%title' => $this->entity->label()));
+    return t('Are you sure you want to delete the responsive image mapping %title?', array('%title' => $this->entity->label()));
   }
 
   /**
@@ -39,8 +39,8 @@ public function getConfirmText() {
    */
   public function submit(array $form, array &$form_state) {
     $this->entity->delete();
-    drupal_set_message(t('Picture mapping %label has been deleted.', array('%label' => $this->entity->label())));
-    watchdog('picture', 'Picture mapping %label has been deleted.', array('%label' => $this->entity->label()), WATCHDOG_NOTICE);
+    drupal_set_message(t('Responsive image mapping %label has been deleted.', array('%label' => $this->entity->label())));
+    watchdog('picture', 'Responsive image mapping %label has been deleted.', array('%label' => $this->entity->label()), WATCHDOG_NOTICE);
     $form_state['redirect_route']['route_name'] = 'picture.mapping_page';
   }
 
diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingFormController.php b/core/modules/picture/lib/Drupal/picture/PictureMappingFormController.php
index 1e4b106..94bc6b5 100644
--- a/core/modules/picture/lib/Drupal/picture/PictureMappingFormController.php
+++ b/core/modules/picture/lib/Drupal/picture/PictureMappingFormController.php
@@ -29,11 +29,11 @@ class PictureMappingFormController extends EntityFormController {
    */
   public function form(array $form, array &$form_state) {
     if ($this->operation == 'duplicate') {
-      $form['#title'] = $this->t('<em>Duplicate picture mapping</em> @label', array('@label' => $this->entity->label()));
+      $form['#title'] = $this->t('<em>Duplicate responsive image mapping</em> @label', array('@label' => $this->entity->label()));
       $this->entity = $this->entity->createDuplicate();
     }
     if ($this->operation == 'edit') {
-      $form['#title'] = $this->t('<em>Edit picture mapping</em> @label', array('@label' => $this->entity->label()));
+      $form['#title'] = $this->t('<em>Edit responsive image mapping</em> @label', array('@label' => $this->entity->label()));
     }
 
     $picture_mapping = $this->entity;
@@ -138,8 +138,8 @@ public function save(array $form, array &$form_state) {
     $picture_mapping = $this->entity;
     $picture_mapping->save();
 
-    watchdog('picture', 'Picture mapping @label saved.', array('@label' => $picture_mapping->label()), WATCHDOG_NOTICE);
-    drupal_set_message($this->t('Picture mapping %label saved.', array('%label' => $picture_mapping->label())));
+    watchdog('picture', 'Responsive image mapping @label saved.', array('@label' => $picture_mapping->label()), WATCHDOG_NOTICE);
+    drupal_set_message($this->t('Responsive image mapping %label saved.', array('%label' => $picture_mapping->label())));
 
     // Redirect to edit form after creating a new mapping or after selecting
     // another breakpoint group.
diff --git a/core/modules/picture/lib/Drupal/picture/Plugin/Field/FieldFormatter/PictureFormatter.php b/core/modules/picture/lib/Drupal/picture/Plugin/Field/FieldFormatter/PictureFormatter.php
index eb1864d..3f8852e 100644
--- a/core/modules/picture/lib/Drupal/picture/Plugin/Field/FieldFormatter/PictureFormatter.php
+++ b/core/modules/picture/lib/Drupal/picture/Plugin/Field/FieldFormatter/PictureFormatter.php
@@ -15,7 +15,7 @@
  *
  * @FieldFormatter(
  *   id = "picture",
- *   label = @Translation("Picture"),
+ *   label = @Translation("Responsive image"),
  *   field_types = {
  *     "image",
  *   },
@@ -43,7 +43,7 @@ public function settingsForm(array $form, array &$form_state) {
     }
 
     $elements['picture_mapping'] = array(
-      '#title' => t('Picture mapping'),
+      '#title' => t('Responsive image mapping'),
       '#type' => 'select',
       '#default_value' => $this->getSetting('picture_mapping'),
       '#required' => TRUE,
@@ -82,7 +82,7 @@ public function settingsSummary() {
 
     $picture_mapping = entity_load('picture_mapping', $this->getSetting('picture_mapping'));
     if ($picture_mapping) {
-      $summary[] = t('Picture mapping: @picture_mapping', array('@picture_mapping' => $picture_mapping->label()));
+      $summary[] = t('Responsive image mapping: @picture_mapping', array('@picture_mapping' => $picture_mapping->label()));
 
       $image_styles = image_style_options(FALSE);
       unset($image_styles['']);
@@ -103,7 +103,7 @@ public function settingsSummary() {
       }
     }
     else {
-      $summary[] = t('Select a picture mapping.');
+      $summary[] = t('Select a responsive image mapping.');
     }
 
     return $summary;
diff --git a/core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php b/core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php
index 3b908db..364e569 100644
--- a/core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php
+++ b/core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php
@@ -79,7 +79,7 @@ public function setUp() {
   public function testPictureAdmin() {
     // We start without any default mappings.
     $this->drupalGet('admin/config/media/picturemapping');
-    $this->assertText('There is no Picture mapping yet.');
+    $this->assertText('There is no Responsive image mapping yet.');
 
     // Add a new picture mapping, our breakpoint set should be selected.
     $this->drupalGet('admin/config/media/picturemapping/add');
@@ -96,7 +96,7 @@ public function testPictureAdmin() {
     // Check if the new group is created.
     $this->assertResponse(200);
     $this->drupalGet('admin/config/media/picturemapping');
-    $this->assertNoText('There is no Picture mapping yet.');
+    $this->assertNoText('There is no Responsive image mapping yet.');
     $this->assertText('Mapping One');
     $this->assertText('mapping_one');
 
@@ -134,7 +134,7 @@ public function testPictureAdmin() {
     $this->drupalGet('admin/config/media/picturemapping/mapping_one/delete');
     $this->drupalPostForm(NULL, array(), t('Delete'));
     $this->drupalGet('admin/config/media/picturemapping');
-    $this->assertText('There is no Picture mapping yet.');
+    $this->assertText('There is no Responsive image mapping yet.');
   }
 
 }
diff --git a/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php b/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php
index 7c11a6f..e29a68f 100644
--- a/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php
+++ b/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php
@@ -29,7 +29,7 @@ class PictureFieldDisplayTest extends ImageFieldTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Picture field display tests',
-      'description' => 'Test picture display formatter.',
+      'description' => 'Test responsive image display formatter.',
       'group' => 'Picture',
     );
   }
diff --git a/core/modules/picture/picture.info.yml b/core/modules/picture/picture.info.yml
index 456d8a7..3dbaebf 100644
--- a/core/modules/picture/picture.info.yml
+++ b/core/modules/picture/picture.info.yml
@@ -1,4 +1,4 @@
-name: Picture
+name: Responsive Images
 type: module
 description: 'Provides an image formatter and breakpoint mappings to output responsive images using the HTML5 picture tag.'
 package: Core
diff --git a/core/modules/picture/picture.local_actions.yml b/core/modules/picture/picture.local_actions.yml
index 0fccbb2..d495a02 100644
--- a/core/modules/picture/picture.local_actions.yml
+++ b/core/modules/picture/picture.local_actions.yml
@@ -1,5 +1,5 @@
 picture.mapping_page_add:
   route_name: picture.mapping_page_add
-  title: 'Add picture mapping'
+  title: 'Add responsive image mapping'
   appears_on:
     - picture.mapping_page
diff --git a/core/modules/picture/picture.module b/core/modules/picture/picture.module
index 60d1c48..4ddc002 100644
--- a/core/modules/picture/picture.module
+++ b/core/modules/picture/picture.module
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Picture display formatter for image fields.
+ * Responsive Images display formatter for image fields.
  */
 
 use Drupal\picture\Entity\PictureMapping;
@@ -16,19 +16,19 @@ function picture_help($path, $arg) {
   switch ($path) {
     case 'admin/help#picture':
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Picture module provides an image formatter and breakpoint mappings to output responsive images using the HTML5 picture tag.') . '</p>';
+      $output .= '<p>' . t('The Responsive Images module provides an image formatter and breakpoint mappings to output responsive images using the HTML5 picture tag.') . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Mapping image styles to breakpoints') . '</dt>';
-      $output .= '<dd>' . t('To use responsive images, you need to define what size the images should be depending on the breakpoints. The Picture module allows you to define which image style should be used for each breakpoint on the <a href="@link">picture mappings administrative page</a>.', array(
+      $output .= '<dd>' . t('To use responsive images, you need to define what size the images should be depending on the breakpoints. The Responsive Images module allows you to define which image style should be used for each breakpoint on the <a href="@link">responsive images mappings administrative page</a>.', array(
         '@link' => url('admin/config/media/picturemapping'),
       )) . '</dd>';
       $output .= '<dt>' . t('Formatting an Image field') . '</dt>';
-      $output .= '<dd>' . t('Images in Image fields can be formatted using the Picture formatter, to make them responsive. They will be automatically resized depending on breakpoints.') . '</dd>';
+      $output .= '<dd>' . t('Images in Image fields can be formatted using the Responsive images formatter, to make them responsive. They will be automatically resized depending on breakpoints.') . '</dd>';
       $output .= '</dl>';
       break;
     case 'admin/config/media/picturemapping':
-      $output .= '<p>' . t('A picture mapping associates an image style with each breakpoint defined by your theme.') . '</p>';
+      $output .= '<p>' . t('A responsive image mapping associates an image style with each breakpoint defined by your theme.') . '</p>';
       break;
 
   }
@@ -41,8 +41,7 @@ function picture_help($path, $arg) {
 function picture_permission() {
   return array(
     'administer pictures' => array(
-      'title' => t('Administer Pictures'),
-      'description' => t('Administer Pictures'),
+      'title' => t('Administer responsive images'),
     ),
   );
 }
@@ -54,17 +53,17 @@ function picture_menu() {
   $items = array();
 
   $items['admin/config/media/picturemapping'] = array(
-    'title' => 'Picture Mappings',
-    'description' => 'Manage picture mappings',
+    'title' => 'Responsive images mappings',
+    'description' => 'Manage responsive image mappings',
     'weight' => 10,
     'route_name' => 'picture.mapping_page',
   );
   $items['admin/config/media/picturemapping/%picture_mapping'] = array(
-    'title' => 'Edit picture mapping',
+    'title' => 'Edit responsive image mapping',
     'route_name' => 'picture.mapping_page_edit',
   );
   $items['admin/config/media/picturemapping/%picture_mapping/duplicate'] = array(
-    'title' => 'Duplicate picture mapping',
+    'title' => 'Duplicate responsive image mapping',
     'route_name' => 'picture.mapping_page_duplicate',
   );
 
@@ -76,8 +75,8 @@ function picture_menu() {
  */
 function picture_menu_link_defaults() {
   $links['picture.admin.config.picturemapping'] = array(
-    'link_title' => 'Picture Mappings',
-    'description' => 'Manage picture mappings',
+    'link_title' => 'Responsive image mappings',
+    'description' => 'Manage responsive image mappings',
     'weight' => 10,
     'route_name' => 'picture.mapping_page',
     'parent' => 'system.admin.config.media',
diff --git a/core/modules/picture/picture.routing.yml b/core/modules/picture/picture.routing.yml
index 11c2dcf..a425c39 100644
--- a/core/modules/picture/picture.routing.yml
+++ b/core/modules/picture/picture.routing.yml
@@ -2,7 +2,7 @@ picture.mapping_page:
   path: '/admin/config/media/picturemapping'
   defaults:
     _entity_list: 'picture_mapping'
-    _title: 'Picture mappings'
+    _title: 'Responsive image mappings'
   requirements:
     _permission: 'administer pictures'
 
@@ -10,7 +10,7 @@ picture.mapping_page_add:
   path: '/admin/config/media/picturemapping/add'
   defaults:
     _entity_form: 'picture_mapping.add'
-    _title: 'Add picture mapping'
+    _title: 'Add responsive image mapping'
   requirements:
     _permission: 'administer pictures'
 
@@ -18,7 +18,7 @@ picture.mapping_page_edit:
   path: '/admin/config/media/picturemapping/{picture_mapping}'
   defaults:
     _entity_form: 'picture_mapping.edit'
-    _title: 'Edit picture mapping'
+    _title: 'Edit responsive image mapping'
   requirements:
     _permission: 'administer pictures'
 
@@ -26,7 +26,7 @@ picture.mapping_page_duplicate:
   path: '/admin/config/media/picturemapping/{picture_mapping}/duplicate'
   defaults:
     _entity_form: 'picture_mapping.duplicate'
-    _title: 'Duplicate picture mapping'
+    _title: 'Duplicate responsive image mapping'
   requirements:
     _permission: 'administer pictures'