diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index bc11462..331701a 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -516,12 +516,12 @@ function field_update_8006(&$sandbox) {
         $from_fields[] = $sql_column;
         $insert_fields[] = $sql_column;
       }
-      $from_query = db_select($original_table)
-        ->fields($from_fields)
+      $from_query = db_select($original_table, 'original')
+        ->fields('original', $from_fields)
         ->condition('entity_type', $field_config['entity_type']);
       db_insert($table)
         ->fields($insert_fields)
-        ->fromQuery($from_query)
+        ->from($from_query)
         ->execute();
     }
   }
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
index 0cca113..446ee14 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
@@ -238,7 +238,7 @@ public function __construct(array $values, $entity_type = 'field_instance') {
     if (isset($values['field_name']) && isset($values['entity_type']) && !isset($values['field_uuid'])) {
       $field = field_info_field($values['entity_type'], $values['field_name']);
       if (!$field) {
-        throw new FieldException(format_string('Attempt to create an instance of unknown, disabled, or deleted field @field_id', array('@field_id' => $values['field_name'])));
+        throw new FieldException(format_string('Attempt to create an instance of unknown, disabled, or deleted field @field_name', array('@field_name' => $values['field_name'])));
       }
       $values['field_uuid'] = $field->uuid;
     }
@@ -267,10 +267,10 @@ public function __construct(array $values, $entity_type = 'field_instance') {
 
     // Check required properties.
     if (empty($values['entity_type'])) {
-      throw new FieldException(format_string('Attempt to create an instance of field @field_id without an entity_type.', array('@field_id' => $this->field->name)));
+      throw new FieldException(format_string('Attempt to create an instance of field @field_name without an entity_type.', array('@field_name' => $this->field->name)));
     }
     if (empty($values['bundle'])) {
-      throw new FieldException(format_string('Attempt to create an instance of field @field_id without a bundle.', array('@field_id' => $this->field->name)));
+      throw new FieldException(format_string('Attempt to create an instance of field @field_name without a bundle.', array('@field_name' => $this->field->name)));
     }
 
     // 'Label' defaults to the field name (mostly useful for field instances
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php
index f3f45e9..03490a5 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php
@@ -256,11 +256,7 @@ function testFieldAttachCache() {
 
     // Cacheable entity type.
     $entity_type = 'entity_test_cache';
-    $instance_definition = $this->instance_definition;
-    $instance_definition['entity_type'] = $entity_type;
-    $instance_definition['bundle'] = $entity_type;
-    entity_create('field_instance', $instance_definition)->save();
-
+    $this->createFieldWithInstance('_2', 'entity_test_cache');
     entity_info_cache_clear();
 
     $entity_init = entity_create($entity_type, array(
@@ -268,11 +264,12 @@ function testFieldAttachCache() {
     ));
 
     // Check that no initial cache entry is present.
+    $cid = "field:$entity_type:" . $entity->id();
     $this->assertFalse(cache('field')->get($cid), 'Cached: no initial cache entry');
 
     // Save, and check that no cache entry is present.
     $entity = clone($entity_init);
-    $entity->{$this->field_name} = $values;
+    $entity->{$this->field_name_2} = $values;
     $entity->save();
     $cid = "field:$entity_type:" . $entity->id();
     $this->assertFalse(cache('field')->get($cid), 'Cached: no cache entry on insert');
@@ -282,15 +279,15 @@ function testFieldAttachCache() {
     $controller->resetCache();
     $controller->load($entity->id());
     $cache = cache('field')->get($cid);
-    $this->assertEqual($cache->data[$this->field_name][$langcode], $values, 'Cached: correct cache entry on load');
+    $this->assertEqual($cache->data[$this->field_name_2][$langcode], $values, 'Cached: correct cache entry on load');
 
     // Update with different values, and check that the cache entry is wiped.
-    $values = $this->_generateTestFieldValues($this->field['cardinality']);
+    $values = $this->_generateTestFieldValues($this->field_name_2['cardinality']);
     $entity = entity_create($entity_type, array(
       'type' => $entity_type,
       'id' => $entity->id(),
     ));
-    $entity->{$this->field_name} = $values;
+    $entity->{$this->field_name_2} = $values;
     $entity->save();
     $this->assertFalse(cache('field')->get($cid), 'Cached: no cache entry on update');
 
@@ -298,14 +295,14 @@ function testFieldAttachCache() {
     $controller->resetCache();
     $controller->load($entity->id());
     $cache = cache('field')->get($cid);
-    $this->assertEqual($cache->data[$this->field_name][$langcode], $values, 'Cached: correct cache entry on load');
+    $this->assertEqual($cache->data[$this->field_name_2][$langcode], $values, 'Cached: correct cache entry on load');
 
     // Create a new revision, and check that the cache entry is wiped.
     $entity = entity_create($entity_type, array(
       'type' => $entity_type,
       'id' => $entity->id(),
     ));
-    $values = $this->_generateTestFieldValues($this->field['cardinality']);
+    $values = $this->_generateTestFieldValues($this->field_name_2['cardinality']);
     $entity->{$this->field_name} = $values;
     $entity->setNewRevision();
     $entity->save();
@@ -315,7 +312,7 @@ function testFieldAttachCache() {
     $controller->resetCache();
     $controller->load($entity->id());
     $cache = cache('field')->get($cid);
-    $this->assertEqual($cache->data[$this->field_name][$langcode], $values, 'Cached: correct cache entry on load');
+    $this->assertEqual($cache->data[$this->field_name_2][$langcode], $values, 'Cached: correct cache entry on load');
 
     // Delete, and check that the cache entry is wiped.
     $entity->delete();
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php
index bdfae09..a923456 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php
@@ -26,11 +26,13 @@ public static function getInfo() {
    * Tests creating fields and instances during default config import.
    */
   function testImportCreateDefault() {
-    $field_id = 'field_test_import';
-    $instance_id = "entity_test.entity_test.$field_id";
-    $field_id_2 = 'field_test_import_2';
-    $instance_id_2a = "entity_test.entity_test.$field_id_2";
-    $instance_id_2b = "entity_test.entity_test.$field_id_2";
+    $field_name = 'field_test_import';
+    $field_id = "entity_test.$field_name";
+    $instance_id = "entity_test.entity_test.$field_name";
+    $field_name_2 = 'field_test_import_2';
+    $field_id_2 = "entity_test.$field_name_2";
+    $instance_id_2a = "entity_test.entity_test.$field_name_2";
+    $instance_id_2b = "entity_test.test_bundle.$field_name_2";
 
     // Check that the fields and instances do not exist yet.
     $this->assertFalse(entity_load('field_entity', $field_id));
@@ -56,9 +58,9 @@ function testImportCreateDefault() {
     $field_2 = entity_load('field_entity', $field_id_2);
     $this->assertTrue($field_2, 'The second field was created.');
     $instance_2a = entity_load('field_instance', $instance_id_2a);
-    $this->assertTrue($instance->bundle, 'test_bundle', 'The second field instance was created on bundle test_bundle.');
+    $this->assertTrue($instance_2a->bundle, 'entity_test', 'The second field instance was created on bundle entity_test.');
     $instance_2b = entity_load('field_instance', $instance_id_2b);
-    $this->assertTrue($instance->bundle, 'test_bundle_2', 'The second field instance was created on bundle test_bundle_2.');
+    $this->assertTrue($instance_2b->bundle, 'test_bundle', 'The second field instance was created on bundle test_bundle.');
 
     // Tests field info contains the right data.
     $instances = Field::fieldInfo()->getInstances('entity_test');
@@ -74,15 +76,17 @@ function testImportCreateDefault() {
    */
   function testImportCreate() {
     // One field with one field instance.
-    $field_id = 'field_test_import_staging';
-    $instance_id = "entity_test.entity_test.$field_id";
+    $field_name = 'test_staging';
+    $field_id = "entity_test.$field_name";
+    $instance_id = "entity_test.entity_test.$field_name";
     $field_config_name = "field.field.$field_id";
     $instance_config_name = "field.instance.$instance_id";
 
     // One field with two field instances.
-    $field_id_2 = 'field_test_import_staging_2';
-    $instance_id_2a = "entity_test.test_bundle.$field_id_2";
-    $instance_id_2b = "entity_test.test_bundle_2.$field_id_2";
+    $field_name_2 = 'test_staging_2';
+    $field_id_2 = "entity_test.$field_name_2";
+    $instance_id_2a = "entity_test.test_bundle.$field_name_2";
+    $instance_id_2b = "entity_test.test_bundle_2.$field_name_2";
     $field_config_name_2 = "field.field.$field_id_2";
     $instance_config_name_2a = "field.instance.$instance_id_2a";
     $instance_config_name_2b = "field.instance.$instance_id_2b";
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldImportDeleteTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldImportDeleteTest.php
index 216d36a..23ae199 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FieldImportDeleteTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldImportDeleteTest.php
@@ -31,11 +31,13 @@ public static function getInfo() {
    * Tests deleting fields and instances as part of config import.
    */
   public function testImportDelete() {
-    $field_id = 'field_test_import';
-    $field_id_2 = 'field_test_import_2';
-    $instance_id = "entity_test.test_bundle.$field_id";
-    $instance_id_2a = "entity_test.test_bundle.$field_id_2";
-    $instance_id_2b = "entity_test.test_bundle_2.$field_id_2";
+    $field_name = 'field_test_import';
+    $field_id = "entity_test.$field_name";
+    $field_name_2 = 'field_test_import_2';
+    $field_id_2 = "entity_test.$field_name_2";
+    $instance_id = "entity_test.test_bundle.$field_name";
+    $instance_id_2a = "entity_test.test_bundle.$field_name_2";
+    $instance_id_2b = "entity_test.test_bundle_2.$field_name_2";
     $field_config_name = "field.field.$field_id";
     $field_config_name_2 = "field.field.$field_id_2";
     $instance_config_name = "field.instance.$instance_id";
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php b/core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php
index 7ba1a18..13c8ce7 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php
@@ -64,7 +64,7 @@ function createFieldWithInstance($suffix = '', $entity_type = 'entity_test', $bu
     $instance = 'instance' . $suffix;
     $instance_definition = 'instance_definition' . $suffix;
 
-    $this->$field_name = drupal_strtolower($this->randomName() . '_field_name' . $suffix);
+    $this->$field_name = drupal_strtolower($this->randomName(2) . '_field_name' . $suffix);
     $this->$field = entity_create('field_entity', array(
       'name' => $this->$field_name,
       'entity_type' => $entity_type,
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.field_test_import_staging.yml b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_staging.yml
similarity index 81%
rename from core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.field_test_import_staging.yml
rename to core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_staging.yml
index a15236e..4f047a0 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.field_test_import_staging.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_staging.yml
@@ -1,7 +1,7 @@
-id: entity_test.field_test_import_staging
+id: entity_test.test_staging
 uuid: 0bf654cc-f14a-4881-b94c-76959e47466b
 langcode: und
-name: field_test_import_staging
+name: test_staging
 entity_type: entity_test
 type: text
 settings:
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_staging_2.yml
similarity index 74%
rename from core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.field_test_import_staging_2.yml
rename to core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_staging_2.yml
index 851d816..4a0014b 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.field_test_import_staging_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_staging_2.yml
@@ -1,8 +1,8 @@
-id: entity_test.field_test_import_staging_2
+id: entity_test.test_staging_2
 uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
 langcode: und
-name: field_test_import_staging_2
-entity_test: entity_test
+name: test_staging_2
+entity_type: entity_test
 type: text
 settings:
   max_length: '255'
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.test_staging.yml
similarity index 86%
rename from core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml
rename to core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.test_staging.yml
index 2be5d9c..3eb8fc6 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.test_staging.yml
@@ -1,4 +1,4 @@
-id: entity_test.entity_test.field_test_import_staging
+id: entity_test.entity_test.test_staging
 uuid: ea711065-6940-47cd-813d-618f64095481
 langcode: und
 field_uuid: 0bf654cc-f14a-4881-b94c-76959e47466b
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.test_staging_2.yml
similarity index 88%
rename from core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml
rename to core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.test_staging_2.yml
index d003875..c0f295e 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.test_staging_2.yml
@@ -1,4 +1,4 @@
-id: entity_test.test_bundle.field_test_import_staging_2
+id: entity_test.test_bundle.test_staging_2
 uuid: f07794a2-d7cc-45b6-b40d-13cf021b5552
 langcode: und
 field_uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.test_staging_2.yml
similarity index 88%
rename from core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml
rename to core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.test_staging_2.yml
index 7eb124e..c88888d 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.test_staging_2.yml
@@ -1,4 +1,4 @@
-id: entity_test.test_bundle_2.field_test_import_staging_2
+id: entity_test.test_bundle_2.test_staging_2
 uuid: 49d6dd19-5097-443d-8f00-fc79525bebce
 langcode: und
 field_uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
index 4b3ef4a..025ef0c 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
@@ -234,7 +234,7 @@ protected function getDefaultValueWidget($field, array &$form, &$form_state) {
 
     // Insert the widget. Since we do not use the "official" instance definition,
     // the whole flow cannot use field_invoke_method().
-    $items = $entity->getNGEntity()->{$this->instance->getField()->id};
+    $items = $entity->getNGEntity()->{$this->instance->getField()->name};
     if (!empty($this->instance['default_value'])) {
       $items->setValue((array) $this->instance['default_value']);
     }
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php
index 6ff7ed1..62c9141 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php
@@ -73,7 +73,7 @@ public function formElement(FieldInterface $items, $delta, array $element, $lang
     $element += array(
       '#type' => 'textfield',
       '#default_value' => taxonomy_implode_tags($tags),
-      '#autocomplete_path' => $this->getSetting('autocomplete_path') . '/' . $items->getParent()->entityType(), $this->fieldDefinition->getFieldName(),
+      '#autocomplete_path' => $this->getSetting('autocomplete_path') . '/' . $items->getParent()->entityType() . '/' . $this->fieldDefinition->getFieldName(),
       '#size' => $this->getSetting('size'),
       '#placeholder' => $this->getSetting('placeholder'),
       '#maxlength' => 1024,