diff --git a/core/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc
index a859e85..4e374bc 100644
--- a/core/modules/aggregator/aggregator.admin.inc
+++ b/core/modules/aggregator/aggregator.admin.inc
@@ -561,7 +561,7 @@ function aggregator_admin_form_submit($form, &$form_state) {
   $config
     ->set('items.allowed_html', $form_state['values']['aggregator_allowed_html_tags'])
     ->set('items.expire', $form_state['values']['aggregator_clear'])
-    ->set('items.teaser_length', $form_state['values']['aggregator_teaser_length'])
+    ->set('items.default_summary_length', $form_state['values']['aggregator_default_summary_length'])
     ->set('source.list_max', $form_state['values']['aggregator_summary_items'])
     ->set('source.category_selector', $form_state['values']['aggregator_category_selector']);
 
diff --git a/core/modules/aggregator/aggregator.install b/core/modules/aggregator/aggregator.install
index bc0a369..743bb90 100644
--- a/core/modules/aggregator/aggregator.install
+++ b/core/modules/aggregator/aggregator.install
@@ -269,7 +269,7 @@ function aggregrator_update_8000() {
     'aggregator_parser' => 'parser',
     'aggregator_processors' => 'processors',
     'aggregator_allowed_html_tags' => 'items.allowed_html',
-    'aggregator_teaser_length' => 'items.teaser_length',
+    'aggregator_teaser_length' => 'items.default_summary_length',
     'aggregator_clear' => 'items.expire',
     'aggregator_summary_items' => 'source.list_max',
     'aggregator_category_selector' => 'source.category_selector',
diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc
index 78ca5bc..576a417 100644
--- a/core/modules/aggregator/aggregator.pages.inc
+++ b/core/modules/aggregator/aggregator.pages.inc
@@ -442,7 +442,7 @@ function theme_aggregator_page_rss($variables) {
   foreach ($feeds as $feed) {
     switch ($feed_length) {
       case 'teaser':
-        $summary = text_summary($feed->description, NULL, config('aggregator.settings')->get('items.teaser_length'));
+        $summary = text_summary($feed->description, NULL, config('aggregator.settings')->get('items.default_summary_length'));
         if ($summary != $feed->description) {
           $summary .= '<p><a href="' . check_url($feed->link) . '">' . t('read more') . "</a></p>\n";
         }
diff --git a/core/modules/aggregator/aggregator.processor.inc b/core/modules/aggregator/aggregator.processor.inc
index b333a96..b6d7edf 100644
--- a/core/modules/aggregator/aggregator.processor.inc
+++ b/core/modules/aggregator/aggregator.processor.inc
@@ -117,10 +117,10 @@ function aggregator_form_aggregator_admin_form_alter(&$form, $form_state) {
       'select' => t('multiple selector')),
       '#description' => t('For a small number of categories, checkboxes are easier to use, while a multiple selector works well with large numbers of categories.'),
     );
-    $form['modules']['aggregator']['aggregator_teaser_length'] = array(
+    $form['modules']['aggregator']['aggregator_default_summary_length'] = array(
       '#type' => 'select',
       '#title' => t('Length of trimmed description'),
-      '#default_value' => config('aggregator.settings')->get('items.teaser_length'),
+      '#default_value' => config('aggregator.settings')->get('items.default_summary_length'),
       '#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_aggregator_characters'),
       '#description' => t("The maximum number of characters used in the trimmed version of content.")
     );
diff --git a/core/modules/aggregator/config/aggregator.settings.yml b/core/modules/aggregator/config/aggregator.settings.yml
index dfc0aa9..3c8db76 100644
--- a/core/modules/aggregator/config/aggregator.settings.yml
+++ b/core/modules/aggregator/config/aggregator.settings.yml
@@ -4,7 +4,7 @@ processors:
   - aggregator
 items:
   allowed_html: '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>'
-  teaser_length: '600'
+  default_summary_length: '600'
   expire: '9676800'
 source:
   list_max: '3'
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php
index 503b9a1..eb50daa 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php
@@ -28,7 +28,7 @@ function testSettingsPage() {
       'aggregator_summary_items' => 10,
       'aggregator_clear' => 3600,
       'aggregator_category_selector' => 'select',
-      'aggregator_teaser_length' => 200,
+      'aggregator_default_summary_length' => 200,
     );
     $this->drupalPost('admin/config/services/aggregator/settings', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));