diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/column-config-sidebar/column-config-sidebar.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/column-config-sidebar/column-config-sidebar.test.tsx
index 5e55cb2baed..6354880db5c 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/column-config-sidebar/column-config-sidebar.test.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/column-config-sidebar/column-config-sidebar.test.tsx
@@ -51,11 +51,7 @@ vi.mock('@sim/emcn', () => ({
   },
   ChipInput: (props: React.InputHTMLAttributes<HTMLInputElement>) => <input {...props} />,
   FieldDivider: () => <hr />,
-  Label: ({ children, ...props }: React.LabelHTMLAttributes<HTMLLabelElement>) => (
-    <label htmlFor={props.htmlFor ?? 'test-field'} {...props}>
-      {children}
-    </label>
-  ),
+  Label: ({ children }: { children: React.ReactNode }) => <span>{children}</span>,
   Switch: ({ checked }: { checked?: boolean }) => (
     <button type='button' aria-pressed={checked}>
       Toggle
@@ -107,12 +103,6 @@ function findButton(label: string): HTMLButtonElement | undefined {
   )
 }
 
-function setInputValue(input: HTMLInputElement, value: string): void {
-  const valueSetter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set
-  valueSetter?.call(input, value)
-  input.dispatchEvent(new Event('input', { bubbles: true }))
-}
-
 beforeEach(() => {
   globalThis.IS_REACT_ACT_ENVIRONMENT = true
   container = document.createElement('div')
@@ -200,8 +190,7 @@ describe('ColumnConfigSidebar', () => {
     expect(mockUpdateColumn).not.toHaveBeenCalled()
   })
 
-  it('edits a Reference column name and target table together', async () => {
-    const onColumnRename = vi.fn()
+  it('edits Reference configuration without exposing column renaming', async () => {
     await act(async () => {
       root.render(
         <ColumnConfigSidebar
@@ -217,27 +206,21 @@ describe('ColumnConfigSidebar', () => {
           tableRowTtlEnabled={false}
           workspaceId='workspace-1'
           tableId='table-current'
-          onColumnRename={onColumnRename}
           referenceColumnsEnabled
         />
       )
     })
 
-    const nameInput = container.querySelector<HTMLInputElement>('#column-sidebar-name')
-    expect(nameInput?.value).toBe('Related row')
+    expect(container).not.toHaveTextContent('Column name')
+    expect(container.querySelector('#column-sidebar-name')).toBeNull()
 
-    act(() => setInputValue(nameInput!, 'Renamed relation'))
     act(() => findCombobox('Select table')?.onChange?.('table-customers'))
     await act(async () => findButton('Save')?.click())
 
     expect(mockUpdateColumn).toHaveBeenCalledWith({
       columnName: 'col-reference',
-      updates: {
-        name: 'Renamed relation',
-        referenceTableId: 'table-customers',
-      },
+      updates: { referenceTableId: 'table-customers' },
     })
-    expect(onColumnRename).toHaveBeenCalledWith('col-reference', 'Renamed relation')
   })
 
   it('keeps an existing Reference column visible but not retargetable when disabled', async () => {
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/column-config-sidebar/column-config-sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/column-config-sidebar/column-config-sidebar.tsx
index 321b1490738..18394a5489e 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/column-config-sidebar/column-config-sidebar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/column-config-sidebar/column-config-sidebar.tsx
@@ -77,9 +77,6 @@ interface ColumnConfigSidebarProps {
   readOnly?: boolean
   /** Why saving is unavailable; surfaced on the disabled Save button. */
   readOnlyReason?: string
-  /** Notify parent of a rename so it can rewrite local `columnOrder` /
-   *  `columnWidths` keys that reference the old name. */
-  onColumnRename?: (oldName: string, newName: string) => void
 }
 
 /**
@@ -132,7 +129,6 @@ function ColumnConfigBody({
   tableId,
   readOnly,
   readOnlyReason,
-  onColumnRename,
 }: ColumnConfigBodyProps) {
   const updateColumn = useUpdateColumn({ workspaceId, tableId })
   const addColumn = useAddTableColumn({ workspaceId, tableId })
@@ -210,7 +206,7 @@ function ColumnConfigBody({
   async function handleSave() {
     // Belt and braces: the button is disabled, and the server refuses too.
     if (readOnly) return
-    if (!trimmedName) {
+    if (config.mode === 'create' && !trimmedName) {
       setShowValidation(true)
       return
     }
@@ -242,7 +238,6 @@ function ColumnConfigBody({
         return
       }
 
-      const renamed = trimmedName !== (existingColumn?.name ?? config.columnName)
       const typeChanged = !!existingColumn && existingColumn.type !== typeInput
       const uniqueChanged =
         supportsUnique && !!existingColumn && !!existingColumn.unique !== uniqueInput
@@ -256,7 +251,6 @@ function ColumnConfigBody({
         wantsReference && existingColumn?.referenceTableId !== referenceTableInput
 
       const updates: {
-        name?: string
         type?: ColumnDefinition['type']
         unique?: boolean
         options?: SelectOption[]
@@ -264,7 +258,6 @@ function ColumnConfigBody({
         currencyCode?: string
         referenceTableId?: string
       } = {
-        ...(renamed ? { name: trimmedName } : {}),
         ...(typeChanged ? { type: typeInput } : {}),
         ...(uniqueChanged ? { unique: uniqueInput } : {}),
         ...(uniqueCleared ? { unique: false } : {}),
@@ -283,8 +276,7 @@ function ColumnConfigBody({
       }
 
       await updateColumn.mutateAsync({ columnName: config.columnName, updates })
-      if (renamed) onColumnRename?.(config.columnName, trimmedName)
-      toast.success(`Saved "${trimmedName}"`)
+      toast.success(`Saved "${existingColumn?.name ?? config.columnName}"`)
       onClose()
     } catch (err) {
       if (isValidationError(err)) {
@@ -321,23 +313,25 @@ function ColumnConfigBody({
             including the comboboxes' trigger buttons; `contents` keeps the
             existing layout. Values stay readable and selectable. */}
         <fieldset disabled={readOnly} className='contents'>
-          <div className='flex flex-col gap-[9.5px]'>
-            <RequiredLabel htmlFor='column-sidebar-name'>Column name</RequiredLabel>
-            <ChipInput
-              id='column-sidebar-name'
-              value={nameInput}
-              onChange={(e) => {
-                setNameInput(e.target.value)
-                if (nameError) setNameError(null)
-              }}
-              spellCheck={false}
-              autoComplete='off'
-              error={Boolean((showValidation && !trimmedName) || nameError)}
-              aria-invalid={(showValidation && !trimmedName) || nameError ? true : undefined}
-            />
-            {showValidation && !trimmedName && <FieldError message='Column name is required' />}
-            {nameError && !(showValidation && !trimmedName) && <FieldError message={nameError} />}
-          </div>
+          {config.mode === 'create' && (
+            <div className='flex flex-col gap-[9.5px]'>
+              <RequiredLabel htmlFor='column-sidebar-name'>Column name</RequiredLabel>
+              <ChipInput
+                id='column-sidebar-name'
+                value={nameInput}
+                onChange={(e) => {
+                  setNameInput(e.target.value)
+                  if (nameError) setNameError(null)
+                }}
+                spellCheck={false}
+                autoComplete='off'
+                error={Boolean((showValidation && !trimmedName) || nameError)}
+                aria-invalid={(showValidation && !trimmedName) || nameError ? true : undefined}
+              />
+              {showValidation && !trimmedName && <FieldError message='Column name is required' />}
+              {nameError && !(showValidation && !trimmedName) && <FieldError message={nameError} />}
+            </div>
+          )}
 
           {config.mode === 'edit' && (
             <>
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/column-rename.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/column-rename.test.tsx
new file mode 100644
index 00000000000..f7cc2650c50
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/column-rename.test.tsx
@@ -0,0 +1,101 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  persistColumnRename,
+  tryStartColumnRename,
+} from '@/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/column-rename'
+import { useInlineRename } from '@/hooks/use-inline-rename'
+
+interface Deferred {
+  promise: Promise<void>
+  resolve: () => void
+}
+
+function createDeferred(): Deferred {
+  let resolve = () => {}
+  const promise = new Promise<void>((settle) => {
+    resolve = settle
+  })
+  return { promise, resolve }
+}
+
+describe('column rename persistence', () => {
+  it('does not register undo history when persistence rejects', async () => {
+    const error = new Error('rename rejected')
+    const pushUndo = vi.fn()
+    const onRenamed = vi.fn()
+
+    await expect(
+      persistColumnRename({
+        columnId: 'column-1',
+        oldName: 'Original',
+        newName: 'Updated',
+        persist: () => Promise.reject(error),
+        pushUndo,
+        onRenamed,
+      })
+    ).rejects.toBe(error)
+
+    expect(pushUndo).not.toHaveBeenCalled()
+    expect(onRenamed).not.toHaveBeenCalled()
+  })
+})
+
+describe('column rename sessions', () => {
+  let container: HTMLDivElement
+  let root: Root
+  let rename: ReturnType<typeof useInlineRename>
+
+  beforeEach(() => {
+    globalThis.IS_REACT_ACT_ENVIRONMENT = true
+    container = document.createElement('div')
+    document.body.appendChild(container)
+    root = createRoot(container)
+  })
+
+  afterEach(() => {
+    act(() => root.unmount())
+    container.remove()
+  })
+
+  it('refuses a second session until the pending rename settles', async () => {
+    const deferred = createDeferred()
+
+    function Harness() {
+      rename = useInlineRename({ onSave: () => deferred.promise })
+      return null
+    }
+
+    act(() => root.render(<Harness />))
+    act(() => {
+      expect(tryStartColumnRename(rename, 'column-1', 'First')).toBe(true)
+    })
+    act(() => rename.setEditValue('Renamed first'))
+
+    let pendingRename: Promise<void>
+    act(() => {
+      pendingRename = rename.submitRename()
+    })
+
+    expect(rename.isSaving).toBe(true)
+    act(() => {
+      expect(tryStartColumnRename(rename, 'column-2', 'Second')).toBe(false)
+    })
+    expect(rename.editingId).toBe('column-1')
+
+    await act(async () => {
+      deferred.resolve()
+      await pendingRename
+    })
+
+    expect(rename.isSaving).toBe(false)
+    act(() => {
+      expect(tryStartColumnRename(rename, 'column-2', 'Second')).toBe(true)
+    })
+    expect(rename.editingId).toBe('column-2')
+  })
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/column-rename.ts b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/column-rename.ts
new file mode 100644
index 00000000000..6cd04c01c01
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/column-rename.ts
@@ -0,0 +1,40 @@
+import type { TableUndoAction } from '@/stores/table/types'
+
+type RenameColumnUndoAction = Extract<TableUndoAction, { type: 'rename-column' }>
+
+interface PersistColumnRenameOptions {
+  columnId: string
+  oldName: string
+  newName: string
+  persist: () => Promise<unknown>
+  pushUndo: (action: RenameColumnUndoAction) => void
+  onRenamed: () => void
+}
+
+export async function persistColumnRename({
+  columnId,
+  oldName,
+  newName,
+  persist,
+  pushUndo,
+  onRenamed,
+}: PersistColumnRenameOptions): Promise<void> {
+  await persist()
+  pushUndo({ type: 'rename-column', oldName, newName, columnId })
+  onRenamed()
+}
+
+interface InlineRenameSession {
+  isSaving: boolean
+  startRename: (id: string, currentName: string) => void
+}
+
+export function tryStartColumnRename(
+  session: InlineRenameSession,
+  columnId: string,
+  currentName: string
+): boolean {
+  if (session.isSaving) return false
+  session.startRename(columnId, currentName)
+  return true
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.test.tsx
new file mode 100644
index 00000000000..d0f728de929
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.test.tsx
@@ -0,0 +1,188 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { WorkflowGroup } from '@/lib/table'
+import type { DisplayColumn } from '@/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/types'
+
+vi.mock('@sim/emcn', () => ({
+  cn: (...values: Array<string | false | null | undefined>) => values.filter(Boolean).join(' '),
+}))
+
+vi.mock('@sim/emcn/icons', () => ({
+  ChevronDown: () => null,
+}))
+
+vi.mock(
+  '@/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-type-icon',
+  () => ({ ColumnTypeIcon: () => null })
+)
+
+vi.mock(
+  '@/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/header-label',
+  () => ({ HeaderLabel: ({ label }: { label: string }) => <span>{label}</span> })
+)
+
+vi.mock(
+  '@/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell',
+  () => ({ ColumnOptionsMenu: () => null })
+)
+
+import { ColumnHeaderMenu } from '@/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu'
+
+let container: HTMLDivElement
+let root: Root
+
+const DEFAULT_COLUMN: DisplayColumn = {
+  id: 'col-name',
+  key: 'col-name',
+  name: 'Name',
+  type: 'string',
+  groupSize: 1,
+  groupStartColIndex: 0,
+  headerLabel: 'Name',
+  isGroupStart: true,
+}
+
+beforeEach(() => {
+  globalThis.IS_REACT_ACT_ENVIRONMENT = true
+  container = document.createElement('div')
+  document.body.appendChild(container)
+  act(() => {
+    root = createRoot(container)
+  })
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+})
+
+function renderHeader({
+  column = DEFAULT_COLUMN,
+  workflowGroups,
+  onColumnSelect = vi.fn(),
+  onOpenConfig = vi.fn(),
+  onRenameColumn = vi.fn(),
+}: {
+  column?: DisplayColumn
+  workflowGroups?: WorkflowGroup[]
+  onColumnSelect?: (colIndex: number, shiftKey: boolean) => void
+  onOpenConfig?: (columnName: string) => void
+  onRenameColumn?: (columnName: string) => void
+} = {}) {
+  act(() => {
+    root.render(
+      <table>
+        <thead>
+          <tr>
+            <ColumnHeaderMenu
+              column={column}
+              colIndex={2}
+              isRenaming={false}
+              isColumnSelected={false}
+              renameValue=''
+              onRenameValueChange={vi.fn()}
+              onRenameSubmit={vi.fn()}
+              onRenameCancel={vi.fn()}
+              onColumnSelect={onColumnSelect}
+              onInsertLeft={vi.fn()}
+              onInsertRight={vi.fn()}
+              onRenameColumn={onRenameColumn}
+              onDeleteColumn={vi.fn()}
+              onResizeStart={vi.fn()}
+              onResize={vi.fn()}
+              onResizeEnd={vi.fn()}
+              onAutoResize={vi.fn()}
+              onOpenConfig={onOpenConfig}
+              workflowGroups={workflowGroups}
+            />
+          </tr>
+        </thead>
+      </table>
+    )
+  })
+
+  const headerButton = Array.from(container.querySelectorAll('button')).find((button) =>
+    button.textContent?.includes(column.workflowGroupId ? column.headerLabel : column.name)
+  )
+  if (!headerButton) throw new Error('Column header button was not rendered')
+  return headerButton
+}
+
+describe('ColumnHeaderMenu interactions', () => {
+  it('selects the column without opening configuration on a single click', () => {
+    const onColumnSelect = vi.fn()
+    const onOpenConfig = vi.fn()
+    const onRenameColumn = vi.fn()
+    const headerButton = renderHeader({ onColumnSelect, onOpenConfig, onRenameColumn })
+
+    act(() => headerButton.click())
+
+    expect(onColumnSelect).toHaveBeenCalledWith(2, false)
+    expect(onOpenConfig).not.toHaveBeenCalled()
+    expect(onRenameColumn).not.toHaveBeenCalled()
+  })
+
+  it('selects before starting inline rename on a double click', () => {
+    const onColumnSelect = vi.fn()
+    const onRenameColumn = vi.fn()
+    const headerButton = renderHeader({ onColumnSelect, onRenameColumn })
+
+    act(() => {
+      headerButton.dispatchEvent(new MouseEvent('click', { bubbles: true, detail: 1 }))
+      headerButton.dispatchEvent(new MouseEvent('click', { bubbles: true, detail: 2 }))
+      headerButton.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }))
+    })
+
+    expect(onColumnSelect).toHaveBeenCalledTimes(1)
+    expect(onRenameColumn).toHaveBeenCalledWith('col-name')
+  })
+
+  it('does not rename a workflow-output column on double click', () => {
+    const onRenameColumn = vi.fn()
+    const headerButton = renderHeader({
+      column: { ...DEFAULT_COLUMN, workflowGroupId: 'workflow-group' },
+      workflowGroups: [
+        {
+          id: 'workflow-group',
+          workflowId: 'workflow-1',
+          type: 'manual',
+          outputs: [{ blockId: 'block-1', path: 'result', columnName: 'col-name' }],
+        },
+      ],
+      onRenameColumn,
+    })
+
+    act(() => {
+      headerButton.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }))
+    })
+
+    expect(onRenameColumn).not.toHaveBeenCalled()
+  })
+
+  it('renames an enrichment column on double click', () => {
+    const onRenameColumn = vi.fn()
+    const headerButton = renderHeader({
+      column: { ...DEFAULT_COLUMN, workflowGroupId: 'enrichment-group' },
+      workflowGroups: [
+        {
+          id: 'enrichment-group',
+          workflowId: '',
+          enrichmentId: 'company-domain',
+          type: 'enrichment',
+          outputs: [{ blockId: '', path: '', outputId: 'domain', columnName: 'col-name' }],
+        },
+      ],
+      onRenameColumn,
+    })
+
+    act(() => {
+      headerButton.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }))
+    })
+
+    expect(onRenameColumn).toHaveBeenCalledWith('col-name')
+  })
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx
index 9782c564aaf..294003e4f14 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx
@@ -22,12 +22,16 @@ interface ColumnHeaderMenuProps {
   isRenaming: boolean
   isColumnSelected: boolean
   renameValue: string
+  /** Marks a refused inline rename until the user changes or cancels it. */
+  renameError?: boolean
   onRenameValueChange: (value: string) => void
   onRenameSubmit: () => void
   onRenameCancel: () => void
   onColumnSelect: (colIndex: number, shiftKey: boolean) => void
   onInsertLeft: (columnName: string) => void
   onInsertRight: (columnName: string) => void
+  /** Starts inline renaming when a plain or enrichment header is double-clicked. */
+  onRenameColumn?: (columnName: string) => void
   /** Opens the table targeted by a Reference column. */
   onGoToReferenceTable?: (tableId: string) => void
   onDeleteColumn: (columnName: string) => void
@@ -76,12 +80,14 @@ export const ColumnHeaderMenu = React.memo(function ColumnHeaderMenu({
   isRenaming,
   isColumnSelected,
   renameValue,
+  renameError,
   onRenameValueChange,
   onRenameSubmit,
   onRenameCancel,
   onColumnSelect,
   onInsertLeft,
   onInsertRight,
+  onRenameColumn,
   onGoToReferenceTable,
   onDeleteColumn,
   onResizeStart,
@@ -124,6 +130,7 @@ export const ColumnHeaderMenu = React.memo(function ColumnHeaderMenu({
       ? 'Hide column'
       : 'Delete column'
     : undefined
+  const isWorkflowOutput = Boolean(column.workflowGroupId && ownGroup?.type !== 'enrichment')
   useEffect(() => {
     if (isRenaming && renameInputRef.current) {
       renameInputRef.current.focus()
@@ -233,10 +240,13 @@ export const ColumnHeaderMenu = React.memo(function ColumnHeaderMenu({
       return
     }
     if (isRenaming) return
+    if (e.detail > 1) return
     onColumnSelect(colIndex, e.shiftKey)
-    if (!e.shiftKey) {
-      onOpenConfig(column.key)
-    }
+  }
+
+  function handleHeaderDoubleClick() {
+    if (isRenaming || isWorkflowOutput) return
+    onRenameColumn?.(column.key)
   }
 
   function handleChevronClick(e: React.MouseEvent) {
@@ -291,7 +301,7 @@ export const ColumnHeaderMenu = React.memo(function ColumnHeaderMenu({
         <div className='flex h-full w-full min-w-0 items-center px-2 py-[7px]'>
           <ColumnTypeIcon
             type={column.type}
-            isWorkflowColumn={!!column.workflowGroupId && ownGroup?.type !== 'enrichment'}
+            isWorkflowColumn={isWorkflowOutput}
             blockIconInfo={sourceInfo?.blockIconInfo}
             blockMissing={blockMissing}
           />
@@ -305,14 +315,18 @@ export const ColumnHeaderMenu = React.memo(function ColumnHeaderMenu({
               if (e.key === 'Escape') onRenameCancel()
             }}
             onBlur={onRenameSubmit}
-            className='ml-1.5 min-w-0 flex-1 border-0 bg-transparent p-0 text-[var(--text-primary)] text-small outline-hidden focus:outline-hidden focus:ring-0'
+            aria-invalid={renameError || undefined}
+            className={cn(
+              'ml-1.5 min-w-0 flex-1 border-0 bg-transparent p-0 text-small outline-hidden focus:outline-hidden focus:ring-0',
+              renameError ? 'text-[var(--text-error)]' : 'text-[var(--text-primary)]'
+            )}
           />
         </div>
       ) : readOnly ? (
         <div className='flex h-full w-full min-w-0 items-center px-2 py-[7px]'>
           <ColumnTypeIcon
             type={column.type}
-            isWorkflowColumn={!!column.workflowGroupId && ownGroup?.type !== 'enrichment'}
+            isWorkflowColumn={isWorkflowOutput}
             blockIconInfo={sourceInfo?.blockIconInfo}
             blockMissing={blockMissing}
           />
@@ -339,11 +353,12 @@ export const ColumnHeaderMenu = React.memo(function ColumnHeaderMenu({
             type='button'
             className='flex min-w-0 flex-1 cursor-pointer items-center px-2 py-[7px] outline-hidden'
             onClick={handleHeaderClick}
+            onDoubleClick={handleHeaderDoubleClick}
             draggable={false}
           >
             <ColumnTypeIcon
               type={column.type}
-              isWorkflowColumn={!!column.workflowGroupId && ownGroup?.type !== 'enrichment'}
+              isWorkflowColumn={isWorkflowOutput}
               blockIconInfo={sourceInfo?.blockIconInfo}
               blockMissing={blockMissing}
             />
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.test.tsx
index 8454b78ce5f..b71431d5c3b 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.test.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.test.tsx
@@ -42,7 +42,6 @@ vi.mock('@sim/emcn/icons', () => ({
   Pin: () => null,
   PinOff: () => null,
   PlayOutline: () => null,
-  Settings: () => null,
   SquareArrowUpRight: () => null,
   Trash: () => null,
   Workflow: () => null,
@@ -102,6 +101,7 @@ function renderMenu(column: ColumnDefinition, onGoToReferenceTable: (tableId: st
         onInsertLeft={vi.fn()}
         onInsertRight={vi.fn()}
         onDeleteColumn={vi.fn()}
+        onOpenConfig={vi.fn()}
         onGoToReferenceTable={onGoToReferenceTable}
       />
     )
@@ -196,3 +196,11 @@ describe('ColumnHeaderMenu read-only Reference navigation', () => {
     expect(container.querySelector('button[aria-label="Column options"]')).toBeNull()
   })
 })
+
+describe('ColumnOptionsMenu editing', () => {
+  it('keeps rename out of the column menu', () => {
+    renderMenu({ id: 'col-name', name: 'Name', type: 'string' }, vi.fn())
+
+    expect(findButton('Rename column')).toBeUndefined()
+  })
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx
index 4e16d7cca58..38bf090e4bb 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx
@@ -137,9 +137,9 @@ function MenuRow({ reason, children }: { reason?: string; children: React.ReactE
 /**
  * Shared column-options dropdown rendered next to the column header chevron
  * AND on right-click of the workflow group meta cell. Anchors to a fixed
- * position passed in (so callers can place it under the chevron, or at the
- * cursor for context-menu use). Rename / change type / unique live in the
- * column sidebar (opened by Edit column).
+ * position passed in so callers can place it under the chevron or at the
+ * cursor. Rename starts in the header; type, uniqueness, and type-specific
+ * configuration live in the sidebar opened by Edit column.
  */
 export function ColumnOptionsMenu({
   open,
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/table-grid.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/table-grid.tsx
index 95efc3a8e78..26435b58290 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/table-grid.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/table-grid.tsx
@@ -2,7 +2,7 @@
 
 import type React from 'react'
 import { Fragment, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
-import { cn, toast, useToast } from '@sim/emcn'
+import { cn, toast, useToast, writeTextToClipboard } from '@sim/emcn'
 import { Loader, TableX } from '@sim/emcn/icons'
 import { createLogger } from '@sim/logger'
 import type { TableCellSelection } from '@sim/realtime-protocol/table-presence'
@@ -11,6 +11,7 @@ import { assessTextPaste, formatPasteLimit, PASTE_LIMITS } from '@sim/utils/past
 import { useVirtualizer } from '@tanstack/react-virtual'
 import { useParams, useRouter } from 'next/navigation'
 import { usePostHog } from 'posthog-js/react'
+import { extractValidationIssues, isValidationError } from '@/lib/api/client/errors'
 import type { RunLimit, RunMode, TableFindMatch } from '@/lib/api/contracts/tables'
 import { attachSelectionContextToClipboard } from '@/lib/copilot/chat/selection-clipboard'
 import { captureEvent } from '@/lib/posthog/client'
@@ -36,6 +37,10 @@ import { cellValueFilterConditions } from '@/lib/table/query-builder/cell-filter
 import { SEARCH_DEBOUNCE_MS } from '@/lib/url-state'
 import { FindBar } from '@/app/workspace/[workspaceId]/components'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
+import {
+  persistColumnRename,
+  tryStartColumnRename,
+} from '@/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/column-rename'
 import {
   REFERENCE_ROW_PREVIEW_HEIGHT,
   ReferenceRowPreview,
@@ -93,6 +98,7 @@ import {
   chipRowCount,
   classifyExecStatusMix,
   collectRowSnapshots,
+  columnNameIssue,
   computeNormalizedSelection,
   drainTargetForChip,
   type ExecStatusMix,
@@ -1583,16 +1589,66 @@ export function TableGrid({
   const handleFindCloseRef = useRef(handleFindClose)
   handleFindCloseRef.current = handleFindClose
 
+  const [renameErrorColumnId, setRenameErrorColumnId] = useState<string | null>(null)
+
   const columnRename = useInlineRename({
     // `columnName` is the column id; record the prior display name + id so undo
     // restores the label (not the id) and targets the right column.
-    onSave: (columnName, newName) => {
+    onSave: async (columnName, newName) => {
       const oldName = columnsRef.current.find((c) => c.key === columnName)?.name ?? columnName
-      pushUndoRef.current({ type: 'rename-column', oldName, newName, columnId: columnName })
-      handleColumnRename(columnName, newName)
-      return updateColumnMutation.mutateAsync({ columnName, updates: { name: newName } })
+      try {
+        await persistColumnRename({
+          columnId: columnName,
+          oldName,
+          newName,
+          persist: () =>
+            updateColumnMutation.mutateAsync({ columnName, updates: { name: newName } }),
+          pushUndo: pushUndoRef.current,
+          onRenamed: () => handleColumnRename(columnName, newName),
+        })
+      } catch (error) {
+        if (isValidationError(error)) {
+          toast.error(extractValidationIssues(error)[0]?.message ?? getErrorMessage(error))
+        }
+        setRenameErrorColumnId(columnName)
+        throw error
+      }
     },
   })
+  const columnRenameRef = useRef<ReturnType<typeof useInlineRename>>(columnRename)
+  columnRenameRef.current = columnRename
+
+  const handleRenameValueChange = useCallback((value: string) => {
+    setRenameErrorColumnId(null)
+    columnRenameRef.current.setEditValue(value)
+  }, [])
+
+  /** Keeps invalid names in the header so the user can correct them in place. */
+  const handleRenameSubmit = useCallback(() => {
+    const { editingId, editValue, submitRename } = columnRenameRef.current
+    const trimmedName = editValue.trim()
+    const currentColumn = columnsRef.current.find((column) => column.key === editingId)
+    if (currentColumn && trimmedName !== currentColumn.name) {
+      const issue = columnNameIssue(
+        trimmedName,
+        schemaColumnsRef.current
+          .filter((column) => getColumnId(column) !== editingId)
+          .map((column) => column.name)
+      )
+      if (issue) {
+        toast.error(issue)
+        setRenameErrorColumnId(editingId)
+        return
+      }
+    }
+    setRenameErrorColumnId(null)
+    void submitRename()
+  }, [])
+
+  const handleRenameCancel = useCallback(() => {
+    setRenameErrorColumnId(null)
+    columnRenameRef.current.cancelRename()
+  }, [])
 
   const toggleBooleanCell = useCallback(
     (rowId: string, columnName: string, currentValue: unknown) => {
@@ -1809,7 +1865,7 @@ export function TableGrid({
   function handleCopyRowId() {
     const rowId = contextMenu.row?.id
     if (!rowId) return
-    void navigator.clipboard.writeText(rowId).catch((error) => {
+    void writeTextToClipboard(rowId).catch((error) => {
       logger.error('Failed to copy row ID', { error })
       toast.error('Failed to copy row ID')
     })
@@ -4125,6 +4181,14 @@ export function TableGrid({
     [onOpenColumnConfig, onOpenWorkflowConfig, workflowGroupById]
   )
 
+  const handleRenameColumn = useCallback((columnName: string) => {
+    const column = columnsRef.current.find((candidate) => candidate.key === columnName)
+    if (!tryStartColumnRename(columnRenameRef.current, columnName, column?.name ?? columnName)) {
+      return
+    }
+    setRenameErrorColumnId(null)
+  }, [])
+
   const handleConfigureWorkflowGroup = useCallback(
     (groupId: string) => {
       const group = workflowGroupById.get(groupId)
@@ -5021,9 +5085,10 @@ export function TableGrid({
                             renameValue={
                               columnRename.editingId === column.key ? columnRename.editValue : ''
                             }
-                            onRenameValueChange={columnRename.setEditValue}
-                            onRenameSubmit={columnRename.submitRename}
-                            onRenameCancel={columnRename.cancelRename}
+                            renameError={renameErrorColumnId === column.key}
+                            onRenameValueChange={handleRenameValueChange}
+                            onRenameSubmit={handleRenameSubmit}
+                            onRenameCancel={handleRenameCancel}
                             onColumnSelect={handleColumnSelect}
                             // Required props here, and the menu is already
                             // suppressed for non-editors by `readOnly`.
@@ -5054,6 +5119,9 @@ export function TableGrid({
                             deleteLockedReason={
                               locks?.deleteLocked ? LOCK_TOOLTIPS.delete : undefined
                             }
+                            onRenameColumn={
+                              userPermissions.canEdit ? handleRenameColumn : undefined
+                            }
                             onGoToReferenceTable={
                               referenceColumnsEnabled ? handleGoToReferenceTable : undefined
                             }
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.test.ts b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.test.ts
index e4fc58c8bf6..77c86df6648 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.test.ts
@@ -12,6 +12,7 @@ import {
   buildTableSelectionContext,
   canWriteRowsWithChip,
   chipRowCount,
+  columnNameIssue,
   drainTargetForChip,
   expandToDisplayColumns,
   horizontalEdgeScrollVelocity,
@@ -235,3 +236,27 @@ describe('drainTargetForChip', () => {
     expect(drainTargetForChip(0)).toBe(MAX_TABLE_SELECTION_ROWS)
   })
 })
+
+describe('columnNameIssue', () => {
+  it('accepts a pattern-safe, unused name', () => {
+    expect(columnNameIssue('email_address', ['name', 'status'])).toBeNull()
+  })
+
+  it('requires a name', () => {
+    expect(columnNameIssue('', [])).toBe('Column name is required')
+  })
+
+  it('refuses invalid patterns and names that begin with a digit', () => {
+    expect(columnNameIssue('New Text', [])).toMatch(/letter or underscore/)
+    expect(columnNameIssue('1st', [])).toMatch(/letter or underscore/)
+  })
+
+  it('refuses a name longer than the column-name limit', () => {
+    const longName = 'a'.repeat(TABLE_LIMITS.MAX_COLUMN_NAME_LENGTH + 1)
+    expect(columnNameIssue(longName, [])).toMatch(/characters or less/)
+  })
+
+  it('refuses an existing name case-insensitively', () => {
+    expect(columnNameIssue('EMAIL', ['email'])).toBe('A column named "email" already exists')
+  })
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.ts b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.ts
index 252ceb01d46..2117f21e19c 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.ts
@@ -13,7 +13,7 @@ import type {
 } from '@/lib/table'
 import { getColumnId } from '@/lib/table/column-keys'
 import { columnReferencedTableIds } from '@/lib/table/column-types'
-import { TABLE_LIMITS } from '@/lib/table/constants'
+import { NAME_PATTERN, TABLE_LIMITS } from '@/lib/table/constants'
 import { areGroupDepsSatisfied, areOutputsFilled } from '@/lib/table/deps'
 import type {
   DisplayColumn,
@@ -513,3 +513,26 @@ export function canWriteRowsWithChip(opts: {
   if (!opts.hasContext || !opts.complete) return false
   return opts.rowCount > 0 && opts.rowCount <= TABLE_LIMITS.MAX_COPY_ROWS
 }
+
+/**
+ * Returns a user-facing reason that a proposed column name cannot be saved,
+ * or `null` when the name is valid and unused.
+ *
+ * @param takenNames Names of every other column in the table.
+ */
+export function columnNameIssue(name: string, takenNames: Iterable<string>): string | null {
+  if (!name) return 'Column name is required'
+  if (name.length > TABLE_LIMITS.MAX_COLUMN_NAME_LENGTH) {
+    return `Column names must be ${TABLE_LIMITS.MAX_COLUMN_NAME_LENGTH} characters or less`
+  }
+  if (!NAME_PATTERN.test(name)) {
+    return 'Column names must start with a letter or underscore and use only letters, numbers, and underscores'
+  }
+  const lowerName = name.toLowerCase()
+  for (const takenName of takenNames) {
+    if (takenName.toLowerCase() === lowerName) {
+      return `A column named "${takenName}" already exists`
+    }
+  }
+  return null
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx
index 9e8f5630e62..8c738899932 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx
@@ -328,9 +328,9 @@ export function Table({
   }, [])
 
   /**
-   * Sink populated by the grid: invoked from sidebar `onColumnRename` so the
-   * grid can rewrite its local `columnWidths` / `columnOrder` keys after a
-   * rename. The grid's render assigns to `current`; the wrapper forwards calls.
+   * Sink populated by the grid: invoked from the workflow sidebar after a
+   * rename so the grid can rewrite its local `columnWidths` / `columnOrder`
+   * keys. The grid's render assigns to `current`; the wrapper forwards calls.
    */
   const columnRenameSinkRef = useRef<((oldName: string, newName: string) => void) | null>(null)
   const onColumnRename = (oldName: string, newName: string) => {
@@ -1737,7 +1737,6 @@ export function Table({
             ? LOCK_TOOLTIPS.schema
             : 'You don’t have permission to change columns.'
         }
-        onColumnRename={onColumnRename}
       />
       <EnrichmentsSidebar
         open={slideout.kind === 'enrichments'}