diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
index 8cb8f37..4325637 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
@@ -25,7 +25,7 @@ class ConfigEntityListController extends EntityListController implements FormInt
   protected $weightKey;
 
   /**
-   * Overrides EntityListController::__construct().
+   * {@inheritdoc}
    */
   public function __construct($entity_type, EntityStorageControllerInterface $storage) {
     parent::__construct($entity_type, $storage);
@@ -40,7 +40,7 @@ public function __construct($entity_type, EntityStorageControllerInterface $stor
   }
 
   /**
-   * Overrides EntityListController::load().
+   * {@inheritdoc}
    */
   public function load() {
     $entities = parent::load();
@@ -49,7 +49,7 @@ public function load() {
   }
 
   /**
-   * Overrides EntityListController::getOperations();
+   * {@inheritdoc}
    */
   public function getOperations(EntityInterface $entity) {
     $operations = parent::getOperations($entity);
@@ -76,7 +76,7 @@ public function getOperations(EntityInterface $entity) {
   }
 
   /**
-   * Overrides EntityListController::buildHeader().
+   * {@inheritdoc}
    */
   public function buildHeader() {
     $row = parent::buildHeader();
@@ -93,7 +93,7 @@ public function buildHeader() {
   }
 
   /**
-   * Overrides EntityListController::buildRow().
+   * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
     $row = parent::buildRow($entity);
@@ -130,7 +130,7 @@ public function buildRow(EntityInterface $entity) {
   }
 
   /**
-   * Overrides EntityListController::render().
+   * {@inheritdoc}
    */
   public function render() {
     if (empty($this->weightKey)) {
@@ -141,14 +141,14 @@ public function render() {
   }
 
   /**
-   * Implements FormInterface::getFormID().
+   * {@inheritdoc}
    */
   public function getFormID() {
     return $this->entityType . '_admin_list_form';
   }
 
   /**
-   * Implements FormInterface::buildForm().
+   * {@inheritdoc}
    */
   public function buildForm(array $form, array &$form_state) {
     $form['entities'] = array(
@@ -180,14 +180,14 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Implements FormInterface::validateForm().
+   * {@inheritdoc}
    */
   public function validateForm(array &$form, array &$form_state) {
     // No validation.
   }
 
   /**
-   * Implements FormInterface::submitForm().
+   * {@inheritdoc}
    */
   public function submitForm(array &$form, array &$form_state) {
     $values = $form_state['values']['entities'];
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryListController.php b/core/modules/contact/lib/Drupal/contact/CategoryListController.php
index b96d5dd..f8e7b9b 100644
--- a/core/modules/contact/lib/Drupal/contact/CategoryListController.php
+++ b/core/modules/contact/lib/Drupal/contact/CategoryListController.php
@@ -15,11 +15,11 @@
 class CategoryListController extends ConfigEntityListController {
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityListController::getOperations().
+   * {@inheritdoc}
    */
   public function getOperations(EntityInterface $entity) {
     $operations = parent::getOperations($entity);
-    if (module_exists('field_ui')) {
+    if (\Drupal::moduleHandler()->moduleExists('field_ui')) {
       $uri = $entity->uri();
       $operations['manage-fields'] = array(
         'title' => t('Manage fields'),
@@ -38,7 +38,7 @@ public function getOperations(EntityInterface $entity) {
   }
 
   /**
-   * Overrides ConfigEntityListController::buildHeader().
+   * {@inheritdoc}
    */
   public function buildHeader() {
     $row = parent::buildHeader();
@@ -52,7 +52,7 @@ public function buildHeader() {
   }
 
   /**
-   * Overrides ConfigEntityListController::buildRow().
+   * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
     $default_category = config('contact.settings')->get('default_category');
diff --git a/core/modules/menu/lib/Drupal/menu/MenuListController.php b/core/modules/menu/lib/Drupal/menu/MenuListController.php
index 3a96339..8144283 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuListController.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuListController.php
@@ -15,7 +15,7 @@
 class MenuListController extends ConfigEntityListController {
 
   /**
-   * Overrides ConfigEntityListController::buildHeader().
+   * {@inheritdoc}
    */
   public function buildHeader() {
     $row = parent::buildHeader();
@@ -30,7 +30,7 @@ public function buildHeader() {
   }
 
   /**
-   * Overrides ConfigEntityListController::buildRow().
+   * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
     $row = parent::buildRow($entity);
@@ -40,7 +40,7 @@ public function buildRow(EntityInterface $entity) {
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityListController::getOperations();
+   * {@inheritdoc}
    */
   public function getOperations(EntityInterface $entity) {
     $operations = parent::getOperations($entity);
@@ -66,7 +66,7 @@ public function getOperations(EntityInterface $entity) {
   }
 
   /**
-   * Overrides ConfigEntityListController::render();
+   * {@inheritdoc}
    */
   public function render() {
     $build = parent::render();
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php
index 8627167..01d3bf5 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php
@@ -15,7 +15,7 @@
 class ShortcutListController extends ConfigEntityListController {
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityListController::getOperations().
+   * {@inheritdoc}
    */
   public function getOperations(EntityInterface $entity) {
     $operations = parent::getOperations($entity);