diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormMapper.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
similarity index 99%
rename from intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormMapper.java
rename to intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
index b073dd971016dbdf7b7930efc27309a1682eb65c..7bfe66759840ae03293a1d35dcd0b0b35a400c60 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormMapper.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
@@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor;
 
 @Component
 @RequiredArgsConstructor
-class IntelliFormMapper {
+class DepositDataMapper {
 
 	public FormData mapToFormData(DepositData depositData) {
 		// Transform deposit data attachments to incoming files
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpoint.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/FormDataEndpoint.java
similarity index 94%
rename from intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpoint.java
rename to intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/FormDataEndpoint.java
index bf079af2007f0327eaf126f749b349f112d219c7..f9caf285a578e2f88316386481331476e6392093 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpoint.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/FormDataEndpoint.java
@@ -37,12 +37,11 @@ import org.springframework.ws.server.endpoint.annotation.RequestPayload;
 import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
 
 import de.ozgcloud.eingang.semantik.SemantikAdapter;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
 @Endpoint
 @Log4j2
-public class IntelliFormEndpoint {
+public class FormDataEndpoint {
 
 	private static final String NAMESPACE_URI = "http://xmlns.cit.de/intelliform/2009/webservices/backend";
 
@@ -53,7 +52,7 @@ public class IntelliFormEndpoint {
 
 
 	@Autowired
-	private IntelliFormMapper intelliFormMapper;
+	private DepositDataMapper depositDataMapper;
 	@Autowired
 	private SemantikAdapter semantikAdapter;
 
@@ -62,7 +61,7 @@ public class IntelliFormEndpoint {
 	public JAXBElement<DepositResponse> inputFormData(@RequestPayload Deposit deposit)
 			throws IOException, ParserConfigurationException {
 		try {
-			var formData = intelliFormMapper.mapToFormData(deposit.getData());
+			var formData = depositDataMapper.mapToFormData(deposit.getData());
 			semantikAdapter.processFormData(formData);
 		} catch (Exception e) {
 			LOG.error("Error processing form data", e);
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormMapperTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
similarity index 96%
rename from intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormMapperTest.java
rename to intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
index c394c2b2ee230d008e392252f11067af34032d74..ac6a615b226a5f31359ae3acfd5c9c135b26d45c 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
@@ -46,10 +46,10 @@ import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.IncomingFile;
 import lombok.SneakyThrows;
 
-class IntelliFormMapperTest {
+class DepositDataMapperTest {
 
 	@Spy
-	private IntelliFormMapper mapper;
+	private DepositDataMapper mapper;
 
 	@DisplayName("map to form data")
 	@Nested
@@ -133,10 +133,6 @@ class IntelliFormMapperTest {
 			return mapper.mapToFormData(depositData);
 		}
 
-		private List<String> expectedAttachmentIds(List<Attachment> attachmentList) {
-			return attachmentList.stream().map(attachment -> attachment.id).toList();
-		}
-
 	}
 
 	@DisplayName("map attachment to incoming file")
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointITCase.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
similarity index 99%
rename from intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointITCase.java
rename to intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
index 06ea34c27dcb5a3c0c2b7dadebddaa78104dca3e..03c8db434f6e206201520e7377f3b878a5de9727 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointITCase.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
@@ -56,7 +56,7 @@ import de.ozgcloud.vorgang.vorgang.GrpcIncomingFileGroup;
 import lombok.SneakyThrows;
 
 @SpringBootTest
-class IntelliFormEndpointITCase {
+class FormDataEndpointITCase {
 
 	private final static String TEST_FILE_PATH = "classpath:itcase/";
 
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
similarity index 92%
rename from intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointTest.java
rename to intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
index 2466e3842775333cc2926f507463ce42cc898bff..b58584e84b0ccf8362a448a506449d67bc7a23c2 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
@@ -42,18 +42,18 @@ import de.ozgcloud.common.test.TestUtils;
 import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
 import de.ozgcloud.eingang.semantik.SemantikAdapter;
 
-class IntelliFormEndpointTest {
+class FormDataEndpointTest {
 
 	@InjectMocks
-	private IntelliFormEndpoint formdataEndpointIntelli;
+	private FormDataEndpoint formdataEndpointIntelli;
 	@Mock
-	private IntelliFormMapper intelliFormMapper;
+	private DepositDataMapper depositDataMapper;
 	@Mock
 	private SemantikAdapter semantikAdapter;
 
 	@BeforeEach
 	void init() throws SAXException, IOException, ParserConfigurationException {
-		when(intelliFormMapper.mapToFormData(any())).thenReturn(FormDataTestFactory.create());
+		when(depositDataMapper.mapToFormData(any())).thenReturn(FormDataTestFactory.create());
 	}
 
 	@Test