diff --git a/core/modules/file/file.install b/core/modules/file/file.install
index 3ca855e..8927e26 100644
--- a/core/modules/file/file.install
+++ b/core/modules/file/file.install
@@ -273,7 +273,7 @@ function file_update_8002() {
       else {
         $field['settings']['default_image'] = array();
       }
-      field_update_field($field);
+      $field->save();
 
       $instances = field_read_instances(array('field_name' => $field['field_name']));
       foreach ($instances as $instance) {
@@ -283,7 +283,7 @@ function file_update_8002() {
         else {
           $instance['settings']['default_image'] = array();
         }
-        field_update_instance($instance);
+        $instance->save();
       }
     }
   }
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php
index 8cff731..ed29cba 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php
@@ -65,14 +65,15 @@ function getLastFileId() {
    *   A list of widget settings that will be added to the widget defaults.
    */
   function createFileField($name, $type_name, $field_settings = array(), $instance_settings = array(), $widget_settings = array()) {
-    $field = array(
+    $field_definition = array(
       'field_name' => $name,
       'type' => 'file',
       'settings' => array(),
       'cardinality' => !empty($field_settings['cardinality']) ? $field_settings['cardinality'] : 1,
     );
-    $field['settings'] = array_merge($field['settings'], $field_settings);
-    $field = field_create_field($field);
+    $field_definition['settings'] = array_merge($field_definition['settings'], $field_settings);
+    $field = entity_create('field_entity', $field_definition);
+    $field->save();
 
     $this->attachFileField($name, 'node', $type_name, $instance_settings, $widget_settings);
     return $field;
@@ -109,7 +110,7 @@ function attachFileField($name, $entity_type, $bundle, $instance_settings = arra
     );
     $instance['settings'] = array_merge($instance['settings'], $instance_settings);
     $instance['widget']['settings'] = array_merge($instance['widget']['settings'], $widget_settings);
-    field_create_instance($instance);
+    entity_create('field_instance', $instance)->save();
   }
 
   /**
@@ -120,7 +121,7 @@ function updateFileField($name, $type_name, $instance_settings = array(), $widge
     $instance['settings'] = array_merge($instance['settings'], $instance_settings);
     $instance['widget']['settings'] = array_merge($instance['widget']['settings'], $widget_settings);
 
-    field_update_instance($instance);
+    $instance->save();
   }
 
   /**
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php
index faceb99..37633e1 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php
@@ -50,7 +50,7 @@ function testRequired() {
     $this->assertFileEntryExists($node_file, t('File entry exists after uploading to the required field.'));
 
     // Try again with a multiple value field.
-    field_delete_field($field_name);
+    $field->delete();
     $this->createFileField($field_name, $type_name, array('cardinality' => FIELD_CARDINALITY_UNLIMITED), array('required' => '1'));
 
     // Try to post a new node without uploading a file in the multivalue field.
@@ -151,4 +151,5 @@ function testFileExtension() {
     $this->assertFileExists($node_file, t('File exists after uploading a file with extension checking.'));
     $this->assertFileEntryExists($node_file, t('File entry exists after uploading a file with extension checking.'));
   }
+
 }
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php b/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php
index 2ec9dfa..674553c 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php
@@ -49,13 +49,13 @@ public function setUp() {
       'type' => 'file',
       'cardinality' => FIELD_CARDINALITY_UNLIMITED,
     );
-    field_create_field($field);
+    entity_create('field_entity', $field)->save();
     $instance = array(
       'entity_type' => 'entity_test',
       'field_name' => 'file_test',
       'bundle' => 'entity_test',
     );
-    field_create_instance($instance);
+    entity_create('field_instance', $instance)->save();
     file_put_contents('public://example.txt', $this->randomName());
     $this->file = entity_create('file', array(
       'uri' => 'public://example.txt',
diff --git a/core/modules/forum/forum.install b/core/modules/forum/forum.install
index 1bc6915..9f9b44b 100644
--- a/core/modules/forum/forum.install
+++ b/core/modules/forum/forum.install
@@ -65,7 +65,7 @@ function forum_enable() {
         ),
       ),
     );
-    field_create_field($field);
+    entity_create('field_entity', $field)->save();
 
     // Create a default forum so forum posts can be created.
     $term = entity_create('taxonomy_term', array(
@@ -88,7 +88,7 @@ function forum_enable() {
         'type' => 'options_select',
       ),
     );
-    field_create_instance($instance);
+    entity_create('field_instance', $instance)->save();
 
     // Assign display settings for the 'default' and 'teaser' view modes.
     entity_get_display('node', 'forum', 'default')
@@ -120,7 +120,7 @@ function forum_uninstall() {
 
   variable_del('node_options_forum');
 
-  field_delete_field('taxonomy_forums');
+  field_info_field('taxonomy_forums')->delete();
   // Purge field data now to allow taxonomy module to be uninstalled
   // if this is the only field remaining.
   field_purge_batch(10);
diff --git a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php b/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php
index b40bffa..e26641e 100644
--- a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php
+++ b/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php
@@ -83,13 +83,13 @@ function setUp() {
       'type' => 'text',
       'translatable' => FALSE,
     );
-    field_create_field($field);
+    entity_create('field_entity', $field)->save();
     $instance = array(
       'entity_type' => 'entity_test',
       'field_name' => 'field_test_text',
       'bundle' => 'entity_test',
     );
-    field_create_instance($instance);
+    entity_create('field_instance', $instance)->save();
 
     // Create the test translatable field.
     $field = array(
@@ -97,13 +97,13 @@ function setUp() {
       'type' => 'text',
       'translatable' => TRUE,
     );
-    field_create_field($field);
+    entity_create('field_entity', $field)->save();
     $instance = array(
       'entity_type' => 'entity_test',
       'field_name' => 'field_test_translatable_text',
       'bundle' => 'entity_test',
     );
-    field_create_instance($instance);
+    entity_create('field_instance', $instance)->save();
 
     // Create the test entity reference field.
     $field = array(
@@ -114,13 +114,13 @@ function setUp() {
       'field_name' => 'field_test_entity_reference',
       'type' => 'entity_reference',
     );
-    field_create_field($field);
+    entity_create('field_entity', $field)->save();
     $instance = array(
       'entity_type' => 'entity_test',
       'field_name' => 'field_test_entity_reference',
       'bundle' => 'entity_test',
     );
-    field_create_instance($instance);
+    entity_create('field_instance', $instance)->save();
 
     // Set up the mock serializer.
     $normalizers = array(
diff --git a/core/modules/image/lib/Drupal/image/ImageStyleStorageController.php b/core/modules/image/lib/Drupal/image/ImageStyleStorageController.php
index 4bbbbde..f2a96ab 100644
--- a/core/modules/image/lib/Drupal/image/ImageStyleStorageController.php
+++ b/core/modules/image/lib/Drupal/image/ImageStyleStorageController.php
@@ -94,7 +94,7 @@ protected function replaceImageStyle(ImageStyle $style) {
           }
           if ($instance['widget']['settings']['preview_image_style'] == $style->getOriginalID()) {
             $instance['widget']['settings']['preview_image_style'] = $style->id();
-            field_update_instance($instance);
+            $instance->save();
           }
         }
       }
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
index c8570c1..903ba2a 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
@@ -51,12 +51,11 @@ function testDefaultImages() {
     $widget_settings = array(
       'preview_image_style' => 'medium',
     );
-    $this->createImageField($field_name, 'article', $field_settings, $instance_settings, $widget_settings);
+    $instance = $this->createImageField($field_name, 'article', $field_settings, $instance_settings, $widget_settings);
     $field = field_info_field($field_name);
-    $instance = field_info_instance('node', $field_name, 'article');
 
     // Add another instance with another default image to the page content type.
-    $instance2 = array(
+    $instance2 = entity_create('field_instance', array(
       'field_name' => $field['field_name'],
       'entity_type' => 'node',
       'bundle' => 'page',
@@ -66,9 +65,8 @@ function testDefaultImages() {
         'default_image' => array($default_images['instance2']->fid),
       ),
       'widget' => $instance['widget'],
-    );
-    field_create_instance($instance2);
-    $instance2 = field_info_instance('node', $field_name, 'page');
+    ));
+    $instance2->save();
     entity_get_display('node', 'page', 'default')
       ->setComponent($field['field_name'])
       ->save();
@@ -141,7 +139,7 @@ function testDefaultImages() {
 
     // Upload a new default for the field.
     $field['settings']['default_image'] = array($default_images['field_new']->fid);
-    field_update_field($field);
+    $field->save();
 
     // Confirm that the new default is used on the article field settings form.
     $this->drupalGet("admin/structure/types/manage/article/fields/$instance->id/field-settings");
@@ -176,7 +174,7 @@ function testDefaultImages() {
 
     // Upload a new default for the article's field instance.
     $instance['settings']['default_image'] = array($default_images['instance_new']->fid);
-    field_update_instance($instance);
+    $instance->save();
 
     // Confirm the new field instance default is used on the article field
     // admin form.
@@ -215,7 +213,7 @@ function testDefaultImages() {
 
     // Remove the instance default from articles.
     $instance['settings']['default_image'] = NULL;
-    field_update_instance($instance);
+    $instance->save();
 
     // Confirm the article field instance default has been removed.
     $this->drupalGet("admin/structure/types/manage/article/fields/$instance->id");
@@ -247,4 +245,5 @@ function testDefaultImages() {
       )
     );
   }
+
 }
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php
index 5a4e20e..c125792 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php
@@ -75,7 +75,7 @@ function createImageField($name, $type_name, $field_settings = array(), $instanc
       'cardinality' => !empty($field_settings['cardinality']) ? $field_settings['cardinality'] : 1,
     );
     $field['settings'] = array_merge($field['settings'], $field_settings);
-    field_create_field($field);
+    entity_create('field_entity', $field)->save();
 
     $instance = array(
       'field_name' => $field['field_name'],
@@ -93,7 +93,8 @@ function createImageField($name, $type_name, $field_settings = array(), $instanc
     $instance['settings'] = array_merge($instance['settings'], $instance_settings);
     $instance['widget']['settings'] = array_merge($instance['widget']['settings'], $widget_settings);
 
-    $field_instance = field_create_instance($instance);
+    $field_instance = entity_create('field_instance', $instance);
+    $field_instance->save();
 
     entity_get_display('node', $type_name, 'default')
       ->setComponent($field['field_name'])
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php
index 7f863cf..86d1cd8 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php
@@ -48,7 +48,7 @@ public function setUp() {
       'type' => 'image',
       'cardinality' => FIELD_CARDINALITY_UNLIMITED,
     );
-    field_create_field($field);
+    entity_create('field_entity', $field)->save();
     $instance = array(
       'entity_type' => 'entity_test',
       'field_name' => 'image_test',
@@ -57,7 +57,7 @@ public function setUp() {
         'type' => 'image_image',
       ),
     );
-    field_create_instance($instance);
+    entity_create('field_instance', $instance)->save();
     file_unmanaged_copy(DRUPAL_ROOT . '/core/misc/druplicon.png', 'public://example.jpg');
     $this->image = entity_create('file', array(
       'uri' => 'public://example.jpg',
diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
index f28bcc2..94fdfdc 100644
--- a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
+++ b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
@@ -48,7 +48,7 @@ function testURLValidation() {
       'field_name' => drupal_strtolower($this->randomName()),
       'type' => 'link',
     );
-    field_create_field($this->field);
+    entity_create('field_entity', $this->field)->save();
     $this->instance = array(
       'field_name' => $this->field['field_name'],
       'entity_type' => 'test_entity',
@@ -63,7 +63,7 @@ function testURLValidation() {
         ),
       ),
     );
-    field_create_instance($this->instance);
+    entity_create('field_instance', $this->instance)->save();
     entity_get_display('test_entity', 'test_bundle', 'full')
       ->setComponent($this->field['field_name'], array(
         'type' => 'link',
@@ -116,8 +116,8 @@ function testLinkTitle() {
       'field_name' => drupal_strtolower($this->randomName()),
       'type' => 'link',
     );
-    field_create_field($this->field);
-    $this->instance = array(
+    entity_create('field_entity', $this->field)->save();
+    $this->instance = entity_create('field_instance', array(
       'field_name' => $this->field['field_name'],
       'entity_type' => 'test_entity',
       'bundle' => 'test_bundle',
@@ -132,8 +132,8 @@ function testLinkTitle() {
           'placeholder_title' => 'Enter a title for this link',
         ),
       ),
-    );
-    field_create_instance($this->instance);
+    ));
+    $this->instance->save();
     entity_get_display('test_entity', 'test_bundle', 'full')
       ->setComponent($this->field['field_name'], array(
         'type' => 'link',
@@ -147,7 +147,7 @@ function testLinkTitle() {
     foreach (array(DRUPAL_DISABLED, DRUPAL_REQUIRED, DRUPAL_OPTIONAL) as $title_setting) {
       // Update the title field setting.
       $this->instance['settings']['title'] = $title_setting;
-      field_update_instance($this->instance);
+      $this->instance->save();
 
       // Display creation form.
       $this->drupalGet('test-entity/add/test_bundle');
@@ -229,7 +229,7 @@ function testLinkFormatter() {
       'type' => 'link',
       'cardinality' => 2,
     );
-    field_create_field($this->field);
+    entity_create('field_entity', $this->field)->save();
     $this->instance = array(
       'field_name' => $this->field['field_name'],
       'entity_type' => 'test_entity',
@@ -246,7 +246,7 @@ function testLinkFormatter() {
       'type' => 'link',
       'label' => 'hidden',
     );
-    field_create_instance($this->instance);
+    entity_create('field_instance', $this->instance)->save();
     entity_get_display('test_entity', 'test_bundle', 'full')
       ->setComponent($this->field['field_name'], $display_options)
       ->save();
@@ -368,7 +368,7 @@ function testLinkSeparateFormatter() {
       'type' => 'link',
       'cardinality' => 2,
     );
-    field_create_field($this->field);
+    entity_create('field_entity', $this->field)->save();
     $this->instance = array(
       'field_name' => $this->field['field_name'],
       'entity_type' => 'test_entity',
@@ -384,7 +384,7 @@ function testLinkSeparateFormatter() {
       'type' => 'link_separate',
       'label' => 'hidden',
     );
-    field_create_instance($this->instance);
+    entity_create('field_instance', $this->instance)->save();
     entity_get_display('test_entity', 'test_bundle', 'full')
       ->setComponent($this->field['field_name'], $display_options)
       ->save();
diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php b/core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php
index e59e403..3968e5f 100644
--- a/core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php
+++ b/core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php
@@ -35,20 +35,20 @@ public function setUp() {
     parent::setUp();
 
     // Create an link field and instance for validation.
-    $this->field = array(
+    $this->field = entity_create('field_entity', array(
       'field_name' => 'field_test',
       'type' => 'link',
-    );
-    field_create_field($this->field);
-    $this->instance = array(
+    ));
+    $this->field->save();
+    $this->instance = entity_create('field_instance', array(
       'entity_type' => 'entity_test',
       'field_name' => 'field_test',
       'bundle' => 'entity_test',
       'widget' => array(
         'type' => 'link_default',
       ),
-    );
-    field_create_instance($this->instance);
+    ));
+    $this->instance->save();
   }
 
   /**