diff --git a/src/common/connection.py b/src/common/connection.py
index bf8b25bc5..224dc78ad 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -300,7 +300,7 @@ class CommonConnection:
                                     composing_xep, label, forward_from, delayed,
                                     session, form_node, user_nick, keyID,
                                     callback)
-                        gajim.nec.push_incoming_event(GPGTrustKey(None,
+                        gajim.nec.push_incoming_event(GPGTrustKeyEvent(None,
                             conn=self, callback=_on_always_trust))
                     else:
                         self._message_encrypted_cb(output, type_, msg, msgtxt,
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 3ee669262..070d64f40 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1994,7 +1994,7 @@ ConnectionJingle, ConnectionIBBytestream):
                 signed = self.get_signed_presence(msg,
                     self._send_first_presence)
                 if signed is None:
-                    gajim.nec.push_incoming_event(GPGPasswordRequired(None,
+                    gajim.nec.push_incoming_event(GPGPasswordRequiredEvent(None,
                         conn=self, callback=self._send_first_presence))
                     # _send_first_presence will be called when user enter
                     # passphrase
diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index 746eda7d7..9321b70c1 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -1374,11 +1374,11 @@ class CapsReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
         self.client_caps = self.base_event.client_caps
         return True
 
-class GPGTrustKey(nec.NetworkIncomingEvent):
+class GPGTrustKeyEvent(nec.NetworkIncomingEvent):
     name = 'gpg-trust-key'
     base_network_events = []
 
-class GPGPasswordRequired(nec.NetworkIncomingEvent):
+class GPGPasswordRequiredEvent(nec.NetworkIncomingEvent):
     name = 'gpg-password-required'
     base_network_events = []