diff --git a/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationEventListenerTest.java b/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationEventListenerTest.java
index 1447874e1835f4e8709fd82c0473c64d03a97e16..904edd060c85a21aa929caa211ed29f6a078fc34 100644
--- a/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationEventListenerTest.java
+++ b/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationEventListenerTest.java
@@ -48,7 +48,7 @@ class UserNotificationEventListenerTest {
 		void shouldNotifyWithOrganisationeinheitIds() {
 			userNotificationEventListener.onVorgangCreated(EVENT);
 
-			verify(userNotificationService).sendNotification(VorgangTestFactory.ORGANISATIONEINCHEIT_ID);
+			verify(userNotificationService).sendNotification(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID);
 		}
 	}
 }
\ No newline at end of file
diff --git a/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationServiceTest.java b/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationServiceTest.java
index 37dd2dc0832eba1f26567a1db03a50cb3fe0eb5b..14baeb2d9e86957be837cdefe9e1c72a1a36f87e 100644
--- a/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationServiceTest.java
+++ b/notification-manager/src/test/java/de/itvsh/kop/notification/user/UserNotificationServiceTest.java
@@ -38,20 +38,20 @@ class UserNotificationServiceTest {
 
 			@BeforeEach
 			void init() {
-				when(userRemoteService.getRecipients(VorgangTestFactory.ORGANISATIONEINCHEIT_ID)).thenReturn(List.of(RecipientTestFactory.create()));
+				when(userRemoteService.getRecipients(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID)).thenReturn(List.of(RecipientTestFactory.create()));
 				doNothing().when(emailRemoteService).sendEmail(any(UserEmail.class));
 			}
 
 			@Test
 			void shouldGetRecipients() {
-				service.sendNotification(VorgangTestFactory.ORGANISATIONEINCHEIT_ID);
+				service.sendNotification(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID);
 
-				verify(userRemoteService).getRecipients(VorgangTestFactory.ORGANISATIONEINCHEIT_ID);
+				verify(userRemoteService).getRecipients(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID);
 			}
 
 			@Test
 			void shouldSendEmail() {
-				service.sendNotification(VorgangTestFactory.ORGANISATIONEINCHEIT_ID);
+				service.sendNotification(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID);
 
 				verify(emailRemoteService).sendEmail(UserEmailTestFactory.create());
 			}
diff --git a/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/GrpcVorgangTestFactory.java b/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/GrpcVorgangTestFactory.java
index 6bfd963d9daeb824cd70dadac49890852c78ea07..7b9d4f89f26eeb95e6f12f47ef9328365f871144 100644
--- a/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/GrpcVorgangTestFactory.java
+++ b/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/GrpcVorgangTestFactory.java
@@ -23,7 +23,7 @@ public class GrpcVorgangTestFactory {
 								.setPostfachId(VorgangTestFactory.POSTFACH_ID)
 								.build())
 						.setZustaendigeStelle(
-								GrpcZustaendigeStelle.newBuilder().setOrganisationseinheitenId(VorgangTestFactory.ORGANISATIONEINCHEIT_ID).build())
+								GrpcZustaendigeStelle.newBuilder().setOrganisationseinheitenId(VorgangTestFactory.ORGANISATIONS_EINHEIT_ID).build())
 						.build());
 
 	}
diff --git a/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/VorgangTestFactory.java b/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/VorgangTestFactory.java
index 4d6a27b0aa842e281c7a744b62da1db1d1d50ec8..ad7d79deee60b6593feb7f7a89be857525c31a4a 100644
--- a/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/VorgangTestFactory.java
+++ b/notification-manager/src/test/java/de/itvsh/kop/notification/vorgang/VorgangTestFactory.java
@@ -14,7 +14,7 @@ public class VorgangTestFactory {
 
 	public static final String POSTFACH_ID = UUID.randomUUID().toString();
 	public static final String FORM_ENGINE_NAME = "deluxeEngine";
-	public static final String ORGANISATIONEINCHEIT_ID = "1234567889";
+	public static final String ORGANISATIONS_EINHEIT_ID = "1234567889";
 
 	public static Vorgang create() {
 		return createBuilder().build();
@@ -28,7 +28,7 @@ public class VorgangTestFactory {
 				.createdAt(CREATED_AT)
 				.postfachId(POSTFACH_ID)
 				.formEngineName(FORM_ENGINE_NAME)
-				.organisationseinheitenId(ORGANISATIONEINCHEIT_ID);
+				.organisationseinheitenId(ORGANISATIONS_EINHEIT_ID);
 	}
 
 }