diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/postfach/PostfachEventListener.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/postfach/PostfachEventListener.java
index e28ce4e137cc792e24f0e880eb6c6a353a584815..9937bbbfbc0ad58912046e60b791c4e8e8af8323 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/postfach/PostfachEventListener.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/postfach/PostfachEventListener.java
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Component;
 
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandCreatedEvent;
-import de.ozgcloud.command.PostfachNachrichtReceived;
+import de.ozgcloud.command.PostfachNachrichtReceivedEvent;
 import de.ozgcloud.command.VorgangAttachedItemCreatedEvent;
 import de.ozgcloud.nachrichten.postfach.PostfachNachricht.Direction;
 import lombok.RequiredArgsConstructor;
@@ -134,6 +134,6 @@ public class PostfachEventListener {
 
 	@EventListener(condition = IS_INCOMING_POSTFACH_NACHRICHT_ITEM_CREATED_CONDITION)
 	public void onIncomingPostfachNachrichtItemCreated(VorgangAttachedItemCreatedEvent event) {
-		publisher.publishEvent(new PostfachNachrichtReceived(event.getCommand(), event.getCreatedResource()));
+		publisher.publishEvent(new PostfachNachrichtReceivedEvent(event.getCommand(), event.getCreatedResource()));
 	}
 }
\ No newline at end of file
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerTest.java
index c419a76d18cb783c5b7c22a5a4da287002b6bb17..5ad3dbcac003e9bfa6120fad4a40c41382bae03c 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerTest.java
@@ -45,7 +45,7 @@ import org.springframework.context.ApplicationEventPublisher;
 
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandCreatedEvent;
-import de.ozgcloud.command.PostfachNachrichtReceived;
+import de.ozgcloud.command.PostfachNachrichtReceivedEvent;
 import de.ozgcloud.command.VorgangAttachedItemCreatedEvent;
 import de.ozgcloud.nachrichten.postfach.PostfachNachricht.Direction;
 import de.ozgcloud.nachrichten.postfach.osi.MessageTestFactory;
@@ -225,7 +225,7 @@ class PostfachEventListenerTest {
 
 		private static final String CREATED_RESOURCE = "created-resource";
 		@Captor
-		public ArgumentCaptor<PostfachNachrichtReceived> eventCaptor;
+		public ArgumentCaptor<PostfachNachrichtReceivedEvent> eventCaptor;
 		@Mock
 		private VorgangAttachedItemCreatedEvent vorgangAttachedItemCreatedEvent;