diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php b/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php
index ab9c5af..5afe523 100644
--- a/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php
+++ b/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php
@@ -66,9 +66,9 @@ function setUp() {
     ));
 
     $this->display_options = array(
-      'type' => 'datetime_default',
+      'type' => 'formatter',
       'label' => 'hidden',
-      'settings' => array('format_type' => 'medium'),
+      'settings' => array('format_type' => 'long'),
     );
     entity_get_display($this->instance['entity_type'], $this->instance['bundle'], 'full')
       ->setComponent('field', $this->field['field_name'], $this->display_options)
@@ -131,7 +131,7 @@ function testDateField() {
     }
 
     // Verify that the plain formatter works.
-    $this->display_options['type'] = 'datetime_plain';
+    $this->display_options['formatter'] = 'datetime_plain';
     $display = entity_get_display($this->instance['entity_type'], $this->instance['bundle'], 'full')
       ->setComponent('field', $this->instance['field_name'], $this->display_options)
       ->save();
@@ -198,7 +198,7 @@ function testDatetimeField() {
     }
 
     // Verify that the plain formatter works.
-    $this->display_options['type'] = 'datetime_plain';
+    $this->display_options['formatter'] = 'datetime_plain';
     $display = entity_get_display($this->instance['entity_type'], $this->instance['bundle'], 'full')
       ->setComponent('field', $this->instance['field_name'], $this->display_options)
       ->save();
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php b/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php
index 9881438..913c444 100644
--- a/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php
@@ -111,7 +111,7 @@ function setUp() {
   protected function getSelectedEditor($items, $field_name, $view_mode = 'default') {
     $options = entity_get_display('entity_test', 'entity_test', $view_mode)->getComponent('field', $field_name);
     $field_instance = field_info_instance('entity_test', $field_name, 'entity_test');
-    return $this->editorSelector->getEditor($options['type'], $field_instance, $items);
+    return $this->editorSelector->getEditor($options['formatter'], $field_instance, $items);
   }
 
   /**
diff --git a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php b/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php
index 547e9f3..f54c20c 100644
--- a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php
@@ -217,7 +217,7 @@ function testFieldEmpty() {
     // Uses \Drupal\field_test\Plugin\field\formatter\TestFieldEmptyFormatter.
     $display = array(
       'label' => 'hidden',
-      'type' => 'field_empty_test',
+      'formatter' => 'field_empty_test',
       'settings' => array(
         'test_empty_string' => '**EMPTY FIELD**' . $this->randomName(),
       ),
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
index 7b6c415..aa4a1f4 100644
--- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
@@ -324,7 +324,7 @@ function testNodeDisplay() {
     $file_formatters = array('options_list_default', 'options_list_key');
     foreach ($file_formatters as $formatter) {
       $edit = array(
-        "fields[$this->field_name][type]" => $formatter,
+        "fields[$this->field_name][formatter]" => $formatter,
       );
       $this->drupalPost('admin/structure/types/manage/' . $this->type_name . '/display', $edit, t('Save'));
       $this->drupalGet('node/' . $node->nid);