diff --git a/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironment.java b/src/main/java/de/ozgcloud/admin/environment/Environment.java
similarity index 87%
rename from src/main/java/de/ozgcloud/admin/environment/FrontendEnvironment.java
rename to src/main/java/de/ozgcloud/admin/environment/Environment.java
index 0f7ca897f9e77c5956cdcab164977ea35d694476..e2bfb54b4aeb2d33da4461d3eb6ae95d89eab93e 100644
--- a/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironment.java
+++ b/src/main/java/de/ozgcloud/admin/environment/Environment.java
@@ -5,7 +5,7 @@ import lombok.Getter;
 
 @Getter
 @Builder
-public class FrontendEnvironment {
+public class Environment {
 	private boolean production;
 	private String remoteHost;
 	private String authServer;
diff --git a/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironmentController.java b/src/main/java/de/ozgcloud/admin/environment/EnvironmentController.java
similarity index 83%
rename from src/main/java/de/ozgcloud/admin/environment/FrontendEnvironmentController.java
rename to src/main/java/de/ozgcloud/admin/environment/EnvironmentController.java
index 41d9e4dbe23fb1f7fd6d8f2de87521366c5cd747..71cf34ce3180c793235693f7ec8582a06aa27c63 100644
--- a/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironmentController.java
+++ b/src/main/java/de/ozgcloud/admin/environment/EnvironmentController.java
@@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor;
 
 @RestController("ozgCloudEnvironmentController")
 @RequiredArgsConstructor
-@RequestMapping(FrontendEnvironmentController.PATH)
-public class FrontendEnvironmentController {
+@RequestMapping(EnvironmentController.PATH)
+public class EnvironmentController {
 
 	static final String PATH = "/api/environment"; // NOSONAR
 
@@ -21,8 +21,8 @@ public class FrontendEnvironmentController {
 	private final OAuth2Properties oAuthProperties;
 
 	@GetMapping
-	public FrontendEnvironment getEnvironment() {
-		return FrontendEnvironment.builder()
+	public Environment getEnvironment() {
+		return Environment.builder()
 				.production(environmentProperties.isProduction())
 				.remoteHost(linkTo(RootController.class).toUri().toString())
 				.authServer(oAuthProperties.getAuthServerUrl())
diff --git a/src/test/java/de/ozgcloud/admin/environment/FrontendEnvironmentControllerTest.java b/src/test/java/de/ozgcloud/admin/environment/EnvironmentControllerTest.java
similarity index 94%
rename from src/test/java/de/ozgcloud/admin/environment/FrontendEnvironmentControllerTest.java
rename to src/test/java/de/ozgcloud/admin/environment/EnvironmentControllerTest.java
index 67d81f084a8a4bea8e747713cbb205c9d9433ca3..bdeaf83b00de2410112833f1447e940fc088e9b5 100644
--- a/src/test/java/de/ozgcloud/admin/environment/FrontendEnvironmentControllerTest.java
+++ b/src/test/java/de/ozgcloud/admin/environment/EnvironmentControllerTest.java
@@ -22,11 +22,11 @@ import de.ozgcloud.admin.RootController;
 import lombok.SneakyThrows;
 
 @ExtendWith(MockitoExtension.class)
-class FrontendEnvironmentControllerTest {
+class EnvironmentControllerTest {
 
 	@Spy
 	@InjectMocks
-	private FrontendEnvironmentController controller;
+	private EnvironmentController controller;
 
 	@Mock
 	private ProductionProperties environmentProperties;
@@ -120,7 +120,7 @@ class FrontendEnvironmentControllerTest {
 
 		@SneakyThrows
 		private ResultActions doRequest() {
-			return mockMvc.perform(get(FrontendEnvironmentController.PATH));
+			return mockMvc.perform(get(EnvironmentController.PATH));
 		}
 
 	}