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 88fdba8f57497cb56e6f6da24b79eb45f50bdff5..e28ce4e137cc792e24f0e880eb6c6a353a584815 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
@@ -53,11 +53,12 @@ public class PostfachEventListener {
 	private static final String IS_SEND_POSTFACH_NACHRICHT_COMMAND = "{T(de.ozgcloud.nachrichten.postfach.PostfachEventListener).IS_SEND_POSTFACH_NACHRICHT.test(event.getSource())}";
 	public static final Predicate<Command> IS_SEND_POSTFACH_NACHRICHT = command -> StringUtils.equals(command.getOrder(), "SEND_POSTFACH_NACHRICHT");
 	public static final String KEY_ITEM_NAME = "itemName";
-	public static final Predicate<Command> IS_INCOMING_NACHRICHT_CREATED = command -> StringUtils.equals(command.getOrder(), "CREATE_ATTACHED_ITEM")
+	public static final Predicate<Command> IS_INCOMING_POSTFACH_NACHRICHT_CREATED = command ->
+			StringUtils.equals(command.getOrder(), "CREATE_ATTACHED_ITEM")
 			&& StringUtils.equals(MapUtils.getString(command.getBodyObject(), KEY_ITEM_NAME), AttachedItemRemoteService.ITEM_NAME)
 			&& StringUtils.equals(MapUtils.getString(command.getBodyObject(), PostfachNachricht.FIELD_DIRECTION), "IN");
-	private static final String IS_INCOMING_NACHRICHT_ITEM_CREATED_CONDITION =
-			"{T(de.ozgcloud.nachrichten.postfach.PostfachEventListener).IS_INCOMING_NACHRICHT_CREATED.test(event.getCommand())}";
+	private static final String IS_INCOMING_POSTFACH_NACHRICHT_ITEM_CREATED_CONDITION =
+			"{T(de.ozgcloud.nachrichten.postfach.PostfachEventListener).IS_INCOMING_POSTFACH_NACHRICHT_CREATED.test(event.getCommand())}";
 	private final PostfachService service;
 	private final ApplicationEventPublisher publisher;
 
@@ -131,8 +132,8 @@ public class PostfachEventListener {
 		}
 	}
 
-	@EventListener(condition = IS_INCOMING_NACHRICHT_ITEM_CREATED_CONDITION)
-	public void onIncomingNachrichtItemCreated(VorgangAttachedItemCreatedEvent event) {
+	@EventListener(condition = IS_INCOMING_POSTFACH_NACHRICHT_ITEM_CREATED_CONDITION)
+	public void onIncomingPostfachNachrichtItemCreated(VorgangAttachedItemCreatedEvent event) {
 		publisher.publishEvent(new PostfachNachrichtReceived(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 00e0d5795e4b8a822cef8f5685289507b8623be3..c419a76d18cb783c5b7c22a5a4da287002b6bb17 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
@@ -221,7 +221,7 @@ class PostfachEventListenerTest {
 
 	@DisplayName("On create incoming nachricht item")
 	@Nested
-	class TestOnCreateIncomingNachrichtItem {
+	class TestOnCreateIncomingPostfachNachrichtItem {
 
 		private static final String CREATED_RESOURCE = "created-resource";
 		@Captor
@@ -237,7 +237,7 @@ class PostfachEventListenerTest {
 
 		@Test
 		void shouldPublishPostfachNachrichtReceivedEvent() {
-			listener.onIncomingNachrichtItemCreated(vorgangAttachedItemCreatedEvent);
+			listener.onIncomingPostfachNachrichtItemCreated(vorgangAttachedItemCreatedEvent);
 
 			verify(publisher).publishEvent(eventCaptor.capture());
 			assertThat(eventCaptor.getValue()).satisfies(event -> {