diff --git a/app/Controller/UserCreationController.php b/app/Controller/UserCreationController.php
index 49f9db54f..4ae170e0c 100644
--- a/app/Controller/UserCreationController.php
+++ b/app/Controller/UserCreationController.php
@@ -3,7 +3,7 @@
 namespace Kanboard\Controller;
 
 use Kanboard\Core\Security\Role;
-use Kanboard\Notification\Mail as MailNotification;
+use Kanboard\Notification\MailNotification;
 
 /**
  * Class UserCreationController
diff --git a/app/Notification/NotificationInterface.php b/app/Core/Notification/NotificationInterface.php
similarity index 89%
rename from app/Notification/NotificationInterface.php
rename to app/Core/Notification/NotificationInterface.php
index 8431a77c0..d336983af 100644
--- a/app/Notification/NotificationInterface.php
+++ b/app/Core/Notification/NotificationInterface.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Kanboard\Notification;
+namespace Kanboard\Core\Notification;
 
 /**
  * Notification Interface
  *
- * @package  core
+ * @package  Kanboard\Core\Notification
  * @author   Frederic Guillot
  */
 interface NotificationInterface
diff --git a/app/Notification/ActivityStream.php b/app/Notification/ActivityStreamNotification.php
similarity index 85%
rename from app/Notification/ActivityStream.php
rename to app/Notification/ActivityStreamNotification.php
index 325732ec1..8ac265d39 100644
--- a/app/Notification/ActivityStream.php
+++ b/app/Notification/ActivityStreamNotification.php
@@ -3,14 +3,15 @@
 namespace Kanboard\Notification;
 
 use Kanboard\Core\Base;
+use Kanboard\Core\Notification\NotificationInterface;
 
 /**
  * Activity Stream Notification
  *
- * @package  notification
+ * @package  Kanboard\Notification
  * @author   Frederic Guillot
  */
-class ActivityStream extends Base implements NotificationInterface
+class ActivityStreamNotification extends Base implements NotificationInterface
 {
     /**
      * Send notification to a user
diff --git a/app/Notification/Mail.php b/app/Notification/MailNotification.php
similarity index 96%
rename from app/Notification/Mail.php
rename to app/Notification/MailNotification.php
index c924fb50a..0ba06715e 100644
--- a/app/Notification/Mail.php
+++ b/app/Notification/MailNotification.php
@@ -3,6 +3,7 @@
 namespace Kanboard\Notification;
 
 use Kanboard\Core\Base;
+use Kanboard\Core\Notification\NotificationInterface;
 use Kanboard\Model\Task;
 use Kanboard\Model\TaskFile;
 use Kanboard\Model\Comment;
@@ -11,10 +12,10 @@ use Kanboard\Model\Subtask;
 /**
  * Email Notification
  *
- * @package  notification
+ * @package  Kanboard\Notification
  * @author   Frederic Guillot
  */
-class Mail extends Base implements NotificationInterface
+class MailNotification extends Base implements NotificationInterface
 {
     /**
      * Notification type
diff --git a/app/Notification/Web.php b/app/Notification/WebNotification.php
similarity index 84%
rename from app/Notification/Web.php
rename to app/Notification/WebNotification.php
index 9271c193d..99c0c903a 100644
--- a/app/Notification/Web.php
+++ b/app/Notification/WebNotification.php
@@ -3,14 +3,15 @@
 namespace Kanboard\Notification;
 
 use Kanboard\Core\Base;
+use Kanboard\Core\Notification\NotificationInterface;
 
 /**
  * Web Notification
  *
- * @package  notification
+ * @package  Kanboard\Notification
  * @author   Frederic Guillot
  */
-class Web extends Base implements NotificationInterface
+class WebNotification extends Base implements NotificationInterface
 {
     /**
      * Notification type
diff --git a/app/Notification/Webhook.php b/app/Notification/WebhookNotification.php
similarity index 88%
rename from app/Notification/Webhook.php
rename to app/Notification/WebhookNotification.php
index e187909f2..25d592511 100644
--- a/app/Notification/Webhook.php
+++ b/app/Notification/WebhookNotification.php
@@ -3,14 +3,15 @@
 namespace Kanboard\Notification;
 
 use Kanboard\Core\Base;
+use Kanboard\Core\Notification\NotificationInterface;
 
 /**
  * Webhook Notification
  *
- * @package  notification
+ * @package  Kanboard\Notification
  * @author   Frederic Guillot
  */
-class Webhook extends Base implements NotificationInterface
+class WebhookNotification extends Base implements NotificationInterface
 {
     /**
      * Send notification to a user
diff --git a/app/ServiceProvider/NotificationProvider.php b/app/ServiceProvider/NotificationProvider.php
index 23d1d5168..2cb015762 100644
--- a/app/ServiceProvider/NotificationProvider.php
+++ b/app/ServiceProvider/NotificationProvider.php
@@ -6,8 +6,8 @@ use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Kanboard\Model\UserNotificationType;
 use Kanboard\Model\ProjectNotificationType;
-use Kanboard\Notification\Mail as MailNotification;
-use Kanboard\Notification\Web as WebNotification;
+use Kanboard\Notification\MailNotification as MailNotification;
+use Kanboard\Notification\WebNotification as WebNotification;
 
 /**
  * Notification Provider
@@ -28,15 +28,15 @@ class NotificationProvider implements ServiceProviderInterface
     {
         $container['userNotificationType'] = function ($container) {
             $type = new UserNotificationType($container);
-            $type->setType(MailNotification::TYPE, t('Email'), '\Kanboard\Notification\Mail');
-            $type->setType(WebNotification::TYPE, t('Web'), '\Kanboard\Notification\Web');
+            $type->setType(MailNotification::TYPE, t('Email'), '\Kanboard\Notification\MailNotification');
+            $type->setType(WebNotification::TYPE, t('Web'), '\Kanboard\Notification\WebNotification');
             return $type;
         };
 
         $container['projectNotificationType'] = function ($container) {
             $type = new ProjectNotificationType($container);
-            $type->setType('webhook', 'Webhook', '\Kanboard\Notification\Webhook', true);
-            $type->setType('activity_stream', 'ActivityStream', '\Kanboard\Notification\ActivityStream', true);
+            $type->setType('webhook', 'Webhook', '\Kanboard\Notification\WebhookNotification', true);
+            $type->setType('activity_stream', 'ActivityStream', '\Kanboard\Notification\ActivityStreamNotification', true);
             return $type;
         };
 
diff --git a/tests/units/Notification/MailTest.php b/tests/units/Notification/MailTest.php
index 7dc6aaef8..8d32b497e 100644
--- a/tests/units/Notification/MailTest.php
+++ b/tests/units/Notification/MailTest.php
@@ -10,14 +10,14 @@ use Kanboard\Model\User;
 use Kanboard\Model\TaskFile;
 use Kanboard\Model\Project;
 use Kanboard\Model\Task;
-use Kanboard\Notification\Mail;
+use Kanboard\Notification\MailNotification;
 use Kanboard\Subscriber\NotificationSubscriber;
 
 class MailTest extends Base
 {
     public function testGetMailContent()
     {
-        $en = new Mail($this->container);
+        $en = new MailNotification($this->container);
         $p = new Project($this->container);
         $tf = new TaskFinder($this->container);
         $tc = new TaskCreation($this->container);
@@ -62,7 +62,7 @@ class MailTest extends Base
 
     public function testSendWithEmailAddress()
     {
-        $en = new Mail($this->container);
+        $en = new MailNotification($this->container);
         $p = new Project($this->container);
         $tf = new TaskFinder($this->container);
         $tc = new TaskCreation($this->container);
@@ -93,7 +93,7 @@ class MailTest extends Base
 
     public function testSendWithoutEmailAddress()
     {
-        $en = new Mail($this->container);
+        $en = new MailNotification($this->container);
         $p = new Project($this->container);
         $tf = new TaskFinder($this->container);
         $tc = new TaskCreation($this->container);