diff --git a/fern/openapi.json b/fern/openapi.json
index 43705af5..2c6dc6fb 100644
--- a/fern/openapi.json
+++ b/fern/openapi.json
@@ -3623,9 +3623,9 @@
     "/v1/folders/{folder_id}/files": {
       "get": {
         "tags": ["folders"],
-        "summary": "List Folder Files",
+        "summary": "List Files For Folder",
         "description": "List paginated files associated with a data folder.",
-        "operationId": "list_folder_files",
+        "operationId": "list_files_for_folder",
         "parameters": [
           {
             "name": "folder_id",
@@ -3746,7 +3746,7 @@
                   "items": {
                     "$ref": "#/components/schemas/FileMetadata"
                   },
-                  "title": "Response List Folder Files"
+                  "title": "Response List Files For Folder"
                 }
               }
             }
@@ -11630,9 +11630,9 @@
     "/v1/mcp-servers/{mcp_server_id}/tools": {
       "get": {
         "tags": ["mcp-servers"],
-        "summary": "List Mcp Tools By Server",
+        "summary": "List Tools For Mcp Server",
         "description": "Get a list of all tools for a specific MCP server",
-        "operationId": "mcp_list_mcp_tools_by_server",
+        "operationId": "mcp_list_tools_for_mcp_server",
         "parameters": [
           {
             "name": "mcp_server_id",
@@ -11654,7 +11654,7 @@
                   "items": {
                     "$ref": "#/components/schemas/Tool"
                   },
-                  "title": "Response Mcp List Mcp Tools By Server"
+                  "title": "Response Mcp List Tools For Mcp Server"
                 }
               }
             }
diff --git a/letta/server/rest_api/routers/v1/folders.py b/letta/server/rest_api/routers/v1/folders.py
index 1ccb9dc8..1ebd09e3 100644
--- a/letta/server/rest_api/routers/v1/folders.py
+++ b/letta/server/rest_api/routers/v1/folders.py
@@ -435,8 +435,8 @@ async def list_folder_passages(
     )
 
 
-@router.get("/{folder_id}/files", response_model=List[FileMetadata], operation_id="list_folder_files")
-async def list_folder_files(
+@router.get("/{folder_id}/files", response_model=List[FileMetadata], operation_id="list_files_for_folder")
+async def list_files_for_folder(
     folder_id: FolderId,
     before: Optional[str] = Query(
         None,
diff --git a/letta/server/rest_api/routers/v1/mcp_servers.py b/letta/server/rest_api/routers/v1/mcp_servers.py
index 9a8e1b80..8ef7557f 100644
--- a/letta/server/rest_api/routers/v1/mcp_servers.py
+++ b/letta/server/rest_api/routers/v1/mcp_servers.py
@@ -128,8 +128,8 @@ async def update_mcp_server(
     return convert_generic_to_union(updated_server)
 
 
-@router.get("/{mcp_server_id}/tools", response_model=List[Tool], operation_id="mcp_list_mcp_tools_by_server")
-async def list_mcp_tools_by_server(
+@router.get("/{mcp_server_id}/tools", response_model=List[Tool], operation_id="mcp_list_tools_for_mcp_server")
+async def list_tools_for_mcp_server(
     mcp_server_id: str,
     server: SyncServer = Depends(get_letta_server),
     headers: HeaderParams = Depends(get_headers),