diff --git a/src/frontend/src/components/core/folderSidebarComponent/components/sideBarFolderButtons/components/mcp-server-notice.tsx b/src/frontend/src/components/core/folderSidebarComponent/components/sideBarFolderButtons/components/mcp-server-notice.tsx
index a121d27a6..4df206faa 100644
--- a/src/frontend/src/components/core/folderSidebarComponent/components/sideBarFolderButtons/components/mcp-server-notice.tsx
+++ b/src/frontend/src/components/core/folderSidebarComponent/components/sideBarFolderButtons/components/mcp-server-notice.tsx
@@ -24,7 +24,7 @@ export const MCPServerNotice: FC<{
         </div>
         <img src={MCPLangflow} alt="MCP Notice Modal" className="rounded-xl" />
         <p className="text-sm text-secondary-foreground">
-          Expose flows as actions from clients like Cursor or Claude.
+          Expose flows as tools from clients like Cursor or Claude.
         </p>
       </div>
 
diff --git a/src/frontend/src/components/core/parameterRenderComponent/components/mcpComponent/index.tsx b/src/frontend/src/components/core/parameterRenderComponent/components/mcpComponent/index.tsx
index 3356d0b0e..d2c4ed24b 100644
--- a/src/frontend/src/components/core/parameterRenderComponent/components/mcpComponent/index.tsx
+++ b/src/frontend/src/components/core/parameterRenderComponent/components/mcpComponent/index.tsx
@@ -31,8 +31,8 @@ export default function McpComponent({
                 : "Error"
               : "Loading..."
             : !server.toolsCount
-              ? "No actions found"
-              : `${server.toolsCount} action${server.toolsCount === 1 ? "" : "s"}`,
+              ? "No tools found"
+              : `${server.toolsCount} tool${server.toolsCount === 1 ? "" : "s"}`,
       })),
     [mcpServers],
   );
diff --git a/src/frontend/src/modals/addMcpServerModal/index.tsx b/src/frontend/src/modals/addMcpServerModal/index.tsx
index 8ac66b8d4..3fde3977a 100644
--- a/src/frontend/src/modals/addMcpServerModal/index.tsx
+++ b/src/frontend/src/modals/addMcpServerModal/index.tsx
@@ -256,7 +256,7 @@ export default function AddMcpServerModal({
               {initialData ? "Update MCP Server" : "Add MCP Server"}
             </div>
             <span className="text-mmd font-normal text-muted-foreground">
-              Save MCP Servers. Manage added connections in{" "}
+              Save MCP Servers. Manage added servers in{" "}
               <CustomLink className="underline" to="/settings/mcp-servers">
                 settings
               </CustomLink>
diff --git a/src/frontend/src/modals/toolsModal/components/toolsTable/index.tsx b/src/frontend/src/modals/toolsModal/components/toolsTable/index.tsx
index aa1cc7bea..fdb244233 100644
--- a/src/frontend/src/modals/toolsModal/components/toolsTable/index.tsx
+++ b/src/frontend/src/modals/toolsModal/components/toolsTable/index.tsx
@@ -162,7 +162,7 @@ export default function ToolsTable({
     },
     {
       field: "name",
-      headerName: isAction ? "Action" : "Slug",
+      headerName: isAction ? "Tool" : "Slug",
       flex: 1,
       resizable: false,
       valueGetter: (params) =>
@@ -263,7 +263,7 @@ export default function ToolsTable({
         <div className="flex-none px-4">
           <Input
             icon="Search"
-            placeholder="Search actions..."
+            placeholder="Search tools..."
             inputClassName="h-8"
             value={searchQuery}
             onChange={handleSearchChange}
@@ -300,7 +300,7 @@ export default function ToolsTable({
                     className="text-mmd font-medium"
                     htmlFor="sidebar-name-input"
                   >
-                    Name
+                    {isAction ? "Tool name" : "Name"}
                   </label>
 
                   <Input
@@ -322,7 +322,7 @@ export default function ToolsTable({
                     className="text-mmd font-medium"
                     htmlFor="sidebar-desc-input"
                   >
-                    Description
+                    {isAction ? "Tool description" : "Description"}
                   </label>
 
                   <Textarea
@@ -335,7 +335,7 @@ export default function ToolsTable({
                   />
                   <div className="text-xs text-muted-foreground">
                     {isAction
-                      ? "This is the description for the action exposed to the clients."
+                      ? "This is the description for the tool exposed to a client."
                       : "This is the description for the tool exposed to the agents."}
                   </div>
                 </div>
@@ -370,7 +370,7 @@ export default function ToolsTable({
                           Parameters
                         </h3>
                         <p className="text-mmd text-muted-foreground">
-                          Manage inputs for this action
+                          Manage inputs for this tool
                         </p>
                       </div>
                     )}
diff --git a/src/frontend/src/pages/MainPage/pages/homePage/components/McpServerTab.tsx b/src/frontend/src/pages/MainPage/pages/homePage/components/McpServerTab.tsx
index 92a0b9e51..27adc7701 100644
--- a/src/frontend/src/pages/MainPage/pages/homePage/components/McpServerTab.tsx
+++ b/src/frontend/src/pages/MainPage/pages/homePage/components/McpServerTab.tsx
@@ -253,8 +253,8 @@ const McpServerTab = ({ folderName }: { folderName: string }) => {
         MCP Server
       </div>
       <div className="pb-4 text-mmd text-muted-foreground">
-        Access your Project's flows as Actions within a MCP Server. Learn more
-        in our
+        Access your Project's flows as Tools within a MCP Server. Learn more in
+        our
         <a
           className="text-accent-pink-foreground"
           href={MCP_SERVER_DEPLOY_TUTORIAL_LINK}
@@ -269,11 +269,11 @@ const McpServerTab = ({ folderName }: { folderName: string }) => {
         <div className="w-full xl:w-2/5">
           <div className="flex flex-row justify-between">
             <ShadTooltip
-              content="Flows in this project can be exposed as callable MCP actions."
+              content="Flows in this project can be exposed as callable MCP tools."
               side="right"
             >
               <div className="flex items-center text-mmd font-medium hover:cursor-help">
-                Flows/Actions
+                Flows/Tools
                 <ForwardedIconComponent
                   name="info"
                   className="ml-1.5 h-4 w-4 text-muted-foreground"
@@ -285,11 +285,11 @@ const McpServerTab = ({ folderName }: { folderName: string }) => {
           <div className="flex flex-row flex-wrap gap-2 pt-2">
             <ToolsComponent
               value={flowsMCPData}
-              title="MCP Server Actions"
-              description="Select actions to add to this server"
+              title="MCP Server Tools"
+              description="Select tools to add to this server"
               handleOnNewValue={handleOnNewValue}
               id="mcp-server-tools"
-              button_description="Edit Actions"
+              button_description="Edit Tools"
               editNode={false}
               isAction
               disabled={false}
diff --git a/src/frontend/src/pages/SettingsPage/index.tsx b/src/frontend/src/pages/SettingsPage/index.tsx
index 003c49254..a9868ed10 100644
--- a/src/frontend/src/pages/SettingsPage/index.tsx
+++ b/src/frontend/src/pages/SettingsPage/index.tsx
@@ -39,7 +39,7 @@ export default function SettingsPage(): JSX.Element {
 
   sidebarNavItems.push(
     {
-      title: "MCP Connections",
+      title: "MCP Servers",
       href: "/settings/mcp-servers",
       icon: (
         <ForwardedIconComponent
diff --git a/src/frontend/src/pages/SettingsPage/pages/MCPServersPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/MCPServersPage/index.tsx
index 5394bf067..3424e9ae3 100644
--- a/src/frontend/src/pages/SettingsPage/pages/MCPServersPage/index.tsx
+++ b/src/frontend/src/pages/SettingsPage/pages/MCPServersPage/index.tsx
@@ -61,7 +61,7 @@ export default function MCPServersPage() {
       <div className="flex w-full items-start justify-between gap-6">
         <div className="flex flex-col">
           <h2 className="flex items-center text-lg font-semibold tracking-tight">
-            MCP Connections
+            MCP Servers
             <ForwardedIconComponent
               name="Mcp"
               className="ml-2 h-5 w-5 text-primary"
@@ -92,7 +92,7 @@ export default function MCPServersPage() {
               </div>
             ) : (
               <div className="text-sm font-medium text-muted-foreground">
-                Servers
+                Added MCP Servers
               </div>
             )}
             <div className="flex flex-col gap-1">
@@ -116,7 +116,9 @@ export default function MCPServersPage() {
                               ? "Timeout"
                               : "Error"
                             : "Loading..."
-                          : `${server.toolsCount} action${server.toolsCount === 1 ? "" : "s"}`}
+                          : !server.toolsCount
+                            ? "No tools found"
+                            : `${server.toolsCount} tool${server.toolsCount === 1 ? "" : "s"}`}
                       </span>
                     </ShadTooltip>
                   </div>
diff --git a/src/frontend/tests/extended/features/edit-tools.spec.ts b/src/frontend/tests/extended/features/edit-tools.spec.ts
index 0cebe4d23..214647592 100644
--- a/src/frontend/tests/extended/features/edit-tools.spec.ts
+++ b/src/frontend/tests/extended/features/edit-tools.spec.ts
@@ -40,7 +40,7 @@ test(
       state: "visible",
     });
 
-    await page.waitForSelector("text=actions", { timeout: 30000 });
+    await page.waitForSelector("text=tools", { timeout: 30000 });
 
     await page.getByTestId("button_open_actions").click();
 
diff --git a/src/frontend/tests/extended/features/mcp-server-tab.spec.ts b/src/frontend/tests/extended/features/mcp-server-tab.spec.ts
index 1416eeefb..ebcf7357c 100644
--- a/src/frontend/tests/extended/features/mcp-server-tab.spec.ts
+++ b/src/frontend/tests/extended/features/mcp-server-tab.spec.ts
@@ -3,7 +3,7 @@ import { awaitBootstrapTest } from "../../utils/await-bootstrap-test";
 import { zoomOut } from "../../utils/zoom-out";
 
 test(
-  "user should be able to manage MCP server actions and configuration",
+  "user should be able to manage MCP server tools and configuration",
   { tag: ["@release", "@workspace", "@components"] },
   async ({ page }) => {
     const maxRetries = 5;
@@ -47,14 +47,14 @@ test(
 
         // Verify MCP server tab is visible
         await expect(page.getByTestId("mcp-server-title")).toBeVisible();
-        await expect(page.getByText("Flows/Actions")).toBeVisible();
+        await expect(page.getByText("Flows/Tools")).toBeVisible();
 
-        // Click on Edit Actions button
+        // Click on Edit Tools button
         await page.getByTestId("button_open_actions").click();
         await page.waitForTimeout(500);
 
         // Verify actions modal is open
-        await expect(page.getByText("MCP Server Actions")).toBeVisible();
+        await expect(page.getByText("MCP Server Tools")).toBeVisible();
 
         // Select some actions
         const rowsCount = await page.getByRole("row").count();
diff --git a/src/frontend/tests/extended/features/mcp-server.spec.ts b/src/frontend/tests/extended/features/mcp-server.spec.ts
index 60e33982b..7b00bd49d 100644
--- a/src/frontend/tests/extended/features/mcp-server.spec.ts
+++ b/src/frontend/tests/extended/features/mcp-server.spec.ts
@@ -105,13 +105,11 @@ test(
 
     await page.getByTestId("menu_settings_button").click({ timeout: 3000 });
 
-    await page.waitForSelector('[data-testid="sidebar-nav-MCP Connections"]', {
+    await page.waitForSelector('[data-testid="sidebar-nav-MCP Servers"]', {
       timeout: 30000,
     });
 
-    await page
-      .getByTestId("sidebar-nav-MCP Connections")
-      .click({ timeout: 3000 });
+    await page.getByTestId("sidebar-nav-MCP Servers").click({ timeout: 3000 });
 
     await page.waitForSelector('[data-testid="add-mcp-server-button-page"]', {
       timeout: 3000,