diff --git a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlAttributeService.java b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlAttributeService.java
index a97cd380b7f47102ac2f7bdf3cd7146e64109ff3..3e17925bacea2d0c0d1e4fbe8fe698202759098b 100644
--- a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlAttributeService.java
+++ b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlAttributeService.java
@@ -151,7 +151,7 @@ public class SamlAttributeService {
 	TokenAttributes buildTokenAttributes(Map<String, String> tokenAttributes, Response token) {
 		var tokenAttributesBuilder = TokenAttributes.builder().postfachId(getPostfachId(tokenAttributes, token))
 				.trustLevel(getTrustLevel(tokenAttributes));
-		tokenAttributes.entrySet().stream().filter(this::isNotMappedField).map(this::buildTokenAttribute)
+		tokenAttributes.entrySet().stream().filter(this::isNotNamedField).map(this::buildTokenAttribute)
 				.forEach(tokenAttributesBuilder::otherAttribute);
 		return tokenAttributesBuilder.build();
 	}
@@ -169,7 +169,7 @@ public class SamlAttributeService {
 		return tokenAttributes.get(mappedKey);
 	}
 
-	boolean isNotMappedField(Map.Entry<String, String> attributeEntry) {
+	boolean isNotNamedField(Map.Entry<String, String> attributeEntry) {
 		var mappedKey = tokenValidationProperty.getMappings().get(attributeEntry.getKey());
 		return !StringUtils.equalsAny(mappedKey, TokenAttributes.POSTFACH_ID_KEY, TokenAttributes.TRUST_LEVEL_KEY);
 	}
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java b/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java
index cda6dbbc0551aa887d9ac5b1e0cf32ed86401d1d..ab3d43919b34ba1bc234f2c96c97243bc8092360 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java
@@ -563,7 +563,7 @@ class SamlAttributeServiceTest {
 
 		@BeforeEach
 		void init() {
-			doReturn(true).when(service).isNotMappedField(any());
+			doReturn(true).when(service).isNotNamedField(any());
 			doReturn(TokenAttributesTestFactory.OTHER_ATTRIBUTE).when(service).buildTokenAttribute(any());
 		}
 
@@ -603,7 +603,7 @@ class SamlAttributeServiceTest {
 		void shouldCallIsNotMappedField() {
 			buildTokenAttributes();
 
-			verify(service).isNotMappedField(Map.entry(TokenAttributeTestFactory.NAME, TokenAttributeTestFactory.VALUE));
+			verify(service).isNotNamedField(Map.entry(TokenAttributeTestFactory.NAME, TokenAttributeTestFactory.VALUE));
 		}
 
 		@Test
@@ -736,7 +736,7 @@ class SamlAttributeServiceTest {
 	}
 
 	@Nested
-	class TestIsNotMappedField {
+	class TestIsNotNamedField {
 
 		private static final String KEY = UUID.randomUUID().toString();
 
@@ -759,7 +759,7 @@ class SamlAttributeServiceTest {
 		}
 
 		private boolean isNotMappedField() {
-			return service.isNotMappedField(Map.entry(KEY, TokenAttributeTestFactory.VALUE));
+			return service.isNotNamedField(Map.entry(KEY, TokenAttributeTestFactory.VALUE));
 		}
 	}