diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/field_type/FileFieldItemList.php b/core/modules/file/lib/Drupal/file/Plugin/Field/FieldType/FileFieldItemList.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/field/field_type/FileFieldItemList.php
rename to core/modules/file/lib/Drupal/file/Plugin/Field/FieldType/FileFieldItemList.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/Field/FieldType/FileItem.php b/core/modules/file/lib/Drupal/file/Plugin/Field/FieldType/FileItem.php
index b7070f8..d132a44 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/Field/FieldType/FileItem.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/Field/FieldType/FileItem.php
@@ -90,7 +90,7 @@ public function getPropertyDefinitions() {
     $this->definition['settings']['target_type'] = 'file';
 
     if (!isset(static::$propertyDefinitions)) {
-      static::$propertyDefinitions = \Drupal\Core\Field\Plugin\Field\FieldType\parent::getPropertyDefinitions();
+      static::$propertyDefinitions = parent::getPropertyDefinitions();
 
       static::$propertyDefinitions['display'] = array(
         'type' => 'boolean',
diff --git a/core/modules/image/lib/Drupal/image/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/lib/Drupal/image/Plugin/Field/FieldType/ImageItem.php
index 34185ab..e8d59c0 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/Field/FieldType/ImageItem.php
@@ -108,7 +108,7 @@ public function getPropertyDefinitions() {
     $this->definition['settings']['target_type'] = 'file';
 
     if (!isset(static::$propertyDefinitions)) {
-      static::$propertyDefinitions = \Drupal\file\Plugin\Field\FieldType\parent::getPropertyDefinitions();
+      static::$propertyDefinitions = parent::getPropertyDefinitions();
 
       static::$propertyDefinitions['alt'] = array(
         'type' => 'string',
@@ -169,7 +169,7 @@ public function settingsForm(array $form, array &$form_state, $has_data) {
    */
   public function instanceSettingsForm(array $form, array &$form_state) {
     // Get base form from FileItem::instanceSettingsForm().
-    $element = \Drupal\file\Plugin\Field\FieldType\parent::instanceSettingsForm($form, $form_state);
+    $element = parent::instanceSettingsForm($form, $form_state);
 
     $settings = $this->getFieldSettings();