diff --git a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java
index 1ac411298f08e6b98880b0e196b004bb4ced2389..95eee8f6422f37e547f8f059b22196c28b1d855b 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java
@@ -36,7 +36,7 @@ public class WiedervorlageCommandController {
 			@PathVariable long wiedervorlageVersion) {
 		var commandWithUpdatedWiedervorlage = buildCommand(service.getById(wiedervorlageId), command, wiedervorlageVersion);
 
-		var createdCommand = createByOrder(commandWithUpdatedWiedervorlage, command.getOrder(), wiedervorlageVersion);
+		var createdCommand = createByOrder(commandWithUpdatedWiedervorlage, command.getOrder());
 
 		service.updateNextFrist((Wiedervorlage) commandWithUpdatedWiedervorlage.getBody(), commandWithUpdatedWiedervorlage.getVorgangId());
 
@@ -62,11 +62,12 @@ public class WiedervorlageCommandController {
 		}
 	}
 
-	Command createByOrder(CreateCommand command, CommandOrder commandOrder, long wiedervorlageVersion) {
+	Command createByOrder(CreateCommand command, CommandOrder commandOrder) {
 		if (shouldBeValidated(commandOrder)) {
-			return service.editWiedervorlage((Wiedervorlage) command.getBody(), command.getRelationId(), wiedervorlageVersion);
+			return service.editWiedervorlage((Wiedervorlage) command.getBody(), command.getRelationId(), command.getRelationVersion());
 		} else {
-			return commandByRelationController.createCommandWithoutValidation(command, WiedervorlageRemoteService.ITEM_NAME, wiedervorlageVersion);
+			return commandByRelationController.createCommandWithoutValidation(command, WiedervorlageRemoteService.ITEM_NAME,
+					command.getRelationVersion());
 		}
 	}
 
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java
index bfe77f37197fca61194562719be145995d675c04..81c082d760808cca48b6d8939a1284d19e619dd8 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java
@@ -35,7 +35,7 @@ class VorgangAttachedItemServiceTest {
 	@Mock
 	private CommandService commandService;
 
-	@DisplayName("Build vorgang attached item")
+	@DisplayName("Create new wiedervorlage")
 	@Nested
 	class TestCreateNewWiedervorlage {
 
@@ -73,6 +73,7 @@ class VorgangAttachedItemServiceTest {
 		}
 	}
 
+	@DisplayName("Edit wiedervorlage")
 	@Nested
 	class TestEditWiedervorlage {
 
@@ -149,6 +150,7 @@ class VorgangAttachedItemServiceTest {
 		}
 	}
 
+	@DisplayName("Edit kommentar")
 	@Nested
 	class TestEditKommentar {
 
@@ -186,7 +188,7 @@ class VorgangAttachedItemServiceTest {
 		}
 	}
 
-	@DisplayName("build createCommand")
+	@DisplayName("build vorgang attached item")
 	@Nested
 	class TestBuildVorgangAttachedItem {
 
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java
index 75b74286112a09ab33960d5f07ff50f0e8a543f5..b6be6f05885c269b7b782ca390f766fa8f7ea096 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java
@@ -63,7 +63,7 @@ class WiedervorlageCommandControllerTest {
 			@BeforeEach
 			void init() {
 				when(service.getById(any())).thenReturn(WiedervorlageTestFactory.create());
-				doReturn(CommandTestFactory.create()).when(controller).createByOrder(any(), any(), anyLong());
+				doReturn(CommandTestFactory.create()).when(controller).createByOrder(any(), any());
 			}
 
 			@Test
@@ -77,7 +77,7 @@ class WiedervorlageCommandControllerTest {
 			void shouldCallCreateByOrderController() throws Exception {
 				doRequest();
 
-				verify(controller).createByOrder(any(), any(), anyLong());
+				verify(controller).createByOrder(any(), any());
 			}
 
 			@Test
@@ -277,8 +277,8 @@ class WiedervorlageCommandControllerTest {
 			}
 
 			private Command createCommandByOrder(CommandOrder order) {
-				return controller.createByOrder(CommandTestFactory.createCreateCommandBuilder().body(WiedervorlageTestFactory.create()).build(),
-						order, WiedervorlageTestFactory.VERSION);
+				return controller.createByOrder(
+						CommandTestFactory.createCreateCommandBuilder().body(WiedervorlageTestFactory.create()).build(), order);
 			}
 		}
 	}