diff --git a/examples/code/guides/agentauth/auth_with_google.js b/examples/code/guides/agentauth/auth_with_google.js
index 033f95465..2cf340cc3 100644
--- a/examples/code/guides/agentauth/auth_with_google.js
+++ b/examples/code/guides/agentauth/auth_with_google.js
@@ -5,7 +5,7 @@ import { google } from "googleapis";
  * In this example, we will use Arcade to authenticate with Google and
  * retrieve Gmail messages.
  *
- * Consider using the Arcade Google toolkit, which simplifies the process for
+ * Consider using the Arcade Gmail toolkit, which simplifies the process for
  * retrieving email messages even further!
  *
  * Below we are just showing how to use Arcade as an auth provider, if you need to directly get a token to use with Google.
diff --git a/examples/code/guides/agentauth/auth_with_google.py b/examples/code/guides/agentauth/auth_with_google.py
index c40b2bd82..d7d599306 100644
--- a/examples/code/guides/agentauth/auth_with_google.py
+++ b/examples/code/guides/agentauth/auth_with_google.py
@@ -8,7 +8,7 @@
 In this example, we will use Arcade to authenticate with Google and
 retrieve Gmail messages.
 
-Consider using the Arcade Google toolkit, which simplifies the process for
+Consider using the Arcade Gmail toolkit, which simplifies the process for
 retrieving email messages even further!
 
 Below we are just showing how to use Arcade as an auth provider, if you need to directly get a token to use with Google.
diff --git a/examples/code/home/crewai/custom_auth_flow.py b/examples/code/home/crewai/custom_auth_flow.py
index f43e890e0..18c8ba237 100644
--- a/examples/code/home/crewai/custom_auth_flow.py
+++ b/examples/code/home/crewai/custom_auth_flow.py
@@ -50,7 +50,7 @@ def tool_manager_callback(tool_manager: ArcadeToolManager, tool_name: str, **too
 
 manager = ArcadeToolManager(executor=tool_manager_callback)
 
-tools = manager.get_tools(tools=["Google.ListEmails"], toolkits=["Slack"])
+tools = manager.get_tools(tools=["Gmail.ListEmails"], toolkits=["Slack"])
 
 crew_agent = Agent(
     role="Main Agent",
diff --git a/examples/code/home/crewai/use_arcade_tools.py b/examples/code/home/crewai/use_arcade_tools.py
index 58dcf9fb3..7d143771e 100644
--- a/examples/code/home/crewai/use_arcade_tools.py
+++ b/examples/code/home/crewai/use_arcade_tools.py
@@ -4,7 +4,7 @@
 
 manager = ArcadeToolManager(default_user_id="{arcade_user_id}")
 
-tools = manager.get_tools(tools=["Google.ListEmails"])
+tools = manager.get_tools(tools=["Gmail.ListEmails"])
 
 
 crew_agent = Agent(
diff --git a/examples/code/home/mcp/streamable-http/typescript-client.ts.fake b/examples/code/home/mcp/streamable-http/typescript-client.ts.fake
index 2d12d2078..813c7af3d 100644
--- a/examples/code/home/mcp/streamable-http/typescript-client.ts.fake
+++ b/examples/code/home/mcp/streamable-http/typescript-client.ts.fake
@@ -66,7 +66,7 @@ try {
   const callToolRequest: CallToolRequest = {
     method: "tools/call",
     params: {
-      name: "Google_ListEmails",
+      name: "Gmail_ListEmails",
       arguments: {
         n_emails: 5,
       },
diff --git a/pages/home/auth-providers/google.mdx b/pages/home/auth-providers/google.mdx
index 449081ca3..e20c3ab80 100644
--- a/pages/home/auth-providers/google.mdx
+++ b/pages/home/auth-providers/google.mdx
@@ -6,7 +6,7 @@ The Google auth provider enables tools and agents to call Google/Google Workspac
 
 <Tip>
   Want to quickly get started with Google services in your agent or AI app? The
-  pre-built [Arcade Google toolkit](/toolkits/productivity/google/gmail) is what
+  pre-built [Arcade Gmail toolkit](/toolkits/productivity/gmail) is what
   you want!
 </Tip>
 
@@ -16,7 +16,7 @@ This page describes how to use and configure Google auth with Arcade.
 
 This auth provider is used by:
 
-- The [Arcade Google toolkit](/toolkits/productivity/google/gmail), which provides pre-built tools for interacting with Google services
+- The [Arcade Gmail toolkit](/toolkits/productivity/gmail), which provides pre-built tools for interacting with Google services
 - Your [app code](#using-google-auth-in-app-code) that needs to call Google APIs
 - Or, your [custom tools](#using-google-auth-in-custom-tools) that need to call Google APIs
 
@@ -149,9 +149,9 @@ Use `client.auth.start()` to get a user token for Google APIs:
 
 ## Using Google auth in custom tools
 
-You can use the pre-built [Arcade Google toolkit](/toolkits/productivity/google/gmail) to quickly build agents and AI apps that interact with Google services like Gmail, Calendar, Drive, and more.
+You can use the pre-built Arcade Google toolkits, like [Arcade Gmail toolkit](/toolkits/productivity/gmail), to quickly build agents and AI apps that interact with Google services like Gmail, Calendar, Drive, and more.
 
-If the pre-built tools in the Google toolkit don't meet your needs, you can author your own [custom tools](/home/build-tools/create-a-toolkit) that interact with Google APIs.
+If the pre-built tools in the Google toolkits don't meet your needs, you can author your own [custom tools](/home/build-tools/create-a-toolkit) that interact with Google APIs.
 
 Use the `Google()` auth class to specify that a tool requires authorization with Google. The `context.authorization.token` field will be automatically populated with the user's Google token:
 
diff --git a/pages/home/auth-providers/index.mdx b/pages/home/auth-providers/index.mdx
index 833d866f5..03c9ca4a5 100644
--- a/pages/home/auth-providers/index.mdx
+++ b/pages/home/auth-providers/index.mdx
@@ -157,7 +157,7 @@ You can create multiple auth providers of the same type, for example, you can ha
 
 However, Arcade's tools are configured to select an auth provider by the type. This means that if you have multiple auth providers of the same type, Arcade will not know which one to use and authorizing the tool will fail.
 
-To work around this, you can fork Arcade's tools and modify them to specify your own auth provider by the unique ID that you give each of them. For example, if you have two Google auth providers, `acme-google-calendar` and `acme-google-email`, you can modify Arcade's Google.ListEmails tool like this:
+To work around this, you can fork Arcade's tools and modify them to specify your own auth provider by the unique ID that you give each of them. For example, if you have two Google auth providers, `acme-google-calendar` and `acme-google-email`, you can modify Arcade's Gmail.ListEmails tool like this:
 
 ```python
 @tool(
diff --git a/pages/home/auth/auth-tool-calling.mdx b/pages/home/auth/auth-tool-calling.mdx
index 4983bd3d9..91ec56c39 100644
--- a/pages/home/auth/auth-tool-calling.mdx
+++ b/pages/home/auth/auth-tool-calling.mdx
@@ -43,7 +43,7 @@ const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env var
 
 ### Authorize a tool directly
 
-Many tools require authorization. For example, the `Google.ListEmails` tool requires authorization with Google.
+Many tools require authorization. For example, the `Gmail.ListEmails` tool requires authorization with Google.
 
 This authorization must be approved by the user. By approving, the user allows your agent or app to access only the data they've approved.
 
@@ -57,7 +57,7 @@ USER_ID = "{arcade_user_id}"
 
 # Request access to the user's Gmail account
 auth_response = client.tools.authorize(
-  tool_name="Google.ListEmails",
+  tool_name="Gmail.ListEmails",
   user_id=USER_ID,
 )
 
@@ -74,7 +74,7 @@ const userId = "{arcade_user_id}";
 
 // Request access to the user's Gmail account
 const authResponse = await client.tools.authorize({
-  tool_name: "Google.ListEmails",
+  tool_name: "Gmail.ListEmails",
   user_id: userId,
 });
 
@@ -117,7 +117,7 @@ Once the user has approved the action, you can run the tool. You only need to pa
 
 ```python
 emails_response = client.tools.execute(
-    tool_name="Google.ListEmails",
+    tool_name="Gmail.ListEmails",
     user_id=USER_ID,
 )
 print(emails_response)
@@ -128,7 +128,7 @@ print(emails_response)
 
 ```js
 const emailsResponse = await client.tools.execute({
-  tool_name: "Google.ListEmails",
+  tool_name: "Gmail.ListEmails",
   user_id: userId,
 });
 
diff --git a/pages/home/auth/call-third-party-apis-directly.mdx b/pages/home/auth/call-third-party-apis-directly.mdx
index 8e693f320..b9b1a2701 100644
--- a/pages/home/auth/call-third-party-apis-directly.mdx
+++ b/pages/home/auth/call-third-party-apis-directly.mdx
@@ -168,7 +168,7 @@ For each item in the list/array, you could use the [`users.messages.get`](https:
 </Steps>
 
 <Note>
-  Consider using the [Arcade Google toolkit](/toolkits/productivity/google/gmail), which simplifies the process for retrieving email messages even further! The pattern described here is useful if you need to directly get a token to use with Google in other parts of your codebase.
+  Consider using the [Arcade Gmail toolkit](/toolkits/productivity/gmail), which simplifies the process for retrieving email messages even further! The pattern described here is useful if you need to directly get a token to use with Google in other parts of your codebase.
 </Note>
 
 ### How it works
diff --git a/pages/home/auth/how-arcade-helps.mdx b/pages/home/auth/how-arcade-helps.mdx
index 17dffd32b..fc4971451 100644
--- a/pages/home/auth/how-arcade-helps.mdx
+++ b/pages/home/auth/how-arcade-helps.mdx
@@ -28,7 +28,7 @@ With Arcade, developers can now create agents that can _act as the end users of
 
 ### Auth permissions and scopes
 
-Each tool in Arcade's toolkits has a set of required permissions - or, more commonly referred to in OAuth2, **scopes**. For example, the [`Google.SendEmail`](/toolkits/productivity/google/gmail#sendemail) tool requires the [`https://www.googleapis.com/auth/gmail.send`](https://developers.google.com/identity/protocols/oauth2/scopes#gmail) scope.
+Each tool in Arcade's toolkits has a set of required permissions - or, more commonly referred to in OAuth2, **scopes**. For example, the [`Gmail.SendEmail`](/toolkits/productivity/gmail#gmailsendemail) tool requires the [`https://www.googleapis.com/auth/gmail.send`](https://developers.google.com/identity/protocols/oauth2/scopes#gmail) scope.
 
 A scope is what the user has authorized someone else (in this case, the AI agent) to do on their behalf. In any OAuth2-compatible service, each kind of action requires a different set of permissions. This gives the user fine-grained control over what data third-party services can access and what actions can be executed in their accounts.
 
@@ -41,7 +41,7 @@ To learn how Arcade allows for actions (tools) to be authorized through OAuth2 a
 
 ### Tools that don't require authorization
 
-Some tools, like [`Search.SearchGoogle`](/toolkits/search/google_search#searchgoogle), allow AI agents to retrieve information or perform actions without needing user-specific authorization.
+Some tools, like [`GoogleSearch.Search`](/toolkits/search/google_search#googlesearchsearch), allow AI agents to retrieve information or perform actions without needing user-specific authorization.
 
 <Tabs items={["Python", "JavaScript"]} storageKey="preferredLanguage">
 <Tabs.Tab>
@@ -50,9 +50,9 @@ from arcadepy import Arcade
 
 client = Arcade(api_key="arcade_api_key")  # or set the ARCADE_API_KEY env var
 
-# Use the Search.SearchGoogle tool to perform a web search
+# Use the GoogleSearch.Searchtool to perform a web search
 response = await client.tools.execute(
-    tool_name="Search.SearchGoogle",
+    tool_name="GoogleSearch.Search",
     input={"query": "Latest AI advancements"},
 )
 print(response.output.value)
@@ -64,9 +64,9 @@ import { Arcade } from "@arcadeai/arcadejs";
 
 const client = new Arcade(api_key="arcade_api_key");  // or set the ARCADE_API_KEY env var
 
-// Use the Search.SearchGoogle tool to perform a web search
+// Use the GoogleSearch.Search tool to perform a web search
 const response = await client.tools.execute({
-  tool_name: "Search.SearchGoogle",
+  tool_name: "GoogleSearch.Search",
   input: { query: "Latest AI advancements" },
 });
 console.log(response.output.value);
diff --git a/pages/home/auth/tool-auth-status.mdx b/pages/home/auth/tool-auth-status.mdx
index b1a322e98..2765a21ce 100644
--- a/pages/home/auth/tool-auth-status.mdx
+++ b/pages/home/auth/tool-auth-status.mdx
@@ -120,7 +120,7 @@ You can also check the authorization status for a specific tool by name:
 <Tabs.Tab>
 ```python
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.ListEmails"
+TOOL_NAME = "Gmail.ListEmails"
 
 # Get specific tool details
 tool = client.tools.get(tool_name=TOOL_NAME, user_id=USER_ID)
@@ -150,7 +150,7 @@ if tool.requirements:
 <Tabs.Tab>
 ```js
 const userId = "{arcade_user_id}";
-const toolName = "Google.ListEmails";
+const toolName = "Gmail.ListEmails";
 
 // Get specific tool details
 const tool = await client.tools.get(toolName, {
diff --git a/pages/home/crewai/custom-auth-flow.mdx b/pages/home/crewai/custom-auth-flow.mdx
index d45d53c8a..602428a87 100644
--- a/pages/home/crewai/custom-auth-flow.mdx
+++ b/pages/home/crewai/custom-auth-flow.mdx
@@ -50,7 +50,7 @@ You can now provide the tool manager callback to the `ArcadeToolManager` upon in
 manager = ArcadeToolManager(executor=tool_manager_callback)
 
 # Retrieve the provided tools and/or toolkits as CrewAI StructuredTools.
-tools = manager.get_tools(tools=["Google.ListEmails"], toolkits=["Slack"])
+tools = manager.get_tools(tools=["Gmail.ListEmails"], toolkits=["Slack"])
 ```
 
 ### Use tools in your CrewAI agent team
diff --git a/pages/home/crewai/use-arcade-tools.mdx b/pages/home/crewai/use-arcade-tools.mdx
index bd74983a9..72c5f06c9 100644
--- a/pages/home/crewai/use-arcade-tools.mdx
+++ b/pages/home/crewai/use-arcade-tools.mdx
@@ -46,7 +46,7 @@ manager = ArcadeToolManager(default_user_id="{arcade_user_id}")
 """
 Retrieves the provided tools and/or toolkits as CrewAI StructuredTools.
 """
-tools = manager.get_tools(tools=["Google.ListEmails"], toolkits=["Slack"])
+tools = manager.get_tools(tools=["Gmail.ListEmails"], toolkits=["Slack"])
 ```
 
 ### Use tools in your CrewAI agent team
diff --git a/pages/home/faq.mdx b/pages/home/faq.mdx
index d62034507..019a9f7c3 100644
--- a/pages/home/faq.mdx
+++ b/pages/home/faq.mdx
@@ -54,7 +54,7 @@ client = Arcade() # Automatically finds the `ARCADE_API_KEY` env variable
 USER_ID = "{arcade_user_id}"
 
 # get the list of tools
-tools = client.tools.list(toolkit="Google")
+tools = client.tools.list(toolkit="Gmail")
 
 # collect the scopes
 scopes = set()
@@ -82,7 +82,7 @@ const client = new Arcade();
 const user_id = "{arcade_user_id}";
 
 // get the list of tools
-const googleToolkit = await client.tools.list({toolkit: "google"})
+const googleToolkit = await client.tools.list({toolkit: "gmail"})
 
 // collect scopes
 const scopes = new Set(googleToolkit.items.flatMap(i => i.requirements?.authorization?.oauth2?.scopes ?? []));
diff --git a/pages/home/google-adk/overview.mdx b/pages/home/google-adk/overview.mdx
index 40d7e7ae3..7d4275aff 100644
--- a/pages/home/google-adk/overview.mdx
+++ b/pages/home/google-adk/overview.mdx
@@ -49,7 +49,7 @@ async def main():
     artifact_service = InMemoryArtifactService()
     client = AsyncArcade()
 
-    google_tools = await get_arcade_tools(client, tools=["Google.ListEmails"])
+    google_tools = await get_arcade_tools(client, tools=["Gmail.ListEmails"])
 
     # authorize the tools
     for tool in google_tools:
diff --git a/pages/home/google-adk/use-arcade-tools.mdx b/pages/home/google-adk/use-arcade-tools.mdx
index 9aad59758..991d27685 100644
--- a/pages/home/google-adk/use-arcade-tools.mdx
+++ b/pages/home/google-adk/use-arcade-tools.mdx
@@ -46,14 +46,14 @@ from google_adk_arcade.tools import get_arcade_tools
 # Initialize the Arcade client
 client = AsyncArcade()
 
-# Get all tools from the "Google" toolkit
-tools = await get_arcade_tools(client, toolkits=["google"])
+# Get all tools from the "Gmail" toolkit
+tools = await get_arcade_tools(client, toolkits=["gmail"])
 
 # You can request multiple toolkits at once
-tools = await get_arcade_tools(client, toolkits=["google", "github", "linkedin"])
+tools = await get_arcade_tools(client, toolkits=["gmail", "github", "linkedin"])
 
 # You can request specific tools
-tools = await get_arcade_tools(client, tools=["Google_ListEmails", "Slack_ListUsers", "Slack_SendDmToUser"])
+tools = await get_arcade_tools(client, tools=["Gmail_ListEmails", "Slack_ListUsers", "Slack_SendDmToUser"])
 ```
 ### Authorize the tools
 
@@ -86,11 +86,11 @@ from google.genai import types
 session_service = InMemorySessionService()
 artifact_service = InMemoryArtifactService()
 
-# Create an agent with Google tools
+# Create an agent with Gmail tools
 google_agent = Agent(
     model="gemini-2.0-flash",
     name="google_tool_agent",
-    instruction="I can use Google tools to manage an inbox!",
+    instruction="I can use Gmail tools to manage an inbox!",
     description="An agent equipped with tools to read Gmail emails."
     tools=tools,
 )
@@ -153,7 +153,7 @@ async def main():
     artifact_service = InMemoryArtifactService()
     client = AsyncArcade()
 
-    google_tools = await get_arcade_tools(client, tools=["Google.ListEmails"])
+    google_tools = await get_arcade_tools(client, tools=["Gmail.ListEmails"])
 
     # authorize the tools
     for tool in google_tools:
@@ -168,9 +168,9 @@ async def main():
     google_agent = Agent(
         model="gemini-2.0-flash",
         name="google_tool_agent",
-        instruction="I can use Google tools to manage an inbox!",
+        instruction="I can use Gmail tools to manage an inbox!",
         description="An agent equipped with tools to read Gmail emails. "
-                    "Make sure to call google_listemails to read and summarize"
+                    "Make sure to call gmail_listemails to read and summarize"
                     " emails",
         tools=google_tools,
     )
diff --git a/pages/home/langchain/use-arcade-tools.mdx b/pages/home/langchain/use-arcade-tools.mdx
index 6354d74b3..fe5a92095 100644
--- a/pages/home/langchain/use-arcade-tools.mdx
+++ b/pages/home/langchain/use-arcade-tools.mdx
@@ -67,12 +67,12 @@ from langchain_arcade import ArcadeToolManager
 
 manager = ArcadeToolManager(api_key=arcade_api_key)
 
-# Fetch the "ScrapeUrl" tool from the "Web" toolkit
-tools = manager.get_tools(tools=["Web.ScrapeUrl"])
+# Fetch the "ScrapeUrl" tool from the "Firecrawl" toolkit
+tools = manager.get_tools(tools=["Firecrawl.ScrapeUrl"])
 print(manager.tools)
 
-# Get all tools from the "Google" toolkit
-tools = manager.get_tools(toolkits=["Google"])
+# Get all tools from the "Gmail" toolkit
+tools = manager.get_tools(toolkits=["Gmail"])
 print(manager.tools)
 ```
 </Tabs.Tab>
@@ -86,8 +86,8 @@ import { tool } from "@langchain/core/tools";
 // Initialize the Arcade client
 const arcade = new Arcade();
 
-// Get the Arcade tools, you can customize the toolkit (e.g. "github", "notion", "google", etc.)
-const googleToolkit = await arcade.tools.list({ toolkit: "google", limit: 30 });
+// Get the Arcade tools, you can customize the toolkit (e.g. "github", "notion", "gmail", etc.)
+const googleToolkit = await arcade.tools.list({ toolkit: "gmail", limit: 30 });
 const arcadeTools = toZod({
 	tools: googleToolkit.items,
 	client: arcade,
diff --git a/pages/home/langchain/user-auth-interrupts.mdx b/pages/home/langchain/user-auth-interrupts.mdx
index f491931ea..8c626d93e 100644
--- a/pages/home/langchain/user-auth-interrupts.mdx
+++ b/pages/home/langchain/user-auth-interrupts.mdx
@@ -54,7 +54,7 @@ arcade_api_key = os.environ["ARCADE_API_KEY"]
 
 # Initialize the tool manager and fetch tools compatible with langgraph
 tool_manager = ArcadeToolManager(api_key=arcade_api_key)
-tools = tool_manager.get_tools(toolkits=["Google"])
+tools = tool_manager.get_tools(toolkits=["Gmail"])
 tool_node = ToolNode(tools)
 
 # Create a language model instance and bind it with the tools
@@ -65,7 +65,7 @@ model_with_tools = model.bind_tools(tools)
 Here are the main code elements:
 
 - arcade_api_key is your Arcade key.
-- tool_manager fetches your Arcade tools, for example the "Google" toolkit.
+- tool_manager fetches your Arcade tools, for example the "Gmail" toolkit.
 - tool_node encapsulates these tools for usage in LangGraph.
 - model_with_tools binds your tools to the "gpt-4o" language model, enabling tool calls.
 
@@ -87,8 +87,8 @@ const arcade = new Arcade();
 // Replace with your application's user ID (e.g. email address, UUID, etc.)
 const USER_ID = "{arcade_user_id}";
 
-// Initialize tools from Google toolkit
-const googleToolkit = await arcade.tools.list({ toolkit: "google", limit: 30 });
+// Initialize tools from Gmail toolkit
+const googleToolkit = await arcade.tools.list({ toolkit: "gmail", limit: 30 });
 const arcadeTools = toZod({
 	tools: googleToolkit.items,
 	client: arcade,
@@ -117,7 +117,7 @@ const modelWithTools = model.bindTools(tools);
 
 Here are the main code elements:
 
-- arcade.tools.list fetches your Arcade tools, for example the "Google" toolkit.
+- arcade.tools.list fetches your Arcade tools, for example the "Gmail" toolkit.
 - toZod converts Arcade tools to Zod schemas, which are required by LangGraph.
 - ToolNode encapsulates these tools for usage in LangGraph.
 - modelWithTools binds your tools to the "gpt-4o" language model, enabling tool calls.
@@ -355,7 +355,7 @@ for await (const chunk of stream) {
 In this example:
 
 - The user prompts the agent to check emails.
-- The message triggers a potential need for the "Google" tools.
+- The message triggers a potential need for the "Gmail" tools.
 - If authorization is required, the code prints a URL and waits until you permit the tool call.
 
 </Steps>
diff --git a/pages/home/mastra/use-arcade-tools.mdx b/pages/home/mastra/use-arcade-tools.mdx
index 05d089409..33841cc3a 100644
--- a/pages/home/mastra/use-arcade-tools.mdx
+++ b/pages/home/mastra/use-arcade-tools.mdx
@@ -84,8 +84,8 @@ import {
 // Initialize Arcade
 const arcade = new Arcade();
 
-// Get Google tools
-const googleToolkit = await arcade.tools.list({ toolkit: "google", limit: 30 });
+// Get Gmail tools
+const googleToolkit = await arcade.tools.list({ toolkit: "gmail", limit: 30 });
 export const googleTools = toZodToolSet({
 	tools: googleToolkit.items,
 	client: arcade,
diff --git a/pages/home/oai-agents/overview.mdx b/pages/home/oai-agents/overview.mdx
index 7f85f97fc..8c81a54af 100644
--- a/pages/home/oai-agents/overview.mdx
+++ b/pages/home/oai-agents/overview.mdx
@@ -60,13 +60,13 @@ async def main():
     # Initialize the Arcade client
     client = AsyncArcade()
 
-    # Get tools from the "google" toolkit
-    tools = await get_arcade_tools(client, toolkits=["google"])
+    # Get tools from the "gmail" toolkit
+    tools = await get_arcade_tools(client, toolkits=["gmail"])
 
-    # Create an agent with Google tools
+    # Create an agent with Gmail tools
     google_agent = Agent(
-        name="Google agent",
-        instructions="You are a helpful assistant that can assist with Google API calls.",
+        name="Gmail agent",
+        instructions="You are a helpful assistant that can assist with Gmail API calls.",
         model="gpt-4o-mini",
         tools=tools,
     )
@@ -101,8 +101,8 @@ import { Agent, run, tool } from '@openai/agents';
 // 1) Initialize Arcade client
 const client = new Arcade();
 
-// 2) Fetch Google toolkit from Arcade and prepare tools for OpenAI Agents
-const googleToolkit = await client.tools.list({ toolkit: "google", limit: 30 });
+// 2) Fetch Gmail toolkit from Arcade and prepare tools for OpenAI Agents
+const googleToolkit = await client.tools.list({ toolkit: "gmail", limit: 30 });
 const tools = toZod({
   tools: googleToolkit.items,
   client,
@@ -110,9 +110,9 @@ const tools = toZod({
   executeFactory: executeOrAuthorizeZodTool,
 }).map(tool);
 
-// 3) Create a new agent with the Google toolkit
+// 3) Create a new agent with the Gmail toolkit
 const googleAgent = new Agent({
-  name: "Google agent",
+  name: "Gmail agent",
   instructions: "You are a helpful assistant that can assist with Google API calls.",
   model: "gpt-4o-mini",
   tools
diff --git a/pages/home/oai-agents/use-arcade-tools.mdx b/pages/home/oai-agents/use-arcade-tools.mdx
index 1e1567ae1..aa1546514 100644
--- a/pages/home/oai-agents/use-arcade-tools.mdx
+++ b/pages/home/oai-agents/use-arcade-tools.mdx
@@ -83,14 +83,14 @@ from agents_arcade import get_arcade_tools
 # Initialize the Arcade client
 client = AsyncArcade()
 
-# Get all tools from the "Google" toolkit
-tools = await get_arcade_tools(client, toolkits=["google"])
+# Get all tools from the "Gmail" toolkit
+tools = await get_arcade_tools(client, toolkits=["gmail"])
 
 # You can request multiple toolkits at once
-tools = await get_arcade_tools(client, toolkits=["google", "github", "linkedin"])
+tools = await get_arcade_tools(client, toolkits=["gmail", "github", "linkedin"])
 
 # You can request specific tools
-tools = await get_arcade_tools(client, tools=["Google_ListEmails", "Slack_ListUsers", "Slack_SendDmToUser"])
+tools = await get_arcade_tools(client, tools=["Gmail_ListEmails", "Slack_ListUsers", "Slack_SendDmToUser"])
 ```
 
 </Tabs.Tab>
@@ -105,12 +105,12 @@ import { tool } from '@openai/agents';
 const client = new Arcade();
 
 // Option 1: Get tools from a single toolkit
-const googleTools = await client.tools.list({ toolkit: "google", limit: 30 });
+const googleTools = await client.tools.list({ toolkit: "gmail", limit: 30 });
 const toolsFromGoogle = googleTools.items;
 
 // Option 2: Get tools from multiple toolkits
 const [google, github, linkedin] = await Promise.all([
-  client.tools.list({ toolkit: "google", limit: 30 }),
+  client.tools.list({ toolkit: "gmail", limit: 30 }),
   client.tools.list({ toolkit: "github", limit: 30 }),
   client.tools.list({ toolkit: "linkedin", limit: 30 })
 ]);
@@ -118,7 +118,7 @@ const toolsFromMultiple = [...google.items, ...github.items, ...linkedin.items];
 
 // Option 3: Get specific tools by name
 const specificTools = await Promise.all([
-  client.tools.get("Google_ListEmails"),
+  client.tools.get("Gmail_ListEmails"),
   client.tools.get("Slack_ListUsers"),
   client.tools.get("Slack_SendDmToUser"),
 ]);
@@ -151,9 +151,9 @@ Create an agent and provide it with the Arcade tools:
 ```python
 from agents import Agent, Runner
 
-# Create an agent with Google tools
+# Create an agent with Gmail tools
 google_agent = Agent(
-    name="Google agent",
+    name="Gmail agent",
     instructions="You are a helpful assistant that can assist with Google API calls.",
     model="gpt-4o-mini",
     tools=tools,
@@ -169,7 +169,7 @@ import { Agent, Runner, tool } from '@openai/agents';
 
 // Create an agent with Arcade tools
 const googleAgent = new Agent({
-  name: "Google agent",
+  name: "Gmail agent",
   instructions: "You are a helpful assistant that can assist with Google API calls.",
   model: "gpt-4o-mini",
   tools
@@ -260,7 +260,7 @@ from agents_arcade.errors import AuthorizationError
 
 async def main():
     client = AsyncArcade()
-    tools = await get_arcade_tools(client, toolkits=["google"])
+    tools = await get_arcade_tools(client, toolkits=["gmail"])
 
     google_agent = Agent(
         name="Google agent",
@@ -300,8 +300,8 @@ import { Agent, run, tool } from '@openai/agents';
 // 1) Initialize Arcade client
 const client = new Arcade();
 
-// 2) Fetch Google toolkit from Arcade and prepare tools for OpenAI Agents
-const googleToolkit = await client.tools.list({ toolkit: "google", limit: 30 });
+// 2) Fetch Gmail toolkit from Arcade and prepare tools for OpenAI Agents
+const googleToolkit = await client.tools.list({ toolkit: "gmail", limit: 30 });
 const tools = toZod({
   tools: googleToolkit.items,
   client,
@@ -309,9 +309,9 @@ const tools = toZod({
   executeFactory: executeOrAuthorizeZodTool,
 }).map(tool);
 
-// 3) Create a new agent with the Google toolkit
+// 3) Create a new agent with the Gmail toolkit
 const googleAgent = new Agent({
-  name: "Google agent",
+  name: "Gmail agent",
   instructions: "You are a helpful assistant that can assist with Google API calls.",
   model: "gpt-4o-mini",
   tools
diff --git a/pages/home/oai-agents/user-auth-interrupts.mdx b/pages/home/oai-agents/user-auth-interrupts.mdx
index 4b41fbb20..1497db48b 100644
--- a/pages/home/oai-agents/user-auth-interrupts.mdx
+++ b/pages/home/oai-agents/user-auth-interrupts.mdx
@@ -272,7 +272,7 @@ while (true) {
       // Catch the authorization error and wait for completion
       if (error instanceof Error && isAuthorizationRequiredError(error)) {
         const response = await client.tools.authorize({
-          tool_name: "Google_ListEmails",
+          tool_name: "Gmail_ListEmails",
           user_id: "<YOUR_SYSTEM_USER_ID_2>",
         });
         if (response.status !== "completed") {
@@ -366,17 +366,17 @@ async function main() {
   // 1) Initialize Arcade client
   const client = new Arcade();
 
-  // 2) Fetch Google toolkit from Arcade and prepare tools for OpenAI Agents
-  const googleToolkit = await client.tools.list({ toolkit: "google", limit: 30 });
+  // 2) Fetch Gmail toolkit from Arcade and prepare tools for OpenAI Agents
+  const googleToolkit = await client.tools.list({ toolkit: "gmail", limit: 30 });
   const tools = toZod({
     tools: googleToolkit.items,
     client,
     userId: "<YOUR_SYSTEM_USER_ID_2>", // Replace this with your application's user ID (e.g. email address, UUID, etc.)
   }).map(tool);
 
-  // 3) Create a new agent with the Google toolkit
+  // 3) Create a new agent with the Gmail toolkit
   const googleAgent = new Agent({
-    name: "Google agent",
+    name: "Gmail agent",
     instructions: "You are a helpful assistant that can assist with Google API calls.",
     model: "gpt-4o-mini",
     tools
@@ -391,7 +391,7 @@ async function main() {
     } catch (error) {
       if (error instanceof Error && isAuthorizationRequiredError(error)) {
         const response = await client.tools.authorize({
-          tool_name: "Google_ListEmails",
+          tool_name: "Gmail_ListEmails",
           user_id: "<YOUR_SYSTEM_USER_ID_2>",
         });
         if (response.status !== "completed") {
diff --git a/pages/home/serve-tools/docker-worker.mdx b/pages/home/serve-tools/docker-worker.mdx
index a02617163..19aa56c18 100644
--- a/pages/home/serve-tools/docker-worker.mdx
+++ b/pages/home/serve-tools/docker-worker.mdx
@@ -41,7 +41,7 @@ Create a file named toolkits.txt in the same directory. Add the toolkits you wan
 
 ```
 arcade-google
-arcade-web
+arcade-firecrawl
 arcade-zoom
 ```
 
diff --git a/pages/home/use-tools/get-tool-definitions.mdx b/pages/home/use-tools/get-tool-definitions.mdx
index 02d332975..d69addedc 100644
--- a/pages/home/use-tools/get-tool-definitions.mdx
+++ b/pages/home/use-tools/get-tool-definitions.mdx
@@ -95,7 +95,7 @@ import { toZod } from "@arcadeai/arcadejs/lib"
 
 const googleToolkit = await arcade.tools.list({
     limit: 20,
-    toolkit: "google",
+    toolkit: "gmail",
 });
 
 const tools = toZod({
@@ -114,7 +114,7 @@ import { toZodToolSet } from "@arcadeai/arcadejs/lib"
 
 const googleToolkit = await arcade.tools.list({
     limit: 20,
-    toolkit: "google",
+    toolkit: "gmail",
 });
 
 const tools = toZodToolSet({
@@ -123,7 +123,7 @@ const tools = toZodToolSet({
     userId: "<YOUR_USER_ID>",
 })
 
-const emails = await tools.Google_ListEmails.execute({
+const emails = await tools.Gmail_ListEmails.execute({
   limit: 10,
 });
 ```
@@ -135,7 +135,7 @@ When you only need to work with a specific tool, use this method to convert just
 ```ts
 import { createZodTool } from "@arcadeai/arcadejs/lib"
 
-const listEmails = await arcade.tools.get("Google_ListEmails");
+const listEmails = await arcade.tools.get("Gmail_ListEmails");
 
 const listEmailsTool = createZodTool({
     tool: listEmails,
@@ -153,7 +153,7 @@ When working with tools that require user authorization (like Gmail, GitHub, Sla
 
 #### Option 1: Manual handling
 
-When you convert Arcade tools to Zod without adding an `executeFactory`, Arcade will try to run tools directly. For tools that need permission (like Google or Slack), you'll see a `PermissionDeniedError` if the user hasn't given access yet.
+When you convert Arcade tools to Zod without adding an `executeFactory`, Arcade will try to run tools directly. For tools that need permission (like Gmail or Slack), you'll see a `PermissionDeniedError` if the user hasn't given access yet.
 
 This approach gives you complete control over the authorization flow, making it perfect for custom UI implementations or complex workflows. You'll have full flexibility to design your own user experience, but you'll need to handle authorization flows and error states manually in your code.
 
@@ -167,7 +167,7 @@ const tools = toZodToolSet({
 })
 
 try {
-	const result = await tools.Google_ListEmails.execute({
+	const result = await tools.Gmail_ListEmails.execute({
 		limit: 10,
 	});
 	console.log(result);
@@ -175,7 +175,7 @@ try {
 	if (error instanceof PermissionDeniedError) {
 		// You can use the `arcade.tools.authorize` method to get an authorization URL for the user
 		const authorizationResponse = await arcade.tools.authorize({
-			tool_name: "Google.ListEmails",
+			tool_name: "Gmail.ListEmails",
 			user_id: "<YOUR_USER_ID>",
 		});
 		console.log(authorizationResponse.url);
@@ -207,7 +207,7 @@ const tools = toZodToolSet({
 	executeFactory: executeOrAuthorizeZodTool, // Automatically handles tool authorization flows, including generating auth URLs
 });
 
-const result = await tools.Google_ListEmails.execute({
+const result = await tools.Gmail_ListEmails.execute({
 	limit: 10,
 });
 
@@ -218,4 +218,4 @@ if ("authorization_required" in result && result.authorization_required) {
 } else {
 	console.log(result);
 }
-```
\ No newline at end of file
+```
diff --git a/pages/home/use-tools/tools-overview.mdx b/pages/home/use-tools/tools-overview.mdx
index 2e25da261..394710b15 100644
--- a/pages/home/use-tools/tools-overview.mdx
+++ b/pages/home/use-tools/tools-overview.mdx
@@ -13,11 +13,11 @@ To solve this, many AI models support tool calling (sometimes referred to as 'fu
 
 Say a colleague shares a document with you on Google Drive, and you'd like an LLM to help you analyze it.
 
-You could go to your Drive, open the document, copy its contents, and paste it into your chat. But what if the LLM could do this for you? The Arcade Drive toolkit provides a [`SearchAndRetrieveDocuments`](/toolkits/productivity/google/drive#searchandretrievedocuments) tool. By calling it, the LLM can find and read the document without you having to do anything.
+You could go to your Drive/Docs, open the document, copy its contents, and paste it into your chat. But what if the LLM could do this for you? The Arcade Google Docs toolkit provides a [`SearchAndRetrieveDocuments`](/toolkits/productivity/google_docs#searchandretrievedocuments) tool. By calling it, the LLM can find and read the document without you having to do anything.
 
-After analyzing the document, you decide that a meeting is needed with your colleague. You can ask the LLM to schedule a meeting and it will use the [Calendar toolkit](/toolkits/productivity/google/calendar) to do it without you needing to leave the chat.
+After analyzing the document, you decide that a meeting is needed with your colleague. You can ask the LLM to schedule a meeting and it will use the [Google Calendar toolkit](/toolkits/productivity/google_calendar) to do it without you needing to leave the chat.
 
-Or you could ask the LLM to send a summary of the analysis to your colleague by email and it would use the [Gmail toolkit](/toolkits/productivity/google/gmail) for that.
+Or you could ask the LLM to send a summary of the analysis to your colleague by email and it would use the [Gmail toolkit](/toolkits/productivity/gmail) for that.
 
 ## Possibilities for Application and AI Agent developers
 
@@ -29,16 +29,16 @@ With the Arcade SDKs, it is easy to build applications and AI Agents that can le
 
 AI models that support tool calling can determine when and how to use specific tools to fulfill a user's request. The developer decides which tools to make available to the model, whether existing tools or tools they've built themselves.
 
-In the example above, when the user asks: "_help me analyze the 'Project XYZ' document shared by John on Google Drive_", the LLM can use its reasoning capabilities to:
+In the example above, when the user asks: "_help me analyze the 'Project XYZ' Google document shared by John_", the LLM can use its reasoning capabilities to:
 
 1. Recognize that it needs to access external data;
-1. Evaluate that the `Drive.SearchAndRetrieveDocuments` tool is the best way to get that data;
+1. Evaluate that the `GoogleDocs.SearchAndRetrieveDocuments` tool is the best way to get that data;
 1. Call the tool with the appropriate parameters;
 1. Read the document content and use it to answer the user's questions.
 
 ## The authorization problem
 
-One challenge to make all that happen is authorization. How do you give the LLM permission to access someone's Google Drive and Gmail in a secure and convenient way?
+One challenge to make all that happen is authorization. How do you give the LLM permission to access someone's Google Docs and Gmail in a secure and convenient way?
 
 Arcade solves this problem by providing a standardized [interface for authorization](/home/auth/how-arcade-helps), as well as pre-built integrations with [popular services](/home/auth-providers) such as Google, Dropbox, GitHub, Notion, and many more.
 
diff --git a/pages/home/vercelai/use-arcade-tools.mdx b/pages/home/vercelai/use-arcade-tools.mdx
index 5d14a4d5d..827c2fb19 100644
--- a/pages/home/vercelai/use-arcade-tools.mdx
+++ b/pages/home/vercelai/use-arcade-tools.mdx
@@ -15,7 +15,7 @@ The [Vercel AI SDK](https://sdk.vercel.ai/) is an open-source library that simpl
 
 Let's supercharge your Vercel AI SDK applications with Arcade's tools. You'll get instant access to production-ready tools for working with Google, Slack, GitHub, LinkedIn, and many other popular services, all with built-in authentication. Browse our [complete toolkit catalog](https://docs.arcade.dev/toolkits) to discover what you can build.
 
-In this guide, we'll show you how to use Arcade's Google toolkit to create an AI agent that can read and summarize emails. You can find the complete code in our [GitHub repository](https://github.com/ArcadeAI/arcade-ai/tree/main/examples/ai-sdk) or follow along below.
+In this guide, we'll show you how to use Arcade's Gmail toolkit to create an AI agent that can read and summarize emails. You can find the complete code in our [GitHub repository](https://github.com/ArcadeAI/arcade-ai/tree/main/examples/ai-sdk) or follow along below.
 
 ## Getting started
 
@@ -80,13 +80,13 @@ import { toZodToolSet, executeOrAuthorizeZodTool } from "@arcadeai/arcadejs/lib"
 const arcade = new Arcade()
 ```
 
-### Get tools from Arcade's Google toolkit and convert them to Zod
+### Get tools from Arcade's Gmail toolkit and convert them to Zod
 
 Arcade offers methods to convert tools into Zod schemas, which is essential since the Vercel AI SDK defines tools using Zod. The `toZodToolSet` method is particularly useful, as it simplifies this integration and makes it easier to use Arcade's tools with the Vercel AI SDK. Learn more about Arcade's Zod integration options [here](/home/use-tools/get-tool-definitions#get-zod-tool-definitions).
 
 ```ts
-// Get Arcade's google toolkit
-const googleToolkit = await arcade.tools.list({ toolkit: "google", limit: 30 })
+// Get Arcade's gmail toolkit
+const googleToolkit = await arcade.tools.list({ toolkit: "gmail", limit: 30 })
 const googleTools = toZodToolSet({
     tools: googleToolkit.items,
     client: arcade,
diff --git a/pages/toolkits/development/_meta.ts b/pages/toolkits/development/_meta.ts
index 2f95bece8..67d2a0c8d 100644
--- a/pages/toolkits/development/_meta.ts
+++ b/pages/toolkits/development/_meta.ts
@@ -1,5 +1,5 @@
 export default {
-  "code-sandbox": "Code Sandbox",
+  e2b: "E2B",
   github: "GitHub",
-  web: "Web",
+  firecrawl: "Firecrawl",
 };
diff --git a/pages/toolkits/development/code-sandbox.mdx b/pages/toolkits/development/e2b.mdx
similarity index 63%
rename from pages/toolkits/development/code-sandbox.mdx
rename to pages/toolkits/development/e2b.mdx
index 9a343853b..3365b30ad 100644
--- a/pages/toolkits/development/code-sandbox.mdx
+++ b/pages/toolkits/development/e2b.mdx
@@ -1,4 +1,4 @@
-# Code Sandbox
+# E2B
 
 import ToolInfo from "@/components/ToolInfo";
 import Badges from "@/components/Badges";
@@ -9,27 +9,27 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to run code in a sandboxed environment."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/code_sandbox"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/e2b"
   authType="API Key"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_code_sandbox" />
+<Badges repo="arcadeai/arcade_e2b" />
 
-The Arcade Code Sandbox toolkit provides a pre-built set of tools for running code in a sandboxed environment. These tools make it easy to build agents and AI apps that can:
+The Arcade E2B toolkit provides a pre-built set of tools for running code in a sandboxed environment. These tools make it easy to build agents and AI apps that can:
 
 - Run code in a sandboxed environment
 - Create a static matplotlib chart
 
 ## Available Tools
 
-These tools are currently available in the Arcade Code Sandbox toolkit.
+These tools are currently available in the Arcade E2B toolkit.
 
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["CodeSandbox.RunCode", "Run code in a sandboxed environment."],
-    ["CodeSandbox.CreateStaticMatplotlibChart", "Create a static matplotlib chart."],
+    ["E2b.RunCode", "Run code in a sandboxed environment."],
+    ["E2b.CreateStaticMatplotlibChart", "Create a static matplotlib chart."],
   ]}
 />
 
@@ -39,7 +39,7 @@ These tools are currently available in the Arcade Code Sandbox toolkit.
   own tools](/home/build-tools/create-a-toolkit).
 </Tip>
 
-## CodeSandbox.RunCode
+## E2b.RunCode
 
 <br />
 <TabbedCodeBlock
@@ -48,9 +48,9 @@ These tools are currently available in the Arcade Code Sandbox toolkit.
       label: "Call the Tool Directly",
       content: {
         Python: [
-          "/examples/integrations/toolkits/code-sandbox/run_code_example_call_tool.py",
+          "/examples/integrations/toolkits/e2b/run_code_example_call_tool.py",
         ],
-        JavaScript: ["/examples/integrations/toolkits/code-sandbox/run_code_example_call_tool.js"],
+        JavaScript: ["/examples/integrations/toolkits/e2b/run_code_example_call_tool.js"],
       },
     }
   ]}
@@ -70,7 +70,7 @@ Run code in a sandbox and return the output.
 
 ---
 
-## CodeSandbox.CreateStaticMatplotlibChart
+## E2b.CreateStaticMatplotlibChart
 
 <br />
 <TabbedCodeBlock
@@ -79,9 +79,9 @@ Run code in a sandbox and return the output.
       label: "Call the Tool Directly",
       content: {
         Python: [
-          "/examples/integrations/toolkits/code-sandbox/create_static_matplotlib_chart_example_call_tool.py",
+          "/examples/integrations/toolkits/e2b/create_static_matplotlib_chart_example_call_tool.py",
         ],
-        JavaScript: ["/examples/integrations/toolkits/code-sandbox/create_static_matplotlib_chart_example_call_tool.js"],
+        JavaScript: ["/examples/integrations/toolkits/e2b/create_static_matplotlib_chart_example_call_tool.js"],
       },
     }
   ]}
@@ -100,10 +100,10 @@ Run the provided Python code to generate a static matplotlib chart. The resultin
 
 ## Auth
 
-The Arcade Code Sandbox toolkit uses [E2B](https://e2b.dev/) to run code in a sandboxed environment.
+The Arcade E2B toolkit uses [E2B](https://e2b.dev/) to run code in a sandboxed environment.
 
 **Global Environment Variables:**
 
 - `E2B_API_KEY`: Your [E2B](https://e2b.dev/) API key.
 
-<ToolFooter pipPackageName="arcade-code-sandbox" />
\ No newline at end of file
+<ToolFooter pipPackageName="arcade-e2b" />
diff --git a/pages/toolkits/development/web/web.mdx b/pages/toolkits/development/firecrawl/firecrawl.mdx
similarity index 71%
rename from pages/toolkits/development/web/web.mdx
rename to pages/toolkits/development/firecrawl/firecrawl.mdx
index 9071ba24a..25dad6d2c 100644
--- a/pages/toolkits/development/web/web.mdx
+++ b/pages/toolkits/development/firecrawl/firecrawl.mdx
@@ -1,4 +1,4 @@
-# Web
+# Firecrawl
 
 import ToolInfo from "@/components/ToolInfo";
 import Badges from "@/components/Badges";
@@ -9,14 +9,14 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to scrape, crawl, and map websites."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/web"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/firecrawl"
   authType="API Key"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_web" />
+<Badges repo="arcadeai/arcade_firecrawl" />
 
-The Arcade Web toolkit provides a pre-built set of tools for interacting with websites. These tools make it easy to build agents and AI apps that can:
+The Arcade Firecrawl toolkit provides a pre-built set of tools for interacting with websites. These tools make it easy to build agents and AI apps that can:
 
 - Scrape web pages
 - Crawl websites
@@ -26,17 +26,17 @@ The Arcade Web toolkit provides a pre-built set of tools for interacting with we
 
 ## Available Tools
 
-These tools are currently available in the Arcade Web toolkit.
+These tools are currently available in the Arcade Firecrawl toolkit.
 
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["Web.ScrapeUrl", "Scrape a URL and return data in specified formats."],
-    ["Web.CrawlWebsite", "Crawl a website and return crawl status and data."],
-    ["Web.GetCrawlStatus", "Retrieve the status of a crawl job."],
-    ["Web.GetCrawlData", "Retrieve data from a completed crawl job."],
-    ["Web.CancelCrawl", "Cancel an ongoing crawl job."],
-    ["Web.MapWebsite", "Map a website from a single URL to a map of the entire website.", ],
+    ["Firecrawl.ScrapeUrl", "Scrape a URL and return data in specified formats."],
+    ["Firecrawl.CrawlWebsite", "Crawl a website and return crawl status and data."],
+    ["Firecrawl.GetCrawlStatus", "Retrieve the status of a crawl job."],
+    ["Firecrawl.GetCrawlData", "Retrieve data from a completed crawl job."],
+    ["Firecrawl.CancelCrawl", "Cancel an ongoing crawl job."],
+    ["Firecrawl.MapWebsite", "Map a website from a single URL to a map of the entire website.", ],
   ]}
 />
 
@@ -46,7 +46,7 @@ These tools are currently available in the Arcade Web toolkit.
   own tools](/home/build-tools/create-a-toolkit).
 </Tip>
 
-## Web.ScrapeUrl
+## Firecrawl.ScrapeUrl
 
 <br />
 <TabbedCodeBlock
@@ -55,10 +55,10 @@ These tools are currently available in the Arcade Web toolkit.
       label: "Call the Tool Directly",
       content: {
         Python: [
-          "/examples/integrations/toolkits/web/scrape_url_example_call_tool.py",
+          "/examples/integrations/toolkits/firecrawl/scrape_url_example_call_tool.py",
         ],
         JavaScript: [
-          "/examples/integrations/toolkits/web/scrape_url_example_call_tool.js",
+          "/examples/integrations/toolkits/firecrawl/scrape_url_example_call_tool.js",
         ],
       },
     }
@@ -75,7 +75,7 @@ Scrape a URL and return data in specified formats.
 **Parameters**
 
 - **`url`** _(string, required)_ The URL to scrape.
-- **`formats`** _(enum ([Formats](/toolkits/development/web/reference#formats)), optional)_ The format of the scraped web page. Defaults to `Formats.MARKDOWN`.
+- **`formats`** _(enum ([Formats](/toolkits/development/firecrawl/reference#formats)), optional)_ The format of the scraped web page. Defaults to `Formats.MARKDOWN`.
 - **`only_main_content`** _(bool, optional)_ Only return the main content of the page. Defaults to `True`.
 - **`include_tags`** _(list, optional)_ List of tags to include in the output.
 - **`exclude_tags`** _(list, optional)_ List of tags to exclude from the output.
@@ -84,7 +84,7 @@ Scrape a URL and return data in specified formats.
 
 ---
 
-## Web.CrawlWebsite
+## Firecrawl.CrawlWebsite
 
 <br />
 <TabbedCodeBlock
@@ -93,10 +93,10 @@ Scrape a URL and return data in specified formats.
       label: "Call the Tool Directly",
       content: {
         Python: [
-          "/examples/integrations/toolkits/web/crawl_website_example_call_tool.py",
+          "/examples/integrations/toolkits/firecrawl/crawl_website_example_call_tool.py",
         ],
         JavaScript: [
-          "/examples/integrations/toolkits/web/crawl_website_example_call_tool.js",
+          "/examples/integrations/toolkits/firecrawl/crawl_website_example_call_tool.js",
         ],
       },
     }
@@ -125,7 +125,7 @@ Crawl a website and return crawl status and data.
 
 ---
 
-## Web.GetCrawlStatus
+## Firecrawl.GetCrawlStatus
 
 <br />
 <TabbedCodeBlock
@@ -134,10 +134,10 @@ Crawl a website and return crawl status and data.
       label: "Call the Tool Directly",
       content: {
         Python: [
-          "/examples/integrations/toolkits/web/get_crawl_status_example_call_tool.py",
+          "/examples/integrations/toolkits/firecrawl/get_crawl_status_example_call_tool.py",
         ],
         JavaScript: [
-          "/examples/integrations/toolkits/web/get_crawl_status_example_call_tool.js",
+          "/examples/integrations/toolkits/firecrawl/get_crawl_status_example_call_tool.js",
         ],
       },
     }
@@ -157,7 +157,7 @@ Retrieve the status of a crawl job.
 
 ---
 
-## Web.GetCrawlData
+## Firecrawl.GetCrawlData
 
 <br />
 <TabbedCodeBlock
@@ -166,10 +166,10 @@ Retrieve the status of a crawl job.
       label: "Call the Tool Directly",
       content: {
         Python: [
-          "/examples/integrations/toolkits/web/get_crawl_data_example_call_tool.py",
+          "/examples/integrations/toolkits/firecrawl/get_crawl_data_example_call_tool.py",
         ],
         JavaScript: [
-          "/examples/integrations/toolkits/web/get_crawl_data_example_call_tool.js",
+          "/examples/integrations/toolkits/firecrawl/get_crawl_data_example_call_tool.js",
         ],
       },
     }
@@ -189,7 +189,7 @@ Retrieve data from a completed crawl job.
 
 ---
 
-## Web.CancelCrawl
+## Firecrawl.CancelCrawl
 
 <br />
 <TabbedCodeBlock
@@ -198,10 +198,10 @@ Retrieve data from a completed crawl job.
       label: "Call the Tool Directly",
       content: {
         Python: [
-          "/examples/integrations/toolkits/web/cancel_crawl_example_call_tool.py",
+          "/examples/integrations/toolkits/firecrawl/cancel_crawl_example_call_tool.py",
         ],
         JavaScript: [
-          "/examples/integrations/toolkits/web/cancel_crawl_example_call_tool.js",
+          "/examples/integrations/toolkits/firecrawl/cancel_crawl_example_call_tool.js",
         ],
       },
     }
@@ -221,7 +221,7 @@ Cancel an ongoing crawl job.
 
 ---
 
-## Web.MapWebsite
+## Firecrawl.MapWebsite
 
 <br />
 <TabbedCodeBlock
@@ -230,10 +230,10 @@ Cancel an ongoing crawl job.
       label: "Call the Tool Directly",
       content: {
         Python: [
-          "/examples/integrations/toolkits/web/map_website_example_call_tool.py",
+          "/examples/integrations/toolkits/firecrawl/map_website_example_call_tool.py",
         ],
         JavaScript: [
-          "/examples/integrations/toolkits/web/map_website_example_call_tool.js",
+          "/examples/integrations/toolkits/firecrawl/map_website_example_call_tool.js",
         ],
       },
     }
@@ -263,4 +263,4 @@ The Arcade Web toolkit uses [Firecrawl](https://www.firecrawl.dev/) to scrape, c
 
 - `FIRECRAWL_API_KEY`: Your [Firecrawl](https://www.firecrawl.dev/) API key.
 
-<ToolFooter pipPackageName="arcade_web" />
+<ToolFooter pipPackageName="arcade_firecrawl" />
diff --git a/pages/toolkits/development/web/reference.mdx b/pages/toolkits/development/firecrawl/reference.mdx
similarity index 93%
rename from pages/toolkits/development/web/reference.mdx
rename to pages/toolkits/development/firecrawl/reference.mdx
index 420f6bfd7..4ed4be127 100644
--- a/pages/toolkits/development/web/reference.mdx
+++ b/pages/toolkits/development/firecrawl/reference.mdx
@@ -1,4 +1,4 @@
-# Reference for Web Toolkit
+# Reference for Firecrawl Toolkit
 
 ## Formats
 
diff --git a/pages/toolkits/productivity/_meta.ts b/pages/toolkits/productivity/_meta.ts
index 7744a221c..513c814b1 100644
--- a/pages/toolkits/productivity/_meta.ts
+++ b/pages/toolkits/productivity/_meta.ts
@@ -2,9 +2,15 @@ export default {
   asana: "Asana",
   confluence: "Confluence",
   dropbox: "Dropbox",
-  google: "Google",
+  gmail: "Gmail",
+  google_calendar: "Google Calendar",
+  google_contacts: "Google Contacts",
+  google_docs: "Google Docs",
+  google_drive: "Google Drive",
+  google_sheets: "Google Sheets",
   jira: "Jira",
-  microsoft: "Microsoft",
   notion: "Notion",
   obsidian: "Obsidian",
+  outlook_calendar: "Outlook Calendar",
+  outlook_mail: "Outlook Mail",
 };
diff --git a/pages/toolkits/productivity/google/gmail.mdx b/pages/toolkits/productivity/gmail.mdx
similarity index 88%
rename from pages/toolkits/productivity/google/gmail.mdx
rename to pages/toolkits/productivity/gmail.mdx
index dabbeeb68..64490dd34 100644
--- a/pages/toolkits/productivity/google/gmail.mdx
+++ b/pages/toolkits/productivity/gmail.mdx
@@ -9,13 +9,13 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to send, read, and manage emails in Gmail."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_gmail"
   authType="oauth2"
   authProviderName="Google"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_google" />
+<Badges repo="arcadeai/arcade_gmail" />
 
 The Arcade Gmail toolkit provides a pre-built set of tools for interacting with Gmail. These tools make it easy to build agents and AI apps that can:
 
@@ -32,18 +32,18 @@ These tools are currently available in the Arcade Gmail toolkit.
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["Google.SendEmail", "Send an email using the Gmail API."],
-    ["Google.SendDraftEmail", "Send a draft email using the Gmail API."],
-    ["Google.WriteDraftEmail", "Compose a new email draft using the Gmail API."],
-    ["Google.UpdateDraftEmail", "Update an existing email draft."],
-    ["Google.DeleteDraftEmail", "Delete a draft email using the Gmail API."],
-    ["Google.TrashEmail", "Move an email to the trash folder."],
-    ["Google.ListDraftEmails", "List draft emails in the user's mailbox."],
-    ["Google.ListEmailsByHeader", "Search for emails by header using the Gmail API."],
-    ["Google.ListEmails", "Read emails and extract plain text content."],
-    ["Google.SearchThreads", "Search for threads in the user's mailbox."],
-    ["Google.ListThreads", "List threads in the user's mailbox."],
-    ["Google.GetThread", "Get the specified thread by ID."],
+    ["Gmail.SendEmail", "Send an email using the Gmail API."],
+    ["Gmail.SendDraftEmail", "Send a draft email using the Gmail API."],
+    ["Gmail.WriteDraftEmail", "Compose a new email draft using the Gmail API."],
+    ["Gmail.UpdateDraftEmail", "Update an existing email draft."],
+    ["Gmail.DeleteDraftEmail", "Delete a draft email using the Gmail API."],
+    ["Gmail.TrashEmail", "Move an email to the trash folder."],
+    ["Gmail.ListDraftEmails", "List draft emails in the user's mailbox."],
+    ["Gmail.ListEmailsByHeader", "Search for emails by header using the Gmail API."],
+    ["Gmail.ListEmails", "Read emails and extract plain text content."],
+    ["Gmail.SearchThreads", "Search for threads in the user's mailbox."],
+    ["Gmail.ListThreads", "List threads in the user's mailbox."],
+    ["Gmail.GetThread", "Get the specified thread by ID."],
   ]}
 />
 
@@ -54,7 +54,7 @@ These tools are currently available in the Arcade Gmail toolkit.
   provider](/home/auth-providers/google#using-google-auth-in-custom-tools).
 </Tip>
 
-## Google.SendEmail
+## Gmail.SendEmail
 
 <br />
 <TabbedCodeBlock
@@ -83,7 +83,7 @@ Send an email using the Gmail API.
 
 ---
 
-## Google.SendDraftEmail
+## Gmail.SendDraftEmail
 
 <br />
 <TabbedCodeBlock
@@ -108,7 +108,7 @@ Send a draft email using the Gmail API.
 
 ---
 
-## Google.WriteDraftEmail
+## Gmail.WriteDraftEmail
 
 <br />
 <TabbedCodeBlock
@@ -137,7 +137,7 @@ Compose a new email draft using the Gmail API.
 
 ---
 
-## Google.UpdateDraftEmail
+## Gmail.UpdateDraftEmail
 
 <br />
 <TabbedCodeBlock
@@ -167,7 +167,7 @@ Update an existing email draft.
 
 ---
 
-## Google.DeleteDraftEmail
+## Gmail.DeleteDraftEmail
 
 <br />
 <TabbedCodeBlock
@@ -192,7 +192,7 @@ Delete a draft email using the Gmail API.
 
 ---
 
-## Google.TrashEmail
+## Gmail.TrashEmail
 
 <Warning type="warning" emoji="⚠️">
   The `TrashEmail` tool is currently only available on a self-hosted instance of the Arcade Engine. To learn more about self-hosting, see the [self-hosting documentation](/home/local-deployment/install/local#install-the-engine).
@@ -221,7 +221,7 @@ Move an email to the trash folder.
 
 ---
 
-## Google.ListDraftEmails
+## Gmail.ListDraftEmails
 
 <br />
 <TabbedCodeBlock
@@ -246,7 +246,7 @@ List draft emails in the user's mailbox.
 
 ---
 
-## Google.ListEmailsByHeader
+## Gmail.ListEmailsByHeader
 
 <br />
 <TabbedCodeBlock
@@ -278,7 +278,7 @@ _At least one of the following parameters must be provided: `sender`, `recipient
 
 ---
 
-## Google.ListEmails
+## Gmail.ListEmails
 
 <br />
 <TabbedCodeBlock
@@ -303,7 +303,7 @@ Read emails from a Gmail account and extract plain text content.
 
 ---
 
-## Google.SearchThreads
+## Gmail.SearchThreads
 
 <br />
 <TabbedCodeBlock
@@ -336,7 +336,7 @@ Search for threads in the user's mailbox
 
 ---
 
-## Google.ListThreads
+## Gmail.ListThreads
 
 <br />
 <TabbedCodeBlock
@@ -363,7 +363,7 @@ List threads in the user's mailbox.
 
 ---
 
-## Google.GetThread
+## Gmail.GetThread
 
 <br />
 <TabbedCodeBlock
@@ -394,4 +394,16 @@ With the hosted Arcade Engine, there's nothing to configure. Your users will see
 
 With a self-hosted installation of Arcade, you need to [configure the Google auth provider](/home/auth-providers/google#configuring-google-auth) with your own Google app credentials.
 
-<ToolFooter pipPackageName="arcade_google" />
+---
+
+## Reference
+
+### GmailReplyToWhom
+
+The type of recipient to reply to.
+
+- **`EVERY_RECIPIENT`**: Reply to the original sender and all recipients.
+- **`ONLY_THE_SENDER`**: Reply to the original sender only.
+
+
+<ToolFooter pipPackageName="arcade_gmail" />
diff --git a/pages/toolkits/productivity/google/_meta.ts b/pages/toolkits/productivity/google/_meta.ts
deleted file mode 100644
index 19b4ed693..000000000
--- a/pages/toolkits/productivity/google/_meta.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export default {
-  calendar: "Calendar",
-  contacts: "Contacts",
-  docs: "Docs",
-  drive: "Drive",
-  gmail: "Gmail",
-  sheets: "Sheets",
-  reference: "Reference",
-};
diff --git a/pages/toolkits/productivity/google/docs.mdx b/pages/toolkits/productivity/google/docs.mdx
deleted file mode 100644
index cdf294017..000000000
--- a/pages/toolkits/productivity/google/docs.mdx
+++ /dev/null
@@ -1,157 +0,0 @@
-# Docs
-
-import ToolInfo from "@/components/ToolInfo";
-import Badges from "@/components/Badges";
-import TabbedCodeBlock from "@/components/TabbedCodeBlock";
-import TableOfContents from "@/components/TableOfContents";
-import ToolFooter from "@/components/ToolFooter";
-
-<ToolInfo
-  description="Enable agents to interact with Google Docs documents."
-  author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google"
-  authType="oauth2"
-  authProviderName="Google"
-  versions={["0.1.0"]}
-/>
-
-<Warning>
-  This Toolkit is not available in Arcade Cloud. You can use these tools with a [self-hosted](/home/local-deployment/install/overview) instance of Arcade.
-</Warning>
-
-<Badges repo="arcadeai/arcade_google" />
-
-The Arcade Docs toolkit provides a pre-built set of tools for interacting with Google Docs. These tools make it easy to build agents and AI apps that can:
-
-- Create, update, list, and delete documents
-
-## Available Tools
-
-These tools are currently available in the Arcade Docs toolkit.
-
-<TableOfContents
-  headers={["Tool Name", "Description"]}
-  data={[
-    ["Google.GetDocumentById", "Retrieve a Google Docs document by ID. Note: This tool currently requires a self-hosted instance of Arcade.", ],
-    ["Google.InsertTextAtEndOfDocument", "Insert text at the end of a Google Docs document. Note: This tool currently requires a self-hosted instance of Arcade.", ],
-    ["Google.CreateBlankDocument", "Create a new blank Google Docs document with a title. Note: This tool currently requires a self-hosted instance of Arcade.", ],
-    ["Google.CreateDocumentFromText", "Create a new Google Docs document with specified text content. Note: This tool currently requires a self-hosted instance of Arcade.", ],
-  ]}
-/>
-
-<Tip>
-  If you need to perform an action that's not listed here, you can [get in touch
-  with us](mailto:contact@arcade.dev) to request a new tool, or [create your
-  own tools](/home/build-tools/create-a-toolkit) with the [Google auth
-  provider](/home/auth-providers/google#using-google-auth-in-custom-tools).
-</Tip>
-
-## Google.GetDocumentById
-
-<br />
-<TabbedCodeBlock
-  tabs={[
-    {
-      label: "Call the Tool with User Authorization",
-      content: {
-        Python: [
-          "/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.py",
-        ],
-        JavaScript: ["/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.js"],
-      },
-    }
-  ]}
-/>
-
-Get the latest version of the specified Google Docs document.
-
-**Parameters**
-
-- **`document_id`** _(string, required)_ The ID of the document to retrieve.
-
----
-
-## Google.InsertTextAtEndOfDocument
-
-<br />
-<TabbedCodeBlock
-  tabs={[
-    {
-      label: "Call the Tool with User Authorization",
-      content: {
-        Python: [
-          "/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.py",
-        ],
-        JavaScript: ["/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.js"],
-      },
-    }
-  ]}
-/>
-
-Insert text at the end of an existing Google Docs document.
-
-**Parameters**
-
-- **`document_id`** _(string, required)_ The ID of the document to update.
-- **`text_content`** _(string, required)_ The text content to insert into the document.
-
----
-
-## Google.CreateBlankDocument
-
-<br />
-<TabbedCodeBlock
-  tabs={[
-    {
-      label: "Call the Tool with User Authorization",
-      content: {
-        Python: [
-          "/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.py",
-        ],
-        JavaScript: ["/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.js"],
-      },
-    }
-  ]}
-/>
-
-Create a blank Google Docs document with the specified title.
-
-**Parameters**
-
-- **`title`** _(string, required)_ The title of the blank document to create.
-
----
-
-## Google.CreateDocumentFromText
-
-<br />
-<TabbedCodeBlock
-  tabs={[
-    {
-      label: "Call the Tool with User Authorization",
-      content: {
-        Python: [
-          "/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.py",
-        ],
-        JavaScript: ["/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.js"],
-      },
-    }
-  ]}
-/>
-
-Create a Google Docs document with the specified title and text content.
-
-**Parameters**
-
-- **`title`** _(string, required)_ The title of the document to create.
-- **`text_content`** _(string, required)_ The text content to insert into the document.
-
-## Auth
-
-The Arcade Docs toolkit uses the [Google auth provider](/home/auth-providers/google) to connect to users' Google accounts.
-
-With the hosted Arcade Engine, there's nothing to configure. Your users will see `Arcade` as the name of the application that's requesting permission.
-
-With a self-hosted installation of Arcade, you need to [configure the Google auth provider](/home/auth-providers/google#configuring-google-auth) with your own Google app credentials.
-
-<ToolFooter pipPackageName="arcade_google" />
diff --git a/pages/toolkits/productivity/google/drive.mdx b/pages/toolkits/productivity/google/drive.mdx
deleted file mode 100644
index 86a545fb9..000000000
--- a/pages/toolkits/productivity/google/drive.mdx
+++ /dev/null
@@ -1,171 +0,0 @@
-# Drive
-
-import ToolInfo from "@/components/ToolInfo";
-import Badges from "@/components/Badges";
-import TabbedCodeBlock from "@/components/TabbedCodeBlock";
-import TableOfContents from "@/components/TableOfContents";
-import ToolFooter from "@/components/ToolFooter";
-
-<ToolInfo
-  description="Enable agents to interact with Google Drive."
-  author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google"
-  authType="oauth2"
-  authProviderName="Google"
-  versions={["0.1.0"]}
-/>
-
-
-<Badges repo="arcadeai/arcade_google" />
-
-The Arcade Drive toolkit provides a pre-built set of tools for interacting with Google Drive. These tools make it easy to build agents and AI apps that can:
-
-- Search Google documents in the user's Google Drive
-- Search and retrieve the contents of Google documents in the user's Google Drive
-
-## Available Tools
-
-These tools are currently available in the Arcade Drive toolkit.
-
-<TableOfContents
-  headers={["Tool Name", "Description"]}
-  data={[
-    ["Google.SearchDocuments", "Search for documents in the user's Google Drive. Note: This tool currently requires a self-hosted instance of Arcade."],
-    ["Google.SearchAndRetrieveDocuments", "Search and retrieve the contents of Google documents in the user's Google Drive. Note: This tool currently requires a self-hosted instance of Arcade."],
-    ["Google.GetFileTreeStructure", "Get the file/folder tree structure of the user's Google Drive."],
-    ["Google.GenerateGoogleFilePickerUrl", "Generate a Google File Picker URL for user-driven file selection and authorization"],
-  ]}
-/>
-
-<Tip>
-  If you need to perform an action that's not listed here, you can [get in touch
-  with us](mailto:contact@arcade.dev) to request a new tool, or [create your
-  own tools](/home/build-tools/create-a-toolkit) with the [Google auth
-  provider](/home/auth-providers/google#using-google-auth-in-custom-tools).
-</Tip>
-
-## Google.SearchDocuments
-
-<br />
-<TabbedCodeBlock
-  tabs={[
-    {
-      label: "Call the Tool with User Authorization",
-      content: {
-        Python: [
-          "/examples/integrations/toolkits/google/drive/search_documents_example_call_tool.py",
-        ],
-        JavaScript: ["/examples/integrations/toolkits/google/drive/search_documents_example_call_tool.js"],
-      },
-    }
-  ]}
-/>
-
-Search Google documents in the user's Google Drive. Excludes documents that are in the trash.
-
-**Parameters**
-
-- **`document_contains`** _(list[str], optional)_ Keywords or phrases that must be in the document title or body. Provide a list of keywords or phrases if needed.
-- **`document_not_contains`** _(list[str], optional)_ Keywords or phrases that must not be in the document title or body. Provide a list of keywords or phrases if needed.
-- **`search_only_in_shared_drive_id`** _(str, optional)_ The ID of the shared drive to restrict the search to. If provided, the search will only return documents from this drive. Defaults to None, which searches across all drives.
-- **`include_shared_drives`** _(bool, optional)_ Whether to include documents from shared drives in the search results. Defaults to False (searches only in the user's 'My Drive').
-- **`include_organization_domain_documents`** _(bool, optional)_ Whether to include documents from the organization's domain. This is applicable to admin users who have permissions to view organization-wide documents in a Google Workspace account. Defaults to False.
-- **`order_by`** _(enum ([OrderBy](/toolkits/productivity/google/reference#orderby)), optional)_ Sort order. Defaults to listing the most recently modified documents first.
-- **`limit`** _(int, optional)_ The number of documents to list. Defaults to `50`.
-- **`pagination_token`** _(str, optional)_ The pagination token to continue a previous request
-
-## Google.SearchAndRetrieveDocuments
-
-<br />
-<TabbedCodeBlock
-  tabs={[
-    {
-      label: "Call the Tool with User Authorization",
-      content: {
-        Python: [
-          "/examples/integrations/toolkits/google/drive/search_and_retrieve_documents_example_call_tool.py",
-        ],
-        JavaScript: ["/examples/integrations/toolkits/google/drive/search_and_retrieve_documents_example_call_tool.js"],
-      },
-    }
-  ]}
-/>
-
-Searches for documents in the user's Google Drive and returns a list of documents (with text content) matching the search criteria. Excludes documents that are in the trash.
-
-**Parameters**
-
-- **`document_format`** _(enum ([DocumentFormat](/toolkits/productivity/google/reference#documentformat)), optional)_ The format of the document to be returned. Defaults to Markdown.
-- **`document_contains`** _(list[str], optional)_ Keywords or phrases that must be in the document title or body. Provide a list of keywords or phrases if needed.
-- **`document_not_contains`** _(list[str], optional)_ Keywords or phrases that must not be in the document title or body. Provide a list of keywords or phrases if needed.
-- **`search_only_in_shared_drive_id`** _(str, optional)_ The ID of the shared drive to restrict the search to. If provided, the search will only return documents from this drive. Defaults to None, which searches across all drives.
-- **`include_shared_drives`** _(bool, optional)_ Whether to include documents from shared drives in the search results. Defaults to False (searches only in the user's 'My Drive').
-- **`include_organization_domain_documents`** _(bool, optional)_ Whether to include documents from the organization's domain. This is applicable to admin users who have permissions to view organization-wide documents in a Google Workspace account. Defaults to False.
-- **`order_by`** _(enum ([OrderBy](/toolkits/productivity/google/reference#orderby)), optional)_ Sort order. Defaults to listing the most recently modified documents first.
-- **`limit`** _(int, optional)_ The number of documents to list. Defaults to `50`.
-- **`pagination_token`** _(str, optional)_ The pagination token to continue a previous request
-
-## Google.GetFileTreeStructure
-
-<br />
-<TabbedCodeBlock
-  tabs={[
-    {
-      label: "Call the Tool with User Authorization",
-      content: {
-        Python: [
-          "/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.py",
-        ],
-        JavaScript: ["/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.js"],
-      },
-    }
-  ]}
-/>
-
-Get the file/folder tree structure of the user's Google Drive.
-
-**Parameters**
-
-- **`include_shared_drives`** _(bool, optional)_ Whether to include shared drives in the file tree structure. Defaults to False.
-- **`restrict_to_shared_drive_id`** _(str, optional)_ If provided, only include files from this shared drive in the file tree structure. Defaults to None, which will include files and folders from all drives.
-- **`include_organization_domain_documents`** _(bool, optional)_ Whether to include documents from the organization's domain. This is applicable to admin users who have permissions to view organization-wide documents in a Google Workspace account. Defaults to False.
-- **`order_by`** _(enum ([OrderBy](/toolkits/productivity/google/reference#orderby)), optional)_ Sort order. Defaults to listing the most recently modified documents first.
-- **`limit`** _(int, optional)_ The number of files and folders to list. Defaults to None, which will list all files and folders.
-
-## Google.GenerateGoogleFilePickerUrl
-
-<br />
-<TabbedCodeBlock
-  tabs={[
-    {
-      label: "Call the Tool with User Authorization",
-      content: {
-        Python: [
-          "/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.py",
-        ],
-        JavaScript: ["/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.js"],
-      },
-    }
-  ]}
-/>
-
-Generate a Google File Picker URL for user-driven file selection and authorization.
-
-This tool generates a URL that directs the end-user to a Google File Picker interface where
-where they can select or upload Google Drive files. Users can grant permission to access their
-Drive files, providing a secure and authorized way to interact with their files.
-
-This is particularly useful when prior tools (e.g., those accessing or modifying
-Google Docs, Google Sheets, etc.) encountered failures due to file non-existence
-(Requested entity was not found) or permission errors. Once the user completes the file
-picker flow, the prior tool can be retried.
-
-## Auth
-
-The Arcade Drive toolkit uses the [Google auth provider](/home/auth-providers/google) to connect to users' Google accounts.
-
-With the hosted Arcade Engine, there's nothing to configure. Your users will see `Arcade` as the name of the application that's requesting permission.
-
-With a self-hosted installation of Arcade, you need to [configure the Google auth provider](/home/auth-providers/google#configuring-google-auth) with your own Google app credentials.
-
-<ToolFooter pipPackageName="arcade_google" />
\ No newline at end of file
diff --git a/pages/toolkits/productivity/google/reference.mdx b/pages/toolkits/productivity/google/reference.mdx
deleted file mode 100644
index 59ec9afb4..000000000
--- a/pages/toolkits/productivity/google/reference.mdx
+++ /dev/null
@@ -1,198 +0,0 @@
-# Reference for Google Toolkit
-
-## OrderBy
-
-Sort keys for ordering files in Google Drive. Each key has both ascending and descending options.
-
-- **`CREATED_TIME`**: When the file was created (ascending).
-- **`CREATED_TIME_DESC`**: When the file was created (descending).
-- **`FOLDER`**: The folder ID, sorted using alphabetical ordering (ascending).
-- **`FOLDER_DESC`**: The folder ID, sorted using alphabetical ordering (descending).
-- **`MODIFIED_BY_ME_TIME`**: The last time the file was modified by the user (ascending).
-- **`MODIFIED_BY_ME_TIME_DESC`**: The last time the file was modified by the user (descending).
-- **`MODIFIED_TIME`**: The last time the file was modified by anyone (ascending).
-- **`MODIFIED_TIME_DESC`**: The last time the file was modified by anyone (descending).
-- **`NAME`**: The name of the file, sorted using alphabetical ordering (ascending).
-- **`NAME_DESC`**: The name of the file, sorted using alphabetical ordering (descending).
-- **`NAME_NATURAL`**: The name of the file, sorted using natural sort ordering (ascending).
-- **`NAME_NATURAL_DESC`**: The name of the file, sorted using natural sort ordering (descending).
-- **`QUOTA_BYTES_USED`**: The number of storage quota bytes used by the file (ascending).
-- **`QUOTA_BYTES_USED_DESC`**: The number of storage quota bytes used by the file (descending).
-- **`RECENCY`**: The most recent timestamp from the file's date-time fields (ascending).
-- **`RECENCY_DESC`**: The most recent timestamp from the file's date-time fields (descending).
-- **`SHARED_WITH_ME_TIME`**: When the file was shared with the user, if applicable (ascending).
-- **`SHARED_WITH_ME_TIME_DESC`**: When the file was shared with the user, if applicable (descending).
-- **`STARRED`**: Whether the user has starred the file (ascending).
-- **`STARRED_DESC`**: Whether the user has starred the file (descending).
-- **`VIEWED_BY_ME_TIME`**: The last time the file was viewed by the user (ascending).
-- **`VIEWED_BY_ME_TIME_DESC`**: The last time the file was viewed by the user (descending).
-
-## DocumentFormat
-
-The format of the document to be returned.
-
-- **`MARKDOWN`**: Markdown format.
-- **`HTML`**: HTML format.
-- **`GOOGLE_API_JSON`**: Original JSON format returned by the Google API.
-
-## DateRange
-
-Represents different date ranges for filtering events.
-
-- **`TODAY`**: Today.
-- **`TOMORROW`**: Tomorrow.
-- **`THIS_WEEK`**: This week.
-- **`NEXT_WEEK`**: Next week.
-- **`THIS_MONTH`**: This month.
-- **`NEXT_MONTH`**: Next month.
-
-## Day
-
-Represents specific days for scheduling.
-
-- **`YESTERDAY`**: Yesterday.
-- **`TODAY`**: Today.
-- **`TOMORROW`**: Tomorrow.
-- **`THIS_SUNDAY`**: This Sunday.
-- **`THIS_MONDAY`**: This Monday.
-- **`THIS_TUESDAY`**: This Tuesday.
-- **`THIS_WEDNESDAY`**: This Wednesday.
-- **`THIS_THURSDAY`**: This Thursday.
-- **`THIS_FRIDAY`**: This Friday.
-- **`THIS_SATURDAY`**: This Saturday.
-- **`NEXT_SUNDAY`**: Next Sunday.
-- **`NEXT_MONDAY`**: Next Monday.
-- **`NEXT_TUESDAY`**: Next Tuesday.
-- **`NEXT_WEDNESDAY`**: Next Wednesday.
-- **`NEXT_THURSDAY`**: Next Thursday.
-- **`NEXT_FRIDAY`**: Next Friday.
-- **`NEXT_SATURDAY`**: Next Saturday.
-
-## TimeSlot
-
-Represents time slots in a day.
-
-- **`_0000`**: 00:00
-- **`_0015`**: 00:15
-- **`_0030`**: 00:30
-- **`_0045`**: 00:45
-- **`_0100`**: 01:00
-- **`_0115`**: 01:15
-- **`_0130`**: 01:30
-- **`_0145`**: 01:45
-- **`_0200`**: 02:00
-- **`_0215`**: 02:15
-- **`_0230`**: 02:30
-- **`_0245`**: 02:45
-- **`_0300`**: 03:00
-- **`_0315`**: 03:15
-- **`_0330`**: 03:30
-- **`_0345`**: 03:45
-- **`_0400`**: 04:00
-- **`_0415`**: 04:15
-- **`_0430`**: 04:30
-- **`_0445`**: 04:45
-- **`_0500`**: 05:00
-- **`_0515`**: 05:15
-- **`_0530`**: 05:30
-- **`_0545`**: 05:45
-- **`_0600`**: 06:00
-- **`_0615`**: 06:15
-- **`_0630`**: 06:30
-- **`_0645`**: 06:45
-- **`_0700`**: 07:00
-- **`_0715`**: 07:15
-- **`_0730`**: 07:30
-- **`_0745`**: 07:45
-- **`_0800`**: 08:00
-- **`_0815`**: 08:15
-- **`_0830`**: 08:30
-- **`_0845`**: 08:45
-- **`_0900`**: 09:00
-- **`_0915`**: 09:15
-- **`_0930`**: 09:30
-- **`_0945`**: 09:45
-- **`_1000`**: 10:00
-- **`_1015`**: 10:15
-- **`_1030`**: 10:30
-- **`_1045`**: 10:45
-- **`_1100`**: 11:00
-- **`_1115`**: 11:15
-- **`_1130`**: 11:30
-- **`_1145`**: 11:45
-- **`_1200`**: 12:00
-- **`_1215`**: 12:15
-- **`_1230`**: 12:30
-- **`_1245`**: 12:45
-- **`_1300`**: 13:00
-- **`_1315`**: 13:15
-- **`_1330`**: 13:30
-- **`_1345`**: 13:45
-- **`_1400`**: 14:00
-- **`_1415`**: 14:15
-- **`_1430`**: 14:30
-- **`_1445`**: 14:45
-- **`_1500`**: 15:00
-- **`_1515`**: 15:15
-- **`_1530`**: 15:30
-- **`_1545`**: 15:45
-- **`_1600`**: 16:00
-- **`_1615`**: 16:15
-- **`_1630`**: 16:30
-- **`_1645`**: 16:45
-- **`_1700`**: 17:00
-- **`_1715`**: 17:15
-- **`_1730`**: 17:30
-- **`_1745`**: 17:45
-- **`_1800`**: 18:00
-- **`_1815`**: 18:15
-- **`_1830`**: 18:30
-- **`_1845`**: 18:45
-- **`_1900`**: 19:00
-- **`_1915`**: 19:15
-- **`_1930`**: 19:30
-- **`_1945`**: 19:45
-- **`_2000`**: 20:00
-- **`_2015`**: 20:15
-- **`_2030`**: 20:30
-- **`_2045`**: 20:45
-- **`_2100`**: 21:00
-- **`_2115`**: 21:15
-- **`_2130`**: 21:30
-- **`_2145`**: 21:45
-- **`_2200`**: 22:00
-- **`_2215`**: 22:15
-- **`_2230`**: 22:30
-- **`_2245`**: 22:45
-- **`_2300`**: 23:00
-- **`_2315`**: 23:15
-- **`_2330`**: 23:30
-- **`_2345`**: 23:45
-
-## EventVisibility
-
-Defines the visibility of an event.
-
-- **`DEFAULT`**: Default visibility.
-- **`PUBLIC`**: Public visibility.
-- **`PRIVATE`**: Private visibility.
-- **`CONFIDENTIAL`**: Confidential visibility.
-
-## EventType
-
-Specifies the type of an event.
-
-- **`BIRTHDAY`**: Birthday events.
-- **`DEFAULT`**: Regular events.
-- **`FOCUS_TIME`**: Focus time events.
-- **`FROM_GMAIL`**: Events from Gmail.
-- **`OUT_OF_OFFICE`**: Out of office events.
-- **`WORKING_LOCATION`**: Working location events.
-
-## SendUpdatesOptions
-
-Options for sending updates about events.
-
-- **`NONE`**: No notifications are sent.
-- **`ALL`**: Notifications are sent to all guests.
-- **`EXTERNAL_ONLY`**: Notifications are sent to non-Google Calendar guests only.
diff --git a/pages/toolkits/productivity/google/calendar.mdx b/pages/toolkits/productivity/google_calendar.mdx
similarity index 79%
rename from pages/toolkits/productivity/google/calendar.mdx
rename to pages/toolkits/productivity/google_calendar.mdx
index 2f169be0f..f150edf68 100644
--- a/pages/toolkits/productivity/google/calendar.mdx
+++ b/pages/toolkits/productivity/google_calendar.mdx
@@ -1,4 +1,4 @@
-# Calendar
+# Google Calendar
 
 import ToolInfo from "@/components/ToolInfo";
 import Badges from "@/components/Badges";
@@ -9,31 +9,31 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to interact with Google Calendar events."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_calendar"
   authType="oauth2"
   authProviderName="Google"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_google" />
+<Badges repo="arcadeai/arcade_google_calendar" />
 
-The Arcade Calendar toolkit provides a pre-built set of tools for interacting with Google Calendar. These tools make it easy to build agents and AI apps that can:
+The Arcade Google Calendar toolkit provides a pre-built set of tools for interacting with Google Calendar. These tools make it easy to build agents and AI apps that can:
 
 - Create, update, list, and delete events
 
 ## Available Tools
 
-These tools are currently available in the Arcade Calendar toolkit.
+These tools are currently available in the Arcade Google Calendar toolkit.
 
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["Google.ListCalendars", "List the calendars that the user can see."],
-    ["Google.CreateEvent", "Create a new event in Google Calendar."],
-    ["Google.ListEvents", "List events from Google Calendar."],
-    ["Google.UpdateEvent", "Update an existing event in Google Calendar."],
-    ["Google.DeleteEvent", "Delete an event from Google Calendar."],
-    ["Google.FindTimeSlotsWhenEveryoneIsFree", "Provides time slots when everyone is free within a given date range and time boundaries."],
+    ["GoogleCalendar.ListCalendars", "List the calendars that the user can see."],
+    ["GoogleCalendar.CreateEvent", "Create a new event in Google Calendar."],
+    ["GoogleCalendar.ListEvents", "List events from Google Calendar."],
+    ["GoogleCalendar.UpdateEvent", "Update an existing event in Google Calendar."],
+    ["GoogleCalendar.DeleteEvent", "Delete an event from Google Calendar."],
+    ["GoogleCalendar.FindTimeSlotsWhenEveryoneIsFree", "Provides time slots when everyone is free within a given date range and time boundaries."],
   ]}
 />
 
@@ -44,7 +44,7 @@ These tools are currently available in the Arcade Calendar toolkit.
   provider](/home/auth-providers/google#using-google-auth-in-custom-tools).
 </Tip>
 
-## Google.ListCalendars
+## GoogleCalendar.ListCalendars
 
 <br />
 <TabbedCodeBlock
@@ -72,7 +72,7 @@ List the calendars that the user can access.
 
 ---
 
-## Google.CreateEvent
+## GoogleCalendar.CreateEvent
 
 <br />
 <TabbedCodeBlock
@@ -104,7 +104,7 @@ Create a new event in the specified calendar.
 
 ---
 
-## Google.ListEvents
+## GoogleCalendar.ListEvents
 
 <br />
 <TabbedCodeBlock
@@ -139,7 +139,7 @@ For example: If min_end_datetime is set to 2024-09-15T09:00:00 and max_start_dat
 
 ---
 
-## Google.UpdateEvent
+## GoogleCalendar.UpdateEvent
 
 <br />
 <TabbedCodeBlock
@@ -169,14 +169,14 @@ Update an existing event in the specified calendar with the provided details. On
 - **`updated_summary`** _(string, optional)_ The updated title of the event
 - **`updated_description`** _(string, optional)_ The updated description of the event
 - **`updated_location`** _(string, optional)_ The updated location of the event
-- **`updated_visibility`** _(enum ([EventVisibility](/toolkits/productivity/google/reference#eventvisibility)), optional)_ The visibility of the event
+- **`updated_visibility`** _(enum ([EventVisibility](#eventvisibility)), optional)_ The visibility of the event
 - **`attendee_emails_to_add`** _(array, optional)_ The list of attendee emails to add. Must be valid email addresses e.g., `username@domain.com`.
 - **`attendee_emails_to_remove`** _(array, optional)_ The list of attendee emails to remove. Must be valid email addresses e.g., `username@domain.com`.
-- **`send_updates`** _(enum ([SendUpdatesOptions](/toolkits/productivity/google/reference#sendupdatesoptions)), optional, Defaults to `'all'`)_ Should attendees be notified of the update? (none, all, external_only)
+- **`send_updates`** _(enum ([SendUpdatesOptions](#sendupdatesoptions)), optional, Defaults to `'all'`)_ Should attendees be notified of the update? (none, all, external_only)
 
 ---
 
-## Google.DeleteEvent
+## GoogleCalendar.DeleteEvent
 
 <br />
 <TabbedCodeBlock
@@ -199,9 +199,9 @@ Delete an event from Google Calendar.
 
 - **`event_id`** _(string, required)_ The ID of the event to delete
 - **`calendar_id`** _(string, optional, Defaults to `'primary'`)_ The ID of the calendar containing the event
-- **`send_updates`** _(enum ([SendUpdatesOptions](/toolkits/productivity/google/reference#sendupdatesoptions)), optional, Defaults to `'all'`)_ Specifies which attendees to notify about the deletion
+- **`send_updates`** _(enum ([SendUpdatesOptions](#sendupdatesoptions)), optional, Defaults to `'all'`)_ Specifies which attendees to notify about the deletion
 
-## Google.FindTimeSlotsWhenEveryoneIsFree
+## GoogleCalendar.FindTimeSlotsWhenEveryoneIsFree
 
 <br />
 <TabbedCodeBlock
@@ -232,10 +232,31 @@ Provides time slots when everyone is free within a given date range and time bou
 
 ## Auth
 
-The Arcade Calendar toolkit uses the [Google auth provider](/home/auth-providers/google) to connect to users' Google accounts.
+The Arcade Google Calendar toolkit uses the [Google auth provider](/home/auth-providers/google) to connect to users' Google accounts.
 
 With the hosted Arcade Engine, there's nothing to configure. Your users will see `Arcade` as the name of the application that's requesting permission.
 
 With a self-hosted installation of Arcade, you need to [configure the Google auth provider](/home/auth-providers/google#configuring-google-auth) with your own Google app credentials.
 
-<ToolFooter pipPackageName="arcade_google" />
\ No newline at end of file
+---
+
+## Reference
+
+### EventVisibility
+
+Defines the visibility of an event.
+
+- **`DEFAULT`**: Default visibility.
+- **`PUBLIC`**: Public visibility.
+- **`PRIVATE`**: Private visibility.
+- **`CONFIDENTIAL`**: Confidential visibility.
+
+### SendUpdatesOptions
+
+Options for sending updates about events.
+
+- **`NONE`**: No notifications are sent.
+- **`ALL`**: Notifications are sent to all guests.
+- **`EXTERNAL_ONLY`**: Notifications are sent to non-Google Calendar guests only.
+
+<ToolFooter pipPackageName="arcade_google_calendar" />
diff --git a/pages/toolkits/productivity/google/contacts.mdx b/pages/toolkits/productivity/google_contacts.mdx
similarity index 78%
rename from pages/toolkits/productivity/google/contacts.mdx
rename to pages/toolkits/productivity/google_contacts.mdx
index 7f90928b2..56e16f153 100644
--- a/pages/toolkits/productivity/google/contacts.mdx
+++ b/pages/toolkits/productivity/google_contacts.mdx
@@ -1,4 +1,4 @@
-# Calendar
+# Google Contacts
 
 import ToolInfo from "@/components/ToolInfo";
 import Badges from "@/components/Badges";
@@ -9,29 +9,29 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to interact with Google Contacts."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_contacts"
   authType="oauth2"
   authProviderName="Google"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_google" />
+<Badges repo="arcadeai/arcade_google_contacts" />
 
-The Arcade Contacts toolkit provides a pre-built set of tools for interacting with Google Contacts. These tools make it easy to build agents and AI apps that can:
+The Arcade Google Contacts toolkit provides a pre-built set of tools for interacting with Google Contacts. These tools make it easy to build agents and AI apps that can:
 
 - Create new contacts
 - Search for contacts by name or email
 
 ## Available Tools
 
-These tools are currently available in the Arcade Contacts toolkit.
+These tools are currently available in the Arcade Google Contacts toolkit.
 
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["Google.SearchContactsByEmail", "Search the user's contacts in Google Contacts by email address."],
-    ["Google.SearchContactsByName", "Search the user's contacts in Google Contacts by name."],
-    ["Google.CreateContact", "Create a new contact record in Google Contacts."],
+    ["GoogleContacts.SearchContactsByEmail", "Search the user's contacts in Google Contacts by email address."],
+    ["GoogleContacts.SearchContactsByName", "Search the user's contacts in Google Contacts by name."],
+    ["GoogleContacts.CreateContact", "Create a new contact record in Google Contacts."],
   ]}
 />
 
@@ -42,7 +42,7 @@ These tools are currently available in the Arcade Contacts toolkit.
   provider](/home/auth-providers/google#using-google-auth-in-custom-tools).
 </Tip>
 
-## Google.SearchContactsByEmail
+## GoogleContacts.SearchContactsByEmail
 
 Search the user's contacts in Google Contacts by email address.
 
@@ -69,7 +69,7 @@ Search the user's contacts in Google Contacts by email address.
 
 ---
 
-## Google.SearchContactsByName
+## GoogleContacts.SearchContactsByName
 
 Search the user's contacts in Google Contacts by name.
 
@@ -96,7 +96,7 @@ Search the user's contacts in Google Contacts by name.
 
 ---
 
-## Google.CreateContact
+## GoogleContacts.CreateContact
 
 Create a new contact record in Google Contacts.
 
@@ -127,10 +127,10 @@ Create a new contact record in Google Contacts.
 
 ## Auth
 
-The Arcade Contacts toolkit uses the [Google auth provider](/home/auth-providers/google) to connect to users' Google accounts.
+The Arcade Google Contacts toolkit uses the [Google auth provider](/home/auth-providers/google) to connect to users' Google accounts.
 
 With the hosted Arcade Engine, there's nothing to configure. Your users will see `Arcade` as the name of the application that's requesting permission.
 
 With a self-hosted installation of Arcade, you need to [configure the Google auth provider](/home/auth-providers/google#configuring-google-auth) with your own Google app credentials.
 
-<ToolFooter pipPackageName="arcade_google" />
\ No newline at end of file
+<ToolFooter pipPackageName="arcade_google_contacts" />
diff --git a/pages/toolkits/productivity/google_docs.mdx b/pages/toolkits/productivity/google_docs.mdx
new file mode 100644
index 000000000..b42b18195
--- /dev/null
+++ b/pages/toolkits/productivity/google_docs.mdx
@@ -0,0 +1,261 @@
+# Google Docs
+
+import ToolInfo from "@/components/ToolInfo";
+import Badges from "@/components/Badges";
+import TabbedCodeBlock from "@/components/TabbedCodeBlock";
+import TableOfContents from "@/components/TableOfContents";
+import ToolFooter from "@/components/ToolFooter";
+
+<ToolInfo
+  description="Enable agents to interact with Google Docs documents."
+  author="Arcade"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_docs"
+  authType="oauth2"
+  authProviderName="Google"
+  versions={["0.1.0"]}
+/>
+
+<Warning>
+  This Toolkit is not available in Arcade Cloud. You can use these tools with a [self-hosted](/home/local-deployment/install/overview) instance of Arcade.
+</Warning>
+
+<Badges repo="arcadeai/arcade_google_docs" />
+
+The Arcade Google Docs toolkit provides a pre-built set of tools for interacting with Google Docs. These tools make it easy to build agents and AI apps that can:
+
+- Create, update, list, and delete documents
+
+## Available Tools
+
+These tools are currently available in the Arcade Google Docs toolkit.
+
+<TableOfContents
+  headers={["Tool Name", "Description"]}
+  data={[
+    ["GoogleDocs.GetDocumentById", "Retrieve a Google Docs document by ID. Note: This tool currently requires a self-hosted instance of Arcade.", ],
+    ["GoogleDocs.InsertTextAtEndOfDocument", "Insert text at the end of a Google Docs document. Note: This tool currently requires a self-hosted instance of Arcade.", ],
+    ["GoogleDocs.CreateBlankDocument", "Create a new blank Google Docs document with a title. Note: This tool currently requires a self-hosted instance of Arcade.", ],
+    ["GoogleDocs.CreateDocumentFromText", "Create a new Google Docs document with specified text content. Note: This tool currently requires a self-hosted instance of Arcade.", ],
+    ["GoogleDocs.SearchDocuments", "Search for documents in the user's Google Drive. Note: This tool currently requires a self-hosted instance of Arcade."],
+    ["GoogleDocs.SearchAndRetrieveDocuments", "Search and retrieve the contents of Google documents in the user's Google Drive. Note: This tool currently requires a self-hosted instance of Arcade."],
+  ]}
+/>
+
+<Tip>
+  If you need to perform an action that's not listed here, you can [get in touch
+  with us](mailto:contact@arcade.dev) to request a new tool, or [create your
+  own tools](/home/build-tools/create-a-toolkit) with the [Google auth
+  provider](/home/auth-providers/google#using-google-auth-in-custom-tools).
+</Tip>
+
+## GoogleDocs.GetDocumentById
+
+<br />
+<TabbedCodeBlock
+  tabs={[
+    {
+      label: "Call the Tool with User Authorization",
+      content: {
+        Python: [
+          "/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.py",
+        ],
+        JavaScript: ["/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.js"],
+      },
+    }
+  ]}
+/>
+
+Get the latest version of the specified Google Docs document.
+
+**Parameters**
+
+- **`document_id`** _(string, required)_ The ID of the document to retrieve.
+
+---
+
+## GoogleDocs.InsertTextAtEndOfDocument
+
+<br />
+<TabbedCodeBlock
+  tabs={[
+    {
+      label: "Call the Tool with User Authorization",
+      content: {
+        Python: [
+          "/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.py",
+        ],
+        JavaScript: ["/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.js"],
+      },
+    }
+  ]}
+/>
+
+Insert text at the end of an existing Google Docs document.
+
+**Parameters**
+
+- **`document_id`** _(string, required)_ The ID of the document to update.
+- **`text_content`** _(string, required)_ The text content to insert into the document.
+
+---
+
+## GoogleDocs.CreateBlankDocument
+
+<br />
+<TabbedCodeBlock
+  tabs={[
+    {
+      label: "Call the Tool with User Authorization",
+      content: {
+        Python: [
+          "/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.py",
+        ],
+        JavaScript: ["/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.js"],
+      },
+    }
+  ]}
+/>
+
+Create a blank Google Docs document with the specified title.
+
+**Parameters**
+
+- **`title`** _(string, required)_ The title of the blank document to create.
+
+---
+
+## GoogleDocs.CreateDocumentFromText
+
+<br />
+<TabbedCodeBlock
+  tabs={[
+    {
+      label: "Call the Tool with User Authorization",
+      content: {
+        Python: [
+          "/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.py",
+        ],
+        JavaScript: ["/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.js"],
+      },
+    }
+  ]}
+/>
+
+Create a Google Docs document with the specified title and text content.
+
+**Parameters**
+
+- **`title`** _(string, required)_ The title of the document to create.
+- **`text_content`** _(string, required)_ The text content to insert into the document.
+
+---
+
+## GoogleDocs.SearchDocuments
+
+<br />
+<TabbedCodeBlock
+  tabs={[
+    {
+      label: "Call the Tool with User Authorization",
+      content: {
+        Python: [
+          "/examples/integrations/toolkits/google/docs/search_documents_example_call_tool.py",
+        ],
+        JavaScript: ["/examples/integrations/toolkits/google/docs/search_documents_example_call_tool.js"],
+      },
+    }
+  ]}
+/>
+
+Search Google documents in the user's Google Drive. Excludes documents that are in the trash.
+
+**Parameters**
+
+- **`document_contains`** _(list[str], optional)_ Keywords or phrases that must be in the document title or body. Provide a list of keywords or phrases if needed.
+- **`document_not_contains`** _(list[str], optional)_ Keywords or phrases that must not be in the document title or body. Provide a list of keywords or phrases if needed.
+- **`search_only_in_shared_drive_id`** _(str, optional)_ The ID of the shared drive to restrict the search to. If provided, the search will only return documents from this drive. Defaults to None, which searches across all drives.
+- **`include_shared_drives`** _(bool, optional)_ Whether to include documents from shared drives in the search results. Defaults to False (searches only in the user's 'My Drive').
+- **`include_organization_domain_documents`** _(bool, optional)_ Whether to include documents from the organization's domain. This is applicable to admin users who have permissions to view organization-wide documents in a Google Workspace account. Defaults to False.
+- **`order_by`** _(enum ([OrderBy](#orderby)), optional)_ Sort order. Defaults to listing the most recently modified documents first.
+- **`limit`** _(int, optional)_ The number of documents to list. Defaults to `50`.
+- **`pagination_token`** _(str, optional)_ The pagination token to continue a previous request
+
+## GoogleDrive.SearchAndRetrieveDocuments
+
+<br />
+<TabbedCodeBlock
+  tabs={[
+    {
+      label: "Call the Tool with User Authorization",
+      content: {
+        Python: [
+          "/examples/integrations/toolkits/google/docs/search_and_retrieve_documents_example_call_tool.py",
+        ],
+        JavaScript: ["/examples/integrations/toolkits/google/docs/search_and_retrieve_documents_example_call_tool.js"],
+      },
+    }
+  ]}
+/>
+
+Searches for documents in the user's Google Drive and returns a list of documents (with text content) matching the search criteria. Excludes documents that are in the trash.
+
+**Parameters**
+
+- **`document_format`** _(enum ([DocumentFormat](#documentformat)), optional)_ The format of the document to be returned. Defaults to Markdown.
+- **`document_contains`** _(list[str], optional)_ Keywords or phrases that must be in the document title or body. Provide a list of keywords or phrases if needed.
+- **`document_not_contains`** _(list[str], optional)_ Keywords or phrases that must not be in the document title or body. Provide a list of keywords or phrases if needed.
+- **`search_only_in_shared_drive_id`** _(str, optional)_ The ID of the shared drive to restrict the search to. If provided, the search will only return documents from this drive. Defaults to None, which searches across all drives.
+- **`include_shared_drives`** _(bool, optional)_ Whether to include documents from shared drives in the search results. Defaults to False (searches only in the user's 'My Drive').
+- **`include_organization_domain_documents`** _(bool, optional)_ Whether to include documents from the organization's domain. This is applicable to admin users who have permissions to view organization-wide documents in a Google Workspace account. Defaults to False.
+- **`order_by`** _(enum ([OrderBy](#orderby)), optional)_ Sort order. Defaults to listing the most recently modified documents first.
+- **`limit`** _(int, optional)_ The number of documents to list. Defaults to `50`.
+- **`pagination_token`** _(str, optional)_ The pagination token to continue a previous request
+
+## Auth
+
+The Arcade Docs toolkit uses the [Google auth provider](/home/auth-providers/google) to connect to users' Google accounts.
+
+With the hosted Arcade Engine, there's nothing to configure. Your users will see `Arcade` as the name of the application that's requesting permission.
+
+With a self-hosted installation of Arcade, you need to [configure the Google auth provider](/home/auth-providers/google#configuring-google-auth) with your own Google app credentials.
+
+---
+
+## Reference
+
+### DocumentFormat
+
+The format of the document to be returned.
+
+- **`MARKDOWN`**: Markdown format.
+- **`HTML`**: HTML format.
+- **`GOOGLE_API_JSON`**: Original JSON format returned by the Google API.
+
+### OrderBy
+
+Sort keys for ordering files in Google Drive. Each key has both ascending and descending options.
+
+- **`CREATED_TIME`**: When the file was created (ascending).
+- **`CREATED_TIME_DESC`**: When the file was created (descending).
+- **`FOLDER`**: The folder ID, sorted using alphabetical ordering (ascending).
+- **`FOLDER_DESC`**: The folder ID, sorted using alphabetical ordering (descending).
+- **`MODIFIED_BY_ME_TIME`**: The last time the file was modified by the user (ascending).
+- **`MODIFIED_BY_ME_TIME_DESC`**: The last time the file was modified by the user (descending).
+- **`MODIFIED_TIME`**: The last time the file was modified by anyone (ascending).
+- **`MODIFIED_TIME_DESC`**: The last time the file was modified by anyone (descending).
+- **`NAME`**: The name of the file, sorted using alphabetical ordering (ascending).
+- **`NAME_DESC`**: The name of the file, sorted using alphabetical ordering (descending).
+- **`NAME_NATURAL`**: The name of the file, sorted using natural sort ordering (ascending).
+- **`NAME_NATURAL_DESC`**: The name of the file, sorted using natural sort ordering (descending).
+- **`QUOTA_BYTES_USED`**: The number of storage quota bytes used by the file (ascending).
+- **`QUOTA_BYTES_USED_DESC`**: The number of storage quota bytes used by the file (descending).
+- **`RECENCY`**: The most recent timestamp from the file's date-time fields (ascending).
+- **`RECENCY_DESC`**: The most recent timestamp from the file's date-time fields (descending).
+- **`SHARED_WITH_ME_TIME`**: When the file was shared with the user, if applicable (ascending).
+- **`SHARED_WITH_ME_TIME_DESC`**: When the file was shared with the user, if applicable (descending).
+- **`STARRED`**: Whether the user has starred the file (ascending).
+- **`STARRED_DESC`**: Whether the user has starred the file (descending).
+- **`VIEWED_BY_ME_TIME`**: The last time the file was viewed by the user (ascending).
+- **`VIEWED_BY_ME_TIME_DESC`**: The last time the file was viewed by the user (descending).
+
+<ToolFooter pipPackageName="arcade_google_docs" />
diff --git a/pages/toolkits/productivity/google_drive.mdx b/pages/toolkits/productivity/google_drive.mdx
new file mode 100644
index 000000000..c14f8e31a
--- /dev/null
+++ b/pages/toolkits/productivity/google_drive.mdx
@@ -0,0 +1,139 @@
+# Google Drive
+
+import ToolInfo from "@/components/ToolInfo";
+import Badges from "@/components/Badges";
+import TabbedCodeBlock from "@/components/TabbedCodeBlock";
+import TableOfContents from "@/components/TableOfContents";
+import ToolFooter from "@/components/ToolFooter";
+
+<ToolInfo
+  description="Enable agents to interact with Google Drive."
+  author="Arcade"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_drive"
+  authType="oauth2"
+  authProviderName="Google"
+  versions={["0.1.0"]}
+/>
+
+
+<Badges repo="arcadeai/arcade_google_drive" />
+
+The Arcade Google Drive toolkit provides a pre-built set of tools for interacting with Google Drive. These tools make it easy to build agents and AI apps that can:
+
+- Search Google documents in the user's Google Drive
+- Search and retrieve the contents of Google documents in the user's Google Drive
+
+## Available Tools
+
+These tools are currently available in the Arcade Google Drive toolkit.
+
+<TableOfContents
+  headers={["Tool Name", "Description"]}
+  data={[
+    ["GoogleDrive.GetFileTreeStructure", "Get the file/folder tree structure of the user's Google Drive."],
+    ["GoogleDrive.GenerateGoogleFilePickerUrl", "Generate a Google File Picker URL for user-driven file selection and authorization"],
+  ]}
+/>
+
+<Tip>
+  If you need to perform an action that's not listed here, you can [get in touch
+  with us](mailto:contact@arcade.dev) to request a new tool, or [create your
+  own tools](/home/build-tools/create-a-toolkit) with the [Google auth
+  provider](/home/auth-providers/google#using-google-auth-in-custom-tools).
+</Tip>
+
+## GoogleDrive.GetFileTreeStructure
+
+<br />
+<TabbedCodeBlock
+  tabs={[
+    {
+      label: "Call the Tool with User Authorization",
+      content: {
+        Python: [
+          "/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.py",
+        ],
+        JavaScript: ["/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.js"],
+      },
+    }
+  ]}
+/>
+
+Get the file/folder tree structure of the user's Google Drive.
+
+**Parameters**
+
+- **`include_shared_drives`** _(bool, optional)_ Whether to include shared drives in the file tree structure. Defaults to False.
+- **`restrict_to_shared_drive_id`** _(str, optional)_ If provided, only include files from this shared drive in the file tree structure. Defaults to None, which will include files and folders from all drives.
+- **`include_organization_domain_documents`** _(bool, optional)_ Whether to include documents from the organization's domain. This is applicable to admin users who have permissions to view organization-wide documents in a Google Workspace account. Defaults to False.
+- **`order_by`** _(enum ([OrderBy](#orderby)), optional)_ Sort order. Defaults to listing the most recently modified documents first.
+- **`limit`** _(int, optional)_ The number of files and folders to list. Defaults to None, which will list all files and folders.
+
+## GoogleDrive.GenerateGoogleFilePickerUrl
+
+<br />
+<TabbedCodeBlock
+  tabs={[
+    {
+      label: "Call the Tool with User Authorization",
+      content: {
+        Python: [
+          "/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.py",
+        ],
+        JavaScript: ["/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.js"],
+      },
+    }
+  ]}
+/>
+
+Generate a Google File Picker URL for user-driven file selection and authorization.
+
+This tool generates a URL that directs the end-user to a Google File Picker interface where
+where they can select or upload Google Drive files. Users can grant permission to access their
+Drive files, providing a secure and authorized way to interact with their files.
+
+This is particularly useful when prior tools (e.g., those accessing or modifying
+Google Docs, Google Sheets, etc.) encountered failures due to file non-existence
+(Requested entity was not found) or permission errors. Once the user completes the file
+picker flow, the prior tool can be retried.
+
+## Auth
+
+The Arcade Google Drive toolkit uses the [Google auth provider](/home/auth-providers/google) to connect to users' Google accounts.
+
+With the hosted Arcade Engine, there's nothing to configure. Your users will see `Arcade` as the name of the application that's requesting permission.
+
+With a self-hosted installation of Arcade, you need to [configure the Google auth provider](/home/auth-providers/google#configuring-google-auth) with your own Google app credentials.
+
+---
+
+## Reference
+
+## OrderBy
+
+Sort keys for ordering files in Google Drive. Each key has both ascending and descending options.
+
+- **`CREATED_TIME`**: When the file was created (ascending).
+- **`CREATED_TIME_DESC`**: When the file was created (descending).
+- **`FOLDER`**: The folder ID, sorted using alphabetical ordering (ascending).
+- **`FOLDER_DESC`**: The folder ID, sorted using alphabetical ordering (descending).
+- **`MODIFIED_BY_ME_TIME`**: The last time the file was modified by the user (ascending).
+- **`MODIFIED_BY_ME_TIME_DESC`**: The last time the file was modified by the user (descending).
+- **`MODIFIED_TIME`**: The last time the file was modified by anyone (ascending).
+- **`MODIFIED_TIME_DESC`**: The last time the file was modified by anyone (descending).
+- **`NAME`**: The name of the file, sorted using alphabetical ordering (ascending).
+- **`NAME_DESC`**: The name of the file, sorted using alphabetical ordering (descending).
+- **`NAME_NATURAL`**: The name of the file, sorted using natural sort ordering (ascending).
+- **`NAME_NATURAL_DESC`**: The name of the file, sorted using natural sort ordering (descending).
+- **`QUOTA_BYTES_USED`**: The number of storage quota bytes used by the file (ascending).
+- **`QUOTA_BYTES_USED_DESC`**: The number of storage quota bytes used by the file (descending).
+- **`RECENCY`**: The most recent timestamp from the file's date-time fields (ascending).
+- **`RECENCY_DESC`**: The most recent timestamp from the file's date-time fields (descending).
+- **`SHARED_WITH_ME_TIME`**: When the file was shared with the user, if applicable (ascending).
+- **`SHARED_WITH_ME_TIME_DESC`**: When the file was shared with the user, if applicable (descending).
+- **`STARRED`**: Whether the user has starred the file (ascending).
+- **`STARRED_DESC`**: Whether the user has starred the file (descending).
+- **`VIEWED_BY_ME_TIME`**: The last time the file was viewed by the user (ascending).
+- **`VIEWED_BY_ME_TIME_DESC`**: The last time the file was viewed by the user (descending).
+
+<ToolFooter pipPackageName="arcade_google_drive" />
diff --git a/pages/toolkits/productivity/google/sheets.mdx b/pages/toolkits/productivity/google_sheets.mdx
similarity index 83%
rename from pages/toolkits/productivity/google/sheets.mdx
rename to pages/toolkits/productivity/google_sheets.mdx
index 4ca17df8e..24aa57fb4 100644
--- a/pages/toolkits/productivity/google/sheets.mdx
+++ b/pages/toolkits/productivity/google_sheets.mdx
@@ -9,13 +9,13 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to create, read, and update spreadsheets in Google Sheets."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_sheets"
   authType="oauth2"
   authProviderName="Google"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_google" />
+<Badges repo="arcadeai/arcade_google_sheets" />
 
 The Arcade Google Sheets toolkit provides pre-built tools for working with spreadsheets using the Google Sheets API. Use these tools to:
 
@@ -25,14 +25,14 @@ The Arcade Google Sheets toolkit provides pre-built tools for working with sprea
 
 ## Available Tools
 
-These tools are currently available in the Arcade Sheets toolkit.
+These tools are currently available in the Arcade Google Sheets toolkit.
 
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["Google.CreateSpreadsheet", "Create a new spreadsheet with a title and optional data."],
-    ["Google.GetSpreadsheet", "Retrieve spreadsheet properties and cell data for all sheets."],
-    ["Google.WriteToCell", "Write a value to a specific cell in a spreadsheet."],
+    ["GoogleSheets.CreateSpreadsheet", "Create a new spreadsheet with a title and optional data."],
+    ["GoogleSheets.GetSpreadsheet", "Retrieve spreadsheet properties and cell data for all sheets."],
+    ["GoogleSheets.WriteToCell", "Write a value to a specific cell in a spreadsheet."],
   ]}
 />
 
@@ -43,7 +43,7 @@ These tools are currently available in the Arcade Sheets toolkit.
   provider](/home/auth-providers/google#using-google-auth-in-custom-tools).
 </Tip>
 
-## Google.CreateSpreadsheet
+## GoogleSheets.CreateSpreadsheet
 
 Create a new spreadsheet with a custom title and optional data in the first sheet.
 
@@ -67,7 +67,7 @@ Create a new spreadsheet with a custom title and optional data in the first shee
   ]}
 />
 
-## Google.GetSpreadsheet
+## GoogleSheets.GetSpreadsheet
 
 Retrieve all properties and cell data for every sheet in a spreadsheet.
 
@@ -90,7 +90,7 @@ Retrieve all properties and cell data for every sheet in a spreadsheet.
   ]}
 />
 
-## Google.WriteToCell
+## GoogleSheets.WriteToCell
 
 Write a value to a specific cell in a spreadsheet.
 
@@ -121,10 +121,10 @@ Write a value to a specific cell in a spreadsheet.
 
 ## Auth
 
-The Arcade Sheets toolkit uses the [Google auth provider](/home/auth-providers/google) to connect to users' Google accounts.
+The Arcade Google Sheets toolkit uses the [Google auth provider](/home/auth-providers/google) to connect to users' Google accounts.
 
 With the hosted Arcade Engine, there's nothing to configure. Your users will see `Arcade` as the name of the application that's requesting permission.
 
 With a self-hosted installation of Arcade, you need to [configure the Google auth provider](/home/auth-providers/google#configuring-google-auth) with your own Google app credentials.
 
-<ToolFooter pipPackageName="arcade_google" />
\ No newline at end of file
+<ToolFooter pipPackageName="arcade_google_sheets" />
diff --git a/pages/toolkits/productivity/microsoft/outlook_calendar.mdx b/pages/toolkits/productivity/outlook_calendar.mdx
similarity index 89%
rename from pages/toolkits/productivity/microsoft/outlook_calendar.mdx
rename to pages/toolkits/productivity/outlook_calendar.mdx
index 532adad9b..78bd9772b 100644
--- a/pages/toolkits/productivity/microsoft/outlook_calendar.mdx
+++ b/pages/toolkits/productivity/outlook_calendar.mdx
@@ -9,13 +9,13 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to create and list events in Outlook Calendar."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/microsoft"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/outlook_calendar"
   authType="oauth2"
   authProviderName="Microsoft"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_microsoft" />
+<Badges repo="arcadeai/arcade_outlook_calendar" />
 
 The Arcade Outlook Calendar toolkit provides pre-built tools for working with calendar events using the Outlook API. Use these tools to:
 
@@ -25,14 +25,14 @@ The Arcade Outlook Calendar toolkit provides pre-built tools for working with ca
 
 ## Available Tools
 
-These tools are currently available in the Arcade Sheets toolkit.
+These tools are currently available in the Arcade Outlook Calendar toolkit.
 
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["Microsoft.CreateEvent", "Create an event in the authenticated user's default calendar"],
-    ["Microsoft.GetEvent", "Get an event by its ID from the user's calendar"],
-    ["Microsoft.ListEventsInTimeRange", "ist events in the user's calendar in a specific time range"],
+    ["OutlookCalendar.CreateEvent", "Create an event in the authenticated user's default calendar"],
+    ["OutlookCalendar.GetEvent", "Get an event by its ID from the user's calendar"],
+    ["OutlookCalendar.ListEventsInTimeRange", "ist events in the user's calendar in a specific time range"],
   ]}
 />
 
@@ -43,7 +43,7 @@ These tools are currently available in the Arcade Sheets toolkit.
   provider](/home/auth-providers/google#using-google-auth-in-custom-tools).
 </Tip>
 
-## Microsoft.CreateEvent
+## OutlookCalendar.CreateEvent
 
 Create an event in the authenticated user's default calendar.
 
@@ -78,7 +78,7 @@ If the user has not set a timezone for their calendar, then the timezone will be
 
 ---
 
-## Microsoft.GetEvent
+## OutlookCalendar.GetEvent
 
 Get an event by its ID from the user's calendar.
 
@@ -103,7 +103,7 @@ Get an event by its ID from the user's calendar.
 
 ---
 
-## Microsoft.ListEventsInTimeRange
+## OutlookCalendar.ListEventsInTimeRange
 
 List events in the user's calendar in a specific time range.
 
@@ -142,4 +142,4 @@ With a self-hosted installation of Arcade, you need to [configure the Microsoft
 
 ---
 
-<ToolFooter pipPackageName="arcade_microsoft" />
\ No newline at end of file
+<ToolFooter pipPackageName="arcade_outlook_calendar" />
diff --git a/pages/toolkits/productivity/microsoft/outlook_mail.mdx b/pages/toolkits/productivity/outlook_mail.mdx
similarity index 89%
rename from pages/toolkits/productivity/microsoft/outlook_mail.mdx
rename to pages/toolkits/productivity/outlook_mail.mdx
index e0ef448c6..2870141da 100644
--- a/pages/toolkits/productivity/microsoft/outlook_mail.mdx
+++ b/pages/toolkits/productivity/outlook_mail.mdx
@@ -9,13 +9,13 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to read, write, and send emails with Outlook."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/microsoft"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/outlook_mail"
   authType="oauth2"
   authProviderName="Microsoft"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_microsoft" />
+<Badges repo="arcadeai/arcade_outlook_mail" />
 
 The Arcade Outlook Mail toolkit provides pre-built tools for working with emails using the Outlook API. Use these tools to:
 
@@ -25,20 +25,20 @@ The Arcade Outlook Mail toolkit provides pre-built tools for working with emails
 
 ## Available Tools
 
-These tools are currently available in the Arcade Sheets toolkit.
+These tools are currently available in the Arcade Outlook Mail toolkit.
 
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["Microsoft.CreateDraftEmail", "Compose a new draft email in Outlook"],
-    ["Microsoft.UpdateDraftEmail", "Update an existing draft email in Outlook"],
-    ["Microsoft.SendDraftEmail", "Send an existing draft email in Outlook"],
-    ["Microsoft.CreateAndSendEmail", "Create and immediately send a new email in Outlook to the specified recipients"],
-    ["Microsoft.ReplyToEmail", "Reply only to the sender of an existing email in Outlook."],
-    ["Microsoft.ReplyAllToEmail", "Reply to all recipients of an existing email in Outlook."],
-    ["Microsoft.ListEmails", "List emails in the user's mailbox across all folders."],
-    ["Microsoft.ListEmailsInFolder", "List the user's emails in the specified folder."],
-    ["Microsoft.ListEmailsByProperty", "List emails in the user's mailbox across all folders filtering by a property."]
+    ["OutlookMail.CreateDraftEmail", "Compose a new draft email in Outlook"],
+    ["OutlookMail.UpdateDraftEmail", "Update an existing draft email in Outlook"],
+    ["OutlookMail.SendDraftEmail", "Send an existing draft email in Outlook"],
+    ["OutlookMail.CreateAndSendEmail", "Create and immediately send a new email in Outlook to the specified recipients"],
+    ["OutlookMail.ReplyToEmail", "Reply only to the sender of an existing email in Outlook."],
+    ["OutlookMail.ReplyAllToEmail", "Reply to all recipients of an existing email in Outlook."],
+    ["OutlookMail.ListEmails", "List emails in the user's mailbox across all folders."],
+    ["OutlookMail.ListEmailsInFolder", "List the user's emails in the specified folder."],
+    ["OutlookMail.ListEmailsByProperty", "List emails in the user's mailbox across all folders filtering by a property."]
   ]}
 />
 
@@ -49,7 +49,7 @@ These tools are currently available in the Arcade Sheets toolkit.
   provider](/home/auth-providers/google#using-google-auth-in-custom-tools).
 </Tip>
 
-## Microsoft.CreateDraftEmail
+## OutlookMail.CreateDraftEmail
 
 Compose a new draft email in Outlook.
 
@@ -78,7 +78,7 @@ Compose a new draft email in Outlook.
 
 ---
 
-## Microsoft.UpdateDraftEmail
+## OutlookMail.UpdateDraftEmail
 
 Update an existing draft email in Outlook.
 
@@ -119,7 +119,7 @@ This tool can update any un-sent email:
 
 ---
 
-## Microsoft.SendDraftEmail
+## OutlookMail.SendDraftEmail
 
 Send an existing draft email in Outlook
 
@@ -147,7 +147,7 @@ Send an existing draft email in Outlook
 
 ---
 
-## Microsoft.CreateAndSendEmail
+## OutlookMail.CreateAndSendEmail
 
 Create and immediately send a new email in Outlook to the specified recipients
 
@@ -173,7 +173,7 @@ Create and immediately send a new email in Outlook to the specified recipients
 
 ---
 
-## Microsoft.ReplyToEmail
+## OutlookMail.ReplyToEmail
 
 Reply to an existing email in Outlook.
 
@@ -200,7 +200,7 @@ Specify the reply_type to determine the scope of the reply.
 
 ---
 
-## Microsoft.ListEmails
+## OutlookMail.ListEmails
 
 List emails in the user's mailbox across all folders.
 
@@ -226,7 +226,7 @@ and other items that are not in the inbox.
 
 ---
 
-## Microsoft.ListEmailsInFolder
+## OutlookMail.ListEmailsInFolder
 
 List the user's emails in the specified folder.
 
@@ -253,7 +253,7 @@ Exactly one of `well_known_folder_name` or `folder_id` MUST be provided.
 
 ---
 
-## Microsoft.ListEmailsByProperty
+## OutlookMail.ListEmailsByProperty
 
 List emails in the user's mailbox across all folders filtering by a property.
 
@@ -311,8 +311,6 @@ The type of reply to send to an email.
 - **`REPLY`** _(string: "reply")_
 - **`REPLY_ALL`** _(string: "reply_all")_
 
-<ToolFooter pipPackageName="arcade_microsoft" />
-
 ### EmailFilterProperty
 
 The property to filter the emails by.
@@ -335,3 +333,5 @@ The operator to use for the filter.
 - **`STARTS_WITH`** _(string: "startsWith")_
 - **`ENDS_WITH`** _(string: "endsWith")_
 - **`CONTAINS`** _(string: "contains")_
+
+<ToolFooter pipPackageName="arcade_outlook_mail" />
diff --git a/pages/toolkits/search/google_finance.mdx b/pages/toolkits/search/google_finance.mdx
index 2ee94fa33..1c738d1e1 100644
--- a/pages/toolkits/search/google_finance.mdx
+++ b/pages/toolkits/search/google_finance.mdx
@@ -9,12 +9,12 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Empower your agents to retrieve stock data using Arcade."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/search"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_finance"
   authType="API Key"
   versions={['0.1.0']}
 />
 
-<Badges repo="arcadeai/arcade-search" />
+<Badges repo="arcadeai/arcade-google-finance" />
 
 The Arcade Google Finance toolkit lets you fetch real-time and historical stock data with ease. Use these tools to build intelligent agents and applications that fetch:
 
@@ -27,8 +27,8 @@ The Arcade Google Finance toolkit lets you fetch real-time and historical stock
   headers={['Tool Name', 'Description']}
   data={
     [
-      ['Search.GetStockSummary', "Retrieve current price and recent price movement of a stock."],
-      ['Search.GetStockHistoricalData', "Fetch historical stock price and volume data for a specified time window."]
+      ['GoogleFinance.GetStockSummary', "Retrieve current price and recent price movement of a stock."],
+      ['GoogleFinance.GetStockHistoricalData', "Fetch historical stock price and volume data for a specified time window."]
     ]
   }
 />
@@ -37,7 +37,7 @@ The Arcade Google Finance toolkit lets you fetch real-time and historical stock
   If you need an action that's not listed here, please [contact us](mailto:contact@arcade.dev) to request a new tool, or [create your own tools](/home/build-tools/create-a-toolkit).
 </Tip>
 
-## Search.GetStockSummary
+## GoogleFinance.GetStockSummary
 
 Retrieve summary information for a given stock using the Google Finance API via SerpAPI. This tool returns the current price and price change from the most recent trading day.
 
@@ -61,7 +61,7 @@ Retrieve summary information for a given stock using the Google Finance API via
   ]}
 />
 
-## Search.GetStockHistoricalData
+## GoogleFinance.GetStockHistoricalData
 
 Fetch historical data for a given stock over a defined time window. This tool returns the stock's price and volume data along with key events when available.
 
@@ -69,7 +69,7 @@ Fetch historical data for a given stock over a defined time window. This tool re
 
 - **`ticker_symbol`** _(string, required)_: The stock ticker, e.g., 'GOOG'.
 - **`exchange_identifier`** _(string, required)_: The market identifier, e.g., 'NASDAQ' or 'NYSE'.
-- **`window`** _(enum ([GoogleFinanceWindow](/toolkits/search/reference#googlefinancewindow)), optional, defaults to ONE_MONTH)_: Time window for the graph data.
+- **`window`** _(enum ([GoogleFinanceWindow](#googlefinancewindow)), optional, defaults to ONE_MONTH)_: Time window for the graph data.
 
 <br />
 <TabbedCodeBlock
@@ -96,4 +96,21 @@ The Arcade Google Finance toolkit uses the [SerpAPI](https://serpapi.com/) to ge
   Setting the `SERP_API_KEY` secret is only required if you are [self-hosting](/home/local-deployment/install/overview) Arcade. If you're using Arcade Cloud, the secret is already set for you. To manage your secrets, go to the [Secrets page](https://api.arcade.dev/dashboard/auth/secrets) in the Arcade Dashboard.
 </Note>
 
-<ToolFooter pipPackageName="arcade_search" />
+---
+
+## Reference
+
+## GoogleFinanceWindow
+
+Defines the time window for fetching stock data from Google Finance.
+
+- **`ONE_DAY`**: Represents a 1-day time window.
+- **`FIVE_DAYS`**: Represents a 5-day time window.
+- **`ONE_MONTH`**: Represents a 1-month time window.
+- **`SIX_MONTHS`**: Represents a 6-month time window.
+- **`YEAR_TO_DATE`**: Represents the time from the start of the year to the current date.
+- **`ONE_YEAR`**: Represents a 1-year time window.
+- **`FIVE_YEARS`**: Represents a 5-year time window.
+- **`MAX`**: Represents the maximum available time window.
+
+<ToolFooter pipPackageName="arcade_google_finance" />
diff --git a/pages/toolkits/search/google_flights.mdx b/pages/toolkits/search/google_flights.mdx
index a77e1e852..7969114fa 100644
--- a/pages/toolkits/search/google_flights.mdx
+++ b/pages/toolkits/search/google_flights.mdx
@@ -9,16 +9,15 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Empower your agents to search for flights using Arcade."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/search"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_flights"
   authType="API Key"
   versions={['0.1.0']}
 />
 
-<Badges repo="arcadeai/arcade-search" />
+<Badges repo="arcadeai/arcade-google-flights" />
 
 The Arcade Google Flights toolkit lets you search for flights with ease. Use these tools to build intelligent agents and applications that:
 
-- Search for round-trip flights.
 - Search for one-way flights.
 
 ## Available Tools
@@ -27,45 +26,12 @@ The Arcade Google Flights toolkit lets you search for flights with ease. Use the
   headers={['Tool Name', 'Description']}
   data={
     [
-      ['Search.SearchRoundtripFlights', "Retrieve roundtrip flight search results using Google Flights."],
-      ['Search.SearchOneWayFlights', "Retrieve one-way flight search results using Google Flights."]
+      ['GoogleFlights.SearchOneWayFlights', "Retrieve one-way flight search results using Google Flights."]
     ]
   }
 />
 
-## Search.SearchRoundtripFlights
-
-Retrieve flight search results using Google Flights.
-
-**Parameters**
-
-- **`departure_airport_code`** _(string, required)_: The departure airport code. An uppercase 3-letter code.
-- **`arrival_airport_code`** _(string, required)_: The arrival airport code. An uppercase 3-letter code.
-- **`outbound_date`** _(string, required)_: Flight outbound date in YYYY-MM-DD format.
-- **`return_date`** _(string, optional)_: Flight return date in YYYY-MM-DD format.
-- **`currency_code`** _(string, optional)_: Currency of the returned prices. Defaults to 'USD'.
-- **`travel_class`** _(enum ([GoogleFlightsTravelClass](/toolkits/search/reference#googleflightstravelclass)), optional)_: Travel class of the flight. Defaults to 'ECONOMY'.
-- **`num_adults`** _(int, optional)_: Number of adult passengers. Defaults to 1.
-- **`num_children`** _(int, optional)_: Number of child passengers. Defaults to 0.
-- **`max_stops`** _(enum ([GoogleFlightsMaxStops](/toolkits/search/reference#googleflightsmaxstops)), optional)_: Maximum number of stops (layovers) for the flight. Defaults to any number of stops.
-- **`sort_by`** _(enum ([GoogleFlightsSortBy](/toolkits/search/reference#googleflightssortby)), optional)_: The sorting order of the results. Defaults to TOP_FLIGHTS.
-
-<br />
-<TabbedCodeBlock
-  tabs={[
-    {
-      label: "Call the tool directly",
-      content: {
-        Python: [
-          "/examples/integrations/toolkits/search/google_flights/search_roundtrip_flights_example_call_tool.py",
-        ],
-        JavaScript: ["/examples/integrations/toolkits/search/google_flights/search_roundtrip_flights_example_call_tool.js"],
-      },
-    }
-  ]}
-/>
-
-## Search.SearchOneWayFlights
+## GoogleFlights.SearchOneWayFlights
 
 Retrieve flight search results for a one-way flight using Google Flights.
 
@@ -75,11 +41,11 @@ Retrieve flight search results for a one-way flight using Google Flights.
 - **`arrival_airport_code`** _(string, required)_: The arrival airport code. An uppercase 3-letter code.
 - **`outbound_date`** _(string, required)_: Flight departure date in YYYY-MM-DD format.
 - **`currency_code`** _(string, optional)_: Currency of the returned prices. Defaults to 'USD'.
-- **`travel_class`** _(enum ([GoogleFlightsTravelClass](/toolkits/search/reference#googleflightstravelclass)), optional)_: Travel class of the flight. Defaults to 'ECONOMY'.
+- **`travel_class`** _(enum ([GoogleFlightsTravelClass](#googleflightstravelclass)), optional)_: Travel class of the flight. Defaults to 'ECONOMY'.
 - **`num_adults`** _(int, optional)_: Number of adult passengers. Defaults to 1.
 - **`num_children`** _(int, optional)_: Number of child passengers. Defaults to 0.
-- **`max_stops`** _(enum ([GoogleFlightsMaxStops](/toolkits/search/reference#googleflightsmaxstops)), optional)_: Maximum number of stops (layovers) for the flight. Defaults to any number of stops.
-- **`sort_by`** _(enum ([GoogleFlightsSortBy](/toolkits/search/reference#googleflightssortby)), optional)_: The sorting order of the results. Defaults to TOP_FLIGHTS.
+- **`max_stops`** _(enum ([GoogleFlightsMaxStops](#googleflightsmaxstops)), optional)_: Maximum number of stops (layovers) for the flight. Defaults to any number of stops.
+- **`sort_by`** _(enum ([GoogleFlightsSortBy](#googleflightssortby)), optional)_: The sorting order of the results. Defaults to TOP_FLIGHTS.
 
 <br />
 <TabbedCodeBlock
@@ -107,4 +73,37 @@ The Arcade Google Flights toolkit uses the [SerpAPI](https://serpapi.com/) to se
   Setting the `SERP_API_KEY` secret is only required if you are [self-hosting](/home/local-deployment/install/overview) Arcade. If you're using Arcade Cloud, the secret is already set for you. To manage your secrets, go to the [Secrets page](https://api.arcade.dev/dashboard/auth/secrets) in the Arcade Dashboard.
 </Note>
 
-<ToolFooter pipPackageName="arcade_search" />
+---
+
+## Reference
+
+## GoogleFlightsMaxStops
+
+Defines the maximum number of stops for flights.
+
+- **`ANY`**: Any number of stops is allowed.
+- **`NONSTOP`**: Only nonstop flights are allowed.
+- **`ONE`**: Only flights with one stop are allowed.
+- **`TWO`**: Only flights with two stops are allowed.
+
+## GoogleFlightsSortBy
+
+Defines the sorting options for flight search results.
+
+- **`TOP_FLIGHTS`**: Sort by the best available flights.
+- **`PRICE`**: Sort by the lowest price.
+- **`DEPARTURE_TIME`**: Sort by the earliest departure time.
+- **`ARRIVAL_TIME`**: Sort by the earliest arrival time.
+- **`DURATION`**: Sort by the shortest flight duration.
+- **`EMISSIONS`**: Sort by the lowest carbon emissions.
+
+## GoogleFlightsTravelClass
+
+Defines the travel class options for flights.
+
+- **`ECONOMY`**: Economy class.
+- **`PREMIUM_ECONOMY`**: Premium economy class.
+- **`BUSINESS`**: Business class.
+- **`FIRST`**: First class.
+
+<ToolFooter pipPackageName="arcade_google_flights" />
diff --git a/pages/toolkits/search/google_hotels.mdx b/pages/toolkits/search/google_hotels.mdx
index e2e201082..a8e31d4ed 100644
--- a/pages/toolkits/search/google_hotels.mdx
+++ b/pages/toolkits/search/google_hotels.mdx
@@ -9,12 +9,12 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Empower your agents to search for hotels using Arcade."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/search"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_hotels"
   authType="API Key"
   versions={['0.1.0']}
 />
 
-<Badges repo="arcadeai/arcade-search" />
+<Badges repo="arcadeai/arcade-google-hotels" />
 
 The Arcade Google Hotels toolkit lets you search for hotels with ease. Use this tool to build intelligent agents and applications that search for hotels worldwide.
 
@@ -24,12 +24,12 @@ The Arcade Google Hotels toolkit lets you search for hotels with ease. Use this
   headers={['Tool Name', 'Description']}
   data={
     [
-      ['Search.SearchHotels', "Retrieve hotel search results using the Google Hotels API."]
+      ['GoogleHotels.SearchHotels', "Retrieve hotel search results using the Google Hotels API."]
     ]
   }
 />
 
-## Search.SearchHotels
+## GoogleHotels.SearchHotels
 
 Retrieve hotel search results using the Google Hotels API.
 
@@ -44,7 +44,7 @@ Retrieve hotel search results using the Google Hotels API.
 - **`max_price`** _(int, optional)_: Maximum price per night. Defaults to no maximum.
 - **`num_adults`** _(int, optional)_: Number of adults per room. Defaults to 2.
 - **`num_children`** _(int, optional)_: Number of children per room. Defaults to 0.
-- **`sort_by`** _(enum ([GoogleHotelsSortBy](/toolkits/search/reference#googlehotelssortby)), optional)_: The sorting order of the results. Defaults to RELEVANCE.
+- **`sort_by`** _(enum ([GoogleHotelsSortBy](#googlehotelssortby)), optional)_: The sorting order of the results. Defaults to RELEVANCE.
 - **`num_results`** _(int, optional)_: Maximum number of results to return. Defaults to 5. Max 20.
 
 <br />
@@ -73,4 +73,15 @@ The Arcade Google Hotels toolkit uses the [SerpAPI](https://serpapi.com/) to sea
   Setting the `SERP_API_KEY` secret is only required if you are [self-hosting](/home/local-deployment/install/overview) Arcade. If you're using Arcade Cloud, the secret is already set for you. To manage your secrets, go to the [Secrets page](https://api.arcade.dev/dashboard/auth/secrets) in the Arcade Dashboard.
 </Note>
 
-<ToolFooter pipPackageName="arcade_search" />
+## Reference
+
+## GoogleHotelsSortBy
+
+Defines the sorting options for hotel search results.
+
+- **`RELEVANCE`**: Sort by the most relevant results.
+- **`LOWEST_PRICE`**: Sort by the lowest price available.
+- **`HIGHEST_RATING`**: Sort by the highest customer ratings.
+- **`MOST_REVIEWED`**: Sort by the most reviewed hotels.
+
+<ToolFooter pipPackageName="arcade_google_hotels" />
diff --git a/pages/toolkits/search/google_jobs.mdx b/pages/toolkits/search/google_jobs.mdx
index 5f37fbb48..c702fe292 100644
--- a/pages/toolkits/search/google_jobs.mdx
+++ b/pages/toolkits/search/google_jobs.mdx
@@ -9,12 +9,12 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to search for job openings with Google Jobs."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/search"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_jobs"
   authType="API Key"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_search" />
+<Badges repo="arcadeai/arcade-google-jobs" />
 
 The Arcade Google Jobs toolkit provides a pre-built set of tools for interacting with Google Jobs. These tools make it easy to build agents and AI apps that can:
 
@@ -25,7 +25,7 @@ The Arcade Google Jobs toolkit provides a pre-built set of tools for interacting
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["Search.SearchJobs", "Search for job openings with Google Jobs."]
+    ["GoogleJobs.SearchJobs", "Search for job openings with Google Jobs."]
   ]}
 />
 
@@ -35,7 +35,7 @@ The Arcade Google Jobs toolkit provides a pre-built set of tools for interacting
   own tools](/home/build-tools/create-a-toolkit).
 </Tip>
 
-## Search.SearchJobs
+## GoogleJobs.SearchJobs
 
 <br />
 <TabbedCodeBlock
@@ -85,6 +85,40 @@ The language code is a 2-character code that determines the language in which th
 - `ARCADE_GOOGLE_LANGUAGE`: a default value for all Google search tools. If not set, defaults to 'en' (English).
 - `ARCADE_GOOGLE_JOBS_LANGUAGE`: a default value for the jobs search tools. If not set, defaults to `ARCADE_GOOGLE_LANGUAGE`.
 
-A list of supported language codes can be found [here](/toolkits/search/reference#languagecodes).
-
-<ToolFooter pipPackageName="arcade_search" />
+A list of supported language codes can be found [here](#languagecodes).
+
+## LanguageCodes
+
+- **`ar`**: Arabic
+- **`bn`**: Bengali
+- **`da`**: Danish
+- **`de`**: German
+- **`el`**: Greek
+- **`en`**: English
+- **`es`**: Spanish
+- **`fi`**: Finnish
+- **`fr`**: French
+- **`hi`**: Hindi
+- **`hu`**: Hungarian
+- **`id`**: Indonesian
+- **`it`**: Italian
+- **`ja`**: Japanese
+- **`ko`**: Korean
+- **`ms`**: Malay
+- **`nl`**: Dutch
+- **`no`**: Norwegian
+- **`pcm`**: Nigerian Pidgin
+- **`pl`**: Polish
+- **`pt`**: Portuguese
+- **`pt-br`**: Portuguese (Brazil)
+- **`pt-pt`**: Portuguese (Portugal)
+- **`ru`**: Russian
+- **`sv`**: Swedish
+- **`tl`**: Filipino
+- **`tr`**: Turkish
+- **`uk`**: Ukrainian
+- **`zh`**: Chinese
+- **`zh-cn`**: Chinese (Simplified)
+- **`zh-tw`**: Chinese (Traditional)
+
+<ToolFooter pipPackageName="arcade_google_jobs" />
diff --git a/pages/toolkits/search/google_maps.mdx b/pages/toolkits/search/google_maps.mdx
index 0949f3043..57dd5e71f 100644
--- a/pages/toolkits/search/google_maps.mdx
+++ b/pages/toolkits/search/google_maps.mdx
@@ -9,12 +9,12 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to get directions between two locations with Google Maps."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/search"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_maps"
   authType="API Key"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_search" />
+<Badges repo="arcadeai/arcade-google-maps" />
 
 The Arcade Google Maps toolkit provides a pre-built set of tools for interacting with Google Maps. These tools make it easy to build agents and AI apps that can:
 
@@ -26,8 +26,8 @@ The Arcade Google Maps toolkit provides a pre-built set of tools for interacting
   headers={["Tool Name", "Description"]}
   data={
     [
-      ["Search.GetDirectionsBetweenAddresses", "Get directions between two addresses."],
-      ["Search.GetDirectionsBetweenCoordinates", "Get directions between two latitude/longitude coordinates."],
+      ["GoogleMaps.GetDirectionsBetweenAddresses", "Get directions between two addresses."],
+      ["GoogleMaps.GetDirectionsBetweenCoordinates", "Get directions between two latitude/longitude coordinates."],
     ]
   }
 />
@@ -38,7 +38,7 @@ The Arcade Google Maps toolkit provides a pre-built set of tools for interacting
   own tools](/home/build-tools/create-a-toolkit).
 </Tip>
 
-## Search.GetDirectionsBetweenAddresses
+## GoogleMaps.GetDirectionsBetweenAddresses
 
 <br />
 <TabbedCodeBlock
@@ -61,12 +61,12 @@ Get directions between two addresses.
 
 - **`origin_address`** _(string, required)_ The origin address. Example: '123 Main St, New York, NY 10001'.
 - **`destination_address`** _(string, required)_ The destination address. Example: '456 Main St, New York, NY 10001'.
-- **`language`** _(string, optional, Defaults to 'en' English)_ 2-character language code to use in the Google Maps search. A list of supported language codes can be found [here](/toolkits/search/reference#languagecodes).
-- **`country`** _(string, optional, Defaults to `None`)_ 2-character country code to use in the Google Maps search. A list of supported country codes can be found [here](/toolkits/search/reference#countrycodes).
-- **`distance_unit`** _(enum ([GoogleMapsDistanceUnit](/toolkits/search/reference#googlemapsdistanceunit)), optional, Defaults to `GoogleMapsDistanceUnit.KM`)_ Distance unit to use in the Google Maps search.
-- **`travel_mode`** _(enum ([GoogleMapsTravelMode](/toolkits/search/reference#googlemapstravelmode)), optional, Defaults to `GoogleMapsTravelMode.BEST`)_ Travel mode to use in the Google Maps search.
+- **`language`** _(string, optional, Defaults to 'en' English)_ 2-character language code to use in the Google Maps search. A list of supported language codes can be found [here](#languagecodes).
+- **`country`** _(string, optional, Defaults to `None`)_ 2-character country code to use in the Google Maps search. A list of supported country codes can be found [here](#countrycodes).
+- **`distance_unit`** _(enum ([GoogleMapsDistanceUnit](#googlemapsdistanceunit)), optional, Defaults to `GoogleMapsDistanceUnit.KM`)_ Distance unit to use in the Google Maps search.
+- **`travel_mode`** _(enum ([GoogleMapsTravelMode](#googlemapstravelmode)), optional, Defaults to `GoogleMapsTravelMode.BEST`)_ Travel mode to use in the Google Maps search.
 
-## Search.GetDirectionsBetweenCoordinates
+## GoogleMaps.GetDirectionsBetweenCoordinates
 
 <br />
 <TabbedCodeBlock
@@ -91,10 +91,10 @@ Get directions between two latitude/longitude coordinates.
 - **`origin_longitude`** _(float, required)_ The origin longitude.
 - **`destination_latitude`** _(float, required)_ The destination latitude.
 - **`destination_longitude`** _(float, required)_ The destination longitude.
-- **`language`** _(string, optional, Defaults to 'en' English)_ 2-character language code to use in the Google Maps search. A list of supported language codes can be found [here](/toolkits/search/reference#languagecodes).
-- **`country`** _(string, optional, Defaults to `None`)_ 2-character country code to use in the Google Maps search. A list of supported country codes can be found [here](/toolkits/search/reference#countrycodes).
-- **`distance_unit`** _(enum ([GoogleMapsDistanceUnit](/toolkits/search/reference#googlemapsdistanceunit)), optional, Defaults to `GoogleMapsDistanceUnit.KM`)_ Distance unit to use in the Google Maps search.
-- **`travel_mode`** _(enum ([GoogleMapsTravelMode](/toolkits/search/reference#googlemapstravelmode)), optional, Defaults to `GoogleMapsTravelMode.BEST`)_ Travel mode to use in the Google Maps search.
+- **`language`** _(string, optional, Defaults to 'en' English)_ 2-character language code to use in the Google Maps search. A list of supported language codes can be found [here](#languagecodes).
+- **`country`** _(string, optional, Defaults to `None`)_ 2-character country code to use in the Google Maps search. A list of supported country codes can be found [here](#countrycodes).
+- **`distance_unit`** _(enum ([GoogleMapsDistanceUnit](#googlemapsdistanceunit)), optional, Defaults to `GoogleMapsDistanceUnit.KM`)_ Distance unit to use in the Google Maps search.
+- **`travel_mode`** _(enum ([GoogleMapsTravelMode](#googlemapstravelmode)), optional, Defaults to `GoogleMapsTravelMode.BEST`)_ Travel mode to use in the Google Maps search.
 
 ## Auth
 
@@ -119,7 +119,7 @@ The language code is a 2-character code that determines the language in which th
 - `ARCADE_GOOGLE_LANGUAGE`: a default value for all Google tools. If not set, defaults to 'en' (English).
 - `ARCADE_GOOGLE_MAPS_LANGUAGE`: a default value for the Google Maps tools. If not set, defaults to `ARCADE_GOOGLE_LANGUAGE`.
 
-A list of supported language codes can be found [here](/toolkits/search/reference#languagecodes).
+A list of supported language codes can be found [here](#languagecodes).
 
 **Country**
 
@@ -127,7 +127,7 @@ The country code is a 2-character code that determines the country in which the
 
 - `ARCADE_GOOGLE_MAPS_COUNTRY`: a default value for the Google Maps tools. If not set, defaults to `None`.
 
-A list of supported country codes can be found [here](/toolkits/search/reference#countrycodes).
+A list of supported country codes can be found [here](#countrycodes).
 
 **Distance Unit**
 
@@ -135,7 +135,7 @@ The distance unit is a string that determines the unit of distance to use in the
 
 - `ARCADE_GOOGLE_MAPS_DISTANCE_UNIT`: a default value for the Google Maps tools. If not set, defaults to `GoogleMapsDistanceUnit.KM`.
 
-A list of supported distance units can be found [here](/toolkits/search/reference#googlemapsdistanceunit).
+A list of supported distance units can be found [here](#googlemapsdistanceunit).
 
 **Travel Mode**
 
@@ -143,11 +143,316 @@ The travel mode is a string that determines the mode of travel to use in the Goo
 
 - `ARCADE_GOOGLE_MAPS_TRAVEL_MODE`: a default value for the Google Maps tools. If not set, defaults to `GoogleMapsTravelMode.BEST`.
 
-A list of supported travel modes can be found [here](/toolkits/search/reference#googlemapstravelmode).
+A list of supported travel modes can be found [here](#googlemapstravelmode).
+
 - **Secret:**
   - `SERP_API_KEY`: Your SerpAPI API key.
 <Note>
   Setting the `SERP_API_KEY` secret is only required if you are [self-hosting](/home/local-deployment/install/overview) Arcade. If you're using Arcade Cloud, the secret is already set for you. To manage your secrets, go to the [Secrets page](https://api.arcade.dev/dashboard/auth/secrets) in the Arcade Dashboard.
 </Note>
 
-<ToolFooter pipPackageName="arcade_search" />
+---
+
+## Reference
+
+### GoogleMapsDistanceUnit
+
+Distance unit to use in the Google Maps search.
+
+- **`KM`**: Kilometers.
+- **`MI`**: Miles.
+
+### GoogleMapsTravelMode
+
+Travel mode to use in the Google Maps search.
+
+- **`BEST`**: Best mode.
+- **`DRIVING`**: Driving mode.
+- **`MOTORCYCLE`**: Motorcycle mode.
+- **`PUBLIC_TRANSPORTATION`**: Public transportation mode.
+- **`WALKING`**: Walking mode.
+- **`BICYCLE`**: Bicycling mode.
+- **`FLIGHT`**: Flight mode.
+
+### LanguageCodes
+
+- **`ar`**: Arabic
+- **`bn`**: Bengali
+- **`da`**: Danish
+- **`de`**: German
+- **`el`**: Greek
+- **`en`**: English
+- **`es`**: Spanish
+- **`fi`**: Finnish
+- **`fr`**: French
+- **`hi`**: Hindi
+- **`hu`**: Hungarian
+- **`id`**: Indonesian
+- **`it`**: Italian
+- **`ja`**: Japanese
+- **`ko`**: Korean
+- **`ms`**: Malay
+- **`nl`**: Dutch
+- **`no`**: Norwegian
+- **`pcm`**: Nigerian Pidgin
+- **`pl`**: Polish
+- **`pt`**: Portuguese
+- **`pt-br`**: Portuguese (Brazil)
+- **`pt-pt`**: Portuguese (Portugal)
+- **`ru`**: Russian
+- **`sv`**: Swedish
+- **`tl`**: Filipino
+- **`tr`**: Turkish
+- **`uk`**: Ukrainian
+- **`zh`**: Chinese
+- **`zh-cn`**: Chinese (Simplified)
+- **`zh-tw`**: Chinese (Traditional)
+
+### CountryCodes
+
+- **`af`**: Afghanistan
+- **`al`**: Albania
+- **`dz`**: Algeria
+- **`as`**: American Samoa
+- **`ad`**: Andorra
+- **`ao`**: Angola
+- **`ai`**: Anguilla
+- **`aq`**: Antarctica
+- **`ag`**: Antigua and Barbuda
+- **`ar`**: Argentina
+- **`am`**: Armenia
+- **`aw`**: Aruba
+- **`au`**: Australia
+- **`at`**: Austria
+- **`az`**: Azerbaijan
+- **`bs`**: Bahamas
+- **`bh`**: Bahrain
+- **`bd`**: Bangladesh
+- **`bb`**: Barbados
+- **`by`**: Belarus
+- **`be`**: Belgium
+- **`bz`**: Belize
+- **`bj`**: Benin
+- **`bm`**: Bermuda
+- **`bt`**: Bhutan
+- **`bo`**: Bolivia
+- **`ba`**: Bosnia and Herzegovina
+- **`bw`**: Botswana
+- **`bv`**: Bouvet Island
+- **`br`**: Brazil
+- **`io`**: British Indian Ocean Territory
+- **`bn`**: Brunei Darussalam
+- **`bg`**: Bulgaria
+- **`bf`**: Burkina Faso
+- **`bi`**: Burundi
+- **`kh`**: Cambodia
+- **`cm`**: Cameroon
+- **`ca`**: Canada
+- **`cv`**: Cape Verde
+- **`ky`**: Cayman Islands
+- **`cf`**: Central African Republic
+- **`td`**: Chad
+- **`cl`**: Chile
+- **`cn`**: China
+- **`cx`**: Christmas Island
+- **`cc`**: Cocos (Keeling) Islands
+- **`co`**: Colombia
+- **`km`**: Comoros
+- **`cg`**: Congo
+- **`cd`**: Congo, the Democratic Republic of the
+- **`ck`**: Cook Islands
+- **`cr`**: Costa Rica
+- **`ci`**: Cote D'ivoire
+- **`hr`**: Croatia
+- **`cu`**: Cuba
+- **`cy`**: Cyprus
+- **`cz`**: Czech Republic
+- **`dk`**: Denmark
+- **`dj`**: Djibouti
+- **`dm`**: Dominica
+- **`do`**: Dominican Republic
+- **`ec`**: Ecuador
+- **`eg`**: Egypt
+- **`sv`**: El Salvador
+- **`gq`**: Equatorial Guinea
+- **`er`**: Eritrea
+- **`ee`**: Estonia
+- **`et`**: Ethiopia
+- **`fk`**: Falkland Islands (Malvinas)
+- **`fo`**: Faroe Islands
+- **`fj`**: Fiji
+- **`fi`**: Finland
+- **`fr`**: France
+- **`gf`**: French Guiana
+- **`pf`**: French Polynesia
+- **`tf`**: French Southern Territories
+- **`ga`**: Gabon
+- **`gm`**: Gambia
+- **`ge`**: Georgia
+- **`de`**: Germany
+- **`gh`**: Ghana
+- **`gi`**: Gibraltar
+- **`gr`**: Greece
+- **`gl`**: Greenland
+- **`gd`**: Grenada
+- **`gp`**: Guadeloupe
+- **`gu`**: Guam
+- **`gt`**: Guatemala
+- **`gg`**: Guernsey
+- **`gn`**: Guinea
+- **`gw`**: Guinea-Bissau
+- **`gy`**: Guyana
+- **`ht`**: Haiti
+- **`hm`**: Heard Island and Mcdonald Islands
+- **`va`**: Holy See (Vatican City State)
+- **`hn`**: Honduras
+- **`hk`**: Hong Kong
+- **`hu`**: Hungary
+- **`is`**: Iceland
+- **`in`**: India
+- **`id`**: Indonesia
+- **`ir`**: Iran, Islamic Republic of
+- **`iq`**: Iraq
+- **`ie`**: Ireland
+- **`im`**: Isle of Man
+- **`il`**: Israel
+- **`it`**: Italy
+- **`je`**: Jersey
+- **`jm`**: Jamaica
+- **`jp`**: Japan
+- **`jo`**: Jordan
+- **`kz`**: Kazakhstan
+- **`ke`**: Kenya
+- **`ki`**: Kiribati
+- **`kp`**: Korea, Democratic People's Republic of
+- **`kr`**: Korea, Republic of
+- **`kw`**: Kuwait
+- **`kg`**: Kyrgyzstan
+- **`la`**: Lao People's Democratic Republic
+- **`lv`**: Latvia
+- **`lb`**: Lebanon
+- **`ls`**: Lesotho
+- **`lr`**: Liberia
+- **`ly`**: Libyan Arab Jamahiriya
+- **`li`**: Liechtenstein
+- **`lt`**: Lithuania
+- **`lu`**: Luxembourg
+- **`mo`**: Macao
+- **`mk`**: Macedonia, the Former Yugosalv Republic of
+- **`mg`**: Madagascar
+- **`mw`**: Malawi
+- **`my`**: Malaysia
+- **`mv`**: Maldives
+- **`ml`**: Mali
+- **`mt`**: Malta
+- **`mh`**: Marshall Islands
+- **`mq`**: Martinique
+- **`mr`**: Mauritania
+- **`mu`**: Mauritius
+- **`yt`**: Mayotte
+- **`mx`**: Mexico
+- **`fm`**: Micronesia, Federated States of
+- **`md`**: Moldova, Republic of
+- **`mc`**: Monaco
+- **`mn`**: Mongolia
+- **`me`**: Montenegro
+- **`ms`**: Montserrat
+- **`ma`**: Morocco
+- **`mz`**: Mozambique
+- **`mm`**: Myanmar
+- **`na`**: Namibia
+- **`nr`**: Nauru
+- **`np`**: Nepal
+- **`nl`**: Netherlands
+- **`an`**: Netherlands Antilles
+- **`nc`**: New Caledonia
+- **`nz`**: New Zealand
+- **`ni`**: Nicaragua
+- **`ne`**: Niger
+- **`ng`**: Nigeria
+- **`nu`**: Niue
+- **`nf`**: Norfolk Island
+- **`mp`**: Northern Mariana Islands
+- **`no`**: Norway
+- **`om`**: Oman
+- **`pk`**: Pakistan
+- **`pw`**: Palau
+- **`ps`**: Palestinian Territory, Occupied
+- **`pa`**: Panama
+- **`pg`**: Papua New Guinea
+- **`py`**: Paraguay
+- **`pe`**: Peru
+- **`ph`**: Philippines
+- **`pn`**: Pitcairn
+- **`pl`**: Poland
+- **`pt`**: Portugal
+- **`pr`**: Puerto Rico
+- **`qa`**: Qatar
+- **`re`**: Reunion
+- **`ro`**: Romania
+- **`ru`**: Russian Federation
+- **`rw`**: Rwanda
+- **`sh`**: Saint Helena
+- **`kn`**: Saint Kitts and Nevis
+- **`lc`**: Saint Lucia
+- **`pm`**: Saint Pierre and Miquelon
+- **`vc`**: Saint Vincent and the Grenadines
+- **`ws`**: Samoa
+- **`sm`**: San Marino
+- **`st`**: Sao Tome and Principe
+- **`sa`**: Saudi Arabia
+- **`sn`**: Senegal
+- **`rs`**: Serbia
+- **`sc`**: Seychelles
+- **`sl`**: Sierra Leone
+- **`sg`**: Singapore
+- **`sk`**: Slovakia
+- **`si`**: Slovenia
+- **`sb`**: Solomon Islands
+- **`so`**: Somalia
+- **`za`**: South Africa
+- **`gs`**: South Georgia and the South Sandwich Islands
+- **`es`**: Spain
+- **`lk`**: Sri Lanka
+- **`sd`**: Sudan
+- **`sr`**: Suriname
+- **`sj`**: Svalbard and Jan Mayen
+- **`sz`**: Swaziland
+- **`se`**: Sweden
+- **`ch`**: Switzerland
+- **`sy`**: Syrian Arab Republic
+- **`tw`**: Taiwan, Province of China
+- **`tj`**: Tajikistan
+- **`tz`**: Tanzania, United Republic of
+- **`th`**: Thailand
+- **`tl`**: Timor-Leste
+- **`tg`**: Togo
+- **`tk`**: Tokelau
+- **`to`**: Tonga
+- **`tt`**: Trinidad and Tobago
+- **`tn`**: Tunisia
+- **`tr`**: Turkiye
+- **`tm`**: Turkmenistan
+- **`tc`**: Turks and Caicos Islands
+- **`tv`**: Tuvalu
+- **`ug`**: Uganda
+- **`ua`**: Ukraine
+- **`ae`**: United Arab Emirates
+- **`uk`**: United Kingdom
+- **`gb`**: United Kingdom
+- **`us`**: United States
+- **`um`**: United States Minor Outlying Islands
+- **`uy`**: Uruguay
+- **`uz`**: Uzbekistan
+- **`vu`**: Vanuatu
+- **`ve`**: Venezuela
+- **`vn`**: Viet Nam
+- **`vg`**: Virgin Islands, British
+- **`vi`**: Virgin Islands, U.S.
+- **`wf`**: Wallis and Futuna
+- **`eh`**: Western Sahara
+- **`ye`**: Yemen
+- **`zm`**: Zambia
+- **`zw`**: Zimbabwe
+
+<ToolFooter pipPackageName="arcade_google_maps" />
diff --git a/pages/toolkits/search/google_news.mdx b/pages/toolkits/search/google_news.mdx
index 9078b649a..83108a345 100644
--- a/pages/toolkits/search/google_news.mdx
+++ b/pages/toolkits/search/google_news.mdx
@@ -9,12 +9,12 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to search for news stories with Google News."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/search"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_news"
   authType="API Key"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_search" />
+<Badges repo="arcadeai/arcade-google-news" />
 
 The Arcade Google News toolkit provides a pre-built set of tools for interacting with Google News. These tools make it easy to build agents and AI apps that can:
 
@@ -26,7 +26,7 @@ The Arcade Google News toolkit provides a pre-built set of tools for interacting
   headers={["Tool Name", "Description"]}
   data={
     [
-      ["Search.SearchNews", "Search for news stories with Google News."],
+      ["GoogleNews.SearchNews", "Search for news stories with Google News."],
     ]
   }
 />
@@ -37,7 +37,7 @@ The Arcade Google News toolkit provides a pre-built set of tools for interacting
   own tools](/home/build-tools/create-a-toolkit).
 </Tip>
 
-## Search.SearchNews
+## GoogleNews.SearchNews
 
 <br />
 <TabbedCodeBlock
@@ -86,7 +86,7 @@ The language code is a 2-character code that determines the language in which th
 - `ARCADE_GOOGLE_LANGUAGE`: a default value for all Google search tools. If not set, defaults to 'en' (English).
 - `ARCADE_GOOGLE_NEWS_LANGUAGE`: a default value for the news search tools. If not set, defaults to `ARCADE_GOOGLE_LANGUAGE`.
 
-A list of supported language codes can be found [here](/toolkits/search/reference#languagecodes).
+A list of supported language codes can be found [here](#languagecodes).
 
 **Country**
 
@@ -94,6 +94,291 @@ The country code is a 2-character code that determines the country in which the
 
 - `ARCADE_GOOGLE_NEWS_COUNTRY`: a default value for the `SearchNews` tool. If not set, defaults to `None` (search news globally).
 
-A list of supported country codes can be found [here](/toolkits/search/reference#countrycodes).
+A list of supported country codes can be found [here](#countrycodes).
 
-<ToolFooter pipPackageName="arcade_search" />
+---
+
+## Reference
+
+## LanguageCodes
+
+- **`ar`**: Arabic
+- **`bn`**: Bengali
+- **`da`**: Danish
+- **`de`**: German
+- **`el`**: Greek
+- **`en`**: English
+- **`es`**: Spanish
+- **`fi`**: Finnish
+- **`fr`**: French
+- **`hi`**: Hindi
+- **`hu`**: Hungarian
+- **`id`**: Indonesian
+- **`it`**: Italian
+- **`ja`**: Japanese
+- **`ko`**: Korean
+- **`ms`**: Malay
+- **`nl`**: Dutch
+- **`no`**: Norwegian
+- **`pcm`**: Nigerian Pidgin
+- **`pl`**: Polish
+- **`pt`**: Portuguese
+- **`pt-br`**: Portuguese (Brazil)
+- **`pt-pt`**: Portuguese (Portugal)
+- **`ru`**: Russian
+- **`sv`**: Swedish
+- **`tl`**: Filipino
+- **`tr`**: Turkish
+- **`uk`**: Ukrainian
+- **`zh`**: Chinese
+- **`zh-cn`**: Chinese (Simplified)
+- **`zh-tw`**: Chinese (Traditional)
+
+## CountryCodes
+
+- **`af`**: Afghanistan
+- **`al`**: Albania
+- **`dz`**: Algeria
+- **`as`**: American Samoa
+- **`ad`**: Andorra
+- **`ao`**: Angola
+- **`ai`**: Anguilla
+- **`aq`**: Antarctica
+- **`ag`**: Antigua and Barbuda
+- **`ar`**: Argentina
+- **`am`**: Armenia
+- **`aw`**: Aruba
+- **`au`**: Australia
+- **`at`**: Austria
+- **`az`**: Azerbaijan
+- **`bs`**: Bahamas
+- **`bh`**: Bahrain
+- **`bd`**: Bangladesh
+- **`bb`**: Barbados
+- **`by`**: Belarus
+- **`be`**: Belgium
+- **`bz`**: Belize
+- **`bj`**: Benin
+- **`bm`**: Bermuda
+- **`bt`**: Bhutan
+- **`bo`**: Bolivia
+- **`ba`**: Bosnia and Herzegovina
+- **`bw`**: Botswana
+- **`bv`**: Bouvet Island
+- **`br`**: Brazil
+- **`io`**: British Indian Ocean Territory
+- **`bn`**: Brunei Darussalam
+- **`bg`**: Bulgaria
+- **`bf`**: Burkina Faso
+- **`bi`**: Burundi
+- **`kh`**: Cambodia
+- **`cm`**: Cameroon
+- **`ca`**: Canada
+- **`cv`**: Cape Verde
+- **`ky`**: Cayman Islands
+- **`cf`**: Central African Republic
+- **`td`**: Chad
+- **`cl`**: Chile
+- **`cn`**: China
+- **`cx`**: Christmas Island
+- **`cc`**: Cocos (Keeling) Islands
+- **`co`**: Colombia
+- **`km`**: Comoros
+- **`cg`**: Congo
+- **`cd`**: Congo, the Democratic Republic of the
+- **`ck`**: Cook Islands
+- **`cr`**: Costa Rica
+- **`ci`**: Cote D'ivoire
+- **`hr`**: Croatia
+- **`cu`**: Cuba
+- **`cy`**: Cyprus
+- **`cz`**: Czech Republic
+- **`dk`**: Denmark
+- **`dj`**: Djibouti
+- **`dm`**: Dominica
+- **`do`**: Dominican Republic
+- **`ec`**: Ecuador
+- **`eg`**: Egypt
+- **`sv`**: El Salvador
+- **`gq`**: Equatorial Guinea
+- **`er`**: Eritrea
+- **`ee`**: Estonia
+- **`et`**: Ethiopia
+- **`fk`**: Falkland Islands (Malvinas)
+- **`fo`**: Faroe Islands
+- **`fj`**: Fiji
+- **`fi`**: Finland
+- **`fr`**: France
+- **`gf`**: French Guiana
+- **`pf`**: French Polynesia
+- **`tf`**: French Southern Territories
+- **`ga`**: Gabon
+- **`gm`**: Gambia
+- **`ge`**: Georgia
+- **`de`**: Germany
+- **`gh`**: Ghana
+- **`gi`**: Gibraltar
+- **`gr`**: Greece
+- **`gl`**: Greenland
+- **`gd`**: Grenada
+- **`gp`**: Guadeloupe
+- **`gu`**: Guam
+- **`gt`**: Guatemala
+- **`gg`**: Guernsey
+- **`gn`**: Guinea
+- **`gw`**: Guinea-Bissau
+- **`gy`**: Guyana
+- **`ht`**: Haiti
+- **`hm`**: Heard Island and Mcdonald Islands
+- **`va`**: Holy See (Vatican City State)
+- **`hn`**: Honduras
+- **`hk`**: Hong Kong
+- **`hu`**: Hungary
+- **`is`**: Iceland
+- **`in`**: India
+- **`id`**: Indonesia
+- **`ir`**: Iran, Islamic Republic of
+- **`iq`**: Iraq
+- **`ie`**: Ireland
+- **`im`**: Isle of Man
+- **`il`**: Israel
+- **`it`**: Italy
+- **`je`**: Jersey
+- **`jm`**: Jamaica
+- **`jp`**: Japan
+- **`jo`**: Jordan
+- **`kz`**: Kazakhstan
+- **`ke`**: Kenya
+- **`ki`**: Kiribati
+- **`kp`**: Korea, Democratic People's Republic of
+- **`kr`**: Korea, Republic of
+- **`kw`**: Kuwait
+- **`kg`**: Kyrgyzstan
+- **`la`**: Lao People's Democratic Republic
+- **`lv`**: Latvia
+- **`lb`**: Lebanon
+- **`ls`**: Lesotho
+- **`lr`**: Liberia
+- **`ly`**: Libyan Arab Jamahiriya
+- **`li`**: Liechtenstein
+- **`lt`**: Lithuania
+- **`lu`**: Luxembourg
+- **`mo`**: Macao
+- **`mk`**: Macedonia, the Former Yugosalv Republic of
+- **`mg`**: Madagascar
+- **`mw`**: Malawi
+- **`my`**: Malaysia
+- **`mv`**: Maldives
+- **`ml`**: Mali
+- **`mt`**: Malta
+- **`mh`**: Marshall Islands
+- **`mq`**: Martinique
+- **`mr`**: Mauritania
+- **`mu`**: Mauritius
+- **`yt`**: Mayotte
+- **`mx`**: Mexico
+- **`fm`**: Micronesia, Federated States of
+- **`md`**: Moldova, Republic of
+- **`mc`**: Monaco
+- **`mn`**: Mongolia
+- **`me`**: Montenegro
+- **`ms`**: Montserrat
+- **`ma`**: Morocco
+- **`mz`**: Mozambique
+- **`mm`**: Myanmar
+- **`na`**: Namibia
+- **`nr`**: Nauru
+- **`np`**: Nepal
+- **`nl`**: Netherlands
+- **`an`**: Netherlands Antilles
+- **`nc`**: New Caledonia
+- **`nz`**: New Zealand
+- **`ni`**: Nicaragua
+- **`ne`**: Niger
+- **`ng`**: Nigeria
+- **`nu`**: Niue
+- **`nf`**: Norfolk Island
+- **`mp`**: Northern Mariana Islands
+- **`no`**: Norway
+- **`om`**: Oman
+- **`pk`**: Pakistan
+- **`pw`**: Palau
+- **`ps`**: Palestinian Territory, Occupied
+- **`pa`**: Panama
+- **`pg`**: Papua New Guinea
+- **`py`**: Paraguay
+- **`pe`**: Peru
+- **`ph`**: Philippines
+- **`pn`**: Pitcairn
+- **`pl`**: Poland
+- **`pt`**: Portugal
+- **`pr`**: Puerto Rico
+- **`qa`**: Qatar
+- **`re`**: Reunion
+- **`ro`**: Romania
+- **`ru`**: Russian Federation
+- **`rw`**: Rwanda
+- **`sh`**: Saint Helena
+- **`kn`**: Saint Kitts and Nevis
+- **`lc`**: Saint Lucia
+- **`pm`**: Saint Pierre and Miquelon
+- **`vc`**: Saint Vincent and the Grenadines
+- **`ws`**: Samoa
+- **`sm`**: San Marino
+- **`st`**: Sao Tome and Principe
+- **`sa`**: Saudi Arabia
+- **`sn`**: Senegal
+- **`rs`**: Serbia
+- **`sc`**: Seychelles
+- **`sl`**: Sierra Leone
+- **`sg`**: Singapore
+- **`sk`**: Slovakia
+- **`si`**: Slovenia
+- **`sb`**: Solomon Islands
+- **`so`**: Somalia
+- **`za`**: South Africa
+- **`gs`**: South Georgia and the South Sandwich Islands
+- **`es`**: Spain
+- **`lk`**: Sri Lanka
+- **`sd`**: Sudan
+- **`sr`**: Suriname
+- **`sj`**: Svalbard and Jan Mayen
+- **`sz`**: Swaziland
+- **`se`**: Sweden
+- **`ch`**: Switzerland
+- **`sy`**: Syrian Arab Republic
+- **`tw`**: Taiwan, Province of China
+- **`tj`**: Tajikistan
+- **`tz`**: Tanzania, United Republic of
+- **`th`**: Thailand
+- **`tl`**: Timor-Leste
+- **`tg`**: Togo
+- **`tk`**: Tokelau
+- **`to`**: Tonga
+- **`tt`**: Trinidad and Tobago
+- **`tn`**: Tunisia
+- **`tr`**: Turkiye
+- **`tm`**: Turkmenistan
+- **`tc`**: Turks and Caicos Islands
+- **`tv`**: Tuvalu
+- **`ug`**: Uganda
+- **`ua`**: Ukraine
+- **`ae`**: United Arab Emirates
+- **`uk`**: United Kingdom
+- **`gb`**: United Kingdom
+- **`us`**: United States
+- **`um`**: United States Minor Outlying Islands
+- **`uy`**: Uruguay
+- **`uz`**: Uzbekistan
+- **`vu`**: Vanuatu
+- **`ve`**: Venezuela
+- **`vn`**: Viet Nam
+- **`vg`**: Virgin Islands, British
+- **`vi`**: Virgin Islands, U.S.
+- **`wf`**: Wallis and Futuna
+- **`eh`**: Western Sahara
+- **`ye`**: Yemen
+- **`zm`**: Zambia
+- **`zw`**: Zimbabwe
+
+<ToolFooter pipPackageName="arcade_google_news" />
diff --git a/pages/toolkits/search/google_search.mdx b/pages/toolkits/search/google_search.mdx
index 37addf46f..c32a64523 100644
--- a/pages/toolkits/search/google_search.mdx
+++ b/pages/toolkits/search/google_search.mdx
@@ -9,12 +9,12 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to perform Google searches using SerpAPI."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/search"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_search"
   authType="API Key"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_search" />
+<Badges repo="arcadeai/arcade-google-search" />
 
 The Arcade Search toolkit provides a pre-built set of tools for interacting with Google search results. These tools make it easy to build agents and AI apps that can:
 
@@ -25,7 +25,7 @@ The Arcade Search toolkit provides a pre-built set of tools for interacting with
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["Search.SearchGoogle", "Search Google and return organic results."]
+    ["GoogleSearch.Search", "Search Google and return organic results."]
   ]}
 />
 
@@ -35,7 +35,7 @@ The Arcade Search toolkit provides a pre-built set of tools for interacting with
   own tools](/home/build-tools/create-a-toolkit).
 </Tip>
 
-## Search.SearchGoogle
+## GoogleSearch.Search
 
 <br />
 <TabbedCodeBlock
@@ -69,4 +69,4 @@ The Arcade Google Search toolkit uses the [SerpAPI](https://serpapi.com/) to get
   Setting the `SERP_API_KEY` secret is only required if you are [self-hosting](/home/local-deployment/install/overview) Arcade. If you're using Arcade Cloud, the secret is already set for you. To manage your secrets, go to the [Secrets page](https://api.arcade.dev/dashboard/auth/secrets) in the Arcade Dashboard.
 </Note>
 
-<ToolFooter pipPackageName="arcade_search" />
+<ToolFooter pipPackageName="arcade_google_search" />
diff --git a/pages/toolkits/search/google_shopping.mdx b/pages/toolkits/search/google_shopping.mdx
index 85f4e80fa..6db28d0ba 100644
--- a/pages/toolkits/search/google_shopping.mdx
+++ b/pages/toolkits/search/google_shopping.mdx
@@ -9,12 +9,12 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to search for products with Google Shopping."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/search"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/google_shopping"
   authType="API Key"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_search" />
+<Badges repo="arcadeai/arcade-google-shopping" />
 
 The Arcade Google Shopping Search toolkit provides a pre-built set of tools for interacting with Google Shopping. These tools make it easy to build agents and AI apps that can:
 
@@ -25,7 +25,7 @@ The Arcade Google Shopping Search toolkit provides a pre-built set of tools for
 <TableOfContents
   headers={["Tool Name", "Description"]}
   data={[
-    ["search.SearchShoppingProducts", "Search for products on Google Shopping."],
+    ["GoogleShopping.SearchProducts", "Search for products on Google Shopping."],
   ]}
 />
 
@@ -35,7 +35,7 @@ The Arcade Google Shopping Search toolkit provides a pre-built set of tools for
   own tools](/home/build-tools/create-a-toolkit).
 </Tip>
 
-## search.SearchShoppingProducts
+## GoogleShopping.SearchProducts
 
 <br />
 <TabbedCodeBlock
@@ -55,8 +55,8 @@ Search for products on Google Shopping.
 **Parameters**
 
 - **keywords** _(string, required)_ Keywords to search for. E.g. 'apple iphone' or 'samsung galaxy'
-- **`country_code`** _(string, optional, Defaults to 'us' United States)_ 2-character country code to use in the Google Shopping search. A list of supported country codes can be found [here](/toolkits/search/reference#countrycodes).
-- **`language_code`** _(string, optional, Defaults to 'en' English)_ 2-character language code to use in the Google Shopping search. A list of supported language codes can be found [here](/toolkits/search/reference#languagecodes).
+- **`country_code`** _(string, optional, Defaults to 'us' United States)_ 2-character country code to use in the Google Shopping search. A list of supported country codes can be found [here](#countrycodes).
+- **`language_code`** _(string, optional, Defaults to 'en' English)_ 2-character language code to use in the Google Shopping search. A list of supported language codes can be found [here](#languagecodes).
 
 
 ## Auth
@@ -83,7 +83,7 @@ The language code is a 2-character code that determines the language in which th
 - `ARCADE_GOOGLE_LANGUAGE`: a default value for all Google Search tools. If not set, defaults to 'en' (English).
 - `ARCADE_GOOGLE_SHOPPING_LANGUAGE`: a default value for the Google Shopping Search tools. If not set, defaults to `ARCADE_GOOGLE_LANGUAGE`.
 
-A list of supported language codes can be found [here](/toolkits/search/reference#languagecodes).
+A list of supported language codes can be found [here](#languagecodes).
 
 **Country**
 
@@ -92,6 +92,291 @@ The country code is a 2-character code that determines the country in which the
 - `ARCADE_GOOGLE_COUNTRY`: a default value for all Google Search tools. If not set, defaults to `None`.
 - `ARCADE_GOOGLE_SHOPPING_COUNTRY`: a default value for the Google Shopping Search tools. If not set, defaults to `ARCADE_GOOGLE_COUNTRY`. If `ARCADE_GOOGLE_COUNTRY` is not set, the default country for Google Shopping tools will be `us` (United States).
 
-A list of supported country codes can be found [here](/toolkits/search/reference#countrycodes).
+A list of supported country codes can be found [here](#countrycodes).
 
-<ToolFooter pipPackageName="arcade_search" />
+---
+
+## Reference
+
+## LanguageCodes
+
+- **`ar`**: Arabic
+- **`bn`**: Bengali
+- **`da`**: Danish
+- **`de`**: German
+- **`el`**: Greek
+- **`en`**: English
+- **`es`**: Spanish
+- **`fi`**: Finnish
+- **`fr`**: French
+- **`hi`**: Hindi
+- **`hu`**: Hungarian
+- **`id`**: Indonesian
+- **`it`**: Italian
+- **`ja`**: Japanese
+- **`ko`**: Korean
+- **`ms`**: Malay
+- **`nl`**: Dutch
+- **`no`**: Norwegian
+- **`pcm`**: Nigerian Pidgin
+- **`pl`**: Polish
+- **`pt`**: Portuguese
+- **`pt-br`**: Portuguese (Brazil)
+- **`pt-pt`**: Portuguese (Portugal)
+- **`ru`**: Russian
+- **`sv`**: Swedish
+- **`tl`**: Filipino
+- **`tr`**: Turkish
+- **`uk`**: Ukrainian
+- **`zh`**: Chinese
+- **`zh-cn`**: Chinese (Simplified)
+- **`zh-tw`**: Chinese (Traditional)
+
+## CountryCodes
+
+- **`af`**: Afghanistan
+- **`al`**: Albania
+- **`dz`**: Algeria
+- **`as`**: American Samoa
+- **`ad`**: Andorra
+- **`ao`**: Angola
+- **`ai`**: Anguilla
+- **`aq`**: Antarctica
+- **`ag`**: Antigua and Barbuda
+- **`ar`**: Argentina
+- **`am`**: Armenia
+- **`aw`**: Aruba
+- **`au`**: Australia
+- **`at`**: Austria
+- **`az`**: Azerbaijan
+- **`bs`**: Bahamas
+- **`bh`**: Bahrain
+- **`bd`**: Bangladesh
+- **`bb`**: Barbados
+- **`by`**: Belarus
+- **`be`**: Belgium
+- **`bz`**: Belize
+- **`bj`**: Benin
+- **`bm`**: Bermuda
+- **`bt`**: Bhutan
+- **`bo`**: Bolivia
+- **`ba`**: Bosnia and Herzegovina
+- **`bw`**: Botswana
+- **`bv`**: Bouvet Island
+- **`br`**: Brazil
+- **`io`**: British Indian Ocean Territory
+- **`bn`**: Brunei Darussalam
+- **`bg`**: Bulgaria
+- **`bf`**: Burkina Faso
+- **`bi`**: Burundi
+- **`kh`**: Cambodia
+- **`cm`**: Cameroon
+- **`ca`**: Canada
+- **`cv`**: Cape Verde
+- **`ky`**: Cayman Islands
+- **`cf`**: Central African Republic
+- **`td`**: Chad
+- **`cl`**: Chile
+- **`cn`**: China
+- **`cx`**: Christmas Island
+- **`cc`**: Cocos (Keeling) Islands
+- **`co`**: Colombia
+- **`km`**: Comoros
+- **`cg`**: Congo
+- **`cd`**: Congo, the Democratic Republic of the
+- **`ck`**: Cook Islands
+- **`cr`**: Costa Rica
+- **`ci`**: Cote D'ivoire
+- **`hr`**: Croatia
+- **`cu`**: Cuba
+- **`cy`**: Cyprus
+- **`cz`**: Czech Republic
+- **`dk`**: Denmark
+- **`dj`**: Djibouti
+- **`dm`**: Dominica
+- **`do`**: Dominican Republic
+- **`ec`**: Ecuador
+- **`eg`**: Egypt
+- **`sv`**: El Salvador
+- **`gq`**: Equatorial Guinea
+- **`er`**: Eritrea
+- **`ee`**: Estonia
+- **`et`**: Ethiopia
+- **`fk`**: Falkland Islands (Malvinas)
+- **`fo`**: Faroe Islands
+- **`fj`**: Fiji
+- **`fi`**: Finland
+- **`fr`**: France
+- **`gf`**: French Guiana
+- **`pf`**: French Polynesia
+- **`tf`**: French Southern Territories
+- **`ga`**: Gabon
+- **`gm`**: Gambia
+- **`ge`**: Georgia
+- **`de`**: Germany
+- **`gh`**: Ghana
+- **`gi`**: Gibraltar
+- **`gr`**: Greece
+- **`gl`**: Greenland
+- **`gd`**: Grenada
+- **`gp`**: Guadeloupe
+- **`gu`**: Guam
+- **`gt`**: Guatemala
+- **`gg`**: Guernsey
+- **`gn`**: Guinea
+- **`gw`**: Guinea-Bissau
+- **`gy`**: Guyana
+- **`ht`**: Haiti
+- **`hm`**: Heard Island and Mcdonald Islands
+- **`va`**: Holy See (Vatican City State)
+- **`hn`**: Honduras
+- **`hk`**: Hong Kong
+- **`hu`**: Hungary
+- **`is`**: Iceland
+- **`in`**: India
+- **`id`**: Indonesia
+- **`ir`**: Iran, Islamic Republic of
+- **`iq`**: Iraq
+- **`ie`**: Ireland
+- **`im`**: Isle of Man
+- **`il`**: Israel
+- **`it`**: Italy
+- **`je`**: Jersey
+- **`jm`**: Jamaica
+- **`jp`**: Japan
+- **`jo`**: Jordan
+- **`kz`**: Kazakhstan
+- **`ke`**: Kenya
+- **`ki`**: Kiribati
+- **`kp`**: Korea, Democratic People's Republic of
+- **`kr`**: Korea, Republic of
+- **`kw`**: Kuwait
+- **`kg`**: Kyrgyzstan
+- **`la`**: Lao People's Democratic Republic
+- **`lv`**: Latvia
+- **`lb`**: Lebanon
+- **`ls`**: Lesotho
+- **`lr`**: Liberia
+- **`ly`**: Libyan Arab Jamahiriya
+- **`li`**: Liechtenstein
+- **`lt`**: Lithuania
+- **`lu`**: Luxembourg
+- **`mo`**: Macao
+- **`mk`**: Macedonia, the Former Yugosalv Republic of
+- **`mg`**: Madagascar
+- **`mw`**: Malawi
+- **`my`**: Malaysia
+- **`mv`**: Maldives
+- **`ml`**: Mali
+- **`mt`**: Malta
+- **`mh`**: Marshall Islands
+- **`mq`**: Martinique
+- **`mr`**: Mauritania
+- **`mu`**: Mauritius
+- **`yt`**: Mayotte
+- **`mx`**: Mexico
+- **`fm`**: Micronesia, Federated States of
+- **`md`**: Moldova, Republic of
+- **`mc`**: Monaco
+- **`mn`**: Mongolia
+- **`me`**: Montenegro
+- **`ms`**: Montserrat
+- **`ma`**: Morocco
+- **`mz`**: Mozambique
+- **`mm`**: Myanmar
+- **`na`**: Namibia
+- **`nr`**: Nauru
+- **`np`**: Nepal
+- **`nl`**: Netherlands
+- **`an`**: Netherlands Antilles
+- **`nc`**: New Caledonia
+- **`nz`**: New Zealand
+- **`ni`**: Nicaragua
+- **`ne`**: Niger
+- **`ng`**: Nigeria
+- **`nu`**: Niue
+- **`nf`**: Norfolk Island
+- **`mp`**: Northern Mariana Islands
+- **`no`**: Norway
+- **`om`**: Oman
+- **`pk`**: Pakistan
+- **`pw`**: Palau
+- **`ps`**: Palestinian Territory, Occupied
+- **`pa`**: Panama
+- **`pg`**: Papua New Guinea
+- **`py`**: Paraguay
+- **`pe`**: Peru
+- **`ph`**: Philippines
+- **`pn`**: Pitcairn
+- **`pl`**: Poland
+- **`pt`**: Portugal
+- **`pr`**: Puerto Rico
+- **`qa`**: Qatar
+- **`re`**: Reunion
+- **`ro`**: Romania
+- **`ru`**: Russian Federation
+- **`rw`**: Rwanda
+- **`sh`**: Saint Helena
+- **`kn`**: Saint Kitts and Nevis
+- **`lc`**: Saint Lucia
+- **`pm`**: Saint Pierre and Miquelon
+- **`vc`**: Saint Vincent and the Grenadines
+- **`ws`**: Samoa
+- **`sm`**: San Marino
+- **`st`**: Sao Tome and Principe
+- **`sa`**: Saudi Arabia
+- **`sn`**: Senegal
+- **`rs`**: Serbia
+- **`sc`**: Seychelles
+- **`sl`**: Sierra Leone
+- **`sg`**: Singapore
+- **`sk`**: Slovakia
+- **`si`**: Slovenia
+- **`sb`**: Solomon Islands
+- **`so`**: Somalia
+- **`za`**: South Africa
+- **`gs`**: South Georgia and the South Sandwich Islands
+- **`es`**: Spain
+- **`lk`**: Sri Lanka
+- **`sd`**: Sudan
+- **`sr`**: Suriname
+- **`sj`**: Svalbard and Jan Mayen
+- **`sz`**: Swaziland
+- **`se`**: Sweden
+- **`ch`**: Switzerland
+- **`sy`**: Syrian Arab Republic
+- **`tw`**: Taiwan, Province of China
+- **`tj`**: Tajikistan
+- **`tz`**: Tanzania, United Republic of
+- **`th`**: Thailand
+- **`tl`**: Timor-Leste
+- **`tg`**: Togo
+- **`tk`**: Tokelau
+- **`to`**: Tonga
+- **`tt`**: Trinidad and Tobago
+- **`tn`**: Tunisia
+- **`tr`**: Turkiye
+- **`tm`**: Turkmenistan
+- **`tc`**: Turks and Caicos Islands
+- **`tv`**: Tuvalu
+- **`ug`**: Uganda
+- **`ua`**: Ukraine
+- **`ae`**: United Arab Emirates
+- **`uk`**: United Kingdom
+- **`gb`**: United Kingdom
+- **`us`**: United States
+- **`um`**: United States Minor Outlying Islands
+- **`uy`**: Uruguay
+- **`uz`**: Uzbekistan
+- **`vu`**: Vanuatu
+- **`ve`**: Venezuela
+- **`vn`**: Viet Nam
+- **`vg`**: Virgin Islands, British
+- **`vi`**: Virgin Islands, U.S.
+- **`wf`**: Wallis and Futuna
+- **`eh`**: Western Sahara
+- **`ye`**: Yemen
+- **`zm`**: Zambia
+- **`zw`**: Zimbabwe
+
+<ToolFooter pipPackageName="arcade_google_shopping" />
diff --git a/pages/toolkits/search/reference.mdx b/pages/toolkits/search/reference.mdx
deleted file mode 100644
index 465d109c7..000000000
--- a/pages/toolkits/search/reference.mdx
+++ /dev/null
@@ -1,368 +0,0 @@
-# Reference for Search Toolkit
-
-## GoogleMapsDistanceUnit
-
-Distance unit to use in the Google Maps search.
-
-- **`KM`**: Kilometers.
-- **`MI`**: Miles.
-
-## GoogleMapsTravelMode
-
-Travel mode to use in the Google Maps search.
-
-- **`BEST`**: Best mode.
-- **`DRIVING`**: Driving mode.
-- **`MOTORCYCLE`**: Motorcycle mode.
-- **`PUBLIC_TRANSPORTATION`**: Public transportation mode.
-- **`WALKING`**: Walking mode.
-- **`BICYCLE`**: Bicycling mode.
-- **`FLIGHT`**: Flight mode.
-
-
-## GoogleFinanceWindow
-
-Defines the time window for fetching stock data from Google Finance.
-
-- **`ONE_DAY`**: Represents a 1-day time window.
-- **`FIVE_DAYS`**: Represents a 5-day time window.
-- **`ONE_MONTH`**: Represents a 1-month time window.
-- **`SIX_MONTHS`**: Represents a 6-month time window.
-- **`YEAR_TO_DATE`**: Represents the time from the start of the year to the current date.
-- **`ONE_YEAR`**: Represents a 1-year time window.
-- **`FIVE_YEARS`**: Represents a 5-year time window.
-- **`MAX`**: Represents the maximum available time window.
-
-
-
-## GoogleFlightsMaxStops
-
-Defines the maximum number of stops for flights.
-
-- **`ANY`**: Any number of stops is allowed.
-- **`NONSTOP`**: Only nonstop flights are allowed.
-- **`ONE`**: Only flights with one stop are allowed.
-- **`TWO`**: Only flights with two stops are allowed.
-
-## GoogleFlightsSortBy
-
-Defines the sorting options for flight search results.
-
-- **`TOP_FLIGHTS`**: Sort by the best available flights.
-- **`PRICE`**: Sort by the lowest price.
-- **`DEPARTURE_TIME`**: Sort by the earliest departure time.
-- **`ARRIVAL_TIME`**: Sort by the earliest arrival time.
-- **`DURATION`**: Sort by the shortest flight duration.
-- **`EMISSIONS`**: Sort by the lowest carbon emissions.
-
-## GoogleFlightsTravelClass
-
-Defines the travel class options for flights.
-
-- **`ECONOMY`**: Economy class.
-- **`PREMIUM_ECONOMY`**: Premium economy class.
-- **`BUSINESS`**: Business class.
-- **`FIRST`**: First class.
-
-
-## GoogleHotelsSortBy
-
-Defines the sorting options for hotel search results.
-
-- **`RELEVANCE`**: Sort by the most relevant results.
-- **`LOWEST_PRICE`**: Sort by the lowest price available.
-- **`HIGHEST_RATING`**: Sort by the highest customer ratings.
-- **`MOST_REVIEWED`**: Sort by the most reviewed hotels.
-
-
-## LanguageCodes
-
-- **`ar`**: Arabic
-- **`bn`**: Bengali
-- **`da`**: Danish
-- **`de`**: German
-- **`el`**: Greek
-- **`en`**: English
-- **`es`**: Spanish
-- **`fi`**: Finnish
-- **`fr`**: French
-- **`hi`**: Hindi
-- **`hu`**: Hungarian
-- **`id`**: Indonesian
-- **`it`**: Italian
-- **`ja`**: Japanese
-- **`ko`**: Korean
-- **`ms`**: Malay
-- **`nl`**: Dutch
-- **`no`**: Norwegian
-- **`pcm`**: Nigerian Pidgin
-- **`pl`**: Polish
-- **`pt`**: Portuguese
-- **`pt-br`**: Portuguese (Brazil)
-- **`pt-pt`**: Portuguese (Portugal)
-- **`ru`**: Russian
-- **`sv`**: Swedish
-- **`tl`**: Filipino
-- **`tr`**: Turkish
-- **`uk`**: Ukrainian
-- **`zh`**: Chinese
-- **`zh-cn`**: Chinese (Simplified)
-- **`zh-tw`**: Chinese (Traditional)
-
-
-## CountryCodes
-
-- **`af`**: Afghanistan
-- **`al`**: Albania
-- **`dz`**: Algeria
-- **`as`**: American Samoa
-- **`ad`**: Andorra
-- **`ao`**: Angola
-- **`ai`**: Anguilla
-- **`aq`**: Antarctica
-- **`ag`**: Antigua and Barbuda
-- **`ar`**: Argentina
-- **`am`**: Armenia
-- **`aw`**: Aruba
-- **`au`**: Australia
-- **`at`**: Austria
-- **`az`**: Azerbaijan
-- **`bs`**: Bahamas
-- **`bh`**: Bahrain
-- **`bd`**: Bangladesh
-- **`bb`**: Barbados
-- **`by`**: Belarus
-- **`be`**: Belgium
-- **`bz`**: Belize
-- **`bj`**: Benin
-- **`bm`**: Bermuda
-- **`bt`**: Bhutan
-- **`bo`**: Bolivia
-- **`ba`**: Bosnia and Herzegovina
-- **`bw`**: Botswana
-- **`bv`**: Bouvet Island
-- **`br`**: Brazil
-- **`io`**: British Indian Ocean Territory
-- **`bn`**: Brunei Darussalam
-- **`bg`**: Bulgaria
-- **`bf`**: Burkina Faso
-- **`bi`**: Burundi
-- **`kh`**: Cambodia
-- **`cm`**: Cameroon
-- **`ca`**: Canada
-- **`cv`**: Cape Verde
-- **`ky`**: Cayman Islands
-- **`cf`**: Central African Republic
-- **`td`**: Chad
-- **`cl`**: Chile
-- **`cn`**: China
-- **`cx`**: Christmas Island
-- **`cc`**: Cocos (Keeling) Islands
-- **`co`**: Colombia
-- **`km`**: Comoros
-- **`cg`**: Congo
-- **`cd`**: Congo, the Democratic Republic of the
-- **`ck`**: Cook Islands
-- **`cr`**: Costa Rica
-- **`ci`**: Cote D'ivoire
-- **`hr`**: Croatia
-- **`cu`**: Cuba
-- **`cy`**: Cyprus
-- **`cz`**: Czech Republic
-- **`dk`**: Denmark
-- **`dj`**: Djibouti
-- **`dm`**: Dominica
-- **`do`**: Dominican Republic
-- **`ec`**: Ecuador
-- **`eg`**: Egypt
-- **`sv`**: El Salvador
-- **`gq`**: Equatorial Guinea
-- **`er`**: Eritrea
-- **`ee`**: Estonia
-- **`et`**: Ethiopia
-- **`fk`**: Falkland Islands (Malvinas)
-- **`fo`**: Faroe Islands
-- **`fj`**: Fiji
-- **`fi`**: Finland
-- **`fr`**: France
-- **`gf`**: French Guiana
-- **`pf`**: French Polynesia
-- **`tf`**: French Southern Territories
-- **`ga`**: Gabon
-- **`gm`**: Gambia
-- **`ge`**: Georgia
-- **`de`**: Germany
-- **`gh`**: Ghana
-- **`gi`**: Gibraltar
-- **`gr`**: Greece
-- **`gl`**: Greenland
-- **`gd`**: Grenada
-- **`gp`**: Guadeloupe
-- **`gu`**: Guam
-- **`gt`**: Guatemala
-- **`gg`**: Guernsey
-- **`gn`**: Guinea
-- **`gw`**: Guinea-Bissau
-- **`gy`**: Guyana
-- **`ht`**: Haiti
-- **`hm`**: Heard Island and Mcdonald Islands
-- **`va`**: Holy See (Vatican City State)
-- **`hn`**: Honduras
-- **`hk`**: Hong Kong
-- **`hu`**: Hungary
-- **`is`**: Iceland
-- **`in`**: India
-- **`id`**: Indonesia
-- **`ir`**: Iran, Islamic Republic of
-- **`iq`**: Iraq
-- **`ie`**: Ireland
-- **`im`**: Isle of Man
-- **`il`**: Israel
-- **`it`**: Italy
-- **`je`**: Jersey
-- **`jm`**: Jamaica
-- **`jp`**: Japan
-- **`jo`**: Jordan
-- **`kz`**: Kazakhstan
-- **`ke`**: Kenya
-- **`ki`**: Kiribati
-- **`kp`**: Korea, Democratic People's Republic of
-- **`kr`**: Korea, Republic of
-- **`kw`**: Kuwait
-- **`kg`**: Kyrgyzstan
-- **`la`**: Lao People's Democratic Republic
-- **`lv`**: Latvia
-- **`lb`**: Lebanon
-- **`ls`**: Lesotho
-- **`lr`**: Liberia
-- **`ly`**: Libyan Arab Jamahiriya
-- **`li`**: Liechtenstein
-- **`lt`**: Lithuania
-- **`lu`**: Luxembourg
-- **`mo`**: Macao
-- **`mk`**: Macedonia, the Former Yugosalv Republic of
-- **`mg`**: Madagascar
-- **`mw`**: Malawi
-- **`my`**: Malaysia
-- **`mv`**: Maldives
-- **`ml`**: Mali
-- **`mt`**: Malta
-- **`mh`**: Marshall Islands
-- **`mq`**: Martinique
-- **`mr`**: Mauritania
-- **`mu`**: Mauritius
-- **`yt`**: Mayotte
-- **`mx`**: Mexico
-- **`fm`**: Micronesia, Federated States of
-- **`md`**: Moldova, Republic of
-- **`mc`**: Monaco
-- **`mn`**: Mongolia
-- **`me`**: Montenegro
-- **`ms`**: Montserrat
-- **`ma`**: Morocco
-- **`mz`**: Mozambique
-- **`mm`**: Myanmar
-- **`na`**: Namibia
-- **`nr`**: Nauru
-- **`np`**: Nepal
-- **`nl`**: Netherlands
-- **`an`**: Netherlands Antilles
-- **`nc`**: New Caledonia
-- **`nz`**: New Zealand
-- **`ni`**: Nicaragua
-- **`ne`**: Niger
-- **`ng`**: Nigeria
-- **`nu`**: Niue
-- **`nf`**: Norfolk Island
-- **`mp`**: Northern Mariana Islands
-- **`no`**: Norway
-- **`om`**: Oman
-- **`pk`**: Pakistan
-- **`pw`**: Palau
-- **`ps`**: Palestinian Territory, Occupied
-- **`pa`**: Panama
-- **`pg`**: Papua New Guinea
-- **`py`**: Paraguay
-- **`pe`**: Peru
-- **`ph`**: Philippines
-- **`pn`**: Pitcairn
-- **`pl`**: Poland
-- **`pt`**: Portugal
-- **`pr`**: Puerto Rico
-- **`qa`**: Qatar
-- **`re`**: Reunion
-- **`ro`**: Romania
-- **`ru`**: Russian Federation
-- **`rw`**: Rwanda
-- **`sh`**: Saint Helena
-- **`kn`**: Saint Kitts and Nevis
-- **`lc`**: Saint Lucia
-- **`pm`**: Saint Pierre and Miquelon
-- **`vc`**: Saint Vincent and the Grenadines
-- **`ws`**: Samoa
-- **`sm`**: San Marino
-- **`st`**: Sao Tome and Principe
-- **`sa`**: Saudi Arabia
-- **`sn`**: Senegal
-- **`rs`**: Serbia
-- **`sc`**: Seychelles
-- **`sl`**: Sierra Leone
-- **`sg`**: Singapore
-- **`sk`**: Slovakia
-- **`si`**: Slovenia
-- **`sb`**: Solomon Islands
-- **`so`**: Somalia
-- **`za`**: South Africa
-- **`gs`**: South Georgia and the South Sandwich Islands
-- **`es`**: Spain
-- **`lk`**: Sri Lanka
-- **`sd`**: Sudan
-- **`sr`**: Suriname
-- **`sj`**: Svalbard and Jan Mayen
-- **`sz`**: Swaziland
-- **`se`**: Sweden
-- **`ch`**: Switzerland
-- **`sy`**: Syrian Arab Republic
-- **`tw`**: Taiwan, Province of China
-- **`tj`**: Tajikistan
-- **`tz`**: Tanzania, United Republic of
-- **`th`**: Thailand
-- **`tl`**: Timor-Leste
-- **`tg`**: Togo
-- **`tk`**: Tokelau
-- **`to`**: Tonga
-- **`tt`**: Trinidad and Tobago
-- **`tn`**: Tunisia
-- **`tr`**: Turkiye
-- **`tm`**: Turkmenistan
-- **`tc`**: Turks and Caicos Islands
-- **`tv`**: Tuvalu
-- **`ug`**: Uganda
-- **`ua`**: Ukraine
-- **`ae`**: United Arab Emirates
-- **`uk`**: United Kingdom
-- **`gb`**: United Kingdom
-- **`us`**: United States
-- **`um`**: United States Minor Outlying Islands
-- **`uy`**: Uruguay
-- **`uz`**: Uzbekistan
-- **`vu`**: Vanuatu
-- **`ve`**: Venezuela
-- **`vn`**: Viet Nam
-- **`vg`**: Virgin Islands, British
-- **`vi`**: Virgin Islands, U.S.
-- **`wf`**: Wallis and Futuna
-- **`eh`**: Western Sahara
-- **`ye`**: Yemen
-- **`zm`**: Zambia
-- **`zw`**: Zimbabwe
-
-
-## WalmartSortBy
-
-- **`RELEVANCE`**: `'relevance_according_to_keywords_searched'` - Sort by relevance.
-- **`PRICE_LOW_TO_HIGH`**: `'lowest_price_first'` - Sort by price from low to high.
-- **`PRICE_HIGH_TO_LOW`**: `'highest_price_first'` - Sort by price from high to low.
-- **`BEST_SELLING`**: `'best_selling_products_first'` - Sort by best selling.
-- **`RATING_HIGH`**: `'highest_rating_first'` - Sort by rating from high to low.
-- **`NEW_ARRIVALS`**: `'new_arrivals_first'` - Sort by new arrivals.
diff --git a/pages/toolkits/search/walmart.mdx b/pages/toolkits/search/walmart.mdx
index 4e291c8a2..7ae3af7f0 100644
--- a/pages/toolkits/search/walmart.mdx
+++ b/pages/toolkits/search/walmart.mdx
@@ -9,12 +9,12 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to search for products with Walmart."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/search"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/walmart"
   authType="API Key"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_search" />
+<Badges repo="arcadeai/arcade-walmart" />
 
 The Arcade Walmart Search toolkit provides a pre-built set of tools for interacting with Walmart. These tools make it easy to build agents and AI apps that can:
 
@@ -27,8 +27,8 @@ The Arcade Walmart Search toolkit provides a pre-built set of tools for interact
   headers={["Tool Name", "Description"]}
   data={
     [
-      ["Search.SearchWalmartProducts", "Search for products listed on Walmart stores."],
-      ["Search.GetWalmartProductDetails", "Get details about a product listed on Walmart."],
+      ["Walmart.SearchProducts", "Search for products listed on Walmart stores."],
+      ["Walmart.GetProductDetails", "Get details about a product listed on Walmart."],
     ]
   }
 />
@@ -39,7 +39,7 @@ The Arcade Walmart Search toolkit provides a pre-built set of tools for interact
   own tools](/home/build-tools/create-a-toolkit).
 </Tip>
 
-## Search.SearchWalmartProducts
+## Walmart.SearchProducts
 
 <br />
 <TabbedCodeBlock
@@ -59,14 +59,14 @@ Search for products listed on Walmart stores.
 **Parameters**
 
 - **keywords** _(string, required)_ Keywords to search for. E.g. 'apple iphone' or 'samsung galaxy'
-- **sort_by** _(enum [WalmartSortBy](/toolkits/search/reference#walmartsortby), optional, Defaults to `WalmartSortBy.RELEVANCE`)_ Sort the results by the specified criteria. Defaults to `WalmartSortBy.RELEVANCE`.
+- **sort_by** _(enum [WalmartSortBy](#walmartsortby), optional, Defaults to `WalmartSortBy.RELEVANCE`)_ Sort the results by the specified criteria. Defaults to `WalmartSortBy.RELEVANCE`.
 - **min_price** _(float, optional, Defaults to `None`)_ Minimum price to filter the results.
 - **max_price** _(float, optional, Defaults to `None`)_ Maximum price to filter the results.
 - **next_day_delivery** _(bool, optional, Defaults to `False`)_ Whether to filter the results by next day delivery. Defaults to False (returns all products, regardless of delivery status).
 - **page** _(int, optional, Defaults to `1`)_ Page number to fetch. Defaults to 1 (first page of results). The maximum page value is 100.
 
 
-## Search.GetWalmartProductDetails
+## Walmart.GetProductDetails
 
 <br />
 <TabbedCodeBlock
@@ -97,4 +97,17 @@ The Arcade Walmart Search toolkit uses the [SerpAPI](https://serpapi.com/) to ge
   Setting the `SERP_API_KEY` secret is only required if you are [self-hosting](/home/local-deployment/install/overview) Arcade. If you're using Arcade Cloud, the secret is already set for you. To manage your secrets, go to the [Secrets page](https://api.arcade.dev/dashboard/auth/secrets) in the Arcade Dashboard.
 </Note>
 
-<ToolFooter pipPackageName="arcade_search" />
+---
+
+## Reference
+
+## WalmartSortBy
+
+- **`RELEVANCE`**: `'relevance_according_to_keywords_searched'` - Sort by relevance.
+- **`PRICE_LOW_TO_HIGH`**: `'lowest_price_first'` - Sort by price from low to high.
+- **`PRICE_HIGH_TO_LOW`**: `'highest_price_first'` - Sort by price from high to low.
+- **`BEST_SELLING`**: `'best_selling_products_first'` - Sort by best selling.
+- **`RATING_HIGH`**: `'highest_rating_first'` - Sort by rating from high to low.
+- **`NEW_ARRIVALS`**: `'new_arrivals_first'` - Sort by new arrivals.
+
+<ToolFooter pipPackageName="arcade_walmart" />
diff --git a/pages/toolkits/search/youtube.mdx b/pages/toolkits/search/youtube.mdx
index 984579964..b39df8c65 100644
--- a/pages/toolkits/search/youtube.mdx
+++ b/pages/toolkits/search/youtube.mdx
@@ -9,12 +9,12 @@ import ToolFooter from "@/components/ToolFooter";
 <ToolInfo
   description="Enable agents to search for videos on YouTube."
   author="Arcade"
-  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/search"
+  codeLink="https://github.com/ArcadeAI/arcade-ai/tree/main/toolkits/youtube"
   authType="API Key"
   versions={["0.1.0"]}
 />
 
-<Badges repo="arcadeai/arcade_search" />
+<Badges repo="arcadeai/arcade_youtube" />
 
 The Arcade YouTube Search toolkit provides a pre-built set of tools for interacting with YouTube. These tools make it easy to build agents and AI apps that can:
 
@@ -27,8 +27,8 @@ The Arcade YouTube Search toolkit provides a pre-built set of tools for interact
   headers={["Tool Name", "Description"]}
   data={
     [
-      ["Search.SearchYoutubeVideos", "Search for videos on YouTube."],
-      ["Search.GetYoutubeVideoDetails", "Get details about a video on YouTube."],
+      ["Youtube.SearchForVideos", "Search for videos on YouTube."],
+      ["Youtube.GetYoutubeVideoDetails", "Get details about a video on YouTube."],
     ]
   }
 />
@@ -39,7 +39,7 @@ The Arcade YouTube Search toolkit provides a pre-built set of tools for interact
   own tools](/home/build-tools/create-a-toolkit).
 </Tip>
 
-## Search.SearchYoutubeVideos
+## Youtube.SearchForVideos
 
 <br />
 <TabbedCodeBlock
@@ -59,12 +59,12 @@ Search for videos on YouTube.
 **Parameters**
 
 - **keywords** _(string, required)_ Keywords to search for. E.g. 'apple iphone' or 'samsung galaxy'
-- **`language_code`** _(string, optional, Defaults to 'en' English)_ 2-character language code to use in the YouTube search. A list of supported language codes can be found [here](/toolkits/search/reference#languagecodes).
-- **`country_code`** _(string, optional, Defaults to 'us' United States)_ 2-character country code to use in the YouTube search. A list of supported country codes can be found [here](/toolkits/search/reference#countrycodes).
+- **`language_code`** _(string, optional, Defaults to 'en' English)_ 2-character language code to use in the YouTube search. A list of supported language codes can be found [here](#languagecodes).
+- **`country_code`** _(string, optional, Defaults to 'us' United States)_ 2-character country code to use in the YouTube search. A list of supported country codes can be found [here](#countrycodes).
 - **`next_page_token`** _(string, optional, Defaults to 'None')_ The next page token to use for pagination. Defaults to `None` (start from the first page).
 
 
-## Search.GetYoutubeVideoDetails
+## Youtube.GetYoutubeVideoDetails
 
 <br />
 <TabbedCodeBlock
@@ -84,8 +84,8 @@ Get details about a video on YouTube.
 **Parameters**
 
 - **video_id** _(string, required)_ Video ID. E.g. '414600577'. This can be retrieved from the search results of the `SearchYoutubeVideos` tool.
-- **`language_code`** _(string, optional, Defaults to 'en' English)_ 2-character language code to return information about the video. A list of supported language codes can be found [here](/toolkits/search/reference#languagecodes).
-- **`country_code`** _(string, optional, Defaults to 'us' United States)_ 2-character country code to return information about the video. A list of supported country codes can be found [here](/toolkits/search/reference#countrycodes).
+- **`language_code`** _(string, optional, Defaults to 'en' English)_ 2-character language code to return information about the video. A list of supported language codes can be found [here](#languagecodes).
+- **`country_code`** _(string, optional, Defaults to 'us' United States)_ 2-character country code to return information about the video. A list of supported country codes can be found [here](#countrycodes).
 
 ## Auth
 
@@ -111,7 +111,7 @@ The language code is a 2-character code that determines the language in which th
 - `ARCADE_GOOGLE_LANGUAGE`: a default value for all Google Search tools. If not set, defaults to 'en' (English).
 - `ARCADE_YOUTUBE_SEARCH_LANGUAGE`: a default value for the YouTube Search tools. If not set, defaults to `ARCADE_GOOGLE_LANGUAGE`.
 
-A list of supported language codes can be found [here](/toolkits/search/reference#languagecodes).
+A list of supported language codes can be found [here](#languagecodes).
 
 **Country**
 
@@ -120,6 +120,291 @@ The country code is a 2-character code that determines the country in which the
 - `ARCADE_GOOGLE_COUNTRY`: a default value for all Google Search tools. If not set, defaults to `None`.
 - `ARCADE_YOUTUBE_SEARCH_COUNTRY`: a default value for the YouTube Search tools. If not set, defaults to `ARCADE_GOOGLE_COUNTRY`. If `ARCADE_GOOGLE_COUNTRY` is not set, the default country for YouTube tools will be `us` (United States).
 
-A list of supported country codes can be found [here](/toolkits/search/reference#countrycodes).
-
-<ToolFooter pipPackageName="arcade_search" />
+A list of supported country codes can be found [here](#countrycodes).
+
+---
+
+## Reference
+
+## LanguageCodes
+
+- **`ar`**: Arabic
+- **`bn`**: Bengali
+- **`da`**: Danish
+- **`de`**: German
+- **`el`**: Greek
+- **`en`**: English
+- **`es`**: Spanish
+- **`fi`**: Finnish
+- **`fr`**: French
+- **`hi`**: Hindi
+- **`hu`**: Hungarian
+- **`id`**: Indonesian
+- **`it`**: Italian
+- **`ja`**: Japanese
+- **`ko`**: Korean
+- **`ms`**: Malay
+- **`nl`**: Dutch
+- **`no`**: Norwegian
+- **`pcm`**: Nigerian Pidgin
+- **`pl`**: Polish
+- **`pt`**: Portuguese
+- **`pt-br`**: Portuguese (Brazil)
+- **`pt-pt`**: Portuguese (Portugal)
+- **`ru`**: Russian
+- **`sv`**: Swedish
+- **`tl`**: Filipino
+- **`tr`**: Turkish
+- **`uk`**: Ukrainian
+- **`zh`**: Chinese
+- **`zh-cn`**: Chinese (Simplified)
+- **`zh-tw`**: Chinese (Traditional)
+
+## CountryCodes
+
+- **`af`**: Afghanistan
+- **`al`**: Albania
+- **`dz`**: Algeria
+- **`as`**: American Samoa
+- **`ad`**: Andorra
+- **`ao`**: Angola
+- **`ai`**: Anguilla
+- **`aq`**: Antarctica
+- **`ag`**: Antigua and Barbuda
+- **`ar`**: Argentina
+- **`am`**: Armenia
+- **`aw`**: Aruba
+- **`au`**: Australia
+- **`at`**: Austria
+- **`az`**: Azerbaijan
+- **`bs`**: Bahamas
+- **`bh`**: Bahrain
+- **`bd`**: Bangladesh
+- **`bb`**: Barbados
+- **`by`**: Belarus
+- **`be`**: Belgium
+- **`bz`**: Belize
+- **`bj`**: Benin
+- **`bm`**: Bermuda
+- **`bt`**: Bhutan
+- **`bo`**: Bolivia
+- **`ba`**: Bosnia and Herzegovina
+- **`bw`**: Botswana
+- **`bv`**: Bouvet Island
+- **`br`**: Brazil
+- **`io`**: British Indian Ocean Territory
+- **`bn`**: Brunei Darussalam
+- **`bg`**: Bulgaria
+- **`bf`**: Burkina Faso
+- **`bi`**: Burundi
+- **`kh`**: Cambodia
+- **`cm`**: Cameroon
+- **`ca`**: Canada
+- **`cv`**: Cape Verde
+- **`ky`**: Cayman Islands
+- **`cf`**: Central African Republic
+- **`td`**: Chad
+- **`cl`**: Chile
+- **`cn`**: China
+- **`cx`**: Christmas Island
+- **`cc`**: Cocos (Keeling) Islands
+- **`co`**: Colombia
+- **`km`**: Comoros
+- **`cg`**: Congo
+- **`cd`**: Congo, the Democratic Republic of the
+- **`ck`**: Cook Islands
+- **`cr`**: Costa Rica
+- **`ci`**: Cote D'ivoire
+- **`hr`**: Croatia
+- **`cu`**: Cuba
+- **`cy`**: Cyprus
+- **`cz`**: Czech Republic
+- **`dk`**: Denmark
+- **`dj`**: Djibouti
+- **`dm`**: Dominica
+- **`do`**: Dominican Republic
+- **`ec`**: Ecuador
+- **`eg`**: Egypt
+- **`sv`**: El Salvador
+- **`gq`**: Equatorial Guinea
+- **`er`**: Eritrea
+- **`ee`**: Estonia
+- **`et`**: Ethiopia
+- **`fk`**: Falkland Islands (Malvinas)
+- **`fo`**: Faroe Islands
+- **`fj`**: Fiji
+- **`fi`**: Finland
+- **`fr`**: France
+- **`gf`**: French Guiana
+- **`pf`**: French Polynesia
+- **`tf`**: French Southern Territories
+- **`ga`**: Gabon
+- **`gm`**: Gambia
+- **`ge`**: Georgia
+- **`de`**: Germany
+- **`gh`**: Ghana
+- **`gi`**: Gibraltar
+- **`gr`**: Greece
+- **`gl`**: Greenland
+- **`gd`**: Grenada
+- **`gp`**: Guadeloupe
+- **`gu`**: Guam
+- **`gt`**: Guatemala
+- **`gg`**: Guernsey
+- **`gn`**: Guinea
+- **`gw`**: Guinea-Bissau
+- **`gy`**: Guyana
+- **`ht`**: Haiti
+- **`hm`**: Heard Island and Mcdonald Islands
+- **`va`**: Holy See (Vatican City State)
+- **`hn`**: Honduras
+- **`hk`**: Hong Kong
+- **`hu`**: Hungary
+- **`is`**: Iceland
+- **`in`**: India
+- **`id`**: Indonesia
+- **`ir`**: Iran, Islamic Republic of
+- **`iq`**: Iraq
+- **`ie`**: Ireland
+- **`im`**: Isle of Man
+- **`il`**: Israel
+- **`it`**: Italy
+- **`je`**: Jersey
+- **`jm`**: Jamaica
+- **`jp`**: Japan
+- **`jo`**: Jordan
+- **`kz`**: Kazakhstan
+- **`ke`**: Kenya
+- **`ki`**: Kiribati
+- **`kp`**: Korea, Democratic People's Republic of
+- **`kr`**: Korea, Republic of
+- **`kw`**: Kuwait
+- **`kg`**: Kyrgyzstan
+- **`la`**: Lao People's Democratic Republic
+- **`lv`**: Latvia
+- **`lb`**: Lebanon
+- **`ls`**: Lesotho
+- **`lr`**: Liberia
+- **`ly`**: Libyan Arab Jamahiriya
+- **`li`**: Liechtenstein
+- **`lt`**: Lithuania
+- **`lu`**: Luxembourg
+- **`mo`**: Macao
+- **`mk`**: Macedonia, the Former Yugosalv Republic of
+- **`mg`**: Madagascar
+- **`mw`**: Malawi
+- **`my`**: Malaysia
+- **`mv`**: Maldives
+- **`ml`**: Mali
+- **`mt`**: Malta
+- **`mh`**: Marshall Islands
+- **`mq`**: Martinique
+- **`mr`**: Mauritania
+- **`mu`**: Mauritius
+- **`yt`**: Mayotte
+- **`mx`**: Mexico
+- **`fm`**: Micronesia, Federated States of
+- **`md`**: Moldova, Republic of
+- **`mc`**: Monaco
+- **`mn`**: Mongolia
+- **`me`**: Montenegro
+- **`ms`**: Montserrat
+- **`ma`**: Morocco
+- **`mz`**: Mozambique
+- **`mm`**: Myanmar
+- **`na`**: Namibia
+- **`nr`**: Nauru
+- **`np`**: Nepal
+- **`nl`**: Netherlands
+- **`an`**: Netherlands Antilles
+- **`nc`**: New Caledonia
+- **`nz`**: New Zealand
+- **`ni`**: Nicaragua
+- **`ne`**: Niger
+- **`ng`**: Nigeria
+- **`nu`**: Niue
+- **`nf`**: Norfolk Island
+- **`mp`**: Northern Mariana Islands
+- **`no`**: Norway
+- **`om`**: Oman
+- **`pk`**: Pakistan
+- **`pw`**: Palau
+- **`ps`**: Palestinian Territory, Occupied
+- **`pa`**: Panama
+- **`pg`**: Papua New Guinea
+- **`py`**: Paraguay
+- **`pe`**: Peru
+- **`ph`**: Philippines
+- **`pn`**: Pitcairn
+- **`pl`**: Poland
+- **`pt`**: Portugal
+- **`pr`**: Puerto Rico
+- **`qa`**: Qatar
+- **`re`**: Reunion
+- **`ro`**: Romania
+- **`ru`**: Russian Federation
+- **`rw`**: Rwanda
+- **`sh`**: Saint Helena
+- **`kn`**: Saint Kitts and Nevis
+- **`lc`**: Saint Lucia
+- **`pm`**: Saint Pierre and Miquelon
+- **`vc`**: Saint Vincent and the Grenadines
+- **`ws`**: Samoa
+- **`sm`**: San Marino
+- **`st`**: Sao Tome and Principe
+- **`sa`**: Saudi Arabia
+- **`sn`**: Senegal
+- **`rs`**: Serbia
+- **`sc`**: Seychelles
+- **`sl`**: Sierra Leone
+- **`sg`**: Singapore
+- **`sk`**: Slovakia
+- **`si`**: Slovenia
+- **`sb`**: Solomon Islands
+- **`so`**: Somalia
+- **`za`**: South Africa
+- **`gs`**: South Georgia and the South Sandwich Islands
+- **`es`**: Spain
+- **`lk`**: Sri Lanka
+- **`sd`**: Sudan
+- **`sr`**: Suriname
+- **`sj`**: Svalbard and Jan Mayen
+- **`sz`**: Swaziland
+- **`se`**: Sweden
+- **`ch`**: Switzerland
+- **`sy`**: Syrian Arab Republic
+- **`tw`**: Taiwan, Province of China
+- **`tj`**: Tajikistan
+- **`tz`**: Tanzania, United Republic of
+- **`th`**: Thailand
+- **`tl`**: Timor-Leste
+- **`tg`**: Togo
+- **`tk`**: Tokelau
+- **`to`**: Tonga
+- **`tt`**: Trinidad and Tobago
+- **`tn`**: Tunisia
+- **`tr`**: Turkiye
+- **`tm`**: Turkmenistan
+- **`tc`**: Turks and Caicos Islands
+- **`tv`**: Tuvalu
+- **`ug`**: Uganda
+- **`ua`**: Ukraine
+- **`ae`**: United Arab Emirates
+- **`uk`**: United Kingdom
+- **`gb`**: United Kingdom
+- **`us`**: United States
+- **`um`**: United States Minor Outlying Islands
+- **`uy`**: Uruguay
+- **`uz`**: Uzbekistan
+- **`vu`**: Vanuatu
+- **`ve`**: Venezuela
+- **`vn`**: Viet Nam
+- **`vg`**: Virgin Islands, British
+- **`vi`**: Virgin Islands, U.S.
+- **`wf`**: Wallis and Futuna
+- **`eh`**: Western Sahara
+- **`ye`**: Yemen
+- **`zm`**: Zambia
+- **`zw`**: Zimbabwe
+
+<ToolFooter pipPackageName="arcade_youtube" />
diff --git a/public/examples/integrations/toolkits/code-sandbox/create_static_matplotlib_chart_example_call_tool.js b/public/examples/integrations/toolkits/e2b/create_static_matplotlib_chart_example_call_tool.js
similarity index 90%
rename from public/examples/integrations/toolkits/code-sandbox/create_static_matplotlib_chart_example_call_tool.js
rename to public/examples/integrations/toolkits/e2b/create_static_matplotlib_chart_example_call_tool.js
index 8bd0dcbc3..719932e7a 100644
--- a/public/examples/integrations/toolkits/code-sandbox/create_static_matplotlib_chart_example_call_tool.js
+++ b/public/examples/integrations/toolkits/e2b/create_static_matplotlib_chart_example_call_tool.js
@@ -4,7 +4,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "CodeSandbox.CreateStaticMatplotlibChart";
+const TOOL_NAME = "E2b.CreateStaticMatplotlibChart";
 
 // Define the code to create a chart
 const chartCode = `
@@ -34,4 +34,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/code-sandbox/create_static_matplotlib_chart_example_call_tool.py b/public/examples/integrations/toolkits/e2b/create_static_matplotlib_chart_example_call_tool.py
similarity index 93%
rename from public/examples/integrations/toolkits/code-sandbox/create_static_matplotlib_chart_example_call_tool.py
rename to public/examples/integrations/toolkits/e2b/create_static_matplotlib_chart_example_call_tool.py
index 433abedde..6ddb2b1b4 100644
--- a/public/examples/integrations/toolkits/code-sandbox/create_static_matplotlib_chart_example_call_tool.py
+++ b/public/examples/integrations/toolkits/e2b/create_static_matplotlib_chart_example_call_tool.py
@@ -4,7 +4,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "CodeSandbox.CreateStaticMatplotlibChart"
+TOOL_NAME = "E2b.CreateStaticMatplotlibChart"
 
 # Define the code to create a chart
 chart_code = """
diff --git a/public/examples/integrations/toolkits/code-sandbox/run_code_example_call_tool.js b/public/examples/integrations/toolkits/e2b/run_code_example_call_tool.js
similarity index 95%
rename from public/examples/integrations/toolkits/code-sandbox/run_code_example_call_tool.js
rename to public/examples/integrations/toolkits/e2b/run_code_example_call_tool.js
index 73144594a..8dbcb7940 100644
--- a/public/examples/integrations/toolkits/code-sandbox/run_code_example_call_tool.js
+++ b/public/examples/integrations/toolkits/e2b/run_code_example_call_tool.js
@@ -4,7 +4,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "CodeSandbox.RunCode";
+const TOOL_NAME = "E2b.RunCode";
 
 // Define the code to merge sort a list
 const mergeSort = `
@@ -56,4 +56,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/code-sandbox/run_code_example_call_tool.py b/public/examples/integrations/toolkits/e2b/run_code_example_call_tool.py
similarity index 96%
rename from public/examples/integrations/toolkits/code-sandbox/run_code_example_call_tool.py
rename to public/examples/integrations/toolkits/e2b/run_code_example_call_tool.py
index 7320c69a9..336bfcf9e 100644
--- a/public/examples/integrations/toolkits/code-sandbox/run_code_example_call_tool.py
+++ b/public/examples/integrations/toolkits/e2b/run_code_example_call_tool.py
@@ -4,7 +4,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "CodeSandbox.RunCode"
+TOOL_NAME = "E2b.RunCode"
 
 # Define the code to merge sort a list
 merge_sort = """
diff --git a/public/examples/integrations/toolkits/web/cancel_crawl_example_call_tool.js b/public/examples/integrations/toolkits/firecrawl/cancel_crawl_example_call_tool.js
similarity index 83%
rename from public/examples/integrations/toolkits/web/cancel_crawl_example_call_tool.js
rename to public/examples/integrations/toolkits/firecrawl/cancel_crawl_example_call_tool.js
index ce5a5b0af..ccd4e90f0 100644
--- a/public/examples/integrations/toolkits/web/cancel_crawl_example_call_tool.js
+++ b/public/examples/integrations/toolkits/firecrawl/cancel_crawl_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Web.CancelCrawl";
+const TOOL_NAME = "Firecrawl.CancelCrawl";
 
 const toolInput = {
   crawl_id: "your_crawl_id"
@@ -15,4 +15,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/web/cancel_crawl_example_call_tool.py b/public/examples/integrations/toolkits/firecrawl/cancel_crawl_example_call_tool.py
similarity index 89%
rename from public/examples/integrations/toolkits/web/cancel_crawl_example_call_tool.py
rename to public/examples/integrations/toolkits/firecrawl/cancel_crawl_example_call_tool.py
index 2393f76bc..37f53771f 100644
--- a/public/examples/integrations/toolkits/web/cancel_crawl_example_call_tool.py
+++ b/public/examples/integrations/toolkits/firecrawl/cancel_crawl_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Web.CancelCrawl"
+TOOL_NAME = "Firecrawl.CancelCrawl"
 
 tool_input = {"crawl_id": "your_crawl_id"}
 
diff --git a/public/examples/integrations/toolkits/web/crawl_website_example_call_tool.js b/public/examples/integrations/toolkits/firecrawl/crawl_website_example_call_tool.js
similarity index 84%
rename from public/examples/integrations/toolkits/web/crawl_website_example_call_tool.js
rename to public/examples/integrations/toolkits/firecrawl/crawl_website_example_call_tool.js
index d7b7d819a..f19d6a2e9 100644
--- a/public/examples/integrations/toolkits/web/crawl_website_example_call_tool.js
+++ b/public/examples/integrations/toolkits/firecrawl/crawl_website_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Web.CrawlWebsite";
+const TOOL_NAME = "Firecrawl.CrawlWebsite";
 
 const toolInput = {
   url: "https://example.com",
@@ -16,4 +16,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/web/crawl_website_example_call_tool.py b/public/examples/integrations/toolkits/firecrawl/crawl_website_example_call_tool.py
similarity index 89%
rename from public/examples/integrations/toolkits/web/crawl_website_example_call_tool.py
rename to public/examples/integrations/toolkits/firecrawl/crawl_website_example_call_tool.py
index a8809b59d..1fc3054b0 100644
--- a/public/examples/integrations/toolkits/web/crawl_website_example_call_tool.py
+++ b/public/examples/integrations/toolkits/firecrawl/crawl_website_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Web.CrawlWebsite"
+TOOL_NAME = "Firecrawl.CrawlWebsite"
 
 tool_input = {"url": "https://example.com", "max_depth": 2}
 
diff --git a/public/examples/integrations/toolkits/web/get_crawl_data_example_call_tool.js b/public/examples/integrations/toolkits/firecrawl/get_crawl_data_example_call_tool.js
similarity index 83%
rename from public/examples/integrations/toolkits/web/get_crawl_data_example_call_tool.js
rename to public/examples/integrations/toolkits/firecrawl/get_crawl_data_example_call_tool.js
index 0938de1db..f3dcc1c01 100644
--- a/public/examples/integrations/toolkits/web/get_crawl_data_example_call_tool.js
+++ b/public/examples/integrations/toolkits/firecrawl/get_crawl_data_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Web.GetCrawlData";
+const TOOL_NAME = "Firecrawl.GetCrawlData";
 
 const toolInput = {
   crawl_id: "your_crawl_id"
@@ -15,4 +15,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/web/get_crawl_data_example_call_tool.py b/public/examples/integrations/toolkits/firecrawl/get_crawl_data_example_call_tool.py
similarity index 88%
rename from public/examples/integrations/toolkits/web/get_crawl_data_example_call_tool.py
rename to public/examples/integrations/toolkits/firecrawl/get_crawl_data_example_call_tool.py
index ba61afe69..ba4dd53b1 100644
--- a/public/examples/integrations/toolkits/web/get_crawl_data_example_call_tool.py
+++ b/public/examples/integrations/toolkits/firecrawl/get_crawl_data_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Web.GetCrawlData"
+TOOL_NAME = "Firecrawl.GetCrawlData"
 
 tool_input = {"crawl_id": "your_crawl_id"}
 
diff --git a/public/examples/integrations/toolkits/web/get_crawl_status_example_call_tool.js b/public/examples/integrations/toolkits/firecrawl/get_crawl_status_example_call_tool.js
similarity index 83%
rename from public/examples/integrations/toolkits/web/get_crawl_status_example_call_tool.js
rename to public/examples/integrations/toolkits/firecrawl/get_crawl_status_example_call_tool.js
index 0e41df210..9f0eec3d7 100644
--- a/public/examples/integrations/toolkits/web/get_crawl_status_example_call_tool.js
+++ b/public/examples/integrations/toolkits/firecrawl/get_crawl_status_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Web.GetCrawlStatus";
+const TOOL_NAME = "Firecrawl.GetCrawlStatus";
 
 const toolInput = {
   crawl_id: "your_crawl_id"
@@ -15,4 +15,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/web/get_crawl_status_example_call_tool.py b/public/examples/integrations/toolkits/firecrawl/get_crawl_status_example_call_tool.py
similarity index 88%
rename from public/examples/integrations/toolkits/web/get_crawl_status_example_call_tool.py
rename to public/examples/integrations/toolkits/firecrawl/get_crawl_status_example_call_tool.py
index 9db589a03..22a6d838e 100644
--- a/public/examples/integrations/toolkits/web/get_crawl_status_example_call_tool.py
+++ b/public/examples/integrations/toolkits/firecrawl/get_crawl_status_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Web.GetCrawlStatus"
+TOOL_NAME = "Firecrawl.GetCrawlStatus"
 
 tool_input = {"crawl_id": "your_crawl_id"}
 
diff --git a/public/examples/integrations/toolkits/web/map_website_example_call_tool.js b/public/examples/integrations/toolkits/firecrawl/map_website_example_call_tool.js
similarity index 83%
rename from public/examples/integrations/toolkits/web/map_website_example_call_tool.js
rename to public/examples/integrations/toolkits/firecrawl/map_website_example_call_tool.js
index d79a653cf..901f98230 100644
--- a/public/examples/integrations/toolkits/web/map_website_example_call_tool.js
+++ b/public/examples/integrations/toolkits/firecrawl/map_website_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Web.MapWebsite";
+const TOOL_NAME = "Firecrawl.MapWebsite";
 
 const toolInput = {
   url: "https://example.com"
@@ -15,4 +15,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/web/map_website_example_call_tool.py b/public/examples/integrations/toolkits/firecrawl/map_website_example_call_tool.py
similarity index 89%
rename from public/examples/integrations/toolkits/web/map_website_example_call_tool.py
rename to public/examples/integrations/toolkits/firecrawl/map_website_example_call_tool.py
index d1b1fa3b2..e4cab328f 100644
--- a/public/examples/integrations/toolkits/web/map_website_example_call_tool.py
+++ b/public/examples/integrations/toolkits/firecrawl/map_website_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Web.MapWebsite"
+TOOL_NAME = "Firecrawl.MapWebsite"
 
 tool_input = {"url": "https://example.com"}
 
diff --git a/public/examples/integrations/toolkits/web/scrape_url_example_call_tool.js b/public/examples/integrations/toolkits/firecrawl/scrape_url_example_call_tool.js
similarity index 85%
rename from public/examples/integrations/toolkits/web/scrape_url_example_call_tool.js
rename to public/examples/integrations/toolkits/firecrawl/scrape_url_example_call_tool.js
index 29e1a3c99..43d240f22 100644
--- a/public/examples/integrations/toolkits/web/scrape_url_example_call_tool.js
+++ b/public/examples/integrations/toolkits/firecrawl/scrape_url_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Web.ScrapeUrl";
+const TOOL_NAME = "Firecrawl.ScrapeUrl";
 
 const toolInput = {
   url: "https://example.com",
@@ -16,4 +16,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/web/scrape_url_example_call_tool.py b/public/examples/integrations/toolkits/firecrawl/scrape_url_example_call_tool.py
similarity index 90%
rename from public/examples/integrations/toolkits/web/scrape_url_example_call_tool.py
rename to public/examples/integrations/toolkits/firecrawl/scrape_url_example_call_tool.py
index d0194e5bd..090b00f2d 100644
--- a/public/examples/integrations/toolkits/web/scrape_url_example_call_tool.py
+++ b/public/examples/integrations/toolkits/firecrawl/scrape_url_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Web.ScrapeUrl"
+TOOL_NAME = "Firecrawl.ScrapeUrl"
 
 tool_input = {"url": "https://example.com", "formats": "Formats.MARKDOWN"}
 
diff --git a/public/examples/integrations/toolkits/google/calendar/create_event_example_call_tool.js b/public/examples/integrations/toolkits/google/calendar/create_event_example_call_tool.js
index 1449a9301..420ac770b 100644
--- a/public/examples/integrations/toolkits/google/calendar/create_event_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/calendar/create_event_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.CreateEvent";
+const TOOL_NAME = "GoogleCalendar.CreateEvent";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/calendar/create_event_example_call_tool.py b/public/examples/integrations/toolkits/google/calendar/create_event_example_call_tool.py
index ff0a0b0a2..348d2b588 100644
--- a/public/examples/integrations/toolkits/google/calendar/create_event_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/calendar/create_event_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.CreateEvent"
+TOOL_NAME = "GoogleCalendar.CreateEvent"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/calendar/delete_event_example_call_tool.js b/public/examples/integrations/toolkits/google/calendar/delete_event_example_call_tool.js
index c13c80c8c..80b2941e7 100644
--- a/public/examples/integrations/toolkits/google/calendar/delete_event_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/calendar/delete_event_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.DeleteEvent";
+const TOOL_NAME = "GoogleCalendar.DeleteEvent";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/calendar/delete_event_example_call_tool.py b/public/examples/integrations/toolkits/google/calendar/delete_event_example_call_tool.py
index 8663b8b08..35eff5710 100644
--- a/public/examples/integrations/toolkits/google/calendar/delete_event_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/calendar/delete_event_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.DeleteEvent"
+TOOL_NAME = "GoogleCalendar.DeleteEvent"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/calendar/find_free_slots_example_call_tool.js b/public/examples/integrations/toolkits/google/calendar/find_free_slots_example_call_tool.js
index e751e0444..c7d249f34 100644
--- a/public/examples/integrations/toolkits/google/calendar/find_free_slots_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/calendar/find_free_slots_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.FindTimeSlotsWhenEveryoneIsFree";
+const TOOL_NAME = "GoogleCalendar.FindTimeSlotsWhenEveryoneIsFree";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/calendar/find_free_slots_example_call_tool.py b/public/examples/integrations/toolkits/google/calendar/find_free_slots_example_call_tool.py
index 554b2b22f..9ef5e7b1b 100644
--- a/public/examples/integrations/toolkits/google/calendar/find_free_slots_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/calendar/find_free_slots_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.FindTimeSlotsWhenEveryoneIsFree"
+TOOL_NAME = "GoogleCalendar.FindTimeSlotsWhenEveryoneIsFree"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/calendar/list_calendars_example_call_tool.js b/public/examples/integrations/toolkits/google/calendar/list_calendars_example_call_tool.js
index a82b4abe2..9a6518f64 100644
--- a/public/examples/integrations/toolkits/google/calendar/list_calendars_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/calendar/list_calendars_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.ListCalendars";
+const TOOL_NAME = "GoogleCalendar.ListCalendars";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/calendar/list_calendars_example_call_tool.py b/public/examples/integrations/toolkits/google/calendar/list_calendars_example_call_tool.py
index f42085198..fdd7e4159 100644
--- a/public/examples/integrations/toolkits/google/calendar/list_calendars_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/calendar/list_calendars_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.ListCalendars"
+TOOL_NAME = "GoogleCalendar.ListCalendars"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/calendar/list_events_example_call_tool.js b/public/examples/integrations/toolkits/google/calendar/list_events_example_call_tool.js
index 6eab677fe..31bde58e0 100644
--- a/public/examples/integrations/toolkits/google/calendar/list_events_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/calendar/list_events_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.ListEvents";
+const TOOL_NAME = "GoogleCalendar.ListEvents";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -31,4 +31,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/calendar/list_events_example_call_tool.py b/public/examples/integrations/toolkits/google/calendar/list_events_example_call_tool.py
index 18b8d14df..7b88fd6d9 100644
--- a/public/examples/integrations/toolkits/google/calendar/list_events_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/calendar/list_events_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.ListEvents"
+TOOL_NAME = "GoogleCalendar.ListEvents"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/calendar/update_event_example_call_tool.js b/public/examples/integrations/toolkits/google/calendar/update_event_example_call_tool.js
index 0f951224c..7f51e4260 100644
--- a/public/examples/integrations/toolkits/google/calendar/update_event_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/calendar/update_event_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.UpdateEvent";
+const TOOL_NAME = "GoogleCalendar.UpdateEvent";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -33,4 +33,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response);
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/calendar/update_event_example_call_tool.py b/public/examples/integrations/toolkits/google/calendar/update_event_example_call_tool.py
index c148aded4..3302ebbe5 100644
--- a/public/examples/integrations/toolkits/google/calendar/update_event_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/calendar/update_event_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.UpdateEvent"
+TOOL_NAME = "GoogleCalendar.UpdateEvent"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/contacts/create_contact_example_call_tool.js b/public/examples/integrations/toolkits/google/contacts/create_contact_example_call_tool.js
index 3d80824ed..e055ee2e9 100644
--- a/public/examples/integrations/toolkits/google/contacts/create_contact_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/contacts/create_contact_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.CreateContact";
+const TOOL_NAME = "GoogleContacts.CreateContact";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/contacts/create_contact_example_call_tool.py b/public/examples/integrations/toolkits/google/contacts/create_contact_example_call_tool.py
index 6a32afff5..423865502 100644
--- a/public/examples/integrations/toolkits/google/contacts/create_contact_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/contacts/create_contact_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.CreateContact"
+TOOL_NAME = "GoogleContacts.CreateContact"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/contacts/search_contacts_by_email_example_call_tool.js b/public/examples/integrations/toolkits/google/contacts/search_contacts_by_email_example_call_tool.js
index cae3a19bc..cae4316fe 100644
--- a/public/examples/integrations/toolkits/google/contacts/search_contacts_by_email_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/contacts/search_contacts_by_email_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.SearchContactsByEmail";
+const TOOL_NAME = "GoogleContacts.SearchContactsByEmail";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/contacts/search_contacts_by_email_example_call_tool.py b/public/examples/integrations/toolkits/google/contacts/search_contacts_by_email_example_call_tool.py
index dc9adef40..a6dea19dc 100644
--- a/public/examples/integrations/toolkits/google/contacts/search_contacts_by_email_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/contacts/search_contacts_by_email_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.SearchContactsByEmail"
+TOOL_NAME = "GoogleContacts.SearchContactsByEmail"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/contacts/search_contacts_by_name_example_call_tool.js b/public/examples/integrations/toolkits/google/contacts/search_contacts_by_name_example_call_tool.js
index 9e9799617..eda3b0687 100644
--- a/public/examples/integrations/toolkits/google/contacts/search_contacts_by_name_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/contacts/search_contacts_by_name_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.SearchContactsByName";
+const TOOL_NAME = "GoogleContacts.SearchContactsByName";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/contacts/search_contacts_by_name_example_call_tool.py b/public/examples/integrations/toolkits/google/contacts/search_contacts_by_name_example_call_tool.py
index 815d0682c..310636bf7 100644
--- a/public/examples/integrations/toolkits/google/contacts/search_contacts_by_name_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/contacts/search_contacts_by_name_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.SearchContactsByName"
+TOOL_NAME = "GoogleContacts.SearchContactsByName"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.js b/public/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.js
index b9a6b38ba..871af2ce6 100644
--- a/public/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.CreateBlankDocument";
+const TOOL_NAME = "GoogleDocs.CreateBlankDocument";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -28,4 +28,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.py b/public/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.py
index f5ec79501..8b1aa7e30 100644
--- a/public/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/docs/create_blank_document_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.CreateBlankDocument"
+TOOL_NAME = "GoogleDocs.CreateBlankDocument"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.js b/public/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.js
index f4fb6caa9..19f0c0a19 100644
--- a/public/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.CreateDocumentFromText";
+const TOOL_NAME = "GoogleDocs.CreateDocumentFromText";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -29,4 +29,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.py b/public/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.py
index c1aa33bb6..69fbd0965 100644
--- a/public/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/docs/create_document_from_text_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.CreateDocumentFromText"
+TOOL_NAME = "GoogleDocs.CreateDocumentFromText"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.js b/public/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.js
index 9c4f9d112..377009ff7 100644
--- a/public/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.GetDocumentById";
+const TOOL_NAME = "GoogleDocs.GetDocumentById";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.py b/public/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.py
index 79ce96827..078879a59 100644
--- a/public/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/docs/get_document_by_id_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}}"
-TOOL_NAME = "Google.GetDocumentById"
+TOOL_NAME = "GoogleDocs.GetDocumentById"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.js b/public/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.js
index 8446caf8f..0023f6e9e 100644
--- a/public/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}}";
-const TOOL_NAME = "Google.InsertTextAtEndOfDocument";
+const TOOL_NAME = "GoogleDocs.InsertTextAtEndOfDocument";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.py b/public/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.py
index f6860317f..68f9bfe60 100644
--- a/public/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/docs/insert_text_at_end_of_document_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.InsertTextAtEndOfDocument"
+TOOL_NAME = "GoogleDocs.InsertTextAtEndOfDocument"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/drive/search_and_retrieve_documents_example_call_tool.js b/public/examples/integrations/toolkits/google/docs/search_and_retrieve_documents_example_call_tool.js
similarity index 93%
rename from public/examples/integrations/toolkits/google/drive/search_and_retrieve_documents_example_call_tool.js
rename to public/examples/integrations/toolkits/google/docs/search_and_retrieve_documents_example_call_tool.js
index ec5ef2395..979f1886f 100644
--- a/public/examples/integrations/toolkits/google/drive/search_and_retrieve_documents_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/docs/search_and_retrieve_documents_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.SearchAndRetrieveDocuments";
+const TOOL_NAME = "GoogleDocs.SearchAndRetrieveDocuments";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/drive/search_and_retrieve_documents_example_call_tool.py b/public/examples/integrations/toolkits/google/docs/search_and_retrieve_documents_example_call_tool.py
similarity index 92%
rename from public/examples/integrations/toolkits/google/drive/search_and_retrieve_documents_example_call_tool.py
rename to public/examples/integrations/toolkits/google/docs/search_and_retrieve_documents_example_call_tool.py
index 5c17bb436..a32675304 100644
--- a/public/examples/integrations/toolkits/google/drive/search_and_retrieve_documents_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/docs/search_and_retrieve_documents_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.SearchAndRetrieveDocuments"
+TOOL_NAME = "GoogleDocs.SearchAndRetrieveDocuments"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/drive/search_documents_example_call_tool.js b/public/examples/integrations/toolkits/google/docs/search_documents_example_call_tool.js
similarity index 94%
rename from public/examples/integrations/toolkits/google/drive/search_documents_example_call_tool.js
rename to public/examples/integrations/toolkits/google/docs/search_documents_example_call_tool.js
index c2a5c0805..acb2b5ca2 100644
--- a/public/examples/integrations/toolkits/google/drive/search_documents_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/docs/search_documents_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.SearchDocuments";
+const TOOL_NAME = "GoogleDocs.SearchDocuments";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/drive/search_documents_example_call_tool.py b/public/examples/integrations/toolkits/google/docs/search_documents_example_call_tool.py
similarity index 94%
rename from public/examples/integrations/toolkits/google/drive/search_documents_example_call_tool.py
rename to public/examples/integrations/toolkits/google/docs/search_documents_example_call_tool.py
index f1e31040a..7c86b7e66 100644
--- a/public/examples/integrations/toolkits/google/drive/search_documents_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/docs/search_documents_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.SearchDocuments"
+TOOL_NAME = "GoogleDocs.SearchDocuments"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.js b/public/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.js
index 4a66a4bd0..c6e606c15 100644
--- a/public/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.GenerateGoogleFilePickerUrl";
+const TOOL_NAME = "GoogleDrive.GenerateGoogleFilePickerUrl";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.py b/public/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.py
index efb93332b..b89e10839 100644
--- a/public/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/drive/generate_google_file_picker_url_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.GenerateGoogleFilePickerUrl"
+TOOL_NAME = "GoogleDrive.GenerateGoogleFilePickerUrl"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.js b/public/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.js
index dc95485fc..d7353c57e 100644
--- a/public/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.GetFileTreeStructure";
+const TOOL_NAME = "GoogleDrive.GetFileTreeStructure";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.py b/public/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.py
index 296421542..76a94d7bb 100644
--- a/public/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/drive/get_file_tree_structure_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.GetFileTreeStructure"
+TOOL_NAME = "GoogleDrive.GetFileTreeStructure"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/delete_draft_email_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/delete_draft_email_example_call_tool.js
index 1e9950557..0d541da85 100644
--- a/public/examples/integrations/toolkits/google/gmail/delete_draft_email_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/delete_draft_email_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.DeleteDraftEmail";
+const TOOL_NAME = "Gmail.DeleteDraftEmail";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -28,4 +28,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response);
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/delete_draft_email_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/delete_draft_email_example_call_tool.py
index 37d2c8748..fa6c8b558 100644
--- a/public/examples/integrations/toolkits/google/gmail/delete_draft_email_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/delete_draft_email_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.DeleteDraftEmail"
+TOOL_NAME = "Gmail.DeleteDraftEmail"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/get_thread_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/get_thread_example_call_tool.js
index ce7528f1c..6fe16fae6 100644
--- a/public/examples/integrations/toolkits/google/gmail/get_thread_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/get_thread_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.GetThread";
+const TOOL_NAME = "Gmail.GetThread";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -28,4 +28,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/get_thread_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/get_thread_example_call_tool.py
index 6416c3c43..b7e335935 100644
--- a/public/examples/integrations/toolkits/google/gmail/get_thread_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/get_thread_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.GetThread"
+TOOL_NAME = "Gmail.GetThread"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/list_draft_emails_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/list_draft_emails_example_call_tool.js
index 118780285..e9f246463 100644
--- a/public/examples/integrations/toolkits/google/gmail/list_draft_emails_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/list_draft_emails_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.ListDraftEmails";
+const TOOL_NAME = "Gmail.ListDraftEmails";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -28,4 +28,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/list_draft_emails_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/list_draft_emails_example_call_tool.py
index a9e4603a9..c11040b15 100644
--- a/public/examples/integrations/toolkits/google/gmail/list_draft_emails_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/list_draft_emails_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.ListDraftEmails"
+TOOL_NAME = "Gmail.ListDraftEmails"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/list_emails_by_header_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/list_emails_by_header_example_call_tool.js
index 08c9bbd4b..29cf5dcd4 100644
--- a/public/examples/integrations/toolkits/google/gmail/list_emails_by_header_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/list_emails_by_header_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.ListEmailsByHeader";
+const TOOL_NAME = "Gmail.ListEmailsByHeader";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -30,4 +30,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/list_emails_by_header_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/list_emails_by_header_example_call_tool.py
index df42b5d98..1e1983682 100644
--- a/public/examples/integrations/toolkits/google/gmail/list_emails_by_header_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/list_emails_by_header_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.ListEmailsByHeader"
+TOOL_NAME = "Gmail.ListEmailsByHeader"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/list_emails_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/list_emails_example_call_tool.js
index 110dc5951..f465c03b1 100644
--- a/public/examples/integrations/toolkits/google/gmail/list_emails_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/list_emails_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.ListEmails";
+const TOOL_NAME = "Gmail.ListEmails";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -28,4 +28,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/list_emails_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/list_emails_example_call_tool.py
index 165d4b84b..a31d54cbc 100644
--- a/public/examples/integrations/toolkits/google/gmail/list_emails_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/list_emails_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.ListEmails"
+TOOL_NAME = "Gmail.ListEmails"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/list_threads_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/list_threads_example_call_tool.js
index 405154d53..a5813b392 100644
--- a/public/examples/integrations/toolkits/google/gmail/list_threads_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/list_threads_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.ListThreads";
+const TOOL_NAME = "Gmail.ListThreads";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -29,4 +29,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/list_threads_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/list_threads_example_call_tool.py
index 681613af2..75fa03c10 100644
--- a/public/examples/integrations/toolkits/google/gmail/list_threads_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/list_threads_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.ListThreads"
+TOOL_NAME = "Gmail.ListThreads"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/search_threads_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/search_threads_example_call_tool.js
index 7f5e31d58..91b518078 100644
--- a/public/examples/integrations/toolkits/google/gmail/search_threads_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/search_threads_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.SearchThreads";
+const TOOL_NAME = "Gmail.SearchThreads";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -31,4 +31,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/search_threads_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/search_threads_example_call_tool.py
index 3d0fba1c7..a2e70b730 100644
--- a/public/examples/integrations/toolkits/google/gmail/search_threads_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/search_threads_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.SearchThreads"
+TOOL_NAME = "Gmail.SearchThreads"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/send_draft_email_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/send_draft_email_example_call_tool.js
index 5335e9e7e..32b96e380 100644
--- a/public/examples/integrations/toolkits/google/gmail/send_draft_email_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/send_draft_email_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.SendDraftEmail";
+const TOOL_NAME = "Gmail.SendDraftEmail";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -28,4 +28,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/send_draft_email_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/send_draft_email_example_call_tool.py
index c7f6f8e77..f437969cd 100644
--- a/public/examples/integrations/toolkits/google/gmail/send_draft_email_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/send_draft_email_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.SendDraftEmail"
+TOOL_NAME = "Gmail.SendDraftEmail"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/send_email_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/send_email_example_call_tool.js
index d906e6d41..362fa7e25 100644
--- a/public/examples/integrations/toolkits/google/gmail/send_email_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/send_email_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.SendEmail";
+const TOOL_NAME = "Gmail.SendEmail";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
diff --git a/public/examples/integrations/toolkits/google/gmail/send_email_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/send_email_example_call_tool.py
index 28f9fcf2c..33af34b0d 100644
--- a/public/examples/integrations/toolkits/google/gmail/send_email_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/send_email_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.SendEmail"
+TOOL_NAME = "Gmail.SendEmail"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/trash_email_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/trash_email_example_call_tool.js
index f91907532..007f69484 100644
--- a/public/examples/integrations/toolkits/google/gmail/trash_email_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/trash_email_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.TrashEmail";
+const TOOL_NAME = "Gmail.TrashEmail";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -28,4 +28,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/trash_email_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/trash_email_example_call_tool.py
index 68df915a8..5f6cbbf5f 100644
--- a/public/examples/integrations/toolkits/google/gmail/trash_email_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/trash_email_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.TrashEmail"
+TOOL_NAME = "Gmail.TrashEmail"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/update_draft_email_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/update_draft_email_example_call_tool.js
index 63f051056..9b9e7d20a 100644
--- a/public/examples/integrations/toolkits/google/gmail/update_draft_email_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/update_draft_email_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.UpdateDraftEmail";
+const TOOL_NAME = "Gmail.UpdateDraftEmail";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -31,4 +31,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/update_draft_email_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/update_draft_email_example_call_tool.py
index a0944c6ae..7c2c16d05 100644
--- a/public/examples/integrations/toolkits/google/gmail/update_draft_email_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/update_draft_email_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.UpdateDraftEmail"
+TOOL_NAME = "Gmail.UpdateDraftEmail"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/gmail/write_draft_email_example_call_tool.js b/public/examples/integrations/toolkits/google/gmail/write_draft_email_example_call_tool.js
index cb85f3590..5f53bb03e 100644
--- a/public/examples/integrations/toolkits/google/gmail/write_draft_email_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/gmail/write_draft_email_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.WriteDraftEmail";
+const TOOL_NAME = "Gmail.WriteDraftEmail";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -30,4 +30,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response); 
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/gmail/write_draft_email_example_call_tool.py b/public/examples/integrations/toolkits/google/gmail/write_draft_email_example_call_tool.py
index d2126bce4..2d58ae1bb 100644
--- a/public/examples/integrations/toolkits/google/gmail/write_draft_email_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/gmail/write_draft_email_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.WriteDraftEmail"
+TOOL_NAME = "Gmail.WriteDraftEmail"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/sheets/create_spreadsheet_example_call_tool.js b/public/examples/integrations/toolkits/google/sheets/create_spreadsheet_example_call_tool.js
index b8e0282be..28b4245f6 100644
--- a/public/examples/integrations/toolkits/google/sheets/create_spreadsheet_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/sheets/create_spreadsheet_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.CreateSpreadsheet";
+const TOOL_NAME = "GoogleSheets.CreateSpreadsheet";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -49,4 +49,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response);
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/sheets/create_spreadsheet_example_call_tool.py b/public/examples/integrations/toolkits/google/sheets/create_spreadsheet_example_call_tool.py
index f63cac65a..c7a33d6c2 100644
--- a/public/examples/integrations/toolkits/google/sheets/create_spreadsheet_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/sheets/create_spreadsheet_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.CreateSpreadsheet"
+TOOL_NAME = "GoogleSheets.CreateSpreadsheet"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/sheets/get_spreadsheet_example_call_tool.js b/public/examples/integrations/toolkits/google/sheets/get_spreadsheet_example_call_tool.js
index 386547159..1a7fa8d0c 100644
--- a/public/examples/integrations/toolkits/google/sheets/get_spreadsheet_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/sheets/get_spreadsheet_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.GetSpreadsheet";
+const TOOL_NAME = "GoogleSheets.GetSpreadsheet";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -28,4 +28,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response);
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/sheets/get_spreadsheet_example_call_tool.py b/public/examples/integrations/toolkits/google/sheets/get_spreadsheet_example_call_tool.py
index 2f79c65de..f88a15dcc 100644
--- a/public/examples/integrations/toolkits/google/sheets/get_spreadsheet_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/sheets/get_spreadsheet_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.GetSpreadsheet"
+TOOL_NAME = "GoogleSheets.GetSpreadsheet"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/google/sheets/write_to_cell_example_call_tool.js b/public/examples/integrations/toolkits/google/sheets/write_to_cell_example_call_tool.js
index 8051c37eb..ccd43cc95 100644
--- a/public/examples/integrations/toolkits/google/sheets/write_to_cell_example_call_tool.js
+++ b/public/examples/integrations/toolkits/google/sheets/write_to_cell_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Google.WriteToCell";
+const TOOL_NAME = "GoogleSheets.WriteToCell";
 
 // Start the authorization process
 const authResponse = await client.tools.authorize({
@@ -31,4 +31,4 @@ const response = await client.tools.execute({
   user_id: USER_ID,
 });
 
-console.log(response);
\ No newline at end of file
+console.log(response);
diff --git a/public/examples/integrations/toolkits/google/sheets/write_to_cell_example_call_tool.py b/public/examples/integrations/toolkits/google/sheets/write_to_cell_example_call_tool.py
index 2f2bfe70f..b707ca22e 100644
--- a/public/examples/integrations/toolkits/google/sheets/write_to_cell_example_call_tool.py
+++ b/public/examples/integrations/toolkits/google/sheets/write_to_cell_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Google.WriteToCell"
+TOOL_NAME = "GoogleSheets.WriteToCell"
 
 auth_response = client.tools.authorize(
     tool_name=TOOL_NAME,
diff --git a/public/examples/integrations/toolkits/search/google_finance/get_stock_historical_data_example_call_tool.js b/public/examples/integrations/toolkits/search/google_finance/get_stock_historical_data_example_call_tool.js
index a213df609..527a6aaa3 100644
--- a/public/examples/integrations/toolkits/search/google_finance/get_stock_historical_data_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/google_finance/get_stock_historical_data_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Search.GetStockHistoricalData";
+const TOOL_NAME = "GoogleFinance.GetStockHistoricalData";
 
 const toolInput = {
 	ticker_symbol: "GOOG",
diff --git a/public/examples/integrations/toolkits/search/google_finance/get_stock_historical_data_example_call_tool.py b/public/examples/integrations/toolkits/search/google_finance/get_stock_historical_data_example_call_tool.py
index 99ce59285..04daaed56 100644
--- a/public/examples/integrations/toolkits/search/google_finance/get_stock_historical_data_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/google_finance/get_stock_historical_data_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Search.GetStockHistoricalData"
+TOOL_NAME = "GoogleFinance.GetStockHistoricalData"
 
 tool_input = {
     "ticker_symbol": "GOOG",
diff --git a/public/examples/integrations/toolkits/search/google_finance/get_stock_summary_example_call_tool.js b/public/examples/integrations/toolkits/search/google_finance/get_stock_summary_example_call_tool.js
index fb2b03f8f..93a0863c3 100644
--- a/public/examples/integrations/toolkits/search/google_finance/get_stock_summary_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/google_finance/get_stock_summary_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Search.GetStockSummary";
+const TOOL_NAME = "GoogleFinance.GetStockSummary";
 
 const toolInput = {
 	ticker_symbol: "GOOG",
diff --git a/public/examples/integrations/toolkits/search/google_finance/get_stock_summary_example_call_tool.py b/public/examples/integrations/toolkits/search/google_finance/get_stock_summary_example_call_tool.py
index ef866f1e7..be46b0aa2 100644
--- a/public/examples/integrations/toolkits/search/google_finance/get_stock_summary_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/google_finance/get_stock_summary_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Search.GetStockSummary"
+TOOL_NAME = "GoogleFinance.GetStockSummary"
 
 tool_input = {
     "ticker_symbol": "GOOG",
diff --git a/public/examples/integrations/toolkits/search/google_flights/search_one_way_flights_example_call_tool.js b/public/examples/integrations/toolkits/search/google_flights/search_one_way_flights_example_call_tool.js
index a6feb32d4..cd29c34fb 100644
--- a/public/examples/integrations/toolkits/search/google_flights/search_one_way_flights_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/google_flights/search_one_way_flights_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Search.SearchOneWayFlights";
+const TOOL_NAME = "GoogleFlights.SearchOneWayFlights";
 
 const toolInput = {
 	departure_airport_code: "LAX",
diff --git a/public/examples/integrations/toolkits/search/google_hotels/search_hotels_example_call_tool.js b/public/examples/integrations/toolkits/search/google_hotels/search_hotels_example_call_tool.js
index 3b415c35f..d077900ba 100644
--- a/public/examples/integrations/toolkits/search/google_hotels/search_hotels_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/google_hotels/search_hotels_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Search.SearchHotels";
+const TOOL_NAME = "GoogleHotels.SearchHotels";
 
 const toolInput = {
 	location: "New York, NY",
diff --git a/public/examples/integrations/toolkits/search/google_hotels/search_hotels_example_call_tool.py b/public/examples/integrations/toolkits/search/google_hotels/search_hotels_example_call_tool.py
index 4a511da70..b4a457f96 100644
--- a/public/examples/integrations/toolkits/search/google_hotels/search_hotels_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/google_hotels/search_hotels_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Search.SearchHotels"
+TOOL_NAME = "GoogleHotels.SearchHotels"
 
 tool_input = {
     "location": "New York, NY",
diff --git a/public/examples/integrations/toolkits/search/google_jobs/search_jobs_example_call_tool.js b/public/examples/integrations/toolkits/search/google_jobs/search_jobs_example_call_tool.js
index 1518157e9..cb948678c 100644
--- a/public/examples/integrations/toolkits/search/google_jobs/search_jobs_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/google_jobs/search_jobs_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Search.SearchJobs";
+const TOOL_NAME = "GoogleJobs.SearchJobs";
 
 const toolInput = {
   query: "software engineer",
diff --git a/public/examples/integrations/toolkits/search/google_jobs/search_jobs_example_call_tool.py b/public/examples/integrations/toolkits/search/google_jobs/search_jobs_example_call_tool.py
index f9b145eee..a0fb5f6b5 100644
--- a/public/examples/integrations/toolkits/search/google_jobs/search_jobs_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/google_jobs/search_jobs_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Search.SearchJobs"
+TOOL_NAME = "GoogleJobs.SearchJobs"
 
 tool_input = {
     "query": "software engineer",
diff --git a/public/examples/integrations/toolkits/search/google_maps/get_directions_between_addresses_example_call_tool.js b/public/examples/integrations/toolkits/search/google_maps/get_directions_between_addresses_example_call_tool.js
index f50014685..a14d812db 100644
--- a/public/examples/integrations/toolkits/search/google_maps/get_directions_between_addresses_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/google_maps/get_directions_between_addresses_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Search.GetDirectionsBetweenAddresses";
+const TOOL_NAME = "GoogleMaps.GetDirectionsBetweenAddresses";
 
 const toolInput = {
 	origin_address: "123 Main St, New York, NY 10001",
diff --git a/public/examples/integrations/toolkits/search/google_maps/get_directions_between_addresses_example_call_tool.py b/public/examples/integrations/toolkits/search/google_maps/get_directions_between_addresses_example_call_tool.py
index 4335f50ef..fad6312a1 100644
--- a/public/examples/integrations/toolkits/search/google_maps/get_directions_between_addresses_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/google_maps/get_directions_between_addresses_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Search.GetDirectionsBetweenAddresses"
+TOOL_NAME = "GoogleMaps.GetDirectionsBetweenAddresses"
 
 tool_input = {
     "origin_address": "123 Main St, New York, NY 10001",
diff --git a/public/examples/integrations/toolkits/search/google_maps/get_directions_between_coordinates_example_call_tool.js b/public/examples/integrations/toolkits/search/google_maps/get_directions_between_coordinates_example_call_tool.js
index a9ecbdf66..5c5e9d406 100644
--- a/public/examples/integrations/toolkits/search/google_maps/get_directions_between_coordinates_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/google_maps/get_directions_between_coordinates_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Search.GetDirectionsBetweenCoordinates";
+const TOOL_NAME = "GoogleMaps.GetDirectionsBetweenCoordinates";
 
 const toolInput = {
 	origin_latitude: 37.7879,
diff --git a/public/examples/integrations/toolkits/search/google_maps/get_directions_between_coordinates_example_call_tool.py b/public/examples/integrations/toolkits/search/google_maps/get_directions_between_coordinates_example_call_tool.py
index 02f5f2538..29c4d8be1 100644
--- a/public/examples/integrations/toolkits/search/google_maps/get_directions_between_coordinates_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/google_maps/get_directions_between_coordinates_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Search.GetDirectionsBetweenCoordinates"
+TOOL_NAME = "GoogleMaps.GetDirectionsBetweenCoordinates"
 
 tool_input = {
     "origin_latitude": 37.7879,
diff --git a/public/examples/integrations/toolkits/search/google_news/search_news_example_call_tool.js b/public/examples/integrations/toolkits/search/google_news/search_news_example_call_tool.js
index 547d9fb91..c5022e9d3 100644
--- a/public/examples/integrations/toolkits/search/google_news/search_news_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/google_news/search_news_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Search.SearchNews";
+const TOOL_NAME = "GoogleNews.SearchNews";
 
 const toolInput = {
 	query: "Apple's new iPhone",
diff --git a/public/examples/integrations/toolkits/search/google_news/search_news_example_call_tool.py b/public/examples/integrations/toolkits/search/google_news/search_news_example_call_tool.py
index 40778de8c..2e56c60a5 100644
--- a/public/examples/integrations/toolkits/search/google_news/search_news_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/google_news/search_news_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Search.SearchNews"
+TOOL_NAME = "GoogleNews.SearchNews"
 
 tool_input = {
     "query": "Apple's new iPhone",
diff --git a/public/examples/integrations/toolkits/search/google_search/search_google_example_call_tool.js b/public/examples/integrations/toolkits/search/google_search/search_google_example_call_tool.js
index dd97d8036..f358eb035 100644
--- a/public/examples/integrations/toolkits/search/google_search/search_google_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/google_search/search_google_example_call_tool.js
@@ -3,7 +3,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
 const USER_ID = "{arcade_user_id}";
-const TOOL_NAME = "Search.SearchGoogle";
+const TOOL_NAME = "GoogleSearch.Search";
 
 const toolInput = {
 	query: "Arcade documentation",
diff --git a/public/examples/integrations/toolkits/search/google_search/search_google_example_call_tool.py b/public/examples/integrations/toolkits/search/google_search/search_google_example_call_tool.py
index 0a01575a1..2eb3e32b5 100644
--- a/public/examples/integrations/toolkits/search/google_search/search_google_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/google_search/search_google_example_call_tool.py
@@ -3,7 +3,7 @@
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
 USER_ID = "{arcade_user_id}"
-TOOL_NAME = "Search.SearchGoogle"
+TOOL_NAME = "GoogleSearch.Search"
 
 tool_input = {"query": "Arcade documentation", "n_results": 5}
 
diff --git a/public/examples/integrations/toolkits/search/google_shopping/search_shopping_products_example_call_tool.js b/public/examples/integrations/toolkits/search/google_shopping/search_shopping_products_example_call_tool.js
index 9e90c1179..91171d855 100644
--- a/public/examples/integrations/toolkits/search/google_shopping/search_shopping_products_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/google_shopping/search_shopping_products_example_call_tool.js
@@ -2,7 +2,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
-const TOOL_NAME = "Search.SearchShoppingProducts";
+const TOOL_NAME = "GoogleShopping.SearchProducts";
 
 const toolInput = {
 	keywords: "Apple iPhone",
diff --git a/public/examples/integrations/toolkits/search/google_shopping/search_shopping_products_example_call_tool.py b/public/examples/integrations/toolkits/search/google_shopping/search_shopping_products_example_call_tool.py
index af9e532f6..5702971db 100644
--- a/public/examples/integrations/toolkits/search/google_shopping/search_shopping_products_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/google_shopping/search_shopping_products_example_call_tool.py
@@ -2,7 +2,7 @@
 
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
-TOOL_NAME = "Search.SearchShoppingProducts"
+TOOL_NAME = "GoogleShopping.SearchProducts"
 
 tool_input = {
     "keywords": "Apple iPhone",
diff --git a/public/examples/integrations/toolkits/search/walmart/get_walmart_product_details_example_call_tool.js b/public/examples/integrations/toolkits/search/walmart/get_walmart_product_details_example_call_tool.js
index b2501ae23..c2b6e7201 100644
--- a/public/examples/integrations/toolkits/search/walmart/get_walmart_product_details_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/walmart/get_walmart_product_details_example_call_tool.js
@@ -2,7 +2,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
-const TOOL_NAME = "Search.GetWalmartProductDetails";
+const TOOL_NAME = "Walmart.GetProductDetails";
 
 const toolInput = {
 	item_id: "1234567890",
diff --git a/public/examples/integrations/toolkits/search/walmart/get_walmart_product_details_example_call_tool.py b/public/examples/integrations/toolkits/search/walmart/get_walmart_product_details_example_call_tool.py
index 556aa51aa..f34406fa2 100644
--- a/public/examples/integrations/toolkits/search/walmart/get_walmart_product_details_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/walmart/get_walmart_product_details_example_call_tool.py
@@ -3,7 +3,7 @@
 
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
-TOOL_NAME = "Search.GetWalmartProductDetails"
+TOOL_NAME = "Walmart.GetProductDetails"
 
 tool_input = {
     "item_id": "1234567890",
diff --git a/public/examples/integrations/toolkits/search/walmart/search_walmart_products_example_call_tool.js b/public/examples/integrations/toolkits/search/walmart/search_walmart_products_example_call_tool.js
index d98333ce5..977435057 100644
--- a/public/examples/integrations/toolkits/search/walmart/search_walmart_products_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/walmart/search_walmart_products_example_call_tool.js
@@ -2,7 +2,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
-const TOOL_NAME = "Search.SearchWalmartProducts";
+const TOOL_NAME = "Walmart.SearchProducts";
 
 const toolInput = {
 	query: "Apple iPhone",
diff --git a/public/examples/integrations/toolkits/search/walmart/search_walmart_products_example_call_tool.py b/public/examples/integrations/toolkits/search/walmart/search_walmart_products_example_call_tool.py
index 8b01c4599..8ccbf246a 100644
--- a/public/examples/integrations/toolkits/search/walmart/search_walmart_products_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/walmart/search_walmart_products_example_call_tool.py
@@ -3,7 +3,7 @@
 
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
-TOOL_NAME = "Search.SearchWalmartProducts"
+TOOL_NAME = "Walmart.SearchProducts"
 
 tool_input = {
     "query": "Apple iPhone",
diff --git a/public/examples/integrations/toolkits/search/youtube/get_youtube_video_details_example_call_tool.js b/public/examples/integrations/toolkits/search/youtube/get_youtube_video_details_example_call_tool.js
index fc68b072f..2892ddbce 100644
--- a/public/examples/integrations/toolkits/search/youtube/get_youtube_video_details_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/youtube/get_youtube_video_details_example_call_tool.js
@@ -2,7 +2,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
-const TOOL_NAME = "Search.GetYoutubeVideoDetails";
+const TOOL_NAME = "Youtube.GetYoutubeVideoDetails";
 
 const toolInput = {
 	video_id: "dQw4w9WgXcQ",
diff --git a/public/examples/integrations/toolkits/search/youtube/get_youtube_video_details_example_call_tool.py b/public/examples/integrations/toolkits/search/youtube/get_youtube_video_details_example_call_tool.py
index fb526b56d..2d0a99980 100644
--- a/public/examples/integrations/toolkits/search/youtube/get_youtube_video_details_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/youtube/get_youtube_video_details_example_call_tool.py
@@ -2,7 +2,7 @@
 
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
-TOOL_NAME = "Search.GetYoutubeVideoDetails"
+TOOL_NAME = "Youtube.GetYoutubeVideoDetails"
 
 tool_input = {
     "video_id": "dQw4w9WgXcQ",
diff --git a/public/examples/integrations/toolkits/search/youtube/search_youtube_videos_example_call_tool.js b/public/examples/integrations/toolkits/search/youtube/search_youtube_videos_example_call_tool.js
index 392ef956c..0e31e677f 100644
--- a/public/examples/integrations/toolkits/search/youtube/search_youtube_videos_example_call_tool.js
+++ b/public/examples/integrations/toolkits/search/youtube/search_youtube_videos_example_call_tool.js
@@ -2,7 +2,7 @@ import { Arcade } from "@arcadeai/arcadejs";
 
 const client = new Arcade(); // Automatically finds the `ARCADE_API_KEY` env variable
 
-const TOOL_NAME = "Search.SearchYoutubeVideos";
+const TOOL_NAME = "Youtube.SearchForVideos";
 
 const toolInput = {
 	keywords: "Apple iPhone",
diff --git a/public/examples/integrations/toolkits/search/youtube/search_youtube_videos_example_call_tool.py b/public/examples/integrations/toolkits/search/youtube/search_youtube_videos_example_call_tool.py
index d66e895f2..84b0d98b0 100644
--- a/public/examples/integrations/toolkits/search/youtube/search_youtube_videos_example_call_tool.py
+++ b/public/examples/integrations/toolkits/search/youtube/search_youtube_videos_example_call_tool.py
@@ -2,7 +2,7 @@
 
 client = Arcade()  # Automatically finds the `ARCADE_API_KEY` env variable
 
-TOOL_NAME = "Search.SearchYoutubeVideos"
+TOOL_NAME = "Youtube.SearchForVideos"
 
 tool_input = {
     "keywords": "Apple iPhone",
diff --git a/public/images/icons/web.png b/public/images/icons/firecrawl.png
similarity index 100%
rename from public/images/icons/web.png
rename to public/images/icons/firecrawl.png
diff --git a/src/components/custom/Toolkits/toolkits-config.ts b/src/components/custom/Toolkits/toolkits-config.ts
index 1aa003dfe..36121013f 100644
--- a/src/components/custom/Toolkits/toolkits-config.ts
+++ b/src/components/custom/Toolkits/toolkits-config.ts
@@ -32,7 +32,7 @@ const availableTools: Tool[] = [
     image: "gmail.png",
     summary:
       "Send, write, draft, delete, trash, and search Gmail emails with your agents.",
-    link: "/toolkits/productivity/google/gmail",
+    link: "/toolkits/productivity/gmail",
     category: "productivity",
     type: "arcade",
   },
@@ -68,7 +68,7 @@ const availableTools: Tool[] = [
     image: "google_calendar.png",
     summary:
       "Create, update, delete, and search events in Google Calendar with your agents.",
-    link: "/toolkits/productivity/google/calendar",
+    link: "/toolkits/productivity/google_calendar",
     category: "productivity",
     type: "arcade",
   },
@@ -76,7 +76,7 @@ const availableTools: Tool[] = [
     name: "Google Contacts",
     image: "google_contacts.png",
     summary: "Create and search contacts in Google Contacts with your agents.",
-    link: "/toolkits/productivity/google/contacts",
+    link: "/toolkits/productivity/google_contacts",
     category: "productivity",
     type: "arcade",
   },
@@ -84,7 +84,7 @@ const availableTools: Tool[] = [
     name: "Google Drive",
     image: "google_drive.png",
     summary: "List documents in Google Drive with your agents.",
-    link: "/toolkits/productivity/google/drive",
+    link: "/toolkits/productivity/google_drive",
     category: "productivity",
     type: "arcade",
   },
@@ -93,7 +93,7 @@ const availableTools: Tool[] = [
     image: "google_docs.png",
     summary:
       "Create, edit, and get information about Google Docs documents with your agents.",
-    link: "/toolkits/productivity/google/docs",
+    link: "/toolkits/productivity/google_docs",
     category: "productivity",
     type: "arcade",
   },
@@ -101,7 +101,7 @@ const availableTools: Tool[] = [
     name: "Google Sheets",
     image: "google_sheets.svg",
     summary: "Create, read, and update Google Sheets with your agents.",
-    link: "/toolkits/productivity/google/sheets",
+    link: "/toolkits/productivity/google_sheets",
     category: "productivity",
     type: "arcade",
   },
@@ -115,18 +115,18 @@ const availableTools: Tool[] = [
     type: "arcade",
   },
   {
-    name: "Code Runner",
+    name: "E2B",
     image: "e2b.png",
     summary: "Execute and test code in a secure sandbox environment",
-    link: "/toolkits/development/code-sandbox",
+    link: "/toolkits/development/e2b",
     category: "development",
     type: "arcade",
   },
   {
-    name: "Web",
-    image: "web.png",
+    name: "Firecrawl",
+    image: "firecrawl.png",
     summary: "Browse and interact with web pages programmatically",
-    link: "/toolkits/development/web/web",
+    link: "/toolkits/development/firecrawl/firecrawl",
     category: "development",
     type: "arcade",
   },