diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index b5124bd..d9c23e7 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -189,7 +189,8 @@ function aggregator_menu() {
     'file' => 'aggregator.admin.inc',
   );
   $items['aggregator/sources/%aggregator_feed'] = array(
-    'title' => 'View',
+    'title callback' => 'entity_page_label',
+    'title arguments' => array(2),
     'route_name' => 'aggregator_page_source',
   );
   $items['aggregator/sources/%aggregator_feed/view'] = array(
diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc
index 30233e6..c524505 100644
--- a/core/modules/aggregator/aggregator.pages.inc
+++ b/core/modules/aggregator/aggregator.pages.inc
@@ -20,7 +20,6 @@
  * @see aggregator_menu()
  */
 function aggregator_page_source(Feed $feed) {
-  drupal_set_title($feed->label());
   $feed_source = entity_view($feed, 'default');
 
   // It is safe to include the fid in the query because it's loaded from the
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
index fafb698..2815265 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
@@ -109,8 +109,7 @@ public function feedAdd() {
    *   The rendered list of items for the feed.
    */
   public function viewFeed(FeedInterface $aggregator_feed) {
-    drupal_set_title($aggregator_feed->label());
-    $feed_source = $this->entityManager->getRenderController($aggregator_feed->entityType())
+    $feed_source = $this->entityManager->getRenderController('aggregator_feed')
       ->view($aggregator_feed, 'default');
     // Load aggregator feed item for the particular feed id.
     $items = $this->entityManager
@@ -121,7 +120,7 @@ public function viewFeed(FeedInterface $aggregator_feed) {
   }
 
   /**
-   * Prints an aggregator page listing a number of feed items.
+   * Builds a listing of aggregator feed items.
    *
    * @param \Drupal\aggregator\ItemInterface[] $items
    *   The items to be listed.
@@ -139,9 +138,9 @@ protected function buildPageList(array $items, $feed_source = '') {
     );
     $build['feed_source'] = is_array($feed_source) ? $feed_source : array('#markup' => $feed_source);
     if ($items) {
-      $build['items'] = $this->entityManager->getRenderController(reset($items)->entityType())
+      $build['items'] = $this->entityManager->getRenderController('aggregator_item')
         ->viewMultiple($items, 'default');
-      $build['pager']['#theme'] = 'pager';
+      $build['pager'] = array('#theme' => 'pager');
     }
     return $build;
   }
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
index 73ef25b..c35bbe5 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
@@ -147,7 +147,7 @@ public function loadFeedItems($type, $data = NULL, $limit = 20) {
       ->execute()
       ->fetchCol();
 
-    $feed_items = $this->load($result);
+    $feed_items = $this->loadMultiple($result);
 
     return $feed_items;
   }