diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index d85a6ec22a..0df50c2632 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -688,24 +688,25 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	$url_status		= ($config['allow_post_links']) ? true : false;
 
 	/**
-	 * Adds an opportunity to rewrite in private messages content statuses with extensions
+	 * Event to override private message BBCode status indications
 	 *
-	 * @event core.pm_content_statuses_settings
+	 * @event core.ucp_pm_compose_modify_bbcode_status_indications
 	 *
-	 * @var bool bbcode_status
-	 * @var bool smilies_status
-	 * @var bool img_status
-	 * @var bool url_status
-	 * @var bool flash_status
+	 * @var bool	bbcode_status	BBCode status
+	 * @var bool	smilies_status	Smilies status
+	 * @var bool	img_status		Image BBCode status
+	 * @var bool	flash_status	Flash BBCode status
+	 * @var bool	url_status		URL BBCode status
+	 * @since 3.3.3-RC1
 	 */
 	$vars = [
 		'bbcode_status',
 		'smilies_status',
 		'img_status',
-		'url_status',
 		'flash_status',
+		'url_status',
 	];
-	extract($phpbb_dispatcher->trigger_event('core.pm_content_statuses_settings', compact($vars)));
+	extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_bbcode_status_indications', compact($vars)));
 
 	// Save Draft
 	if ($save && $auth->acl_get('u_savedrafts'))
diff --git a/phpBB/posting.php b/phpBB/posting.php
index ef7833771a..85d1b10966 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -730,16 +730,17 @@ $flash_status	= ($bbcode_status && $auth->acl_get('f_flash', $forum_id) && $conf
 $quote_status	= true;
 
 /**
- * Adds an opportunity to rewrite in posting content statuses with extensions
+ * Event to override message BBCode status indications
  *
- * @event core.posting_content_statuses_settings
+ * @event core.posting_modify_bbcode_status_indications
  *
- * @var bool bbcode_status
- * @var bool smilies_status
- * @var bool img_status
- * @var bool url_status
- * @var bool flash_status
- * @var bool quote_status
+ * @var bool	bbcode_status	BBCode status
+ * @var bool	smilies_status	Smilies status
+ * @var bool	img_status		Image BBCode status
+ * @var bool	url_status		URL BBCode status
+ * @var bool	flash_status	Flash BBCode status
+ * @var bool	quote_status	Quote BBCode status
+ * @since 3.3.3-RC1
  */
 $vars = [
 	'bbcode_status',
@@ -749,7 +750,7 @@ $vars = [
 	'flash_status',
 	'quote_status',
 ];
-extract($phpbb_dispatcher->trigger_event('core.posting_content_statuses_settings', compact($vars)));
+extract($phpbb_dispatcher->trigger_event('core.posting_modify_bbcode_status_indications', compact($vars)));
 
 // Save Draft
 if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote'))