diff -u b/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php b/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
--- b/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
@@ -34,7 +34,7 @@
    * Gets the override state.
    *
    * @return bool
-   *   Get the override state.
+   *   Whether the configuration is overridden.
    */
   public function getOverrideState();
 
@@ -58,7 +58,7 @@
    * @param array $names
    *   List of names of configuration objects.
    *
-   * @return array
+   * @return \Drupal\Core\Config\Config[]
    *   List of successfully loaded configuration objects, keyed by name.
    */
   public function loadMultiple(array $names);
@@ -66,12 +66,11 @@
   /**
    * Resets and re-initializes configuration objects. Internal use only.
    *
-   * @param string $name
+   * @param string|null $name
    *   (optional) The name of the configuration object to reset. If omitted, all
    *   configuration objects are reset.
    *
    * @return $this
-   *   The config factory object.
    */
   public function reset($name = NULL);
 
@@ -120,7 +119,7 @@
   /**
    * Sets the language to be used in configuration overrides.
    *
-   * @param \Drupal\Core\Language\Language $language
+   * @param \Drupal\Core\Language\Language|null $language
    *   The language object to be set on the config factory. Used to override
    *   configuration by language.
    *
@@ -141,9 +140,10 @@
   public function setLanguageFromDefault(LanguageDefault $language_default);
 
   /**
-   * Gets the language Used to override configuration.
+   * Gets the language used to override configuration.
    *
    * @return \Drupal\Core\Language\Language
+   *   The language used to override configuration.
    */
   public function getLanguage();
 
@@ -174,7 +174,7 @@
    *
    * @return bool|string
    *   The configuration name for configuration object providing overrides.
-   *   Returns false if the name already starts with the language config prefix.
+   *   Returns FALSE if the name already starts with the language config prefix.
    */
   public function getLanguageConfigName($langcode, $name);
 
diff -u b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
--- b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -82,8 +82,8 @@
   /**
    * Constructs a ConfigStorageController object.
    *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_info
-   *   The entity info for the entity type.
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type definition.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The config factory service.
    * @param \Drupal\Core\Config\StorageInterface $config_storage
@@ -93,8 +93,8 @@
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
    *   The UUID service.
    */
-  public function __construct(EntityTypeInterface $entity_info, ConfigFactoryInterface $config_factory, StorageInterface $config_storage, QueryFactory $entity_query_factory, UuidInterface $uuid_service) {
-    parent::__construct($entity_info);
+  public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, StorageInterface $config_storage, QueryFactory $entity_query_factory, UuidInterface $uuid_service) {
+    parent::__construct($entity_type);
 
     $this->idKey = $this->entityType->getKey('id');
     $this->statusKey = $this->entityType->getKey('status');
@@ -108,9 +108,9 @@
   /**
    * {@inheritdoc}
    */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_info) {
+  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
-      $entity_info,
+      $entity_type,
       $container->get('config.factory'),
       $container->get('config.storage'),
       $container->get('entity.query'),