diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/FrontendEnvironment.java b/alfa-service/src/main/java/de/ozgcloud/alfa/Environment.java
similarity index 97%
rename from alfa-service/src/main/java/de/ozgcloud/alfa/FrontendEnvironment.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/Environment.java
index 218f2f1f4732c4bb0b856403f9fd0e8b9eafec73..d4506a9c0e64e2b842680a1c69d66fcd36cf8709 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/FrontendEnvironment.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/Environment.java
@@ -30,7 +30,7 @@ import lombok.Getter;
 
 @Getter
 @Builder
-public class FrontendEnvironment {
+public class Environment {
 
 	private boolean production;
 	private String remoteHost;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/EnvironmentController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/EnvironmentController.java
index 65f0ef8f07d25157d8fc52f73cc3852a13c2cd90..aa126fda712b2ed9ad962bbb745b0a4ee51233d4 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/EnvironmentController.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/EnvironmentController.java
@@ -48,8 +48,8 @@ public class EnvironmentController {
 	private VorgangProcessorProperties vorgangProcessorProperties;
 
 	@GetMapping
-	public FrontendEnvironment getFrontendEnvironment() {
-		return FrontendEnvironment.builder()
+	public Environment getEnvironment() {
+		return Environment.builder()
 				.production(productionProperties.isProduction())
 				.remoteHost(linkTo(RootController.class).toUri().toString())
 				.authServer(oAuth2Properties.getAuthServerUrl())
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java
index 154de97e2243536056b9502ea6eac01d37cc2306..6334cfef724090ff8428b0fc102353a98e9f5979 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java
@@ -64,7 +64,7 @@ class EnvironmentControllerTest {
 
 	@DisplayName("Get frontend environment")
 	@Nested
-	class TestGetFrontendEnvironment {
+	class TestGetEnvironment {
 
 		private static final String CLIENT = LoremIpsum.getInstance().getFirstName() + "Client";
 		private static final boolean PRODUCTION = true;