diff --git a/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php b/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php
index 65f167c..669aae8 100644
--- a/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php
+++ b/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php
@@ -61,7 +61,7 @@ public function __construct(EntityTypeInterface $entity_type, EntityStorageInter
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header = array();
     if (!empty($this->weightKey)) {
       $header['weight'] = t('Weight');
@@ -72,7 +72,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row = array();
     if (!empty($this->weightKey)) {
       // Override default values to markup elements.
diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilder.php b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
index eee643b..b107a77 100644
--- a/core/lib/Drupal/Core/Entity/EntityListBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
@@ -138,7 +138,7 @@ protected function getDefaultOperations(EntityInterface $entity) {
    *
    * @see \Drupal\Core\Entity\EntityListBuilder::render()
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $row['operations'] = $this->t('Operations');
     return $row;
   }
@@ -154,7 +154,7 @@ public function buildHeader() {
    *
    * @see \Drupal\Core\Entity\EntityListBuilder::render()
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['operations']['data'] = $this->buildOperations($entity);
     return $row;
   }
@@ -170,7 +170,7 @@ public function buildRow(EntityInterface $entity) {
    *
    * @see \Drupal\Core\Entity\EntityListBuilder::buildRow()
    */
-  public function buildOperations(EntityInterface $entity) {
+  protected function buildOperations(EntityInterface $entity) {
     $build = array(
       '#type' => 'operations',
       '#links' => $this->getOperations($entity),
diff --git a/core/modules/action/src/ActionListBuilder.php b/core/modules/action/src/ActionListBuilder.php
index 2d3af86..2eabf47 100644
--- a/core/modules/action/src/ActionListBuilder.php
+++ b/core/modules/action/src/ActionListBuilder.php
@@ -78,7 +78,7 @@ public function load() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['type'] = $entity->getType();
     $row['label'] = $this->getLabel($entity);
     if ($this->hasConfigurableActions) {
@@ -90,7 +90,7 @@ public function buildRow(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header = array(
       'type' => t('Action type'),
       'label' => t('Label'),
diff --git a/core/modules/block_content/src/BlockContentListBuilder.php b/core/modules/block_content/src/BlockContentListBuilder.php
index 731f2da..6132f2f 100644
--- a/core/modules/block_content/src/BlockContentListBuilder.php
+++ b/core/modules/block_content/src/BlockContentListBuilder.php
@@ -20,7 +20,7 @@ class BlockContentListBuilder extends EntityListBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = t('Block description');
     return $header + parent::buildHeader();
   }
@@ -28,7 +28,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label'] = $this->getLabel($entity);
     return $row + parent::buildRow($entity);
   }
diff --git a/core/modules/block_content/src/BlockContentTypeListBuilder.php b/core/modules/block_content/src/BlockContentTypeListBuilder.php
index 6cfda1d..d5ca679 100644
--- a/core/modules/block_content/src/BlockContentTypeListBuilder.php
+++ b/core/modules/block_content/src/BlockContentTypeListBuilder.php
@@ -34,7 +34,7 @@ public function getDefaultOperations(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['type'] = t('Block type');
     $header['description'] = t('Description');
     return $header + parent::buildHeader();
@@ -43,7 +43,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['type'] = \Drupal::linkGenerator()->generateFromUrl($entity->label(), $entity->urlInfo());
     $row['description'] = Xss::filterAdmin($entity->description);
     return $row + parent::buildRow($entity);
diff --git a/core/modules/comment/src/CommentTypeListBuilder.php b/core/modules/comment/src/CommentTypeListBuilder.php
index 7f54ce9..9f8afbd 100644
--- a/core/modules/comment/src/CommentTypeListBuilder.php
+++ b/core/modules/comment/src/CommentTypeListBuilder.php
@@ -35,7 +35,7 @@ public function getDefaultOperations(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['type'] = t('Comment type');
     $header['description'] = t('Description');
     return $header + parent::buildHeader();
@@ -44,7 +44,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['type'] = String::checkPlain($entity->label());
     $row['description'] = Xss::filterAdmin($entity->getDescription());
     return $row + parent::buildRow($entity);
diff --git a/core/modules/config/src/Tests/ConfigEntityListTest.php b/core/modules/config/src/Tests/ConfigEntityListTest.php
index b0818b9..a77f2ee 100644
--- a/core/modules/config/src/Tests/ConfigEntityListTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityListTest.php
@@ -29,6 +29,7 @@ class ConfigEntityListTest extends WebTestBase {
    * Tests entity list builder methods.
    */
   function testList() {
+    /** @var \Drupal\Core\Entity\EntityListBuilderInterface $controller */
     $controller = \Drupal::entityManager()->getListBuilder('config_test');
 
     // Test getStorage() method.
@@ -65,16 +66,20 @@ function testList() {
     $this->assertIdentical($expected_operations, $actual_operations, 'The operations are identical.');
 
     // Test buildHeader() method.
+    $build = $controller->render();
     $expected_items = array(
       'label' => 'Label',
       'id' => 'Machine name',
       'operations' => 'Operations',
     );
-    $actual_items = $controller->buildHeader();
+    $actual_items = $build['#header'];
     $this->assertIdentical($expected_items, $actual_items, 'Return value from buildHeader matches expected.');
 
     // Test buildRow() method.
-    $build_operations = $controller->buildOperations($entity);
+    $build_operations = [
+      '#type' => 'operations',
+      '#links' => $controller->getOperations($entity),
+    ];
     $expected_items = array(
       'label' => 'Default',
       'id' => 'dotted.default',
@@ -82,8 +87,8 @@ function testList() {
         'data' => $build_operations,
       ),
     );
-    $actual_items = $controller->buildRow($entity);
-    $this->assertIdentical($expected_items, $actual_items, 'Return value from buildRow matches expected.');
+    $actual_items = reset($build['#rows']);
+    $this->assertEqual($expected_items, $actual_items, 'Return value from buildRow matches expected.');
     // Test sorting.
     $storage = $controller->getStorage();
     $entity = $storage->create(array(
diff --git a/core/modules/config/tests/config_test/src/ConfigTestListBuilder.php b/core/modules/config/tests/config_test/src/ConfigTestListBuilder.php
index 8634b96..96f402b 100644
--- a/core/modules/config/tests/config_test/src/ConfigTestListBuilder.php
+++ b/core/modules/config/tests/config_test/src/ConfigTestListBuilder.php
@@ -20,7 +20,7 @@ class ConfigTestListBuilder extends ConfigEntityListBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = t('Label');
     $header['id'] = t('Machine name');
     return $header + parent::buildHeader();
@@ -29,7 +29,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label'] = $this->getLabel($entity);
     $row['id'] = $entity->id();
     return $row + parent::buildRow($entity);
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php b/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
index 332f894..1566bce 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
@@ -60,7 +60,7 @@ public function getFilterLabels() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $theme = $entity->get('theme');
     $plugin_definition = $entity->getPlugin()->getPluginDefinition();
 
@@ -87,7 +87,7 @@ public function buildRow(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = $this->t('Block');
     $header['theme'] = $this->t('Theme');
     $header['category'] = $this->t('Category');
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php b/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
index 9d94468..fb005ed 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
@@ -66,7 +66,7 @@ public function render() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label']['data'] = $this->getLabel($entity);
     $row['label']['class'] = 'table-filter-text-source';
     return $row + parent::buildRow($entity);
@@ -75,7 +75,7 @@ public function buildRow(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = $this->t('Label');
     return $header + parent::buildHeader();
   }
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php b/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
index a046d3b..b5be46a 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
@@ -114,7 +114,7 @@ public function getFilterLabels() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label'] = array(
       'data' => $this->getLabel($entity),
       'class' => 'table-filter-text-source',
@@ -134,7 +134,7 @@ public function buildRow(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = $this->t('Field');
     if ($this->displayBundle()) {
       $header['bundle'] = $this->baseEntityInfo->getBundleLabel() ?: $this->t('Bundle');
diff --git a/core/modules/contact/src/ContactFormListBuilder.php b/core/modules/contact/src/ContactFormListBuilder.php
index 883ad9a..9c34fb4 100644
--- a/core/modules/contact/src/ContactFormListBuilder.php
+++ b/core/modules/contact/src/ContactFormListBuilder.php
@@ -21,7 +21,7 @@ class ContactFormListBuilder extends ConfigEntityListBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['form'] = t('Form');
     $header['recipients'] = t('Recipients');
     $header['selected'] = t('Selected');
@@ -31,7 +31,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['form'] = $this->getLabel($entity);
     // Special case the personal form.
     if ($entity->id() == 'personal') {
diff --git a/core/modules/field_ui/src/EntityDisplayModeListBuilder.php b/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
index f52d721..b148408 100644
--- a/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
+++ b/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
@@ -58,7 +58,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = t('Name');
     return $header + parent::buildHeader();
   }
@@ -66,7 +66,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label'] = $this->getLabel($entity);
     return $row + parent::buildRow($entity);
   }
diff --git a/core/modules/field_ui/src/FieldStorageConfigListBuilder.php b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
index 1eef291..d34e6bc 100644
--- a/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
+++ b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
@@ -84,7 +84,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['id'] = t('Field name');
     $header['type'] = array(
       'data' => t('Field type'),
@@ -97,7 +97,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $field) {
+  protected function buildRow(EntityInterface $field) {
     if ($field->locked) {
       $row['class'] = array('menu-disabled');
       $row['data']['id'] =  t('@field_name (Locked)', array('@field_name' => $field->name));
diff --git a/core/modules/filter/src/FilterFormatListBuilder.php b/core/modules/filter/src/FilterFormatListBuilder.php
index 0003cfa..ad457f9 100644
--- a/core/modules/filter/src/FilterFormatListBuilder.php
+++ b/core/modules/filter/src/FilterFormatListBuilder.php
@@ -82,7 +82,7 @@ public function load() {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = $this->t('Name');
     $header['roles'] = $this->t('Roles');
     return $header + parent::buildHeader();
@@ -91,7 +91,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     // Check whether this is the fallback text format. This format is available
     // to all roles and cannot be disabled via the admin interface.
     if ($entity->isFallbackFormat()) {
diff --git a/core/modules/image/src/ImageStyleListBuilder.php b/core/modules/image/src/ImageStyleListBuilder.php
index 73dfe6c..991ed4b 100644
--- a/core/modules/image/src/ImageStyleListBuilder.php
+++ b/core/modules/image/src/ImageStyleListBuilder.php
@@ -58,7 +58,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = $this->t('Style name');
     return $header + parent::buildHeader();
   }
@@ -66,7 +66,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label'] = $this->getLabel($entity);
     return $row + parent::buildRow($entity);
   }
diff --git a/core/modules/language/src/LanguageListBuilder.php b/core/modules/language/src/LanguageListBuilder.php
index c8dbe13..b1e2e24 100644
--- a/core/modules/language/src/LanguageListBuilder.php
+++ b/core/modules/language/src/LanguageListBuilder.php
@@ -60,7 +60,7 @@ public function getDefaultOperations(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = t('Name');
     return $header + parent::buildHeader();
   }
@@ -68,7 +68,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label'] = $this->getLabel($entity);
     return $row + parent::buildRow($entity);
   }
diff --git a/core/modules/menu_ui/src/MenuListBuilder.php b/core/modules/menu_ui/src/MenuListBuilder.php
index 4fdb298..040ccfb 100644
--- a/core/modules/menu_ui/src/MenuListBuilder.php
+++ b/core/modules/menu_ui/src/MenuListBuilder.php
@@ -22,7 +22,7 @@ class MenuListBuilder extends ConfigEntityListBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['title'] = t('Title');
     $header['description'] = array(
       'data' => t('Description'),
@@ -34,7 +34,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['title'] = array(
       'data' => $this->getLabel($entity),
       'class' => array('menu-label'),
diff --git a/core/modules/node/src/NodeListBuilder.php b/core/modules/node/src/NodeListBuilder.php
index c78915d..cfac5f6 100644
--- a/core/modules/node/src/NodeListBuilder.php
+++ b/core/modules/node/src/NodeListBuilder.php
@@ -60,7 +60,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     // Enable language column and filter if multiple languages are added.
     $header = array(
       'title' => $this->t('Title'),
@@ -90,7 +90,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     /** @var \Drupal\node\NodeInterface $entity */
     $mark = array(
       '#theme' => 'mark',
diff --git a/core/modules/node/src/NodeTypeListBuilder.php b/core/modules/node/src/NodeTypeListBuilder.php
index 779672a..2e5821e 100644
--- a/core/modules/node/src/NodeTypeListBuilder.php
+++ b/core/modules/node/src/NodeTypeListBuilder.php
@@ -59,7 +59,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['title'] = t('Name');
     $header['description'] = array(
       'data' => t('Description'),
@@ -71,7 +71,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['title'] = array(
       'data' => $this->getLabel($entity),
       'class' => array('menu-label'),
diff --git a/core/modules/responsive_image/src/ResponsiveImageMappingListBuilder.php b/core/modules/responsive_image/src/ResponsiveImageMappingListBuilder.php
index b12fb61..9a98f44 100644
--- a/core/modules/responsive_image/src/ResponsiveImageMappingListBuilder.php
+++ b/core/modules/responsive_image/src/ResponsiveImageMappingListBuilder.php
@@ -18,7 +18,7 @@ class ResponsiveImageMappingListBuilder extends ConfigEntityListBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = t('Label');
     $header['id'] = t('Machine name');
     return $header + parent::buildHeader();
@@ -27,7 +27,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label'] = $this->getLabel($entity);
     $row['id'] = $entity->id();
     return $row + parent::buildRow($entity);
diff --git a/core/modules/search/src/SearchPageListBuilder.php b/core/modules/search/src/SearchPageListBuilder.php
index 5e6f1b5..76c05db 100644
--- a/core/modules/search/src/SearchPageListBuilder.php
+++ b/core/modules/search/src/SearchPageListBuilder.php
@@ -84,7 +84,7 @@ public function getFormID() {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = array(
       'data' => $this->t('Label'),
     );
@@ -109,7 +109,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     /** @var $entity \Drupal\search\SearchPageInterface */
     $row['label'] = $this->getLabel($entity);
     $row['url']['#markup'] = 'search/' . $entity->getPath();
diff --git a/core/modules/shortcut/src/ShortcutSetListBuilder.php b/core/modules/shortcut/src/ShortcutSetListBuilder.php
index 907f470..39ec598 100644
--- a/core/modules/shortcut/src/ShortcutSetListBuilder.php
+++ b/core/modules/shortcut/src/ShortcutSetListBuilder.php
@@ -20,7 +20,7 @@ class ShortcutSetListBuilder extends ConfigEntityListBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['name'] = t('Name');
     return $header + parent::buildHeader();
   }
@@ -44,7 +44,7 @@ public function getDefaultOperations(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['name'] = $this->getLabel($entity);
     return $row + parent::buildRow($entity);
   }
diff --git a/core/modules/system/src/DateFormatListBuilder.php b/core/modules/system/src/DateFormatListBuilder.php
index ba7511b..3431906 100644
--- a/core/modules/system/src/DateFormatListBuilder.php
+++ b/core/modules/system/src/DateFormatListBuilder.php
@@ -58,7 +58,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['id'] = t('Machine name');
     $header['label'] = t('Name');
     $header['pattern'] = t('Pattern');
@@ -68,7 +68,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     if ($entity->isLocked()) {
       $row['id'] =  $this->t('@entity_id (locked)', array('@entity_id' => $entity->id()));
     }
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestListBuilder.php b/core/modules/system/tests/modules/entity_test/src/EntityTestListBuilder.php
index 1fbc8a1..9bac7cd 100644
--- a/core/modules/system/tests/modules/entity_test/src/EntityTestListBuilder.php
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestListBuilder.php
@@ -20,7 +20,7 @@ class EntityTestListBuilder extends EntityListBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = t('Label');
     $header['id'] = t('Machine name');
     return $header + parent::buildHeader();
@@ -29,7 +29,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label'] = $this->getLabel($entity);
     $row['id'] = $entity->id();
     return $row + parent::buildRow($entity);
diff --git a/core/modules/taxonomy/src/VocabularyListBuilder.php b/core/modules/taxonomy/src/VocabularyListBuilder.php
index 056c073..541d9a4 100644
--- a/core/modules/taxonomy/src/VocabularyListBuilder.php
+++ b/core/modules/taxonomy/src/VocabularyListBuilder.php
@@ -56,7 +56,7 @@ public function getDefaultOperations(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = t('Vocabulary name');
     return $header + parent::buildHeader();
   }
@@ -64,7 +64,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label'] = $this->getLabel($entity);
     return $row + parent::buildRow($entity);
   }
diff --git a/core/modules/user/src/RoleListBuilder.php b/core/modules/user/src/RoleListBuilder.php
index 8e7feec..d9dca3f 100644
--- a/core/modules/user/src/RoleListBuilder.php
+++ b/core/modules/user/src/RoleListBuilder.php
@@ -28,7 +28,7 @@ public function getFormId() {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header['label'] = t('Name');
     return $header + parent::buildHeader();
   }
@@ -36,7 +36,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['label'] = $this->getLabel($entity);
     return $row + parent::buildRow($entity);
   }
diff --git a/core/modules/user/src/UserListBuilder.php b/core/modules/user/src/UserListBuilder.php
index 667ba4f..52db7ff 100644
--- a/core/modules/user/src/UserListBuilder.php
+++ b/core/modules/user/src/UserListBuilder.php
@@ -82,7 +82,7 @@ public function load() {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     $header = array(
       'username' => array(
         'data' => $this->t('Username'),
@@ -119,7 +119,7 @@ public function buildHeader() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $entity) {
+  protected function buildRow(EntityInterface $entity) {
     $row['username']['data'] = array(
       '#theme' => 'username',
       '#account' => $entity,
diff --git a/core/modules/views_ui/src/ViewListBuilder.php b/core/modules/views_ui/src/ViewListBuilder.php
index 16b5b84..cd7452a 100644
--- a/core/modules/views_ui/src/ViewListBuilder.php
+++ b/core/modules/views_ui/src/ViewListBuilder.php
@@ -79,7 +79,7 @@ public function load() {
   /**
    * {@inheritdoc}
    */
-  public function buildRow(EntityInterface $view) {
+  protected function buildRow(EntityInterface $view) {
     $row = parent::buildRow($view);
     $display_paths = '';
     $separator = '';
@@ -114,7 +114,7 @@ public function buildRow(EntityInterface $view) {
   /**
    * {@inheritdoc}
    */
-  public function buildHeader() {
+  protected function buildHeader() {
     return array(
       'view_name' => array(
         'data' => $this->t('View name'),
diff --git a/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php b/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
index bcc03ff..cc16db2 100644
--- a/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
+++ b/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
@@ -144,7 +144,7 @@ public function testBuildRowEntityList() {
 
 class TestViewListBuilder extends ViewListBuilder {
 
-  public function buildOperations(EntityInterface $entity) {
+  protected function buildOperations(EntityInterface $entity) {
     return array();
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
index 7e2fce4..93600fc 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
@@ -198,7 +198,7 @@ public function providerTestBuildRow() {
 }
 
 class TestEntityListBuilder extends EntityTestListBuilder {
-  public function buildOperations(EntityInterface $entity) {
+  protected function buildOperations(EntityInterface $entity) {
     return array();
   }
 }