diff --git a/help/archive-a-stream.md b/help/archive-a-stream.md
index b5c98c4beb..2ac6c6dcd8 100644
--- a/help/archive-a-stream.md
+++ b/help/archive-a-stream.md
@@ -10,7 +10,7 @@ Archiving a stream does not delete a stream's messages. Users will still be
 able to find any given message by searching for it. However, links to
 messages and topics in the stream may or may not continue to work.
 
-In most cases, we recommend [renaming streams](/help/rename-a-stream) rather
+In most cases, we recommend [renaming channels](/help/rename-a-channel) rather
 than archiving them.
 
 ## Archive a stream
diff --git a/help/configure-automated-notices.md b/help/configure-automated-notices.md
index 33ade46348..c58957b7cf 100644
--- a/help/configure-automated-notices.md
+++ b/help/configure-automated-notices.md
@@ -12,7 +12,7 @@ language](/help/change-your-language).
 
 ## Notices about streams
 
-Notices about stream settings changes, such as [name](/help/rename-a-stream),
+Notices about channel settings changes, such as [name](/help/rename-a-channel),
 [description](/help/change-the-stream-description),
 [permission](/help/channel-permissions) and
 [policy](/help/channel-posting-policy) updates are sent to the
diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md
index a555db37be..6d3f5818a1 100644
--- a/help/include/sidebar_index.md
+++ b/help/include/sidebar_index.md
@@ -207,7 +207,7 @@
 * [Restrict channel membership management](/help/configure-who-can-invite-to-channels)
 * [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
 * [Set default channels for new users](/help/set-default-channels-for-new-users)
-* [Rename a stream](/help/rename-a-stream)
+* [Rename a channel](/help/rename-a-channel)
 * [Change a stream's description](/help/change-the-stream-description)
 * [Change the privacy of a stream](/help/change-the-privacy-of-a-stream)
 * [Delete or archive a stream](/help/archive-a-stream)
diff --git a/help/rename-a-stream.md b/help/rename-a-channel.md
similarity index 69%
rename from help/rename-a-stream.md
rename to help/rename-a-channel.md
index 0245762719..6d921b6eb8 100644
--- a/help/rename-a-stream.md
+++ b/help/rename-a-channel.md
@@ -1,4 +1,4 @@
-# Rename a stream
+# Rename a channel
 
 {!admin-only.md!}
 
@@ -8,12 +8,12 @@
 
 {relative|stream|all}
 
-1. Select a stream.
+1. Select a channel.
 
 {!select-channel-view-general.md!}
 
 1. Click the **pencil** (<i class="fa fa-pencil"></i>) icon
-   to the right of the stream name, and enter a new stream name.
+   to the right of the channel name, and enter a new channel name.
 
 {!save-changes.md!}
 
@@ -25,9 +25,9 @@
 
 {!stream-name-long-press-menu.md!}
 
-1. Tap **Stream settings**.
+1. Tap **Channel settings**.
 
-1. Tap **Edit stream**, and enter a new stream name.
+1. Tap **Edit channel**, and enter a new channel name.
 
 1. Tap **Save**.
 
diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py
index 7849c3936d..8160a1c3a7 100644
--- a/zerver/lib/url_redirects.py
+++ b/zerver/lib/url_redirects.py
@@ -114,6 +114,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
     URLRedirect(
         "/help/set-default-streams-for-new-users", "/help/set-default-channels-for-new-users"
     ),
+    URLRedirect("/help/rename-a-stream", "/help/rename-a-channel"),
 ]
 
 LANDING_PAGE_REDIRECTS = [
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index 552d18ac3a..27982fdfc3 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -17865,7 +17865,7 @@ paths:
         an organization administrator editing any property of a stream,
         including:
 
-        - Stream [name](/help/rename-a-stream) and [description](/help/change-the-stream-description)
+        - Stream [name](/help/rename-a-channel) and [description](/help/change-the-stream-description)
         - Stream [permissions](/help/channel-permissions), including
           [privacy](/help/change-the-privacy-of-a-stream) and [who can
           send](/help/channel-posting-policy).