diff -u b/core/modules/responsive_image/lib/Drupal/responsive_image/Entity/ResponsiveImageMapping.php b/core/modules/responsive_image/lib/Drupal/responsive_image/Entity/ResponsiveImageMapping.php
--- b/core/modules/responsive_image/lib/Drupal/responsive_image/Entity/ResponsiveImageMapping.php
+++ b/core/modules/responsive_image/lib/Drupal/responsive_image/Entity/ResponsiveImageMapping.php
@@ -11,7 +11,7 @@
 use Drupal\responsive_image\ResponsiveImageMappingInterface;
  
 /**
- * Defines the ResponsiveImage entity.
+ * Defines the responsive image mapping entity.
  *
  * @ConfigEntityType(
  *   id = "responsive_image_mapping",
diff -u b/core/modules/responsive_image/lib/Drupal/responsive_image/ResponsiveImageMappingListController.php b/core/modules/responsive_image/lib/Drupal/responsive_image/ResponsiveImageMappingListController.php
--- b/core/modules/responsive_image/lib/Drupal/responsive_image/ResponsiveImageMappingListController.php
+++ b/core/modules/responsive_image/lib/Drupal/responsive_image/ResponsiveImageMappingListController.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Entity\EntityInterface;
  
 /**
- * Provides a listing of ResponsiveImages.
+ * Provides a listing of responsive image mappings.
  */
 class ResponsiveImageMappingListController extends ConfigEntityListController {
  
diff -u b/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
--- b/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -39,7 +39,7 @@
 function responsive_image_permission() {
   return array(
     'administer responsive image' => array(
-      'title' => t('Administer responsive image'),
+      'title' => t('Administer responsive images'),
     ),
   );
 }
@@ -89,7 +89,7 @@
  * @param int $id
  *   The id of the responsive image mapping to load.
  *
- * @return \Drupal\responsive_image\ResponsiveImage
+ * @return \Drupal\responsive_image\ResponsiveImageMappingInterface
  *   The entity object, or NULL if there is no entity with the given id.
  *
  * @todo Needed for menu_callback