diff --git a/help/add-or-remove-users-from-a-stream.md b/help/add-or-remove-users-from-a-stream.md
index 73a845d1e7..9a27bd8481 100644
--- a/help/add-or-remove-users-from-a-stream.md
+++ b/help/add-or-remove-users-from-a-stream.md
@@ -23,7 +23,7 @@ stream][add-users] or [remove other users from a stream][remove-users].
 
 1. Select a stream.
 
-{!select-stream-view-subscribers.md!}
+{!select-channel-view-subscribers.md!}
 
 1. Under **Add subscribers**, enter a name or email address. The typeahead
    will only include users who aren't already subscribed to the stream.
@@ -69,7 +69,7 @@ stream][add-users] or [remove other users from a stream][remove-users].
 
 1. Click **Stream settings**.
 
-{!select-stream-view-subscribers.md!}
+{!select-channel-view-subscribers.md!}
 
 1. Under **Add subscribers**, enter a name or email address. The typeahead
    will only include users who aren't already subscribed to the stream.
@@ -121,7 +121,7 @@ subscribe the user.
 
 1. Select a stream.
 
-{!select-stream-view-subscribers.md!}
+{!select-channel-view-subscribers.md!}
 
 1. Under **Subscribers**, find the user you would like to remove.
 
diff --git a/help/change-the-color-of-a-stream.md b/help/change-the-color-of-a-stream.md
index 0221abd7a2..e396e2537b 100644
--- a/help/change-the-color-of-a-stream.md
+++ b/help/change-the-color-of-a-stream.md
@@ -27,7 +27,7 @@ stream. Changing a stream's color does not change it for anyone else.
 
 1. Select a stream.
 
-{!select-stream-view-personal.md!}
+{!select-channel-view-personal.md!}
 
 1. Under **Personal settings**, click on the colored square below **Stream color**.
 
diff --git a/help/change-the-privacy-of-a-stream.md b/help/change-the-privacy-of-a-stream.md
index ae28c1898c..832dd92609 100644
--- a/help/change-the-privacy-of-a-stream.md
+++ b/help/change-the-privacy-of-a-stream.md
@@ -19,7 +19,7 @@ public.
 
 1. Select a stream.
 
-{!select-stream-view-general.md!}
+{!select-channel-view-general.md!}
 
 1. Under **Stream permissions**, configure **Who can access the stream**.
 
diff --git a/help/change-the-stream-description.md b/help/change-the-stream-description.md
index b258aacfce..eaa21770d3 100644
--- a/help/change-the-stream-description.md
+++ b/help/change-the-stream-description.md
@@ -19,7 +19,7 @@ disabled. Use Markdown formatting to include a link to a website, Zulip
 
 1. Select a stream.
 
-{!select-stream-view-general.md!}
+{!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 description.
diff --git a/help/configure-who-can-invite-to-streams.md b/help/configure-who-can-invite-to-streams.md
index 1922bc37cc..ff56236f47 100644
--- a/help/configure-who-can-invite-to-streams.md
+++ b/help/configure-who-can-invite-to-streams.md
@@ -28,7 +28,7 @@ subscribed to the stream to configure these settings.
 
 1. Select a stream.
 
-{!select-stream-view-general.md!}
+{!select-channel-view-general.md!}
 
 1. Under **Stream permissions**, configure
    **Who can unsubscribe others from this stream?**
diff --git a/help/include/select-stream-view-general.md b/help/include/select-channel-view-general.md
similarity index 100%
rename from help/include/select-stream-view-general.md
rename to help/include/select-channel-view-general.md
diff --git a/help/include/select-stream-view-personal.md b/help/include/select-channel-view-personal.md
similarity index 100%
rename from help/include/select-stream-view-personal.md
rename to help/include/select-channel-view-personal.md
diff --git a/help/include/select-stream-view-subscribers.md b/help/include/select-channel-view-subscribers.md
similarity index 100%
rename from help/include/select-stream-view-subscribers.md
rename to help/include/select-channel-view-subscribers.md
diff --git a/help/manage-user-stream-subscriptions.md b/help/manage-user-stream-subscriptions.md
index 32fcca7720..5fbe068a39 100644
--- a/help/manage-user-stream-subscriptions.md
+++ b/help/manage-user-stream-subscriptions.md
@@ -29,7 +29,7 @@ other users to a stream][configure-invites].
 
 1. Select a stream.
 
-{!select-stream-view-subscribers.md!}
+{!select-channel-view-subscribers.md!}
 
 1. Under **Add subscribers**, enter the user's name or email address.
 
@@ -65,7 +65,7 @@ stream](/help/unsubscribe-from-a-stream).
 
 1. Select a stream.
 
-{!select-stream-view-subscribers.md!}
+{!select-channel-view-subscribers.md!}
 
 1. Under **Subscribers**, find the user you would like
    to remove from the stream.
diff --git a/help/message-a-channel-by-email.md b/help/message-a-channel-by-email.md
index 3d6e1c4d9a..fea72a2287 100644
--- a/help/message-a-channel-by-email.md
+++ b/help/message-a-channel-by-email.md
@@ -28,7 +28,7 @@ API](/api/send-message).
 
 1. Select a channel.
 
-{!select-stream-view-general.md!}
+{!select-channel-view-general.md!}
 
 1. Click **Generate email address** under **Email address**.
 
diff --git a/help/message-retention-policy.md b/help/message-retention-policy.md
index 5d5655ee40..19a592ba3f 100644
--- a/help/message-retention-policy.md
+++ b/help/message-retention-policy.md
@@ -44,7 +44,7 @@ Standard hosting.
 
 1. Select a stream.
 
-{!select-stream-view-general.md!}
+{!select-channel-view-general.md!}
 
 1. Under **Stream permissions**, configure the
    **Message retention period**.
diff --git a/help/mute-a-stream.md b/help/mute-a-stream.md
index 5bc9eeb507..d56caf0f22 100644
--- a/help/mute-a-stream.md
+++ b/help/mute-a-stream.md
@@ -53,7 +53,7 @@
 
 1. Select a stream.
 
-{!select-stream-view-personal.md!}
+{!select-channel-view-personal.md!}
 
 1. Under **Notification settings**, toggle **Mute stream**.
 
diff --git a/help/pin-a-stream.md b/help/pin-a-stream.md
index 0ebbe3bb76..a54e7a3357 100644
--- a/help/pin-a-stream.md
+++ b/help/pin-a-stream.md
@@ -54,7 +54,7 @@ which is especially handy if you are subscribed to a large number of streams.
 
 1. Select a stream.
 
-{!select-stream-view-personal.md!}
+{!select-channel-view-personal.md!}
 
 1. Under **Personal settings**, toggle **Pin stream to top of left sidebar**.
 
diff --git a/help/rename-a-stream.md b/help/rename-a-stream.md
index fedce1b10e..0245762719 100644
--- a/help/rename-a-stream.md
+++ b/help/rename-a-stream.md
@@ -10,7 +10,7 @@
 
 1. Select a stream.
 
-{!select-stream-view-general.md!}
+{!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.
diff --git a/help/stream-notifications.md b/help/stream-notifications.md
index 58391bc85b..e6953f77e9 100644
--- a/help/stream-notifications.md
+++ b/help/stream-notifications.md
@@ -17,7 +17,7 @@ streams](/help/mute-a-stream), stream notification settings apply only to
 
 1. Click **Stream settings**.
 
-{!select-stream-view-personal.md!}
+{!select-channel-view-personal.md!}
 
 1. Under **Notification settings**, toggle your preferred
    notifications settings for the stream.
diff --git a/help/stream-sending-policy.md b/help/stream-sending-policy.md
index 48266b550d..17e07c9b89 100644
--- a/help/stream-sending-policy.md
+++ b/help/stream-sending-policy.md
@@ -13,7 +13,7 @@ certain users can send messages.
 
 1. Select a stream.
 
-{!select-stream-view-general.md!}
+{!select-channel-view-general.md!}
 
 1. Under **Stream permissions**, configure **Who can post to the stream**.
 
diff --git a/help/view-stream-subscribers.md b/help/view-stream-subscribers.md
index 1e79c96dcd..8c57aaa6c5 100644
--- a/help/view-stream-subscribers.md
+++ b/help/view-stream-subscribers.md
@@ -16,7 +16,7 @@ unsubscribe other users to streams.
 
 1. Select a stream.
 
-{!select-stream-view-subscribers.md!}
+{!select-channel-view-subscribers.md!}
 
 {!stream-menu-subscribers-tab-tip.md!}