diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldFormSection.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldFormSection.tsx
index 94418ad88..f452d06b3 100644
--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldFormSection.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldFormSection.tsx
@@ -9,7 +9,6 @@ import { Section } from '@/ui/layout/section/components/Section';
 
 type SettingsObjectFieldFormSectionProps = {
   disabled?: boolean;
-  disableNameEdition?: boolean;
   name?: string;
   description?: string;
   iconKey?: string;
@@ -31,7 +30,6 @@ const StyledInputsContainer = styled.div`
 
 export const SettingsObjectFieldFormSection = ({
   disabled,
-  disableNameEdition,
   name = '',
   description = '',
   iconKey = 'IconUsers',
@@ -57,7 +55,7 @@ export const SettingsObjectFieldFormSection = ({
             onChange?.({ label: value });
           }
         }}
-        disabled={disabled || disableNameEdition}
+        disabled={disabled}
         fullWidth
       />
     </StyledInputsContainer>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
index 4e1eff295..4bc96b263 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -209,7 +209,6 @@ export const SettingsObjectFieldEdit = () => {
         </SettingsHeaderContainer>
         <SettingsObjectFieldFormSection
           disabled={!activeMetadataField.isCustom}
-          disableNameEdition
           name={formValues.label}
           description={formValues.description}
           iconKey={formValues.icon}
diff --git a/packages/twenty-server/src/metadata/field-metadata/field-metadata.service.ts b/packages/twenty-server/src/metadata/field-metadata/field-metadata.service.ts
index 70bcfed98..d64b999ba 100644
--- a/packages/twenty-server/src/metadata/field-metadata/field-metadata.service.ts
+++ b/packages/twenty-server/src/metadata/field-metadata/field-metadata.service.ts
@@ -228,9 +228,23 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
           )
         : fieldMetadataInput;
 
-    const updatedFieldMetadata = await super.updateOne(id, updatableFieldInput);
+    const updatedFieldMetadata = await super.updateOne(id, {
+      ...updatableFieldInput,
+      // If the name is updated, the targetColumnMap should be updated as well
+      targetColumnMap: updatableFieldInput.name
+        ? generateTargetColumnMap(
+            existingFieldMetadata.type,
+            existingFieldMetadata.isCustom,
+            updatableFieldInput.name,
+          )
+        : existingFieldMetadata.targetColumnMap,
+    });
 
-    if (updatableFieldInput.options || updatableFieldInput.defaultValue) {
+    if (
+      fieldMetadataInput.name ||
+      updatableFieldInput.options ||
+      updatableFieldInput.defaultValue
+    ) {
       await this.workspaceMigrationService.createCustomMigration(
         generateMigrationName(`update-${updatedFieldMetadata.name}`),
         existingFieldMetadata.workspaceId,