diff --git a/name_prepopulate.info.yml b/name_prepopulate.info.yml
index 6377dbe..abcbc35 100644
--- a/name_prepopulate.info.yml
+++ b/name_prepopulate.info.yml
@@ -1,5 +1,7 @@
 name: Name Prepopulate
 description: Prepopulates name fields from the user account.
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
 package: Fields
 type: module
+dependencies:
+  - name:name
diff --git a/name_prepopulate.module b/name_prepopulate.module
index 455f2f0..23041c0 100644
--- a/name_prepopulate.module
+++ b/name_prepopulate.module
@@ -6,7 +6,7 @@ use Drupal\name_prepopulate\NamePrepopulateHelper;
  * Implements hook_entity_prepare_form().
  */
 function name_prepopulate_entity_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $operation, \Drupal\Core\Form\FormStateInterface $form_state) {
-  $nameField = 'field_name';
+  $nameField = 'name';
 
   $types = ['contact_message'];
 
@@ -27,7 +27,7 @@ function name_prepopulate_entity_prepare_form(\Drupal\Core\Entity\EntityInterfac
  * Implements hook_entity_presave().
  */
 function name_prepopulate_entity_presave(Drupal\Core\Entity\EntityInterface $entity) {
-  $nameField = 'field_name';
+  $nameField = 'name';
 
   $types = ['contact_message'];
 
diff --git a/src/NamePrepopulateHelper.php b/src/NamePrepopulateHelper.php
index 98a8d0e..22db8b2 100644
--- a/src/NamePrepopulateHelper.php
+++ b/src/NamePrepopulateHelper.php
@@ -5,7 +5,6 @@
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\name\NameFormatParser;
 use Drupal\user\Entity\User;
 
 class NamePrepopulateHelper {
@@ -51,19 +50,18 @@ public function prepopulateFromAccount() {
   }
 
   protected function getNameString() {
-    /** @var \Drupal\Core\Field\FieldConfigInterface $fieldConfig; */
-    $fieldConfig = FieldConfig::loadByName($this->entity->getEntityTypeId(), $this->entity->bundle(), $this->fieldName);
-
-    /** @var \Drupal\name\NameFormatInterface $format */
-    $format = \Drupal::entityTypeManager()->getStorage('name_format')->load($fieldConfig->getSetting('override_format'));
-
     $field = $this->getField();
 
     if ($field->isEmpty()) {
       return '';
     }
 
-    return NameFormatParser::parse($field->get(0)->getValue(), $format->get('pattern'), ['object' => $this->entity, 'type' => $this->entity->getEntityTypeId()]);
+    $value = ($field->get(0)->getValue())['value'];
+    if ($value instanceof \Drupal\Component\Render\HtmlEscapedText) {
+        return $value->__toString();
+    } else {
+        return $value;
+    }
   }
 
   protected function getField() {