diff --git a/help/configure-who-can-create-streams.md b/help/configure-who-can-create-streams.md
index 633b0885b2..929ffaa16a 100644
--- a/help/configure-who-can-create-streams.md
+++ b/help/configure-who-can-create-streams.md
@@ -48,5 +48,5 @@ unadvertised web-public stream in a legitimate organization.
 
 ## Related articles
 
-* [Create a stream](/help/create-a-stream)
+* [Create a channel](/help/create-a-channel)
 * [Roles and permissions](/help/roles-and-permissions)
diff --git a/help/create-a-stream.md b/help/create-a-channel.md
similarity index 69%
rename from help/create-a-stream.md
rename to help/create-a-channel.md
index f6a1e075f0..1e97898fb8 100644
--- a/help/create-a-stream.md
+++ b/help/create-a-channel.md
@@ -1,27 +1,27 @@
-# Create a stream
+# Create a channel
 
-By default, all users other than guests can create streams. Administrators can
-[restrict the ability to create a stream](/help/configure-who-can-create-streams) to specific
+By default, all users other than guests can create channels. Administrators can
+[restrict the ability to create a channel](/help/configure-who-can-create-streams) to specific
 [roles](/help/roles-and-permissions).
 
-If you are an administrator setting up streams for the first time, check out our
+If you are an administrator setting up channels for the first time, check out our
 [guide to setting up channels for a new organization](/help/create-channels).
 
 ## Create a channel
 
 {!create-a-channel-instructions.md!}
 
-## Stream options
+## Channel options
 
-There are several parameters you can set while creating a stream. All but
-**Announce stream** you can change later.
+There are several parameters you can set while creating a channel. All but
+**Announce channel** you can change later.
 
-* **Stream name**: Appears in the left sidebar for subscribed users. The
-  stream name can be in any language, and can include spaces and other
+* **Channel name**: Appears in the left sidebar for subscribed users. The
+  channel name can be in any language, and can include spaces and other
   punctuation.
 
-* **Stream description**: Helps users decide whether to subscribe when they
-  are browsing streams.
+* **Channel description**: Helps users decide whether to subscribe when they
+  are browsing channels.
 
 * **Announce new stream in the [stream configured by your organization](/help/configure-automated-notices#new-stream-announcements)**:
   Posts a message in the "new streams" topic advertising the new stream.
diff --git a/help/create-channels.md b/help/create-channels.md
index 33ace94838..bda9d546d3 100644
--- a/help/create-channels.md
+++ b/help/create-channels.md
@@ -6,7 +6,7 @@
 
 {!create-a-channel-instructions.md!}
 
-For more details about channel settings, see [Create a channel](/help/create-a-stream#stream-options).
+For more details about channel settings, see [Create a channel](/help/create-a-channel#channel-options).
 
 ## Tips for creating channels
 
@@ -15,7 +15,7 @@ For more details about channel settings, see [Create a channel](/help/create-a-s
 ## Related articles
 
 * [Setting up your organization](/help/getting-your-organization-started-with-zulip)
-* [Create a stream](/help/create-a-stream#stream-options)
+* [Create a channel](/help/create-a-channel#channel-options)
 * [Stream permissions](/help/stream-permissions)
 * [Set default streams for new users](/help/set-default-streams-for-new-users)
 * [Getting started with Zulip](/help/getting-started-with-zulip)
diff --git a/help/direct-messages.md b/help/direct-messages.md
index 46cec39378..aabda215fe 100644
--- a/help/direct-messages.md
+++ b/help/direct-messages.md
@@ -5,7 +5,7 @@ of a [channel](/help/channels-and-topics). DMs work well for one-off messages,
 usually with just one or two others.
 
 If you find yourself frequently conversing with the same person or group, it
-often works better to [create a private stream](/help/create-a-stream) for your
+often works better to [create a private channel](/help/create-a-channel) for your
 conversations. This lets you organize your discussion into topics, and add or
 remove participants as needed.
 
diff --git a/help/getting-your-organization-started-with-zulip.md b/help/getting-your-organization-started-with-zulip.md
index cd7767eba3..8ea937c4eb 100644
--- a/help/getting-your-organization-started-with-zulip.md
+++ b/help/getting-your-organization-started-with-zulip.md
@@ -65,8 +65,8 @@ us know!
 
 {end_tabs}
 
-For more details about stream settings, see [Create a
-stream](/help/create-a-stream#stream-options).
+For more details about channel settings, see [Create a
+channel](/help/create-a-channel#channel-options).
 
 ### Tips for creating channels
 
diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md
index bdf69a183e..8b519b6d55 100644
--- a/help/include/sidebar_index.md
+++ b/help/include/sidebar_index.md
@@ -128,7 +128,7 @@
 * [Channels and topics](/help/channels-and-topics)
 * [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams)
 * [Unsubscribe from a stream](/help/unsubscribe-from-a-stream)
-* [Create a stream](/help/create-a-stream)
+* [Create a channel](/help/create-a-channel)
 * [View stream subscribers](/help/view-stream-subscribers)
 * [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream)
 * [Pin a stream](/help/pin-a-stream)
diff --git a/help/public-access-option.md b/help/public-access-option.md
index 9a60b37c4d..b4dea4dacc 100644
--- a/help/public-access-option.md
+++ b/help/public-access-option.md
@@ -63,11 +63,11 @@ communities such as open-source projects and research communities.
     See [Managing abuse](#managing-abuse) to learn why only
     trusted roles like moderators and administrators can create web-public streams.
 
-## Creating a web-public stream
+## Creating a web-public channel
 
-To create a new web-public stream, follow the [instructions for
-creating stream](/help/create-a-stream#create-a-stream_1), selecting
-the **Web-public** option for **Who can access the stream?**.
+To create a new web-public channel, follow the [instructions for
+creating a channel](/help/create-a-channel#create-a-channel_1), selecting
+the **Web-public** option for **Who can access the channel?**.
 
 To make an existing stream web-public, follow the instructions to
 [change the privacy of a
diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md
index 1a925aa618..b62a063370 100644
--- a/help/setting-up-zulip-for-a-class.md
+++ b/help/setting-up-zulip-for-a-class.md
@@ -221,8 +221,8 @@ how to assign roles and permissions for a class.
 
 {end_tabs}
 
-For more details about stream settings, see [Create a
-stream](/help/create-a-stream#stream-options).
+For more details about channel settings, see [Create a
+channel](/help/create-a-channel#channel-options).
 
 ### Tips for creating streams
 
diff --git a/templates/zerver/integrations/include/create-stream.md b/templates/zerver/integrations/include/create-stream.md
index b69e619673..6331825ea9 100644
--- a/templates/zerver/integrations/include/create-stream.md
+++ b/templates/zerver/integrations/include/create-stream.md
@@ -1,2 +1,2 @@
-[Create the stream](/help/create-a-stream) you'd like to use for
+[Create the stream](/help/create-a-channel) you'd like to use for
 {{ integration_display_name }} notifications.
diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py
index 459f568ca2..435517e01c 100644
--- a/zerver/lib/url_redirects.py
+++ b/zerver/lib/url_redirects.py
@@ -86,6 +86,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
     URLRedirect("/help/configure-notification-bot", "/help/configure-automated-notices"),
     URLRedirect("/help/all-messages", "/help/combined-feed"),
     URLRedirect("/help/create-streams", "/help/create-channels"),
+    URLRedirect("/help/create-a-stream", "/help/create-a-channel"),
 ]
 
 LANDING_PAGE_REDIRECTS = [