diff --git a/src/Event/ConfigLoadedEvent.php b/src/Event/ConfigLoadedEvent.php
index 8923c53681..67f1407389 100644
--- a/src/Event/ConfigLoadedEvent.php
+++ b/src/Event/ConfigLoadedEvent.php
@@ -16,23 +16,17 @@ use Friendica\Core\Config\Util\ConfigFileManager;
  *
  * @internal
  */
-final class ConfigLoadedEvent implements NamedEvent
+final class ConfigLoadedEvent extends Event
 {
 	public const CONFIG_LOADED = 'friendica.config_loaded';
 
-	private string $name;
-
 	private ConfigFileManager $config;
 
 	public function __construct(string $name, ConfigFileManager $config)
 	{
-		$this->name   = $name;
-		$this->config = $config;
-	}
+		parent::__construct($name);
 
-	public function getName(): string
-	{
-		return $this->name;
+		$this->config = $config;
 	}
 
 	public function getConfig(): ConfigFileManager
diff --git a/src/Event/Event.php b/src/Event/Event.php
index fc2511ed11..90defc3204 100644
--- a/src/Event/Event.php
+++ b/src/Event/Event.php
@@ -14,7 +14,7 @@ namespace Friendica\Event;
  *
  * @internal
  */
-final class Event implements NamedEvent
+class Event implements NamedEvent
 {
 	/**
 	 * Friendica is initialized.
diff --git a/src/Event/HtmlFilterEvent.php b/src/Event/HtmlFilterEvent.php
index 0831fd468b..6b71ffb5bc 100644
--- a/src/Event/HtmlFilterEvent.php
+++ b/src/Event/HtmlFilterEvent.php
@@ -14,7 +14,7 @@ namespace Friendica\Event;
  *
  * @internal
  */
-final class HtmlFilterEvent implements NamedEvent
+final class HtmlFilterEvent extends Event
 {
 	public const HEAD = 'friendica.html.head';
 
@@ -24,19 +24,13 @@ final class HtmlFilterEvent implements NamedEvent
 
 	public const PAGE_END = 'friendica.html.page_end';
 
-	private string $name;
-
 	private string $html;
 
 	public function __construct(string $name, string $html)
 	{
-		$this->name = $name;
-		$this->html = $html;
-	}
+		parent::__construct($name);
 
-	public function getName(): string
-	{
-		return $this->name;
+		$this->html = $html;
 	}
 
 	public function getHtml(): string