diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 3b46049..407a45f 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -116,7 +116,7 @@ function block_menu() {
     'route_name' => 'block_admin_display',
   );
   $items['admin/structure/block/list'] = array(
-    'title' => 'Blocks',
+    'title' => 'Block layout',
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );
   $items['admin/structure/block/manage/%block'] = array(
diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module
index 4603f45..e324a3f 100644
--- a/core/modules/block/custom_block/custom_block.module
+++ b/core/modules/block/custom_block/custom_block.module
@@ -86,7 +86,7 @@ function custom_block_menu() {
   $items['admin/structure/block/custom-blocks/manage/%custom_block_type'] = array(
     'title' => 'Edit custom block type',
     'title callback' => 'entity_page_label',
-    'title arguments' => array(4),
+    'title arguments' => array(5),
     'route_name' => 'custom_block_type_edit',
   );
   $items['admin/structure/block/custom-blocks/manage/%custom_block_type/edit'] = array(
diff --git a/core/modules/block/custom_block/custom_block.routing.yml b/core/modules/block/custom_block/custom_block.routing.yml
index f3e7a79..0181101 100644
--- a/core/modules/block/custom_block/custom_block.routing.yml
+++ b/core/modules/block/custom_block/custom_block.routing.yml
@@ -58,6 +58,7 @@ custom_block_type_edit:
 custom_block_list:
   pattern: '/admin/structure/block/custom-blocks'
   defaults:
+    _title: 'Custom block library'
     _entity_list: 'custom_block'
   requirements:
     _permission: 'administer blocks'
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
index 404b436..94c8b9e 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
@@ -273,7 +273,7 @@ function testBlockModuleDisable() {
     $this->drupalGet('admin/structure/block');
     $this->assertResponse(200);
     // A 200 response is possible with a fatal error, so check the title too.
-    $this->assertTitle(t('Blocks | Drupal'));
+    $this->assertTitle(t('Block layout') . ' | Drupal');
 
     // Ensure that the disabled module's block instance is not listed.
     foreach ($regions as $region) {