diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 0df50c2632..7cb4c85916 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -690,7 +690,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	/**
 	 * Event to override private message BBCode status indications
 	 *
-	 * @event core.ucp_pm_compose_modify_bbcode_status_indications
+	 * @event core.ucp_pm_compose_modify_bbcode_status
 	 *
 	 * @var bool	bbcode_status	BBCode status
 	 * @var bool	smilies_status	Smilies status
@@ -706,7 +706,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		'flash_status',
 		'url_status',
 	];
-	extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_bbcode_status_indications', compact($vars)));
+	extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_bbcode_status', compact($vars)));
 
 	// Save Draft
 	if ($save && $auth->acl_get('u_savedrafts'))
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 85d1b10966..696c3346cb 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -732,7 +732,7 @@ $quote_status	= true;
 /**
  * Event to override message BBCode status indications
  *
- * @event core.posting_modify_bbcode_status_indications
+ * @event core.posting_modify_bbcode_status
  *
  * @var bool	bbcode_status	BBCode status
  * @var bool	smilies_status	Smilies status
@@ -750,7 +750,7 @@ $vars = [
 	'flash_status',
 	'quote_status',
 ];
-extract($phpbb_dispatcher->trigger_event('core.posting_modify_bbcode_status_indications', compact($vars)));
+extract($phpbb_dispatcher->trigger_event('core.posting_modify_bbcode_status', compact($vars)));
 
 // Save Draft
 if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote'))