diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module
index bfe5a3963488fd94a4ff149416d84e50df909e53..620611c048eba7e06e5a1387c5cf3a2c329d52d6 100644
--- a/core/modules/block/custom_block/custom_block.module
+++ b/core/modules/block/custom_block/custom_block.module
@@ -107,12 +107,12 @@ function custom_block_entity_bundle_info() {
  * @param string $block_type_id
  *   Id of the block type.
  * @param string $label
- *   (optional) The label for the body instance. Defaults to 'Block body'
+ *   (optional) The label for the body instance. Defaults to 'Body'
  *
  * @return array()
  *   Body field instance.
  */
-function custom_block_add_body_field($block_type_id, $label = 'Block body') {
+function custom_block_add_body_field($block_type_id, $label = 'Body') {
   // Add or remove the body field, as needed.
   $field = field_info_field('custom_block', 'body');
   $instance = field_info_instance('custom_block', 'body', $block_type_id);
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php
index 739f234256036c631c4fead819043c7b70c5f5a1..b24bfaaad2f8b419b36fefd7fc089d7e7e6c4fa6 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php
@@ -79,12 +79,12 @@ public function testCustomBlockTypeEditing() {
     $this->createCustomBlockType('other');
 
     $instance = field_info_instance('custom_block', 'body', 'basic');
-    $this->assertEqual($instance->getLabel(), 'Block body', 'Body field was found.');
+    $this->assertEqual($instance->getLabel(), 'Body', 'Body field was found.');
 
     // Verify that title and body fields are displayed.
     $this->drupalGet('block/add/basic');
     $this->assertRaw('Block description', 'Block info field was found.');
-    $this->assertRaw('Block body', 'Body field was found.');
+    $this->assertRaw('Body', 'Body field was found.');
 
     // Change the block type name.
     $edit = array(
@@ -104,7 +104,7 @@ public function testCustomBlockTypeEditing() {
     $this->drupalPostForm('admin/structure/block/custom-blocks/manage/basic', array(), t('Save'));
     // Check that the body field doesn't exist.
     $this->drupalGet('block/add/basic');
-    $this->assertNoRaw('Block body', 'Body field was not found.');
+    $this->assertNoRaw('Body', 'Body field was not found.');
   }
 
   /**