diff --git a/core/lib/Drupal/Core/TypedData/AllowedValuesInterface.php b/core/lib/Drupal/Core/TypedData/AllowedValuesInterface.php
index 77e50c9..67a8d24 100644
--- a/core/lib/Drupal/Core/TypedData/AllowedValuesInterface.php
+++ b/core/lib/Drupal/Core/TypedData/AllowedValuesInterface.php
@@ -29,38 +29,38 @@
 interface AllowedValuesInterface {
 
   /**
-   * Returns an array of all possible values.
+   * Returns an array of possible values.
    *
    * If the optional $account parameter is passed, then the array is filtered to
    * values viewable by the account.
    *
    * @param \Drupal\Core\Session\AccountInterface $account
-   *   (optional) The user account for which to filter the possible viewable
-   *   values. If omitted the default behavior is to return all possible values.
+   *   (optional) The user account for which to filter the possible values. If
+   *   omitted, all possible values are returned.
    *
    * @return array
-   *   An array of all possible values.
+   *   An array of possible values.
    */
-  public function getAllPossibleValues(AccountInterface $account = NULL);
+  public function getPossibleValues(AccountInterface $account = NULL);
 
   /**
-   * Returns an array of all possible values with labels for display.
+   * Returns an array of possible values with labels for display.
    *
    * If the optional $account parameter is passed, then the array is filtered to
    * values viewable by the account.
    *
    * @param \Drupal\Core\Session\AccountInterface $account
-   *   (optional) The user account for which to filter the possible viewable
-   *   options. If omitted the default behavior is to return all possible
-   *   options.
+   *   (optional) The user account for which to filter the possible options.
+   *   If omitted, all possible options are returned.
    *
    * @return array
-   *   The array of possible options for the object; e.g. for display within a
-   *   widget. This is either a flat array of option labels keyed by values, or
-   *   a multi-dimensional array of option groups; i.e., an array of flat option
-   *   arrays, keyed by option group label. Labels should NOT be sanitized.
+   *   An array of possible options for the object that may rightaway be used in
+   *   an Options widget, for example when existing data should be filtered.
+   *   It may either be a flat array of option labels keyed by values, or a
+   *   two-dimensional array of option groups (array of flat option arrays,
+   *   keyed by option group label). Note that labels should NOT be sanitized.
    */
-  public function getAllPossibleOptions(AccountInterface $account = NULL);
+  public function getPossibleOptions(AccountInterface $account = NULL);
 
   /**
    * Returns an array of settable values.
@@ -70,7 +70,7 @@ public function getAllPossibleOptions(AccountInterface $account = NULL);
    *
    * @param \Drupal\Core\Session\AccountInterface $account
    *   (optional) The user account for which to filter the settable values. If
-   *   omitted the default behavior is to return all settable values.
+   *   omitted, all settable values are returned.
    *
    * @return array
    *   An array of settable values.
@@ -85,13 +85,13 @@ public function getSettableValues(AccountInterface $account = NULL);
    *
    * @param \Drupal\Core\Session\AccountInterface $account
    *   (optional) The user account for which to filter the settable options. If
-   *   omitted the default behavior is to return all settable options.
+   *   omitted, all settable options are returned.
    *
    * @return array
-   *   The array of settable options for the object; e.g. for display within a
-   *   widget. This is either a flat array of option labels keyed by values, or
-   *   a multi-dimensional array of option groups; i.e., an array of flat option
-   *   arrays, keyed by option group label. Labels should NOT be sanitized.
+   *   An array of settable options for the object that may rightaway be used in
+   *   an Options widget, usually when new data should be entered.
+   *   It may either be a flat array of option labels keyed by values, or a
+   *   two-dimensional array of option groups (array of flat option arrays,
+   *   keyed by option group label). Note that labels should NOT be sanitized.
    */
   public function getSettableOptions(AccountInterface $account = NULL);
-}
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php b/core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php
index 8aea6d6..eb0738f 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php
@@ -26,14 +26,14 @@ class FilterFormat extends String implements AllowedValuesInterface {
   /**
    * {@inheritdoc}
    */
-  public function getAllPossibleValues(AccountInterface $account = NULL) {
-    return array_keys($this->getAllPossibleOptions());
+  public function getPossibleValues(AccountInterface $account = NULL) {
+    return array_keys($this->getPossibleOptions());
   }
 
   /**
    * {@inheritdoc}
    */
-  public function getAllPossibleOptions(AccountInterface $account = NULL) {
+  public function getPossibleOptions(AccountInterface $account = NULL) {
     $values = array();
     foreach (filter_formats() as $format) {
       $values[$format->id()] = $format->label();
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php
index 766af63..e163665 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php
@@ -205,9 +205,9 @@ function testTypedDataAPI() {
     $user = drupal_anonymous_user();
     \Drupal::request()->attributes->set('account', $user);
 
-    $available_values = $data->getAllPossibleValues();
+    $available_values = $data->getPossibleValues();
     $this->assertEqual($available_values, array('filtered_html', 'full_html', 'plain_text'));
-    $available_options = $data->getAllPossibleOptions();
+    $available_options = $data->getPossibleOptions();
     $expected_available_options = array(
       'filtered_html' => 'Filtered HTML',
       'full_html' => 'Full HTML',