diff --git a/components/Email/Email.php b/plugins/EmailNotifications/EmailNotifications.php
similarity index 93%
rename from components/Email/Email.php
rename to plugins/EmailNotifications/EmailNotifications.php
index 843d1331d9..bd41b37dc1 100644
--- a/components/Email/Email.php
+++ b/plugins/EmailNotifications/EmailNotifications.php
@@ -23,19 +23,19 @@
  * Handle email notifications
  *
  * @package  GNUsocial
- * @category Component
+ * @category Plugin
  *
  * @author    Hugo Sales <hugo@fc.up.pt>
  * @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 
-namespace Component\Email;
+namespace Plugin\EmailNotifications;
 
 use App\Core\Event;
 use App\Core\Module;
 
-class Email extends Module
+class EmailNotifications extends Module
 {
     public function onAddNotificationTransport(&$form_defs): bool
     {
diff --git a/components/XMPP/XMPP.php b/plugins/XMPPNotifications/XMPPNotifications.php
similarity index 73%
rename from components/XMPP/XMPP.php
rename to plugins/XMPPNotifications/XMPPNotifications.php
index aac91684b7..6ec8dd7adc 100644
--- a/components/XMPP/XMPP.php
+++ b/plugins/XMPPNotifications/XMPPNotifications.php
@@ -19,12 +19,23 @@
 
 // }}}
 
-namespace Component\XMPP;
+/**
+ * Handle xmpp notifications
+ *
+ * @package  GNUsocial
+ * @category Plugin
+ *
+ * @author    Hugo Sales <hugo@fc.up.pt>
+ * @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
+ * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ */
+
+namespace Plugin\XMPPNotifications;
 
 use App\Core\Event;
 use App\Core\Module;
 
-class XMPP extends Module
+class XMPPNotifications extends Module
 {
     public function onAddNotificationTransport(&$form_defs): bool
     {