diff -u b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/UriWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/UriWidget.php
--- b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/UriWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/UriWidget.php
@@ -15,9 +15,9 @@
  *
  * @FieldWidget(
  *   id = "uri",
- *   label = @Translation("Uri field"),
+ *   label = @Translation("URI field"),
  *   field_types = {
- *     "uri"
+ *     "uri",
  *   }
  * )
  */
@@ -39,7 +39,7 @@
   public function settingsForm(array $form, array &$form_state) {
     $element['size'] = array(
       '#type' => 'number',
-      '#title' => t('Size of textfield'),
+      '#title' => t('Size of URI field'),
       '#default_value' => $this->getSetting('size'),
       '#required' => TRUE,
       '#min' => 1,
@@ -59,7 +59,7 @@
   public function settingsSummary() {
     $summary = array();
 
-    $summary[] = t('URL field size: !size', array('!size' => $this->getSetting('size')));
+    $summary[] = t('URI field size: !size', array('!size' => $this->getSetting('size')));
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
       $summary[] = t('Placeholder: @placeholder', array('@placeholder' => $placeholder));
@@ -79,7 +79,6 @@
       '#placeholder' => $this->getSetting('placeholder'),
       '#maxlength' => $this->getFieldSetting('max_length'),
     );
-
     return $element;
   }
 
diff -u b/core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php b/core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php
--- b/core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php
@@ -25,7 +25,8 @@
     $feed = $this->entity;
 
     // @todo: convert to a language selection widget defined in the base field.
-    // Blocked on https://drupal.org/node/2226493 which adds a generic language widget.
+    //   Blocked on https://drupal.org/node/2226493 which adds a generic
+    //   language widget.
     $form['langcode'] = array(
       '#title' => $this->t('Language'),
       '#type' => 'language_select',