diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php
index 88a2184..a4c6621 100644
--- a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php
+++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php
@@ -23,7 +23,6 @@
  *
  * @FieldFormatter(
  *   id = "datetime_default",
- *   module = "datetime",
  *   label = @Translation("Default"),
  *   field_types = {
  *     "datetime"
diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php
index 7c59dda..a746110 100644
--- a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php
+++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php
@@ -18,7 +18,6 @@
  *
  * @FieldFormatter(
  *   id = "datetime_plain",
- *   module = "datetime",
  *   label = @Translation("Plain"),
  *   field_types = {
  *     "datetime"
diff --git a/core/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php b/core/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php
index 33e5920..4d096a5 100644
--- a/core/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php
+++ b/core/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "email_mailto",
- *   module = "email",
  *   label = @Translation("Email"),
  *   field_types = {
  *     "email"
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php
index 4b8df9c..f97f727 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php
@@ -18,7 +18,6 @@
  *
  * @FieldFormatter(
  *   id = "entity_reference_entity_view",
- *   module = "entity_reference",
  *   label = @Translation("Rendered entity"),
  *   description = @Translation("Display the referenced entities rendered by entity_view()."),
  *   field_types = {
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceIdFormatter.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceIdFormatter.php
index 3de34ee..7f5e305 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceIdFormatter.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceIdFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "entity_reference_entity_id",
- *   module = "entity_reference",
  *   label = @Translation("Entity ID"),
  *   description = @Translation("Display the ID of the referenced entities."),
  *   field_types = {
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceLabelFormatter.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceLabelFormatter.php
index 568d3d8..bd6bab4 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceLabelFormatter.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceLabelFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "entity_reference_label",
- *   module = "entity_reference",
  *   label = @Translation("Label"),
  *   description = @Translation("Display the label of the referenced entities."),
  *   field_types = {
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 5ea0c0c..e46ee7c 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -442,8 +442,8 @@ function field_sync_field_status() {
   // Set fields with missing field type or storage modules to inactive.
   foreach ($fields as $uuid => &$field) {
     // Associate field types.
-    if (isset($field_types[$field['type']]) && ($field['module'] != $field_types[$field['type']]['module'] || !$field['active'])) {
-      $field['module'] = $field_types[$field['type']]['module'];
+    if (isset($field_types[$field['type']]) && ($field['module'] != $field_types[$field['type']]['provider'] || !$field['active'])) {
+      $field['module'] = $field_types[$field['type']]['provider'];
       $field['active'] = TRUE;
       $changed[$uuid] = $field;
     }
diff --git a/core/modules/field/lib/Drupal/field/Annotation/FieldFormatter.php b/core/modules/field/lib/Drupal/field/Annotation/FieldFormatter.php
index f052c60..e688a76 100644
--- a/core/modules/field/lib/Drupal/field/Annotation/FieldFormatter.php
+++ b/core/modules/field/lib/Drupal/field/Annotation/FieldFormatter.php
@@ -52,13 +52,6 @@ class FieldFormatter extends Plugin {
   public $description;
 
   /**
-   * The name of the module providing the formatter.
-   *
-   * @var string
-   */
-  public $module;
-
-  /**
    * The name of the field formatter class.
    *
    * This is not provided manually, it will be added by the discovery mechanism.
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
index 1bb1ae4..4602399 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
@@ -356,7 +356,7 @@ protected function saveNew() {
     if (!$field_type) {
       throw new FieldException(format_string('Attempt to create a field of unknown type %type.', array('%type' => $this->type)));
     }
-    $this->module = $field_type['module'];
+    $this->module = $field_type['provider'];
     $this->active = TRUE;
 
     // Make sure all settings are present, so that a complete field
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
index ff4472f..603d900 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
@@ -95,7 +95,7 @@ public function getPropertyDefinitions() {
    */
   public static function schema(Field $field) {
     $definition = \Drupal::service('plugin.manager.entity.field.field_type')->getDefinition($field->type);
-    $module = $definition['module'];
+    $module = $definition['provider'];
     module_load_install($module);
     $callback = "{$module}_field_schema";
     if (function_exists($callback)) {
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php
index 9aa6ab7..c40a8a5 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php
@@ -63,7 +63,7 @@ public function getDefinitions() {
       if (function_exists($function)) {
         foreach ($function() as $plugin_id => $definition) {
           $definition['id'] = $plugin_id;
-          $definition['module'] = $module;
+          $definition['provider'] = $module;
           $definition['list_class'] = '\Drupal\field\Plugin\field\field_type\LegacyConfigField';
           $definitions[$plugin_id] = $definition;
         }
diff --git a/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigField.php b/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigField.php
index bfbf092..31e65ca 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigField.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigField.php
@@ -102,7 +102,7 @@ public function deleteRevision() {
    */
   protected function legacyCallback($hook, $args = array()) {
     $definition = $this->getPluginDefinition();
-    $module = $definition['module'];
+    $module = $definition['provider'];
     $callback = "{$module}_field_{$hook}";
     if (function_exists($callback)) {
       $entity = $this->getParent();
diff --git a/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php b/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php
index ea4073b..2b440bb 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php
@@ -30,7 +30,7 @@
    */
   public static function schema(Field $field) {
     $definition = \Drupal::service('plugin.manager.entity.field.field_type')->getDefinition($field->type);
-    $module = $definition['module'];
+    $module = $definition['provider'];
     module_load_install($module);
     $callback = "{$module}_field_schema";
     if (function_exists($callback)) {
@@ -117,7 +117,7 @@ public function prepareCache() {
    */
   protected function getLegacyCallback($hook) {
     $definition = $this->getPluginDefinition();
-    $module = $definition['module'];
+    $module = $definition['provider'];
     $callback = "{$module}_field_{$hook}";
     if (function_exists($callback)) {
       return $callback;
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php
index 4e1f59a..aa812cd 100644
--- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php
+++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "field_test_default",
- *   module = "field_test",
  *   label = @Translation("Default"),
  *   description = @Translation("Default formatter"),
  *   field_types = {
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldEmptyFormatter.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldEmptyFormatter.php
index df71b16..c2a7dbe 100644
--- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldEmptyFormatter.php
+++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldEmptyFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "field_empty_test",
- *   module = "field_test",
  *   label = @Translation("Field empty test"),
  *   field_types = {
  *     "test_field",
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php
index 2810e09..64ec25c 100644
--- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php
+++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "field_test_multiple",
- *   module = "field_test",
  *   label = @Translation("Multiple"),
  *   description = @Translation("Multiple formatter"),
  *   field_types = {
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php
index ad0ea47..8308e2b 100644
--- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php
+++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "field_test_with_prepare_view",
- *   module = "field_test",
  *   label = @Translation("With prepare step"),
  *   description = @Translation("Tests prepareView() method"),
  *   field_types = {
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php
index 6eae26a..7f243b1 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php
@@ -16,7 +16,6 @@
  *
  * @FieldFormatter(
  *   id = "file_default",
- *   module = "file",
  *   label = @Translation("Generic file"),
  *   field_types = {
  *     "file"
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php
index af57980..a44f6e1 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php
@@ -16,7 +16,6 @@
  *
  * @FieldFormatter(
  *   id = "file_rss_enclosure",
- *   module = "file",
  *   label = @Translation("RSS enclosure"),
  *   field_types = {
  *     "file"
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php
index 95920f3..92ae059 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php
@@ -16,7 +16,6 @@
  *
  * @FieldFormatter(
  *   id = "file_table",
- *   module = "file",
  *   label = @Translation("Table of files"),
  *   field_types = {
  *     "file"
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php
index 090bd37..d261f45 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php
@@ -16,7 +16,6 @@
  *
  * @FieldFormatter(
  *   id = "file_url_plain",
- *   module = "file",
  *   label = @Translation("URL to file"),
  *   field_types = {
  *     "file"
diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php b/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php
index 84b73ba..ea671c5 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php
@@ -16,7 +16,6 @@
  *
  * @FieldFormatter(
  *   id = "image",
- *   module = "image",
  *   label = @Translation("Image"),
  *   field_types = {
  *     "image"
diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php b/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
index 27daeef..39ba48f 100644
--- a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
+++ b/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "link",
- *   module = "link",
  *   label = @Translation("Link"),
  *   field_types = {
  *     "link"
diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkSeparateFormatter.php b/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkSeparateFormatter.php
index d39d420..ae1f116 100644
--- a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkSeparateFormatter.php
+++ b/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkSeparateFormatter.php
@@ -15,14 +15,12 @@
 use Drupal\field\Annotation\FieldFormatter;
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\field\Plugin\Type\Formatter\FormatterBase;
 
 /**
  * Plugin implementation of the 'link_separate' formatter.
  *
  * @FieldFormatter(
  *   id = "link_separate",
- *   module = "link",
  *   label = @Translation("Separate link text and URL"),
  *   field_types = {
  *     "link"
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php
index 41f075d..4f5a25a 100644
--- a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php
+++ b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php
@@ -22,7 +22,6 @@
  *
  * @FieldFormatter(
  *   id = "number_decimal",
- *   module = "number",
  *   label = @Translation("Default"),
  *   field_types = {
  *     "number_decimal",
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php
index 16f36ad..a2e27f9 100644
--- a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php
+++ b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php
@@ -22,7 +22,6 @@
  *
  * @FieldFormatter(
  *   id = "number_integer",
- *   module = "number",
  *   label = @Translation("Default"),
  *   field_types = {
  *     "number_integer"
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php
index b8a3653..94ca53b 100644
--- a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php
+++ b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "number_unformatted",
- *   module = "number",
  *   label = @Translation("Unformatted"),
  *   field_types = {
  *     "number_integer",
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php b/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php
index 3da3b64..c847e4d 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "list_default",
- *   module = "options",
  *   label = @Translation("Default"),
  *   field_types = {
  *     "list_integer",
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php b/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php
index de62b57..5664727 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "list_key",
- *   module = "options",
  *   label = @Translation("Key"),
  *   field_types = {
  *     "list_integer",
diff --git a/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php b/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php
index 0bf24cf..6019a24 100644
--- a/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php
+++ b/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "picture",
- *   module = "picture",
  *   label = @Translation("Picture"),
  *   field_types = {
  *     "image",
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php
index eeb7437..af207b0 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php
@@ -19,7 +19,6 @@
  *
  * @FieldFormatter(
  *   id = "entity_reference_rss_category",
- *   module = "taxonomy",
  *   label = @Translation("RSS category"),
  *   description = @Translation("Display reference to taxonomy term in RSS."),
  *   field_types = {
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php
index b44002e..78ecb62 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php
@@ -18,7 +18,6 @@
  *
  * @FieldFormatter(
  *   id = "taxonomy_term_reference_link",
- *   module = "taxonomy",
  *   label = @Translation("Link"),
  *   field_types = {
  *     "taxonomy_term_reference"
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php
index 0294cb4..2b087b0 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php
@@ -10,7 +10,6 @@
 use Drupal\field\Annotation\FieldFormatter;
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\field\Plugin\Type\Formatter\FormatterBase;
 use Drupal\taxonomy\Plugin\field\formatter\TaxonomyFormatterBase;
 
 /**
@@ -18,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "taxonomy_term_reference_plain",
- *   module = "taxonomy",
  *   label = @Translation("Plain text"),
  *   field_types = {
  *     "taxonomy_term_reference"
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php
index 2a2af05..4266c98 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php
@@ -10,7 +10,6 @@
 use Drupal\field\Annotation\FieldFormatter;
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\field\Plugin\Type\Formatter\FormatterBase;
 use Drupal\taxonomy\Plugin\field\formatter\TaxonomyFormatterBase;
 
 /**
@@ -18,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "taxonomy_term_reference_rss_category",
- *   module = "taxonomy",
  *   label = @Translation("RSS category"),
  *   field_types = {
  *     "taxonomy_term_reference"
diff --git a/core/modules/telephone/lib/Drupal/telephone/Plugin/field/field_type/TelephoneItem.php b/core/modules/telephone/lib/Drupal/telephone/Plugin/field/field_type/TelephoneItem.php
index c7725d9..2edecc2 100644
--- a/core/modules/telephone/lib/Drupal/telephone/Plugin/field/field_type/TelephoneItem.php
+++ b/core/modules/telephone/lib/Drupal/telephone/Plugin/field/field_type/TelephoneItem.php
@@ -17,7 +17,6 @@
  *
  * @FieldType(
  *   id = "telephone",
- *   module = "telephone",
  *   label = @Translation("Telephone number"),
  *   description = @Translation("This field stores a telephone number in the database."),
  *   default_widget = "telephone_default",
diff --git a/core/modules/telephone/lib/Drupal/telephone/Plugin/field/formatter/TelephoneLinkFormatter.php b/core/modules/telephone/lib/Drupal/telephone/Plugin/field/formatter/TelephoneLinkFormatter.php
index 208d6bd..1a99d2a 100644
--- a/core/modules/telephone/lib/Drupal/telephone/Plugin/field/formatter/TelephoneLinkFormatter.php
+++ b/core/modules/telephone/lib/Drupal/telephone/Plugin/field/formatter/TelephoneLinkFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "telephone_link",
- *   module = "telephone",
  *   label = @Translation("Telephone link"),
  *   field_types = {
  *     "telephone"
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItem.php b/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItem.php
index 1c79cf7..0f06254 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItem.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItem.php
@@ -16,7 +16,6 @@
  *
  * @FieldType(
  *   id = "text",
- *   module = "text",
  *   label = @Translation("Text"),
  *   description = @Translation("This field stores varchar text in the database."),
  *   settings = {
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextLongItem.php b/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextLongItem.php
index be86655..82fda1c 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextLongItem.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextLongItem.php
@@ -16,7 +16,6 @@
  *
  * @FieldType(
  *   id = "text_long",
- *   module = "text",
  *   label = @Translation("Long text"),
  *   description = @Translation("This field stores long text in the database."),
  *   instance_settings = {
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php b/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php
index 7aecf67..5aad0f2 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php
@@ -16,7 +16,6 @@
  *
  * @FieldType(
  *   id = "text_with_summary",
- *   module = "text",
  *   label = @Translation("Long text and summary"),
  *   description = @Translation("This field stores long text in the database along with optional summary text."),
  *   instance_settings = {
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php
index 52b2388..2cd4ed0 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "text_default",
- *   module = "text",
  *   label = @Translation("Default"),
  *   field_types = {
  *     "text",
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php
index 813bb92..d003056 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php
@@ -17,7 +17,6 @@
  *
  * @FieldFormatter(
  *   id = "text_plain",
- *   module = "text",
  *   label = @Translation("Plain text"),
  *   field_types = {
  *     "text",
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php
index e0a0de0..12f03fc 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php
@@ -15,7 +15,6 @@
  *
  * @FieldFormatter(
  *   id = "text_summary_or_trimmed",
- *   module = "text",
  *   label = @Translation("Summary or trimmed"),
  *   field_types = {
  *     "text_with_summary"
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php
index 88ef0c5..e3a7ce2 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php
@@ -22,7 +22,6 @@
  *
  * @FieldFormatter(
  *   id = "text_trimmed",
- *   module = "text",
  *   label = @Translation("Trimmed"),
  *   field_types = {
  *     "text",