diff --git a/src/const.ts b/src/const.ts
index 87dd84be..3f41fd5f 100644
--- a/src/const.ts
+++ b/src/const.ts
@@ -22,10 +22,10 @@ export const SERVER_VERSION = '1.0.0';
 export const USER_AGENT_ORIGIN = 'Origin/mcp-server';
 
 export enum HelperTools {
-    SEARCH_ACTOR = 'search-actor',
-    ADD_TOOL = 'add-tool',
-    REMOVE_TOOL = 'remove-tool',
-    GET_TOOL_DETAILS = 'get-tool-details',
+    SEARCH_ACTORS = 'search-actors',
+    ADD_ACTOR = 'add-actor',
+    REMOVE_ACTOR = 'remove-actor',
+    GET_ACTOR_DETAILS = 'get-actor-details',
 }
 
 export const defaults = {
diff --git a/src/tools/build.ts b/src/tools/build.ts
index 35ae6483..1d0d1266 100644
--- a/src/tools/build.ts
+++ b/src/tools/build.ts
@@ -116,8 +116,9 @@ const GetActorDefinitionArgsSchema = z.object({
 export const actorDefinitionTool: ToolWrap = {
     type: 'internal',
     tool: {
-        name: HelperTools.GET_TOOL_DETAILS,
-        actorFullName: HelperTools.GET_TOOL_DETAILS,
+        name: HelperTools.GET_ACTOR_DETAILS,
+        // TODO: remove actorFullName from internal tools
+        actorFullName: HelperTools.GET_ACTOR_DETAILS,
         description: 'Get documentation, readme, input schema and other details about an Actor. '
             + 'For example, when user says, I need to know more about web crawler Actor.'
             + 'Get details for an Actor with with Actor ID or Actor full name, i.e. username/name.'
diff --git a/src/tools/helpers.ts b/src/tools/helpers.ts
index c4d7b4e2..26c0f502 100644
--- a/src/tools/helpers.ts
+++ b/src/tools/helpers.ts
@@ -16,7 +16,7 @@ export const AddToolArgsSchema = z.object({
 export const addTool: ToolWrap = {
     type: 'internal',
     tool: {
-        name: HelperTools.ADD_TOOL,
+        name: HelperTools.ADD_ACTOR,
         description: 'Add a tool, Actor or MCP-Server to available tools by Actor ID or Actor name. '
             + 'A tool is an Actor or MCP-Server that can be called by the user'
             + 'Do not execute the tool, only add it and list it in available tools. '
@@ -48,7 +48,7 @@ export const RemoveToolArgsSchema = z.object({
 export const removeTool: ToolWrap = {
     type: 'internal',
     tool: {
-        name: HelperTools.REMOVE_TOOL,
+        name: HelperTools.REMOVE_ACTOR,
         description: 'Remove a tool, an Actor or MCP-Server by name from available tools. '
             + 'For example, when user says, I do not need a tool username/name anymore',
         inputSchema: zodToJsonSchema(RemoveToolArgsSchema),
diff --git a/src/tools/store_collection.ts b/src/tools/store_collection.ts
index 98577644..df38137c 100644
--- a/src/tools/store_collection.ts
+++ b/src/tools/store_collection.ts
@@ -70,8 +70,8 @@ export const SearchToolArgsSchema = z.object({
 export const searchActorTool: ToolWrap = {
     type: 'internal',
     tool: {
-        name: HelperTools.SEARCH_ACTOR,
-        actorFullName: HelperTools.SEARCH_ACTOR,
+        name: HelperTools.SEARCH_ACTORS,
+        actorFullName: HelperTools.SEARCH_ACTORS,
         description: `Discover available Actors or MCP-Servers in Apify Store using full text search using keywords.`
             + `Users try to discover Actors using free form query in this case search query must be converted to full text search. `
             + `Returns a list of Actors with name, description, run statistics, pricing, starts, and URL. `
diff --git a/tests/actor-server-test.ts b/tests/actor-server-test.ts
index da30dfef..ecdf16ed 100644
--- a/tests/actor-server-test.ts
+++ b/tests/actor-server-test.ts
@@ -59,10 +59,10 @@ describe('ApifyMcpServer initialization', () => {
 
         const toolNames = server.getToolNames();
         expect(toolNames).toEqual([
-            HelperTools.SEARCH_ACTOR,
-            HelperTools.GET_TOOL_DETAILS,
-            HelperTools.ADD_TOOL,
-            HelperTools.REMOVE_TOOL,
+            HelperTools.SEARCH_ACTORS,
+            HelperTools.GET_ACTOR_DETAILS,
+            HelperTools.ADD_ACTOR,
+            HelperTools.REMOVE_ACTOR,
         ]);
     });
 });