diff --git a/notifications/EventUpdated.php b/notifications/EventUpdated.php
index c9817a99..9dc4e751 100644
--- a/notifications/EventUpdated.php
+++ b/notifications/EventUpdated.php
@@ -9,6 +9,7 @@
 namespace  humhub\modules\calendar\notifications;
 
 use humhub\libs\Html;
+use humhub\modules\calendar\notifications\base\EventNotification;
 use humhub\modules\space\models\Space;
 use Yii;
 
@@ -18,7 +19,7 @@
  * Date: 21.07.2017
  * Time: 23:12
  */
-class EventUpdated extends BaseEventNotification
+class EventUpdated extends EventNotification
 {
     /**
      * @inheritdoc
diff --git a/notifications/MarkAttend.php b/notifications/MarkAttend.php
index 576eedc5..41954b0c 100644
--- a/notifications/MarkAttend.php
+++ b/notifications/MarkAttend.php
@@ -8,10 +8,11 @@
 namespace  humhub\modules\calendar\notifications;
 
 use humhub\libs\Html;
+use humhub\modules\calendar\notifications\base\EventNotification;
 use humhub\modules\space\models\Space;
 use Yii;
 
-class MarkAttend extends BaseEventNotification
+class MarkAttend extends EventNotification
 {
     public ?int $participationStatus = null;
 
diff --git a/notifications/ParticipantAdded.php b/notifications/ParticipantAdded.php
index 99fb455e..0918c74c 100644
--- a/notifications/ParticipantAdded.php
+++ b/notifications/ParticipantAdded.php
@@ -9,9 +9,10 @@
 
 use humhub\libs\Html;
 use humhub\modules\calendar\interfaces\participation\CalendarEventParticipationIF;
+use humhub\modules\calendar\notifications\base\EventNotification;
 use Yii;
 
-class ParticipantAdded extends BaseEventNotification
+class ParticipantAdded extends EventNotification
 {
     public ?int $participationStatus = null;
 
diff --git a/notifications/ReopenedEvent.php b/notifications/ReopenedEvent.php
index 0ae936ab..b507574a 100644
--- a/notifications/ReopenedEvent.php
+++ b/notifications/ReopenedEvent.php
@@ -9,6 +9,7 @@
 namespace  humhub\modules\calendar\notifications;
 
 use humhub\libs\Html;
+use humhub\modules\calendar\notifications\base\EventNotification;
 use humhub\modules\space\models\Space;
 use Yii;
 
@@ -18,7 +19,7 @@
  * Date: 21.07.2017
  * Time: 23:12
  */
-class ReopenedEvent extends BaseEventNotification
+class ReopenedEvent extends EventNotification
 {
     /**
      * @inheritdoc
diff --git a/notifications/BaseEventNotification.php b/notifications/base/EventNotification.php
similarity index 84%
rename from notifications/BaseEventNotification.php
rename to notifications/base/EventNotification.php
index 393cc1e9..97e71cdf 100644
--- a/notifications/BaseEventNotification.php
+++ b/notifications/base/EventNotification.php
@@ -5,14 +5,15 @@
  * @license https://www.humhub.com/licences
  */
 
-namespace  humhub\modules\calendar\notifications;
+namespace humhub\modules\calendar\notifications\base;
 
 use humhub\modules\calendar\models\CalendarEntry;
+use humhub\modules\calendar\notifications\CalendarNotificationCategory;
 use humhub\modules\notification\components\BaseNotification;
 use yii\mail\MessageInterface;
 
 /* @property CalendarEntry $source */
-abstract class BaseEventNotification extends BaseNotification
+abstract class EventNotification extends BaseNotification
 {
     /**
      * @inheritdoc