diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/ChatStoryLineHandler.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/ChatStoryLineHandler.java
index af40257..bd5506c 100644
--- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/ChatStoryLineHandler.java
+++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/ChatStoryLineHandler.java
@@ -19,7 +19,7 @@ public class ChatStoryLineHandler implements EventHandler<ChatMail> {
 
     @Override
     public String getEventType() {
-        return ChatMail.class.getName();
+        return ChatMail.class.getSimpleName();
     }
 
 }
diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/PersonStoryLineHandler.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/PersonStoryLineHandler.java
index 776bfbf..0c2fa67 100644
--- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/PersonStoryLineHandler.java
+++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/provider/PersonStoryLineHandler.java
@@ -19,7 +19,7 @@ public class PersonStoryLineHandler implements EventHandler<Mail> {
 
     @Override
     public String getEventType() {
-        return Mail.class.getName();
+        return Mail.class.getSimpleName();
     }
 
 }
diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/ChatMail.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/ChatMail.java
index 77d3b31..bdc26a9 100644
--- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/ChatMail.java
+++ b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/ChatMail.java
@@ -1,6 +1,5 @@
 package dev.struchkov.godfather.main.domain.content;
 
-import dev.struchkov.godfather.main.domain.event.Event;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,7 +9,7 @@ import java.util.List;
 
 @Getter
 @Setter
-public class ChatMail extends Message implements Event {
+public class ChatMail extends Message {
 
     public static final String TYPE = "CHAT_MAIL";
 
@@ -44,9 +43,4 @@ public class ChatMail extends Message implements Event {
         this.attachments.addAll(attachments);
     }
 
-    @Override
-    public String getEventType() {
-        return TYPE;
-    }
-
 }
diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Mail.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Mail.java
index f7e6ea0..56fb81f 100644
--- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Mail.java
+++ b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Mail.java
@@ -1,6 +1,5 @@
 package dev.struchkov.godfather.main.domain.content;
 
-import dev.struchkov.godfather.main.domain.event.Event;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,7 +15,7 @@ import java.util.List;
 
 @Getter
 @Setter
-public class Mail extends Message implements Event {
+public class Mail extends Message {
 
     public static final String TYPE = "MAIL";
 
@@ -80,9 +79,4 @@ public class Mail extends Message implements Event {
         this.forwardMail = forwardMail;
     }
 
-    @Override
-    public String getEventType() {
-        return TYPE;
-    }
-
 }
diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/event/Event.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/event/Event.java
deleted file mode 100644
index 808e7ea..0000000
--- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/event/Event.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package dev.struchkov.godfather.main.domain.event;
-
-public interface Event {
-
-    String getEventType();
-
-}