help: Update include markdown files for stream to channel rename.

docs/documentation/helpcenter.md

@@ -374,7 +374,7 @@ The source for macros is the Markdown files under `help/include` in the
 - **Save changes** `{!save-changes.md!}`: Save changes after modifying
   organization settings.
 
-- **Stream actions** `{!stream-actions.md!}`: Navigate to the stream actions
+- **Stream actions** `{!channel-actions.md!}`: Navigate to the stream actions
   menu from the left sidebar.
 
 - **Start composing** `{!start-composing.md!}`: Open the compose box.

help/add-or-remove-users-from-a-channel.md

@@ -37,9 +37,9 @@ channel][add-users] or [remove other users from a channel][remove-users].
 
 {tab|mobile}
 
-{!mobile-all-streams-view.md!}
+{!mobile-all-channels-view.md!}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Channel settings**.
 
@@ -55,7 +55,7 @@ channel][add-users] or [remove other users from a channel][remove-users].
 
 {end_tabs}
 
-{!automated-dm-stream-subscription.md!}
+{!automated-dm-channel-subscription.md!}
 
 ## Alternate methods to add users to a channel
 
@@ -65,7 +65,7 @@ channel][add-users] or [remove other users from a channel][remove-users].
 
 {tab|desktop-web}
 
-{!stream-actions.md!}
+{!channel-actions.md!}
 
 1. Click **Channel settings**.
 
@@ -78,7 +78,7 @@ channel][add-users] or [remove other users from a channel][remove-users].
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Channel settings**.
 
@@ -92,7 +92,7 @@ channel][add-users] or [remove other users from a channel][remove-users].
    (<img src="/static/images/help/mobile-check-circle-icon.svg" alt="checkmark" class="help-center-icon"/>)
    button in the bottom right corner of the app.
 
-{!mobile-stream-settings-menu-tip.md!}
+{!mobile-channel-settings-menu-tip.md!}
 
 {end_tabs}
 
@@ -127,7 +127,7 @@ subscribe the user.
 
 1. Click the **Unsubscribe** button in that row.
 
-{!stream-menu-subscribers-tab-tip.md!}
+{!channel-menu-subscribers-tab-tip.md!}
 
 {tab|via-right-sidebar}
 

help/browse-and-subscribe-to-channels.md

@@ -22,7 +22,7 @@
 
 {tab|mobile}
 
-{!mobile-all-streams-view.md!}
+{!mobile-all-channels-view.md!}
 
 1. Scroll through the list of channels.
 

help/change-the-channel-description.md

@@ -26,13 +26,13 @@ disabled. Use Markdown formatting to include a link to a website, Zulip
 
 {!save-changes.md!}
 
-{!stream-settings-general-tab-tip.md!}
+{!channel-settings-general-tab-tip.md!}
 
 {tab|mobile}
 
-{!mobile-all-streams-view.md!}
+{!mobile-all-channels-view.md!}
 
-{!stream-name-long-press-menu.md!}
+{!channel-name-long-press-menu.md!}
 
 1. Tap **Channel settings**.
 
@@ -40,11 +40,11 @@ disabled. Use Markdown formatting to include a link to a website, Zulip
 
 1. Tap **Save**.
 
-{!stream-name-long-press-menu-tip.md!}
+{!channel-name-long-press-menu-tip.md!}
 
 {end_tabs}
 
-{!automated-notice-stream-event.md!}
+{!automated-notice-channel-event.md!}
 
 [markdown-formatting]: /help/format-your-message-using-markdown
 [message-link]: /help/link-to-a-message-or-conversation#get-a-link-to-a-specific-message

help/change-the-color-of-a-channel.md

@@ -7,7 +7,7 @@ channel. Changing a channel's color does not change it for anyone else.
 
 {start_tabs}
 
-{!stream-actions.md!}
+{!channel-actions.md!}
 
 1. Click **Change color**.
 

help/change-the-privacy-of-a-channel.md

@@ -25,13 +25,13 @@ public.
 
 {!save-changes.md!}
 
-{!stream-settings-general-tab-tip.md!}
+{!channel-settings-general-tab-tip.md!}
 
 {tab|mobile}
 
-{!mobile-all-streams-view.md!}
+{!mobile-all-channels-view.md!}
 
-{!stream-name-long-press-menu.md!}
+{!channel-name-long-press-menu.md!}
 
 1. Tap **Channel settings**.
 
@@ -41,11 +41,11 @@ public.
 
 1. Tap **Save**.
 
-{!stream-name-long-press-menu-tip.md!}
+{!channel-name-long-press-menu-tip.md!}
 
 {end_tabs}
 
-{!automated-notice-stream-event.md!}
+{!automated-notice-channel-event.md!}
 
 !!! warn ""
 

help/channel-notifications.md

@@ -13,7 +13,7 @@ channels](/help/mute-a-channel), channel notification settings apply only to
 
 {tab|desktop-web}
 
-{!stream-actions.md!}
+{!channel-actions.md!}
 
 1. Click **Channel settings**.
 
@@ -24,13 +24,13 @@ channels](/help/mute-a-channel), channel notification settings apply only to
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Channel settings**.
 
 1. Toggle **Notifications**.
 
-{!mobile-stream-settings-menu-tip.md!}
+{!mobile-channel-settings-menu-tip.md!}
 
 {end_tabs}
 

help/channel-posting-policy.md

@@ -21,4 +21,4 @@ certain users can send messages.
 
 {end_tabs}
 
-{!automated-notice-stream-event.md!}
+{!automated-notice-channel-event.md!}

help/include/automated-dm-channel-subscription.md

@@ -1,6 +1,6 @@
 !!! warn ""
 
-      **Note**: Subscribing someone else to a stream sends them an
+      **Note**: Subscribing someone else to a channel sends them an
       automated direct message from [notification bot][notification-bot].
 
 [notification-bot]: /help/configure-automated-notices

help/include/automated-notice-channel-event.md

@@ -1,7 +1,7 @@
 !!! warn ""
 
     **Note**: This sends an automated notice from [notification
-    bot][notification-bot] to the "stream events" topic in the
+    bot][notification-bot] to the "channel events" topic in the
-    modified stream.
+    modified channel.
 
 [notification-bot]: /help/configure-automated-notices

help/include/channel-actions.md

@@ -1,3 +1,3 @@
-1. Hover over a stream in the left sidebar.
+1. Hover over a channel in the left sidebar.
 
 1. Click on the **ellipsis** (<i class="zulip-icon zulip-icon-more-vertical"></i>).

help/include/channel-long-press-menu-tip.md

@@ -0,0 +1,4 @@
+!!! tip ""
+
+    If you are in a channel view, you can access the long-press
+    menu from the bar at the top of the app.

help/include/channel-long-press-menu.md

@@ -0,0 +1 @@
+1. Press and hold a channel until the long-press menu appears.

help/include/channel-menu-subscribers-tab-tip.md

@@ -0,0 +1,5 @@
+!!! tip ""
+
+    You can also hover over a channel in the left sidebar, click on the
+    **ellipsis** (<i class="zulip-icon zulip-icon-more-vertical"></i>), and
+    select **Channel settings** to access the **Subscribers** tab.

help/include/channel-name-long-press-menu-tip.md

@@ -0,0 +1,4 @@
+!!! tip ""
+
+    You can also press and hold the name of a channel in Inbox and channel views
+    to access the long-press menu.

help/include/channel-name-long-press-menu.md

@@ -0,0 +1 @@
+1. Press and hold a channel name until the long-press menu appears.

help/include/channel-settings-general-tab-tip.md

@@ -0,0 +1,5 @@
+!!! tip ""
+
+    You can also hover over a channel in the left sidebar, click on the
+    **ellipsis** (<i class="zulip-icon zulip-icon-more-vertical"></i>), and
+    select **Channel settings** to access the **General** tab.

help/include/channels-and-topics.md

@@ -5,7 +5,7 @@ Topics are light-weight subjects, very similar to the subject line of an email.
 Like in email or a forum, messages about the same topic are shown together as a
 conversational thread. Here is what it looks like in Zulip.
 
-![Streams and topics](/static/images/help/streams-and-topics.png)
+![Channels and topics](/static/images/help/streams-and-topics.png)
 
 Topics are one of the most wonderful aspects of using Zulip:
 

help/include/combined-feed.md

@@ -1,5 +1,5 @@
 The **Combined feed** view is a feed of all the unmuted messages you have
-received, which combines stream messages and direct messages. It's a great way
+received, which combines channel messages and direct messages. It's a great way
 to see new messages as they come in.
 
 You can configure **Combined feed** to be the [home

help/include/create-a-channel-instructions.md

@@ -17,7 +17,7 @@
 
 {tab|mobile}
 
-{!mobile-all-streams-view.md!}
+{!mobile-all-channels-view.md!}
 
 1. Tap the **Create new channel** button at the top of the app.
 

help/include/how-to-start-a-new-topic.md

@@ -5,9 +5,9 @@
 1. Click the **Start new conversation** button at the bottom of the app, or
    use the <kbd>C</kbd> keyboard shortcut.
 
-1. _(optional)_ You can change the destination stream for your message using
+1. _(optional)_ You can change the destination channel for your message using
    the dropdown in the top left of the compose box. You can start typing to
-   filter streams.
+   filter channels.
 
 1. Enter a topic name. Auto-complete will provide suggestions for previously
    used topics.
@@ -28,11 +28,11 @@
 
 {tab|mobile}
 
-1. Tap the **Streams**
+1. Tap the **Channels**
    (<img src="/static/images/help/mobile-hash-icon.svg" alt="hash" class="help-center-icon"/>)
    tab at the bottom of the app.
 
-1. Tap on the desired stream.
+1. Tap on the desired channel.
 
 1. Tap the compose box at the bottom of the app.
 

help/include/inbox-instructions.md

@@ -9,12 +9,12 @@
 
 !!! tip ""
 
-    You can collapse or expand the list of topics in a stream by clicking the
+    You can collapse or expand the list of topics in a channel by clicking the
     **collapse**
     (<i class="zulip-icon zulip-icon-arrow-down"></i>)
     or **expand**
     (<i class="zulip-icon zulip-icon-arrow-down icon-collapsed-state"></i>)
-    icon to the left of a stream name.
+    icon to the left of a channel name.
 
 {tab|mobile}
 
@@ -27,11 +27,11 @@
 
 !!! tip ""
 
-    You can collapse or expand the list of topics in a stream by tapping the
+    You can collapse or expand the list of topics in a channel by tapping the
     **collapse**
     (<img src="/static/images/help/mobile-expand-less-icon.svg" alt="inbox" class="help-center-icon"/>)
     or **expand**
     (<img src="/static/images/help/mobile-expand-more-icon.svg" alt="inbox" class="help-center-icon"/>)
-    icon to the left of a stream name.
+    icon to the left of a channel name.
 
 {end_tabs}

help/include/inbox-intro.md

@@ -1,3 +1,3 @@
 **Inbox** provides an overview of your conversations with unread messages.
 Conversations are shown in the same order as in the left sidebar in the web app,
-and you can collapse any streams you are not currently interested in.
+and you can collapse any channels you are not currently interested in.

help/include/left-sidebar-conversations.md

@@ -1,11 +1,11 @@
 In the web app, the left sidebar provides quick access to your direct messages,
-and the streams you are subscribed to.
+and the channels you are subscribed to.
 
 {start_tabs}
 
 {tab|desktop-web}
 
-1. Click on **DIRECT MESSAGES** or the name of a stream in the left sidebar. You
+1. Click on **DIRECT MESSAGES** or the name of a channel in the left sidebar. You
    will see a list of the most recent unread conversations that you have not [muted](/help/mute-a-topic).
 
 1. Click on the conversation you are interested in.
@@ -13,6 +13,6 @@ and the streams you are subscribed to.
 !!! tip ""
 
     To see all conversations, click on **more conversations** (in direct messages) or **more topics**
-    (in a stream).
+    (in a channel).
 
 {end_tabs}

help/include/links-examples.md

@@ -3,8 +3,8 @@
 ```
 Named link: [Zulip homepage](zulip.com)
 A URL (links automatically): zulip.com
-Stream link: #**stream name**
+Channel link: #**channel name**
-Stream and topic link: #**stream name>topic name**
+Channel and topic link: #**channel name>topic name**
 Custom linkifier: For example, #2468 can automatically link to an issue in your tracker.
 ```
 

help/include/links-intro.md

@@ -2,7 +2,7 @@ In Zulip, you can insert a named link using Markdown formatting. In addition, Zu
 automatically creates links for you when you enter:
 
 - A URL
-- An appropriately formatted stream name, or a stream name followed by a topic
+- An appropriately formatted channel name, or a channel name followed by a topic
   (see also [Link to a message or
   conversation](/help/link-to-a-message-or-conversation))
 - Text that matches a [custom linkifier](/help/add-a-custom-linkifier) set up by your organization

help/include/manage-configured-topics.md

@@ -6,11 +6,11 @@
 
 {tab|mobile}
 
-1. Tap the **Streams**
+1. Tap the **Channels**
    (<img src="/static/images/help/mobile-hash-icon.svg" alt="hash" class="help-center-icon"/>)
    tab at the bottom of the app.
 
-1. Select a stream containing topics you want to configure.
+1. Select a channel containing topics you want to configure.
 
 1. Tap the **Topics list**
    (<img src="/static/images/help/mobile-list-icon.svg" alt="list" class="help-center-icon"/>)

help/include/mobile-all-channels-view.md

@@ -1,5 +1,5 @@
-1. Tap the **Streams**
+1. Tap the **Channels**
    (<img src="/static/images/help/mobile-hash-icon.svg" alt="hash" class="help-center-icon"/>)
    tab at the bottom of the app.
 
-1. Scroll down to the bottom, and tap **ALL STREAMS**.
+1. Scroll down to the bottom, and tap **ALL CHANNELS**.

help/include/mobile-channel-settings-menu-tip.md

@@ -1,6 +1,6 @@
 !!! tip ""
 
-    If you are in a stream view, you can access the
+    If you are in a channel view, you can access the
-    stream settings menu from the **information**
+    channel settings menu from the **information**
     (<img src="/static/images/help/mobile-info-circle-icon.svg" alt="information" class="help-center-icon"/>)
     button in the top right corner of the app.

help/include/mute-unmute-intro.md

@@ -1,7 +1,7 @@
-Zulip lets you mute topics and streams to avoid receiving notifications for messages
+Zulip lets you mute topics and channels to avoid receiving notifications for messages
-you are not interested in. Muting a stream effectively mutes all topics in
+you are not interested in. Muting a channel effectively mutes all topics in
-that stream. You can also manually **mute** a topic in an unmuted stream, or
+that channel. You can also manually **mute** a topic in an unmuted channel, or
-**unmute** a topic in a muted stream.
+**unmute** a topic in a muted channel.
 
 Muting has the following effects:
 
@@ -13,11 +13,11 @@ Muting has the following effects:
 - Muted topics appear in the [**Recent conversations**
   view](/help/recent-conversations) only if the **Include muted** filter is
   enabled.
-- Unread messages in muted topics do not contribute to stream unread counts.
+- Unread messages in muted topics do not contribute to channel unread counts.
-- Muted topics and streams are grayed out in the left sidebar of the desktop/web
+- Muted topics and channels are grayed out in the left sidebar of the desktop/web
   app, and in the mobile app.
-- In the desktop/web app, muted topics are sorted to the bottom of their stream,
+- In the desktop/web app, muted topics are sorted to the bottom of their channel,
-  and muted streams are sorted to the bottom of their stream section.
+  and muted channels are sorted to the bottom of their channel section.
 
 !!! warn ""
 

help/include/sidebar_index.md

@@ -58,7 +58,7 @@
 ## Writing messages
 * [Message formatting](/help/format-your-message-using-markdown)
 * [Mention a user or group](/help/mention-a-user-or-group)
-* [Link to a stream, topic, or message](/help/link-to-a-message-or-conversation)
+* [Link to a channel, topic, or message](/help/link-to-a-message-or-conversation)
 * [Format a quote](/help/format-a-quote)
 * [Quote and reply](/help/quote-and-reply)
 * [Emoji and emoticons](/help/emoji-and-emoticons)
@@ -124,7 +124,7 @@
 * [User groups](/help/user-groups)
 * [Find administrators](/help/find-administrators)
 
-## Streams & topics
+## Channels & topics
 * [Channels and topics](/help/channels-and-topics)
 * [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)
 * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel)
@@ -199,7 +199,7 @@
 * [Restrict profile picture changes](/help/restrict-profile-picture-changes)
 * [Restrict permissions of new members](/help/restrict-permissions-of-new-members)
 
-## Stream management
+## Channel management
 * [Channel permissions](/help/channel-permissions)
 * [Public access option](/help/public-access-option)
 * [Channel posting policy](/help/channel-posting-policy)
@@ -215,7 +215,7 @@
 ## Organization settings
 * [Custom emoji](/help/custom-emoji)
 * [Add a custom linkifier](/help/add-a-custom-linkifier)
-* [Require topics in stream messages](/help/require-topics)
+* [Require topics in channel messages](/help/require-topics)
 * [Restrict direct messages](/help/restrict-direct-messages)
 * [Restrict wildcard mentions](/help/restrict-wildcard-mentions)
 * [Restrict moving messages](/help/restrict-moving-messages)

help/include/stream-long-press-menu-tip.md

@@ -1,4 +0,0 @@
-!!! tip ""
-
-    If you are in a stream view, you can access the long-press
-    menu from the bar at the top of the app.

help/include/stream-long-press-menu.md

@@ -1 +0,0 @@
-1. Press and hold a stream until the long-press menu appears.

help/include/stream-menu-subscribers-tab-tip.md

@@ -1,5 +0,0 @@
-!!! tip ""
-
-    You can also hover over a stream in the left sidebar, click on the
-    **ellipsis** (<i class="zulip-icon zulip-icon-more-vertical"></i>), and
-    select **Stream settings** to access the **Subscribers** tab.

help/include/stream-name-long-press-menu-tip.md

@@ -1,4 +0,0 @@
-!!! tip ""
-
-    You can also press and hold the name of a stream in Inbox and stream views
-    to access the long-press menu.

help/include/stream-name-long-press-menu.md

@@ -1 +0,0 @@
-1. Press and hold a stream name until the long-press menu appears.

help/include/stream-settings-general-tab-tip.md

@@ -1,5 +0,0 @@
-!!! tip ""
-
-    You can also hover over a stream in the left sidebar, click on the
-    **ellipsis** (<i class="zulip-icon zulip-icon-more-vertical"></i>), and
-    select **Stream settings** to access the **General** tab.

help/include/web-public-channels-intro.md

@@ -1,14 +1,14 @@
-The public access option lets administrators configure selected streams to be
+The public access option lets administrators configure selected channels to be
-**web-public**. Web-public streams can be viewed by anyone on the Internet
+**web-public**. Web-public channels can be viewed by anyone on the Internet
 without creating an account in your organization.
 
 For example, you can [link to a Zulip
-topic](/help/link-to-a-message-or-conversation) in a web-public stream
+topic](/help/link-to-a-message-or-conversation) in a web-public channel
 from a GitHub issue, a social media post, or a forum thread, and
 anyone will be able to click the link and view the discussion in the
 Zulip web application without needing to create an account.
 
-To see this feature in action, you can [view web-public streams in the Zulip
+To see this feature in action, you can [view web-public channels in the Zulip
 development community](https://chat.zulip.org/) without logging in.
 
 Users who wish to post content will need to create an account in order

help/link-to-a-message-or-conversation.md

@@ -109,11 +109,11 @@ message](/help/quote-and-reply).
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Copy link to stream**.
 
-{!stream-long-press-menu-tip.md!}
+{!channel-long-press-menu-tip.md!}
 
 {end_tabs}
 

help/manage-user-channel-subscriptions.md

@@ -48,7 +48,7 @@ other users to a channel][configure-invites].
 
 {end_tabs}
 
-{!automated-dm-stream-subscription.md!}
+{!automated-dm-channel-subscription.md!}
 
 ## Unsubscribe a user from channel(s)
 

help/message-retention-policy.md

@@ -53,7 +53,7 @@ Standard hosting.
 
 {end_tabs}
 
-{!automated-notice-stream-event.md!}
+{!automated-notice-channel-event.md!}
 
 ## Important details
 

help/moderating-open-organizations.md

@@ -82,7 +82,7 @@ organization's policy choices.
 
 ## Public access option
 
-{!web-public-streams-intro.md!}
+{!web-public-channels-intro.md!}
 
 ## Zulip communities directory
 

help/mute-a-channel.md

@@ -8,17 +8,17 @@
 
 {tab|desktop-web}
 
-{!stream-actions.md!}
+{!channel-actions.md!}
 
 1. Click **Mute channel**.
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Mute channel**.
 
-{!stream-long-press-menu-tip.md!}
+{!channel-long-press-menu-tip.md!}
 
 {end_tabs}
 
@@ -29,17 +29,17 @@
 
 {tab|desktop-web}
 
-{!stream-actions.md!}
+{!channel-actions.md!}
 
 1. Click **Unmute channel**.
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Unmute channel**.
 
-{!stream-long-press-menu-tip.md!}
+{!channel-long-press-menu-tip.md!}
 
 {end_tabs}
 
@@ -59,13 +59,13 @@
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Channel settings**.
 
 1. Toggle **Muted**.
 
-{!mobile-stream-settings-menu-tip.md!}
+{!mobile-channel-settings-menu-tip.md!}
 
 {end_tabs}
 

help/pin-a-channel.md

@@ -10,17 +10,17 @@ which is especially handy if you are subscribed to a large number of channels.
 
 {tab|desktop-web}
 
-{!stream-actions.md!}
+{!channel-actions.md!}
 
 1. Click **Pin channel to top**.
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Pin to top**.
 
-{!stream-long-press-menu-tip.md!}
+{!channel-long-press-menu-tip.md!}
 
 {end_tabs}
 
@@ -30,17 +30,17 @@ which is especially handy if you are subscribed to a large number of channels.
 
 {tab|desktop-web}
 
-{!stream-actions.md!}
+{!channel-actions.md!}
 
 1. Click **Unpin channel from top**.
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Unpin from top**.
 
-{!stream-long-press-menu-tip.md!}
+{!channel-long-press-menu-tip.md!}
 
 {end_tabs}
 
@@ -60,13 +60,13 @@ which is especially handy if you are subscribed to a large number of channels.
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Channel settings**.
 
 1. Toggle **Pinned**.
 
-{!mobile-stream-settings-menu-tip.md!}
+{!mobile-channel-settings-menu-tip.md!}
 
 {end_tabs}
 

help/rename-a-channel.md

@@ -17,13 +17,13 @@
 
 {!save-changes.md!}
 
-{!stream-settings-general-tab-tip.md!}
+{!channel-settings-general-tab-tip.md!}
 
 {tab|mobile}
 
-{!mobile-all-streams-view.md!}
+{!mobile-all-channels-view.md!}
 
-{!stream-name-long-press-menu.md!}
+{!channel-name-long-press-menu.md!}
 
 1. Tap **Channel settings**.
 
@@ -31,8 +31,8 @@
 
 1. Tap **Save**.
 
-{!stream-name-long-press-menu-tip.md!}
+{!channel-name-long-press-menu-tip.md!}
 
 {end_tabs}
 
-{!automated-notice-stream-event.md!}
+{!automated-notice-channel-event.md!}

help/unsubscribe-from-a-channel.md

@@ -6,17 +6,17 @@ You can always unsubscribe from any channel in Zulip.
 
 {tab|desktop-web}
 
-{!stream-actions.md!}
+{!channel-actions.md!}
 
 1. Click **Unsubscribe**.
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Unsubscribe**.
 
-{!stream-long-press-menu-tip.md!}
+{!channel-long-press-menu-tip.md!}
 
 {end_tabs}
 
@@ -36,7 +36,7 @@ You can always unsubscribe from any channel in Zulip.
 
 {tab|mobile}
 
-{!mobile-all-streams-view.md!}
+{!mobile-all-channels-view.md!}
 
 1. Tap the **checkmark**
    (<img src="/static/images/help/mobile-check-icon.svg" alt="checkmark" class="help-center-icon"/>)
@@ -55,7 +55,7 @@ You can always unsubscribe from any channel in Zulip.
 
 {tab|desktop-web}
 
-{!stream-actions.md!}
+{!channel-actions.md!}
 
 1. Click **Channel settings**.
 
@@ -68,13 +68,13 @@ You can always unsubscribe from any channel in Zulip.
 
 {tab|mobile}
 
-{!stream-long-press-menu.md!}
+{!channel-long-press-menu.md!}
 
 1. Tap **Channel settings**.
 
 1. Tap **Unsubscribe**.
 
-{!mobile-stream-settings-menu-tip.md!}
+{!mobile-channel-settings-menu-tip.md!}
 
 {end_tabs}
 

help/view-channel-subscribers.md

@@ -18,7 +18,7 @@ unsubscribe other users to channels.
 
 {!select-channel-view-subscribers.md!}
 
-{!stream-menu-subscribers-tab-tip.md!}
+{!channel-menu-subscribers-tab-tip.md!}
 
 {tab|via-right-sidebar}