diff --git a/cli/src/index.ts b/cli/src/index.ts
index bda1e8f7..d1342ed5 100644
--- a/cli/src/index.ts
+++ b/cli/src/index.ts
@@ -20,6 +20,8 @@ import {
 import { handleError } from "./error-handler.js";
 import { createTransport, TransportOptions } from "./transport.js";
 
+import packageJson from "../package.json" with { type: "json" };
+
 type Args = {
   target: string[];
   method?: string;
@@ -61,10 +63,12 @@ function createTransportOptions(target: string[]): TransportOptions {
 async function callMethod(args: Args): Promise<void> {
   const transportOptions = createTransportOptions(args.target);
   const transport = createTransport(transportOptions);
-  const client = new Client({
-    name: "inspector-cli",
-    version: "0.5.1",
-  });
+
+  const [_, name = packageJson.name] = packageJson.name.split("/");
+  const version = packageJson.version;
+  const clientIdentity = { name, version };
+
+  const client = new Client(clientIdentity);
 
   try {
     await connect(client, transport);
diff --git a/client/src/lib/hooks/useConnection.ts b/client/src/lib/hooks/useConnection.ts
index 9009e698..e432002c 100644
--- a/client/src/lib/hooks/useConnection.ts
+++ b/client/src/lib/hooks/useConnection.ts
@@ -287,19 +287,22 @@ export function useConnection({
   };
 
   const connect = async (_e?: unknown, retryCount: number = 0) => {
-    const client = new Client<Request, Notification, Result>(
-      {
-        name: "mcp-inspector",
-        version: packageJson.version,
-      },
-      {
-        capabilities: {
-          sampling: {},
-          roots: {
-            listChanged: true,
-          },
+    const [_, name = packageJson.name] = packageJson.name.split("/");
+    const version = packageJson.version;
+    const clientIdentity = { name, version };
+
+    const clientCapabilities = {
+      capabilities: {
+        sampling: {},
+        roots: {
+          listChanged: true,
         },
       },
+    };
+
+    const client = new Client<Request, Notification, Result>(
+      clientIdentity,
+      clientCapabilities,
     );
 
     try {