diff --git a/zerver/webhooks/deskdotcom/tests.py b/zerver/webhooks/deskdotcom/tests.py
index ae370a9d46..eb1e143b3b 100644
--- a/zerver/webhooks/deskdotcom/tests.py
+++ b/zerver/webhooks/deskdotcom/tests.py
@@ -4,7 +4,7 @@ from zerver.lib.test_classes import WebhookTestCase
 
 # Tests for the Desk.com webhook integration.
 #
-# The stream name must be provided in the URL-encoded test fixture data,
+# The channel name must be provided in the URL-encoded test fixture data,
 # and must match CHANNEL_NAME set here.
 #
 # Example:
diff --git a/zerver/webhooks/github/tests.py b/zerver/webhooks/github/tests.py
index 46c27ed5c4..1e8b9fbef1 100644
--- a/zerver/webhooks/github/tests.py
+++ b/zerver/webhooks/github/tests.py
@@ -550,7 +550,7 @@ A temporary team so that I can get some webhook fixtures!
         log_mock = patch("zerver.decorator.webhook_unsupported_events_logger.exception")
 
         with log_mock as m:
-            stream_message = self.send_webhook_payload(
+            channel_message = self.send_webhook_payload(
                 self.test_user,
                 self.url,
                 payload,
@@ -559,7 +559,7 @@ A temporary team so that I can get some webhook fixtures!
             )
 
         self.assert_channel_message(
-            message=stream_message,
+            message=channel_message,
             channel_name=self.CHANNEL_NAME,
             topic_name="team My Team",
             content="Team has changes to `bogus_key1/bogus_key2` data.",
diff --git a/zerver/webhooks/jira/tests.py b/zerver/webhooks/jira/tests.py
index 1c9538e5a7..24b3d1e87d 100644
--- a/zerver/webhooks/jira/tests.py
+++ b/zerver/webhooks/jira/tests.py
@@ -10,7 +10,7 @@ class JiraHookTests(WebhookTestCase):
     URL_TEMPLATE = "/api/v1/external/jira?api_key={api_key}&stream={stream}"
     WEBHOOK_DIR_NAME = "jira"
 
-    def test_custom_stream(self) -> None:
+    def test_custom_channel(self) -> None:
         api_key = get_api_key(self.test_user)
         self.subscribe(self.test_user, "jira_custom")
         url = f"/api/v1/external/jira?api_key={api_key}&stream=jira_custom"
@@ -64,7 +64,7 @@ Leo Franchi created [BUG-15: New bug with hook](http://lfranchi.com:8080/browse/
             self.assertFalse(m.called)
             self.assert_json_success(result)
 
-    def test_created_with_stream_with_spaces_escaped(self) -> None:
+    def test_created_with_channel_with_spaces_escaped(self) -> None:
         self.CHANNEL_NAME = quote("jira alerts")
         self.url = self.build_webhook_url()
         self.subscribe(self.test_user, unquote(self.CHANNEL_NAME))
@@ -85,7 +85,7 @@ Leo Franchi created [BUG-15: New bug with hook](http://lfranchi.com:8080/browse/
         self.assertEqual(msg.content, expected_message)
         self.assertEqual(msg.topic_name(), expected_topic_name)
 
-    def test_created_with_stream_with_spaces_double_escaped(self) -> None:
+    def test_created_with_channel_with_spaces_double_escaped(self) -> None:
         self.CHANNEL_NAME = quote(quote("jira alerts"))
         self.url = self.build_webhook_url()
         self.subscribe(self.test_user, unquote(unquote(self.CHANNEL_NAME)))
diff --git a/zerver/webhooks/slack/view.py b/zerver/webhooks/slack/view.py
index 6622098701..8d0c3a42b9 100644
--- a/zerver/webhooks/slack/view.py
+++ b/zerver/webhooks/slack/view.py
@@ -47,8 +47,8 @@ def api_slack_webhook(
             content,
         )
     elif channels_map_to_topics == VALID_OPTIONS["SHOULD_NOT_BE_MAPPED"]:
-        # This stream-channel mapping will be used even if
-        # there is a stream specified in the webhook URL.
+        # This channel-channel mapping will be used even if
+        # there is a channel specified in the webhook URL.
         check_send_webhook_message(
             request,
             user_profile,
diff --git a/zerver/webhooks/wordpress/tests.py b/zerver/webhooks/wordpress/tests.py
index 21662db8e1..5740e0f682 100644
--- a/zerver/webhooks/wordpress/tests.py
+++ b/zerver/webhooks/wordpress/tests.py
@@ -83,7 +83,7 @@ class WordPressHookTests(WebhookTestCase):
         # we are testing. The value of result is the error message the webhook should
         # return if no params are sent. The fixture for this test is an empty file.
 
-        # subscribe to the target stream
+        # subscribe to the target channel
         self.subscribe(self.test_user, self.CHANNEL_NAME)
 
         # post to the webhook url