diff --git a/app/en/resources/faq/page.mdx b/app/en/resources/faq/page.mdx
index c831a9deb..b00f027bd 100644
--- a/app/en/resources/faq/page.mdx
+++ b/app/en/resources/faq/page.mdx
@@ -53,6 +53,7 @@ Tools](/references/auth-providers/google, you can use this code to authenticate
 
 <Tabs items={["Python", "JavaScript"]} storageKey="preferredLanguage">
 <Tabs.Tab>
+
 ```python
 from arcadepy import Arcade
 
@@ -60,29 +61,26 @@ 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="Gmail")
 
 # collect the scopes
-
 scopes = set()
 for tool in tools:
-if tool.requirements.authorization.oauth2.scopes:
-scopes |= set(tool.requirements.authorization.oauth2.scopes)
+    if tool.requirements.authorization.oauth2.scopes:
+        scopes |= set(tool.requirements.authorization.oauth2.scopes)
 
 # start auth
-
 auth_response = client.auth.start(user_id=USER_ID, scopes=list(scopes), provider="google")
 
 # show the url to the user if needed
-
 if auth_response.status != "complete":
-print(f"Please click here to authorize: {auth_response.url}") # Wait for the authorization to complete
-client.auth.wait_for_completion(auth_response)
+    print(f"Please click here to authorize: {auth_response.url}") # Wait for the authorization to complete
+    client.auth.wait_for_completion(auth_response)
+```
 
-````
 </Tabs.Tab>
 <Tabs.Tab>
+
 ```js
 import Arcade from "@arcadeai/arcadejs";
 
@@ -107,7 +105,7 @@ if (auth_response.status !== "completed") {
     // Wait for the authorization to complete
     auth_response = await client.auth.waitForCompletion(auth_response);
 }
-````
+```
 
 </Tabs.Tab>
 </Tabs>
@@ -122,6 +120,7 @@ The tool will work with the broader permissions while still satisfying its minim
 
 <Tabs items={["Python", "JavaScript"]} storageKey="preferredLanguage">
 <Tabs.Tab>
+
 ```python
 from arcadepy import Arcade
 
@@ -129,17 +128,19 @@ client = Arcade() # Automatically finds the `ARCADE_API_KEY` env variable
 user_id = "{arcade_user_id}"
 
 auth_response = client.auth.start(
-user_id=user_id,
-provider="google",
-scopes=[
-"https://www.googleapis.com/auth/drive.file",
-"https://www.googleapis.com/auth/drive"
-]
+    user_id=user_id,
+    provider="google",
+    scopes=[
+        "https://www.googleapis.com/auth/drive.file",
+        "https://www.googleapis.com/auth/drive"
+    ]
 )
 
-````
+```
+
 </Tabs.Tab>
 <Tabs.Tab>
+
 ```javascript
 import Arcade from "@arcadeai/arcadejs";
 
@@ -149,7 +150,7 @@ const user_id = "{arcade_user_id}";
 const authResponse = await client.auth.start(user_id, "google", {
     scopes: ["https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive"]
 });
-````
+```
 
 </Tabs.Tab>
 </Tabs>
diff --git a/next.config.ts b/next.config.ts
index 46eb422e4..8a7583b09 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -894,6 +894,26 @@ const nextConfig: NextConfig = withLlmsTxt({
           destination: "/:locale/get-started/mcp-clients/:path*",
           permanent: true,
         },
+        // Deprecated toolkit renames (microsoft_* prefix, ArcadeAI/monorepo#601)
+        {
+          source:
+            "/:locale/resources/integrations/productivity/outlook-calendar",
+          destination:
+            "/:locale/resources/integrations/productivity/microsoft-outlook-calendar",
+          permanent: true,
+        },
+        {
+          source: "/:locale/resources/integrations/productivity/outlook-mail",
+          destination:
+            "/:locale/resources/integrations/productivity/microsoft-outlook-mail",
+          permanent: true,
+        },
+        {
+          source: "/:locale/resources/integrations/productivity/sharepoint",
+          destination:
+            "/:locale/resources/integrations/productivity/microsoft-sharepoint",
+          permanent: true,
+        },
       ];
     },
     headers: async () => [
diff --git a/toolkit-docs-generator/excluded-toolkits.txt b/toolkit-docs-generator/excluded-toolkits.txt
index 56d33bc83..b8b737561 100644
--- a/toolkit-docs-generator/excluded-toolkits.txt
+++ b/toolkit-docs-generator/excluded-toolkits.txt
@@ -2,3 +2,8 @@
 Google
 Microsoft
 
+# Deprecated — renamed to microsoft_* prefix (see ArcadeAI/monorepo#601)
+OutlookCalendar
+OutlookMail
+Sharepoint
+