diff --git a/core/modules/block_content/src/BlockContentForm.php b/core/modules/block_content/src/BlockContentForm.php
index 769a7f3..878698f 100644
--- a/core/modules/block_content/src/BlockContentForm.php
+++ b/core/modules/block_content/src/BlockContentForm.php
@@ -14,6 +14,7 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\block_content\Entity\BlockContentType;
 
 /**
  * Form controller for the custom block edit forms.
@@ -80,7 +81,7 @@ public static function create(ContainerInterface $container) {
   protected function prepareEntity() {
     $block = $this->entity;
     // Set up default values, if required.
-    $block_type = entity_load('block_content_type', $block->bundle());
+    $block_type = BlockContentType::load($block->bundle());
     if (!$block->isNew()) {
       $block->setRevisionLog(NULL);
     }
diff --git a/core/modules/block_content/src/BlockContentTranslationHandler.php b/core/modules/block_content/src/BlockContentTranslationHandler.php
index ca7a6d9..29975d3 100644
--- a/core/modules/block_content/src/BlockContentTranslationHandler.php
+++ b/core/modules/block_content/src/BlockContentTranslationHandler.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\content_translation\ContentTranslationHandler;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\block_content\Entity\BlockContentType;
 
 /**
  * Defines the translation handler for custom blocks.
@@ -37,7 +38,7 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
    * {@inheritdoc}
    */
   protected function entityFormTitle(EntityInterface $entity) {
-    $block_type = entity_load('block_content_type', $entity->bundle());
+    $block_type = BlockContentType::load($entity->bundle());
     return t('<em>Edit @type</em> @title', array('@type' => $block_type->label(), '@title' => $entity->label()));
   }
 
diff --git a/core/modules/block_content/src/Plugin/Derivative/BlockContent.php b/core/modules/block_content/src/Plugin/Derivative/BlockContent.php
index 54ec325..0b68c51 100644
--- a/core/modules/block_content/src/Plugin/Derivative/BlockContent.php
+++ b/core/modules/block_content/src/Plugin/Derivative/BlockContent.php
@@ -8,6 +8,7 @@
 namespace Drupal\block_content\Plugin\Derivative;
 
 use Drupal\Component\Plugin\Derivative\DeriverBase;
+use Drupal\block_content\Entity\BlockContent as BlockContentEntity;
 
 /**
  * Retrieves block plugin definitions for all custom blocks.
@@ -17,7 +18,7 @@ class BlockContent extends DeriverBase {
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    $block_contents = entity_load_multiple('block_content');
+    $block_contents = BlockContentEntity::loadMultiple();
     /** @var $block_content \Drupal\block_content\Entity\BlockContent */
     foreach ($block_contents as $block_content) {
       $this->derivatives[$block_content->uuid()] = $base_plugin_definition;
diff --git a/core/modules/block_content/src/Tests/BlockContentCreationTest.php b/core/modules/block_content/src/Tests/BlockContentCreationTest.php
index 0262dd4..8d52cc0 100644
--- a/core/modules/block_content/src/Tests/BlockContentCreationTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentCreationTest.php
@@ -169,7 +169,7 @@ public function testBlockDelete() {
       'settings[label]' => $edit['info[0][value]'],
       'region' => 'sidebar_first',
     );
-    $block = entity_load('block_content', 1);
+    $block = BlockContent::load(1);
     $url = 'admin/structure/block/add/block_content:' . $block->uuid() . '/' . \Drupal::config('system.theme')->get('default');
     $this->drupalPostForm($url, $instance, t('Save block'));
 
@@ -223,7 +223,7 @@ public function testConfigDependencies() {
       'settings[label]' => $block->label(),
       'region' => 'sidebar_first',
     );
-    $block = entity_load('block_content', 1);
+    $block = BlockContent::load(1);
     $url = 'admin/structure/block/add/block_content:' . $block->uuid() . '/' . \Drupal::config('system.theme')->get('default');
     $this->drupalPostForm($url, $instance, t('Save block'));
 
diff --git a/core/modules/block_content/src/Tests/BlockContentFieldTest.php b/core/modules/block_content/src/Tests/BlockContentFieldTest.php
index 4fc7bf6..f20fabc 100644
--- a/core/modules/block_content/src/Tests/BlockContentFieldTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentFieldTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\block_content\Tests;
 use Drupal\Component\Utility\Unicode;
+use Drupal\block_content\Entity\BlockContent;
 
 /**
  * Tests block fieldability.
@@ -90,7 +91,7 @@ public function testBlockFields() {
       $this->fieldStorage->getName() . '[0][title]' => 'Example.com'
     );
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $block = entity_load('block_content', 1);
+    $block = BlockContent::load(1);
     $url = 'admin/structure/block/add/block_content:' . $block->uuid() . '/' . \Drupal::config('system.theme')->get('default');
     // Place the block.
     $instance = array(
diff --git a/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php b/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php
index 79233f3..4815dbc 100644
--- a/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\block_content\Tests;
+use Drupal\block_content\Entity\BlockContent;
 
 /**
  * Create a block with revisions.
@@ -88,7 +89,7 @@ public function testRevisions() {
 
     // Verify that the non-default revision id is greater than the default
     // revision id.
-    $default_revision = entity_load('block_content', $loaded->id());
+    $default_revision = BlockContent::load($loaded->id());
     $this->assertTrue($loaded->getRevisionId() > $default_revision->getRevisionId(), 'Revision id is greater than default revision id.');
   }
 
diff --git a/core/modules/block_content/src/Tests/BlockContentTypeTest.php b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
index 76dfdb7..7042737 100644
--- a/core/modules/block_content/src/Tests/BlockContentTypeTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
@@ -6,7 +6,7 @@
  */
 
 namespace Drupal\block_content\Tests;
-
+use Drupal\block_content\Entity\BlockContentType;
 /**
  * Ensures that custom block type functions work correctly.
  *
@@ -38,7 +38,7 @@ public function testBlockContentTypeCreation() {
     // Create a block type programmaticaly.
     $type = $this->createBlockContentType('other');
 
-    $block_type = entity_load('block_content_type', 'other');
+    $block_type = BlockContentType::load('other');
     $this->assertTrue($block_type, 'The new block type has been created.');
 
     // Login a test user.
@@ -53,7 +53,7 @@ public function testBlockContentTypeCreation() {
       'label' => 'title for foo',
     );
     $this->drupalPostForm('admin/structure/block/block-content/types/add', $edit, t('Save'));
-    $block_type = entity_load('block_content_type', 'foo');
+    $block_type = BlockContentType::load('foo');
     $this->assertTrue($block_type, 'The new block type has been created.');
 
     // Check that the block type was created in site default language.
diff --git a/core/modules/block_content/src/Tests/PageEditTest.php b/core/modules/block_content/src/Tests/PageEditTest.php
index 3577547..579bb5a 100644
--- a/core/modules/block_content/src/Tests/PageEditTest.php
+++ b/core/modules/block_content/src/Tests/PageEditTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\block_content\Tests;
 use Drupal\Component\Utility\Unicode;
+use Drupal\block_content\Entity\BlockContent;
 
 /**
  * Create a block and test block edit functionality.
@@ -31,7 +32,7 @@ public function testPageEdit() {
 
     // Check that the block exists in the database.
     $blocks = \Drupal::entityQuery('block_content')->condition('info', $edit['info[0][value]'])->execute();
-    $block = entity_load('block_content', reset($blocks));
+    $block = BlockContent::load(reset($blocks));
     $this->assertTrue($block, 'Custom block found in database.');
 
     // Load the edit page.
@@ -55,7 +56,7 @@ public function testPageEdit() {
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Ensure that the block revision has been created.
-    $revised_block = entity_load('block_content', $block->id(), TRUE);
+    $revised_block = BlockContent::load($block->id());
     $this->assertNotIdentical($block->getRevisionId(), $revised_block->getRevisionId(), 'A new revision has been created.');
 
     // Test deleting the block.