diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php
index 7419a15..1d92cab 100644
--- a/core/modules/filter/src/Entity/FilterFormat.php
+++ b/core/modules/filter/src/Entity/FilterFormat.php
@@ -33,8 +33,8 @@
  *   config_prefix = "format",
  *   admin_permission = "administer filters",
  *   entity_keys = {
- *     "id" = "format",
- *     "label" = "name",
+ *     "id" = "id",
+ *     "label" = "label",
  *     "weight" = "weight",
  *     "status" = "status"
  *   },
@@ -43,8 +43,8 @@
  *     "disable" = "/admin/config/content/formats/manage/{filter_format}/disable"
  *   },
  *   config_export = {
- *     "name",
- *     "format",
+ *     "label",
+ *     "id",
  *     "weight",
  *     "roles",
  *     "filters",
@@ -56,11 +56,9 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
   /**
    * Unique machine name of the format.
    *
-   * @todo Rename to $id.
-   *
    * @var string
    */
-  protected $format;
+  protected $id;
 
   /**
    * Unique label of the text format.
@@ -69,11 +67,9 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
    * label but different filter configuration would impose a security risk.
    * Therefore, each text format label must be unique.
    *
-   * @todo Rename to $label.
-   *
    * @var string
    */
-  protected $name;
+  protected $label;
 
   /**
    * Weight of this format in the text format selector.
@@ -130,7 +126,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
    * {@inheritdoc}
    */
   public function id() {
-    return $this->format;
+    return $this->id;
   }
 
   /**
@@ -204,7 +200,7 @@ public function preSave(EntityStorageInterface $storage) {
 
     parent::preSave($storage);
 
-    $this->name = trim($this->label());
+    $this->label = trim($this->label());
   }
 
   /**