diff --git a/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/Handles.tsx b/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/Handles.tsx
index 354160d76..3add82010 100644
--- a/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/Handles.tsx
+++ b/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/Handles.tsx
@@ -34,7 +34,7 @@ export const InputHandle = ({
   onLabelClick,
   onHandleSelectionChange,
 }: InputHandleProps) => {
-  const { getTaskInputNodeId } = useNodeManager();
+  const { getInputHandleNodeId } = useNodeManager();
   const { taskId, nodeId, state, name } = useTaskNode();
 
   const fromHandle = useConnection((connection) => connection.fromHandle?.id);
@@ -47,7 +47,7 @@ export const InputHandle = ({
   const [selected, setSelected] = useState(false);
   const [active, setActive] = useState(false);
 
-  const handleId = getTaskInputNodeId(taskId, input.name);
+  const handleId = getInputHandleNodeId(taskId, input.name);
 
   const missing = invalid ? "bg-red-700!" : "bg-gray-500!";
   const hasValue = value !== undefined && value !== null;
@@ -230,7 +230,7 @@ export const OutputHandle = ({
   onLabelClick,
   onHandleSelectionChange,
 }: OutputHandleProps) => {
-  const { getTaskOutputNodeId } = useNodeManager();
+  const { getOutputHandleNodeId } = useNodeManager();
   const { taskId, nodeId, state, name } = useTaskNode();
 
   const fromHandle = useConnection((connection) => connection.fromHandle?.id);
@@ -243,7 +243,7 @@ export const OutputHandle = ({
   const [selected, setSelected] = useState(false);
   const [active, setActive] = useState(false);
 
-  const handleId = getTaskOutputNodeId(taskId, output.name);
+  const handleId = getOutputHandleNodeId(taskId, output.name);
   const hasValue = value !== undefined && value !== "" && value !== null;
 
   const handleHandleClick = useCallback(
diff --git a/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/TaskNodeInputs.tsx b/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/TaskNodeInputs.tsx
index 8677588ab..de6144189 100644
--- a/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/TaskNodeInputs.tsx
+++ b/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/TaskNodeInputs.tsx
@@ -27,7 +27,7 @@ export function TaskNodeInputs({
   expanded,
   onBackgroundClick,
 }: TaskNodeInputsProps) {
-  const { getTaskInputNodeId } = useNodeManager();
+  const { getInputHandleNodeId } = useNodeManager();
   const { taskId, inputs, taskSpec, state, select } = useTaskNode();
   const { graphSpec } = useComponentSpec();
   const {
@@ -146,7 +146,7 @@ export function TaskNodeInputs({
     }
 
     const input = inputs.find(
-      (i) => getTaskInputNodeId(taskId, i.name) === fromHandle?.id,
+      (i) => getInputHandleNodeId(taskId, i.name) === fromHandle?.id,
     );
 
     if (!input) return;
diff --git a/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/TaskNodeOutputs.tsx b/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/TaskNodeOutputs.tsx
index 63b7c2580..0d5f39f8b 100644
--- a/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/TaskNodeOutputs.tsx
+++ b/src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/TaskNodeOutputs.tsx
@@ -23,7 +23,7 @@ export function TaskNodeOutputs({
   expanded,
   onBackgroundClick,
 }: TaskNodeOutputsProps) {
-  const { getTaskOutputNodeId } = useNodeManager();
+  const { getOutputHandleNodeId } = useNodeManager();
   const { taskId, nodeId, outputs, state, select } = useTaskNode();
   const {
     highlightSearchFilter,
@@ -41,7 +41,7 @@ export function TaskNodeOutputs({
     edges.some(
       (edge) =>
         edge.source === nodeId &&
-        edge.sourceHandle === getTaskOutputNodeId(taskId, output.name),
+        edge.sourceHandle === getOutputHandleNodeId(taskId, output.name),
     ),
   );
 
@@ -139,7 +139,7 @@ export function TaskNodeOutputs({
     }
 
     const output = outputs.find(
-      (o) => getTaskOutputNodeId(taskId, o.name) === fromHandle?.id,
+      (o) => getOutputHandleNodeId(taskId, o.name) === fromHandle?.id,
     );
 
     if (!output) return;
diff --git a/src/components/shared/ReactFlow/FlowCanvas/utils/addAndConnectNode.ts b/src/components/shared/ReactFlow/FlowCanvas/utils/addAndConnectNode.ts
index df11f38cd..ea3875536 100644
--- a/src/components/shared/ReactFlow/FlowCanvas/utils/addAndConnectNode.ts
+++ b/src/components/shared/ReactFlow/FlowCanvas/utils/addAndConnectNode.ts
@@ -64,10 +64,10 @@ export function addAndConnectNode({
     fromHandleName = fromHandleInfo?.handleName;
     fromHandleType = nodeManager.getNodeType(fromHandle.id);
   } else if (fromNodeType === "input") {
-    fromHandleType = "taskOutput";
+    fromHandleType = "outputHandle";
     fromHandleName = inputIdToInputName(fromTaskId);
   } else if (fromNodeType === "output") {
-    fromHandleType = "taskInput";
+    fromHandleType = "inputHandle";
     fromHandleName = outputIdToOutputName(fromTaskId);
   } else {
     return componentSpec;
@@ -79,13 +79,13 @@ export function addAndConnectNode({
 
   if (
     !fromHandleType ||
-    (fromHandleType !== "taskInput" && fromHandleType !== "taskOutput")
+    (fromHandleType !== "inputHandle" && fromHandleType !== "outputHandle")
   ) {
     return componentSpec;
   }
 
   const adjustedPosition =
-    fromHandleType === "taskInput"
+    fromHandleType === "inputHandle"
       ? { ...position, x: position.x - DEFAULT_NODE_DIMENSIONS.w }
       : position;
 
@@ -126,11 +126,11 @@ export function addAndConnectNode({
   }
 
   let connectionType: TypeSpecType | undefined;
-  if (fromHandleType === "taskInput") {
+  if (fromHandleType === "inputHandle") {
     connectionType = fromComponentSpec?.inputs?.find(
       (io) => io.name === fromHandleName,
     )?.type;
-  } else if (fromHandleType === "taskOutput") {
+  } else if (fromHandleType === "outputHandle") {
     connectionType = fromComponentSpec?.outputs?.find(
       (io) => io.name === fromHandleName,
     )?.type;
@@ -138,7 +138,7 @@ export function addAndConnectNode({
 
   // Find the first matching handle on the new node
   const toHandleType =
-    fromHandleType === "taskInput" ? "taskOutput" : "taskInput";
+    fromHandleType === "inputHandle" ? "outputHandle" : "inputHandle";
 
   const inputHandleName = componentRef.spec?.inputs?.find(
     (io) => io.type === connectionType,
@@ -149,13 +149,13 @@ export function addAndConnectNode({
   )?.name;
 
   const toHandleName =
-    toHandleType === "taskInput" ? inputHandleName : outputHandleName;
+    toHandleType === "inputHandle" ? inputHandleName : outputHandleName;
 
   if (!toHandleName) {
     return newComponentSpec;
   }
 
-  const targetHandleId = nodeManager.getTaskHandleNodeId(
+  const targetHandleId = nodeManager.getHandleNodeId(
     newTaskId,
     toHandleName,
     toHandleType,
@@ -167,7 +167,7 @@ export function addAndConnectNode({
     const fromHandleId = fromHandle.id;
 
     const isReversedConnection =
-      fromHandleType === "taskInput" && toHandleType === "taskOutput";
+      fromHandleType === "inputHandle" && toHandleType === "outputHandle";
 
     const connection: Connection = isReversedConnection
       ? // Drawing from an input handle to a new output handle
diff --git a/src/hooks/useComponentSpecToEdges.ts b/src/hooks/useComponentSpecToEdges.ts
index c2d163279..2062b3ca0 100644
--- a/src/hooks/useComponentSpecToEdges.ts
+++ b/src/hooks/useComponentSpecToEdges.ts
@@ -112,16 +112,16 @@ const createTaskOutputEdge = (
   const sourceNodeId = nodeManager.getNodeId(taskOutput.taskId, "task");
   const targetNodeId = nodeManager.getNodeId(taskId, "task");
 
-  const sourceHandleNodeId = nodeManager.getTaskHandleNodeId(
+  const sourceHandleNodeId = nodeManager.getHandleNodeId(
     taskOutput.taskId,
     taskOutput.outputName,
-    "taskOutput",
+    "outputHandle",
   );
 
-  const targetHandleNodeId = nodeManager.getTaskHandleNodeId(
+  const targetHandleNodeId = nodeManager.getHandleNodeId(
     taskId,
     inputName,
-    "taskInput",
+    "inputHandle",
   );
 
   return {
@@ -145,10 +145,10 @@ const createGraphInputEdge = (
   const sourceNodeId = nodeManager.getNodeId(inputId, "input");
   const targetNodeId = nodeManager.getNodeId(taskId, "task");
 
-  const targetHandleNodeId = nodeManager.getTaskHandleNodeId(
+  const targetHandleNodeId = nodeManager.getHandleNodeId(
     taskId,
     inputName,
-    "taskInput",
+    "inputHandle",
   );
 
   return {
@@ -174,10 +174,10 @@ const createOutputEdgesFromGraphSpec = (
       const targetOutputId = outputNameToOutputId(outputName);
       const targetNodeId = nodeManager.getNodeId(targetOutputId, "output");
 
-      const sourceHandleNodeId = nodeManager.getTaskHandleNodeId(
+      const sourceHandleNodeId = nodeManager.getHandleNodeId(
         taskOutput.taskId,
         taskOutput.outputName,
-        "taskOutput",
+        "outputHandle",
       );
 
       const edge: Edge = {