diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index ead7b2a..62658b0 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -170,22 +170,22 @@ function content_translation_entity_base_field_info_alter(&$fields, EntityTypeIn
 /**
  * Implements hook_entity_field_info().
  */
-function content_translation_entity_field_info($entity_type) {
-  if (content_translation_enabled($entity_type)) {
+function content_translation_entity_base_field_info(EntityTypeInterface $entity_type) {
+  if (content_translation_enabled($entity_type->id())) {
     $info = array();
 
-    $info['definitions']['translation_source'] = FieldDefinition::create('language')
+    $info['translation_source'] = FieldDefinition::create('language')
       ->setLabel(t('Translation source'))
       ->setDescription(t('The source language from which this translation was created.'))
       ->setTranslatable(TRUE);
 
 
-    $info['definitions']['translation_outdated'] = FieldDefinition::create('boolean')
+    $info['translation_outdated'] = FieldDefinition::create('boolean')
       ->setLabel(t('Translation outdated'))
       ->setDescription(t('A boolean indicating whether this translation needs to be updated.'))
       ->setTranslatable(TRUE);
 
-    $info['definitions']['translation_uid'] = FieldDefinition::create('entity_reference')
+    $info['translation_uid'] = FieldDefinition::create('entity_reference')
       ->setLabel(t('Translation author id'))
       ->setDescription(t('The author of this translation.'))
       ->setSettings(array(
@@ -194,7 +194,7 @@ function content_translation_entity_field_info($entity_type) {
       ))
       ->setTranslatable(TRUE);
 
-    $info['definitions']['translation_status'] = FieldDefinition::create('boolean')
+    $info['translation_status'] = FieldDefinition::create('boolean')
       ->setLabel(t('Translation status'))
       ->setDescription(t('A boolean indicating whether the translation is visible to non-translators.'))
       ->setSettings(array(
@@ -202,12 +202,12 @@ function content_translation_entity_field_info($entity_type) {
       ))
       ->setTranslatable(TRUE);
 
-    $info['definitions']['translation_created'] = FieldDefinition::create('integer')
+    $info['translation_created'] = FieldDefinition::create('integer')
       ->setLabel(t('Translation created time'))
       ->setDescription(t('The Unix timestamp when the translation was created.'))
       ->setTranslatable(TRUE);
 
-    $info['definitions']['translation_changed'] = FieldDefinition::create('integer')
+    $info['translation_changed'] = FieldDefinition::create('integer')
       ->setLabel(t('Translation changed time'))
       ->setDescription(t('The Unix timestamp when the translation was most recently saved.'))
       ->setPropertyConstraints('value', array('EntityChanged' => array()))
@@ -695,7 +695,7 @@ function content_translation_load_translation_metadata(array $entities, $entity_
         }
         $name = 'translation_' . $key;
         $item = $entity->getTranslation($langcode)->get($name);
-        $item->{$item[0]->getMainPropertyName()} = $value;
+        $item->{$item[0]->getFieldDefinition()->getMainPropertyName()} = $value;
       }
     }
   }