diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 97f1981..59d43f5 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -375,7 +375,7 @@ function entity_create($entity_type, array $values = array()) {
  *
  * @return \Drupal\Core\Entity\EntityStorageInterface
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getStorageController().
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
  *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
  *   Use \Drupal::entityManager()->getStorage().
diff --git a/core/modules/comment/lib/Drupal/comment/CommentManager.php b/core/modules/comment/lib/Drupal/comment/CommentManager.php
index 9625af2..3e6ed5a 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentManager.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentManager.php
@@ -153,7 +153,7 @@ public function addDefaultField($entity_type, $bundle, $field_name = 'comment',
     }
     // Make sure the instance doesn't already exist.
     if (!$this->fieldInfo->getInstance($entity_type, $bundle, $field_name)) {
-      $instance = $this->entityManager->getStorag('field_instance_config')->create(array(
+      $instance = $this->entityManager->getStorage('field_instance_config')->create(array(
         'label' => 'Comment settings',
         'description' => '',
         'field_name' => $field_name,
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 67b25fe..7353544 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1705,9 +1705,9 @@ function system_get_module_admin_tasks($module, $info) {
   if (\Drupal::moduleHandler()->implementsHook($module, 'permission')) {
     /** @var \Drupal\Core\Access\AccessManager $access_manager */
     $access_manager = \Drupal::service('access_manager');
-    /** @var \Drupal\menu_link\MenuLinkStorageControllerInterface $menu_link_storage_controller */
+    /** @var \Drupal\menu_link\MenuLinkStorageInterface $menu_link_storage_controller */
     $menu_link_storage_controller = \Drupal::entityManager()
-      ->getStorageController('menu_link');
+      ->getStorage('menu_link');
     if ($access_manager->checkNamedRoute('user.admin_permissions', array(), \Drupal::currentUser())) {
       $path = \Drupal::urlGenerator()
         ->getPathFromRoute('user.admin_permissions');