diff --git a/core/modules/block_content/block_content.links.action.yml b/core/modules/block_content/block_content.links.action.yml
index 735e374..44efc49 100644
--- a/core/modules/block_content/block_content.links.action.yml
+++ b/core/modules/block_content/block_content.links.action.yml
@@ -1,12 +1,12 @@
 block_content_type_add:
   route_name: block_content.type_add
-  title: 'Add custom block type'
+  title: 'Add block type'
   appears_on:
     - block_content.type_list
 
 block_content_add_action:
   route_name: block_content.add_page
-  title: 'Add custom block'
+  title: 'Add block'
   appears_on:
     - block.admin_display
     - block.admin_display_theme
diff --git a/core/modules/block_content/block_content.routing.yml b/core/modules/block_content/block_content.routing.yml
index 1628b89..c3b562d 100644
--- a/core/modules/block_content/block_content.routing.yml
+++ b/core/modules/block_content/block_content.routing.yml
@@ -10,7 +10,7 @@ block_content.add_page:
   path: '/block/add'
   defaults:
     _content: '\Drupal\block_content\Controller\BlockContentController::add'
-    _title: 'Add custom block'
+    _title: 'Add block'
   options:
     _admin_route: TRUE
   requirements:
diff --git a/core/modules/block_content/src/Tests/BlockContentListTest.php b/core/modules/block_content/src/Tests/BlockContentListTest.php
index 07a3299..2d3f3f2 100644
--- a/core/modules/block_content/src/Tests/BlockContentListTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentListTest.php
@@ -51,7 +51,7 @@ public function testListing() {
     $label = 'Antelope';
     $new_label = 'Albatross';
     // Add a new entity using the operations link.
-    $link_text = t('Add custom block');
+    $link_text = t('Add block');
     $this->assertLink($link_text);
     $this->clickLink($link_text);
     $this->assertResponse(200);
diff --git a/core/modules/block_content/src/Tests/BlockContentTypeTest.php b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
index e08942b..8bb16c3 100644
--- a/core/modules/block_content/src/Tests/BlockContentTypeTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
@@ -158,7 +158,7 @@ public function testsBlockContentAddTypes() {
         // block configure form.
         $path = $theme == $default_theme ? 'admin/structure/block' : "admin/structure/block/list/$theme";
         $this->drupalGet($path);
-        $this->clickLink(t('Add custom block'));
+        $this->clickLink(t('Add block'));
         // The seven theme has markup inside the link, we cannot use clickLink().
         if ($default_theme == 'seven') {
           $options = $theme != $default_theme ? array('query' => array('theme' => $theme)) : array();
@@ -187,7 +187,7 @@ public function testsBlockContentAddTypes() {
     // Test that adding a block from the 'custom blocks list' doesn't send you
     // to the block configure form.
     $this->drupalGet('admin/structure/block/block-content');
-    $this->clickLink(t('Add custom block'));
+    $this->clickLink(t('Add block'));
     $this->clickLink('foo');
     $edit = array('info[0][value]' => $this->randomMachineName(8));
     $this->drupalPostForm(NULL, $edit, t('Save'));