diff --git a/core/modules/filter/config/filter.format.plain_text.yml b/core/modules/filter/config/filter.format.plain_text.yml
index 97296ec..37650f9 100644
--- a/core/modules/filter/config/filter.format.plain_text.yml
+++ b/core/modules/filter/config/filter.format.plain_text.yml
@@ -15,14 +15,14 @@ filters:
   # Escape all HTML.
   filter_html_escape:
     id: filter_html_escape
-    module: filter
+    provider: filter
     status: true
     weight: -10
     settings: {  }
   # Convert URLs into links.
   filter_url:
     id: filter_url
-    module: filter
+    provider: filter
     status: true
     weight: 0
     settings:
@@ -30,7 +30,7 @@ filters:
   # Convert linebreaks into paragraphs.
   filter_autop:
     id: filter_autop
-    module: filter
+    provider: filter
     status: true
     weight: 0
     settings: {  }
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php
index 67cede4..3795430 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php
@@ -14,7 +14,6 @@
  *
  * @Filter(
  *   id = "filter_autop",
- *   module = "filter",
  *   title = @Translation("Convert line breaks into HTML (i.e. <code>&lt;br&gt;</code> and <code>&lt;p&gt;</code>)"),
  *   type = FILTER_TYPE_MARKUP_LANGUAGE
  * )
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php
index d3552a8..c19d0be 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php
@@ -17,7 +17,6 @@
  *
  * @Filter(
  *   id = "filter_caption",
- *   module = "filter",
  *   title = @Translation("Display image captions and align images"),
  *   description = @Translation("Uses data-caption and data-align attributes on &lt;img&gt; tags to caption and align images."),
  *   type = FILTER_TYPE_TRANSFORM_REVERSIBLE
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php
index 62c9401..b5b6bfe 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php
@@ -14,7 +14,6 @@
  *
  * @Filter(
  *   id = "filter_html",
- *   module = "filter",
  *   title = @Translation("Limit allowed HTML tags"),
  *   type = FILTER_TYPE_HTML_RESTRICTOR,
  *   settings = {
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php
index 7f83026..e19071b 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php
@@ -14,7 +14,6 @@
  *
  * @Filter(
  *   id = "filter_htmlcorrector",
- *   module = "filter",
  *   title = @Translation("Correct faulty and chopped off HTML"),
  *   type = FILTER_TYPE_HTML_RESTRICTOR,
  *   weight = 10
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php
index 549bcaa..6d195b7 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php
@@ -14,7 +14,6 @@
  *
  * @Filter(
  *   id = "filter_html_escape",
- *   module = "filter",
  *   title = @Translation("Display any HTML as plain text"),
  *   type = FILTER_TYPE_HTML_RESTRICTOR,
  *   weight = -10
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php
index ba5fb26..7a0e998 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php
@@ -14,7 +14,6 @@
  *
  * @Filter(
  *   id = "filter_html_image_secure",
- *   module = "filter",
  *   title = @Translation("Restrict images to this site"),
  *   description = @Translation("Disallows usage of &lt;img&gt; tag sources that are not hosted on this site by replacing them with a placeholder image."),
  *   type = FILTER_TYPE_HTML_RESTRICTOR,
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php
index a466893..90e57eb 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php
@@ -18,7 +18,6 @@
  *
  * @Filter(
  *   id = "filter_null",
- *   module = "filter",
  *   title = @Translation("Provides a fallback for missing filters. Do not use."),
  *   type = FILTER_TYPE_HTML_RESTRICTOR,
  *   weight = -10
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php
index f7e2075..2398840 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php
@@ -14,7 +14,6 @@
  *
  * @Filter(
  *   id = "filter_url",
- *   module = "filter",
  *   title = @Translation("Convert URLs into links"),
  *   type = FILTER_TYPE_MARKUP_LANGUAGE,
  *   settings = {
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/FilterBase.php b/core/modules/filter/lib/Drupal/filter/Plugin/FilterBase.php
index 6717ecd..a9a4169 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/FilterBase.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/FilterBase.php
@@ -26,7 +26,7 @@
    *
    * @var string
    */
-  public $module;
+  public $provider;
 
   /**
    * A Boolean indicating whether this filter is enabled.
@@ -71,7 +71,7 @@
   public function __construct(array $configuration, $plugin_id, array $plugin_definition) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
-    $this->module = $this->pluginDefinition['module'];
+    $this->provider = $this->pluginDefinition['provider'];
     $this->cache = $this->pluginDefinition['cache'];
 
     $this->setConfiguration($configuration);
@@ -99,7 +99,7 @@ public function setConfiguration(array $configuration) {
   public function getConfiguration() {
     return array(
       'id' => $this->getPluginId(),
-      'module' => $this->pluginDefinition['module'],
+      'provider' => $this->pluginDefinition['provider'],
       'status' => $this->status,
       'weight' => $this->weight,
       'settings' => $this->settings,
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php
index ef25d64..ff930c1 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php
@@ -63,15 +63,15 @@ function testInstallation() {
     $filters = $format->get('filters');
     $this->assertEqual($filters['filter_html_escape']['status'], 1);
     $this->assertEqual($filters['filter_html_escape']['weight'], -10);
-    $this->assertEqual($filters['filter_html_escape']['module'], 'filter');
+    $this->assertEqual($filters['filter_html_escape']['provider'], 'filter');
     $this->assertEqual($filters['filter_html_escape']['settings'], array());
     $this->assertEqual($filters['filter_autop']['status'], 1);
     $this->assertEqual($filters['filter_autop']['weight'], 0);
-    $this->assertEqual($filters['filter_autop']['module'], 'filter');
+    $this->assertEqual($filters['filter_autop']['provider'], 'filter');
     $this->assertEqual($filters['filter_autop']['settings'], array());
     $this->assertEqual($filters['filter_url']['status'], 1);
     $this->assertEqual($filters['filter_url']['weight'], 0);
-    $this->assertEqual($filters['filter_url']['module'], 'filter');
+    $this->assertEqual($filters['filter_url']['provider'], 'filter');
     $this->assertEqual($filters['filter_url']['settings'], array(
       'filter_url_length' => 72,
     ));
diff --git a/core/modules/filter/tests/filter_test/config/filter.format.filter_test.yml b/core/modules/filter/tests/filter_test/config/filter.format.filter_test.yml
index 61c97ea..9b48b54 100644
--- a/core/modules/filter/tests/filter_test/config/filter.format.filter_test.yml
+++ b/core/modules/filter/tests/filter_test/config/filter.format.filter_test.yml
@@ -10,19 +10,19 @@ langcode: en
 filters:
   filter_html_escape:
     id: filter_html_escape
-    module: filter
+    provider: filter
     status: true
     weight: -10
     settings: {  }
   filter_autop:
     id: filter_autop
-    module: filter
+    provider: filter
     status: true
     weight: 0
     settings: {  }
   filter_url:
     id: filter_url
-    module: filter
+    provider: filter
     status: true
     weight: 0
     settings:
diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php
index f360050..8f5b31b 100644
--- a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php
+++ b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php
@@ -14,7 +14,6 @@
  *
  * @Filter(
  *   id = "filter_test_replace",
- *   module = "filter_test",
  *   title = @Translation("Testing filter"),
  *   description = @Translation("Replaces all content with filter and text format information."),
  *   type = FILTER_TYPE_TRANSFORM_IRREVERSIBLE
diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
index 6c94dbf..5df1bab 100644
--- a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
+++ b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
@@ -15,7 +15,6 @@
  *
  * @Filter(
  *   id = "filter_test_restrict_tags_and_attributes",
- *   module = "filter_test",
  *   title = @Translation("Tag and attribute restricting filter"),
  *   description = @Translation("Used for testing filter_get_html_restrictions_by_format()."),
  *   type = FILTER_TYPE_HTML_RESTRICTOR
diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php
index ad2a30e..4a03e7c 100644
--- a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php
+++ b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php
@@ -14,7 +14,6 @@
  *
  * @Filter(
  *   id = "filter_test_uncacheable",
- *   module = "filter_test",
  *   title = @Translation("Uncacheable filter"),
  *   description = @Translation("Does nothing, but makes a text format uncacheable"),
  *   type = FILTER_TYPE_TRANSFORM_IRREVERSIBLE,
diff --git a/core/profiles/standard/config/filter.format.basic_html.yml b/core/profiles/standard/config/filter.format.basic_html.yml
index 276ac0c..f5acb95 100644
--- a/core/profiles/standard/config/filter.format.basic_html.yml
+++ b/core/profiles/standard/config/filter.format.basic_html.yml
@@ -9,7 +9,7 @@ cache: true
 filters:
   filter_html:
     id: filter_html
-    module: filter
+    provider: filter
     status: true
     weight: -10
     settings:
@@ -18,19 +18,19 @@ filters:
       filter_html_nofollow: false
   filter_caption:
     id: filter_caption
-    module: filter
+    provider: filter
     status: 1
     weight: 8
     settings: {  }
   filter_html_image_secure:
     id: filter_html_image_secure
-    module: filter
+    provider: filter
     status: true
     weight: 9
     settings: {  }
   filter_htmlcorrector:
     id: filter_htmlcorrector
-    module: filter
+    provider: filter
     status: true
     weight: 10
     settings: {  }
diff --git a/core/profiles/standard/config/filter.format.full_html.yml b/core/profiles/standard/config/filter.format.full_html.yml
index 86bf71e..37daecc 100644
--- a/core/profiles/standard/config/filter.format.full_html.yml
+++ b/core/profiles/standard/config/filter.format.full_html.yml
@@ -9,13 +9,13 @@ cache: true
 filters:
   filter_caption:
     id: filter_caption
-    module: filter
+    provider: filter
     status: true
     weight: 9
     settings: {  }
   filter_htmlcorrector:
     id: filter_htmlcorrector
-    module: filter
+    provider: filter
     status: true
     weight: 10
     settings: {  }
diff --git a/core/profiles/standard/config/filter.format.restricted_html.yml b/core/profiles/standard/config/filter.format.restricted_html.yml
index 4284574..36ca00e 100644
--- a/core/profiles/standard/config/filter.format.restricted_html.yml
+++ b/core/profiles/standard/config/filter.format.restricted_html.yml
@@ -9,7 +9,7 @@ cache: true
 filters:
   filter_html:
     id: filter_html
-    module: filter
+    provider: filter
     status: true
     weight: -10
     settings:
@@ -18,20 +18,20 @@ filters:
       filter_html_nofollow: false
   filter_autop:
     id: filter_autop
-    module: filter
+    provider: filter
     status: true
     weight: 0
     settings: {  }
   filter_url:
     id: filter_url
-    module: filter
+    provider: filter
     status: true
     weight: 0
     settings:
       filter_url_length: 72
   filter_htmlcorrector:
     id: filter_htmlcorrector
-    module: filter
+    provider: filter
     status: true
     weight: 10
     settings: {  }
