diff --git a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
index b932cbdc5f..a5afa4209f 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
@@ -19,10 +19,19 @@ type TextInputProps = {
   onEscape: (newText: string) => void;
   onTab?: (newText: string) => void;
   onShiftTab?: (newText: string) => void;
-  onClickOutside: (event: MouseEvent | TouchEvent, inputValue: string) => void;
+  onClickOutside?: (event: MouseEvent | TouchEvent, inputValue: string) => void;
   hotkeyScope: string;
   onChange?: (newText: string) => void;
   copyButton?: boolean;
+  shouldTrim?: boolean;
+};
+
+const getValue = (value: string, shouldTrim: boolean) => {
+  if (shouldTrim) {
+    return value.trim();
+  }
+
+  return value;
 };
 
 export const TextInput = ({
@@ -37,6 +46,7 @@ export const TextInput = ({
   onClickOutside,
   onChange,
   copyButton = true,
+  shouldTrim = true,
 }: TextInputProps) => {
   const [internalText, setInternalText] = useState(value);
 
@@ -44,12 +54,12 @@ export const TextInput = ({
   const copyRef = useRef<HTMLDivElement>(null);
 
   const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
-    setInternalText(event.target.value.trim());
-    onChange?.(event.target.value.trim());
+    setInternalText(getValue(event.target.value, shouldTrim));
+    onChange?.(getValue(event.target.value, shouldTrim));
   };
   useEffect(() => {
-    setInternalText(value.trim());
-  }, [value]);
+    setInternalText(getValue(value, shouldTrim));
+  }, [value, shouldTrim]);
 
   useRegisterInputEvents({
     inputRef: wrapperRef,
diff --git a/packages/twenty-front/src/modules/workflow/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx b/packages/twenty-front/src/modules/workflow/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx
index 2667195f23..d02ea69c7c 100644
--- a/packages/twenty-front/src/modules/workflow/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx
@@ -39,7 +39,7 @@ export const RightDrawerWorkflowSelectTriggerTypeContent = ({
         <MenuItem
           key={action.type}
           LeftIcon={action.icon}
-          text={action.label}
+          text={action.name}
           onClick={async () => {
             await updateTrigger(
               getTriggerDefaultDefinition({
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramBaseStepNode.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramBaseStepNode.tsx
index 0318f61a6b..caf1dc8565 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramBaseStepNode.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramBaseStepNode.tsx
@@ -2,7 +2,7 @@ import { WorkflowDiagramStepNodeData } from '@/workflow/types/WorkflowDiagram';
 import styled from '@emotion/styled';
 import { Handle, Position } from '@xyflow/react';
 import React from 'react';
-import { isDefined } from 'twenty-ui';
+import { isDefined, OverflowingTextWithTooltip } from 'twenty-ui';
 import { capitalize } from '~/utils/string/capitalize';
 
 type Variant = 'placeholder';
@@ -68,6 +68,7 @@ const StyledStepNodeLabel = styled.div<{ variant?: Variant }>`
     variant === 'placeholder'
       ? theme.font.color.extraLight
       : theme.font.color.primary};
+  max-width: 200px;
 `;
 
 const StyledSourceHandle = styled(Handle)`
@@ -90,13 +91,13 @@ const StyledRightFloatingElementContainer = styled.div`
 
 export const WorkflowDiagramBaseStepNode = ({
   nodeType,
-  label,
+  name,
   variant,
   Icon,
   RightFloatingElement,
 }: {
   nodeType: WorkflowDiagramStepNodeData['nodeType'];
-  label: string;
+  name: string;
   variant?: Variant;
   Icon?: React.ReactNode;
   RightFloatingElement?: React.ReactNode;
@@ -113,7 +114,7 @@ export const WorkflowDiagramBaseStepNode = ({
         <StyledStepNodeLabel variant={variant}>
           {Icon}
 
-          {label}
+          <OverflowingTextWithTooltip text={name} />
         </StyledStepNodeLabel>
 
         {isDefined(RightFloatingElement) ? (
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramEmptyTrigger.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramEmptyTrigger.tsx
index a355733219..68f4c0e66c 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramEmptyTrigger.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramEmptyTrigger.tsx
@@ -17,7 +17,7 @@ export const WorkflowDiagramEmptyTrigger = () => {
 
   return (
     <WorkflowDiagramBaseStepNode
-      label="Add a Trigger"
+      name="Add a Trigger"
       nodeType="trigger"
       variant="placeholder"
       Icon={
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramStepNodeBase.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramStepNodeBase.tsx
index cccb23a12a..03d0921cae 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramStepNodeBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowDiagramStepNodeBase.tsx
@@ -100,8 +100,8 @@ export const WorkflowDiagramStepNodeBase = ({
 
   return (
     <WorkflowDiagramBaseStepNode
+      name={data.name}
       nodeType={data.nodeType}
-      label={data.label}
       Icon={renderStepIcon()}
       RightFloatingElement={RightFloatingElement}
     />
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormRecordCreate.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormRecordCreate.tsx
index 647dfe240a..aa86a84a89 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormRecordCreate.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormRecordCreate.tsx
@@ -119,15 +119,27 @@ export const WorkflowEditActionFormRecordCreate = ({
     };
   }, [saveAction]);
 
+  const headerTitle = isDefined(action.name) ? action.name : `Create Record`;
+
   return (
     <WorkflowEditGenericFormBase
+      onTitleChange={(newName: string) => {
+        if (actionOptions.readonly === true) {
+          return;
+        }
+
+        actionOptions.onActionUpdate({
+          ...action,
+          name: newName,
+        });
+      }}
       HeaderIcon={
         <IconAddressBook
           color={theme.font.color.tertiary}
           stroke={theme.icon.stroke.sm}
         />
       }
-      headerTitle="Record Create"
+      headerTitle={headerTitle}
       headerType="Action"
     >
       <Select
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormSendEmail.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormSendEmail.tsx
index 72f3f2cfd6..c4b77b000a 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormSendEmail.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormSendEmail.tsx
@@ -166,11 +166,23 @@ export const WorkflowEditActionFormSendEmail = ({
     }
   });
 
+  const headerTitle = isDefined(action.name) ? action.name : 'Send Email';
+
   return (
     !loading && (
       <WorkflowEditGenericFormBase
+        onTitleChange={(newName: string) => {
+          if (actionOptions.readonly === true) {
+            return;
+          }
+
+          actionOptions.onActionUpdate({
+            ...action,
+            name: newName,
+          });
+        }}
         HeaderIcon={<IconMail color={theme.color.blue} />}
-        headerTitle="Send Email"
+        headerTitle={headerTitle}
         headerType="Email"
       >
         <Controller
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormServerlessFunctionInner.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormServerlessFunctionInner.tsx
index 1779f15932..0ce875ed36 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormServerlessFunctionInner.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormServerlessFunctionInner.tsx
@@ -217,10 +217,24 @@ export const WorkflowEditActionFormServerlessFunctionInner = ({
     });
   };
 
+  const headerTitle = isDefined(action.name)
+    ? action.name
+    : 'Code - Serverless Function';
+
   return (
     <WorkflowEditGenericFormBase
+      onTitleChange={(newName: string) => {
+        if (actionOptions.readonly === true) {
+          return;
+        }
+
+        actionOptions?.onActionUpdate({
+          ...action,
+          name: newName,
+        });
+      }}
       HeaderIcon={<IconCode color={theme.color.orange} />}
-      headerTitle="Code - Serverless Function"
+      headerTitle={headerTitle}
       headerType="Code"
     >
       <Select
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowEditGenericFormBase.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowEditGenericFormBase.tsx
index 19c0ca1ade..f133aa3a9d 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowEditGenericFormBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowEditGenericFormBase.tsx
@@ -1,5 +1,7 @@
+import { TextInput } from '@/ui/field/input/components/TextInput';
 import styled from '@emotion/styled';
 import React from 'react';
+import { useDebouncedCallback } from 'use-debounce';
 
 const StyledHeader = styled.div`
   background-color: ${({ theme }) => theme.background.secondary};
@@ -40,22 +42,36 @@ const StyledContentContainer = styled.div`
 `;
 
 export const WorkflowEditGenericFormBase = ({
+  onTitleChange,
   HeaderIcon,
   headerTitle,
   headerType,
   children,
 }: {
+  onTitleChange: (newTitle: string) => void;
   HeaderIcon: React.ReactNode;
   headerTitle: string;
   headerType: string;
   children: React.ReactNode;
 }) => {
+  const debouncedOnTitleChange = useDebouncedCallback(onTitleChange, 100);
+
   return (
     <>
       <StyledHeader>
         <StyledHeaderIconContainer>{HeaderIcon}</StyledHeaderIconContainer>
 
-        <StyledHeaderTitle>{headerTitle}</StyledHeaderTitle>
+        <StyledHeaderTitle>
+          <TextInput
+            value={headerTitle}
+            copyButton={false}
+            hotkeyScope="workflow-step-title"
+            onEnter={onTitleChange}
+            onEscape={onTitleChange}
+            onChange={debouncedOnTitleChange}
+            shouldTrim={false}
+          />
+        </StyledHeaderTitle>
 
         <StyledHeaderType>{headerType}</StyledHeaderType>
       </StyledHeader>
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowEditTriggerDatabaseEventForm.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowEditTriggerDatabaseEventForm.tsx
index 507afd9151..9cce5d103c 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowEditTriggerDatabaseEventForm.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowEditTriggerDatabaseEventForm.tsx
@@ -1,50 +1,12 @@
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { Select, SelectOption } from '@/ui/input/components/Select';
+import { WorkflowEditGenericFormBase } from '@/workflow/components/WorkflowEditGenericFormBase';
 import { OBJECT_EVENT_TRIGGERS } from '@/workflow/constants/ObjectEventTriggers';
 import { WorkflowDatabaseEventTrigger } from '@/workflow/types/Workflow';
 import { splitWorkflowTriggerEventName } from '@/workflow/utils/splitWorkflowTriggerEventName';
 import { useTheme } from '@emotion/react';
-import styled from '@emotion/styled';
 import { IconPlaylistAdd, isDefined } from 'twenty-ui';
 
-const StyledTriggerHeader = styled.div`
-  background-color: ${({ theme }) => theme.background.secondary};
-  border-bottom: 1px solid ${({ theme }) => theme.border.color.medium};
-  display: flex;
-  flex-direction: column;
-  padding: ${({ theme }) => theme.spacing(6)};
-`;
-
-const StyledTriggerHeaderTitle = styled.p`
-  color: ${({ theme }) => theme.font.color.primary};
-  font-weight: ${({ theme }) => theme.font.weight.semiBold};
-  font-size: ${({ theme }) => theme.font.size.xl};
-
-  margin: ${({ theme }) => theme.spacing(3)} 0;
-`;
-
-const StyledTriggerHeaderType = styled.p`
-  color: ${({ theme }) => theme.font.color.tertiary};
-  margin: 0;
-`;
-
-const StyledTriggerHeaderIconContainer = styled.div`
-  align-self: flex-start;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: ${({ theme }) => theme.background.transparent.light};
-  border-radius: ${({ theme }) => theme.border.radius.xs};
-  padding: ${({ theme }) => theme.spacing(1)};
-`;
-
-const StyledTriggerSettings = styled.div`
-  padding: ${({ theme }) => theme.spacing(6)};
-  display: flex;
-  flex-direction: column;
-  row-gap: ${({ theme }) => theme.spacing(4)};
-`;
-
 type WorkflowEditTriggerDatabaseEventFormProps = {
   trigger: WorkflowDatabaseEventTrigger;
   triggerOptions:
@@ -87,92 +49,98 @@ export const WorkflowEditTriggerDatabaseEventForm = ({
       )
     : undefined;
 
+  const headerTitle = isDefined(trigger.name)
+    ? trigger.name
+    : isDefined(recordTypeMetadata) && isDefined(selectedEvent)
+      ? `When a ${recordTypeMetadata.labelSingular} is ${selectedEvent.label}`
+      : '-';
+
+  const headerType = isDefined(selectedEvent)
+    ? `Trigger · Record is ${selectedEvent.label}`
+    : '-';
+
   return (
-    <>
-      <StyledTriggerHeader>
-        <StyledTriggerHeaderIconContainer>
-          <IconPlaylistAdd color={theme.font.color.tertiary} />
-        </StyledTriggerHeaderIconContainer>
+    <WorkflowEditGenericFormBase
+      onTitleChange={(newName: string) => {
+        if (triggerOptions.readonly === true) {
+          return;
+        }
 
-        <StyledTriggerHeaderTitle>
-          {isDefined(recordTypeMetadata) && isDefined(selectedEvent)
-            ? `When a ${recordTypeMetadata.labelSingular} is ${selectedEvent.label}`
-            : '-'}
-        </StyledTriggerHeaderTitle>
+        triggerOptions.onTriggerUpdate({
+          ...trigger,
+          name: newName,
+        });
+      }}
+      HeaderIcon={<IconPlaylistAdd color={theme.font.color.tertiary} />}
+      headerTitle={headerTitle}
+      headerType={headerType}
+    >
+      <Select
+        dropdownId="workflow-edit-trigger-record-type"
+        label="Record Type"
+        fullWidth
+        disabled={triggerOptions.readonly}
+        value={triggerEvent?.objectType}
+        emptyOption={{ label: 'Select an option', value: '' }}
+        options={availableMetadata}
+        onChange={(updatedRecordType) => {
+          if (triggerOptions.readonly === true) {
+            return;
+          }
 
-        <StyledTriggerHeaderType>
-          {isDefined(selectedEvent)
-            ? `Trigger · Record is ${selectedEvent.label}`
-            : '-'}
-        </StyledTriggerHeaderType>
-      </StyledTriggerHeader>
-
-      <StyledTriggerSettings>
-        <Select
-          dropdownId="workflow-edit-trigger-record-type"
-          label="Record Type"
-          fullWidth
-          disabled={triggerOptions.readonly}
-          value={triggerEvent?.objectType}
-          emptyOption={{ label: 'Select an option', value: '' }}
-          options={availableMetadata}
-          onChange={(updatedRecordType) => {
-            if (triggerOptions.readonly === true) {
-              return;
-            }
-
-            triggerOptions.onTriggerUpdate(
-              isDefined(trigger) && isDefined(triggerEvent)
-                ? {
-                    ...trigger,
-                    settings: {
-                      ...trigger.settings,
-                      eventName: `${updatedRecordType}.${triggerEvent.event}`,
-                    },
-                  }
-                : {
-                    type: 'DATABASE_EVENT',
-                    settings: {
-                      eventName: `${updatedRecordType}.${OBJECT_EVENT_TRIGGERS[0].value}`,
-                      outputSchema: {},
-                    },
+          triggerOptions.onTriggerUpdate(
+            isDefined(trigger) && isDefined(triggerEvent)
+              ? {
+                  ...trigger,
+                  settings: {
+                    ...trigger.settings,
+                    eventName: `${updatedRecordType}.${triggerEvent.event}`,
                   },
-            );
-          }}
-        />
-        <Select
-          dropdownId="workflow-edit-trigger-event-type"
-          label="Event type"
-          fullWidth
-          value={triggerEvent?.event}
-          emptyOption={{ label: 'Select an option', value: '' }}
-          options={OBJECT_EVENT_TRIGGERS}
-          disabled={triggerOptions.readonly}
-          onChange={(updatedEvent) => {
-            if (triggerOptions.readonly === true) {
-              return;
-            }
-
-            triggerOptions.onTriggerUpdate(
-              isDefined(trigger) && isDefined(triggerEvent)
-                ? {
-                    ...trigger,
-                    settings: {
-                      ...trigger.settings,
-                      eventName: `${triggerEvent.objectType}.${updatedEvent}`,
-                    },
-                  }
-                : {
-                    type: 'DATABASE_EVENT',
-                    settings: {
-                      eventName: `${availableMetadata[0].value}.${updatedEvent}`,
-                      outputSchema: {},
-                    },
+                }
+              : {
+                  name: headerTitle,
+                  type: 'DATABASE_EVENT',
+                  settings: {
+                    eventName: `${updatedRecordType}.${OBJECT_EVENT_TRIGGERS[0].value}`,
+                    outputSchema: {},
                   },
-            );
-          }}
-        />
-      </StyledTriggerSettings>
-    </>
+                },
+          );
+        }}
+      />
+      <Select
+        dropdownId="workflow-edit-trigger-event-type"
+        label="Event type"
+        fullWidth
+        value={triggerEvent?.event}
+        emptyOption={{ label: 'Select an option', value: '' }}
+        options={OBJECT_EVENT_TRIGGERS}
+        disabled={triggerOptions.readonly}
+        onChange={(updatedEvent) => {
+          if (triggerOptions.readonly === true) {
+            return;
+          }
+
+          triggerOptions.onTriggerUpdate(
+            isDefined(trigger) && isDefined(triggerEvent)
+              ? {
+                  ...trigger,
+                  settings: {
+                    ...trigger.settings,
+                    eventName: `${triggerEvent.objectType}.${updatedEvent}`,
+                  },
+                }
+              : {
+                  name: headerTitle,
+                  type: 'DATABASE_EVENT',
+                  settings: {
+                    eventName: `${availableMetadata[0].value}.${updatedEvent}`,
+                    outputSchema: {},
+                  },
+                },
+          );
+        }}
+      />
+    </WorkflowEditGenericFormBase>
   );
 };
diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowEditTriggerManualForm.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowEditTriggerManualForm.tsx
index 3863767653..683cef39f9 100644
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowEditTriggerManualForm.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowEditTriggerManualForm.tsx
@@ -44,10 +44,22 @@ export const WorkflowEditTriggerManualForm = ({
       ? 'WHEN_RECORD_SELECTED'
       : 'EVERYWHERE';
 
+  const headerTitle = isDefined(trigger.name) ? trigger.name : 'Manual Trigger';
+
   return (
     <WorkflowEditGenericFormBase
+      onTitleChange={(newName: string) => {
+        if (triggerOptions.readonly === true) {
+          return;
+        }
+
+        triggerOptions.onTriggerUpdate({
+          ...trigger,
+          name: newName,
+        });
+      }}
       HeaderIcon={<IconHandMove color={theme.font.color.tertiary} />}
-      headerTitle="Manual Trigger"
+      headerTitle={headerTitle}
       headerType="Trigger · Manual"
     >
       <Select
diff --git a/packages/twenty-front/src/modules/workflow/constants/TriggerTypes.ts b/packages/twenty-front/src/modules/workflow/constants/TriggerTypes.ts
index 82da0b774f..2360703fbf 100644
--- a/packages/twenty-front/src/modules/workflow/constants/TriggerTypes.ts
+++ b/packages/twenty-front/src/modules/workflow/constants/TriggerTypes.ts
@@ -2,17 +2,17 @@ import { WorkflowTriggerType } from '@/workflow/types/Workflow';
 import { IconComponent, IconSettingsAutomation } from 'twenty-ui';
 
 export const TRIGGER_TYPES: Array<{
-  label: string;
+  name: string;
   type: WorkflowTriggerType;
   icon: IconComponent;
 }> = [
   {
-    label: 'Database Event',
+    name: 'Database Event',
     type: 'DATABASE_EVENT',
     icon: IconSettingsAutomation,
   },
   {
-    label: 'Manual',
+    name: 'Manual Trigger',
     type: 'MANUAL',
     icon: IconSettingsAutomation,
   },
diff --git a/packages/twenty-front/src/modules/workflow/search-variables/hooks/useAvailableVariablesInWorkflowStep.ts b/packages/twenty-front/src/modules/workflow/search-variables/hooks/useAvailableVariablesInWorkflowStep.ts
index 6fac1f9b73..320fce7e95 100644
--- a/packages/twenty-front/src/modules/workflow/search-variables/hooks/useAvailableVariablesInWorkflowStep.ts
+++ b/packages/twenty-front/src/modules/workflow/search-variables/hooks/useAvailableVariablesInWorkflowStep.ts
@@ -49,7 +49,9 @@ export const useAvailableVariablesInWorkflowStep = (): StepOutputSchema[] => {
   ) {
     result.push({
       id: 'trigger',
-      name: getTriggerStepName(workflow.currentVersion.trigger),
+      name: isDefined(workflow.currentVersion.trigger.name)
+        ? workflow.currentVersion.trigger.name
+        : getTriggerStepName(workflow.currentVersion.trigger),
       outputSchema: workflow.currentVersion.trigger.settings.outputSchema,
     });
   }
diff --git a/packages/twenty-front/src/modules/workflow/types/Workflow.ts b/packages/twenty-front/src/modules/workflow/types/Workflow.ts
index ef496712ef..0005fb4fb7 100644
--- a/packages/twenty-front/src/modules/workflow/types/Workflow.ts
+++ b/packages/twenty-front/src/modules/workflow/types/Workflow.ts
@@ -109,8 +109,8 @@ export type WorkflowActionType =
 export type WorkflowStepType = WorkflowActionType;
 
 type BaseTrigger = {
+  name?: string;
   type: string;
-  input?: object;
 };
 
 export type WorkflowDatabaseEventTrigger = BaseTrigger & {
diff --git a/packages/twenty-front/src/modules/workflow/types/WorkflowDiagram.ts b/packages/twenty-front/src/modules/workflow/types/WorkflowDiagram.ts
index a07a7da0eb..ee9b15a5b3 100644
--- a/packages/twenty-front/src/modules/workflow/types/WorkflowDiagram.ts
+++ b/packages/twenty-front/src/modules/workflow/types/WorkflowDiagram.ts
@@ -16,12 +16,12 @@ export type WorkflowDiagramStepNodeData =
   | {
       nodeType: 'trigger';
       triggerType: WorkflowTriggerType;
-      label: string;
+      name: string;
     }
   | {
       nodeType: 'action';
       actionType: WorkflowActionType;
-      label: string;
+      name: string;
     };
 
 export type WorkflowDiagramCreateStepNodeData = {
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/addCreateStepNodes.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/addCreateStepNodes.test.ts
index 69dade0e73..6d56a51589 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/addCreateStepNodes.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/addCreateStepNodes.test.ts
@@ -5,6 +5,7 @@ import { addCreateStepNodes } from '../addCreateStepNodes';
 describe('addCreateStepNodes', () => {
   it("adds a create step node to the end of a single-branch flow and doesn't change the shape of other nodes", () => {
     const trigger: WorkflowTrigger = {
+      name: 'Company created',
       type: 'DATABASE_EVENT',
       settings: {
         eventName: 'company.created',
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/generateWorkflowDiagram.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/generateWorkflowDiagram.test.ts
index bac17a8499..1ec663b345 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/generateWorkflowDiagram.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/generateWorkflowDiagram.test.ts
@@ -4,6 +4,7 @@ import { generateWorkflowDiagram } from '../generateWorkflowDiagram';
 describe('generateWorkflowDiagram', () => {
   it('should generate a single trigger node when no step is provided', () => {
     const trigger: WorkflowTrigger = {
+      name: 'Company created',
       type: 'DATABASE_EVENT',
       settings: {
         eventName: 'company.created',
@@ -19,7 +20,6 @@ describe('generateWorkflowDiagram', () => {
 
     expect(result.nodes[0]).toMatchObject({
       data: {
-        label: 'Company is Created',
         nodeType: 'trigger',
       },
     });
@@ -27,6 +27,7 @@ describe('generateWorkflowDiagram', () => {
 
   it('should generate a diagram with nodes and edges corresponding to the steps', () => {
     const trigger: WorkflowTrigger = {
+      name: 'Company created',
       type: 'DATABASE_EVENT',
       settings: {
         eventName: 'company.created',
@@ -85,13 +86,14 @@ describe('generateWorkflowDiagram', () => {
       expect(stepNodes[index].data).toEqual({
         nodeType: 'action',
         actionType: 'CODE',
-        label: step.name,
+        name: step.name,
       });
     }
   });
 
   it('should correctly link nodes with edges', () => {
     const trigger: WorkflowTrigger = {
+      name: 'Company created',
       type: 'DATABASE_EVENT',
       settings: {
         eventName: 'company.created',
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowVersionDiagram.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowVersionDiagram.test.ts
index 20bcd43119..b62d1ae754 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowVersionDiagram.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowVersionDiagram.test.ts
@@ -42,6 +42,7 @@ describe('getWorkflowVersionDiagram', () => {
       name: '',
       steps: null,
       trigger: {
+        name: 'Company created',
         settings: { eventName: 'company.created', outputSchema: {} },
         type: 'DATABASE_EVENT',
       },
@@ -53,7 +54,7 @@ describe('getWorkflowVersionDiagram', () => {
       nodes: [
         {
           data: {
-            label: 'Company is Created',
+            name: 'Company created',
             nodeType: 'trigger',
             triggerType: 'DATABASE_EVENT',
           },
@@ -93,6 +94,7 @@ describe('getWorkflowVersionDiagram', () => {
         },
       ],
       trigger: {
+        name: 'Company created',
         settings: { eventName: 'company.created', outputSchema: {} },
         type: 'DATABASE_EVENT',
       },
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/insertStep.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/insertStep.test.ts
index 5c8ee4b65e..4cc05bf6b2 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/insertStep.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/insertStep.test.ts
@@ -11,6 +11,7 @@ describe('insertStep', () => {
       name: '',
       steps: [],
       trigger: {
+        name: 'Company created',
         settings: { eventName: 'company.created', outputSchema: {} },
         type: 'DATABASE_EVENT',
       },
@@ -54,6 +55,7 @@ describe('insertStep', () => {
       name: '',
       steps: [],
       trigger: {
+        name: 'Company created',
         settings: { eventName: 'company.created', outputSchema: {} },
         type: 'DATABASE_EVENT',
       },
@@ -135,6 +137,7 @@ describe('insertStep', () => {
         },
       ],
       trigger: {
+        name: 'Company created',
         settings: { eventName: 'company.created', outputSchema: {} },
         type: 'DATABASE_EVENT',
       },
@@ -220,6 +223,7 @@ describe('insertStep', () => {
         },
       ],
       trigger: {
+        name: 'Company created',
         settings: { eventName: 'company.created', outputSchema: {} },
         type: 'DATABASE_EVENT',
       },
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/mergeWorkflowDiagrams.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/mergeWorkflowDiagrams.test.ts
index 38e3baabdc..4005ff0471 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/mergeWorkflowDiagrams.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/mergeWorkflowDiagrams.test.ts
@@ -5,7 +5,7 @@ it('Preserves the properties defined in the previous version but not in the next
   const previousDiagram: WorkflowDiagram = {
     nodes: [
       {
-        data: { nodeType: 'action', label: '', actionType: 'CODE' },
+        data: { nodeType: 'action', name: '', actionType: 'CODE' },
         id: '1',
         position: { x: 0, y: 0 },
         selected: true,
@@ -16,7 +16,7 @@ it('Preserves the properties defined in the previous version but not in the next
   const nextDiagram: WorkflowDiagram = {
     nodes: [
       {
-        data: { nodeType: 'action', label: '', actionType: 'CODE' },
+        data: { nodeType: 'action', name: '', actionType: 'CODE' },
         id: '1',
         position: { x: 0, y: 0 },
       },
@@ -27,7 +27,7 @@ it('Preserves the properties defined in the previous version but not in the next
   expect(mergeWorkflowDiagrams(previousDiagram, nextDiagram)).toEqual({
     nodes: [
       {
-        data: { nodeType: 'action', label: '', actionType: 'CODE' },
+        data: { nodeType: 'action', name: '', actionType: 'CODE' },
         id: '1',
         position: { x: 0, y: 0 },
         selected: true,
@@ -41,7 +41,7 @@ it('Replaces duplicated properties with the next value', () => {
   const previousDiagram: WorkflowDiagram = {
     nodes: [
       {
-        data: { nodeType: 'action', label: '', actionType: 'CODE' },
+        data: { nodeType: 'action', name: '', actionType: 'CODE' },
         id: '1',
         position: { x: 0, y: 0 },
       },
@@ -51,7 +51,7 @@ it('Replaces duplicated properties with the next value', () => {
   const nextDiagram: WorkflowDiagram = {
     nodes: [
       {
-        data: { nodeType: 'action', label: '2', actionType: 'CODE' },
+        data: { nodeType: 'action', name: '2', actionType: 'CODE' },
         id: '1',
         position: { x: 0, y: 0 },
       },
@@ -62,7 +62,7 @@ it('Replaces duplicated properties with the next value', () => {
   expect(mergeWorkflowDiagrams(previousDiagram, nextDiagram)).toEqual({
     nodes: [
       {
-        data: { nodeType: 'action', label: '2', actionType: 'CODE' },
+        data: { nodeType: 'action', name: '2', actionType: 'CODE' },
         id: '1',
         position: { x: 0, y: 0 },
       },
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/removeStep.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/removeStep.test.ts
index 6847ff80e4..f4f30aafcf 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/removeStep.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/removeStep.test.ts
@@ -28,6 +28,7 @@ it('returns a deep copy of the provided steps array instead of mutating it', ()
     name: '',
     steps: [stepToBeRemoved],
     trigger: {
+      name: 'Company created',
       settings: { eventName: 'company.created', outputSchema: {} },
       type: 'DATABASE_EVENT',
     },
@@ -108,6 +109,7 @@ it('removes a step in a non-empty steps array', () => {
       },
     ],
     trigger: {
+      name: 'Company created',
       settings: { eventName: 'company.created', outputSchema: {} },
       type: 'DATABASE_EVENT',
     },
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/replaceStep.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/replaceStep.test.ts
index 1507382209..5e9b52e65e 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/replaceStep.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/replaceStep.test.ts
@@ -29,6 +29,7 @@ describe('replaceStep', () => {
       name: '',
       steps: [stepToBeReplaced],
       trigger: {
+        name: 'Company created',
         settings: { eventName: 'company.created', outputSchema: {} },
         type: 'DATABASE_EVENT',
       },
@@ -123,6 +124,7 @@ describe('replaceStep', () => {
         },
       ],
       trigger: {
+        name: 'Company created',
         settings: {
           eventName: 'company.created',
           outputSchema: {},
diff --git a/packages/twenty-front/src/modules/workflow/utils/generateWorkflowDiagram.ts b/packages/twenty-front/src/modules/workflow/utils/generateWorkflowDiagram.ts
index 24f5c10f48..8b701b944b 100644
--- a/packages/twenty-front/src/modules/workflow/utils/generateWorkflowDiagram.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/generateWorkflowDiagram.ts
@@ -53,7 +53,7 @@ export const generateWorkflowDiagram = ({
       data: {
         nodeType: 'action',
         actionType: nodeActionType,
-        label: nodeLabel,
+        name: isDefined(step.name) ? step.name : nodeLabel,
       },
       position: {
         x: xPos,
@@ -110,7 +110,7 @@ export const generateWorkflowDiagram = ({
       data: {
         nodeType: 'trigger',
         triggerType: trigger.type,
-        label: triggerLabel,
+        name: isDefined(trigger.name) ? trigger.name : triggerLabel,
       },
       position: {
         x: 0,
diff --git a/packages/twenty-front/src/modules/workflow/utils/getStepDefaultDefinition.ts b/packages/twenty-front/src/modules/workflow/utils/getStepDefaultDefinition.ts
index 7abe92d20b..20a33f8b9c 100644
--- a/packages/twenty-front/src/modules/workflow/utils/getStepDefaultDefinition.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/getStepDefaultDefinition.ts
@@ -65,7 +65,7 @@ export const getStepDefaultDefinition = ({
     case 'RECORD_CRUD.CREATE': {
       return {
         id: newStepId,
-        name: 'Record Create',
+        name: 'Create Record',
         type: 'RECORD_CRUD',
         valid: false,
         settings: {