diff --git a/app/models/notifier/event.rb b/app/models/notifier/event_notifier.rb
similarity index 92%
rename from app/models/notifier/event.rb
rename to app/models/notifier/event_notifier.rb
index 0fc31914a..ea771bc15 100644
--- a/app/models/notifier/event.rb
+++ b/app/models/notifier/event_notifier.rb
@@ -1,4 +1,4 @@
-class Notifier::Event < Notifier
+class Notifier::EventNotifier < Notifier
   delegate :card, :creator, to: :source
   delegate :watchers_and_subscribers, to: :card
 
diff --git a/app/models/notifier/mention.rb b/app/models/notifier/mention_notifier.rb
similarity index 82%
rename from app/models/notifier/mention.rb
rename to app/models/notifier/mention_notifier.rb
index feea686f4..c3920df8a 100644
--- a/app/models/notifier/mention.rb
+++ b/app/models/notifier/mention_notifier.rb
@@ -1,4 +1,4 @@
-class Notifier::Mention < Notifier
+class Notifier::MentionNotifier < Notifier
   alias mention source
 
   private