diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module
index 9c892de..318796d 100644
--- a/core/modules/block/custom_block/custom_block.module
+++ b/core/modules/block/custom_block/custom_block.module
@@ -16,10 +16,14 @@ function custom_block_help($path, $arg) {
     case 'admin/help#custom_block':
       return t('Allows the creation of custom blocks through the user interface.');
 
-    case 'admin/structure/custom-blocks/types':
+    case 'admin/structure/custom-blocks':
       $output = '<p>' . t('This page lists user-created blocks. These blocks are derived from block types. A block type can consist of different fields and display settings. From the block types tab you can manage these fields as well as create new block types.') . '</p>';
       return $output;
 
+    case 'admin/structure/custom-blocks/types':
+      $output = '<p>' . t('This page lists block types. A block type can consist of different fields and display settings. From here you can manage these fields as well as create new block types.') . '</p>';
+      return $output;
+
   }
 }
 
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php
index 217e7ae..d2429b6 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php
@@ -20,6 +20,7 @@ class CustomBlockListController extends EntityListController {
    */
   public function buildHeader() {
     $header = parent::buildHeader();
+    $header['label'] = t('Block description');
     unset($header['id']);
     return $header;
   }
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php
index f9b43c1..438b4f9 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php
@@ -51,7 +51,7 @@ public function testListing() {
     $this->assertEqual(count($elements), 2, 'Correct number of table header cells found.');
 
     // Test the contents of each th cell.
-    $expected_items = array(t('Label'), t('Operations'));
+    $expected_items = array(t('Block description'), t('Operations'));
     foreach ($elements as $key => $element) {
       $this->assertIdentical((string) $element[0], $expected_items[$key]);
     }