diff --git a/packages/ripple-tide-webform/mapping/webforms-mapping.ts b/packages/ripple-tide-webform/mapping/webforms-mapping.ts
index 87c62cf485..e17b7c5d83 100644
--- a/packages/ripple-tide-webform/mapping/webforms-mapping.ts
+++ b/packages/ripple-tide-webform/mapping/webforms-mapping.ts
@@ -25,10 +25,11 @@ export const getFormSchemaFromMapping = async (
   const fields = []
   const formId = webform.drupal_internal__id
 
-  for (const [fieldKey, fieldData] of Object.entries(elements)) {
+  for (const [fieldMachineName, fieldData] of Object.entries(elements)) {
     let mappedField
     const field: TideWebformElement = { ...fieldData, formId }
-    const fieldID = `${formId}_${fieldKey}`
+    const fieldID = `${formId}_${fieldMachineName}`
+    const fieldKey = field['#attributes']?.name || fieldMachineName
 
     switch (field['#type']) {
       case 'hidden':