diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
index 89a47bc..163d98a 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
@@ -17,7 +17,7 @@
   /**
    * The block ID.
    */
-  public function getId();
+  public function id();
 
   /**
    * The revision ID.
@@ -25,24 +25,14 @@ public function getId();
   public function getRevisionId();
 
   /**
-   * Checks if is the default revision.
-   */
-  public function isDefaultRevision();
-
-  /**
    * The block UUID.
    */
-  public function getUuid();
+  public function uuid();
 
   /**
    * The custom block type (bundle).
    */
-  public function getType();
-
-  /**
-   * The block language code.
-   */
-  public function getLangcode();
+  public function bundle();
 
   /**
    * The block description.
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
index 8765757..aa27f88 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
@@ -53,7 +53,7 @@ class CustomBlock extends EntityNG implements CustomBlockInterface {
   /**
    * {@inheritdoc}
    */
-  public function getId() {
+  public function id() {
     return $this->get('id')->value;
   }
 
@@ -67,37 +67,20 @@ public function getRevisionId() {
   /**
    * {@inheritdoc}
    */
-  public function isDefaultRevision() {
-    if (!isset($this->get('isDefaultRevision')->value)) {
-      return TRUE;
-    }
-    return $this->get('isDefaultRevision')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUuid() {
+  public function uuid() {
     return $this->get('uuid')->value;
   }
 
   /**
    * {@inheritdoc}
    */
-  public function getType() {
+  public function bundle() {
     return $this->get('type')->value;
   }
 
   /**
    * {@inheritdoc}
    */
-  public function getLangcode() {
-     return $this->get('langcode')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function getInfo() {
     return $this->get('info')->value;
   }
@@ -169,7 +152,7 @@ public function postSave(EntityStorageControllerInterface $storage_controller, $
    * {@inheritdoc}
    */
   public function getInstances() {
-    return entity_load_multiple_by_properties('block', array('plugin' => 'custom_block:' . $this->uuid->value));
+    return entity_load_multiple_by_properties('block', array('plugin' => 'custom_block:' . $this->uuid()));
   }
 
   /**