diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index d4a2253..bffe7fc 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -123,7 +123,7 @@ function filter_formats(AccountInterface $account = NULL) {
     $formats['user'][$account_id] = array();
     foreach ($formats['all'] as $format) {
       if ($format->access('use', $account)) {
-        $formats['user'][$account_id][$format->format] = $format;
+        $formats['user'][$account_id][$format->id()] = $format;
       }
     }
   }
@@ -213,7 +213,7 @@ function filter_default_format(AccountInterface $account = NULL) {
   // available is the user's default format.
   $formats = filter_formats($account);
   $format = reset($formats);
-  return $format->format;
+  return $format->id();
 }
 
 /**
@@ -375,7 +375,7 @@ function template_preprocess_filter_guidelines(&$variables) {
   $format = $variables['format'];
   $variables['tips'] = array(
     '#theme' => 'filter_tips',
-    '#tips' => _filter_tips($format->format, FALSE),
+    '#tips' => _filter_tips($format->id(), FALSE),
   );
 }
 
diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php
index 4b00af1..6cb8dcc 100644
--- a/core/modules/filter/src/Entity/FilterFormat.php
+++ b/core/modules/filter/src/Entity/FilterFormat.php
@@ -61,11 +61,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
    */
-  public $name;
+  protected $label;
 
   /**
    * Weight of this format in the text format selector.
@@ -75,7 +73,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
    *
    * @var int
    */
-  public $weight = 0;
+  protected $weight = 0;
 
   /**
    * List of user role IDs to grant access to use this format on initial creation.
@@ -128,6 +126,75 @@ public function id() {
   /**
    * {@inheritdoc}
    */
+  public function getLabel() {
+    return $this->label;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRoles() {
+    return $this->roles;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getWeight() {
+    return $this->weight;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isCacheable() {
+    return $this->cache > 0;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setLabel($label) {
+    $this->label = $label;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setId($id) {
+    $this->format = $id;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setWeight($weight) {
+    $this->weight = $weight;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setRoles($roles) {
+    $this->roles = $roles;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setCache($cache) {
+    $this->cache = $cache;
+    return $this;
+  }
+
+
+  /**
+   * {@inheritdoc}
+   */
   public function filters($instance_id = NULL) {
     if (!isset($this->filterCollection)) {
       $this->filterCollection = new FilterPluginCollection(\Drupal::service('plugin.manager.filter'), $this->filters);
@@ -192,7 +259,7 @@ public function preSave(EntityStorageInterface $storage) {
 
     parent::preSave($storage);
 
-    $this->name = trim($this->label());
+    $this->label = trim($this->getLabel());
   }
 
   /**
diff --git a/core/modules/filter/src/FilterFormatInterface.php b/core/modules/filter/src/FilterFormatInterface.php
index b5e75ce..d255314 100644
--- a/core/modules/filter/src/FilterFormatInterface.php
+++ b/core/modules/filter/src/FilterFormatInterface.php
@@ -84,4 +84,90 @@ public function getFilterTypes();
    */
   public function getHtmlRestrictions();
 
+  /**
+   * Returns the unique label of the text format.
+   *
+   * @return string
+   *   The label of this format.
+   */
+  public function getLabel();
+
+  /**
+   * Returns the weight of the format in the text format selector.
+   *
+   * @return int
+   *   The weight of this format.
+   */
+  public function getWeight();
+
+  /**
+   * Returns the list of user role IDS.
+   *
+   * @return array
+   *   The role ID list.
+   */
+  public function getRoles();
+
+  /**
+   * Returns the cache status.
+   *
+   * @return bool
+   *   TRUE if the filter is cached.
+   */
+  public function isCacheable();
+
+  /**
+   * Sets the weight to the given value.
+   *
+   * @param int $weight
+   *   The desired weight.
+   *
+   * @return $this
+   */
+  public function setWeight($weight);
+
+  /**
+   * Sets the list of user role IDs to the given array.
+   *
+   * @param array $roles
+   *   The desired user role ID array.
+   *
+   * @return \Drupal\filter\FilterFormatInterface
+   *   The class instance this method is called on.
+   */
+  public function setRoles($roles);
+
+  /**
+   * Sets the cache value (whether or not text of this format can be cached).
+   *
+   * @param bool $cache
+   *   The desired cache value.
+   *
+   * @return \Drupal\filter\FilterFormatInterface
+   *   The class instance this method is called on.
+   */
+  public function setCache($cache);
+
+  /**
+   * Sets the unique label for the format.
+   *
+   * @param string label
+   *   The unique name of the format.
+   *
+   * @return \Drupal\filter\FilterFormatInterface
+   *   The class instance this method is called on.
+   */
+  public function setLabel($label);
+
+  /**
+   * Sets the unique id for the format.
+   *
+   * @param string $id
+   *   The unique id for the format.
+   *
+   * @return \Drupal\filter\FilterFormatInterface
+   *   The class instance this method is called on.
+   */
+  public function setId($id);
+
 }
diff --git a/core/modules/filter/src/Tests/FilterAdminTest.php b/core/modules/filter/src/Tests/FilterAdminTest.php
index de3ab11..ef0953e 100644
--- a/core/modules/filter/src/Tests/FilterAdminTest.php
+++ b/core/modules/filter/src/Tests/FilterAdminTest.php
@@ -243,13 +243,13 @@ function testFilterAdmin() {
     filter_formats_reset();
     $format = entity_load('filter_format', $edit['format']);
     $this->assertNotNull($format, 'Format found in database.');
-    $this->drupalGet('admin/config/content/formats/manage/' . $format->format);
+    $this->drupalGet('admin/config/content/formats/manage/' . $format->id());
     $this->assertFieldByName('roles[' . DRUPAL_AUTHENTICATED_RID . ']', '', 'Role found.');
     $this->assertFieldByName('filters[' . $second_filter . '][status]', '', 'Line break filter found.');
     $this->assertFieldByName('filters[' . $first_filter . '][status]', '', 'Url filter found.');
 
     // Disable new filter.
-    $this->drupalPostForm('admin/config/content/formats/manage/' . $format->format . '/disable', array(), t('Disable'));
+    $this->drupalPostForm('admin/config/content/formats/manage/' . $format->id() . '/disable', array(), t('Disable'));
     $this->assertUrl('admin/config/content/formats');
     $this->assertRaw(t('Disabled text format %format.', array('%format' => $edit['name'])), 'Format successfully disabled.');
 
@@ -260,7 +260,7 @@ function testFilterAdmin() {
     $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = 1;
     $this->drupalPostForm('admin/config/content/formats/manage/' . $full, $edit, t('Save configuration'));
     $this->assertUrl('admin/config/content/formats');
-    $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->name)), 'Full HTML format successfully updated.');
+    $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->getLabel())), 'Full HTML format successfully updated.');
 
     // Switch user.
     $this->drupalLogin($this->web_user);
@@ -318,7 +318,7 @@ function testFilterAdmin() {
     $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = FALSE;
     $this->drupalPostForm('admin/config/content/formats/manage/' . $full, $edit, t('Save configuration'));
     $this->assertUrl('admin/config/content/formats');
-    $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->name)), 'Full HTML format successfully reverted.');
+    $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->getLabel())), 'Full HTML format successfully reverted.');
     $this->drupalGet('admin/config/content/formats/manage/' . $full);
     $this->assertFieldByName('roles[' . DRUPAL_AUTHENTICATED_RID . ']', $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'], 'Changes reverted.');
 
diff --git a/core/modules/filter/src/Tests/FilterCrudTest.php b/core/modules/filter/src/Tests/FilterCrudTest.php
index 37d1232..de46a6d 100644
--- a/core/modules/filter/src/Tests/FilterCrudTest.php
+++ b/core/modules/filter/src/Tests/FilterCrudTest.php
@@ -29,8 +29,8 @@ class FilterCrudTest extends DrupalUnitTestBase {
   function testTextFormatCrud() {
     // Add a text format with minimum data only.
     $format = entity_create('filter_format');
-    $format->format = 'empty_format';
-    $format->name = 'Empty format';
+    $format->setId('empty_format');
+    $format->setLabel('Empty format');
     $format->save();
     $this->verifyTextFormat($format);
 
@@ -49,7 +49,7 @@ function testTextFormatCrud() {
     $this->verifyTextFormat($format);
 
     // Alter some text format properties and save again.
-    $format->name = 'Altered format';
+    $format->setLabel('Altered format');
     $format->setFilterConfig('filter_url', array(
       'status' => 0,
     ));
@@ -70,21 +70,21 @@ function testTextFormatCrud() {
     $format->disable()->save();
 
     $formats = filter_formats();
-    $this->assertTrue(!isset($formats[$format->format]), 'filter_formats: Disabled text format no longer exists.');
+    $this->assertTrue(!isset($formats[$format->id()]), 'filter_formats: Disabled text format no longer exists.');
   }
 
   /**
    * Verifies that a text format is properly stored.
    */
   function verifyTextFormat($format) {
-    $t_args = array('%format' => $format->name);
+    $t_args = array('%format' => $format->getLabel());
     $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
 
     // Verify the loaded filter has all properties.
-    $filter_format = entity_load('filter_format', $format->format);
-    $this->assertEqual($filter_format->format, $format->format, format_string('filter_format_load: Proper format id for text format %format.', $t_args));
-    $this->assertEqual($filter_format->name, $format->name, format_string('filter_format_load: Proper title for text format %format.', $t_args));
-    $this->assertEqual($filter_format->weight, $format->weight, format_string('filter_format_load: Proper weight for text format %format.', $t_args));
+    $filter_format = entity_load('filter_format', $format->id());
+    $this->assertEqual($filter_format->id(), $format->id(), format_string('filter_format_load: Proper format id for text format %format.', $t_args));
+    $this->assertEqual($filter_format->getLabel(), $format->getLabel(), format_string('filter_format_load: Proper title for text format %format.', $t_args));
+    $this->assertEqual($filter_format->getWeight(), $format->getWeight(), format_string('filter_format_load: Proper weight for text format %format.', $t_args));
     // Check that the filter was created in site default language.
     $this->assertEqual($format->language()->getId(), $default_langcode, format_string('filter_format_load: Proper language code for text format %format.', $t_args));
   }
diff --git a/core/modules/filter/src/Tests/FilterDefaultConfigTest.php b/core/modules/filter/src/Tests/FilterDefaultConfigTest.php
index 5af4758..939349a 100644
--- a/core/modules/filter/src/Tests/FilterDefaultConfigTest.php
+++ b/core/modules/filter/src/Tests/FilterDefaultConfigTest.php
@@ -40,13 +40,13 @@ function testInstallation() {
     $this->assertTrue((bool) $format);
     $this->assertEqual($format->id(), 'filter_test');
     $this->assertEqual($format->label(), 'Test format');
-    $this->assertEqual($format->get('weight'), 2);
+    $this->assertEqual($format->getWeight(), 2);
 
     // Verify that format default property values have been added/injected.
     $this->assertTrue($format->uuid());
 
     // Verify that the loaded format does not contain any roles.
-    $this->assertEqual($format->get('roles'), NULL);
+    $this->assertEqual($format->getRoles(), NULL);
     // Verify that the defined roles in the default config have been processed.
     $this->assertEqual(array_keys(filter_get_roles_by_format($format)), array(
       DRUPAL_ANONYMOUS_RID,
@@ -83,7 +83,7 @@ function testUpdateRoles() {
     ));
 
     // Attempt to change roles.
-    $format->set('roles', array(
+    $format->setRoles(array(
       DRUPAL_AUTHENTICATED_RID,
     ));
     $format->save();
diff --git a/core/modules/filter/src/Tests/FilterDefaultFormatTest.php b/core/modules/filter/src/Tests/FilterDefaultFormatTest.php
index 5bde08e..6f79b36 100644
--- a/core/modules/filter/src/Tests/FilterDefaultFormatTest.php
+++ b/core/modules/filter/src/Tests/FilterDefaultFormatTest.php
@@ -49,24 +49,24 @@ function testDefaultTextFormats() {
     // Adjust the weights so that the first and second formats (in that order)
     // are the two lowest weighted formats available to any user.
     $edit = array();
-    $edit['formats[' . $first_format->format . '][weight]'] = -2;
-    $edit['formats[' . $second_format->format . '][weight]'] = -1;
+    $edit['formats[' . $first_format->id() . '][weight]'] = -2;
+    $edit['formats[' . $second_format->id() . '][weight]'] = -1;
     $this->drupalPostForm('admin/config/content/formats', $edit, t('Save changes'));
     $this->resetFilterCaches();
 
     // Check that each user's default format is the lowest weighted format that
     // the user has access to.
     $actual = filter_default_format($first_user);
-    $expected = $first_format->format;
+    $expected = $first_format->id();
     $this->assertEqual($actual, $expected, "First user's default format $actual is the expected lowest weighted format $expected that the user has access to.");
     $actual = filter_default_format($second_user);
-    $expected = $second_format->format;
+    $expected = $second_format->id();
     $this->assertEqual($actual, $expected, "Second user's default format $actual is the expected lowest weighted format $expected that the user has access to, and different to the first user's.");
 
     // Reorder the two formats, and check that both users now have the same
     // default.
     $edit = array();
-    $edit['formats[' . $second_format->format . '][weight]'] = -3;
+    $edit['formats[' . $second_format->id() . '][weight]'] = -3;
     $this->drupalPostForm('admin/config/content/formats', $edit, t('Save changes'));
     $this->resetFilterCaches();
     $this->assertEqual(filter_default_format($first_user), filter_default_format($second_user), 'After the formats are reordered, both users have the same default format.');
diff --git a/core/modules/filter/src/Tests/FilterFormatAccessTest.php b/core/modules/filter/src/Tests/FilterFormatAccessTest.php
index 580e60c..92171c9 100644
--- a/core/modules/filter/src/Tests/FilterFormatAccessTest.php
+++ b/core/modules/filter/src/Tests/FilterFormatAccessTest.php
@@ -131,8 +131,8 @@ function testFormatPermissions() {
 
     // Perform similar checks as above, but now against the entire list of
     // available formats for this user.
-    $this->assertTrue(in_array($this->allowed_format->format, array_keys(filter_formats($this->web_user))), 'The allowed format appears in the list of available formats for a regular user.');
-    $this->assertFalse(in_array($this->disallowed_format->format, array_keys(filter_formats($this->web_user))), 'The disallowed format does not appear in the list of available formats for a regular user.');
+    $this->assertTrue(in_array($this->allowed_format->id(), array_keys(filter_formats($this->web_user))), 'The allowed format appears in the list of available formats for a regular user.');
+    $this->assertFalse(in_array($this->disallowed_format->id(), array_keys(filter_formats($this->web_user))), 'The disallowed format does not appear in the list of available formats for a regular user.');
     $this->assertTrue(in_array(filter_fallback_format(), array_keys(filter_formats($this->web_user))), 'The fallback format appears in the list of available formats for a regular user.');
 
     // Make sure that a regular user only has permission to use the format
@@ -146,20 +146,20 @@ function testFormatPermissions() {
     $this->drupalGet('node/add/page');
     $elements = $this->xpath('//select[@name=:name]/option', array(
       ':name' => 'body[0][format]',
-      ':option' => $this->allowed_format->format,
+      ':option' => $this->allowed_format->id(),
     ));
     $options = array();
     foreach ($elements as $element) {
       $options[(string) $element['value']] = $element;
     }
-    $this->assertTrue(isset($options[$this->allowed_format->format]), 'The allowed text format appears as an option when adding a new node.');
-    $this->assertFalse(isset($options[$this->disallowed_format->format]), 'The disallowed text format does not appear as an option when adding a new node.');
+    $this->assertTrue(isset($options[$this->allowed_format->id()]), 'The allowed text format appears as an option when adding a new node.');
+    $this->assertFalse(isset($options[$this->disallowed_format->id()]), 'The disallowed text format does not appear as an option when adding a new node.');
     $this->assertFalse(isset($options[filter_fallback_format()]), 'The fallback format does not appear as an option when adding a new node.');
 
     // Check regular user access to the filter tips pages.
-    $this->drupalGet('filter/tips/' . $this->allowed_format->format);
+    $this->drupalGet('filter/tips/' . $this->allowed_format->id());
     $this->assertResponse(200);
-    $this->drupalGet('filter/tips/' . $this->disallowed_format->format);
+    $this->drupalGet('filter/tips/' . $this->disallowed_format->id());
     $this->assertResponse(403);
     $this->drupalGet('filter/tips/' . filter_fallback_format());
     $this->assertResponse(200);
@@ -168,9 +168,9 @@ function testFormatPermissions() {
 
     // Check admin user access to the filter tips pages.
     $this->drupalLogin($this->admin_user);
-    $this->drupalGet('filter/tips/' . $this->allowed_format->format);
+    $this->drupalGet('filter/tips/' . $this->allowed_format->id());
     $this->assertResponse(200);
-    $this->drupalGet('filter/tips/' . $this->disallowed_format->format);
+    $this->drupalGet('filter/tips/' . $this->disallowed_format->id());
     $this->assertResponse(200);
     $this->drupalGet('filter/tips/' . filter_fallback_format());
     $this->assertResponse(200);
@@ -194,8 +194,8 @@ function testFormatRoles() {
 
     // Check that the correct text format appears in the list of formats
     // available to that role.
-    $this->assertTrue(in_array($this->allowed_format->format, array_keys(filter_get_formats_by_role($rid))), 'A text format which a role has access to appears in the list of formats available to that role.');
-    $this->assertFalse(in_array($this->disallowed_format->format, array_keys(filter_get_formats_by_role($rid))), 'A text format which a role does not have access to does not appear in the list of formats available to that role.');
+    $this->assertTrue(in_array($this->allowed_format->id(), array_keys(filter_get_formats_by_role($rid))), 'A text format which a role has access to appears in the list of formats available to that role.');
+    $this->assertFalse(in_array($this->disallowed_format->id(), array_keys(filter_get_formats_by_role($rid))), 'A text format which a role does not have access to does not appear in the list of formats available to that role.');
 
     // Check that the fallback format is always allowed.
     $this->assertEqual(filter_get_roles_by_format(entity_load('filter_format', filter_fallback_format())), user_role_names(), 'All roles have access to the fallback format.');
@@ -220,7 +220,7 @@ function testFormatWidgetPermissions() {
     $edit = array();
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit[$body_value_key] = $this->randomMachineName(16);
-    $edit[$body_format_key] = $this->disallowed_format->format;
+    $edit[$body_format_key] = $this->disallowed_format->id();
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
 
@@ -293,7 +293,7 @@ function testFormatWidgetPermissions() {
     // Switch the text format to a new one, then disable that format and all
     // other formats on the site (leaving only the fallback format).
     $this->drupalLogin($this->admin_user);
-    $edit = array($body_format_key => $this->allowed_format->format);
+    $edit = array($body_format_key => $this->allowed_format->id());
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
     $this->assertUrl('node/' . $node->id());
     foreach (filter_formats() as $format) {
diff --git a/core/modules/filter/src/Tests/FilterFormatMethodsTest.php b/core/modules/filter/src/Tests/FilterFormatMethodsTest.php
new file mode 100644
index 0000000..1fb0da0
--- /dev/null
+++ b/core/modules/filter/src/Tests/FilterFormatMethodsTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\filter\Tests\FilterFormatMethodsTest.
+ */
+
+namespace Drupal\filter\Tests;
+
+use Drupal\simpletest\KernelTestBase;
+
+/**
+ * Tests get and set methods on text format interface.
+ *
+ * @group block
+ */
+class FilterFormatMethodsTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('filter');
+
+  /**
+   * Text format object.
+   *
+   * @var object
+   */
+  private $format;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    $this->format = entity_create('filter_format', array());
+    $this->format->setId('custom_format');
+    $this->format->setLabel('Custom format');
+    $this->format->setFilterConfig('filter_url', array(
+      'status' => 1,
+      'settings' => array(
+        'filter_url_length' => 30,
+      ),
+    ));
+    $this->format->save();
+  }
+
+  /**
+   * Tests weight get and set method.
+   */
+  function testGetWeight() {
+    $weight = 0;
+    $this->assertIdentical(spl_object_hash($this->format->setWeight($weight)), spl_object_hash($this->format), format_string('Test weight set method for text format %format.', array('%format' => $this->format->getLabel())));
+    $this->assertIdentical($this->format->getWeight(), $weight, format_string('Test weight get method for text format %format.', array('%format' => $this->format->getLabel())));
+  }
+
+  /**
+   * Tests roles get and set method.
+   */
+  function testGetRoles() {
+    $roles = array(0,1);
+    $this->assertIdentical(spl_object_hash($this->format->setRoles($roles)), spl_object_hash($this->format), format_string('Test roles set method for text format %format.', array('%format' => $this->format->getLabel())));
+    $this->assertIdentical($this->format->getRoles(), $roles, format_string('Test roles get method for text format %format.', array('%format' => $this->format->getLabel())));
+  }
+
+  /**
+   * Tests cache get and set method.
+   */
+  function testIsCacheable() {
+    $is_cacheable = TRUE;
+    $this->assertIdentical(spl_object_hash($this->format->setCache($is_cacheable)), spl_object_hash($this->format), format_string('Test cache set method for text format %format.', array('%format' => $this->format->getLabel())));
+    $this->assertIdentical($this->format->isCacheable(), $is_cacheable, format_string('Test cache get method for text format %format.', array('%format' => $this->format->getLabel())));
+  }
+
+}
