diff --git a/core/lib/Drupal/Core/Entity/EntityAccessControllerInterface.php b/core/lib/Drupal/Core/Entity/EntityAccessControllerInterface.php
index 8a62727..a6c7834 100644
--- a/core/lib/Drupal/Core/Entity/EntityAccessControllerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityAccessControllerInterface.php
@@ -83,11 +83,11 @@ public function setModuleHandler(ModuleHandlerInterface $module_handler);
    * @param \Drupal\Core\Session\AccountInterface $account
    *  (optional) The user session for which to check access, or NULL to check
    *   access for the current user. Defaults to NULL.
-   * @param \Drupal\Core\Entity\Field\FieldInterface $field
+   * @param \Drupal\Core\Entity\Field\FieldInterface $items
    *   (optional) The field values for which to check access, or NULL if access
    *    is checked for the field definition, without any specific value
    *    available. Defaults to NULL.
    */
-  public function fieldAccess($operation, FieldDefinitionInterface $field_definition, AccountInterface $account = NULL, FieldInterface $field = NULL);
+  public function fieldAccess($operation, FieldDefinitionInterface $field_definition, AccountInterface $account = NULL, FieldInterface $items = NULL);
 
 }
diff --git a/core/lib/Drupal/Core/Entity/Field/FieldDefinition.php b/core/lib/Drupal/Core/Entity/Field/FieldDefinition.php
index 70553f5..459a4b4 100644
--- a/core/lib/Drupal/Core/Entity/Field/FieldDefinition.php
+++ b/core/lib/Drupal/Core/Entity/Field/FieldDefinition.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Entity\Field;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\TypedData\DataDefinition;
 
 /**
  * A class for defining entity fields.
@@ -51,7 +50,7 @@ public function getFieldName() {
    * @param string $name
    *   The field name to set.
    *
-   * @return \Drupal\Core\TypedData\DataDefinition
+   * @return \Drupal\Core\Entity\Field\FieldDefinition
    *   The object itself for chaining.
    */
   public function setFieldName($name) {
@@ -74,7 +73,7 @@ public function getFieldType() {
    * @param string $type
    *   The field type to set.
    *
-   * @return \Drupal\Core\TypedData\DataDefinition
+   * @return \Drupal\Core\Entity\Field\FieldDefinition
    *   The object itself for chaining.
    */
   public function setFieldType($type) {
@@ -117,7 +116,7 @@ public function isFieldTranslatable() {
    * @param boolean $translatable
    *   Whether the field is translatable.
    *
-   * @return \Drupal\Core\TypedData\DataDefinition
+   * @return \Drupal\Core\Entity\Field\FieldDefinition
    *   The object itself for chaining.
    */
   public function setTranslatable($translatable) {
@@ -167,7 +166,7 @@ public function isFieldQueryable() {
    * @param boolean $queryable
    *   Whether the field is queryable.
    *
-   * @return \Drupal\Core\TypedData\DataDefinition
+   * @return \Drupal\Core\Entity\Field\FieldDefinition
    *   The object itself for chaining.
    */
   public function setQueryable($queryable) {
@@ -183,7 +182,7 @@ public function setQueryable($queryable) {
    * @param array $constraints
    *   The constraints to set.
    *
-   * @return \Drupal\Core\TypedData\DataDefinition
+   * @return \Drupal\Core\Entity\Field\FieldDefinition
    *   The object itself for chaining.
    */
   public function setPropertyConstraints($name, array $constraints) {
@@ -223,7 +222,7 @@ public function getItemDefinition() {
    *   The data definition of an item of the list, or NULL if the data is no
    *   list.
    *
-   * @return \Drupal\Core\Entity\Field\FieldDefinitionInterface
+   * @return \Drupal\Core\Entity\Field\FieldDefinition
    *   The object itself for chaining.
    */
   public function setItemDefinition(FieldDefinition $item_definition = NULL) {
diff --git a/core/lib/Drupal/Core/Entity/Field/FieldInterface.php b/core/lib/Drupal/Core/Entity/Field/FieldInterface.php
index 4363f70..fe1243c 100644
--- a/core/lib/Drupal/Core/Entity/Field/FieldInterface.php
+++ b/core/lib/Drupal/Core/Entity/Field/FieldInterface.php
@@ -64,8 +64,7 @@ public function getFieldDefinition();
    * Contains the default access logic of this field.
    *
    * See \Drupal\Core\TypedData\AccessibleInterface::access() for the parameter
-   * doucmentation. This method can be overriden by field sub classes to provide
-   * a different default access logic.
+   * documentation.
    *
    * @return bool
    *   TRUE if access to this field is allowed per default, FALSE otherwise.
diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/Field.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/Field.php
deleted file mode 100644
index 5200370..0000000
--- a/core/lib/Drupal/Core/Entity/Plugin/DataType/Field.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Entity\Plugin\DataType\Field.
- */
-
-namespace Drupal\Core\Entity\Plugin\DataType;
-
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * Defines a data type plugin for entity fields, i.e. the list of field items.
- *
- * Note that the class only register the plugin, and is actually never used.
- * @todo: Move the implementation to this place also.
- *
- * @DataType(
- *   id = "entity_field",
- *   label = @Translation("Entity field"),
- *   class = "\Drupal\Core\Entity\Field\Field"
- * )
- */
-class Field extends \Drupal\Core\Entity\Field\Field {
-
-}
diff --git a/core/modules/system/entity.api.php b/core/modules/system/entity.api.php
index d96fd1f..c11d44b 100644
--- a/core/modules/system/entity.api.php
+++ b/core/modules/system/entity.api.php
@@ -714,7 +714,7 @@ function hook_entity_operation_alter(array &$operations, \Drupal\Core\Entity\Ent
  *   The field definition
  * @param \Drupal\Core\Session\AccountInterface $account
  *   The user account to check.
- * @param \Drupal\Core\Entity\Field\FieldInterface $field
+ * @param \Drupal\Core\Entity\Field\FieldInterface $items
  *   (optional) The entity field object on which the operation is to be
  *   performed.
  *
@@ -722,7 +722,7 @@ function hook_entity_operation_alter(array &$operations, \Drupal\Core\Entity\Ent
  *   TRUE if access should be allowed, FALSE if access should be denied and NULL
  *   if the implementation has no opinion.
  */
-function hook_entity_field_access($operation, \Drupal\Core\Entity\Field\FieldDefinitionInterface $field_definition, \Drupal\Core\Session\AccountInterface $account, \Drupal\Core\Entity\Field\FieldInterface $field) {
+function hook_entity_field_access($operation, \Drupal\Core\Entity\Field\FieldDefinitionInterface $field_definition, \Drupal\Core\Session\AccountInterface $account, \Drupal\Core\Entity\Field\FieldInterface $items) {
   if ($field_definition->getFieldName() == 'field_of_interest' && $operation == 'update') {
     return user_access('update field of interest', $account);
   }