diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index 1795513..9dfc622 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -81,19 +81,28 @@ class ConfigStorageController implements EntityStorageControllerInterface, Entit
   protected $statusKey = 'status';
 
   /**
+   * The config factory service.
+   *
    * @var \Drupal\Core\Config\ConfigFactory
    */
   protected $configFactory;
 
   /**
+   * The config storage service.
+   *
    * @var \Drupal\Core\Config\StorageInterface
    */
   protected $configStorage;
 
   /**
-   * Implements Drupal\Core\Entity\EntityStorageControllerInterface::__construct().
+   * Constructs a ConfigStorageController object.
    *
-   * Sets basic variables.
+   * @param string $entityType
+   *   The entity type for which the instance is created.
+   * @param \Drupal\Core\Config\ConfigFactory $config_factory
+   *   The config factory service.
+   * @param \Drupal\Core\Config\StorageInterface $config_storage
+   *   The config storage service.
    */
   public function __construct($entityType, ConfigFactory $config_factory, StorageInterface $config_storage) {
     $this->entityType = $entityType;
diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
index 11606ce..8af95b2 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
@@ -122,7 +122,7 @@ class DatabaseStorageController implements EntityStorageControllerInterface, Ent
   protected $database;
 
   /**
-   * Implements \Drupal\Core\Entity\EntityControllerInterface::createInstance().
+   * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, $entity_type) {
     return new static(
diff --git a/core/lib/Drupal/Core/Entity/EntityControllerInterface.php b/core/lib/Drupal/Core/Entity/EntityControllerInterface.php
index 519dac9..f7ac1cd 100644
--- a/core/lib/Drupal/Core/Entity/EntityControllerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityControllerInterface.php
@@ -13,8 +13,7 @@
 /**
  * Defines a common interface for entity controllers.
  *
- * This interface can be implemented by entity
- * form|render|storage|access|translation|list controllers that require
+ * This interface can be implemented by entity controllers that require
  * dependency injection. These are not controllers in the routing sense of the
  * word, but instead are handlers that perform a specific function for an entity
  * type.
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
index a951bdd..5024147 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityFormController;
 use Drupal\Core\Entity\EntityControllerInterface;
-use Drupal\Core\CacheDecorator\AliasManagerCacheDecorator;
+use Drupal\Core\Path\AliasManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -19,14 +19,21 @@
 class MenuLinkFormController extends EntityFormController implements EntityControllerInterface {
 
   /**
+   * The path alias manager.
+   *
+   * @var \Drupal\Core\Path\AliasManagerInterface
+   */
+  protected $pathAliasManager;
+
+  /**
    * Constructs a new MenuLinkFormController object.
    *
    * @param string $operation
    *   The name of the current operation.
-   * @param \Drupal\user\TempStoreFactory $temp_store_factory
-   *   The factory for the temp store object.
+   * @param \Drupal\Core\Path\AliasManagerInterface $path_alias_manager
+   *   The path alias manager.
    */
-  public function __construct($operation, AliasManagerCacheDecorator $path_alias_manager) {
+  public function __construct($operation, AliasManagerInterface $path_alias_manager) {
     parent::__construct($operation);
 
     $this->pathAliasManager = $path_alias_manager;
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
index 7468f08..c1526cf 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
@@ -37,12 +37,21 @@ class MenuLinkStorageController extends DatabaseStorageController {
   protected static $routerItemFields = array();
 
   /**
+   * The route provider service.
+   *
    * @var \Symfony\Cmf\Component\Routing\RouteProviderInterface
    */
   protected $routeProvider;
 
   /**
    * Overrides DatabaseStorageController::__construct().
+   *
+   * @param string $entityType
+   *   The entity type for which the instance is created.
+   * @param \Drupal\Core\Database\Connection $database
+   *   The database connection to be used.
+   * @param \Symfony\Cmf\Component\Routing\RouteProviderInterface $route_provider
+   *   The route provider service.
    */
   public function __construct($entityType, Connection $database, RouteProviderInterface $route_provider) {
     parent::__construct($entityType, $database);
diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/Drupal/user/UserStorageController.php
index 6a5da02..8ee10d9 100644
--- a/core/modules/user/lib/Drupal/user/UserStorageController.php
+++ b/core/modules/user/lib/Drupal/user/UserStorageController.php
@@ -39,6 +39,15 @@ class UserStorageController extends DatabaseStorageController {
 
   /**
    * Constructs a new UserStorageController object.
+   *
+   * @param string $entityType
+   *   The entity type for which the instance is created.
+   * @param \Drupal\Core\Database\Connection $database
+   *   The database connection to be used.
+   * @param \Drupal\Core\Password\PasswordInterface $password
+   *   The password hashing service.
+   * @param \Drupal\user\UserDataInterface $user_data
+   *   The user data service.
    */
   public function __construct($entity_type, Connection $database, PasswordInterface $password, UserDataInterface $user_data) {
     parent::__construct($entity_type, $database);
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
index a24185b..4450ceb 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
@@ -20,6 +20,8 @@
 class ViewAddFormController extends ViewFormControllerBase implements EntityControllerInterface {
 
   /**
+   * The wizard plugin manager.
+   *
    * @var \Drupal\views\Plugin\ViewsPluginManager
    */
   protected $wizardManager;
@@ -39,7 +41,7 @@ public function __construct($operation, ViewsPluginManager $wizard_manager) {
   }
 
   /**
-   * Implements \Drupal\Core\Entity\EntityControllerInterface::createInstance().
+   * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, $entity_type, $operation = NULL) {
     return new static(
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
index 4957790..0b7a497 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -55,7 +55,7 @@ public function __construct($operation, TempStoreFactory $temp_store_factory, Re
   }
 
   /**
-   * Implements \Drupal\Core\Entity\EntityControllerInterface::createInstance().
+   * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, $entity_type, $operation = NULL) {
     return new static(