diff --git a/src/main/java/eu/hbp/mip/controllers/UsersApi.java b/src/main/java/eu/hbp/mip/controllers/ActiveUserAPI.java
similarity index 60%
rename from src/main/java/eu/hbp/mip/controllers/UsersApi.java
rename to src/main/java/eu/hbp/mip/controllers/ActiveUserAPI.java
index 0c07b5f05e3c851870b1a5fc2ba19a7a9b093a41..7e5209b75b5ec2e112dd56c6a4ee8ef778221e39 100644
--- a/src/main/java/eu/hbp/mip/controllers/UsersApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ActiveUserAPI.java
@@ -1,7 +1,5 @@
 package eu.hbp.mip.controllers;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.hbp.mip.models.DAOs.UserDAO;
 import eu.hbp.mip.services.ActiveUserService;
 import eu.hbp.mip.utils.Logging;
@@ -9,19 +7,19 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 @RestController
 @RequestMapping(value = "/activeUser", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/activeUser")
-public class UsersApi {
+public class ActiveUserAPI {
 
     @Autowired
     private ActiveUserService activeUserService;
@@ -32,22 +30,6 @@ public class UsersApi {
         Logging.LogUserAction(activeUserService.getActiveUser().getUsername(), "(GET) /activeUser",
                 "Loading the details of the activeUser");
 
-        UserDAO activeUser = activeUserService.getActiveUser();
-
-        // Add the active user object to a cookie
-        try {
-            // TODO needed? Ask Manuel
-            ObjectMapper mapper = new ObjectMapper();
-            String userJSON = mapper.writeValueAsString(activeUser);
-            Cookie cookie = new Cookie("user", URLEncoder.encode(userJSON, "UTF-8"));
-            cookie.setSecure(true);
-            cookie.setPath("/");
-            response.addCookie(cookie);
-        } catch (JsonProcessingException | UnsupportedEncodingException e) {
-            Logging.LogUserAction(activeUser.getUsername(),
-                    "(GET) /activeUser", "Failed to add Cookie. Exception: " + e.getMessage());
-        }
-
         return ResponseEntity.ok(activeUserService.getActiveUser());
     }
 
diff --git a/src/main/java/eu/hbp/mip/controllers/AlgorithmsApi.java b/src/main/java/eu/hbp/mip/controllers/AlgorithmsAPI.java
similarity index 99%
rename from src/main/java/eu/hbp/mip/controllers/AlgorithmsApi.java
rename to src/main/java/eu/hbp/mip/controllers/AlgorithmsAPI.java
index 454007298e1e663380b3e44e67c816af9cc923ac..001409d25552ff77a12f6df12e79c46c297754c2 100644
--- a/src/main/java/eu/hbp/mip/controllers/AlgorithmsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/AlgorithmsAPI.java
@@ -37,7 +37,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 @RestController
 @RequestMapping(value = "/algorithms", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/algorithms")
-public class AlgorithmsApi {
+public class AlgorithmsAPI {
 
     private static final Gson gson = new Gson();
 
diff --git a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentAPI.java
similarity index 99%
rename from src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
rename to src/main/java/eu/hbp/mip/controllers/ExperimentAPI.java
index 79168b42aa9b842b9c98d0697d2070f276319285..9c77111aa93314afbdfef6b158fe8c2a429c8f4b 100644
--- a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ExperimentAPI.java
@@ -25,7 +25,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 @RestController
 @RequestMapping(value = "/experiments", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/experiments")
-public class ExperimentApi {
+public class ExperimentAPI {
 
     @Autowired
     private ActiveUserService activeUserService;
diff --git a/src/main/java/eu/hbp/mip/controllers/PathologiesApi.java b/src/main/java/eu/hbp/mip/controllers/PathologiesAPI.java
similarity index 99%
rename from src/main/java/eu/hbp/mip/controllers/PathologiesApi.java
rename to src/main/java/eu/hbp/mip/controllers/PathologiesAPI.java
index 2c9e08a7e50d841067f0e2b0fefea82bf113637e..f79052ff5e07e73ae14f5e96ec676e09727838fd 100644
--- a/src/main/java/eu/hbp/mip/controllers/PathologiesApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/PathologiesAPI.java
@@ -27,7 +27,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 @RestController
 @RequestMapping(value = "/pathologies", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/pathologies")
-public class PathologiesApi {
+public class PathologiesAPI {
 
     private static final Gson gson = new Gson();