diff -u b/core/modules/block_content/lib/Drupal/block_content/Tests/BlockContentTypeTest.php b/core/modules/block_content/lib/Drupal/block_content/Tests/BlockContentTypeTest.php
--- b/core/modules/block_content/lib/Drupal/block_content/Tests/BlockContentTypeTest.php
+++ b/core/modules/block_content/lib/Drupal/block_content/Tests/BlockContentTypeTest.php
@@ -61,7 +61,7 @@
       'id' => 'foo',
       'label' => 'title for foo',
     );
-    $this->drupalPostForm('admin/structure/block/block-contentents/types/add', $edit, t('Save'));
+    $this->drupalPostForm('admin/structure/block/block-content/types/add', $edit, t('Save'));
     $block_type = entity_load('block_content_type', 'foo');
     $this->assertTrue($block_type, 'The new block type has been created.');
 
@@ -90,7 +90,7 @@
     $edit = array(
       'label' => 'Bar',
     );
-    $this->drupalPostForm('admin/structure/block/block-contentents/manage/basic', $edit, t('Save'));
+    $this->drupalPostForm('admin/structure/block/block-content/manage/basic', $edit, t('Save'));
     field_info_cache_clear();
 
     $this->drupalGet('block/add');
@@ -99,9 +99,9 @@
     $this->assertEqual(url('block/add/basic', array('absolute' => TRUE)), $this->getUrl(), 'Original machine name was used in URL.');
 
     // Remove the body field.
-    $this->drupalPostForm('admin/structure/block/block-contentents/manage/basic/fields/block_content.basic.body/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/block/block-content/manage/basic/fields/block_content.basic.body/delete', array(), t('Delete'));
     // Resave the settings for this type.
-    $this->drupalPostForm('admin/structure/block/block-contentents/manage/basic', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/block/block-content/manage/basic', array(), t('Save'));
     // Check that the body field doesn't exist.
     $this->drupalGet('block/add/basic');
     $this->assertNoRaw('Body', 'Body field was not found.');
@@ -119,7 +119,7 @@
     // Add a new block of this type.
     $block = $this->createBlockContent(FALSE, 'foo');
     // Attempt to delete the block type, which should not be allowed.
-    $this->drupalGet('admin/structure/block/block-contentents/manage/' . $type->id() . '/delete');
+    $this->drupalGet('admin/structure/block/block-content/manage/' . $type->id() . '/delete');
     $this->assertRaw(
       t('%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.', array('%label' => $type->label())),
       'The block type will not be deleted until all blocks of that type are removed.'
@@ -129,7 +129,7 @@
     // Delete the block.
     $block->delete();
     // Attempt to delete the block type, which should now be allowed.
-    $this->drupalGet('admin/structure/block/block-contentents/manage/' . $type->id() . '/delete');
+    $this->drupalGet('admin/structure/block/block-content/manage/' . $type->id() . '/delete');
     $this->assertRaw(
       t('Are you sure you want to delete %type?', array('%type' => $type->id())),
       'The block type is available for deletion.'
@@ -196,14 +196,14 @@
 
     // 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-contentents');
+    $this->drupalGet('admin/structure/block/block-content');
     $this->clickLink(t('Add custom block'));
     $this->clickLink('foo');
     $edit = array('info[0][value]' => $this->randomName(8));
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $blocks = $storage->loadByProperties(array('info' => $edit['info[0][value]']));
     if (!empty($blocks)) {
-      $destination = 'admin/structure/block/block-contentents';
+      $destination = 'admin/structure/block/block-content';
       $this->assertUrl(url($destination, array('absolute' => TRUE)));
     }
     else {
diff -u b/core/modules/block_content/tests/Drupal/block_contents/Tests/Menu/BlockContentLocalTasksTest.php b/core/modules/block_content/tests/Drupal/block_contents/Tests/Menu/BlockContentLocalTasksTest.php
--- b/core/modules/block_content/tests/Drupal/block_contents/Tests/Menu/BlockContentLocalTasksTest.php
+++ b/core/modules/block_content/tests/Drupal/block_contents/Tests/Menu/BlockContentLocalTasksTest.php
@@ -28,7 +28,7 @@
   public function setUp() {
     $this->directoryList = array(
       'block' => 'core/modules/block',
-      'block_content' => 'core/modules/block/block_content',
+      'block_content' => 'core/modules/block_content',
     );
     parent::setUp();
   }
diff -u b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCustomBlockTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCustomBlockTest.php
--- b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCustomBlockTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateCustomBlockTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\Core\Language\Language;
-use Drupal\block_content\Entity\CustomBlock;
+use Drupal\block_content\Entity\BlockContent;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
 
@@ -24,7 +24,7 @@
    */
   public static function getInfo() {
     return array(
-      'name'  => 'Migrate custom blocks.',
+      'name'  => 'Migrate custom blocks',
       'description'  => 'Upgrade custom blocks.',
       'group' => 'Migrate Drupal',
     );
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml
@@ -14,6 +14,6 @@ process:
     source: format
   'body.value': body
 destination:
-  plugin: entity:custom_block
+  plugin: entity:block_content
 migration_dependencies:
   - d6_filter_format