diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php
index e1c6ace..6f90e56 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php
@@ -98,6 +98,9 @@ public function postSave(EntityStorageControllerInterface $storage_controller, $
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public static function postDelete(EntityStorageControllerInterface $storage_controller, array $entities) {
     foreach ($entities as $entity) {
       entity_invoke_bundle_hook('delete', 'custom_block', $entity->id());
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php
index c76b76c..3fb408f 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php
@@ -20,6 +20,7 @@
    * executed during deletion.
    *
    * @param bool $value
+   *   TRUE if reparenting should be allowed, FALSE if it should be prevented.
    */
   public function setPreventReparenting($value = FALSE);
 
@@ -28,6 +29,7 @@ public function setPreventReparenting($value = FALSE);
    * executed during deletion.
    *
    * @return bool
+   *   TRUE if reparenting is allowed, FALSE if it is prevented.
    */
   public function getPreventReparenting();
 
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageController.php
index 95d95bb..a7150b1 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageController.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageController.php
@@ -29,7 +29,6 @@ protected function attachLoad(&$queried_entities, $revision_id = FALSE) {
     }
   }
 
-
   /**
    * {@inheritdoc}
    */
@@ -55,7 +54,7 @@ public function assignUser($shortcut_set, $account) {
   /**
    * {@inheritdoc}
    */
-  public function unAssignUser($account) {
+  public function unassignUser($account) {
     $deleted = db_delete('shortcut_set_users')
       ->condition('uid', $account->uid)
       ->execute();
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageControllerInterface.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageControllerInterface.php
index 77e2e4a..e951620 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageControllerInterface.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageControllerInterface.php
@@ -38,7 +38,7 @@ public function assignUser($shortcut_set, $account);
    *   successfully removed from it. FALSE if the user was already not assigned
    *   to any set.
    */
-  public function unAssignUser($account);
+  public function unassignUser($account);
 
   /**
    * Delete shortcut sets assigned to users.
@@ -49,7 +49,7 @@ public function unAssignUser($account);
   public function deleteAssignedShortcutSets(Shortcut $entity);
 
   /**
-   * Get the set name assigned to this user.
+   * Get the name of the set assigned to this user.
    *
    * @param \Drupal\user\Plugin\Core\Entity\User
    *   The user account.
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 7699958..bd23686 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -332,7 +332,7 @@ function shortcut_set_assign_user($shortcut_set, $account) {
 function shortcut_set_unassign_user($account) {
   return (bool) Drupal::entityManager()
     ->getStorageController('shortcut')
-    ->unAssignUser($account);
+    ->unassignUser($account);
 }
 
 /**