diff --git a/main/bridge.c b/main/bridge.c
index a9295b68405a258db061ce3833272e00c3c2d465..ad8e8bec6a53913bd33a0dfb52fe66eaa7daf020 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -4815,7 +4815,7 @@ static char *handle_bridge_technology_suspend(struct ast_cli_entry *e, int cmd,
 static struct ast_cli_entry bridge_cli[] = {
 	AST_CLI_DEFINE(handle_bridge_show_all, "List all bridges"),
 	AST_CLI_DEFINE(handle_bridge_show_specific, "Show information about a bridge"),
-/* BUGBUG need AMI action equivalents to the following CLI commands. */
+/* XXX ASTERISK-22356 need AMI action equivalents to the following CLI commands. */
 	AST_CLI_DEFINE(handle_bridge_destroy_specific, "Destroy a bridge"),
 	AST_CLI_DEFINE(handle_bridge_kick_channel, "Kick a channel from a bridge"),
 	AST_CLI_DEFINE(handle_bridge_technology_show, "List registered bridge technologies"),
diff --git a/main/bridge_channel.c b/main/bridge_channel.c
index f6d909cbcfdb3b2ee2b253cd8f77e6de4517f6a8..f49fddc0fcf930c1ae00ffe3458b32676ffe933d 100644
--- a/main/bridge_channel.c
+++ b/main/bridge_channel.c
@@ -305,7 +305,8 @@ static int bridge_channel_write_frame(struct ast_bridge_channel *bridge_channel,
 {
 	ast_bridge_channel_lock_bridge(bridge_channel);
 /*
- * BUGBUG need to implement a deferred write queue for when there is no peer channel in the bridge (yet or it was kicked).
+ * XXX need to implement a deferred write queue for when there
+ * is no peer channel in the bridge (yet or it was kicked).
  *
  * The tech decides if a frame needs to be pushed back for deferral.
  * simple_bridge/native_bridge are likely the only techs that will do this.