diff --git a/sat/plugins/plugin_comp_ap_gateway/__init__.py b/sat/plugins/plugin_comp_ap_gateway/__init__.py
index 3380a19d..14d1f284 100644
--- a/sat/plugins/plugin_comp_ap_gateway/__init__.py
+++ b/sat/plugins/plugin_comp_ap_gateway/__init__.py
@@ -109,7 +109,7 @@ PLUGIN_INFO = {
     C.PI_DEPENDENCIES: [
         "XEP-0050", "XEP-0054", "XEP-0060", "XEP-0084", "XEP-0106", "XEP-0277",
         "XEP-0292", "XEP-0329", "XEP-0372", "XEP-0424", "XEP-0465", "XEP-0470",
-        "XEP-0447", "PUBSUB_CACHE", "TEXT_SYNTAXES", "IDENTITY", "EVENTS"
+        "XEP-0447", "XEP-0471", "PUBSUB_CACHE", "TEXT_SYNTAXES", "IDENTITY"
     ],
     C.PI_RECOMMENDATIONS: [],
     C.PI_MAIN: "APGateway",
@@ -150,7 +150,7 @@ class APGateway:
         self._c = host.plugins["PUBSUB_CACHE"]
         self._t = host.plugins["TEXT_SYNTAXES"]
         self._i = host.plugins["IDENTITY"]
-        self._events = host.plugins["EVENTS"]
+        self._events = host.plugins["XEP-0471"]
         self._p.addManagedNode(
             "",
             items_cb=self._itemsReceived,
diff --git a/sat/plugins/plugin_comp_ap_gateway/events.py b/sat/plugins/plugin_comp_ap_gateway/events.py
index 8eee0644..a79ad406 100644
--- a/sat/plugins/plugin_comp_ap_gateway/events.py
+++ b/sat/plugins/plugin_comp_ap_gateway/events.py
@@ -96,7 +96,7 @@ class APEvents:
     def __init__(self, apg):
         self.host = apg.host
         self.apg = apg
-        self._events = self.host.plugins["EVENTS"]
+        self._events = self.host.plugins["XEP-0471"]
 
     async def event_data_2_ap_item(
         self, event_data: dict, author_jid: jid.JID, is_new: bool=True
diff --git a/sat/plugins/plugin_exp_invitation_pubsub.py b/sat/plugins/plugin_exp_invitation_pubsub.py
index b1e1dc65..a3c25ae0 100644
--- a/sat/plugins/plugin_exp_invitation_pubsub.py
+++ b/sat/plugins/plugin_exp_invitation_pubsub.py
@@ -147,11 +147,11 @@ class PubsubInvitation:
             extra = {}
         try:
             handler = self._ns_handler[namespace]
-            preflight = handler.onInvitationPreflight
+            preflight = handler.on_invitation_preflight
         except KeyError:
             pass
         except AttributeError:
-            log.debug(f"no onInvitationPreflight method found for {namespace!r}")
+            log.debug(f"no on_invitation_preflight method found for {namespace!r}")
         else:
             await utils.asDeferred(
                 preflight,
diff --git a/sat/plugins/plugin_misc_lists.py b/sat/plugins/plugin_misc_lists.py
index ed23732e..7febd8b6 100644
--- a/sat/plugins/plugin_misc_lists.py
+++ b/sat/plugins/plugin_misc_lists.py
@@ -297,7 +297,7 @@ class PubsubLists:
             async_=True,
         )
 
-    async def onInvitationPreflight(
+    async def on_invitation_preflight(
         self,
         client: SatXMPPEntity,
         namespace: str,
diff --git a/sat/plugins/plugin_exp_events.py b/sat/plugins/plugin_xep_0471.py
similarity index 98%
rename from sat/plugins/plugin_exp_events.py
rename to sat/plugins/plugin_xep_0471.py
index aed58bdd..d54d3bc5 100644
--- a/sat/plugins/plugin_exp_events.py
+++ b/sat/plugins/plugin_xep_0471.py
@@ -48,8 +48,8 @@ log = getLogger(__name__)
 
 PLUGIN_INFO = {
     C.PI_NAME: "Events",
-    C.PI_IMPORT_NAME: "EVENTS",
-    C.PI_TYPE: "EXP",
+    C.PI_IMPORT_NAME: "XEP-0471",
+    C.PI_TYPE: "XEP",
     C.PI_MODES: C.PLUG_MODE_BOTH,
     C.PI_PROTOCOLS: [],
     C.PI_DEPENDENCIES: [
@@ -57,9 +57,9 @@ PLUGIN_INFO = {
         # "LIST_INTEREST"
     ],
     C.PI_RECOMMENDATIONS: ["XEP-0277", "EMAIL_INVITATION"],
-    C.PI_MAIN: "Events",
+    C.PI_MAIN: "XEP_0471",
     C.PI_HANDLER: "yes",
-    C.PI_DESCRIPTION: _("""XMPP Events Management"""),
+    C.PI_DESCRIPTION: _("""Calendar Events"""),
 }
 
 NS_EVENT = "org.salut-a-toi.event:0"
@@ -68,7 +68,7 @@ NS_RSVP: Final = "urn:xmpp:events:rsvp:0"
 NS_EXTRA: Final = "urn:xmpp:events:extra:0"
 
 
-class Events:
+class XEP_0471:
     namespace = NS_EVENTS
 
     def __init__(self, host):
@@ -144,7 +144,7 @@ class Events:
             ".plugin",
             in_sign="ssssassssssss",
             out_sign="",
-            method=self._inviteByEmail,
+            method=self._invite_by_email,
             async_=True,
         )
 
@@ -1081,7 +1081,7 @@ class Events:
             invitee_jid, service, node, item_id or NS_EVENT, profile_key=profile
         )
 
-    def _inviteByEmail(self, service, node, id_=NS_EVENT, email="", emails_extra=None,
+    def _invite_by_email(self, service, node, id_=NS_EVENT, email="", emails_extra=None,
                        name="", host_name="", language="", url_template="",
                        message_subject="", message_body="",
                        profile_key=C.PROF_KEY_NONE):
@@ -1101,11 +1101,11 @@ class Events:
         ):
             value = locals()[key]
             kwargs[key] = str(value)
-        return defer.ensureDeferred(self.inviteByEmail(
+        return defer.ensureDeferred(self.invite_by_email(
             client, jid.JID(service) if service else None, node, id_ or NS_EVENT, **kwargs
         ))
 
-    async def inviteByEmail(self, client, service, node, id_=NS_EVENT, **kwargs):
+    async def invite_by_email(self, client, service, node, id_=NS_EVENT, **kwargs):
         """High level method to create an email invitation to an event
 
         @param service(unicode, None): PubSub service
@@ -1131,7 +1131,7 @@ class Events:
         # now that we have a jid, we can send normal invitation
         await self.invite(client, invitee_jid, service, node, id_)
 
-    def onInvitationPreflight(
+    def on_invitation_preflight(
         self,
         client: SatXMPPEntity,
         name: str,