diff --git a/web/src/compose_validate.ts b/web/src/compose_validate.ts
index 52222a0708..21b721719f 100644
--- a/web/src/compose_validate.ts
+++ b/web/src/compose_validate.ts
@@ -187,7 +187,7 @@ export function warn_if_private_stream_is_linked(
         const new_row_html = render_private_stream_warning({
             stream_id: linked_stream.stream_id,
             banner_type: compose_banner.WARNING,
-            stream_name: linked_stream.name,
+            channel_name: linked_stream.name,
             classname: compose_banner.CLASSNAMES.private_stream_warning,
         });
         compose_banner.append_compose_banner_to_banner_list($(new_row_html), $banner_container);
@@ -514,7 +514,7 @@ export function validate_stream_message_mentions(opts: StreamWildcardOptions): b
             const new_row_html = render_wildcard_mention_not_allowed_error({
                 banner_type: compose_banner.ERROR,
                 classname: compose_banner.CLASSNAMES.wildcards_not_allowed,
-                stream_wildcard_mention: opts.stream_wildcard_mention,
+                wildcard_mention_string: opts.stream_wildcard_mention,
             });
             compose_banner.append_compose_banner_to_banner_list(
                 $(new_row_html),
diff --git a/web/templates/compose_banner/private_stream_warning.hbs b/web/templates/compose_banner/private_stream_warning.hbs
index e64678393b..c5567031c9 100644
--- a/web/templates/compose_banner/private_stream_warning.hbs
+++ b/web/templates/compose_banner/private_stream_warning.hbs
@@ -1,5 +1,5 @@
 {{#> compose_banner }}
     <p class="banner_message">
-        {{#tr}}Warning: <strong>#{stream_name}</strong> is a private stream.{{/tr}}
+        {{#tr}}Warning: <strong>#{channel_name}</strong> is a private channel.{{/tr}}
     </p>
 {{/compose_banner}}
diff --git a/web/templates/compose_banner/wildcard_mention_not_allowed_error.hbs b/web/templates/compose_banner/wildcard_mention_not_allowed_error.hbs
index b05ba39e23..2ca370bd58 100644
--- a/web/templates/compose_banner/wildcard_mention_not_allowed_error.hbs
+++ b/web/templates/compose_banner/wildcard_mention_not_allowed_error.hbs
@@ -1,7 +1,7 @@
 {{#> compose_banner }}
     <p class="banner_message">
-        {{#if stream_wildcard_mention}}
-            {{#tr}}You do not have permission to use <b>@{stream_wildcard_mention}</b> mentions in this stream.{{/tr}}
+        {{#if wildcard_mention_string}}
+            {{#tr}}You do not have permission to use <b>@{wildcard_mention_string}</b> mentions in this channel.{{/tr}}
         {{else}}
             {{#tr}}You do not have permission to use <b>@topic</b> mentions in this topic.{{/tr}}
         {{/if}}
diff --git a/web/tests/compose_validate.test.js b/web/tests/compose_validate.test.js
index d1fba0a590..57d26cc399 100644
--- a/web/tests/compose_validate.test.js
+++ b/web/tests/compose_validate.test.js
@@ -395,7 +395,7 @@ test_ui("validate_stream_message", ({override_rewire, mock_template}) => {
     let wildcards_not_allowed_rendered = false;
     mock_template("compose_banner/wildcard_mention_not_allowed_error.hbs", false, (data) => {
         assert.equal(data.classname, compose_banner.CLASSNAMES.wildcards_not_allowed);
-        assert.equal(data.stream_wildcard_mention, "all");
+        assert.equal(data.wildcard_mention_string, "all");
         wildcards_not_allowed_rendered = true;
         return "<banner-stub>";
     });
@@ -627,7 +627,7 @@ test_ui("warn_if_private_stream_is_linked", ({mock_template}) => {
     let banner_rendered = false;
     mock_template("compose_banner/private_stream_warning.hbs", false, (data) => {
         assert.equal(data.classname, compose_banner.CLASSNAMES.private_stream_warning);
-        assert.equal(data.stream_name, "Denmark");
+        assert.equal(data.channel_name, "Denmark");
         banner_rendered = true;
         return "<banner-stub>";
     });