diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageData.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageData.java
index 3e5cfeda7f610bf12e879013d6f9afdbc2ded8b1..432b06c5273798eb5bf67ff0666dea40211c69ad 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageData.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageData.java
@@ -9,7 +9,7 @@ import lombok.Singular;
 
 @Builder
 public record XdomeaMessageData(
-		IncomingFile primaryDocument,
+		IncomingFile metadataFile,
 		List<IncomingFile> representations,
 		@Singular
 		List<IncomingFileGroup> attachments
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java
index d0aa8ba08fe11a158217929a55198ecb4cb993b2..9f9f2f93c60d21fe2faa903601e1db37dd4206d4 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java
@@ -31,7 +31,7 @@ public class XdomeaMessageDataMapper {
 		var fileNameToFileMap = incomingFileList.stream()
 				.collect(Collectors.toMap(IncomingFile::getName, file -> file));
 		return XdomeaMessageData.builder()
-				.primaryDocument(xdomeaXMLFile)
+				.metadataFile(xdomeaXMLFile)
 				// Representations are incoming files which are referenced in the xdomea-xml in 'Dateiname' elements
 				.representations(getFilesByName(
 								movePrimaryRepresentationFileNameToFirstPosition(representationFileNames),
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java
index fdab0a006dd0ce2e2c84d10fe9cf21a4729b5e32..79cfdc3eefff7301f9f4daff34e7603f861710e6 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java
@@ -1,18 +1,18 @@
 package de.ozgcloud.eingang.xta;
 
-import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import java.util.List;
+import java.util.stream.Stream;
+
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.FormHeader;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
 import de.ozgcloud.eingang.common.vorgang.VorgangNummerSupplier;
 import de.ozgcloud.eingang.xdomea.XdomeaMessageData;
 
-import java.util.List;
-import java.util.stream.Stream;
-
 @Mapper
 interface XtaMessageMapper {
 	int VORGANG_NUMMER_SUFFIX_LENGTH = 4;
@@ -22,14 +22,16 @@ interface XtaMessageMapper {
 	@Mapping(target = "id", ignore = true)
 	@Mapping(target = "zustaendigeStelle", ignore = true)
 	@Mapping(target = "header", source = "metaData")
-	@Mapping(target="representations", source="xdomeaMessageData")
+	@Mapping(target = "representations", source = "xdomeaMessageData")
+	@Mapping(target = "representation", ignore = true)
+	@Mapping(target = "attachment", ignore = true)
 	FormData toFormData(XdomeaMessageData xdomeaMessageData, XtaMessageMetaData metaData, @Context VorgangNummerSupplier vorgangNummerSupplier);
 
 	default List<IncomingFile> getRepresentations(XdomeaMessageData xdomeaMessageData) {
 		return Stream.concat(
-					Stream.of(xdomeaMessageData.primaryDocument()),
-					xdomeaMessageData.representations().stream()
-				).toList();
+				Stream.of(xdomeaMessageData.metadataFile()),
+				xdomeaMessageData.representations().stream()
+		).toList();
 	}
 
 	@Mapping(target = "formId", source = "messageType")
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java
index b2fd5099cfbfdb0a8eaa1f9f93938e429915a467..b061b1590bae4d357d79eec4f5eea866b314ae34 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java
@@ -125,12 +125,12 @@ class XdomeaMessageDataMapperTest {
 			doReturn(REPR_XML_NAME).when(fileClassifier).findPrimaryRepresentationName(representationFileNames);
 		}
 
-		@DisplayName("should contain primary document (xdomea)")
+		@DisplayName("should contain xdomea metadata file")
 		@Test
-		void shouldContainPrimaryDocument() {
+		void shouldContainXdomeaMetadataFile() {
 			var classification = doClassify();
 
-			var primaryDocument = classification.primaryDocument();
+			var primaryDocument = classification.metadataFile();
 
 			assertThat(primaryDocument.getName()).isEqualTo(XDOMEA_XML_NAME);
 		}
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataTestFactory.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataTestFactory.java
index ccdf9d4c483b832179dd058b131bb119870310e8..90a659b8ddddb9cbef12e8c54da9f33ee213ab74 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataTestFactory.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataTestFactory.java
@@ -12,7 +12,7 @@ public class XdomeaMessageDataTestFactory {
 
 	public static XdomeaMessageData.XdomeaMessageDataBuilder createBuilder() {
 		return XdomeaMessageData.builder()
-				.primaryDocument(IncomingFileTestFactory.createBuilder().name("xdomea-primary-document.xml").build())
+				.metadataFile(IncomingFileTestFactory.createBuilder().name("xdomea-primary-document.xml").build())
 				.representations(List.of(IncomingFileTestFactory.create()))
 				.attachment(IncomingFileGroup.builder().file(IncomingFileTestFactory.create()).build());
 	}
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
index 24e74909691fc022a0a862b447368ed90325e57e..52eb46a971f9c52dd4c6289b44812a9e464695e9 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
@@ -43,7 +43,7 @@ class XtaMessageMapperTest {
 		void shouldMapRepresentations() {
 			var formData = doMapping();
 
-			assertThat(formData.getRepresentations()).containsExactly(xdomeaMessageData.primaryDocument(), xdomeaMessageData.representations().getFirst());
+			assertThat(formData.getRepresentations()).containsExactly(xdomeaMessageData.metadataFile(), xdomeaMessageData.representations().getFirst());
 		}
 
 		@Test