diff --git a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlTokenValidationService.java b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlAttributeService.java
similarity index 99%
rename from token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlTokenValidationService.java
rename to token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlAttributeService.java
index e5120a5afc795e05dddca9cdcca651d6411180a4..fbba32136fc96a2f983d5093833c4293723ab99a 100644
--- a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlTokenValidationService.java
+++ b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlAttributeService.java
@@ -59,7 +59,7 @@ import lombok.Builder;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 
 @Builder
-public class SamlTokenValidationService {
+public class SamlAttributeService {
 
 	private final SignatureTrustEngine signatureTrustEngine;
 	private final Decrypter decrypter;
diff --git a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlConfiguration.java b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlConfiguration.java
index 0cad2348097b0ab6ddd787b9f232bd7a18d44db6..6e2353225b0db9148d2f4007e536af46b4c5a3e4 100644
--- a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlConfiguration.java
+++ b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlConfiguration.java
@@ -45,8 +45,8 @@ public class SamlConfiguration {
 		return registryBuilder.build();
 	}
 
-	SamlTokenValidationService samlTokenService(TokenValidationProperty tokenValidationProperty) {
-		return SamlTokenValidationService.builder()
+	SamlAttributeService samlTokenService(TokenValidationProperty tokenValidationProperty) {
+		return SamlAttributeService.builder()
 				.signatureTrustEngine(samlTrustEngineFactory.buildSamlTrustEngine(tokenValidationProperty))
 				.decrypter(samlDecrypterFactory.buildDecrypter(tokenValidationProperty))
 				.profileValidator(samlSignatureProfileValidator())
diff --git a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlServiceRegistry.java b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlServiceRegistry.java
index 6e1afcb853a1cefc4733dab265b919f6a89e583a..5bb44ebeb05df3b28ef4784fa5a3a86fbb62fae9 100644
--- a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlServiceRegistry.java
+++ b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlServiceRegistry.java
@@ -30,9 +30,9 @@ import lombok.Singular;
 public class SamlServiceRegistry {
 
 	@Singular
-	private final Map<String, SamlTokenValidationService> samlServices;
+	private final Map<String, SamlAttributeService> samlServices;
 
-	public Optional<SamlTokenValidationService> getService(String idpEntityId) {
+	public Optional<SamlAttributeService> getService(String idpEntityId) {
 		return Optional.ofNullable(samlServices.get(idpEntityId));
 	}
 }
diff --git a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlTokenService.java b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlTokenService.java
index 819567584d0705d59f31af49a0643d1f379257ec..f6612ed6f27c5d1b1a79b8f0e5e3e145b6981f6e 100644
--- a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlTokenService.java
+++ b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlTokenService.java
@@ -78,7 +78,7 @@ public class SamlTokenService {
 		return getValidationService(tokenIssuer).validate(token);
 	}
 
-	SamlTokenValidationService getValidationService(String tokenIssuer) {
+	SamlAttributeService getValidationService(String tokenIssuer) {
 		return samlServiceRegistry.getService(tokenIssuer)
 				.orElseThrow(() -> new TechnicalException("No validation service found for issuer %s".formatted(tokenIssuer)));
 	}
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlTokenValidationServiceTest.java b/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java
similarity index 99%
rename from token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlTokenValidationServiceTest.java
rename to token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java
index 29a20fcfcc7033bd63ce0f1b50da28f2eb4ac22e..70c33fb0a31bcce22359bcd1b501bde89cd0c1a0 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlTokenValidationServiceTest.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java
@@ -69,11 +69,11 @@ import de.ozgcloud.token.common.errorhandling.TokenVerificationException;
 import lombok.SneakyThrows;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 
-class SamlTokenValidationServiceTest {
+class SamlAttributeServiceTest {
 
 	@Spy
 	@InjectMocks
-	private SamlTokenValidationService service;
+	private SamlAttributeService service;
 
 	@Mock
 	private SignatureTrustEngine signatureTrustEngine;
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlConfigurationTest.java b/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlConfigurationTest.java
index 82f6021b14abd4e3aa455dc900b264048db255ab..cd5cf96edf55515ef3afcf887d3ece84049975a6 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlConfigurationTest.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlConfigurationTest.java
@@ -65,7 +65,7 @@ class SamlConfigurationTest {
 		@Mock
 		private TokenValidationProperty tokenValidationProperty;
 		@Mock
-		private SamlTokenValidationService tokenValidationService;
+		private SamlAttributeService tokenValidationService;
 
 		@BeforeEach
 		void init() {
@@ -175,7 +175,7 @@ class SamlConfigurationTest {
 			assertThat(result).extracting("verificationCriteria").isEqualTo(verificationCriteria);
 		}
 
-		private SamlTokenValidationService samlTokenService() {
+		private SamlAttributeService samlTokenService() {
 			return configuration.samlTokenService(tokenValidationProperty);
 		}
 	}