diff --git a/src/Core/Hooks/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
index 6daa53a54d..9b3265130e 100644
--- a/src/Core/Hooks/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -35,34 +35,34 @@ final class HookEventBridge
 	 * This maps the new event names to the legacy Hook names.
 	 */
 	private static array $eventMapper = [
-		Event::INIT                          => 'init_1',
-		Event::HOME_INIT                     => 'home_init',
-		ConfigLoadedEvent::CONFIG_LOADED     => 'load_config',
-		CollectRoutesEvent::COLLECT_ROUTES   => 'route_collection',
-		ArrayFilterEvent::APP_MENU           => 'app_menu',
-		ArrayFilterEvent::NAV_INFO           => 'nav_info',
-		ArrayFilterEvent::FEATURE_ENABLED    => 'isEnabled',
-		ArrayFilterEvent::FEATURE_GET        => 'get',
-		ArrayFilterEvent::POST_LOCAL_START   => 'post_local_start',
-		ArrayFilterEvent::POST_LOCAL         => 'post_local',
-		ArrayFilterEvent::POST_LOCAL_END     => 'post_local_end',
-		ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'photo_upload_form',
-		ArrayFilterEvent::NETWORK_TO_NAME    => 'network_to_name',
-		ArrayFilterEvent::CONVERSATION_START => 'conversation_start',
-		ArrayFilterEvent::DISPLAY_ITEM       => 'display_item',
-		ArrayFilterEvent::RENDER_LOCATION    => 'render_location',
-		ArrayFilterEvent::ITEM_PHOTO_MENU    => 'item_photo_menu',
-		ArrayFilterEvent::OEMBED_FETCH_END   => 'oembed_fetch_url',
-		ArrayFilterEvent::PAGE_INFO          => 'page_info_data',
-		ArrayFilterEvent::SMILEY_LIST        => 'smilie',
-		ArrayFilterEvent::BBCODE_TO_HTML_START => 'bbcode',
+		Event::INIT                              => 'init_1',
+		Event::HOME_INIT                         => 'home_init',
+		ConfigLoadedEvent::CONFIG_LOADED         => 'load_config',
+		CollectRoutesEvent::COLLECT_ROUTES       => 'route_collection',
+		ArrayFilterEvent::APP_MENU               => 'app_menu',
+		ArrayFilterEvent::NAV_INFO               => 'nav_info',
+		ArrayFilterEvent::FEATURE_ENABLED        => 'isEnabled',
+		ArrayFilterEvent::FEATURE_GET            => 'get',
+		ArrayFilterEvent::POST_LOCAL_START       => 'post_local_start',
+		ArrayFilterEvent::POST_LOCAL             => 'post_local',
+		ArrayFilterEvent::POST_LOCAL_END         => 'post_local_end',
+		ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'photo_upload_form',
+		ArrayFilterEvent::NETWORK_TO_NAME        => 'network_to_name',
+		ArrayFilterEvent::CONVERSATION_START     => 'conversation_start',
+		ArrayFilterEvent::DISPLAY_ITEM           => 'display_item',
+		ArrayFilterEvent::RENDER_LOCATION        => 'render_location',
+		ArrayFilterEvent::ITEM_PHOTO_MENU        => 'item_photo_menu',
+		ArrayFilterEvent::OEMBED_FETCH_END       => 'oembed_fetch_url',
+		ArrayFilterEvent::PAGE_INFO              => 'page_info_data',
+		ArrayFilterEvent::SMILEY_LIST            => 'smilie',
+		ArrayFilterEvent::BBCODE_TO_HTML_START   => 'bbcode',
 		ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'bb2diaspora',
-		HtmlFilterEvent::HEAD                => 'head',
-		HtmlFilterEvent::FOOTER              => 'footer',
-		HtmlFilterEvent::PAGE_HEADER         => 'page_header',
-		HtmlFilterEvent::PAGE_CONTENT_TOP    => 'page_content_top',
-		HtmlFilterEvent::PAGE_END            => 'page_end',
-		HtmlFilterEvent::JOT_TOOL            => 'jot_tool',
+		HtmlFilterEvent::HEAD                    => 'head',
+		HtmlFilterEvent::FOOTER                  => 'footer',
+		HtmlFilterEvent::PAGE_HEADER             => 'page_header',
+		HtmlFilterEvent::PAGE_CONTENT_TOP        => 'page_content_top',
+		HtmlFilterEvent::PAGE_END                => 'page_end',
+		HtmlFilterEvent::JOT_TOOL                => 'jot_tool',
 	];
 
 	/**
@@ -71,34 +71,34 @@ final class HookEventBridge
 	public static function getStaticSubscribedEvents(): array
 	{
 		return [
-			Event::INIT                          => 'onNamedEvent',
-			Event::HOME_INIT                     => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED     => 'onConfigLoadedEvent',
-			CollectRoutesEvent::COLLECT_ROUTES   => 'onCollectRoutesEvent',
-			ArrayFilterEvent::APP_MENU           => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO           => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED    => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET        => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START   => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL         => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END     => 'onArrayFilterEvent',
-			ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'onArrayFilterEvent',
-			ArrayFilterEvent::NETWORK_TO_NAME    => 'onArrayFilterEvent',
-			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
-			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
-			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
-			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
-			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
-			ArrayFilterEvent::PAGE_INFO          => 'onArrayFilterEvent',
-			ArrayFilterEvent::SMILEY_LIST        => 'onArrayFilterEvent',
-			ArrayFilterEvent::BBCODE_TO_HTML_START => 'onBbcodeToHtmlEvent',
+			Event::INIT                              => 'onNamedEvent',
+			Event::HOME_INIT                         => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED         => 'onConfigLoadedEvent',
+			CollectRoutesEvent::COLLECT_ROUTES       => 'onCollectRoutesEvent',
+			ArrayFilterEvent::APP_MENU               => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO               => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED        => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET            => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START       => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL             => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END         => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_TO_NAME        => 'onArrayFilterEvent',
+			ArrayFilterEvent::CONVERSATION_START     => 'onArrayFilterEvent',
+			ArrayFilterEvent::DISPLAY_ITEM           => 'onArrayFilterEvent',
+			ArrayFilterEvent::RENDER_LOCATION        => 'onArrayFilterEvent',
+			ArrayFilterEvent::ITEM_PHOTO_MENU        => 'onArrayFilterEvent',
+			ArrayFilterEvent::OEMBED_FETCH_END       => 'onOembedFetchEndEvent',
+			ArrayFilterEvent::PAGE_INFO              => 'onArrayFilterEvent',
+			ArrayFilterEvent::SMILEY_LIST            => 'onArrayFilterEvent',
+			ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
 			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
-			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP    => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END            => 'onHtmlFilterEvent',
-			HtmlFilterEvent::JOT_TOOL            => 'onHtmlFilterEvent',
+			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP        => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END                => 'onHtmlFilterEvent',
+			HtmlFilterEvent::JOT_TOOL                => 'onHtmlFilterEvent',
 		];
 	}
 
diff --git a/tests/Unit/Core/Hooks/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 11f178451b..9e76cebcf2 100644
--- a/tests/Unit/Core/Hooks/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -24,34 +24,34 @@ class HookEventBridgeTest extends TestCase
 	public function testGetStaticSubscribedEventsReturnsStaticMethods(): void
 	{
 		$expected = [
-			Event::INIT                          => 'onNamedEvent',
-			Event::HOME_INIT                     => 'onNamedEvent',
-			ConfigLoadedEvent::CONFIG_LOADED     => 'onConfigLoadedEvent',
-			CollectRoutesEvent::COLLECT_ROUTES   => 'onCollectRoutesEvent',
-			ArrayFilterEvent::APP_MENU           => 'onArrayFilterEvent',
-			ArrayFilterEvent::NAV_INFO           => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_ENABLED    => 'onArrayFilterEvent',
-			ArrayFilterEvent::FEATURE_GET        => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_START   => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL         => 'onArrayFilterEvent',
-			ArrayFilterEvent::POST_LOCAL_END     => 'onArrayFilterEvent',
-			ArrayFilterEvent::PHOTO_UPLOAD_FORM  => 'onArrayFilterEvent',
-			ArrayFilterEvent::NETWORK_TO_NAME    => 'onArrayFilterEvent',
-			ArrayFilterEvent::CONVERSATION_START => 'onArrayFilterEvent',
-			ArrayFilterEvent::DISPLAY_ITEM       => 'onArrayFilterEvent',
-			ArrayFilterEvent::RENDER_LOCATION    => 'onArrayFilterEvent',
-			ArrayFilterEvent::ITEM_PHOTO_MENU    => 'onArrayFilterEvent',
-			ArrayFilterEvent::OEMBED_FETCH_END   => 'onOembedFetchEndEvent',
-			ArrayFilterEvent::PAGE_INFO          => 'onArrayFilterEvent',
-			ArrayFilterEvent::SMILEY_LIST        => 'onArrayFilterEvent',
-			ArrayFilterEvent::BBCODE_TO_HTML_START => 'onBbcodeToHtmlEvent',
+			Event::INIT                              => 'onNamedEvent',
+			Event::HOME_INIT                         => 'onNamedEvent',
+			ConfigLoadedEvent::CONFIG_LOADED         => 'onConfigLoadedEvent',
+			CollectRoutesEvent::COLLECT_ROUTES       => 'onCollectRoutesEvent',
+			ArrayFilterEvent::APP_MENU               => 'onArrayFilterEvent',
+			ArrayFilterEvent::NAV_INFO               => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_ENABLED        => 'onArrayFilterEvent',
+			ArrayFilterEvent::FEATURE_GET            => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_START       => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL             => 'onArrayFilterEvent',
+			ArrayFilterEvent::POST_LOCAL_END         => 'onArrayFilterEvent',
+			ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'onArrayFilterEvent',
+			ArrayFilterEvent::NETWORK_TO_NAME        => 'onArrayFilterEvent',
+			ArrayFilterEvent::CONVERSATION_START     => 'onArrayFilterEvent',
+			ArrayFilterEvent::DISPLAY_ITEM           => 'onArrayFilterEvent',
+			ArrayFilterEvent::RENDER_LOCATION        => 'onArrayFilterEvent',
+			ArrayFilterEvent::ITEM_PHOTO_MENU        => 'onArrayFilterEvent',
+			ArrayFilterEvent::OEMBED_FETCH_END       => 'onOembedFetchEndEvent',
+			ArrayFilterEvent::PAGE_INFO              => 'onArrayFilterEvent',
+			ArrayFilterEvent::SMILEY_LIST            => 'onArrayFilterEvent',
+			ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
 			ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
-			HtmlFilterEvent::HEAD                => 'onHtmlFilterEvent',
-			HtmlFilterEvent::FOOTER              => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_HEADER         => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_CONTENT_TOP    => 'onHtmlFilterEvent',
-			HtmlFilterEvent::PAGE_END            => 'onHtmlFilterEvent',
-			HtmlFilterEvent::JOT_TOOL            => 'onHtmlFilterEvent',
+			HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
+			HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_CONTENT_TOP        => 'onHtmlFilterEvent',
+			HtmlFilterEvent::PAGE_END                => 'onHtmlFilterEvent',
+			HtmlFilterEvent::JOT_TOOL                => 'onHtmlFilterEvent',
 		];
 
 		$this->assertSame(