diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
index cda9bd6842a89445a7dfc08d376f8d05725a02f7..23a89da9ae971ea81f4e4ff1252d579faae68be0 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
@@ -45,12 +45,12 @@ class AfmZustaendigeStelleMapper implements AfmEngineBasedMapper {
 	public static final String TAG_BEZEICHNUNG = "OrganisationseinheitenBEZEICHNUNG";
 
 	@Autowired
-	private BayernBehoerdeMetadataMapper bayernBehoerdeMetadataMapper;
+	private BayernZustaendigeStelleMetadataMapper bayernZustaendigeStelleMetadataMapper;
 
 	@Override
 	public FormData parseFormData(FormData formData) {
-		if (bayernBehoerdeMetadataMapper.isResponsible(formData)) {
-			return bayernBehoerdeMetadataMapper.parseZustaendigeStelleData(formData);
+		if (bayernZustaendigeStelleMetadataMapper.isResponsible(formData)) {
+			return bayernZustaendigeStelleMetadataMapper.parseZustaendigeStelleData(formData);
 		}
 		var zustaendigeStelleMap = getZustaendigeStelle(formData);
 		var organisationseinheitenID = getOrganisationseinheitenId(formData);
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapper.java
similarity index 98%
rename from semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapper.java
rename to semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapper.java
index 7417593b447e01993c7ea22b06f0541ecdc87271..85fe01c4029aec2e8437f2f063fb9522402b5771 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapper.java
@@ -21,7 +21,7 @@ import lombok.extern.log4j.Log4j2;
 
 @Log4j2
 @Component
-public class BayernBehoerdeMetadataMapper {
+public class BayernZustaendigeStelleMetadataMapper {
 
 	static final String BEHOERDE_METADATA_SUFFIX = "behoerde_metadata.xml";
 
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
index c7a45051739c5f16034940c5f98170d411f11c02..234c2f054e7064632110874865412fa749ade32b 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
@@ -45,7 +45,7 @@ class AfmZustaendigeStelleMapperTest {
 	private AfmZustaendigeStelleMapper mapper;
 
 	@Mock
-	private BayernBehoerdeMetadataMapper bayernBehoerdeMetadataMapper;
+	private BayernZustaendigeStelleMetadataMapper bayernZustaendigeStelleMetadataMapper;
 
 	@Nested
 	class TestParseFormData {
@@ -98,9 +98,9 @@ class AfmZustaendigeStelleMapperTest {
 
 			@Test
 			void shouldCallParseBayernMetadata() {
-				when(bayernBehoerdeMetadataMapper.isResponsible(any())).thenReturn(true);
+				when(bayernZustaendigeStelleMetadataMapper.isResponsible(any())).thenReturn(true);
 				var expectedFormData = FormDataTestFactory.create();
-				when(bayernBehoerdeMetadataMapper.parseZustaendigeStelleData(any())).thenReturn(expectedFormData);
+				when(bayernZustaendigeStelleMetadataMapper.parseZustaendigeStelleData(any())).thenReturn(expectedFormData);
 
 				var resultFormData = parseFormData(formData);
 
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapperTest.java
similarity index 95%
rename from semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapperTest.java
rename to semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapperTest.java
index b3102fe48f22d2e44bb1e340b7df625f8a88e2f5..5c2831e808c1caac04bfa3b1e1c02060726dc454 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernBehoerdeMetadataMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/BayernZustaendigeStelleMetadataMapperTest.java
@@ -1,6 +1,6 @@
 package de.ozgcloud.eingang.semantik.enginebased.afm;
 
-import static de.ozgcloud.eingang.semantik.enginebased.afm.BayernBehoerdeMetadataMapper.*;
+import static de.ozgcloud.eingang.semantik.enginebased.afm.BayernZustaendigeStelleMetadataMapper.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
@@ -21,10 +21,10 @@ import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
 import de.ozgcloud.eingang.common.formdata.ZustaendigeStelleTestFactory;
 import lombok.SneakyThrows;
 
-class BayernBehoerdeMetadataMapperTest {
+class BayernZustaendigeStelleMetadataMapperTest {
 
 	@Spy
-	private BayernBehoerdeMetadataMapper mapper;
+	private BayernZustaendigeStelleMetadataMapper mapper;
 
 	@Nested
 	class TestParseBehoerdeMetadata {
@@ -35,7 +35,7 @@ class BayernBehoerdeMetadataMapperTest {
 
 		@BeforeEach
 		void setUp() {
-			behoerdeMetadataFile = IncomingFileTestFactory.createBuilder().name(BayernBehoerdeMetadataMapper.BEHOERDE_METADATA_SUFFIX)
+			behoerdeMetadataFile = IncomingFileTestFactory.createBuilder().name(BayernZustaendigeStelleMetadataMapper.BEHOERDE_METADATA_SUFFIX)
 					.build();
 			formData = FormDataTestFactory.createBuilder()
 					.zustaendigeStelle(null)
@@ -80,7 +80,7 @@ class BayernBehoerdeMetadataMapperTest {
 		@BeforeEach
 		void setUp() {
 			behoerdeMetadataXml = IncomingFileTestFactory.createBuilder()
-					.name(BayernBehoerdeMetadataMapper.BEHOERDE_METADATA_SUFFIX)
+					.name(BayernZustaendigeStelleMetadataMapper.BEHOERDE_METADATA_SUFFIX)
 					.file(new File(TestUtils.class.getClassLoader().getResource(BEHOERDE_METADATA_SUFFIX).toURI())).build();
 		}
 
@@ -252,7 +252,7 @@ class BayernBehoerdeMetadataMapperTest {
 	@Test
 	void shouldApproveResponsibility() {
 		var formData = FormDataTestFactory.createBuilder()
-				.representation(IncomingFileTestFactory.createBuilder().name(BayernBehoerdeMetadataMapper.BEHOERDE_METADATA_SUFFIX)
+				.representation(IncomingFileTestFactory.createBuilder().name(BayernZustaendigeStelleMetadataMapper.BEHOERDE_METADATA_SUFFIX)
 						.build()).build();
 
 		var isResponsible = mapper.isResponsible(formData);