diff --git a/core/modules/hal/hal.services.yml b/core/modules/hal/hal.services.yml
index 21225dc..967a636 100644
--- a/core/modules/hal/hal.services.yml
+++ b/core/modules/hal/hal.services.yml
@@ -1,6 +1,6 @@
 services:
-  serializer.normalizer.entity_reference_item_file.hal:
-    class: Drupal\hal\Normalizer\EntityReferenceItemFileNormalizer
+  serializer.normalizer.entity_reference_item_image.hal:
+    class: Drupal\hal\Normalizer\EntityReferenceItemImageNormalizer
     arguments: ['@rest.link_manager', '@serializer.entity_resolver']
     tags:
       - { name: normalizer, priority: 20 }
diff --git a/core/modules/hal/src/Normalizer/EntityReferenceItemFileNormalizer.php b/core/modules/hal/src/Normalizer/EntityReferenceItemFileNormalizer.php
deleted file mode 100644
index 89c37c7..0000000
--- a/core/modules/hal/src/Normalizer/EntityReferenceItemFileNormalizer.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\hal\Normalizer\EntityReferenceItemFileNormalizer.
- */
-
-namespace Drupal\hal\Normalizer;
-
-use Drupal\hal\Normalizer\EntityReferenceItemNormalizer;
-use Drupal\Core\Language\LanguageInterface;
-
-/**
- * Converts the Drupal entity reference file item object to HAL array structure.
- */
-class EntityReferenceItemFileNormalizer extends EntityReferenceItemNormalizer {
-
-  /**
-   * Overrides \Drupal\hal\Normalizer\EntityReferenceItemNormalizer::constructValue().
-   */
-  protected function constructValue($data, $context) {
-    if (!empty($data['filename']) && !empty($data['value'])) {
-      // Create the file entity and add it as a reference to the parent entity.
-      $file = base64_decode($data['value']);
-      // Transliterate the filename.
-      $filename = $data['filename'];
-      $transliteration_service = \Drupal::transliteration();
-      $filename = $transliteration_service->transliterate($filename, LanguageInterface::LANGCODE_DEFAULT, '_');
-
-      // Build the file scheme to save the file.
-      $settings = $context['target_instance']->getFieldDefinition()->getSettings();
-      $file_scheme = $settings['uri_scheme'] . '://' . $settings['file_directory'];
-
-      // Save the file.
-      if (file_prepare_directory($file_scheme, FILE_CREATE_DIRECTORY)) {
-        $file = file_save_data($file, $file_scheme . '/' . $filename);
-        if (!empty($file)) {
-          return array('target_id' => $file->id(), 'display' => (int) $settings['display_field']);
-        }
-      }
-    }
-    return NULL;
-  }
-
-}
diff --git a/core/modules/hal/src/Normalizer/EntityReferenceItemImageNormalizer.php b/core/modules/hal/src/Normalizer/EntityReferenceItemImageNormalizer.php
new file mode 100644
index 0000000..41b0756
--- /dev/null
+++ b/core/modules/hal/src/Normalizer/EntityReferenceItemImageNormalizer.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\hal\Normalizer\EntityReferenceItemImageNormalizer.
+ */
+
+namespace Drupal\hal\Normalizer;
+
+use Drupal\hal\Normalizer\EntityReferenceItemNormalizer;
+use Drupal\Core\Language\LanguageInterface;
+
+/**
+ * Converts the Drupal entity reference image item object to HAL array structure.
+ */
+class EntityReferenceItemImageNormalizer extends EntityReferenceItemNormalizer {
+
+  /**
+   * Overrides \Drupal\hal\Normalizer\EntityReferenceItemNormalizer::constructValue().
+   */
+  protected function constructValue($data, $context) {
+    if (!empty($data['filename']) && !empty($data['value'])) {
+      // Create the file entity and add it as a reference to the parent entity.
+      $image = base64_decode($data['value']);
+      // Transliterate the filename.
+      $filename = $data['filename'];
+      $transliteration_service = \Drupal::transliteration();
+      $filename = $transliteration_service->transliterate($filename, LanguageInterface::LANGCODE_DEFAULT, '_');
+
+      // Build the file scheme to save the file.
+      $settings = $context['target_instance']->getFieldDefinition()->getSettings();
+      $file_scheme = $settings['uri_scheme'] . '://' . $settings['file_directory'];
+
+      // Save the image.
+      if (file_prepare_directory($file_scheme, FILE_CREATE_DIRECTORY)) {
+        $image = file_save_data($image, $file_scheme . '/' . $filename);
+        if (!empty($image)) {
+          return array('target_id' => $image->id());
+        }
+      }
+    }
+    return NULL;
+  }
+
+}