diff --git a/core/services/workflow_service/schemas/compute_block.py b/core/services/workflow_service/schemas/compute_block.py
index 0fc9f9b..122bd7d 100644
--- a/core/services/workflow_service/schemas/compute_block.py
+++ b/core/services/workflow_service/schemas/compute_block.py
@@ -74,12 +74,14 @@ def replace_minio_host(url: str | None) -> str | None:
 
 class BaseIODTO(BaseModel):
     id: UUID | None = None
+    name: str | None = None
     data_type: DataType
 
     @classmethod
     def from_input_output(cls, io):
         return cls(
             id=io.uuid,
+            name=io.name,
             data_type=io.data_type
         )
 
diff --git a/frontend/components/nodes/ComputeBlockNode.tsx b/frontend/components/nodes/ComputeBlockNode.tsx
index f8eac9c..5a80caa 100644
--- a/frontend/components/nodes/ComputeBlockNode.tsx
+++ b/frontend/components/nodes/ComputeBlockNode.tsx
@@ -5,6 +5,7 @@ import { useSelectedComputeBlock } from "@/hooks/useSelectedComputeBlock"
 import type { ComputeBlock, InputOutput } from "../CreateComputeBlockModal"
 import { ComputeBlockStatus, InputOutputType } from "../CreateComputeBlockModal"
 import { CheckCircle, Error, Warning, Schedule, Autorenew } from "@mui/icons-material"
+import Tooltip from "@mui/material/Tooltip"
 
 export interface ComputeBlockNodeType extends Node {
   id: string,
@@ -67,22 +68,28 @@ export default function ComputeBlockNode({ data }: { data: ComputeBlock }) {
   const renderHandles = (items: InputOutput[], type: "target" | "source", position: Position) => {
     return items.map((item, index) => {
       return (
-        <Handle
-          key={index}
-          type={type}
-          position={position}
-          id={item.id}
-          style={{
-            ...handleStyles[item.data_type] || {
-              backgroundImage: "",
-              backgroundColor: "grey",
-            },
-            width: "15px",
-            height: "15px",
-            borderRadius: "50%",
-            top: `${(index + 1) * 20}%`,
-          }}
-        />
+        <Tooltip
+          key={item.id}
+          title={`${item.name} (${item.data_type})`}
+          placement={type === "target" ? "left" : "right"}
+          arrow
+          disableInteractive
+        >
+          <Handle
+            key={item.id}
+            id={item.id}
+            type={type}
+            position={position}
+            style={{
+              ...handleStyles[item.data_type],
+              width: "15px",
+              height: "15px",
+              borderRadius: "50%",
+              top: `${(index + 1) * 20}%`,
+              pointerEvents: "all",
+            }}
+          />
+        </Tooltip>
       )
     })
   }
diff --git a/frontend/eslint.config.js b/frontend/eslint.config.js
index 2f6473b..e1ca8b1 100644
--- a/frontend/eslint.config.js
+++ b/frontend/eslint.config.js
@@ -4,10 +4,17 @@ export default [
   ...config.nextExtension,
   {
     rules: {
-      ...config.nextExtension.rules,
       "semi": ["error", "never"],
-      "quotes": ["error", "double", { avoidEscape: true, allowTemplateLiterals: true }],  // Override quotes rule
-      "@stylistic/quotes": ["error", "double", { avoidEscape: true, allowTemplateLiterals: true }]  // Override the @stylistic/quotes plugin rule as wellls: true }], // Override or add the quotes rule
-    }
-  }
+      "quotes": ["error", "double", { avoidEscape: true, allowTemplateLiterals: true }],
+      "@stylistic/quotes": ["error", "double", { avoidEscape: true, allowTemplateLiterals: true }],
+    },
+  },
+  // Override for generated Next.js file
+  {
+    files: ["next-env.d.ts"],
+    rules: {
+      "@typescript-eslint/triple-slash-reference": "off",
+    },
+  },
 ]
+
diff --git a/frontend/next-env.d.ts b/frontend/next-env.d.ts
index 1b3be08..830fb59 100644
--- a/frontend/next-env.d.ts
+++ b/frontend/next-env.d.ts
@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference path="./.next/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.