diff --git a/cli/src/client/tools.ts b/cli/src/client/tools.ts
index 909f17af..51681411 100644
--- a/cli/src/client/tools.ts
+++ b/cli/src/client/tools.ts
@@ -115,9 +115,9 @@ export async function callTool(
 
     // Merge general metadata with tool-specific metadata
     // Tool-specific metadata takes precedence over general metadata
-    let mergedMeta: Record<string, string> | undefined;
+    let mergedMetadata: Record<string, string> | undefined;
     if (generalMetadata || toolSpecificMetadata) {
-      mergedMeta = {
+      mergedMetadata = {
         ...(generalMetadata || {}),
         ...(toolSpecificMetadata || {}),
       };
@@ -127,8 +127,8 @@ export async function callTool(
       name: name,
       arguments: convertedArgs,
       _meta:
-        mergedMeta && Object.keys(mergedMeta).length > 0
-          ? mergedMeta
+        mergedMetadata && Object.keys(mergedMetadata).length > 0
+          ? mergedMetadata
           : undefined,
     });
     return response;
diff --git a/client/src/App.tsx b/client/src/App.tsx
index e17c24ed..d58cd8fe 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -821,7 +821,7 @@ const App = () => {
 
       // Merge general metadata with tool-specific metadata
       // Tool-specific metadata takes precedence over general metadata
-      const mergedMeta = {
+      const mergedMetadata = {
         ...metadata, // General metadata first
         progressToken: progressTokenRef.current++,
         ...(metadata ?? {}), // Tool-specific metadata overrides
@@ -833,7 +833,7 @@ const App = () => {
           params: {
             name,
             arguments: cleanedParams,
-            _meta: mergedMeta,
+            _meta: mergedMetadata,
           },
         },
         CompatibilityCallToolResultSchema,