diff --git a/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php b/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
index 9405ab2..7c39f19 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
@@ -205,7 +205,7 @@ public function loadByProperties(array $values = array()) {
    * {@inheritdoc}
    */
   public function getQuery($conjunction = 'AND') {
-    return \Drupal::service($this->getQueryServicename())->get($this->entityType, $conjunction);
+    return \Drupal::entityQuery($this->getEntityTypeId(), $conjunction);
   }
 
 }
diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
index 2bb7236..d6720a7 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
@@ -9,7 +9,7 @@
 
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Entity\EntityFormController;
-use Drupal\Core\Entity\EntityStorageControllerInterface;
+use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Language\Language;
 use Drupal\menu_link\MenuLinkStorageControllerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -20,11 +20,11 @@
 class MenuFormController extends EntityFormController {
 
   /**
-   * The menu storage controller.
+   * The factory for entity queries.
    *
-   * @var \Drupal\Core\Entity\EntityStorageControllerInterface
+   * @var \Drupal\Core\Entity\Query\QueryFactory
    */
-  protected $menuStorage;
+  protected $entityQueryFactory;
 
   /**
    * The menu link storage controller.
@@ -43,13 +43,13 @@ class MenuFormController extends EntityFormController {
   /**
    * Constructs a MenuFormController object.
    *
-   * @param \Drupal\Core\Entity\EntityStorageControllerInterface $menu_storage
-   *   The menu storage controller.
+   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory
+   *   The factory for entity queries.
    * @param \Drupal\menu_link\MenuLinkStorageControllerInterface $menu_link_storage
    *   The menu link storage controller.
    */
-  public function __construct(EntityStorageControllerInterface $menu_storage, MenuLinkStorageControllerInterface $menu_link_storage) {
-    $this->menuStorage = $menu_storage;
+  public function __construct(QueryFactory $entity_query_factory, MenuLinkStorageControllerInterface $menu_link_storage) {
+    $this->entityQueryFactory = $entity_query_factory;
     $this->menuLinkStorage = $menu_link_storage;
   }
 
@@ -57,10 +57,9 @@ public function __construct(EntityStorageControllerInterface $menu_storage, Menu
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    $entity_manager = $container->get('entity.manager');
     return new static(
-      $entity_manager->getStorageController('menu'),
-      $entity_manager->getStorageController('menu_link')
+      $container->get('entity.query'),
+      $container->get('entity.manager')->getStorageController('menu_link')
     );
   }
 
@@ -152,12 +151,12 @@ public function form(array $form, array &$form_state) {
    */
   public function menuNameExists($value) {
     // Check first to see if a menu with this ID exists.
-    if ($this->menuStorage->getQuery()->condition('id', $value)->range(0, 1)->count()->execute()) {
+    if ($this->entityQueryFactory->get('menu')->condition('id', $value)->range(0, 1)->count()->execute()) {
       return TRUE;
     }
 
     // Check for a link assigned to this menu.
-    return $this->menuLinkStorage->getQuery()->condition('menu_name', $value)->range(0, 1)->count()->execute();
+    return $this->entityQueryFactory->get('menu_link')->condition('menu_name', $value)->range(0, 1)->count()->execute();
   }
 
   /**
@@ -245,7 +244,7 @@ protected function buildOverviewForm(array &$form, array &$form_state) {
     $form['#attached']['css'] = array(drupal_get_path('module', 'menu') . '/css/menu.admin.css');
 
     $links = array();
-    $query = $this->menuLinkStorage->getQuery()
+    $query = $this->entityQueryFactory->get('menu_link')
       ->condition('menu_name', $this->entity->id());
     for ($i = 1; $i <= MENU_MAX_DEPTH; $i++) {
       $query->sort('p' . $i, 'ASC');