diff --git a/core/modules/aggregator/aggregator.links.menu.yml b/core/modules/aggregator/aggregator.links.menu.yml
index dd2735b..6c966d5 100644
--- a/core/modules/aggregator/aggregator.links.menu.yml
+++ b/core/modules/aggregator/aggregator.links.menu.yml
@@ -1,11 +1,11 @@
 aggregator.admin_overview:
-  title: 'Feed aggregator'
+  title: 'Aggregator'
   description: 'Add feeds or import OPMLs to gather external content and configure how often they are updated.'
   route_name: aggregator.admin_overview
   parent: system.admin_config_services
   weight: 10
 aggregator.page_last:
-  title: 'Feed aggregator'
+  title: 'Aggregator'
   weight: 5
   route_name: aggregator.page_last
 aggregator.feed_add:
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index f612297..215d8d7 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -31,11 +31,11 @@
         $output .= '<dd>' . t('Users view feed content in the <a href=":aggregator">main aggregator display</a>, or by <a href=":aggregator-sources">their source</a> (usually via an RSS feed reader). The most recent content in a feed can be displayed as a block through the <a href=":admin-block">Blocks administration page</a>.', array(':aggregator' => \Drupal::url('aggregator.page_last'), ':aggregator-sources' => $url->toString(), ':admin-block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '</dd>';
       }
       $output .= '<dt>' . t('Adding, editing, and deleting feeds') . '</dt>';
-      $output .= '<dd>' . t('Administrators can add, edit, and delete feeds, and choose how often to check each feed for newly updated items on the <a href=":feededit">Feed aggregator page</a>.', array(':feededit' => \Drupal::url('aggregator.admin_overview'))) . '</dd>';
+      $output .= '<dd>' . t('Administrators can add, edit, and delete feeds, and choose how often to check each feed for newly updated items on the <a href=":feededit">Aggregator administration page</a>.', array(':feededit' => \Drupal::url('aggregator.admin_overview'))) . '</dd>';
       $output .= '<dt>' . t('Configuring the display of feed items') . '</dt>';
-      $output .= '<dd>' . t('Administrators can choose how many items are displayed in the listing pages, which HTML tags are allowed in the content of feed items, and whether they should be trimmed to a maximum number of characters on the <a href=":settings">Feed aggregator settings page</a>.', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '</dd>';
+      $output .= '<dd>' . t('Administrators can choose how many items are displayed in the listing pages, which HTML tags are allowed in the content of feed items, and whether they should be trimmed to a maximum number of characters on the <a href=":settings">Aggregator settings page</a>.', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '</dd>';
       $output .= '<dt>' . t('Discarding old feed items') . '</dt>';
-      $output .= '<dd>' . t('Administrators can choose whether to discard feed items that are older than a specified period of time on the <a href=":settings">Feed aggregator settings page</a>. This requires a correctly configured cron maintenance task (see below).', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '<dd>';
+      $output .= '<dd>' . t('Administrators can choose whether to discard feed items that are older than a specified period of time on the <a href=":settings">Aggregator settings page</a>. This requires a correctly configured cron maintenance task (see below).', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '<dd>';
 
       $output .= '<dt>' . t('<abbr title="Outline Processor Markup Language">OPML</abbr> integration') . '</dt>';
       // Check if the aggregator opml View is enabled.
diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml
index 941f693..105ab6d 100644
--- a/core/modules/aggregator/aggregator.routing.yml
+++ b/core/modules/aggregator/aggregator.routing.yml
@@ -2,7 +2,7 @@
   path: '/admin/config/services/aggregator'
   defaults:
     _controller: '\Drupal\aggregator\Controller\AggregatorController::adminOverview'
-    _title: 'Feed aggregator'
+    _title: 'Aggregator'
   requirements:
     _permission: 'administer news feeds'
 
@@ -10,7 +10,7 @@
   path: '/admin/config/services/aggregator/settings'
   defaults:
     _form: '\Drupal\aggregator\Form\SettingsForm'
-    _title: 'Feed aggregator settings'
+    _title: 'Aggregator settings'
   requirements:
     _permission: 'administer news feeds'
 
@@ -53,6 +53,6 @@
   path: '/aggregator'
   defaults:
     _controller: '\Drupal\aggregator\Controller\AggregatorController::pageLast'
-    _title: 'Feed aggregator'
+    _title: 'Aggregator'
   requirements:
     _permission: 'access news feeds'
diff --git a/core/modules/aggregator/src/Tests/AggregatorAdminTest.php b/core/modules/aggregator/src/Tests/AggregatorAdminTest.php
index edc594b..5d69dc0 100644
--- a/core/modules/aggregator/src/Tests/AggregatorAdminTest.php
+++ b/core/modules/aggregator/src/Tests/AggregatorAdminTest.php
@@ -19,7 +19,7 @@
    */
   public function testSettingsPage() {
     $this->drupalGet('admin/config');
-    $this->clickLink('Feed aggregator');
+    $this->clickLink('Aggregator');
     $this->clickLink('Settings');
     // Make sure that test plugins are present.
     $this->assertText('Test fetcher');