diff --git a/templates/zerver/api/deploying-bots.md b/templates/zerver/api/deploying-bots.md
index 23904f1e5b..e940a66275 100644
--- a/templates/zerver/api/deploying-bots.md
+++ b/templates/zerver/api/deploying-bots.md
@@ -89,7 +89,7 @@ pip3 install zulip_botserver
 1. Register new bot users on the Zulip server's web interface.
 
     * Log in to the Zulip server.
-    * Navigate to *Settings (<i class="fa fa-cog"></i>)* -> *Your bots* -> *Add a new bot*.
+    * Navigate to *Personal settings (<i class="fa fa-cog"></i>)* -> *Bots* -> *Add a new bot*.
       Select *Outgoing webhook* for bot type, fill out the form (using
       the URL from above) and click on *Create bot*.
     * A new bot user should appear in the *Active bots* panel.
diff --git a/templates/zerver/api/incoming-webhooks-walkthrough.md b/templates/zerver/api/incoming-webhooks-walkthrough.md
index 8ab28d168d..d2d68ab84f 100644
--- a/templates/zerver/api/incoming-webhooks-walkthrough.md
+++ b/templates/zerver/api/incoming-webhooks-walkthrough.md
@@ -232,11 +232,13 @@ Common validators are available in `zerver/lib/validators.py`.
 
 ## Step 4: Manually testing the webhook
 
-For either one of the command line tools, first, you'll need to get an API key
-from the **Your bots** section of your Zulip user's Settings page. To test the webhook,
-you'll need to [create a bot](https://zulip.com/help/add-a-bot-or-integration) with
-the **Incoming webhook** type. Replace `<api_key>` with your bot's API key in the examples
-presented below! This is how Zulip knows that the request was made by an authorized user.
+For either one of the command line tools, first, you'll need to get an
+API key from the **Bots** section of your Zulip user's **Personal
+settings**. To test the webhook, you'll need to [create a
+bot](https://zulip.com/help/add-a-bot-or-integration) with the
+**Incoming webhook** type. Replace `<api_key>` with your bot's API key
+in the examples presented below! This is how Zulip knows that the
+request was made by an authorized user.
 
 ### Curl
 
diff --git a/templates/zerver/api/outgoing-webhooks.md b/templates/zerver/api/outgoing-webhooks.md
index 4a0e9bea0b..a09884f7d9 100644
--- a/templates/zerver/api/outgoing-webhooks.md
+++ b/templates/zerver/api/outgoing-webhooks.md
@@ -18,7 +18,7 @@ with porting an existing Slack integration to work with Zulip.
 To register an outgoing webhook:
 
 * Log in to the Zulip server.
-* Navigate to *Settings (<i class="fa fa-cog"></i>)* -> *Your bots* ->
+* Navigate to *Personal settings (<i class="fa fa-cog"></i>)* -> *Bots* ->
   *Add a new bot*.  Select *Outgoing webhook* for bot type, the URL
   you'd like Zulip to post to as the **Endpoint URL**, the format you
   want, and click on *Create bot*. to submit the form/
diff --git a/templates/zerver/app/settings_overlay.html b/templates/zerver/app/settings_overlay.html
index 06c875458c..c1271486fa 100644
--- a/templates/zerver/app/settings_overlay.html
+++ b/templates/zerver/app/settings_overlay.html
@@ -30,7 +30,7 @@
                 {% if not is_guest %}
                 <li tabindex="0" data-section="your-bots">
                     <i class="icon fa fa-github" aria-hidden="true"></i>
-                    <div class="text">{{ _('Your bots') }}</div>
+                    <div class="text">{{ _('Bots') }}</div>
                 </li>
                 {% endif %}
                 <li tabindex="0" data-section="alert-words">
diff --git a/templates/zerver/integrations/google-calendar.md b/templates/zerver/integrations/google-calendar.md
index d2806745e0..b700ba54ba 100644
--- a/templates/zerver/integrations/google-calendar.md
+++ b/templates/zerver/integrations/google-calendar.md
@@ -16,10 +16,10 @@ your reminders directly in your Zulip feed.
     instructions on the
     [Google website](https://developers.google.com/api-client-library/python/start/installation).
 
-1.  Then go to your **Zulip Settings** by clicking on the cog in the top
-    right corner, and then clicking on **Settings**.
+1.  In Zulip, go to your click on the cog in the top right corner, and
+    then clicking on **Personal settings**.
 
-1.  Click on the tab that’s labeled **Your bots** and click on
+1.  Click on the tab that’s labeled **Account & privacy** and click on
     **Show/change your API key**. Enter your password if prompted, and
     download the `zuliprc` file. Save this file as `.zuliprc` to your `~/`
     directory.
diff --git a/zerver/lib/markdown/help_settings_links.py b/zerver/lib/markdown/help_settings_links.py
index 89ad43b985..3fd5ce154f 100644
--- a/zerver/lib/markdown/help_settings_links.py
+++ b/zerver/lib/markdown/help_settings_links.py
@@ -24,7 +24,7 @@ link_mapping = {
     ],
     "display-settings": ["Personal settings", "Display settings", "/#settings/display-settings"],
     "notifications": ["Personal settings", "Notifications", "/#settings/notifications"],
-    "your-bots": ["Personal settings", "Your bots", "/#settings/your-bots"],
+    "your-bots": ["Personal settings", "Bots", "/#settings/your-bots"],
     "alert-words": ["Personal settings", "Alert words", "/#settings/alert-words"],
     "uploaded-files": ["Personal settings", "Uploaded files", "/#settings/uploaded-files"],
     "muted-topics": ["Personal settings", "Muted topics", "/#settings/muted-topics"],