diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-format/components/empty-state.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/empty-state.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-format/components/empty-state.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/empty-state.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-format/components/filter-rule-row.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-format/components/filter-rule-row.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-format/filter-format.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/filter-builder.tsx
similarity index 96%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-format/filter-format.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/filter-builder.tsx
index 0ccf43e96..ea8163bba 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-format/filter-format.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/filter-builder.tsx
@@ -10,7 +10,7 @@ import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/c
 import { EmptyState } from './components/empty-state'
 import { FilterRuleRow } from './components/filter-rule-row'
 
-interface FilterFormatProps {
+interface FilterBuilderProps {
   blockId: string
   subBlockId: string
   isPreview?: boolean
@@ -21,7 +21,7 @@ interface FilterFormatProps {
 }
 
 /** Visual builder for table filter rules in workflow blocks. */
-export function FilterFormat({
+export function FilterBuilder({
   blockId,
   subBlockId,
   isPreview = false,
@@ -29,7 +29,7 @@ export function FilterFormat({
   disabled = false,
   columns: propColumns,
   tableIdSubBlockId = 'tableId',
-}: FilterFormatProps) {
+}: FilterBuilderProps) {
   const [storeValue, setStoreValue] = useSubBlockValue<FilterRule[]>(blockId, subBlockId)
   const [tableIdValue] = useSubBlockValue<string>(blockId, tableIdSubBlockId)
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/index.ts
index 50fa2fafd..8e3fd9f48 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/index.ts
@@ -9,7 +9,7 @@ export { Dropdown } from './dropdown/dropdown'
 export { EvalInput } from './eval-input/eval-input'
 export { FileSelectorInput } from './file-selector/file-selector-input'
 export { FileUpload } from './file-upload/file-upload'
-export { FilterFormat } from './filter-format/filter-format'
+export { FilterBuilder } from './filter-builder/filter-builder'
 export { FolderSelectorInput } from './folder-selector/components/folder-selector-input'
 export { GroupedCheckboxList } from './grouped-checkbox-list/grouped-checkbox-list'
 export { InputMapping } from './input-mapping/input-mapping'
@@ -26,7 +26,7 @@ export { ScheduleInfo } from './schedule-info/schedule-info'
 export { ShortInput } from './short-input/short-input'
 export { SlackSelectorInput } from './slack-selector/slack-selector-input'
 export { SliderInput } from './slider-input/slider-input'
-export { SortFormat } from './sort-format/sort-format'
+export { SortBuilder } from './sort-builder/sort-builder'
 export { InputFormat } from './starter/input-format'
 export { SubBlockInputController } from './sub-block-input-controller'
 export { Switch } from './switch/switch'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-format/components/empty-state.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/empty-state.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-format/components/empty-state.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/empty-state.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-format/components/sort-rule-row.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-format/components/sort-rule-row.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-format/sort-format.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/sort-builder.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-format/sort-format.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/sort-builder.tsx
index 0272a3328..d8c856717 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-format/sort-format.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/sort-builder.tsx
@@ -10,7 +10,7 @@ import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/c
 import { EmptyState } from './components/empty-state'
 import { SortRuleRow } from './components/sort-rule-row'
 
-interface SortFormatProps {
+interface SortBuilderProps {
   blockId: string
   subBlockId: string
   isPreview?: boolean
@@ -27,7 +27,7 @@ const createDefaultRule = (columns: ComboboxOption[]): SortRule => ({
 })
 
 /** Visual builder for table sort rules in workflow blocks. */
-export function SortFormat({
+export function SortBuilder({
   blockId,
   subBlockId,
   isPreview = false,
@@ -35,7 +35,7 @@ export function SortFormat({
   disabled = false,
   columns: propColumns,
   tableIdSubBlockId = 'tableId',
-}: SortFormatProps) {
+}: SortBuilderProps) {
   const [storeValue, setStoreValue] = useSubBlockValue<SortRule[]>(blockId, subBlockId)
   const [tableIdValue] = useSubBlockValue<string>(blockId, tableIdSubBlockId)
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
index 54ba32a9e..72153fb1a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
@@ -17,7 +17,7 @@ import {
   EvalInput,
   FileSelectorInput,
   FileUpload,
-  FilterFormat,
+  FilterBuilder,
   FolderSelectorInput,
   GroupedCheckboxList,
   InputFormat,
@@ -35,7 +35,7 @@ import {
   ShortInput,
   SlackSelectorInput,
   SliderInput,
-  SortFormat,
+  SortBuilder,
   Switch,
   Table,
   TableSelector,
@@ -814,9 +814,9 @@ function SubBlockComponent({
           />
         )
 
-      case 'filter-format':
+      case 'filter-builder':
         return (
-          <FilterFormat
+          <FilterBuilder
             blockId={blockId}
             subBlockId={config.id}
             isPreview={isPreview}
@@ -825,9 +825,9 @@ function SubBlockComponent({
           />
         )
 
-      case 'sort-format':
+      case 'sort-builder':
         return (
-          <SortFormat
+          <SortBuilder
             blockId={blockId}
             subBlockId={config.id}
             isPreview={isPreview}
diff --git a/apps/sim/blocks/blocks/table.ts b/apps/sim/blocks/blocks/table.ts
index 1364e2b7d..25b624d73 100644
--- a/apps/sim/blocks/blocks/table.ts
+++ b/apps/sim/blocks/blocks/table.ts
@@ -317,7 +317,7 @@ Return ONLY the rows array:`,
     {
       id: 'bulkFilterBuilder',
       title: 'Filter Conditions',
-      type: 'filter-format',
+      type: 'filter-builder',
       required: {
         field: 'operation',
         value: ['update_rows_by_filter', 'delete_rows_by_filter'],
@@ -398,7 +398,7 @@ Return ONLY the filter JSON:`,
     {
       id: 'filterBuilder',
       title: 'Filter Conditions',
-      type: 'filter-format',
+      type: 'filter-builder',
       condition: {
         field: 'operation',
         value: 'query_rows',
@@ -410,7 +410,7 @@ Return ONLY the filter JSON:`,
     {
       id: 'sortBuilder',
       title: 'Sort Order',
-      type: 'sort-format',
+      type: 'sort-builder',
       condition: {
         field: 'operation',
         value: 'query_rows',
diff --git a/apps/sim/blocks/types.ts b/apps/sim/blocks/types.ts
index 31bf6e092..4d71ea7e9 100644
--- a/apps/sim/blocks/types.ts
+++ b/apps/sim/blocks/types.ts
@@ -72,8 +72,8 @@ export type SubBlockType =
   | 'mcp-dynamic-args' // MCP dynamic arguments based on tool schema
   | 'input-format' // Input structure format
   | 'response-format' // Response structure format
-  | 'filter-format' // Filter conditions builder
-  | 'sort-format' // Sort conditions builder
+  | 'filter-builder' // Filter conditions builder
+  | 'sort-builder' // Sort conditions builder
   | 'trigger-save' // Trigger save button with validation
   | 'file-upload' // File uploader
   | 'input-mapping' // Map parent variables to child workflow input schema