diff --git a/core/lib/Drupal/Core/Condition/Annotation/Condition.php b/core/lib/Drupal/Core/Condition/Annotation/Condition.php
index 55834d041c2f9b96fbcc962a8300a485ff28e423..176f3739a7672ddf7973ee401d14ec9903a032b7 100644
--- a/core/lib/Drupal/Core/Condition/Annotation/Condition.php
+++ b/core/lib/Drupal/Core/Condition/Annotation/Condition.php
@@ -46,11 +46,11 @@ class Condition extends Plugin {
   public $label;
 
   /**
-   * The name of the module providing the type.
+   * The name of the provider that owns the filter.
    *
    * @var string
    */
-  public $module;
+  public $provider;
 
   /**
    * An array of contextual data.
diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php
index 9c37809c56ce52740f3d26ca90dd958f33083f84..4d45323ef9eed9ccf006fe5ca1be493fdb265c54 100644
--- a/core/modules/filter/src/Entity/FilterFormat.php
+++ b/core/modules/filter/src/Entity/FilterFormat.php
@@ -99,7 +99,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
    * An associative array of filters assigned to the text format, keyed by the
    * instance ID of each filter and using the properties:
    * - id: The plugin ID of the filter plugin instance.
-   * - module: The name of the module providing the filter.
+   * - provider: The name of the provider that owns the filter.
    * - status: (optional) A Boolean indicating whether the filter is
    *   enabled in the text format. Defaults to FALSE.
    * - weight: (optional) The weight of the filter in the text format. Defaults
diff --git a/core/modules/filter/src/Plugin/FilterBase.php b/core/modules/filter/src/Plugin/FilterBase.php
index b5394b4ddfceee2cac9078f256790cfebae198f9..59a0bb4a2e1350e6688218dd92d3cb56b8c83bc4 100644
--- a/core/modules/filter/src/Plugin/FilterBase.php
+++ b/core/modules/filter/src/Plugin/FilterBase.php
@@ -28,7 +28,7 @@ abstract class FilterBase extends PluginBase implements FilterInterface {
   protected $plugin_id;
 
   /**
-   * The name of the module that owns this filter.
+   * The name of the provider that owns this filter.
    *
    * @var string
    */