diff --git a/packages/atxp/src/call-tool.test.ts b/packages/atxp/src/call-tool.test.ts
index 4fb1ac2..780052e 100644
--- a/packages/atxp/src/call-tool.test.ts
+++ b/packages/atxp/src/call-tool.test.ts
@@ -20,17 +20,17 @@ describe('Call Tool', () => {
 
     it('should map commands to correct tool names', () => {
       const toolMap: Record<string, string> = {
-        search: 'search',
-        image: 'generate_image',
-        music: 'generate_music',
-        video: 'generate_video',
+        search: 'search_search',
+        image: 'image_create_image',
+        music: 'music_create',
+        video: 'create_video',
         x: 'x_live_search',
       };
 
-      expect(toolMap.search).toBe('search');
-      expect(toolMap.image).toBe('generate_image');
-      expect(toolMap.music).toBe('generate_music');
-      expect(toolMap.video).toBe('generate_video');
+      expect(toolMap.search).toBe('search_search');
+      expect(toolMap.image).toBe('image_create_image');
+      expect(toolMap.music).toBe('music_create');
+      expect(toolMap.video).toBe('create_video');
       expect(toolMap.x).toBe('x_live_search');
     });
   });
diff --git a/packages/atxp/src/commands/commands.test.ts b/packages/atxp/src/commands/commands.test.ts
index fd44070..59575d9 100644
--- a/packages/atxp/src/commands/commands.test.ts
+++ b/packages/atxp/src/commands/commands.test.ts
@@ -3,14 +3,14 @@ import { describe, it, expect } from 'vitest';
 describe('Tool Commands', () => {
   describe('search command', () => {
     const SERVER = 'search.mcp.atxp.ai';
-    const TOOL = 'search';
+    const TOOL = 'search_search';
 
     it('should have correct server', () => {
       expect(SERVER).toBe('search.mcp.atxp.ai');
     });
 
     it('should have correct tool name', () => {
-      expect(TOOL).toBe('search');
+      expect(TOOL).toBe('search_search');
     });
 
     it('should validate query is required', () => {
@@ -33,14 +33,14 @@ describe('Tool Commands', () => {
 
   describe('image command', () => {
     const SERVER = 'image.mcp.atxp.ai';
-    const TOOL = 'generate_image';
+    const TOOL = 'image_create_image';
 
     it('should have correct server', () => {
       expect(SERVER).toBe('image.mcp.atxp.ai');
     });
 
     it('should have correct tool name', () => {
-      expect(TOOL).toBe('generate_image');
+      expect(TOOL).toBe('image_create_image');
     });
 
     it('should validate prompt is required', () => {
@@ -55,14 +55,14 @@ describe('Tool Commands', () => {
 
   describe('music command', () => {
     const SERVER = 'music.mcp.atxp.ai';
-    const TOOL = 'generate_music';
+    const TOOL = 'music_create';
 
     it('should have correct server', () => {
       expect(SERVER).toBe('music.mcp.atxp.ai');
     });
 
     it('should have correct tool name', () => {
-      expect(TOOL).toBe('generate_music');
+      expect(TOOL).toBe('music_create');
     });
 
     it('should validate prompt is required', () => {
@@ -77,14 +77,14 @@ describe('Tool Commands', () => {
 
   describe('video command', () => {
     const SERVER = 'video.mcp.atxp.ai';
-    const TOOL = 'generate_video';
+    const TOOL = 'create_video';
 
     it('should have correct server', () => {
       expect(SERVER).toBe('video.mcp.atxp.ai');
     });
 
     it('should have correct tool name', () => {
-      expect(TOOL).toBe('generate_video');
+      expect(TOOL).toBe('create_video');
     });
 
     it('should validate prompt is required', () => {
diff --git a/packages/atxp/src/commands/image.ts b/packages/atxp/src/commands/image.ts
index 899d000..f44d927 100644
--- a/packages/atxp/src/commands/image.ts
+++ b/packages/atxp/src/commands/image.ts
@@ -2,7 +2,7 @@ import { callTool } from '../call-tool.js';
 import chalk from 'chalk';
 
 const SERVER = 'image.mcp.atxp.ai';
-const TOOL = 'generate_image';
+const TOOL = 'image_create_image';
 
 export async function imageCommand(prompt: string): Promise<void> {
   if (!prompt || prompt.trim().length === 0) {
diff --git a/packages/atxp/src/commands/music.ts b/packages/atxp/src/commands/music.ts
index d44527b..605554c 100644
--- a/packages/atxp/src/commands/music.ts
+++ b/packages/atxp/src/commands/music.ts
@@ -2,7 +2,7 @@ import { callTool } from '../call-tool.js';
 import chalk from 'chalk';
 
 const SERVER = 'music.mcp.atxp.ai';
-const TOOL = 'generate_music';
+const TOOL = 'music_create';
 
 export async function musicCommand(prompt: string): Promise<void> {
   if (!prompt || prompt.trim().length === 0) {
diff --git a/packages/atxp/src/commands/search.ts b/packages/atxp/src/commands/search.ts
index ca38cbf..adfbfe2 100644
--- a/packages/atxp/src/commands/search.ts
+++ b/packages/atxp/src/commands/search.ts
@@ -2,7 +2,7 @@ import { callTool } from '../call-tool.js';
 import chalk from 'chalk';
 
 const SERVER = 'search.mcp.atxp.ai';
-const TOOL = 'search';
+const TOOL = 'search_search';
 
 export async function searchCommand(query: string): Promise<void> {
   if (!query || query.trim().length === 0) {
diff --git a/packages/atxp/src/commands/video.ts b/packages/atxp/src/commands/video.ts
index 8abd299..60f2bb6 100644
--- a/packages/atxp/src/commands/video.ts
+++ b/packages/atxp/src/commands/video.ts
@@ -2,7 +2,7 @@ import { callTool } from '../call-tool.js';
 import chalk from 'chalk';
 
 const SERVER = 'video.mcp.atxp.ai';
-const TOOL = 'generate_video';
+const TOOL = 'create_video';
 
 export async function videoCommand(prompt: string): Promise<void> {
   if (!prompt || prompt.trim().length === 0) {