diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php b/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php
index 48268aa..01b4efb 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php
@@ -16,7 +16,7 @@
  * Plugin implementation of the 'list_default' formatter.
  *
  * @Plugin(
- *   id = "options_list_default",
+ *   id = "list_default",
  *   module = "options",
  *   label = @Translation("Default"),
  *   field_types = {
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php b/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php
index d461155..94b076f 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php
@@ -16,7 +16,7 @@
  * Plugin implementation of the 'list_key' formatter.
  *
  * @Plugin(
- *   id = "options_list_key",
+ *   id = "list_key",
  *   module = "options",
  *   label = @Translation("Key"),
  *   field_types = {
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
index 7b6c415..e231458 100644
--- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
@@ -321,7 +321,7 @@ function testNodeDisplay() {
     $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save and keep published'));
 
     // Check the node page and see if the values are correct.
-    $file_formatters = array('options_list_default', 'options_list_key');
+    $file_formatters = array('list_default', 'list_key');
     foreach ($file_formatters as $formatter) {
       $edit = array(
         "fields[$this->field_name][type]" => $formatter,
@@ -329,7 +329,7 @@ function testNodeDisplay() {
       $this->drupalPost('admin/structure/types/manage/' . $this->type_name . '/display', $edit, t('Save'));
       $this->drupalGet('node/' . $node->nid);
 
-      if ($formatter == 'options_list_default') {
+      if ($formatter == 'list_default') {
         $output = $on;
       }
       else {