diff --git a/core/modules/block_content/src/Tests/BlockContentTestBase.php b/core/modules/block_content/src/Tests/BlockContentTestBase.php
index 0055867..a7c401d 100644
--- a/core/modules/block_content/src/Tests/BlockContentTestBase.php
+++ b/core/modules/block_content/src/Tests/BlockContentTestBase.php
@@ -44,19 +44,19 @@
   public static $modules = array('block', 'block_content');
 
   /**
-   * Whether or not to create an initial block type.
+   * Whether or not to auto-create the basic block type during setup.
    *
    * @var bool
    */
-  protected $createInitialBlockType = TRUE;
+  protected $autoCreateBasicBlockType = TRUE;
 
   /**
    * Sets the test up.
    */
   protected function setUp() {
     parent::setUp();
-    if ($this->createInitialBlockType) {
-      $this->createInitialBlockType();
+    if ($this->autoCreateBasicBlockType) {
+      $this->createBasicBlockType();
     }
 
     $this->adminUser = $this->drupalCreateUser($this->permissions);
@@ -106,10 +106,10 @@ protected function createBlockContentType($label) {
   }
 
   /**
-   * Creates the block-type found in the standard profile.
+   * Creates the basic block-type.
    */
-  protected function createInitialBlockType() {
-    // Ensure the basic bundle exists. This is provided by the standard profile.
+  protected function createBasicBlockType() {
+    // Ensure the basic bundle exists.
     $block_content_type = $this->createBlockContentType('basic');
     block_content_add_body_field($block_content_type->id());
   }
diff --git a/core/modules/block_content/src/Tests/BlockContentTypeTest.php b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
index 6361ab0..b3cec58 100644
--- a/core/modules/block_content/src/Tests/BlockContentTypeTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
@@ -37,7 +37,7 @@ class BlockContentTypeTest extends BlockContentTestBase {
    *
    * @var bool
    */
-  protected $createInitialBlockType = FALSE;
+  protected $autoCreateBasicBlockType = FALSE;
 
   /**
    * Tests creating a block type programmatically and via a form.
@@ -51,7 +51,7 @@ public function testBlockContentTypeCreation() {
     $this->assertResponse(200);
     $this->assertText('You have not created any block types yet');
     // Now create an initial block-type.
-    $this->createInitialBlockType();
+    $this->createBasicBlockType();
     // Create a block type programmaticaly.
     $type = $this->createBlockContentType('other');
 
@@ -83,7 +83,7 @@ public function testBlockContentTypeCreation() {
    */
   public function testBlockContentTypeEditing() {
     // Now create an initial block-type.
-    $this->createInitialBlockType();
+    $this->createBasicBlockType();
 
     $this->drupalLogin($this->adminUser);
     // We need two block types to prevent /block/add redirecting.
@@ -123,7 +123,7 @@ public function testBlockContentTypeEditing() {
    */
   public function testBlockContentTypeDeletion() {
     // Now create an initial block-type.
-    $this->createInitialBlockType();
+    $this->createBasicBlockType();
 
     // Create a block type programmatically.
     $type = $this->createBlockContentType('foo');
@@ -156,7 +156,7 @@ public function testBlockContentTypeDeletion() {
    */
   public function testsBlockContentAddTypes() {
     // Now create an initial block-type.
-    $this->createInitialBlockType();
+    $this->createBasicBlockType();
 
     $this->drupalLogin($this->adminUser);
     // Create two block types programmatically.