diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc
index c141b8c..98dc665 100644
--- a/core/modules/aggregator/aggregator.pages.inc
+++ b/core/modules/aggregator/aggregator.pages.inc
@@ -105,9 +105,9 @@ function aggregator_page_category_form($form, $form_state, $category) {
  * @param int $limit
  *   (optional) The number of records to return. Defaults to 20.
  *
- * @deprecated Use \Drupal\aggregator\ItemStorageController::loadFeedItems() for
- *   loading all feed items, \Drupal\aggregator\ItemStorageController::loadFeedItemsBySource()
- *   for loading feed items filtered by the source feed, and \Drupal\aggregator\ItemStorageController::loadFeedItemsByCategory()
+ * @deprecated Use \Drupal\aggregator\ItemStorageController::loadAll() for
+ *   loading all feed items, \Drupal\aggregator\ItemStorageController::loadByFeed()
+ *   for loading feed items filtered by the source feed, and \Drupal\aggregator\ItemStorageController::loadByCategory()
  *   for loading feed items filtered by the feed category.
  *
  * @return \Drupal\aggregator\ItemInterface[]
@@ -117,13 +117,13 @@ function aggregator_load_feed_items($type, $data = NULL, $limit = 20) {
   $storage_controller = Drupal::entityManager()->getStorageController('aggregator_item');
   switch ($type) {
     case 'sum':
-      return $storage_controller->loadFeedItems($limit);
+      return $storage_controller->loadAll($limit);
 
     case 'source':
-      return $storage_controller->loadFeedItemsBySource($data->id(), $limit);
+      return $storage_controller->loadByFeed($data->id(), $limit);
 
     case 'category':
-      return $storage_controller->loadFeedItemsByCategory($data->cid, $limit);
+      return $storage_controller->loadByCategory($data->cid, $limit);
   }
 }
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
index cd264b6..31f4a97 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
@@ -117,7 +117,7 @@ public function saveCategories(Item $item) {
   /**
    * {@inheritdoc}
    */
-  public function loadFeedItems($limit = 20) {
+  public function loadAll($limit = 20) {
     $query = $this->database->select('aggregator_item', 'i');
     $query->join('aggregator_feed', 'f', 'i.fid = f.fid');
     $query->fields('i', array('iid'));
@@ -127,7 +127,7 @@ public function loadFeedItems($limit = 20) {
   /**
    * {@inheritdoc}
    */
-  public function loadFeedItemsBySource($fid, $limit = 20) {
+  public function loadByFeed($fid, $limit = 20) {
     $query = $this->database->select('aggregator_item', 'i');
     $query
       ->fields('i', array('iid'))
@@ -138,7 +138,7 @@ public function loadFeedItemsBySource($fid, $limit = 20) {
   /**
    * {@inheritdoc}
    */
-  public function loadFeedItemsByCategory($cid, $limit = 20) {
+  public function loadByCategory($cid, $limit = 20) {
     $query = $this->database->select('aggregator_category_item', 'c');
     $query->leftJoin('aggregator_item', 'i', 'c.iid = i.iid');
     $query->leftJoin('aggregator_feed', 'f', 'i.fid = f.fid');
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php
index f9fa154..da9597d 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php
@@ -51,7 +51,7 @@ public function saveCategories(Item $item);
    * @return \Drupal\aggregator\ItemInterface[]
    *   An array of the feed items.
    */
-  public function loadFeedItems($limit = 20);
+  public function loadAll($limit = 20);
 
   /**
    * Loads feed items filtered by a feed.
@@ -64,7 +64,7 @@ public function loadFeedItems($limit = 20);
    * @return \Drupal\aggregator\ItemInterface[]
    *   An array of the feed items.
    */
-  public function loadFeedItemsBySource($fid, $limit = 20);
+  public function loadByFeed($fid, $limit = 20);
 
   /**
    * Loads feed items from all feeds.
@@ -77,6 +77,6 @@ public function loadFeedItemsBySource($fid, $limit = 20);
    * @return \Drupal\aggregator\ItemInterface[]
    *   An array of the feed items.
    */
-  public function loadFeedItemsByCategory($cid, $limit = 20);
+  public function loadByCategory($cid, $limit = 20);
 
 }