diff --git a/.github/workflows/addIssueToProject.yml b/.github/workflows/add-issue-to-project.yml
similarity index 100%
rename from .github/workflows/addIssueToProject.yml
rename to .github/workflows/add-issue-to-project.yml
diff --git a/.run/OkrApplication-E2E.run.xml b/.run/OkrApplication-E2E.run.xml
index 4d2c9a4905..aa7706165a 100644
--- a/.run/OkrApplication-E2E.run.xml
+++ b/.run/OkrApplication-E2E.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OkrApplication-E2E" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="integration-test" />
-    <option name="ALTERNATIVE_JRE_PATH" value="temurin-21" />
+    <option name="ALTERNATIVE_JRE_PATH" value="$USER_HOME$/.sdkman/candidates/java/current" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <module name="backend" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="ch.puzzle.okr.OkrApplication" />
diff --git a/backend/src/main/java/ch/puzzle/okr/controller/CheckInController.java b/backend/src/main/java/ch/puzzle/okr/controller/CheckInController.java
index 976e0ceb24..4879c4f908 100644
--- a/backend/src/main/java/ch/puzzle/okr/controller/CheckInController.java
+++ b/backend/src/main/java/ch/puzzle/okr/controller/CheckInController.java
@@ -15,7 +15,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("api/v2/checkIns")
+@RequestMapping("api/v2/checkins")
 public class CheckInController {
 
     private final CheckInMapper checkInMapper;
diff --git a/backend/src/main/java/ch/puzzle/okr/controller/ClientConfigController.java b/backend/src/main/java/ch/puzzle/okr/controller/ClientConfigController.java
index 1fd85d9089..d22c582af9 100644
--- a/backend/src/main/java/ch/puzzle/okr/controller/ClientConfigController.java
+++ b/backend/src/main/java/ch/puzzle/okr/controller/ClientConfigController.java
@@ -12,17 +12,17 @@
 @Controller
 public class ClientConfigController {
 
-    private final ClientConfigService configService;
+    private final ClientConfigService clientConfigService;
 
-    public ClientConfigController(ClientConfigService configService) {
-        this.configService = configService;
+    public ClientConfigController(ClientConfigService clientConfigService) {
+        this.clientConfigService = clientConfigService;
     }
 
     @GetMapping("/config")
     public ResponseEntity<ClientConfigDto> getConfig(HttpServletRequest request) {
         return ResponseEntity
                 .status(HttpStatus.OK)
-                .body(configService.getConfigBasedOnActiveEnv(request.getServerName()));
+                .body(clientConfigService.getConfigBasedOnActiveEnv(request.getServerName()));
     }
 
     @RequestMapping(value = "/**/{[path:[^\\.]*}")
diff --git a/backend/src/main/java/ch/puzzle/okr/controller/ObjectiveController.java b/backend/src/main/java/ch/puzzle/okr/controller/ObjectiveController.java
index 411c11787a..bd8aeb6a5d 100644
--- a/backend/src/main/java/ch/puzzle/okr/controller/ObjectiveController.java
+++ b/backend/src/main/java/ch/puzzle/okr/controller/ObjectiveController.java
@@ -91,8 +91,8 @@ public void deleteObjectiveById(@Parameter(description = "The ID of an Objective
             @ApiResponse(responseCode = "401", description = "Not authorized to create an Objective", content = @Content) })
     @PostMapping
     public ResponseEntity<ObjectiveDto> createObjective(@io.swagger.v3.oas.annotations.parameters.RequestBody(description = "The Objective as json to create a new Objective.", required = true)
-    @RequestBody ObjectiveDto objectiveDTO) {
-        Objective objective = objectiveMapper.toObjective(objectiveDTO);
+    @RequestBody ObjectiveDto objectiveDto) {
+        Objective objective = objectiveMapper.toObjective(objectiveDto);
         ObjectiveDto createdObjective = objectiveMapper.toDto(objectiveAuthorizationService.createEntity(objective));
         return ResponseEntity.status(HttpStatus.CREATED).body(createdObjective);
     }
@@ -126,8 +126,8 @@ public ResponseEntity<ObjectiveDto> duplicateObjective(@Parameter(description =
             @ApiResponse(responseCode = "422", description = "Can't update Objective since Objective was updated or deleted by another user.", content = @Content) })
     @PutMapping("/{id}")
     public ResponseEntity<ObjectiveDto> updateObjective(@Parameter(description = "The ID for updating an Objective.", required = true)
-    @PathVariable Long id, @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "The objective as json to update an existing Objective.", required = true) @RequestBody ObjectiveDto objectiveDTO) {
-        Objective objective = objectiveMapper.toObjective(objectiveDTO);
+    @PathVariable Long id, @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "The objective as json to update an existing Objective.", required = true) @RequestBody ObjectiveDto objectiveDto) {
+        Objective objective = objectiveMapper.toObjective(objectiveDto);
         boolean isObjectiveImUsed = objectiveAuthorizationService.isImUsed(objective);
         ObjectiveDto updatedObjective = objectiveMapper
                 .toDto(objectiveAuthorizationService.updateEntity(id, objective));
diff --git a/backend/src/main/java/ch/puzzle/okr/controller/TeamController.java b/backend/src/main/java/ch/puzzle/okr/controller/TeamController.java
index 51cb9daeed..0835742054 100644
--- a/backend/src/main/java/ch/puzzle/okr/controller/TeamController.java
+++ b/backend/src/main/java/ch/puzzle/okr/controller/TeamController.java
@@ -81,7 +81,7 @@ public void deleteTeamById(@Parameter(description = "The ID of an Team to delete
     @PutMapping("/{id}/addusers")
     public void addUsersToTeam(@Parameter(description = "The ID of an Team to add to users to it.", required = true)
     @PathVariable long id, @RequestBody List<UserDto> userDtoList) {
-        var userIds = userDtoList.stream().map(UserDto::id).toList();
+        List<Long> userIds = userDtoList.stream().map(UserDto::id).toList();
         teamAuthorizationService.addUsersToTeam(id, userIds);
     }
 
diff --git a/backend/src/main/java/ch/puzzle/okr/controller/UserController.java b/backend/src/main/java/ch/puzzle/okr/controller/UserController.java
index 36decfb050..fb190a823c 100644
--- a/backend/src/main/java/ch/puzzle/okr/controller/UserController.java
+++ b/backend/src/main/java/ch/puzzle/okr/controller/UserController.java
@@ -2,8 +2,9 @@
 
 import ch.puzzle.okr.dto.NewUserDto;
 import ch.puzzle.okr.dto.UserDto;
-import ch.puzzle.okr.dto.userOkrData.UserOkrDataDto;
+import ch.puzzle.okr.dto.userokrdata.UserOkrDataDto;
 import ch.puzzle.okr.mapper.UserMapper;
+import ch.puzzle.okr.models.User;
 import ch.puzzle.okr.service.authorization.AuthorizationService;
 import ch.puzzle.okr.service.authorization.UserAuthorizationService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -44,7 +45,7 @@ public List<UserDto> getAllUsers() {
                     @Content(mediaType = "application/json", schema = @Schema(implementation = UserDto.class)) }), })
     @GetMapping(path = "/current")
     public UserDto getCurrentUser() {
-        var currentUser = this.authorizationService.updateOrAddAuthorizationUser().user();
+        User currentUser = this.authorizationService.updateOrAddAuthorizationUser().user();
         return userMapper.toDto(currentUser);
     }
 
@@ -54,7 +55,7 @@ public UserDto getCurrentUser() {
     @GetMapping(path = "/{id}")
     public UserDto getUserById(@Parameter(description = "The ID for requested user.", required = true)
     @PathVariable long id) {
-        var user = this.userAuthorizationService.getById(id);
+        User user = this.userAuthorizationService.getById(id);
         return userMapper.toDto(user);
     }
 
@@ -64,7 +65,7 @@ public UserDto getUserById(@Parameter(description = "The ID for requested user."
     @PutMapping(path = "/{id}/isokrchampion/{isOkrChampion}")
     public UserDto setOkrChampion(@Parameter(description = "The ID for requested user.", required = true)
     @PathVariable long id, @Parameter(description = "okrChampion property of user is set to this flag.", required = true) @PathVariable boolean isOkrChampion) {
-        var user = this.userAuthorizationService.setIsOkrChampion(id, isOkrChampion);
+        User user = this.userAuthorizationService.setIsOkrChampion(id, isOkrChampion);
         return userMapper.toDto(user);
     }
 
@@ -74,7 +75,7 @@ public UserDto setOkrChampion(@Parameter(description = "The ID for requested use
     @PostMapping(path = "/createall")
     public List<UserDto> createUsers(@io.swagger.v3.oas.annotations.parameters.RequestBody(description = "The users to create", required = true)
     @RequestBody List<NewUserDto> newUserDtoList) {
-        var createdUsers = this.userAuthorizationService.createUsers(userMapper.toUserList(newUserDtoList));
+        List<User> createdUsers = this.userAuthorizationService.createUsers(userMapper.toUserList(newUserDtoList));
         return userMapper.toDtos(createdUsers);
     }
 
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/ActionDto.java b/backend/src/main/java/ch/puzzle/okr/dto/ActionDto.java
index 2cfe1d6836..473f86b764 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/ActionDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/ActionDto.java
@@ -1,5 +1,5 @@
 package ch.puzzle.okr.dto;
 
 public record ActionDto(Long id, int version, String action, int priority, boolean isChecked, Long keyResultId,
-        boolean writeable) {
+        boolean isWriteable) {
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/NewUserDto.java b/backend/src/main/java/ch/puzzle/okr/dto/NewUserDto.java
index 5874453023..872eb00e63 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/NewUserDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/NewUserDto.java
@@ -1,4 +1,4 @@
 package ch.puzzle.okr.dto;
 
-public record NewUserDto(String firstname, String lastname, String email) {
+public record NewUserDto(String firstName, String lastName, String email) {
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/ObjectiveDto.java b/backend/src/main/java/ch/puzzle/okr/dto/ObjectiveDto.java
index 9de9d8fafa..1cde0ab367 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/ObjectiveDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/ObjectiveDto.java
@@ -4,5 +4,5 @@
 import java.time.LocalDateTime;
 
 public record ObjectiveDto(Long id, int version, String title, Long teamId, Long quarterId, String quarterLabel,
-        String description, State state, LocalDateTime createdOn, LocalDateTime modifiedOn, boolean writeable) {
+        String description, State state, LocalDateTime createdOn, LocalDateTime modifiedOn, boolean isWriteable) {
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/TeamDto.java b/backend/src/main/java/ch/puzzle/okr/dto/TeamDto.java
index 1f980d4662..7f646cd60e 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/TeamDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/TeamDto.java
@@ -1,4 +1,4 @@
 package ch.puzzle.okr.dto;
 
-public record TeamDto(Long id, int version, String name, boolean writeable) {
+public record TeamDto(Long id, int version, String name, boolean isWriteable) {
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/UserDto.java b/backend/src/main/java/ch/puzzle/okr/dto/UserDto.java
index 119a7554cd..a6fe5f96e4 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/UserDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/UserDto.java
@@ -2,6 +2,6 @@
 
 import java.util.List;
 
-public record UserDto(Long id, int version, String firstname, String lastname, String email,
+public record UserDto(Long id, int version, String firstName, String lastName, String email,
         List<UserTeamDto> userTeamList, boolean isOkrChampion) {
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/checkin/CheckInMetricDto.java b/backend/src/main/java/ch/puzzle/okr/dto/checkin/CheckInMetricDto.java
index 190627334e..b22c584f04 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/checkin/CheckInMetricDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/checkin/CheckInMetricDto.java
@@ -6,5 +6,5 @@
 @JsonDeserialize(as = CheckInMetricDto.class)
 public record CheckInMetricDto(Long id, int version, String changeInfo, String initiatives, Integer confidence,
         Long keyResultId, LocalDateTime createdOn, LocalDateTime modifiedOn, Double value,
-        boolean writeable) implements CheckInDto {
+        boolean isWriteable) implements CheckInDto {
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/checkin/CheckInOrdinalDto.java b/backend/src/main/java/ch/puzzle/okr/dto/checkin/CheckInOrdinalDto.java
index d4537437f8..616f77b06b 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/checkin/CheckInOrdinalDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/checkin/CheckInOrdinalDto.java
@@ -7,5 +7,5 @@
 @JsonDeserialize(as = CheckInOrdinalDto.class)
 public record CheckInOrdinalDto(Long id, int version, String changeInfo, String initiatives, Integer confidence,
         Long keyResultId, LocalDateTime createdOn, LocalDateTime modifiedOn, Zone zone,
-        boolean writeable) implements CheckInDto {
+        boolean isWriteable) implements CheckInDto {
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultMetricDto.java b/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultMetricDto.java
index 69c0d18153..323699dd7f 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultMetricDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultMetricDto.java
@@ -9,8 +9,8 @@
 @JsonDeserialize(as = KeyResultMetricDto.class)
 public record KeyResultMetricDto(Long id, int version, String keyResultType, String title, String description,
         Double baseline, Double stretchGoal, Unit unit, KeyResultUserDto owner, KeyResultObjectiveDto objective,
-        KeyResultLastCheckInMetricDto lastCheckIn, LocalDateTime createdOn, LocalDateTime modifiedOn, boolean writeable,
-        List<ActionDto> actionList) implements KeyResultDto {
+        KeyResultLastCheckInMetricDto lastCheckIn, LocalDateTime createdOn, LocalDateTime modifiedOn,
+        boolean isWriteable, List<ActionDto> actionList) implements KeyResultDto {
     @Override
     public List<ActionDto> getActionList() {
         return actionList;
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultOrdinalDto.java b/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultOrdinalDto.java
index 44d622ea35..8ae6de01c4 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultOrdinalDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultOrdinalDto.java
@@ -9,7 +9,7 @@
 public record KeyResultOrdinalDto(Long id, int version, String keyResultType, String title, String description,
         String commitZone, String targetZone, String stretchZone, KeyResultUserDto owner,
         KeyResultObjectiveDto objective, KeyResultLastCheckInOrdinalDto lastCheckIn, LocalDateTime createdOn,
-        LocalDateTime modifiedOn, boolean writeable, List<ActionDto> actionList) implements KeyResultDto {
+        LocalDateTime modifiedOn, boolean isWriteable, List<ActionDto> actionList) implements KeyResultDto {
     @Override
     public List<ActionDto> getActionList() {
         return actionList;
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultUserDto.java b/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultUserDto.java
index b10f27becf..135a06aaa3 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultUserDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultUserDto.java
@@ -1,4 +1,4 @@
 package ch.puzzle.okr.dto.keyresult;
 
-public record KeyResultUserDto(Long id, String firstname, String lastname) {
+public record KeyResultUserDto(Long id, String firstName, String lastName) {
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/overview/DashboardDto.java b/backend/src/main/java/ch/puzzle/okr/dto/overview/DashboardDto.java
deleted file mode 100644
index a1bf342fa7..0000000000
--- a/backend/src/main/java/ch/puzzle/okr/dto/overview/DashboardDto.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package ch.puzzle.okr.dto.overview;
-
-import java.util.List;
-
-public record DashboardDto(Boolean adminAccess, List<OverviewDto> overviews) {
-}
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/overview/OverviewDto.java b/backend/src/main/java/ch/puzzle/okr/dto/overview/OverviewDto.java
index fe22794e63..8508283b9a 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/overview/OverviewDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/overview/OverviewDto.java
@@ -2,5 +2,5 @@
 
 import java.util.List;
 
-public record OverviewDto(OverviewTeamDto team, List<OverviewObjectiveDto> objectives, boolean writeable) {
+public record OverviewDto(OverviewTeamDto team, List<OverviewObjectiveDto> objectives, boolean isWriteable) {
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/userOkrData/UserKeyResultDataDto.java b/backend/src/main/java/ch/puzzle/okr/dto/userokrdata/UserKeyResultDataDto.java
similarity index 75%
rename from backend/src/main/java/ch/puzzle/okr/dto/userOkrData/UserKeyResultDataDto.java
rename to backend/src/main/java/ch/puzzle/okr/dto/userokrdata/UserKeyResultDataDto.java
index 5dc7ab256b..9252f1001e 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/userOkrData/UserKeyResultDataDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/userokrdata/UserKeyResultDataDto.java
@@ -1,4 +1,4 @@
-package ch.puzzle.okr.dto.userOkrData;
+package ch.puzzle.okr.dto.userokrdata;
 
 public record UserKeyResultDataDto(Long keyResultId, String keyResultName, Long objectiveId, String objectiveName) {
 }
\ No newline at end of file
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/userOkrData/UserOkrDataDto.java b/backend/src/main/java/ch/puzzle/okr/dto/userokrdata/UserOkrDataDto.java
similarity index 71%
rename from backend/src/main/java/ch/puzzle/okr/dto/userOkrData/UserOkrDataDto.java
rename to backend/src/main/java/ch/puzzle/okr/dto/userokrdata/UserOkrDataDto.java
index 6e9de6ce0b..b2a6365012 100644
--- a/backend/src/main/java/ch/puzzle/okr/dto/userOkrData/UserOkrDataDto.java
+++ b/backend/src/main/java/ch/puzzle/okr/dto/userokrdata/UserOkrDataDto.java
@@ -1,4 +1,4 @@
-package ch.puzzle.okr.dto.userOkrData;
+package ch.puzzle.okr.dto.userokrdata;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/ch/puzzle/okr/mapper/ActionMapper.java b/backend/src/main/java/ch/puzzle/okr/mapper/ActionMapper.java
index 7be672faea..072f1a4e2e 100644
--- a/backend/src/main/java/ch/puzzle/okr/mapper/ActionMapper.java
+++ b/backend/src/main/java/ch/puzzle/okr/mapper/ActionMapper.java
@@ -44,7 +44,7 @@ private Action toAction(ActionDto actionDto, KeyResult keyResult) {
                 .withVersion(actionDto.version())
                 .withAction(actionDto.action())
                 .withPriority(actionDto.priority())
-                .withIsChecked(actionDto.isChecked())
+                .isChecked(actionDto.isChecked())
                 .withKeyResult(keyResult)
                 .build();
     }
diff --git a/backend/src/main/java/ch/puzzle/okr/mapper/UserMapper.java b/backend/src/main/java/ch/puzzle/okr/mapper/UserMapper.java
index 6ad179fd5d..a13d4b7f76 100644
--- a/backend/src/main/java/ch/puzzle/okr/mapper/UserMapper.java
+++ b/backend/src/main/java/ch/puzzle/okr/mapper/UserMapper.java
@@ -22,7 +22,7 @@ public List<UserDto> toDtos(List<User> userList) {
     }
 
     public UserDto toDto(User user) {
-        var userTeams = user
+        List<UserTeamDto> userTeams = user
                 .getUserTeamList()
                 .stream()
                 .map(ut -> new UserTeamDto(ut.getId(),
@@ -33,8 +33,8 @@ public UserDto toDto(User user) {
 
         return new UserDto(user.getId(),
                            user.getVersion(),
-                           user.getFirstname(),
-                           user.getLastname(),
+                           user.getFirstName(),
+                           user.getLastName(),
                            user.getEmail(),
                            userTeams,
                            user.isOkrChampion());
@@ -45,9 +45,9 @@ public List<User> toUserList(List<NewUserDto> newUserList) {
     }
 
     public User toUser(NewUserDto newUserDto) {
-        var user = new User();
-        user.setFirstname(newUserDto.firstname());
-        user.setLastname(newUserDto.lastname());
+        User user = new User();
+        user.setFirstName(newUserDto.firstName());
+        user.setLastName(newUserDto.lastName());
         user.setEmail(newUserDto.email());
         return user;
     }
diff --git a/backend/src/main/java/ch/puzzle/okr/mapper/UserOkrDataMapper.java b/backend/src/main/java/ch/puzzle/okr/mapper/UserOkrDataMapper.java
index 0b4a411c15..6e8feb53cb 100644
--- a/backend/src/main/java/ch/puzzle/okr/mapper/UserOkrDataMapper.java
+++ b/backend/src/main/java/ch/puzzle/okr/mapper/UserOkrDataMapper.java
@@ -1,7 +1,7 @@
 package ch.puzzle.okr.mapper;
 
-import ch.puzzle.okr.dto.userOkrData.UserKeyResultDataDto;
-import ch.puzzle.okr.dto.userOkrData.UserOkrDataDto;
+import ch.puzzle.okr.dto.userokrdata.UserKeyResultDataDto;
+import ch.puzzle.okr.dto.userokrdata.UserOkrDataDto;
 import ch.puzzle.okr.models.keyresult.KeyResult;
 import java.util.List;
 import org.springframework.stereotype.Component;
diff --git a/backend/src/main/java/ch/puzzle/okr/mapper/keyresult/KeyResultMetricMapper.java b/backend/src/main/java/ch/puzzle/okr/mapper/keyresult/KeyResultMetricMapper.java
index e84d2520ef..19da407e5e 100644
--- a/backend/src/main/java/ch/puzzle/okr/mapper/keyresult/KeyResultMetricMapper.java
+++ b/backend/src/main/java/ch/puzzle/okr/mapper/keyresult/KeyResultMetricMapper.java
@@ -33,8 +33,8 @@ public KeyResultMetricMapper(UserBusinessService userBusinessService,
     public KeyResultDto toDto(KeyResultMetric keyResult, List<Action> actionList) {
         KeyResultUserDto ownerDto = new KeyResultUserDto( //
                                                          keyResult.getOwner().getId(), //
-                                                         keyResult.getOwner().getFirstname(), //
-                                                         keyResult.getOwner().getLastname());
+                                                         keyResult.getOwner().getFirstName(), //
+                                                         keyResult.getOwner().getLastName());
 
         KeyResultQuarterDto quarterDto = new KeyResultQuarterDto( //
                                                                  keyResult.getObjective().getQuarter().getId(), //
diff --git a/backend/src/main/java/ch/puzzle/okr/mapper/keyresult/KeyResultOrdinalMapper.java b/backend/src/main/java/ch/puzzle/okr/mapper/keyresult/KeyResultOrdinalMapper.java
index 1e7f286e2c..c801671a90 100644
--- a/backend/src/main/java/ch/puzzle/okr/mapper/keyresult/KeyResultOrdinalMapper.java
+++ b/backend/src/main/java/ch/puzzle/okr/mapper/keyresult/KeyResultOrdinalMapper.java
@@ -33,8 +33,8 @@ public KeyResultOrdinalMapper(UserBusinessService userBusinessService,
     public KeyResultDto toDto(KeyResultOrdinal keyResult, List<Action> actionList) {
         KeyResultUserDto ownerDto = new KeyResultUserDto( //
                                                          keyResult.getOwner().getId(), //
-                                                         keyResult.getOwner().getFirstname(), //
-                                                         keyResult.getOwner().getLastname());
+                                                         keyResult.getOwner().getFirstName(), //
+                                                         keyResult.getOwner().getLastName());
 
         KeyResultQuarterDto quarterDto = new KeyResultQuarterDto( //
                                                                  keyResult.getObjective().getQuarter().getId(), //
diff --git a/backend/src/main/java/ch/puzzle/okr/models/Action.java b/backend/src/main/java/ch/puzzle/okr/models/Action.java
index 793f7ec297..892201dbe5 100644
--- a/backend/src/main/java/ch/puzzle/okr/models/Action.java
+++ b/backend/src/main/java/ch/puzzle/okr/models/Action.java
@@ -24,7 +24,7 @@ public class Action implements WriteableInterface {
     private int priority;
 
     @NotNull(message = MessageKey.ATTRIBUTE_NOT_NULL)
-    private boolean isChecked;
+    private boolean checked;
 
     @NotNull(message = MessageKey.ATTRIBUTE_NOT_NULL)
     @ManyToOne
@@ -40,7 +40,7 @@ private Action(Builder builder) {
         version = builder.version;
         action = builder.action;
         priority = builder.priority;
-        isChecked = builder.isChecked;
+        checked = builder.checked;
         keyResult = builder.keyResult;
     }
 
@@ -69,11 +69,11 @@ public void setPriority(int priority) {
     }
 
     public boolean isChecked() {
-        return isChecked;
+        return checked;
     }
 
     public void setChecked(boolean checked) {
-        isChecked = checked;
+        this.checked = checked;
     }
 
     public KeyResult getKeyResult() {
@@ -105,7 +105,7 @@ public void setWriteable(boolean writeable) {
     @Override
     public String toString() {
         return "Action{" + "id=" + id + ", version=" + version + ", action='" + action + '\'' + ", priority=" + priority
-               + ", isChecked=" + isChecked + ", keyResult=" + keyResult + ", writeable=" + writeable + '}';
+               + ", checked=" + checked + ", keyResult=" + keyResult + ", writeable=" + writeable + '}';
     }
 
     @Override
@@ -115,14 +115,14 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass())
             return false;
         Action action1 = (Action) o;
-        return version == action1.version && priority == action1.priority && isChecked == action1.isChecked
+        return version == action1.version && priority == action1.priority && checked == action1.checked
                && writeable == action1.writeable && Objects.equals(id, action1.id)
                && Objects.equals(action, action1.action) && Objects.equals(keyResult, action1.keyResult);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, version, action, priority, isChecked, keyResult, writeable);
+        return Objects.hash(id, version, action, priority, checked, keyResult, writeable);
     }
 
     public static final class Builder {
@@ -130,7 +130,7 @@ public static final class Builder {
         private int version;
         private String action;
         private int priority;
-        private boolean isChecked;
+        private boolean checked;
         private KeyResult keyResult;
 
         private Builder() {
@@ -160,8 +160,8 @@ public Builder withPriority(int priority) {
             return this;
         }
 
-        public Builder withIsChecked(boolean isChecked) {
-            this.isChecked = isChecked;
+        public Builder isChecked(boolean checked) {
+            this.checked = checked;
             return this;
         }
 
diff --git a/backend/src/main/java/ch/puzzle/okr/models/User.java b/backend/src/main/java/ch/puzzle/okr/models/User.java
index e92d9b2e3d..71a2c983be 100644
--- a/backend/src/main/java/ch/puzzle/okr/models/User.java
+++ b/backend/src/main/java/ch/puzzle/okr/models/User.java
@@ -24,12 +24,12 @@ public class User {
     @NotBlank(message = MessageKey.ATTRIBUTE_NOT_BLANK)
     @NotNull(message = MessageKey.ATTRIBUTE_NOT_NULL)
     @Size(min = 2, max = 50, message = MessageKey.ATTRIBUTE_SIZE_BETWEEN)
-    private String firstname;
+    private String firstName;
 
     @NotBlank(message = MessageKey.ATTRIBUTE_NOT_BLANK)
     @NotNull(message = MessageKey.ATTRIBUTE_NOT_NULL)
     @Size(min = 2, max = 50, message = MessageKey.ATTRIBUTE_SIZE_BETWEEN)
-    private String lastname;
+    private String lastName;
 
     @Column(unique = true, nullable = false)
     @Email(message = MessageKey.ATTRIBUTE_NOT_VALID)
@@ -42,7 +42,7 @@ public class User {
     private List<UserTeam> userTeamList = new ArrayList<>();
 
     @Column(nullable = false, columnDefinition = "boolean default false")
-    private boolean isOkrChampion = false;
+    private boolean okrChampion = false;
 
     public User() {
     }
@@ -50,11 +50,11 @@ public User() {
     private User(Builder builder) {
         id = builder.id;
         version = builder.version;
-        setFirstname(builder.firstname);
-        setLastname(builder.lastname);
+        setFirstName(builder.firstName);
+        setLastName(builder.lastName);
         setEmail(builder.email);
         setUserTeamList(builder.userTeamList);
-        setOkrChampion(builder.isOkrChampion);
+        setOkrChampion(builder.okrChampion);
     }
 
     public Long getId() {
@@ -65,20 +65,20 @@ public int getVersion() {
         return version;
     }
 
-    public String getFirstname() {
-        return firstname;
+    public String getFirstName() {
+        return firstName;
     }
 
-    public void setFirstname(String firstname) {
-        this.firstname = firstname;
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
     }
 
-    public String getLastname() {
-        return lastname;
+    public String getLastName() {
+        return lastName;
     }
 
-    public void setLastname(String lastname) {
-        this.lastname = lastname;
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
     }
 
     public String getEmail() {
@@ -98,17 +98,17 @@ public void setUserTeamList(List<UserTeam> userTeamList) {
     }
 
     public boolean isOkrChampion() {
-        return isOkrChampion;
+        return okrChampion;
     }
 
     public void setOkrChampion(boolean okrChampion) {
-        isOkrChampion = okrChampion;
+        this.okrChampion = okrChampion;
     }
 
     @Override
     public String toString() {
-        return "User{" + "id=" + id + ", version=" + version + ", firstname='" + firstname + '\'' + ", lastname='"
-               + lastname + '\'' + ", email='" + email + '\'' + ", isOkrChampion='" + isOkrChampion + '\'' + '}';
+        return "User{" + "id=" + id + ", version=" + version + ", firstName='" + firstName + '\'' + ", lastName='"
+               + lastName + '\'' + ", email='" + email + '\'' + ", okrChampion='" + okrChampion + '\'' + '}';
     }
 
     @Override
@@ -119,23 +119,23 @@ public boolean equals(Object o) {
             return false;
         User user = (User) o;
         return Objects.equals(id, user.id) && Objects.equals(version, user.version)
-               && Objects.equals(firstname, user.firstname) && Objects.equals(lastname, user.lastname)
-               && Objects.equals(email, user.email) && Objects.equals(isOkrChampion, user.isOkrChampion);
+               && Objects.equals(firstName, user.firstName) && Objects.equals(lastName, user.lastName)
+               && Objects.equals(email, user.email) && Objects.equals(okrChampion, user.okrChampion);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, version, firstname, lastname, email, isOkrChampion);
+        return Objects.hash(id, version, firstName, lastName, email, okrChampion);
     }
 
     public static final class Builder {
         private Long id;
         private int version;
-        private String firstname;
-        private String lastname;
+        private String firstName;
+        private String lastName;
         private String email;
         private List<UserTeam> userTeamList;
-        private boolean isOkrChampion;
+        private boolean okrChampion;
 
         private Builder() {
         }
@@ -154,13 +154,13 @@ public Builder withVersion(int version) {
             return this;
         }
 
-        public Builder withFirstname(String firstname) {
-            this.firstname = firstname;
+        public Builder withFirstName(String firstName) {
+            this.firstName = firstName;
             return this;
         }
 
-        public Builder withLastname(String lastname) {
-            this.lastname = lastname;
+        public Builder withLastName(String lastName) {
+            this.lastName = lastName;
             return this;
         }
 
@@ -174,8 +174,8 @@ public Builder withUserTeamList(List<UserTeam> userTeamList) {
             return this;
         }
 
-        public Builder withOkrChampion(boolean isOkrChampion) {
-            this.isOkrChampion = isOkrChampion;
+        public Builder isOkrChampion(boolean okrChampion) {
+            this.okrChampion = okrChampion;
             return this;
         }
 
diff --git a/backend/src/main/java/ch/puzzle/okr/models/UserTeam.java b/backend/src/main/java/ch/puzzle/okr/models/UserTeam.java
index 281f02faf6..84a5998935 100644
--- a/backend/src/main/java/ch/puzzle/okr/models/UserTeam.java
+++ b/backend/src/main/java/ch/puzzle/okr/models/UserTeam.java
@@ -24,7 +24,7 @@ public class UserTeam {
     private Team team;
 
     @Column(nullable = false, columnDefinition = "boolean default false")
-    private boolean isTeamAdmin = false;
+    private boolean teamAdmin = false;
 
     private UserTeam() {
     }
@@ -34,7 +34,7 @@ private UserTeam(Builder builder) {
         this.version = builder.version;
         this.user = builder.user;
         this.team = builder.team;
-        this.isTeamAdmin = builder.isTeamAdmin;
+        this.teamAdmin = builder.teamAdmin;
     }
 
     public Long getId() {
@@ -70,11 +70,11 @@ public void setTeam(Team team) {
     }
 
     public boolean isTeamAdmin() {
-        return isTeamAdmin;
+        return teamAdmin;
     }
 
     public void setTeamAdmin(boolean teamAdmin) {
-        isTeamAdmin = teamAdmin;
+        this.teamAdmin = teamAdmin;
     }
 
     @Override
@@ -86,19 +86,19 @@ public boolean equals(Object o) {
             return false;
         }
         UserTeam userTeam = (UserTeam) o;
-        return version == userTeam.version && isTeamAdmin == userTeam.isTeamAdmin && Objects.equals(id, userTeam.id)
+        return version == userTeam.version && teamAdmin == userTeam.teamAdmin && Objects.equals(id, userTeam.id)
                && Objects.equals(user, userTeam.user) && Objects.equals(team, userTeam.team);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, version, user, team, isTeamAdmin);
+        return Objects.hash(id, version, user, team, teamAdmin);
     }
 
     @Override
     public String toString() {
-        return "UserTeam{" + "id=" + id + ", version=" + version + ", user=" + user + ", team=" + team
-               + ", isTeamAdmin=" + isTeamAdmin + '}';
+        return "UserTeam{" + "id=" + id + ", version=" + version + ", user=" + user + ", team=" + team + ", teamAdmin="
+               + teamAdmin + '}';
     }
 
     public static class Builder {
@@ -106,7 +106,7 @@ public static class Builder {
         private int version;
         private User user;
         private Team team;
-        private boolean isTeamAdmin;
+        private boolean teamAdmin;
 
         public static Builder builder() {
             return new Builder();
@@ -132,8 +132,8 @@ public Builder withTeam(Team team) {
             return this;
         }
 
-        public Builder withTeamAdmin(boolean isAdmin) {
-            this.isTeamAdmin = isAdmin;
+        public Builder isTeamAdmin(boolean teamAdmin) {
+            this.teamAdmin = teamAdmin;
             return this;
         }
 
diff --git a/backend/src/main/java/ch/puzzle/okr/multitenancy/HibernateContext.java b/backend/src/main/java/ch/puzzle/okr/multitenancy/HibernateContext.java
index d78c3ba4ac..f620ee6de1 100644
--- a/backend/src/main/java/ch/puzzle/okr/multitenancy/HibernateContext.java
+++ b/backend/src/main/java/ch/puzzle/okr/multitenancy/HibernateContext.java
@@ -7,7 +7,7 @@ public class HibernateContext {
     public static final String HIBERNATE_CONNECTION_URL = "hibernate.connection.url";
     public static final String HIBERNATE_CONNECTION_USERNAME = "hibernate.connection.username";
     public static final String HIBERNATE_CONNECTION_PASSWORD = "hibernate.connection.password";
-    public static final String HIBERNATE_MULTITENANCY = "hibernate.multiTenancy";
+    public static final String HIBERNATE_MULTITENANCY = "hibernate.multi-tenancy";
 
     public static String SPRING_DATASOURCE_URL = "spring.datasource.url";
     public static String SPRING_DATASOURCE_USERNAME = "spring.datasource.username";
diff --git a/backend/src/main/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomizationProvider.java b/backend/src/main/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomizationProvider.java
index b2886711d6..81c2297669 100644
--- a/backend/src/main/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomizationProvider.java
+++ b/backend/src/main/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomizationProvider.java
@@ -62,7 +62,7 @@ private TenantClientCustomization readClientCustomizationConfig(String tenantId)
                                                                      tenantId)),
                                              env
                                                      .getProperty(MessageFormat
-                                                             .format("okr.tenants.{0}.clientcustomization.helpSiteUrl",
+                                                             .format("okr.tenants.{0}.clientcustomization.help-site-url",
                                                                      tenantId)),
                                              getCustomCssStyles(tenantId) //
         );
diff --git a/backend/src/main/java/ch/puzzle/okr/repository/AlignmentSelectionRepository.java b/backend/src/main/java/ch/puzzle/okr/repository/AlignmentSelectionRepository.java
index dcd03ab8bc..4e4bddb21d 100644
--- a/backend/src/main/java/ch/puzzle/okr/repository/AlignmentSelectionRepository.java
+++ b/backend/src/main/java/ch/puzzle/okr/repository/AlignmentSelectionRepository.java
@@ -8,7 +8,7 @@
 
 public interface AlignmentSelectionRepository extends ReadOnlyRepository<AlignmentSelection, AlignmentSelectionId> {
 
-    @Query(value = "from AlignmentSelection where quarterId = :quarter_id and teamId != :ignoredTeamId")
-    List<AlignmentSelection> getAlignmentSelectionByQuarterIdAndTeamIdNot(@Param("quarter_id") Long quarterId,
+    @Query(value = "from AlignmentSelection where quarterId = :quarterId and teamId != :ignoredTeamId")
+    List<AlignmentSelection> getAlignmentSelectionByQuarterIdAndTeamIdNot(@Param("quarterId") Long quarterId,
                                                                           @Param("ignoredTeamId") Long ignoredTeamId);
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/repository/UserRepository.java b/backend/src/main/java/ch/puzzle/okr/repository/UserRepository.java
index addae09197..3b7a5a4e5b 100644
--- a/backend/src/main/java/ch/puzzle/okr/repository/UserRepository.java
+++ b/backend/src/main/java/ch/puzzle/okr/repository/UserRepository.java
@@ -8,5 +8,5 @@
 public interface UserRepository extends CrudRepository<User, Long> {
     Optional<User> findByEmail(String email);
 
-    List<User> findByIsOkrChampion(boolean okrChampion);
+    List<User> findByOkrChampion(boolean isOkrChampion);
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/security/JwtHelper.java b/backend/src/main/java/ch/puzzle/okr/security/JwtHelper.java
index 6e2034416e..e00d314c0f 100644
--- a/backend/src/main/java/ch/puzzle/okr/security/JwtHelper.java
+++ b/backend/src/main/java/ch/puzzle/okr/security/JwtHelper.java
@@ -33,17 +33,17 @@ public class JwtHelper {
     private static final Logger logger = LoggerFactory.getLogger(JwtHelper.class);
 
     private final TenantConfigProvider tenantConfigProvider;
-    private final String firstname;
-    private final String lastname;
+    private final String firstName;
+    private final String lastName;
     private final String email;
 
     public JwtHelper(TenantConfigProvider tenantConfigProvider,
-                     @Value("${okr.jwt.claim.firstname}") final String tokenClaimsKeyFirstname,
-                     @Value("${okr.jwt.claim.lastname}") final String tokenClaimsKeyLastname,
+                     @Value("${okr.jwt.claim.first-name}") final String tokenClaimsKeyFirstname,
+                     @Value("${okr.jwt.claim.last-name}") final String tokenClaimsKeyLastname,
                      @Value("${okr.jwt.claim.email}") final String tokenClaimsKeyEmail) {
         this.tenantConfigProvider = tenantConfigProvider;
-        this.firstname = tokenClaimsKeyFirstname;
-        this.lastname = tokenClaimsKeyLastname;
+        this.firstName = tokenClaimsKeyFirstname;
+        this.lastName = tokenClaimsKeyLastname;
         this.email = tokenClaimsKeyEmail;
     }
 
@@ -54,8 +54,8 @@ public User getUserFromJwt(Jwt token) {
         try {
             return User.Builder
                     .builder() //
-                    .withFirstname(claims.get(firstname).toString()) //
-                    .withLastname(claims.get(lastname).toString()) //
+                    .withFirstName(claims.get(firstName).toString()) //
+                    .withLastName(claims.get(lastName).toString()) //
                     .withEmail(claims.get(email).toString()) //
                     .build();
         } catch (Exception e) {
diff --git a/backend/src/main/java/ch/puzzle/okr/service/CacheService.java b/backend/src/main/java/ch/puzzle/okr/service/CacheService.java
index 5a315116fd..b9c37828a9 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/CacheService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/CacheService.java
@@ -23,7 +23,7 @@ public CacheService(CacheManager cacheManager) {
     }
 
     @CacheEvict(value = AUTHORIZATION_USER_CACHE, allEntries = true)
-    @Scheduled(fixedRateString = "${caching.authorization.users.TTL}")
+    @Scheduled(fixedRateString = "${caching.authorization.users.ttl}")
     public void emptyAuthorizationUsersCache() {
         logger.info("emptying authorization users cache");
     }
diff --git a/backend/src/main/java/ch/puzzle/okr/service/authorization/AuthorizationRegistrationService.java b/backend/src/main/java/ch/puzzle/okr/service/authorization/AuthorizationRegistrationService.java
index 33980f8fad..663958ef37 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/authorization/AuthorizationRegistrationService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/authorization/AuthorizationRegistrationService.java
@@ -27,16 +27,16 @@ public AuthorizationRegistrationService(UserBusinessService userBusinessService,
 
     @Cacheable(value = AUTHORIZATION_USER_CACHE, key = "T(ch.puzzle.okr.SpringCachingConfig).cacheKey(#userFromToken)")
     public AuthorizationUser updateOrAddAuthorizationUser(User userFromToken) {
-        var userFromDB = userBusinessService.getOrCreateUser(userFromToken);
-        var userFromDBWithTokenData = setFirstLastNameFromToken(userFromDB, userFromToken);
-        var userFromDBWithTokenAndPropertiesData = setOkrChampionFromProperties(userFromDBWithTokenData);
-        userBusinessService.saveUser(userFromDBWithTokenAndPropertiesData);
-        return new AuthorizationUser(userFromDBWithTokenAndPropertiesData);
+        User userFromDb = userBusinessService.getOrCreateUser(userFromToken);
+        User userFromDbWithTokenData = setFirstLastNameFromToken(userFromDb, userFromToken);
+        User userFromDbWithTokenAndPropertiesData = setOkrChampionFromProperties(userFromDbWithTokenData);
+        userBusinessService.saveUser(userFromDbWithTokenAndPropertiesData);
+        return new AuthorizationUser(userFromDbWithTokenAndPropertiesData);
     }
 
     // firstname and lastname comes from JWT token
-    private User setFirstLastNameFromToken(User userFromDB, User userFromToken) {
-        return helper.setFirstLastNameFromToken(userFromDB, userFromToken);
+    private User setFirstLastNameFromToken(User userFromDb, User userFromToken) {
+        return helper.setFirstLastNameFromToken(userFromDb, userFromToken);
     }
 
     // okr champion is set in application properties
@@ -59,10 +59,10 @@ public User setOkrChampionFromProperties(User user, TenantConfigProvider.TenantC
             return user;
         }
 
-        public User setFirstLastNameFromToken(User userFromDB, User userFromToken) {
-            userFromDB.setFirstname(userFromToken.getFirstname());
-            userFromDB.setLastname(userFromToken.getLastname());
-            return userFromDB;
+        public User setFirstLastNameFromToken(User userFromDb, User userFromToken) {
+            userFromDb.setFirstName(userFromToken.getFirstName());
+            userFromDb.setLastName(userFromToken.getLastName());
+            return userFromDb;
         }
     }
 
diff --git a/backend/src/main/java/ch/puzzle/okr/service/authorization/AuthorizationService.java b/backend/src/main/java/ch/puzzle/okr/service/authorization/AuthorizationService.java
index b249332663..cc5f026624 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/authorization/AuthorizationService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/authorization/AuthorizationService.java
@@ -44,16 +44,16 @@ public static boolean hasRoleWriteForTeam(AuthorizationUser authorizationUser, L
         return authorizationUser.isUserMemberInTeam(teamId);
     }
 
-    public static void checkRoleWriteAndReadAll(AuthorizationUser user,
+    public static void checkRoleWriteAndReadAll(AuthorizationUser authorizationUser,
                                                 OkrResponseStatusException notAuthorizedException) {
-        if (hasRoleWriteAndReadAll(user)) {
+        if (hasRoleWriteAndReadAll(authorizationUser)) {
             return;
         }
         throw notAuthorizedException;
     }
 
-    public static boolean hasRoleWriteAndReadAll(AuthorizationUser user) {
-        return user.user().isOkrChampion();
+    public static boolean hasRoleWriteAndReadAll(AuthorizationUser authorizationUser) {
+        return authorizationUser.user().isOkrChampion();
     }
 
     public AuthorizationUser updateOrAddAuthorizationUser() {
diff --git a/backend/src/main/java/ch/puzzle/okr/service/authorization/UserAuthorizationService.java b/backend/src/main/java/ch/puzzle/okr/service/authorization/UserAuthorizationService.java
index 9ec8444c6e..627e7f4b6a 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/authorization/UserAuthorizationService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/authorization/UserAuthorizationService.java
@@ -3,9 +3,10 @@
 import static ch.puzzle.okr.Constants.USER;
 
 import ch.puzzle.okr.ErrorKey;
-import ch.puzzle.okr.dto.userOkrData.UserOkrDataDto;
+import ch.puzzle.okr.dto.userokrdata.UserOkrDataDto;
 import ch.puzzle.okr.exception.OkrResponseStatusException;
 import ch.puzzle.okr.mapper.UserOkrDataMapper;
+import ch.puzzle.okr.models.Team;
 import ch.puzzle.okr.models.User;
 import ch.puzzle.okr.models.UserTeam;
 import ch.puzzle.okr.models.keyresult.KeyResult;
@@ -32,7 +33,7 @@ public UserAuthorizationService(UserBusinessService userBusinessService, Authori
     }
 
     public List<User> getAllUsers() {
-        var allUsers = userBusinessService.getAllUsers();
+        List<User> allUsers = userBusinessService.getAllUsers();
         allUsers.forEach(this::setTeamWritableForUser);
         return allUsers;
     }
@@ -42,18 +43,18 @@ private void setTeamWritableForUser(User user) {
     }
 
     private void setTeamWritableForUserTeam(UserTeam userTeam) {
-        var team = userTeam.getTeam();
+        Team team = userTeam.getTeam();
         team.setWriteable(teamAuthorizationService.isUserWriteAllowed(team.getId()));
     }
 
     public User getById(long id) {
-        var user = userBusinessService.getUserById(id);
+        User user = userBusinessService.getUserById(id);
         setTeamWritableForUser(user);
         return user;
     }
 
     public User setIsOkrChampion(long id, boolean isOkrChampion) {
-        var user = userBusinessService.getUserById(id);
+        User user = userBusinessService.getUserById(id);
         AuthorizationService
                 .checkRoleWriteAndReadAll(authorizationService.updateOrAddAuthorizationUser(),
                                           OkrResponseStatusException.of(ErrorKey.NOT_AUTHORIZED_TO_WRITE, USER));
diff --git a/backend/src/main/java/ch/puzzle/okr/service/business/ObjectiveBusinessService.java b/backend/src/main/java/ch/puzzle/okr/service/business/ObjectiveBusinessService.java
index 05f217180c..3e2ce24887 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/business/ObjectiveBusinessService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/business/ObjectiveBusinessService.java
@@ -69,15 +69,15 @@ public Objective updateEntity(Long id, Objective objective, AuthorizationUser au
     }
 
     private void setQuarterIfIsImUsed(Objective objective, Objective savedObjective) {
-        boolean imUsed = isImUsed(objective, savedObjective);
-        if (imUsed) {
+        boolean isImUsed = isImUsed(objective, savedObjective);
+        if (isImUsed) {
             objective.setQuarter(savedObjective.getQuarter());
         }
-        logger.debug("quarter has changed and is{}changeable, {}", spaceOrNot(imUsed), objective);
+        logger.debug("quarter has changed and is{}changeable, {}", spaceOrNot(isImUsed), objective);
     }
 
-    private String spaceOrNot(boolean imUsed) {
-        if (imUsed)
+    private String spaceOrNot(boolean isImUsed) {
+        if (isImUsed)
             return " NOT ";
         return " ";
     }
diff --git a/backend/src/main/java/ch/puzzle/okr/service/business/QuarterBusinessService.java b/backend/src/main/java/ch/puzzle/okr/service/business/QuarterBusinessService.java
index 7069eb4cf9..3e5286f7c9 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/business/QuarterBusinessService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/business/QuarterBusinessService.java
@@ -90,7 +90,7 @@ private void generateQuarter(LocalDateTime start, String label) {
         quarterPersistenceService.save(quarter);
     }
 
-    private boolean inLastMonthOfQuarter(int currentQuarter, int nextQuarter) {
+    private boolean isInLastMonthOfQuarter(int currentQuarter, int nextQuarter) {
         // If the quarter 4 months in the future and the current are exactly 2 apart,
         // we are in the final month of the current quarter. This works for all 4 cases:
         // 1 -> 3 | 2 -> 4 | 3 -> 1 | 4 -> 2
@@ -122,7 +122,7 @@ public void scheduledGenerationQuarters() {
         int nextQuarter = quarters.get(nextQuarterYearMonth.getMonthValue());
 
         // If we are in the last month of a quarter, generate the next quarter
-        if (inLastMonthOfQuarter(currentQuarter, nextQuarter)) {
+        if (isInLastMonthOfQuarter(currentQuarter, nextQuarter)) {
             logger.info("Generated quarters on last day of month");
             String label = createQuarterLabel(nextQuarterYearMonth, nextQuarter);
             generateQuarter(nextQuarterYearMonth.atDay(1).atStartOfDay(), label);
diff --git a/backend/src/main/java/ch/puzzle/okr/service/business/TeamBusinessService.java b/backend/src/main/java/ch/puzzle/okr/service/business/TeamBusinessService.java
index e4b46423a7..3a65a035ed 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/business/TeamBusinessService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/business/TeamBusinessService.java
@@ -56,8 +56,8 @@ public Team getTeamById(Long teamId) {
     public Team createTeam(Team team, AuthorizationUser authorizationUser) {
         validator.validateOnCreate(team);
         cacheService.emptyAuthorizationUsersCache();
-        var savedTeam = teamPersistenceService.save(team);
-        var currentUser = authorizationUser.user();
+        Team savedTeam = teamPersistenceService.save(team);
+        User currentUser = authorizationUser.user();
         addTeamMembership(savedTeam.getId(), true, currentUser, currentUser.getUserTeamList());
         userPersistenceService.save(currentUser);
         return savedTeam;
@@ -81,11 +81,11 @@ public void deleteTeam(Long id) {
     }
 
     private void deleteUserTeamList(Long id) {
-        var team = teamPersistenceService.findById(id);
+        Team team = teamPersistenceService.findById(id);
         // remove userTeam from each user, otherwise they are still in the session and
         // are not deleted
         team.getUserTeamList().forEach(userTeam -> {
-            var user = userTeam.getUser();
+            User user = userTeam.getUser();
             user.getUserTeamList().remove(userTeam);
         });
         userTeamPersistenceService.deleteAll(team.getUserTeamList());
@@ -106,10 +106,10 @@ private List<Team> sortTeams(List<Team> teams, AuthorizationUser authorizationUs
 
     @Transactional
     public void addUsersToTeam(long teamId, List<Long> userIdList) {
-        var team = teamPersistenceService.findById(teamId);
-        for (var userId : userIdList) {
-            var user = userPersistenceService.findById(userId);
-            var userTeam = UserTeam.Builder.builder().withTeam(team).withUser(user).withTeamAdmin(false).build();
+        Team team = teamPersistenceService.findById(teamId);
+        for (Long userId : userIdList) {
+            User user = userPersistenceService.findById(userId);
+            UserTeam userTeam = UserTeam.Builder.builder().withTeam(team).withUser(user).isTeamAdmin(false).build();
             user.getUserTeamList().add(userTeam);
             userPersistenceService.save(user);
         }
@@ -118,13 +118,13 @@ public void addUsersToTeam(long teamId, List<Long> userIdList) {
 
     @Transactional
     public void removeUserFromTeam(long teamId, long userId) {
-        var user = userPersistenceService.findById(userId);
-        var team = this.teamPersistenceService.findById(teamId);
+        User user = userPersistenceService.findById(userId);
+        Team team = this.teamPersistenceService.findById(teamId);
 
         checkTeamHasAtLeastOneAdmin(team, user);
 
-        var userTeamList = user.getUserTeamList();
-        var userTeamToRemove = userTeamList
+        List<UserTeam> userTeamList = user.getUserTeamList();
+        UserTeam userTeamToRemove = userTeamList
                 .stream()
                 .filter(ut -> ut.getTeam().getId() == teamId)
                 .findFirst()
@@ -149,9 +149,9 @@ private void checkTeamHasAtLeastOneAdmin(Team team, User user) {
 
     @Transactional
     public void updateOrAddTeamMembership(long teamId, long userId, boolean isAdmin) {
-        var user = userPersistenceService.findById(userId);
+        User user = userPersistenceService.findById(userId);
         List<UserTeam> userTeamList = user.getUserTeamList();
-        for (var ut : userTeamList) {
+        for (UserTeam ut : userTeamList) {
             if (ut.getTeam().getId().equals(teamId)) {
                 updateTeamMembership(isAdmin, ut, user);
                 return;
@@ -173,8 +173,8 @@ private void updateTeamMembership(boolean isAdmin, UserTeam ut, User user) {
     }
 
     private void addTeamMembership(long teamId, boolean isAdmin, User user, List<UserTeam> userTeamList) {
-        var team = teamPersistenceService.findById(teamId);
-        var userTeam = UserTeam.Builder.builder().withTeam(team).withTeamAdmin(isAdmin).withUser(user).build();
+        Team team = teamPersistenceService.findById(teamId);
+        UserTeam userTeam = UserTeam.Builder.builder().withTeam(team).isTeamAdmin(isAdmin).withUser(user).build();
         userTeamList.add(userTeam);
     }
 
diff --git a/backend/src/main/java/ch/puzzle/okr/service/business/UserBusinessService.java b/backend/src/main/java/ch/puzzle/okr/service/business/UserBusinessService.java
index 3bb9a10d54..e290cd054d 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/business/UserBusinessService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/business/UserBusinessService.java
@@ -42,18 +42,18 @@ public User getOrCreateUser(User user) {
         return userPersistenceService.getOrCreateUser(user);
     }
 
-    public User setIsOkrChampion(User user, boolean okrChampion) {
-        if (!okrChampion) {
+    public User setIsOkrChampion(User user, boolean isOkrChampion) {
+        if (!isOkrChampion) {
             checkAtLeastOneOkrChampionExists(user);
         }
-        user.setOkrChampion(okrChampion);
+        user.setOkrChampion(isOkrChampion);
         cacheService.emptyAuthorizationUsersCache();
         return userPersistenceService.save(user);
     }
 
     // checks if at least one okr champion remains after removing given one
     private void checkAtLeastOneOkrChampionExists(User user) {
-        var champions = userPersistenceService.findAllOkrChampions();
+        List<User> champions = userPersistenceService.findAllOkrChampions();
         champions
                 .stream()
                 .filter(c -> c.isOkrChampion() && !Objects.equals(c.getId(), user.getId()))
@@ -68,7 +68,7 @@ public User saveUser(User user) {
 
     @Transactional
     public List<User> createUsers(List<User> userList) {
-        var userIter = userPersistenceService.saveAll(userList);
+        Iterable<User> userIter = userPersistenceService.saveAll(userList);
         return StreamSupport.stream(userIter.spliterator(), false).toList();
     }
 
diff --git a/backend/src/main/java/ch/puzzle/okr/service/clientconfig/ClientConfigService.java b/backend/src/main/java/ch/puzzle/okr/service/clientconfig/ClientConfigService.java
index 29cc6ab69d..9011b6f967 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/clientconfig/ClientConfigService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/clientconfig/ClientConfigService.java
@@ -29,25 +29,25 @@ public ClientConfigService(final TenantClientCustomizationProvider clientCustomi
     }
 
     public ClientConfigDto getConfigBasedOnActiveEnv(String hostName) {
-        String subdomain = hostName.split("\\.")[0];
+        String subDomain = hostName.split("\\.")[0];
         String domainPrefixByHyphen = hostName.split("-")[0];
 
         Optional<TenantConfigProvider.TenantConfig> tenantConfig = getTenantConfig(hostName,
-                                                                                   subdomain,
+                                                                                   subDomain,
                                                                                    domainPrefixByHyphen);
 
         if (tenantConfig.isEmpty()) {
             throw new EntityNotFoundException(MessageFormat
-                    .format("Could not find tenant config for subdomain:{0}", subdomain));
+                    .format("Could not find tenant config for subDomain:{0}", subDomain));
         }
 
         Optional<TenantClientCustomization> tenantClientCustomization = getTenantClientCustomization(hostName,
-                                                                                                     subdomain,
+                                                                                                     subDomain,
                                                                                                      domainPrefixByHyphen);
 
         if (tenantClientCustomization.isEmpty()) {
             throw new EntityNotFoundException(MessageFormat
-                    .format("Could not find tenant client customization for subdomain:{0}", subdomain));
+                    .format("Could not find tenant client customization for subDomain:{0}", subDomain));
         }
 
         return new ClientConfigDto(activeProfile, //
@@ -62,7 +62,7 @@ public ClientConfigDto getConfigBasedOnActiveEnv(String hostName) {
                                    tenantClientCustomization.get().customStyles()); //
     }
 
-    private Optional<TenantConfigProvider.TenantConfig> getTenantConfig(String hostname, String... tenantsFromUrl) {
+    private Optional<TenantConfigProvider.TenantConfig> getTenantConfig(String hostName, String... tenantsFromUrl) {
         for (String tenant : tenantsFromUrl) {
             Optional<TenantConfigProvider.TenantConfig> tenantConfig = tenantConfigProvider.getTenantConfigById(tenant);
             if (tenantConfig.isPresent()) {
@@ -71,11 +71,11 @@ private Optional<TenantConfigProvider.TenantConfig> getTenantConfig(String hostn
             }
             logger.info("get config found for " + tenant + ": failed");
         }
-        logger.info("no config found for " + hostname + ": failed");
+        logger.info("no config found for " + hostName + ": failed");
         return Optional.empty();
     }
 
-    private Optional<TenantClientCustomization> getTenantClientCustomization(String hostname,
+    private Optional<TenantClientCustomization> getTenantClientCustomization(String hostName,
                                                                              String... tenantsFromUrl) {
         for (String tenant : tenantsFromUrl) {
             Optional<TenantClientCustomization> tenantCustomization = tenantClientCustomizationProvider
@@ -86,7 +86,7 @@ private Optional<TenantClientCustomization> getTenantClientCustomization(String
             }
             logger.info("get client customization for " + tenant + ": failed");
         }
-        logger.info("no client customization found for " + hostname + ": failed");
+        logger.info("no client customization found for " + hostName + ": failed");
         return Optional.empty();
     }
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/AuthorizationCriteria.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/AuthorizationCriteria.java
index 02a5dbc7ed..2a87e6a7c7 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/AuthorizationCriteria.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/AuthorizationCriteria.java
@@ -21,7 +21,7 @@ public class AuthorizationCriteria<T> {
     private static final String PARAM_TEAM_IDS = "teamIds";
     private static final String PARAM_USER_TEAM_IDS = "userTeamIds";
 
-    public String appendOverview(List<Long> teamIds, String objectiveQuery, AuthorizationUser user) {
+    public String appendOverview(List<Long> teamIds, String objectiveQuery, AuthorizationUser authorizationUser) {
         String alias = "o";
         StringBuilder sb = new StringBuilder(256);
         if (shouldAddTeamFilter(teamIds)) {
@@ -32,7 +32,7 @@ public String appendOverview(List<Long> teamIds, String objectiveQuery, Authoriz
                     .append("\n and lower(coalesce(o.objectiveTitle, '')) like lower(concat('%',:"
                             + PARAM_OBJECTIVE_QUERY + ",'%'))");
         }
-        String authorizationWhereClause = append(user, alias, "objectiveState", "overviewId.teamId");
+        String authorizationWhereClause = append(authorizationUser, alias, "objectiveState", "overviewId.teamId");
         if (!authorizationWhereClause.isEmpty()) {
             sb.append("\n").append(authorizationWhereClause.substring(0, authorizationWhereClause.length() - 1));
             sb.append(format(" or %s.overviewId.objectiveId = -1)", alias));
@@ -40,13 +40,13 @@ public String appendOverview(List<Long> teamIds, String objectiveQuery, Authoriz
         return sb.toString();
     }
 
-    public String appendObjective(AuthorizationUser user) {
-        return append(user, "o", "state", "team.id");
+    public String appendObjective(AuthorizationUser authorizationUser) {
+        return append(authorizationUser, "o", "state", "team.id");
     }
 
-    private String append(AuthorizationUser user, String alias, String stateColumn, String teamIdColumn) {
+    private String append(AuthorizationUser authorizationUser, String alias, String stateColumn, String teamIdColumn) {
         StringBuilder sb = new StringBuilder(256);
-        if (hasRoleWriteAndReadAll(user)) {
+        if (hasRoleWriteAndReadAll(authorizationUser)) {
             sb.append(format(" or %s.%s=:%s", alias, stateColumn, PARAM_ALL_DRAFT_STATE));
         } else {
             // users can read draft state of teams with admin role
@@ -68,22 +68,22 @@ private String append(AuthorizationUser user, String alias, String stateColumn,
     }
 
     public void setParameters(TypedQuery<T> typedQuery, List<Long> teamIds, String objectiveQuery,
-                              AuthorizationUser user) {
+                              AuthorizationUser authorizationUser) {
         if (shouldAddTeamFilter(teamIds)) {
             typedQuery.setParameter(PARAM_TEAM_IDS, teamIds);
         }
         if (shouldAddObjectiveFilter(objectiveQuery)) {
             typedQuery.setParameter(PARAM_OBJECTIVE_QUERY, objectiveQuery);
         }
-        setParameters(typedQuery, user);
+        setParameters(typedQuery, authorizationUser);
     }
 
-    public void setParameters(TypedQuery<T> typedQuery, AuthorizationUser user) {
-        if (hasRoleWriteAndReadAll(user)) {
+    public void setParameters(TypedQuery<T> typedQuery, AuthorizationUser authorizationUser) {
+        if (hasRoleWriteAndReadAll(authorizationUser)) {
             typedQuery.setParameter(PARAM_ALL_DRAFT_STATE, DRAFT);
         } else {
             typedQuery.setParameter(PARAM_TEAM_DRAFT_STATE, DRAFT);
-            typedQuery.setParameter(PARAM_USER_TEAM_IDS, user.extractTeamIds());
+            typedQuery.setParameter(PARAM_USER_TEAM_IDS, authorizationUser.extractTeamIds());
         }
         typedQuery.setParameter(PARAM_PUBLISHED_STATES, List.of(ONGOING, SUCCESSFUL, NOTSUCCESSFUL));
     }
diff --git a/backend/src/main/java/ch/puzzle/okr/service/persistence/UserPersistenceService.java b/backend/src/main/java/ch/puzzle/okr/service/persistence/UserPersistenceService.java
index 2cfa105ec8..5fa8ce6b3e 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/persistence/UserPersistenceService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/persistence/UserPersistenceService.java
@@ -36,7 +36,7 @@ public User save(User user) {
     }
 
     public List<User> findAllOkrChampions() {
-        return getRepository().findByIsOkrChampion(true);
+        return getRepository().findByOkrChampion(true);
     }
 
     public Iterable<User> saveAll(List<User> userList) {
diff --git a/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/QuarterLabel.java b/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/QuarterLabel.java
index 85f6e36b8c..dcd523d61e 100644
--- a/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/QuarterLabel.java
+++ b/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/QuarterLabel.java
@@ -19,8 +19,8 @@ public QuarterLabel(LocalDate date) {
 
     public String label() {
         return "GJ " + //
-               formatYearAs2Digits(firstYearOfGeschaeftsJahr()) + "/" + //
-               formatYearAs2Digits(secondYearOfGeschaeftsJahr()) + "-Q" + //
+               formatYearAs2Digits(firstYearOfFiscalYear()) + "/" + //
+               formatYearAs2Digits(secondYearOfFiscalYear()) + "-Q" + //
                getQuarterDigit();
     }
 
@@ -35,27 +35,27 @@ private int getQuarterDigit() {
         return 2;
     }
 
-    private int firstYearOfGeschaeftsJahr() {
-        if (isNowInNewGeschaeftsJahr()) {
+    private int firstYearOfFiscalYear() {
+        if (isNowInNewFiscalYear()) {
             return date.getYear();
         }
         return date.getYear() - 1;
     }
 
-    private boolean isNowInNewGeschaeftsJahr() {
-        LocalDate startNewGJ = startOfNewGeschaeftsJahr();
+    private boolean isNowInNewFiscalYear() {
+        LocalDate startNewGJ = startOfNewFiscalYear();
         return date.equals(startNewGJ) || date.isAfter(startNewGJ);
     }
 
-    private int secondYearOfGeschaeftsJahr() {
-        return firstYearOfGeschaeftsJahr() + 1;
+    private int secondYearOfFiscalYear() {
+        return firstYearOfFiscalYear() + 1;
     }
 
     private int formatYearAs2Digits(int year) {
         return year % 1000;
     }
 
-    private LocalDate startOfNewGeschaeftsJahr() {
+    private LocalDate startOfNewFiscalYear() {
         return LocalDate.of(date.getYear(), 7, 1);
     }
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/h2/QuarterFunction.java b/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/h2/QuarterFunction.java
index 563b7e4f29..60425ac0c5 100644
--- a/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/h2/QuarterFunction.java
+++ b/backend/src/main/java/ch/puzzle/okr/util/quarter/generate/h2/QuarterFunction.java
@@ -22,56 +22,56 @@ public class QuarterFunction {
     public static final int CURRENT_QUARTER_DB_ID = 2;
     public static final int NEXT_QUARTER_DB_ID = 3;
 
-    private static final Map<Integer, QuarterData> QUARTERS = new HashMap<>();
+    private static Map<Integer, QuarterData> quarters = new HashMap<>();
     private static final Logger logger = LoggerFactory.getLogger(QuarterFunction.class);
 
     public static void initQuarterData() {
         LocalDate now = LocalDate.now();
         registerCurrentQuarterForDate(now, CURRENT_QUARTER_DB_ID);
 
-        LocalDate in3Months = now.plusMonths(3);
-        registerCurrentQuarterForDate(in3Months, NEXT_QUARTER_DB_ID);
+        LocalDate inThreeMonths = now.plusMonths(3);
+        registerCurrentQuarterForDate(inThreeMonths, NEXT_QUARTER_DB_ID);
     }
 
     private static void registerCurrentQuarterForDate(LocalDate date, int dbId) {
         Quarters quarters = new Quarters(date.getYear());
         QuarterData currentQuarter = quarters.currentQuarter(date);
-        QUARTERS.put(dbId, currentQuarter);
+        QuarterFunction.quarters.put(dbId, currentQuarter);
     }
 
     public static String currentQuarterLabel() {
-        var label = QUARTERS.get(CURRENT_QUARTER_DB_ID).label();
+        String label = quarters.get(CURRENT_QUARTER_DB_ID).label();
         logger.info("currentQuarterLabel    : {}", label);
         return label;
 
     }
 
     public static String currentQuarterStartDate() {
-        var start = QUARTERS.get(CURRENT_QUARTER_DB_ID).startDateAsIsoString();
+        String start = quarters.get(CURRENT_QUARTER_DB_ID).startDateAsIsoString();
         logger.info("currentQuarterStartDate: {}", start);
         return start;
     }
 
     public static String currentQuarterEndDate() {
-        var end = QUARTERS.get(CURRENT_QUARTER_DB_ID).endDateAsIsoString();
+        String end = quarters.get(CURRENT_QUARTER_DB_ID).endDateAsIsoString();
         logger.info("currentQuarterEndDate  : {}", end);
         return end;
     }
 
     public static String nextQuarterLabel() {
-        var label = QUARTERS.get(NEXT_QUARTER_DB_ID).label();
+        String label = quarters.get(NEXT_QUARTER_DB_ID).label();
         logger.info("nextQuarterLabel       : {}", label);
         return label;
     }
 
     public static String nextQuarterStartDate() {
-        var start = QUARTERS.get(NEXT_QUARTER_DB_ID).startDateAsIsoString();
+        String start = quarters.get(NEXT_QUARTER_DB_ID).startDateAsIsoString();
         logger.info("nextQuarterStartDate   : {}", start);
         return start;
     }
 
     public static String nextQuarterEndDate() {
-        var end = QUARTERS.get(NEXT_QUARTER_DB_ID).endDateAsIsoString();
+        String end = quarters.get(NEXT_QUARTER_DB_ID).endDateAsIsoString();
         logger.info("nextQuarterEndDate     : {}", end);
         return end;
     }
diff --git a/backend/src/main/resources/application-dev.properties b/backend/src/main/resources/application-dev.properties
index 0918d25dc8..8cfc3d25db 100644
--- a/backend/src/main/resources/application-dev.properties
+++ b/backend/src/main/resources/application-dev.properties
@@ -16,7 +16,7 @@ connect.src=http://localhost:8544 http://localhost:8545
 hibernate.connection.url=jdbc:postgresql://localhost:5432/okr
 hibernate.connection.username=user
 hibernate.connection.password=pwd
-hibernate.multiTenancy=SCHEMA
+hibernate.multi-tenancy=SCHEMA
 # pitc
 okr.tenants.pitc.datasource.url=jdbc:postgresql://localhost:5432/okr
 okr.tenants.pitc.datasource.username=pitc
@@ -41,7 +41,7 @@ okr.tenants.pitc.clientcustomization.triangles=assets/images/triangles-okr-heade
 okr.tenants.pitc.clientcustomization.background-logo=assets/images/puzzle-p.svg
 okr.tenants.pitc.clientcustomization.favicon=assets/favicon.png
 okr.tenants.pitc.clientcustomization.title=Puzzle OKR
-okr.tenants.pitc.clientcustomization.helpSiteUrl=https://wiki.puzzle.ch/Puzzle/OKRs
+okr.tenants.pitc.clientcustomization.help-site-url=https://wiki.puzzle.ch/Puzzle/OKRs
 okr.tenants.pitc.clientcustomization.customstyles.okr-topbar-background-color=#1e5a96
 okr.tenants.pitc.clientcustomization.customstyles.okr-banner-background-color=#dcedf9
 # acme client customization
@@ -50,6 +50,6 @@ okr.tenants.acme.clientcustomization.triangles=assets/images/triangles-okr-acme-
 okr.tenants.acme.clientcustomization.background-logo=assets/images/acme.svg
 okr.tenants.acme.clientcustomization.favicon=assets/favicon-acme.png
 okr.tenants.acme.clientcustomization.title=ACME OKR
-okr.tenants.acme.clientcustomization.helpSiteUrl=https://en.wikipedia.org/wiki/Acme_Corporation
+okr.tenants.acme.clientcustomization.help-site-url=https://en.wikipedia.org/wiki/Acme_Corporation
 okr.tenants.acme.clientcustomization.customstyles.okr-topbar-background-color=#738290
 okr.tenants.acme.clientcustomization.customstyles.okr-banner-background-color=#F2F2F2
diff --git a/backend/src/main/resources/application-integration-test.properties b/backend/src/main/resources/application-integration-test.properties
index c59746d4b0..c48031758c 100644
--- a/backend/src/main/resources/application-integration-test.properties
+++ b/backend/src/main/resources/application-integration-test.properties
@@ -23,7 +23,7 @@ connect.src=http://localhost:8544 http://localhost:8545
 hibernate.connection.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;
 hibernate.connection.username=user
 hibernate.connection.password=sa
-hibernate.multiTenancy=SCHEMA
+hibernate.multi-tenancy=SCHEMA
 
 # pitc
 okr.tenants.pitc.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS okr_pitc
@@ -51,7 +51,7 @@ okr.tenants.pitc.clientcustomization.triangles=assets/images/triangles-okr-heade
 okr.tenants.pitc.clientcustomization.background-logo=assets/images/puzzle-p.svg
 okr.tenants.pitc.clientcustomization.favicon=assets/favicon.png
 okr.tenants.pitc.clientcustomization.title=Puzzle OKR
-okr.tenants.pitc.clientcustomization.helpSiteUrl=https://wiki.puzzle.ch/Puzzle/OKRs
+okr.tenants.pitc.clientcustomization.help-site-url=https://wiki.puzzle.ch/Puzzle/OKRs
 okr.tenants.pitc.clientcustomization.customstyles.okr-topbar-background-color=#1e5a96
 
 # acme client customization
@@ -60,5 +60,5 @@ okr.tenants.acme.clientcustomization.triangles=assets/images/triangles-okr-acme-
 okr.tenants.acme.clientcustomization.background-logo=assets/images/acme.svg
 okr.tenants.acme.clientcustomization.favicon=assets/favicon-acme.png
 okr.tenants.acme.clientcustomization.title=ACME OKR
-okr.tenants.acme.clientcustomization.helpSiteUrl=https://en.wikipedia.org/wiki/Acme_Corporation
+okr.tenants.acme.clientcustomization.help-site-url=https://en.wikipedia.org/wiki/Acme_Corporation
 okr.tenants.acme.clientcustomization.customstyles.okr-topbar-background-color=#738290
\ No newline at end of file
diff --git a/backend/src/main/resources/application-prod.properties b/backend/src/main/resources/application-prod.properties
index 1c7efd9e11..827e3d3d89 100644
--- a/backend/src/main/resources/application-prod.properties
+++ b/backend/src/main/resources/application-prod.properties
@@ -10,7 +10,7 @@ connect.src=https://sso.puzzle.ch
 hibernate.connection.url=jdbc:postgresql://localhost:5432/okr
 hibernate.connection.username=user
 hibernate.connection.password=pwd
-hibernate.multiTenancy=SCHEMA
+hibernate.multi-tenancy=SCHEMA
 
 
 # TENANT Configuration
diff --git a/backend/src/main/resources/application-staging.properties b/backend/src/main/resources/application-staging.properties
index 57ade77501..f7c513cc64 100644
--- a/backend/src/main/resources/application-staging.properties
+++ b/backend/src/main/resources/application-staging.properties
@@ -9,7 +9,7 @@ connect.src=http://localhost:8544 http://localhost:8545
 hibernate.connection.url=jdbc:postgresql://localhost:5432/okr
 hibernate.connection.username=user
 hibernate.connection.password=pwd
-hibernate.multiTenancy=SCHEMA
+hibernate.multi-tenancy=SCHEMA
 
 
 # TENANT Configuration
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 70b1ff8014..e9d6ff7ec1 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -16,8 +16,8 @@ logging.level.org.flywaydb.core=INFO
 
 
 # cache configuration
-caching.authorization.users.TTL=1800000
-caching.users.TTL=1800000
+caching.authorization.users.ttl=1800000
+caching.users.ttl=1800000
 
 # security configuration
 server.port=8080
@@ -38,11 +38,11 @@ okr.jwt.claim.realm=pitc
 okr.jwt.claim.organisations=roles
 okr.jwt.claim.organisation.name.prefix=org_
 okr.jwt.claim.username=preferred_username
-okr.jwt.claim.firstname=given_name
-okr.jwt.claim.lastname=family_name
+okr.jwt.claim.first-name=given_name
+okr.jwt.claim.last-name=family_name
 okr.jwt.claim.email=email
 
-spring.jpa.properties.hibernate.multiTenancy=SCHEMA
+spring.jpa.properties.hibernate.multi-tenancy=SCHEMA
 spring.jpa.properties.hibernate.tenant_identifier_resolver=ch.puzzle.okr.multitenancy.CurrentTenantIdentifierResolverImpl
 spring.jpa.properties.hibernate.multi_tenant_connection_provider=ch.puzzle.okr.multitenancy.SchemaMultiTenantConnectionProvider
 
diff --git a/backend/src/main/resources/db/data-migration-demo/afterMigrate__0_initialData.sql b/backend/src/main/resources/db/data-migration-demo/afterMigrate__0_initialData.sql
index 0217f691c9..9b8ff979a5 100644
--- a/backend/src/main/resources/db/data-migration-demo/afterMigrate__0_initialData.sql
+++ b/backend/src/main/resources/db/data-migration-demo/afterMigrate__0_initialData.sql
@@ -20,7 +20,7 @@ values (1, '1'), -- last past quarter
        (8, '8'), -- future quarter
        (999, 'Backlog');
 
-insert into person (id, email, firstname, lastname, version, is_okr_champion)
+insert into person (id, email, firstName, lastName, version, is_okr_champion)
 values (1, 'peggimann@puzzle.ch', 'Paco', 'Eggimann', 1, TRUE),
        (2, 'leimgruber@puzzle.ch', 'Philipp', 'Leimgruber', 1, TRUE),
        (3, 'brantschen@puzzle.ch', 'Jean-Claude', 'Brantschen', 1, TRUE),
diff --git a/backend/src/main/resources/db/h2-db/data-test-h2/V100_0_0__TestData.sql b/backend/src/main/resources/db/h2-db/data-test-h2/V100_0_0__TestData.sql
index 3e3aebdaa2..f3b7f7dbbc 100644
--- a/backend/src/main/resources/db/h2-db/data-test-h2/V100_0_0__TestData.sql
+++ b/backend/src/main/resources/db/h2-db/data-test-h2/V100_0_0__TestData.sql
@@ -24,7 +24,7 @@ ALTER SEQUENCE sequence_quarter RESTART WITH 200;
 ALTER SEQUENCE sequence_team RESTART WITH 200;
 ALTER SEQUENCE sequence_person_team RESTART WITH 200;
 
-INSERT INTO person (id, version, email, firstname, lastname, is_okr_champion)
+INSERT INTO person (id, version, email, first_name, last_name, okr_champion)
 VALUES (1, 1, 'peggimann@puzzle.ch', 'Paco', 'Eggimann', FALSE),
        (11, 1, 'wunderland@puzzle.ch', 'Alice', 'Wunderland', FALSE),
        (21, 1, 'baumeister@puzzle.ch', 'Bob', 'Baumeister', FALSE),
@@ -56,7 +56,7 @@ values (4, 1, '/BBT'),
        (6, 1, 'LoremIpsum');
 
 -- map existing users to teams
-INSERT INTO person_team (id, version, person_id, team_id, is_team_admin)
+INSERT INTO person_team (id, version, person_id, team_id, team_admin)
 -- peggimann@puzzle.ch
 VALUES (1, 1, 1, 4, TRUE),
        (2, 1, 1, 5, FALSE),
@@ -147,7 +147,7 @@ insert into completed (id, version, objective_id, comment) values
        (2,1, 6, 'War leider nicht moeglich'),
        (3,1, 10, 'Schade');
 
-insert into action (id, version, action, priority, is_checked, key_result_id) values
+insert into action (id, version, action, priority, checked, key_result_id) values
                                                       (1,  1, 'Neues Haus', 1, true, 8),
                                                       (2,  1, 'Neue Katze', 2, true, 8),
                                                       (3,  1, 'Neuer Garten', 3, true, 10),
diff --git a/backend/src/main/resources/db/h2-db/database-h2-schema/V1_0_0__current-db-schema-for-testing.sql b/backend/src/main/resources/db/h2-db/database-h2-schema/V1_0_0__current-db-schema-for-testing.sql
index cd6cfe0ed7..689cab97d7 100644
--- a/backend/src/main/resources/db/h2-db/database-h2-schema/V1_0_0__current-db-schema-for-testing.sql
+++ b/backend/src/main/resources/db/h2-db/database-h2-schema/V1_0_0__current-db-schema-for-testing.sql
@@ -14,9 +14,9 @@ create table if not exists person
     id        bigint       not null,
     version   int          not null,
     email     varchar(250) not null,
-    firstname varchar(50)  not null,
-    lastname  varchar(50)  not null,
-    is_okr_champion BOOLEAN DEFAULT FALSE,
+    first_name varchar(50)  not null,
+    last_name  varchar(50)  not null,
+    okr_champion BOOLEAN DEFAULT FALSE,
     primary key (id),
     constraint uk_person_email
         unique (email)
@@ -149,7 +149,7 @@ create table action
     version       int           not null,
     action        varchar(4096) not null,
     priority      integer       not null,
-    is_checked    boolean       not null,
+    checked    boolean       not null,
     key_result_id bigint        not null
         constraint fk_completed_key_result
             references key_result
@@ -247,7 +247,7 @@ CREATE SEQUENCE IF NOT EXISTS sequence_team;
 
 CREATE TABLE person_team
 (
-    is_team_admin BOOLEAN DEFAULT FALSE NOT NULL,
+    team_admin BOOLEAN DEFAULT FALSE NOT NULL,
     version       INTEGER               NOT NULL,
     id            BIGINT                NOT NULL,
     person_id     BIGINT,
diff --git a/backend/src/main/resources/db/migration/V3_1_0__renameBooleanColumns.sql b/backend/src/main/resources/db/migration/V3_1_0__renameBooleanColumns.sql
new file mode 100644
index 0000000000..2bce2762bd
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V3_1_0__renameBooleanColumns.sql
@@ -0,0 +1,8 @@
+ALTER TABLE action
+    RENAME COLUMN is_checked to checked;
+
+ALTER TABLE person_team
+    RENAME COLUMN is_team_admin to team_admin;
+
+ALTER TABLE person
+    RENAME COLUMN is_okr_champion to okr_champion;
\ No newline at end of file
diff --git a/backend/src/main/resources/db/migration/V3_2_0__renameFirstAndLastNameColumns.sql b/backend/src/main/resources/db/migration/V3_2_0__renameFirstAndLastNameColumns.sql
new file mode 100644
index 0000000000..4fe77bde02
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V3_2_0__renameFirstAndLastNameColumns.sql
@@ -0,0 +1,4 @@
+ALTER TABLE person
+    RENAME COLUMN firstname to first_name;
+ALTER TABLE person
+    RENAME COLUMN lastname to last_name;
\ No newline at end of file
diff --git a/backend/src/test/java/ch/puzzle/okr/ForwardFilterTest.java b/backend/src/test/java/ch/puzzle/okr/ForwardFilterTest.java
index 81fe66f00c..902badd0d8 100644
--- a/backend/src/test/java/ch/puzzle/okr/ForwardFilterTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/ForwardFilterTest.java
@@ -38,7 +38,7 @@ class ForwardFilterTest {
     void setup() {
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should not filter the path: {0}")
     @ValueSource(strings = { "/", "/api/", "/index.html", "/runtime.", "/polyfills.", "/main.", "/scripts.", "/styles.",
             "/favicon.ico", "/3rdpartylicenses.txt", "/assets/" })
     void shouldNotFilterTheRootPath(String requestUri) throws ServletException, IOException {
diff --git a/backend/src/test/java/ch/puzzle/okr/SpringCachingConfigTest.java b/backend/src/test/java/ch/puzzle/okr/SpringCachingConfigTest.java
index 0d4001cd23..df4c54a625 100644
--- a/backend/src/test/java/ch/puzzle/okr/SpringCachingConfigTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/SpringCachingConfigTest.java
@@ -41,18 +41,18 @@ void tearDown() {
         cacheManager.getCache(AUTHORIZATION_USER_CACHE).clear();
     }
 
-    @DisplayName("before calling updateOrAddAuthorizationUser the User is not in the cache")
+    @DisplayName("Should confirm user is not in the cache before calling updateOrAddAuthorizationUser")
     @Test
-    void testUserIsNotCached() {
+    void shouldNotHaveCachedUserBeforeUpdateOrAddAuthorizationUser() {
         Cache cache = cacheManager.getCache(AUTHORIZATION_USER_CACHE);
 
         assertNotNull(cache);
         assertNull(cache.get(key, AuthorizationUser.class));
     }
 
-    @DisplayName("updateOrAddAuthorizationUser puts the User in the cache with key composed by Tenant and User Email")
+    @DisplayName("Should put user in the cache with key composed of tenant and user email when calling updateOrAddAuthorizationUser")
     @Test
-    void testUserIsCached() {
+    void shouldCacheUserGivenToUpdateOrAddAuthorizationUser() {
         Cache cache = cacheManager.getCache(AUTHORIZATION_USER_CACHE);
 
         service.updateOrAddAuthorizationUser(user);
@@ -66,10 +66,10 @@ void testUserIsCached() {
     private void assertEqualUsers(AuthorizationUser expectedAuthorizationUser,
                                   AuthorizationUser actualAuthorizationUser) {
 
-        User expcetedUser = expectedAuthorizationUser.user();
+        User expectedUser = expectedAuthorizationUser.user();
         User actualUser = actualAuthorizationUser.user();
-        assertTrue(expcetedUser.getFirstname().equals(actualUser.getFirstname())
-                   && expcetedUser.getLastname().equals(actualUser.getLastname())
-                   && expcetedUser.getEmail().equals(actualUser.getEmail()));
+        assertTrue(expectedUser.getFirstName().equals(actualUser.getFirstName())
+                   && expectedUser.getLastName().equals(actualUser.getLastName())
+                   && expectedUser.getEmail().equals(actualUser.getEmail()));
     }
 }
\ No newline at end of file
diff --git a/backend/src/test/java/ch/puzzle/okr/UserKeyGeneratorTest.java b/backend/src/test/java/ch/puzzle/okr/UserKeyGeneratorTest.java
index 511dc51dc3..3b513e9bb8 100644
--- a/backend/src/test/java/ch/puzzle/okr/UserKeyGeneratorTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/UserKeyGeneratorTest.java
@@ -6,6 +6,7 @@
 import java.lang.reflect.Method;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 class UserKeyGeneratorTest {
@@ -15,8 +16,9 @@ void setUp() {
         TenantContext.setCurrentTenant(null);
     }
 
+    @DisplayName("Should generate tenant and user information correctly")
     @Test
-    void generate_shouldReturnTenantAndUserInfo() {
+    void shouldGenerateTenantAndUserInfo() {
         Object notUsedObject = new Object();
         Method notUsedMethod = notUsedObject.getClass().getEnclosingMethod();
 
diff --git a/backend/src/test/java/ch/puzzle/okr/architecture/OkrArchitectureTest.java b/backend/src/test/java/ch/puzzle/okr/architecture/OkrArchitectureTest.java
index 449f9a640b..653aaf6506 100644
--- a/backend/src/test/java/ch/puzzle/okr/architecture/OkrArchitectureTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/architecture/OkrArchitectureTest.java
@@ -10,6 +10,7 @@
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.library.Architectures;
 import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvFileSource;
@@ -19,8 +20,9 @@
 
 class OkrArchitectureTest {
 
+    @DisplayName("Repositories should only be accessed by persistence services")
     @Test
-    void repositoryAccessedOnlyByPersistenceService() {
+    void repositoriesShouldOnlyBeAccessedByPersistenceServices() {
         JavaClasses importedClasses = getMainSourceClasses();
         ArchRule rule = classes()
                 .that()
@@ -34,8 +36,9 @@ void repositoryAccessedOnlyByPersistenceService() {
         rule.check(importedClasses);
     }
 
+    @DisplayName("Mappers should only be accessed by themselves, controllers, and authorization services")
     @Test
-    void mapperAccessedByControllerOrAuthorization() {
+    void mappersShouldOnlyBeAccessedByThemselvesAndControllersAndAuthorization() {
         JavaClasses importedClasses = getMainSourceClasses();
         ArchRule rule = classes()
                 .that()
@@ -47,8 +50,9 @@ void mapperAccessedByControllerOrAuthorization() {
         rule.check(importedClasses);
     }
 
+    @DisplayName("Authorization services should only be accessed by themselves and controllers")
     @Test
-    void authorizationServiceAccessedByControllerOrAuthorization() {
+    void authorizationServiceShouldOnlyBeAccessedByItselfAndControllers() {
         JavaClasses importedClasses = getMainSourceClasses();
         ArchRule rule = classes()
                 .that()
@@ -60,8 +64,9 @@ void authorizationServiceAccessedByControllerOrAuthorization() {
         rule.check(importedClasses);
     }
 
+    @DisplayName("Business services should only be accessed by specific layers and components")
     @Test
-    void businessServiceAccessedByControllerOrAuthorizationServiceOrMapper() {
+    void businessServicesShouldOnlyBeAccessedByThemselvesAndControllersAndAuthorizationAndMappers() {
         JavaClasses importedClasses = getMainSourceClasses();
         ArchRule rule = classes()
                 .that()
@@ -73,8 +78,9 @@ void businessServiceAccessedByControllerOrAuthorizationServiceOrMapper() {
         rule.check(importedClasses);
     }
 
+    @DisplayName("Controllers should not directly call repositories")
     @Test
-    void controllerCallsNoRepository() {
+    void controllersShouldCallNoRepositories() {
         JavaClasses importedClasses = getMainSourceClasses();
 
         ArchRule rule = noClasses()
@@ -89,8 +95,9 @@ void controllerCallsNoRepository() {
         rule.check(importedClasses);
     }
 
+    @DisplayName("Repositories should not call services")
     @Test
-    void repositoryCallsNoService() {
+    void repositoriesShouldCallNoServices() {
         JavaClasses importedClasses = getMainSourceClasses();
 
         ArchRule rule = noClasses()
@@ -105,8 +112,9 @@ void repositoryCallsNoService() {
         rule.check(importedClasses);
     }
 
+    @DisplayName("Service classes should be annotated with @Service")
     @Test
-    void servicesAreAnnotatedWithService() {
+    void servicesShouldBeAnnotatedWithService() {
         JavaClasses importedClasses = getMainSourceClasses();
 
         ArchRule rule = classes()
@@ -122,8 +130,9 @@ void servicesAreAnnotatedWithService() {
         rule.check(importedClasses);
     }
 
+    @DisplayName("Controller classes should be annotated with @RestController or @Controller")
     @Test
-    void controllersAreAnnotatedWithRestController() {
+    void controllersShouldBeAnnotatedWithRestController() {
         JavaClasses importedClasses = getMainSourceClasses();
 
         ArchRule rule = classes()
@@ -141,8 +150,9 @@ void controllersAreAnnotatedWithRestController() {
         rule.check(importedClasses);
     }
 
+    @DisplayName("Mapper classes should be annotated with @Component")
     @Test
-    void mappersAreAnnotatedWithComponent() {
+    void mappersShouldBeAnnotatedWithComponent() {
         JavaClasses importedClasses = getMainSourceClasses();
 
         ArchRule rule = classes()
@@ -158,11 +168,12 @@ void mappersAreAnnotatedWithComponent() {
         rule.check(importedClasses);
     }
 
+    @DisplayName("Repositories should only be accessed by themselves, persistence services, and validation services")
     @ParameterizedTest
     @CsvFileSource(resources = "/repositoriesAndPersistenceServices.csv", numLinesToSkip = 1)
-    void repositoriesShouldOnlyBeCalledFromPersistenceServicesAndValidationService(String repository,
-                                                                                   String persistenceService,
-                                                                                   String validationService) {
+    void repositoriesShouldOnlyBeAccessedByThemselvesAndPersistenceServicesAndValidationServices(String repository,
+                                                                                                 String persistenceService,
+                                                                                                 String validationService) {
         JavaClasses importedClasses = getMainSourceClasses();
 
         ArchRule rule = classes()
@@ -179,9 +190,10 @@ void repositoriesShouldOnlyBeCalledFromPersistenceServicesAndValidationService(S
         rule.check(importedClasses);
     }
 
+    @DisplayName("Classes should reside in the correct packages based on naming conventions")
     @ParameterizedTest
     @ValueSource(strings = { "controller", "service", "mapper", "repository", "dto", "exception" })
-    void classesInRightPackages(String passedName) {
+    void classesShouldBeInCorrectPackages(String passedName) {
         JavaClasses importedClasses = new ClassFileImporter().importPackages("ch.puzzle.okr");
 
         ArchRule rule = classes()
@@ -195,6 +207,7 @@ void classesInRightPackages(String passedName) {
         rule.check(importedClasses);
     }
 
+    @DisplayName("Service layer architecture should comply with defined layer rules")
     @Test
     void serviceLayerCheck() {
         JavaClasses importedClasses = getMainSourceClasses();
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/ActionControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/ActionControllerIT.java
index c58ec40e94..7038bd508a 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/ActionControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/ActionControllerIT.java
@@ -12,6 +12,7 @@
 import ch.puzzle.okr.service.authorization.ActionAuthorizationService;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.BDDMockito;
@@ -78,14 +79,15 @@ void setUp() {
                 .withId(3L)
                 .withAction("Neues Haus")
                 .withPriority(1)
-                .withIsChecked(true)
+                .isChecked(true)
                 .withKeyResult(KeyResultMetric.Builder.builder().withId(10L).withTitle("KR Title").build())
                 .build();
         BDDMockito.given(actionMapper.toActions(any())).willReturn(List.of(action, action));
     }
 
+    @DisplayName("Should successfully update multiple actions")
     @Test
-    void updateSuccessfulActions() throws Exception {
+    void shouldSuccessfullyUpdateMultipleActions() throws Exception {
         mvc
                 .perform(put(BASEURL)
                         .content(SUCCESSFUL_UPDATE_BODY)
@@ -97,8 +99,9 @@ void updateSuccessfulActions() throws Exception {
         verify(actionAuthorizationService, times(1)).updateEntities(any());
     }
 
+    @DisplayName("Should successfully update a single action")
     @Test
-    void updateSuccessfulOnlyOneAction() throws Exception {
+    void shouldSuccessfullyUpdateSingleAction() throws Exception {
         mvc
                 .perform(put(BASEURL)
                         .content(SUCCESSFUL_UPDATE_BODY_SINGLE_ACTION)
@@ -110,15 +113,17 @@ void updateSuccessfulOnlyOneAction() throws Exception {
         verify(actionAuthorizationService, times(1)).updateEntities(any());
     }
 
+    @DisplayName("Should successfully delete an action")
     @Test
-    void shouldDeleteAction() throws Exception {
+    void shouldSuccessfullyDeleteAction() throws Exception {
         mvc
                 .perform(delete("/api/v2/action/1").with(SecurityMockMvcRequestPostProcessors.csrf()))
                 .andExpect(MockMvcResultMatchers.status().isOk());
     }
 
+    @DisplayName("Should throw exception when action with given id cannot be found while deleting")
     @Test
-    void throwExceptionWhenActionWithIdCantBeFoundWhileDeleting() throws Exception {
+    void shouldThrowExceptionWhenActionWithIdCantBeFoundWhileDeleting() throws Exception {
         doThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "Action not found"))
                 .when(actionAuthorizationService)
                 .deleteActionByActionId(anyLong());
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/AlignmentControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/AlignmentControllerIT.java
index f9c40ae2c2..263d1b54c2 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/AlignmentControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/AlignmentControllerIT.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import org.hamcrest.Matchers;
 import org.hamcrest.core.Is;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.BDDMockito;
@@ -82,6 +83,7 @@ class AlignmentControllerIT {
             .withObjectiveTitle("Objective 8")
             .build();
 
+    @DisplayName("Should get all objectives with their key-results")
     @Test
     void shouldGetAllObjectivesWithKeyResults() throws Exception {
         List<AlignmentSelection> alignmentSelections = new ArrayList<>();
@@ -108,6 +110,7 @@ void shouldGetAllObjectivesWithKeyResults() throws Exception {
                 .andExpect(jsonPath("$[2].keyResults.size()", Is.is(0)));
     }
 
+    @DisplayName("Should return empty list when all objectives are filtered")
     @Test
     void shouldGetAllObjectivesWithKeyResultsIfAllObjectivesFiltered() throws Exception {
         BDDMockito
@@ -120,6 +123,7 @@ void shouldGetAllObjectivesWithKeyResultsIfAllObjectivesFiltered() throws Except
                 .andExpect(jsonPath("$", Matchers.hasSize(0)));
     }
 
+    @DisplayName("Should return objective with empty key-result List when no key-results are present in the filtered quarter")
     @Test
     void shouldReturnObjectiveWithEmptyKeyResultListWhenNoKeyResultsInFilteredQuarter() throws Exception {
         BDDMockito
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/CacheControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/CacheControllerIT.java
index 1c23c80fc9..33492719be 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/CacheControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/CacheControllerIT.java
@@ -5,6 +5,7 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 
 import ch.puzzle.okr.service.CacheService;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -25,8 +26,9 @@ class CacheControllerIT {
     @MockBean
     private CacheService cacheService;
 
+    @DisplayName("Should empty authorization cache of users")
     @Test
-    void shouldEmptyAuthorisationUsersCache() throws Exception {
+    void shouldEmptyAuthorizationUsersCache() throws Exception {
         mvc
                 .perform(post("/api/v2/caches/emptyAuthorizationUsersCache")
                         .with(SecurityMockMvcRequestPostProcessors.csrf()))
@@ -34,6 +36,7 @@ void shouldEmptyAuthorisationUsersCache() throws Exception {
         verify(cacheService, times(1)).emptyAuthorizationUsersCache();
     }
 
+    @DisplayName("Should empty all caches")
     @Test
     void shouldEmptyAllCaches() throws Exception {
         mvc
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/CheckInControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/CheckInControllerIT.java
index a662071aeb..9a6d69f837 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/CheckInControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/CheckInControllerIT.java
@@ -55,8 +55,9 @@ void setUp() {
         BDDMockito.given(checkInMapper.toDto(checkInOrdinal)).willReturn(checkInOrdinalDto);
     }
 
+    @DisplayName("Should get metric check-in by id")
     @Test
-    void shouldGetMetricCheckInWithId() throws Exception {
+    void shouldGetMetricCheckInById() throws Exception {
         BDDMockito.given(checkInAuthorizationService.getEntityById(anyLong())).willReturn(checkInMetric);
 
         mvc
@@ -71,8 +72,9 @@ void shouldGetMetricCheckInWithId() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_VALUE, Is.is(46D)));
     }
 
+    @DisplayName("Should get ordinal check-in by id")
     @Test
-    void shouldGetOrdinalCheckInWithId() throws Exception {
+    void shouldGetOrdinalCheckInById() throws Exception {
         BDDMockito.given(checkInAuthorizationService.getEntityById(anyLong())).willReturn(checkInOrdinal);
 
         mvc
@@ -87,8 +89,9 @@ void shouldGetOrdinalCheckInWithId() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_ZONE, Is.is(Zone.COMMIT.toString())));
     }
 
+    @DisplayName("Should throw not found exception when getting a check-in with a non existing id")
     @Test
-    void shouldNotFindTheCheckInWithId() throws Exception {
+    void shouldThrowNotFoundWhenGettingCheckInByNonExistingId() throws Exception {
         BDDMockito
                 .given(checkInAuthorizationService.getEntityById(anyLong()))
                 .willThrow(new ResponseStatusException(HttpStatus.NOT_FOUND));
@@ -98,8 +101,9 @@ void shouldNotFindTheCheckInWithId() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isNotFound());
     }
 
+    @DisplayName("Should return updated check-in after successfully updating it")
     @Test
-    void shouldReturnUpdatedCheckIn() throws Exception {
+    void shouldReturnUpdatedCheckInAfterSuccessfulUpdate() throws Exception {
         BDDMockito
                 .given(keyResultBusinessService.getEntityById(anyLong()))
                 .willReturn(KeyResultMetric.Builder.builder().withId(1L).build());
@@ -119,8 +123,9 @@ void shouldReturnUpdatedCheckIn() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_KEY_RESULT_ID, Is.is(1)));
     }
 
+    @DisplayName("Should throw not found exception when trying to update a non existent check-in")
     @Test
-    void shouldReturnNotFound() throws Exception {
+    void shouldThrowNotFoundWhenTryingToUpdateNonExistentCheckIn() throws Exception {
         BDDMockito
                 .given(keyResultBusinessService.getEntityById(anyLong()))
                 .willReturn(KeyResultMetric.Builder.builder().withId(1L).build());
@@ -137,8 +142,9 @@ void shouldReturnNotFound() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isNotFound());
     }
 
+    @DisplayName("Should successfully create a new metric key-result")
     @Test
-    void shouldCreateKeyResultMetric() throws Exception {
+    void shouldSuccessfullyCreateKeyResultMetric() throws Exception {
         BDDMockito
                 .given(keyResultBusinessService.getEntityById(anyLong()))
                 .willReturn(KeyResultMetric.Builder.builder().withId(1L).build());
@@ -158,8 +164,9 @@ void shouldCreateKeyResultMetric() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_VALUE, Is.is(46D)));
     }
 
+    @DisplayName("Should successfully create a new metric key-result")
     @Test
-    void shouldCreateKeyResultOrdinal() throws Exception {
+    void shouldSuccessfullyCreateKeyResultOrdinal() throws Exception {
         BDDMockito
                 .given(keyResultBusinessService.getEntityById(anyLong()))
                 .willReturn(KeyResultOrdinal.Builder.builder().withId(1L).build());
@@ -179,8 +186,9 @@ void shouldCreateKeyResultOrdinal() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_ZONE, Is.is(Zone.COMMIT.toString())));
     }
 
+    @DisplayName("Should throw client error when creating a check-in but the key-result id is missing")
     @Test
-    void shouldThrowExceptionWhenKeyResultIdMissing() throws Exception {
+    void shouldThrowClientErrorWhenCreatingCheckInButKeyResultIdMissing() throws Exception {
         BDDMockito
                 .given(keyResultBusinessService.getEntityById(anyLong()))
                 .willReturn(KeyResultMetric.Builder.builder().withId(1L).build());
@@ -194,9 +202,9 @@ void shouldThrowExceptionWhenKeyResultIdMissing() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().is4xxClientError());
     }
 
-    @DisplayName("Should return client error for KeyResult not of type metric or ordinal")
+    @DisplayName("Should throw client error for KeyResult not of type metric or ordinal")
     @Test
-    void shouldReturnClientErrorForKeyResultNotOfTypeMetricOrOrdinal() throws Exception {
+    void shouldThrowClientErrorForKeyResultNotOfTypeMetricOrOrdinal() throws Exception {
         class NonMetricOrOrdinalKeyResult extends KeyResult {
         }
 
@@ -212,8 +220,9 @@ class NonMetricOrOrdinalKeyResult extends KeyResult {
                 .andExpect(MockMvcResultMatchers.status().is4xxClientError());
     }
 
+    @DisplayName("Should successfully delete check-in by id")
     @Test
-    void shouldDeleteCheckInById() throws Exception {
+    void shouldSuccessfullyDeleteCheckInById() throws Exception {
         mvc
                 .perform(delete(CHECK_IN_5_URL).with(SecurityMockMvcRequestPostProcessors.csrf()))
                 .andExpect(MockMvcResultMatchers.status().isOk());
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/ClientConfigControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/ClientConfigControllerIT.java
index e538605b3b..1e664916b0 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/ClientConfigControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/ClientConfigControllerIT.java
@@ -9,6 +9,7 @@
 import ch.puzzle.okr.service.clientconfig.ClientConfigService;
 import java.util.Map;
 import org.hamcrest.Matchers;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.BDDMockito;
@@ -31,6 +32,7 @@ public class ClientConfigControllerIT {
     @MockBean
     private ClientConfigService configService;
 
+    @DisplayName("Should get client config with correct values")
     @Test
     void shouldGetClientConfig() throws Exception {
         BDDMockito.given(configService.getConfigBasedOnActiveEnv(anyString())).willReturn(createClientConfigDto());
@@ -47,7 +49,7 @@ void shouldGetClientConfig() throws Exception {
                 .andExpect(jsonPath("$.triangles", Matchers.is("Triangles")))
                 .andExpect(jsonPath("$.backgroundLogo", Matchers.is("Background_Logo")))
                 .andExpect(jsonPath("$.title", Matchers.is("Title")))
-                .andExpect(jsonPath("$.helpSiteUrl", Matchers.is("helpSiteUrl")))
+                .andExpect(jsonPath("$.helpSiteUrl", Matchers.is("Help_Site_Url")))
                 .andExpect(jsonPath("$.customStyles.font-family", Matchers.is("verdana")))
                 .andExpect(jsonPath("$.customStyles.font-size", Matchers.is("20px")));
     }
@@ -62,7 +64,7 @@ private ClientConfigDto createClientConfigDto() {
                                    "Triangles",
                                    "Background_Logo",
                                    "Title",
-                                   "helpSiteUrl",
+                                   "Help_Site_Url",
                                    customStyles);
     }
 
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/CompletedControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/CompletedControllerIT.java
index 9732dcb64e..f39b6a6a5a 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/CompletedControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/CompletedControllerIT.java
@@ -86,7 +86,7 @@ void setUp() {
         BDDMockito.given(completedMapper.toCompleted(any())).willReturn(successfulCompleted);
     }
 
-    @DisplayName("create() should create complete")
+    @DisplayName("Should create a completed-objective")
     @Test
     void createShouldCreateCompleted() throws Exception {
         BDDMockito.given(this.completedAuthorizationService.createCompleted(any())).willReturn(successfulCompleted);
@@ -103,7 +103,7 @@ void createShouldCreateCompleted() throws Exception {
                 .andExpect(jsonPath("$.comment", Is.is(COMPLETED_COMMENT)));
     }
 
-    @DisplayName("delete() should delete Completed")
+    @DisplayName("Should delete a completed-objective")
     @Test
     void deleteShouldDeleteCompleted() throws Exception {
         mvc
@@ -111,7 +111,7 @@ void deleteShouldDeleteCompleted() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isOk());
     }
 
-    @DisplayName("delete() should throw exception when Completed with id cant be found")
+    @DisplayName("Should throw not found exception when a completed-objective with non existent id can not be found")
     @Test
     void deleteShouldThrowExceptionWhenCompletedWithIdCantBeFound() throws Exception {
         doThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "Completed not found"))
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/KeyResultControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/KeyResultControllerIT.java
index b6d333745e..36740fc55f 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/KeyResultControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/KeyResultControllerIT.java
@@ -28,6 +28,7 @@
 import org.hamcrest.Matchers;
 import org.hamcrest.core.Is;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.BDDMockito;
@@ -76,8 +77,9 @@ void setUp() {
         BDDMockito.given(checkInMapper.toDto(checkIn2)).willReturn(checkInDto2);
     }
 
+    @DisplayName("Should get metric key-result by id")
     @Test
-    void shouldGetMetricKeyResultWithId() throws Exception {
+    void shouldGetMetricKeyResultById() throws Exception {
         BDDMockito.given(keyResultAuthorizationService.getEntityById(anyLong())).willReturn(metricKeyResult);
         BDDMockito.given(keyResultMapper.toDto(any(), anyList())).willReturn(keyResultMetricDto);
 
@@ -91,15 +93,16 @@ void shouldGetMetricKeyResultWithId() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_BASELINE, Is.is(BASELINE_VALUE)))
                 .andExpect(jsonPath(JSON_PATH_STRETCH_GOAL, Is.is(STRETCH_GOAL_VALUE)))
                 .andExpect(jsonPath(JSON_PATH_UNIT, Is.is(KEY_RESULT_UNIT.toString())))
-                .andExpect(jsonPath(JSON_PATH_OWNER_FIRSTNAME, Is.is(FIRSTNAME)))
+                .andExpect(jsonPath(JSON_PATH_OWNER_FIRST_NAME, Is.is(FIRST_NAME)))
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_STATE, Is.is(OBJECTIVE_STATE_ONGOING)))
                 .andExpect(jsonPath(JSON_PATH_ID_LAST_CHECK_IN_VALUE, Is.is(4.0)))
                 .andExpect(jsonPath(JSON_PATH_LAST_CHECK_IN_CONFIDENCE, Is.is(CONFIDENCE)))
                 .andExpect(jsonPath(JSON_PATH_CREATED_ON, Is.is(KEY_RESULT_CREATED_ON)));
     }
 
+    @DisplayName("Should get ordinal key-result by id")
     @Test
-    void shouldGetOrdinalKeyResultWithId() throws Exception {
+    void shouldGetOrdinalKeyResultById() throws Exception {
         BDDMockito.given(keyResultAuthorizationService.getEntityById(anyLong())).willReturn(ordinalKeyResult);
         BDDMockito.given(keyResultMapper.toDto(any(), anyList())).willReturn(keyResultOrdinalDto);
 
@@ -109,7 +112,7 @@ void shouldGetOrdinalKeyResultWithId() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_ID, Is.is(5)))
                 .andExpect(jsonPath(JSON_PATH_DESCRIPTION, Is.is(DESCRIPTION)))
                 .andExpect(jsonPath(JSON_PATH_KEY_RESULT_TYPE, Is.is(KEY_RESULT_TYPE_ORDINAL)))
-                .andExpect(jsonPath(JSON_PATH_OWNER_FIRSTNAME, Is.is(FIRSTNAME)))
+                .andExpect(jsonPath(JSON_PATH_OWNER_FIRST_NAME, Is.is(FIRST_NAME)))
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_ID, Is.is(OBJECTIVE_ID)))
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_STATE, Is.is(OBJECTIVE_STATE_ONGOING)))
                 .andExpect(jsonPath(JSON_PATH_QUARTER_LABEL, Is.is(QUARTER_LABEL)))
@@ -121,8 +124,9 @@ void shouldGetOrdinalKeyResultWithId() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_STRETCH_ZONE, Is.is(STRETCH_ZONE)));
     }
 
+    @DisplayName("Should not find key-result if key-result with given id does not exist")
     @Test
-    void shouldNotFindTheKeyResultWithGivenId() throws Exception {
+    void shouldNotFindKeyResultIfKeyResultWithGivenIdDoesntExist() throws Exception {
         BDDMockito
                 .given(keyResultAuthorizationService.getEntityById(anyLong()))
                 .willThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "KeyResult with id 55 not found"));
@@ -133,6 +137,7 @@ void shouldNotFindTheKeyResultWithGivenId() throws Exception {
                 .andExpect(status().isNotFound());
     }
 
+    @DisplayName("Should return check-ins of key-result")
     @Test
     void shouldReturnCheckInsFromKeyResult() throws Exception {
         List<CheckIn> checkInList = Arrays.asList(checkIn1, checkIn2);
@@ -156,8 +161,9 @@ void shouldReturnCheckInsFromKeyResult() throws Exception {
                 .andExpect(jsonPath("$[1].initiatives", Is.is("Initiatives2")));
     }
 
+    @DisplayName("Should get empty list of check-ins if no check-ins exist on the given key-result")
     @Test
-    void shouldGetAllCheckInsIfNoCheckInExistsInKeyResult() throws Exception {
+    void shouldGetEmptyListOfCheckInsIfNoCheckInExistsInKeyResult() throws Exception {
         BDDMockito
                 .given(keyResultAuthorizationService.getAllCheckInsByKeyResult(anyLong()))
                 .willReturn(Collections.emptyList());
@@ -168,6 +174,7 @@ void shouldGetAllCheckInsIfNoCheckInExistsInKeyResult() throws Exception {
                 .andExpect(jsonPath("$", Matchers.hasSize(0)));
     }
 
+    @DisplayName("Should return error when key-result does not exist while retrieving check-ins")
     @Test
     void shouldReturnErrorWhenKeyResultDoesntExistWhenGettingCheckInsFromKeyResult() throws Exception {
         BDDMockito
@@ -180,8 +187,9 @@ void shouldReturnErrorWhenKeyResultDoesntExistWhenGettingCheckInsFromKeyResult()
                 .andExpect(status().isNotFound());
     }
 
+    @DisplayName("Should create a metric key-result")
     @Test
-    void createMetricKeyResult() throws Exception {
+    void shouldBeAbleToCreateMetricKeyResult() throws Exception {
         BDDMockito.given(keyResultAuthorizationService.createEntity(any())).willReturn(metricKeyResult);
         BDDMockito.given(keyResultMapper.toDto(any(), anyList())).willReturn(keyResultMetricDto);
         BDDMockito.given(keyResultMapper.toKeyResult(any())).willReturn(metricKeyResult);
@@ -198,7 +206,7 @@ void createMetricKeyResult() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_KEY_RESULT_TYPE, Is.is(KEY_RESULT_TYPE_METRIC)))
                 .andExpect(jsonPath(JSON_PATH_BASELINE, Is.is(BASELINE_VALUE)))
                 .andExpect(jsonPath(JSON_PATH_STRETCH_GOAL, Is.is(STRETCH_GOAL_VALUE)))
-                .andExpect(jsonPath(JSON_PATH_OWNER_FIRSTNAME, Is.is(FIRSTNAME)))
+                .andExpect(jsonPath(JSON_PATH_OWNER_FIRST_NAME, Is.is(FIRST_NAME)))
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_ID, Is.is(OBJECTIVE_ID)))
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_STATE, Is.is(OBJECTIVE_STATE_ONGOING)))
                 .andExpect(jsonPath(JSON_PATH_QUARTER_START_DATE, Is.is(START_DATE)))
@@ -209,8 +217,9 @@ void createMetricKeyResult() throws Exception {
         verify(actionAuthorizationService, times(1)).createEntities(List.of());
     }
 
+    @DisplayName("Should create an ordinal key-result")
     @Test
-    void createOrdinalKeyResult() throws Exception {
+    void shouldBeAbleToCreateOrdinalKeyResult() throws Exception {
         BDDMockito.given(keyResultAuthorizationService.createEntity(any())).willReturn(ordinalKeyResult);
         BDDMockito.given(keyResultMapper.toDto(any(), anyList())).willReturn(keyResultOrdinalDto);
         BDDMockito.given(keyResultMapper.toKeyResult(any())).willReturn(ordinalKeyResult);
@@ -227,7 +236,7 @@ void createOrdinalKeyResult() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_KEY_RESULT_TYPE, Is.is(KEY_RESULT_TYPE_ORDINAL)))
                 .andExpect(jsonPath(JSON_PATH_TARGET_ZONE, Is.is(TARGET_ZONE)))
                 .andExpect(jsonPath(JSON_PATH_STRETCH_ZONE, Is.is(STRETCH_ZONE)))
-                .andExpect(jsonPath(JSON_PATH_OWNER_FIRSTNAME, Is.is(FIRSTNAME)))
+                .andExpect(jsonPath(JSON_PATH_OWNER_FIRST_NAME, Is.is(FIRST_NAME)))
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_ID, Is.is(OBJECTIVE_ID)))
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_STATE, Is.is(OBJECTIVE_STATE_ONGOING)))
                 .andExpect(jsonPath(JSON_PATH_QUARTER_START_DATE, Is.is(START_DATE)))
@@ -237,6 +246,7 @@ void createOrdinalKeyResult() throws Exception {
         verify(actionAuthorizationService, times(1)).createEntities(List.of());
     }
 
+    @DisplayName("Should create actions when creating a key-result")
     @Test
     void shouldCreateActionsWhenCreatingKeyResult() throws Exception {
         Action action1 = Action.Builder
@@ -245,7 +255,7 @@ void shouldCreateActionsWhenCreatingKeyResult() throws Exception {
                 .withAction("Neue Katze")
                 .withPriority(0)
                 .withKeyResult(ordinalKeyResult)
-                .withIsChecked(false)
+                .isChecked(false)
                 .build();
         Action action2 = Action.Builder
                 .builder()
@@ -253,7 +263,7 @@ void shouldCreateActionsWhenCreatingKeyResult() throws Exception {
                 .withAction("Neuer Hund")
                 .withPriority(1)
                 .withKeyResult(ordinalKeyResult)
-                .withIsChecked(false)
+                .isChecked(false)
                 .build();
         action1.setWriteable(false);
         action2.setWriteable(false);
@@ -276,7 +286,7 @@ void shouldCreateActionsWhenCreatingKeyResult() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_KEY_RESULT_TYPE, Is.is(KEY_RESULT_TYPE_ORDINAL)))
                 .andExpect(jsonPath(JSON_PATH_TARGET_ZONE, Is.is(TARGET_ZONE)))
                 .andExpect(jsonPath(JSON_PATH_STRETCH_ZONE, Is.is(STRETCH_ZONE)))
-                .andExpect(jsonPath(JSON_PATH_OWNER_FIRSTNAME, Is.is(FIRSTNAME)))
+                .andExpect(jsonPath(JSON_PATH_OWNER_FIRST_NAME, Is.is(FIRST_NAME)))
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_ID, Is.is(OBJECTIVE_ID)))
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_STATE, Is.is(OBJECTIVE_STATE_ONGOING)))
                 .andExpect(jsonPath(JSON_PATH_QUARTER_START_DATE, Is.is(START_DATE)))
@@ -286,6 +296,7 @@ void shouldCreateActionsWhenCreatingKeyResult() throws Exception {
         verify(actionAuthorizationService, times(1)).createEntities(actionList);
     }
 
+    @DisplayName("Should throw exception when key-result type is missing")
     @Test
     void shouldThrowExceptionWhenKeyResultTypeMissing() throws Exception {
         mvc
@@ -296,6 +307,7 @@ void shouldThrowExceptionWhenKeyResultTypeMissing() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().is4xxClientError());
     }
 
+    @DisplayName("Should throw exception when key-result type is unknown")
     @Test
     void shouldThrowExceptionWhenKeyResultTypeUnknown() throws Exception {
         mvc
@@ -306,8 +318,9 @@ void shouldThrowExceptionWhenKeyResultTypeUnknown() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().is4xxClientError());
     }
 
+    @DisplayName("Should create an entity with enum keys")
     @Test
-    void createEntityWithEnumKeys() throws Exception {
+    void shouldCreateEntityWithEnumKeys() throws Exception {
         BDDMockito.given(keyResultAuthorizationService.createEntity(any())).willReturn(ordinalKeyResult);
         BDDMockito.given(keyResultMapper.toDto(any(), anyList())).willReturn(keyResultOrdinalDto);
         BDDMockito.given(keyResultMapper.toKeyResult(any())).willReturn(ordinalKeyResult);
@@ -322,7 +335,7 @@ void createEntityWithEnumKeys() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_ID, Is.is(OBJECTIVE_ID)))
                 .andExpect(jsonPath(JSON_PATH_DESCRIPTION, Is.is(DESCRIPTION)))
                 .andExpect(jsonPath(JSON_PATH_KEY_RESULT_TYPE, Is.is(KEY_RESULT_TYPE_ORDINAL)))
-                .andExpect(jsonPath(JSON_PATH_OWNER_FIRSTNAME, Is.is(FIRSTNAME)))
+                .andExpect(jsonPath(JSON_PATH_OWNER_FIRST_NAME, Is.is(FIRST_NAME)))
                 .andExpect(jsonPath(JSON_PATH_OBJECTIVE_STATE, Is.is(OBJECTIVE_STATE_ONGOING)))
                 .andExpect(jsonPath(JSON_PATH_LAST_CHECK_IN_ZONE, Is.is(LAST_CHECK_IN_ZONE.toString())))
                 .andExpect(jsonPath(JSON_PATH_LAST_CHECK_IN_CONFIDENCE, Is.is(CONFIDENCE)))
@@ -331,8 +344,9 @@ void createEntityWithEnumKeys() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_TARGET_ZONE, Is.is(TARGET_ZONE)));
     }
 
+    @DisplayName("Should throw error when creating entity with an invalid DTO")
     @Test
-    void createEntityShouldThrowErrorWhenInvalidDto() throws Exception {
+    void shouldThrowErrorWhenCreatingEntityWithInvalidDto() throws Exception {
         BDDMockito
                 .given(keyResultMapper.toKeyResult(any()))
                 .willThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "Error"));
@@ -348,8 +362,9 @@ void createEntityShouldThrowErrorWhenInvalidDto() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isNotFound());
     }
 
+    @DisplayName("Should return updated key-result when updating key-result")
     @Test
-    void shouldReturnUpdatedKeyResult() throws Exception {
+    void shouldReturnUpdatedKeyResultWhenUpdatingKeyResult() throws Exception {
         BDDMockito
                 .given(keyResultAuthorizationService.updateEntities(anyLong(), any(), anyList()))
                 .willReturn(new KeyResultWithActionList(metricKeyResult, List.of()));
@@ -371,7 +386,7 @@ void shouldReturnUpdatedKeyResult() throws Exception {
                         .content(JSON))
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andExpect(jsonPath(JSON_PATH_TITLE, Is.is(TITLE)))
-                .andExpect(jsonPath(JSON_PATH_OWNER_FIRSTNAME, Is.is(FIRSTNAME)))
+                .andExpect(jsonPath(JSON_PATH_OWNER_FIRST_NAME, Is.is(FIRST_NAME)))
                 .andExpect(jsonPath(JSON_PATH_KEY_RESULT_TYPE, Is.is(KEY_RESULT_TYPE_METRIC)))
                 .andExpect(jsonPath(JSON_PATH_BASELINE, Is.is(BASELINE_VALUE)))
                 .andExpect(jsonPath(JSON_PATH_STRETCH_GOAL, Is.is(STRETCH_GOAL_VALUE)))
@@ -385,6 +400,7 @@ void shouldReturnUpdatedKeyResult() throws Exception {
         verify(keyResultAuthorizationService, times(1)).updateEntities(anyLong(), any(), anyList());
     }
 
+    @DisplayName("Should return updated key-result with 'Im Used' status")
     @Test
     void shouldReturnUpdatedKeyResultWithImUsed() throws Exception {
         BDDMockito
@@ -401,7 +417,7 @@ void shouldReturnUpdatedKeyResultWithImUsed() throws Exception {
                         .content(JSON))
                 .andExpect(MockMvcResultMatchers.status().isImUsed())
                 .andExpect(jsonPath(JSON_PATH_TITLE, Is.is(TITLE)))
-                .andExpect(jsonPath(JSON_PATH_OWNER_FIRSTNAME, Is.is(FIRSTNAME)))
+                .andExpect(jsonPath(JSON_PATH_OWNER_FIRST_NAME, Is.is(FIRST_NAME)))
                 .andExpect(jsonPath(JSON_PATH_KEY_RESULT_TYPE, Is.is(KEY_RESULT_TYPE_METRIC)))
                 .andExpect(jsonPath(JSON_PATH_BASELINE, Is.is(BASELINE_VALUE)))
                 .andExpect(jsonPath(JSON_PATH_STRETCH_GOAL, Is.is(STRETCH_GOAL_VALUE)))
@@ -415,8 +431,9 @@ void shouldReturnUpdatedKeyResultWithImUsed() throws Exception {
         verify(keyResultAuthorizationService, times(1)).updateEntities(anyLong(), any(), anyList());
     }
 
+    @DisplayName("Should return not found when trying to update key-result by non-existent id")
     @Test
-    void shouldReturnNotFoundWhenUpdatingKeyResult() throws Exception {
+    void shouldReturnNotFoundWhenTryingToUpdateKeyResultByNonExistentId() throws Exception {
         doThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "Keyresult not found"))
                 .when(keyResultAuthorizationService)
                 .updateEntities(any(), any(), anyList());
@@ -429,6 +446,7 @@ void shouldReturnNotFoundWhenUpdatingKeyResult() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isNotFound());
     }
 
+    @DisplayName("Should return bad request when updating key-result")
     @Test
     void shouldReturnBadRequestWhenUpdatingKeyResult() throws Exception {
         BDDMockito
@@ -440,13 +458,15 @@ void shouldReturnBadRequestWhenUpdatingKeyResult() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isBadRequest());
     }
 
+    @DisplayName("Should successfully delete a key-result")
     @Test
-    void shouldDeleteKeyResult() throws Exception {
+    void shouldSuccessfullyDeleteKeyResult() throws Exception {
         mvc
                 .perform(delete(URL_TO_KEY_RESULT_10).with(SecurityMockMvcRequestPostProcessors.csrf()))
                 .andExpect(MockMvcResultMatchers.status().isOk());
     }
 
+    @DisplayName("Should throw exception when key-result with given id cannot be found while deleting")
     @Test
     void throwExceptionWhenKeyResultWithIdCantBeFoundWhileDeleting() throws Exception {
         doThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "Keyresult not found"))
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/ObjectiveControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/ObjectiveControllerIT.java
index eeb5df3003..d39783dd63 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/ObjectiveControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/ObjectiveControllerIT.java
@@ -20,6 +20,7 @@
 import java.time.LocalDateTime;
 import org.hamcrest.core.Is;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.BDDMockito;
@@ -43,7 +44,7 @@ class ObjectiveControllerIT {
     private static final String OBJECTIVE_TITLE_1 = "Objective 1";
     private static final String OBJECTIVE_TITLE_2 = "Objective 2";
     private static final String DESCRIPTION = "This is our description";
-    private static final String EVERYTHING_FINE_DESCRIPTION = "Everything Fine";
+    private static final String UPDATED_DESCRIPTION = "This is a updated description";
     private static final String TITLE = "Hunting";
     private static final String URL_BASE_OBJECTIVE = "/api/v2/objectives";
     private static final String URL_OBJECTIVE_5 = "/api/v2/objectives/5";
@@ -77,7 +78,7 @@ class ObjectiveControllerIT {
             }
             """;
     private static final String RESPONSE_NEW_OBJECTIVE = """
-            {"id":null,"version":1,"title":"Program Faster","teamId":1,"quarterId":1,"quarterLabel":"GJ 22/23-Q2","description":"Just be faster","state":"DRAFT","createdOn":null,"modifiedOn":null,"writeable":true}""";
+            {"id":null,"version":1,"title":"Program Faster","teamId":1,"quarterId":1,"quarterLabel":"GJ 22/23-Q2","description":"Just be faster","state":"DRAFT","createdOn":null,"modifiedOn":null,"isWriteable":true}""";
     private static final String JSON_PATH_TITLE = "$.title";
     private static final Objective objective1 = Objective.Builder
             .builder()
@@ -92,8 +93,8 @@ class ObjectiveControllerIT {
     private static final User user = User.Builder
             .builder()
             .withId(1L)
-            .withFirstname("Bob")
-            .withLastname("Kaufmann")
+            .withFirstName("Bob")
+            .withLastName("Kaufmann")
             .withEmail("kaufmann@puzzle.ch")
             .build();
     private static final Team team = Team.Builder.builder().withId(1L).withName("Team1").build();
@@ -152,8 +153,9 @@ void setUp() {
         BDDMockito.given(objectiveMapper.toDto(objective2)).willReturn(objective2Dto);
     }
 
+    @DisplayName("Should get an objective by id")
     @Test
-    void getObjectiveById() throws Exception {
+    void shouldGetObjectiveById() throws Exception {
         BDDMockito.given(objectiveAuthorizationService.getEntityById(anyLong())).willReturn(objective1);
 
         mvc
@@ -163,8 +165,9 @@ void getObjectiveById() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_TITLE, Is.is(OBJECTIVE_TITLE_1)));
     }
 
+    @DisplayName("Should throw not found exception when getting a objective with a non existent id")
     @Test
-    void getObjectiveByIdFail() throws Exception {
+    void shouldThrowNotFoundWhenGettingObjectiveWithNonExistentId() throws Exception {
         BDDMockito
                 .given(objectiveAuthorizationService.getEntityById(anyLong()))
                 .willThrow(new ResponseStatusException(HttpStatus.NOT_FOUND));
@@ -174,8 +177,9 @@ void getObjectiveByIdFail() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isNotFound());
     }
 
+    @DisplayName("Should return the created objective when creating a new objective")
     @Test
-    void shouldReturnObjectiveWhenCreatingNewObjective() throws Exception {
+    void shouldReturnCreatedObjectiveWhenCreatingNewObjective() throws Exception {
         ObjectiveDto testObjective = new ObjectiveDto(null,
                                                       1,
                                                       "Program Faster",
@@ -201,8 +205,9 @@ void shouldReturnObjectiveWhenCreatingNewObjective() throws Exception {
         verify(objectiveAuthorizationService, times(1)).createEntity(any());
     }
 
+    @DisplayName("Should throw bad request exception when creating a objective with null values")
     @Test
-    void shouldReturnResponseStatusExceptionWhenCreatingObjectiveWithNullValues() throws Exception {
+    void shouldThrowResponseStatusExceptionWhenCreatingObjectiveWithNullValues() throws Exception {
         BDDMockito
                 .given(objectiveAuthorizationService.createEntity(any()))
                 .willThrow(new ResponseStatusException(HttpStatus.BAD_REQUEST,
@@ -216,15 +221,16 @@ void shouldReturnResponseStatusExceptionWhenCreatingObjectiveWithNullValues() th
                 .andExpect(MockMvcResultMatchers.status().isBadRequest());
     }
 
+    @DisplayName("Should return the updated objective when updating a objective")
     @Test
-    void shouldReturnUpdatedObjective() throws Exception {
+    void shouldReturnUpdatedObjectiveWhenUpdatingObjective() throws Exception {
         ObjectiveDto testObjective = new ObjectiveDto(1L,
                                                       1,
                                                       TITLE,
                                                       1L,
                                                       1L,
                                                       "GJ 22/23-Q2",
-                                                      EVERYTHING_FINE_DESCRIPTION,
+                                                      UPDATED_DESCRIPTION,
                                                       State.NOTSUCCESSFUL,
                                                       LocalDateTime.MIN,
                                                       LocalDateTime.MAX,
@@ -232,7 +238,7 @@ void shouldReturnUpdatedObjective() throws Exception {
         Objective objective = Objective.Builder
                 .builder()
                 .withId(1L)
-                .withDescription(EVERYTHING_FINE_DESCRIPTION)
+                .withDescription(UPDATED_DESCRIPTION)
                 .withTitle(TITLE)
                 .build();
 
@@ -247,10 +253,11 @@ void shouldReturnUpdatedObjective() throws Exception {
                         .with(SecurityMockMvcRequestPostProcessors.csrf()))
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andExpect(jsonPath("$.id", Is.is(1)))
-                .andExpect(jsonPath("$.description", Is.is(EVERYTHING_FINE_DESCRIPTION)))
+                .andExpect(jsonPath("$.description", Is.is(UPDATED_DESCRIPTION)))
                 .andExpect(jsonPath(JSON_PATH_TITLE, Is.is(TITLE)));
     }
 
+    @DisplayName("Should return im used exception")
     @Test
     void shouldReturnImUsed() throws Exception {
         ObjectiveDto testObjectiveDto = new ObjectiveDto(1L,
@@ -259,7 +266,7 @@ void shouldReturnImUsed() throws Exception {
                                                          1L,
                                                          1L,
                                                          "GJ 22/23-Q2",
-                                                         EVERYTHING_FINE_DESCRIPTION,
+                                                         UPDATED_DESCRIPTION,
                                                          State.SUCCESSFUL,
                                                          LocalDateTime.MAX,
                                                          LocalDateTime.MAX,
@@ -267,7 +274,7 @@ void shouldReturnImUsed() throws Exception {
         Objective objectiveImUsed = Objective.Builder
                 .builder()
                 .withId(1L)
-                .withDescription(EVERYTHING_FINE_DESCRIPTION)
+                .withDescription(UPDATED_DESCRIPTION)
                 .withQuarter(Quarter.Builder.builder().withId(1L).withLabel("GJ 22/23-Q2").build())
                 .withTitle(TITLE)
                 .build();
@@ -285,8 +292,9 @@ void shouldReturnImUsed() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isImUsed());
     }
 
+    @DisplayName("Should return not found when updating a objective with a non existent id")
     @Test
-    void shouldReturnNotFound() throws Exception {
+    void shouldReturnNotFoundWhenUpdatingObjectiveByNonExistentId() throws Exception {
         BDDMockito
                 .given(objectiveAuthorizationService.updateEntity(anyLong(), any()))
                 .willThrow(new ResponseStatusException(HttpStatus.NOT_FOUND,
@@ -300,6 +308,7 @@ void shouldReturnNotFound() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isNotFound());
     }
 
+    @DisplayName("Should return bad request exception")
     @Test
     void shouldReturnBadRequest() throws Exception {
         BDDMockito
@@ -312,15 +321,17 @@ void shouldReturnBadRequest() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isBadRequest());
     }
 
+    @DisplayName("Should successfully delete an objective")
     @Test
-    void shouldDeleteObjective() throws Exception {
+    void shouldSuccessfullyDeleteObjective() throws Exception {
         mvc
                 .perform(delete(URL_OBJECTIVE_10).with(SecurityMockMvcRequestPostProcessors.csrf()))
                 .andExpect(MockMvcResultMatchers.status().isOk());
     }
 
+    @DisplayName("Should throw not found exception when an objective with a given id can not be found while deleting")
     @Test
-    void throwExceptionWhenObjectiveWithIdCantBeFoundWhileDeleting() throws Exception {
+    void shouldThrowExceptionWhenObjectiveWithIdCantBeFoundWhileDeleting() throws Exception {
         doThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "Objective not found"))
                 .when(objectiveAuthorizationService)
                 .deleteEntityById(anyLong());
@@ -330,6 +341,7 @@ void throwExceptionWhenObjectiveWithIdCantBeFoundWhileDeleting() throws Exceptio
                 .andExpect(MockMvcResultMatchers.status().isNotFound());
     }
 
+    @DisplayName("Should return is created when an ojective was duplicated")
     @Test
     void shouldReturnIsCreatedWhenObjectiveWasDuplicated() throws Exception {
         BDDMockito
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/OverviewControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/OverviewControllerIT.java
index 5e6dc0b997..62d97fe38e 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/OverviewControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/OverviewControllerIT.java
@@ -17,6 +17,7 @@
 import java.util.List;
 import org.hamcrest.Matchers;
 import org.hamcrest.core.Is;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.BDDMockito;
@@ -148,6 +149,7 @@ class OverviewControllerIT {
             .withTeamName(TEAM_KUCHEN)
             .build();
 
+    @DisplayName("Should get all teams with their objectives")
     @Test
     void shouldGetAllTeamsWithObjective() throws Exception {
         List<Overview> overviews = new ArrayList<>();
@@ -176,6 +178,7 @@ void shouldGetAllTeamsWithObjective() throws Exception {
                 .andExpect(jsonPath("$[2].objectives[0].id", Is.is(8)));
     }
 
+    @DisplayName("Should return empty list if no teams exist")
     @Test
     void shouldGetAllTeamsWithObjectiveIfNoTeamsExists() throws Exception {
         BDDMockito
@@ -189,6 +192,7 @@ void shouldGetAllTeamsWithObjectiveIfNoTeamsExists() throws Exception {
                 .andExpect(jsonPath(JSON_PATH_ROOT, Matchers.hasSize(0)));
     }
 
+    @DisplayName("Should return only objectives filtered by quarter and team")
     @Test
     void shouldReturnOnlyFilteredObjectivesByQuarterAndTeam() throws Exception {
         List<Overview> overviews = new ArrayList<>(overviewPuzzle);
@@ -210,6 +214,7 @@ void shouldReturnOnlyFilteredObjectivesByQuarterAndTeam() throws Exception {
                 .andExpect(jsonPath("$[1].objectives[0].id", Is.is(8)));
     }
 
+    @DisplayName("Should return team with empty objective list when no objectives exist in the filtered quarter")
     @Test
     void shouldReturnTeamWithEmptyObjectiveListWhenNoObjectiveInFilteredQuarter() throws Exception {
         BDDMockito
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/QuarterControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/QuarterControllerIT.java
index 28f7e95314..8187fea0f7 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/QuarterControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/QuarterControllerIT.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import org.hamcrest.Matchers;
 import org.hamcrest.core.Is;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.BDDMockito;
@@ -59,6 +60,7 @@ class QuarterControllerIT {
     @MockBean
     private QuarterBusinessService quarterBusinessService;
 
+    @DisplayName("Should get all quarters")
     @Test
     void shouldGetAllQuarters() throws Exception {
         BDDMockito.given(quarterBusinessService.getQuarters()).willReturn(quaterList);
@@ -79,8 +81,9 @@ void shouldGetAllQuarters() throws Exception {
                 .andExpect(jsonPath("$[2].label", Is.is(BACK_LOG_QUARTER_LABEL)));
     }
 
+    @DisplayName("Should return an empty list if no quarters exist")
     @Test
-    void shouldGetAllTeamsIfNoTeamsExists() throws Exception {
+    void shouldReturnEmptyListIfNoQuarterExists() throws Exception {
         BDDMockito.given(quarterBusinessService.getQuarters()).willReturn(Collections.emptyList());
 
         mvc
@@ -89,6 +92,7 @@ void shouldGetAllTeamsIfNoTeamsExists() throws Exception {
                 .andExpect(jsonPath("$", Matchers.hasSize(0)));
     }
 
+    @DisplayName("Should call current-quarter after requesting so")
     @Test
     void shouldCallCurrentQuarterAfterRequest() throws Exception {
         mvc.perform(get("/api/v2/quarters/current").contentType(MediaType.APPLICATION_JSON));
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/TeamControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/TeamControllerIT.java
index 3aebd55fad..36e4dc3420 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/TeamControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/TeamControllerIT.java
@@ -16,6 +16,7 @@
 import org.hamcrest.Matchers;
 import org.hamcrest.core.Is;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.BDDMockito;
@@ -57,7 +58,7 @@ class TeamControllerIT {
             }
             """;
     private static final String RESPONSE_NEW_TEAM = """
-            {"id":7,"version":4,"name":"OKR","writeable":false}""";
+            {"id":7,"version":4,"name":"OKR","isWriteable":false}""";
 
     private static final String UPDATE_TEAM = """
             {
@@ -66,7 +67,7 @@ class TeamControllerIT {
             """;
 
     private static final String ADD_USERS = """
-            [{"id":31,"version":1,"firstname":"Findus","lastname":"Peterson","email":"peterson@puzzle.ch","userTeamList":[{"id":31,"version":1,"team":{"id":8,"version":1,"name":"we are cube.³","isWriteable":false},"isTeamAdmin":true}],"isOkrChampion":false},{"id":41,"version":1,"firstname":"Paco","lastname":"Egiman","email":"egiman@puzzle.ch","userTeamList":[{"id":41,"version":1,"team":{"id":4,"version":1,"name":"/BBT","isWriteable":false},"isTeamAdmin":false}],"isOkrChampion":false}]
+            [{"id":31,"version":1,"firstName":"Findus","lastName":"Peterson","email":"peterson@puzzle.ch","userTeamList":[{"id":31,"version":1,"team":{"id":8,"version":1,"name":"we are cube.³","isWriteable":false},"isTeamAdmin":true}],"isOkrChampion":false},{"id":41,"version":1,"firstName":"Paco","lastName":"Egiman","email":"egiman@puzzle.ch","userTeamList":[{"id":41,"version":1,"team":{"id":4,"version":1,"name":"/BBT","isWriteable":false},"isTeamAdmin":false}],"isOkrChampion":false}]
             """;
 
     @Autowired
@@ -82,6 +83,7 @@ void setUp() {
         BDDMockito.given(teamMapper.toDto(teamOKR)).willReturn(teamOkrDto);
     }
 
+    @DisplayName("Should get all teams for the specified quarter")
     @Test
     void shouldGetAllTeams() throws Exception {
         BDDMockito.given(teamAuthorizationService.getAllTeams()).willReturn(teamList);
@@ -96,6 +98,7 @@ void shouldGetAllTeams() throws Exception {
                 .andExpect(jsonPath("$[1].name", Is.is("OKR")));
     }
 
+    @DisplayName("Should get all teams when no quarter parameter is passed")
     @Test
     void shouldGetAllTeamsWhenNoQuarterParamIsPassed() throws Exception {
         BDDMockito.given(teamAuthorizationService.getAllTeams()).willReturn(teamList);
@@ -104,6 +107,7 @@ void shouldGetAllTeamsWhenNoQuarterParamIsPassed() throws Exception {
         BDDMockito.verify(teamMapper).toDto(teamPuzzle);
     }
 
+    @DisplayName("Should return empty list if no teams exist")
     @Test
     void shouldGetAllTeamsIfTeamModelIsNull() throws Exception {
         BDDMockito.given(teamAuthorizationService.getAllTeams()).willReturn(Collections.emptyList());
@@ -114,8 +118,9 @@ void shouldGetAllTeamsIfTeamModelIsNull() throws Exception {
                 .andExpect(jsonPath("$", Matchers.hasSize(0)));
     }
 
+    @DisplayName("Should return created team after creating a new team")
     @Test
-    void shouldReturnCreatedTeam() throws Exception {
+    void shouldReturnCreatedTeamAfterCreatingTeam() throws Exception {
         BDDMockito.given(teamAuthorizationService.createEntity(any())).willReturn(teamOKR);
 
         mvc
@@ -127,6 +132,7 @@ void shouldReturnCreatedTeam() throws Exception {
                 .andExpect(MockMvcResultMatchers.content().string(RESPONSE_NEW_TEAM));
     }
 
+    @DisplayName("Should return bad request when creating a team with null values")
     @Test
     void shouldReturnResponseStatusExceptionWhenCreatingObjectiveWithNullValues() throws Exception {
         BDDMockito
@@ -142,8 +148,9 @@ void shouldReturnResponseStatusExceptionWhenCreatingObjectiveWithNullValues() th
                 .andExpect(MockMvcResultMatchers.status().isBadRequest());
     }
 
+    @DisplayName("Should return updated team after updating an existing team")
     @Test
-    void shouldReturnUpdatedTeam() throws Exception {
+    void shouldReturnUpdatedTeamAfterUpdatingTeam() throws Exception {
         TeamDto teamDto = new TeamDto(1L, 0, "OKR-Team", false);
         Team team = Team.Builder.builder().withId(1L).withName("OKR-Team").build();
 
@@ -161,8 +168,9 @@ void shouldReturnUpdatedTeam() throws Exception {
                 .andExpect(jsonPath("$.name", Is.is(teamDto.name())));
     }
 
+    @DisplayName("Should return not found when attempting to update a non-existent team")
     @Test
-    void shouldReturnNotFound() throws Exception {
+    void shouldReturnNotFoundWhenTeamToUpdateIsNotFound() throws Exception {
         BDDMockito
                 .given(teamAuthorizationService.updateEntity(any(), anyLong()))
                 .willThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "Failed team -> Attribut is invalid"));
@@ -175,8 +183,9 @@ void shouldReturnNotFound() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isNotFound());
     }
 
+    @DisplayName("Should return bad request when updating team with invalid data")
     @Test
-    void shouldReturnBadRequest() throws Exception {
+    void shouldReturnBadRequestWhenUpdatingTeamWithInvalidData() throws Exception {
         BDDMockito
                 .given(teamAuthorizationService.updateEntity(any(), anyLong()))
                 .willThrow(new ResponseStatusException(HttpStatus.BAD_REQUEST, "Failed team -> Attribut is invalid"));
@@ -189,6 +198,7 @@ void shouldReturnBadRequest() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isBadRequest());
     }
 
+    @DisplayName("Should successfully delete a team")
     @Test
     void shouldDeleteTeam() throws Exception {
         mvc
@@ -196,8 +206,9 @@ void shouldDeleteTeam() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isOk());
     }
 
+    @DisplayName("Should throw exception when deleting a team that does not exist")
     @Test
-    void throwExceptionWhenOTeamWithIdCantBeFoundWhileDeleting() throws Exception {
+    void shouldThrowExceptionWhenTeamWithIdCantBeFoundWhileDeleting() throws Exception {
         doThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "Team not found"))
                 .when(teamAuthorizationService)
                 .deleteEntity(anyLong());
@@ -206,8 +217,9 @@ void throwExceptionWhenOTeamWithIdCantBeFoundWhileDeleting() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isNotFound());
     }
 
+    @DisplayName("Should successfully add a user to a team")
     @Test
-    void addUsersToTeam_shouldReturnOk() throws Exception {
+    void shouldSuccessfullyAddUserToTeam() throws Exception {
         mvc
                 .perform(put(URL_TEAM_1 + "/addusers")
                         .contentType(MediaType.APPLICATION_JSON)
@@ -216,8 +228,9 @@ void addUsersToTeam_shouldReturnOk() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isOk());
     }
 
+    @DisplayName("Should successfully remove a user from a team")
     @Test
-    void removeUserFromTeam_shouldReturnOk() throws Exception {
+    void shouldSuccessfullyRemoveUserFromTeam() throws Exception {
         mvc
                 .perform(put(URL_TEAM_1 + SUB_URL_USER_5 + "/removeuser")
                         .contentType(MediaType.APPLICATION_JSON)
@@ -226,8 +239,9 @@ void removeUserFromTeam_shouldReturnOk() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isOk());
     }
 
+    @DisplayName("Should successfully update or add team membership")
     @Test
-    void updateOrAddTeamMembership_shouldReturnOk() throws Exception {
+    void shouldSuccessfullyUpdateOrAddTeamMembership() throws Exception {
         mvc
                 .perform(put(URL_TEAM_1 + SUB_URL_USER_5 + "/updateaddteammembership/true")
                         .contentType(MediaType.APPLICATION_JSON)
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/UserControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/UserControllerIT.java
index 87219c0775..78adbd2123 100644
--- a/backend/src/test/java/ch/puzzle/okr/controller/UserControllerIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/controller/UserControllerIT.java
@@ -39,29 +39,29 @@
 @ExtendWith(MockitoExtension.class)
 @WebMvcTest(UserController.class)
 class UserControllerIT {
-    private static final String FIRSTNAME_1 = "Alice";
-    private static final String LASTNAME_1 = "Wunderland";
+    private static final String FIRST_NAME_1 = "Alice";
+    private static final String LAST_NAME_1 = "Wunderland";
     private static final String EMAIL_1 = "wunderland@puzzle.ch";
-    private static final String FIRSTNAME_2 = "Bob";
-    private static final String LASTNAME_2 = "Baumeister";
+    private static final String FIRST_NAME_2 = "Bob";
+    private static final String LAST_NAME_2 = "Baumeister";
     private static final String EMAIL_2 = "baumeister@puzzle.ch";
     static User userAlice = User.Builder
             .builder()
             .withId(2L)
-            .withFirstname(FIRSTNAME_1)
-            .withLastname(LASTNAME_1)
+            .withFirstName(FIRST_NAME_1)
+            .withLastName(LAST_NAME_1)
             .withEmail(EMAIL_1)
             .build();
     static User userBob = User.Builder
             .builder()
             .withId(9L)
-            .withFirstname(FIRSTNAME_2)
-            .withLastname(LASTNAME_2)
+            .withFirstName(FIRST_NAME_2)
+            .withLastName(LAST_NAME_2)
             .withEmail(EMAIL_2)
             .build();
     static List<User> userList = Arrays.asList(userAlice, userBob);
-    static UserDto userAliceDto = new UserDto(2L, 3, FIRSTNAME_1, LASTNAME_1, EMAIL_1, new ArrayList<>(), false);
-    static UserDto userBobDto = new UserDto(9L, 4, FIRSTNAME_2, LASTNAME_2, EMAIL_2, new ArrayList<>(), false);
+    static UserDto userAliceDto = new UserDto(2L, 3, FIRST_NAME_1, LAST_NAME_1, EMAIL_1, new ArrayList<>(), false);
+    static UserDto userBobDto = new UserDto(9L, 4, FIRST_NAME_2, LAST_NAME_2, EMAIL_2, new ArrayList<>(), false);
     @Autowired
     private MockMvc mvc;
     @MockBean
@@ -77,6 +77,7 @@ void setUp() {
         BDDMockito.given(userMapper.toDto(userBob)).willReturn(userBobDto);
     }
 
+    @DisplayName("Should get all users")
     @Test
     void shouldGetAllUsers() throws Exception {
         BDDMockito.given(userAuthorizationService.getAllUsers()).willReturn(userList);
@@ -86,17 +87,18 @@ void shouldGetAllUsers() throws Exception {
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andExpect(jsonPath("$", Matchers.hasSize(2)))
                 .andExpect(jsonPath("$[0].id", Is.is(2)))
-                .andExpect(jsonPath("$[0].firstname", Is.is(FIRSTNAME_1)))
-                .andExpect(jsonPath("$[0].lastname", Is.is(LASTNAME_1)))
+                .andExpect(jsonPath("$[0].firstName", Is.is(FIRST_NAME_1)))
+                .andExpect(jsonPath("$[0].lastName", Is.is(LAST_NAME_1)))
                 .andExpect(jsonPath("$[0].email", Is.is(EMAIL_1)))
                 .andExpect(jsonPath("$[1].id", Is.is(9)))
-                .andExpect(jsonPath("$[1].firstname", Is.is(FIRSTNAME_2)))
-                .andExpect(jsonPath("$[1].lastname", Is.is(LASTNAME_2)))
+                .andExpect(jsonPath("$[1].firstName", Is.is(FIRST_NAME_2)))
+                .andExpect(jsonPath("$[1].lastName", Is.is(LAST_NAME_2)))
                 .andExpect(jsonPath("$[1].email", Is.is(EMAIL_2)));
     }
 
+    @DisplayName("Should get an empty list if no users exist")
     @Test
-    void shouldGetAllUsersIfNoUserExists() throws Exception {
+    void shouldGetEmptyUserListIfNoUserExists() throws Exception {
         BDDMockito.given(userAuthorizationService.getAllUsers()).willReturn(Collections.emptyList());
 
         mvc
@@ -105,6 +107,7 @@ void shouldGetAllUsersIfNoUserExists() throws Exception {
                 .andExpect(jsonPath("$", Matchers.hasSize(0)));
     }
 
+    @DisplayName("Should return the current user")
     @Test
     void shouldReturnCurrentUser() throws Exception {
         BDDMockito
@@ -118,13 +121,14 @@ void shouldReturnCurrentUser() throws Exception {
                 .andExpect(jsonPath("$", Matchers.aMapWithSize(7))) //
                 .andExpect(jsonPath("$.id", Is.is(2))) //
                 .andExpect(jsonPath("$.version", Is.is(3))) //
-                .andExpect(jsonPath("$.firstname", Is.is(FIRSTNAME_1))) //
-                .andExpect(jsonPath("$.lastname", Is.is(LASTNAME_1))) //
+                .andExpect(jsonPath("$.firstName", Is.is(FIRST_NAME_1))) //
+                .andExpect(jsonPath("$.lastName", Is.is(LAST_NAME_1))) //
                 .andExpect(jsonPath("$.email", Is.is(EMAIL_1))) //
                 .andExpect(jsonPath("$.userTeamList", Matchers.empty())) //
                 .andExpect(jsonPath("$.isOkrChampion", Is.is(false)));
     }
 
+    @DisplayName("Should return the user by id")
     @Test
     void shouldReturnUserById() throws Exception {
         BDDMockito.given(userAuthorizationService.getById(2)).willReturn(userAlice);
@@ -136,13 +140,14 @@ void shouldReturnUserById() throws Exception {
                 .andExpect(jsonPath("$", Matchers.aMapWithSize(7))) //
                 .andExpect(jsonPath("$.id", Is.is(2))) //
                 .andExpect(jsonPath("$.version", Is.is(3))) //
-                .andExpect(jsonPath("$.firstname", Is.is(FIRSTNAME_1))) //
-                .andExpect(jsonPath("$.lastname", Is.is(LASTNAME_1))) //
+                .andExpect(jsonPath("$.firstName", Is.is(FIRST_NAME_1))) //
+                .andExpect(jsonPath("$.lastName", Is.is(LAST_NAME_1))) //
                 .andExpect(jsonPath("$.email", Is.is(EMAIL_1))) //
                 .andExpect(jsonPath("$.userTeamList", Matchers.empty())) //
                 .andExpect(jsonPath("$.isOkrChampion", Is.is(false)));
     }
 
+    @DisplayName("Should set the okr champion role")
     @Test
     void shouldSetOkrChampion() throws Exception {
         BDDMockito.given(userAuthorizationService.setIsOkrChampion(2, true)).willReturn(userAlice);
@@ -158,15 +163,16 @@ void shouldSetOkrChampion() throws Exception {
                 .andExpect(jsonPath("$", Matchers.aMapWithSize(7))) //
                 .andExpect(jsonPath("$.id", Is.is(2))) //
                 .andExpect(jsonPath("$.version", Is.is(3))) //
-                .andExpect(jsonPath("$.firstname", Is.is(FIRSTNAME_1))) //
-                .andExpect(jsonPath("$.lastname", Is.is(LASTNAME_1))) //
+                .andExpect(jsonPath("$.firstName", Is.is(FIRST_NAME_1))) //
+                .andExpect(jsonPath("$.lastName", Is.is(LAST_NAME_1))) //
                 .andExpect(jsonPath("$.email", Is.is(EMAIL_1))) //
                 .andExpect(jsonPath("$.userTeamList", Matchers.empty())) //
                 .andExpect(jsonPath("$.isOkrChampion", Is.is(false)));
     }
 
+    @DisplayName("Should successfully create multiple users")
     @Test
-    void shouldCreateUsers() throws Exception {
+    void shouldSuccessfullyCreateUsers() throws Exception {
         BDDMockito.given(userAuthorizationService.createUsers(any())).willReturn(List.of(userAlice));
         BDDMockito.given(userMapper.toDtos(List.of(userAlice))).willReturn(List.of(userAliceDto));
 
@@ -180,23 +186,24 @@ void shouldCreateUsers() throws Exception {
                 .andExpect(jsonPath("$", Matchers.hasSize(1))) //
                 .andExpect(jsonPath("$[0].id", Is.is(2))) //
                 .andExpect(jsonPath("$[0].version", Is.is(3))) //
-                .andExpect(jsonPath("$[0].firstname", Is.is(FIRSTNAME_1))) //
-                .andExpect(jsonPath("$[0].lastname", Is.is(LASTNAME_1))) //
+                .andExpect(jsonPath("$[0].firstName", Is.is(FIRST_NAME_1))) //
+                .andExpect(jsonPath("$[0].lastName", Is.is(LAST_NAME_1))) //
                 .andExpect(jsonPath("$[0].email", Is.is(EMAIL_1))) //
                 .andExpect(jsonPath("$[0].userTeamList", Matchers.empty())) //
                 .andExpect(jsonPath("$[0].isOkrChampion", Is.is(false)));
     }
 
+    @DisplayName("Should successfully delete a user")
     @Test
-    void shouldDeleteUser() throws Exception {
+    void shouldSuccessfullyDeleteUser() throws Exception {
         mvc
                 .perform(delete("/api/v1/users/10").with(SecurityMockMvcRequestPostProcessors.csrf()))
                 .andExpect(MockMvcResultMatchers.status().isOk());
     }
 
-    @DisplayName("should throw exception when user with id cant be found while deleting")
+    @DisplayName("Should throw exception when user with id cant be found while deleting")
     @Test
-    void throwExceptionWhenUserWithIdCantBeFoundWhileDeleting() throws Exception {
+    void shouldThrowExceptionWhenUserWithIdCantBeFoundWhileDeleting() throws Exception {
         doThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "User not found"))
                 .when(userAuthorizationService)
                 .deleteEntityById(1000);
diff --git a/backend/src/test/java/ch/puzzle/okr/deserializer/CheckInDeserializerTest.java b/backend/src/test/java/ch/puzzle/okr/deserializer/CheckInDeserializerTest.java
index 2dd743dc58..18c4c92705 100644
--- a/backend/src/test/java/ch/puzzle/okr/deserializer/CheckInDeserializerTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/deserializer/CheckInDeserializerTest.java
@@ -35,7 +35,7 @@ class CheckInDeserializerTest {
     @Mock
     DeserializationContext deserializationContext;
 
-    @DisplayName("deserialize() should call helper with correct params")
+    @DisplayName("deserialize() should call helper with correct params for metric json")
     @Test
     void deserializeShouldReturnCheckInMetricDtoForMetricJson() throws Exception {
         // arrange
@@ -58,10 +58,10 @@ private static Stream<Arguments> checkInTypes() {
                     Arguments.of(ordinalKeyResult, CHECK_IN_ORDINAL_JSON, "ordinal"));
     }
 
-    @DisplayName("deserialize() should call helper with correct params")
+    @DisplayName("getKeyResultType() should return the correct key-result type")
     @ParameterizedTest
     @MethodSource("checkInTypes")
-    void shouldReturnCorrectKeyResulType(KeyResult kr, String json, String type) throws Exception {
+    void getKeyResultTypeShouldReturnCorrectType(KeyResult kr, String json, String type) throws Exception {
         // arrange
         when(keyResultBusinessService.getEntityById(any())).thenReturn(kr);
         JsonNode jsonNode = TestHelper.getJsonNode(json);
@@ -73,8 +73,9 @@ void shouldReturnCorrectKeyResulType(KeyResult kr, String json, String type) thr
         assertEquals(type, keyResultType);
     }
 
+    @DisplayName("getKeyResultType() should return null for missing attribute")
     @Test
-    void shouldReturnNullForMissingAttribute() throws Exception {
+    void getKeyResultTypeShouldReturnNullForMissingAttribute() throws Exception {
         // arrange
         JsonNode jsonNode = TestHelper.getJsonNode("");
 
diff --git a/backend/src/test/java/ch/puzzle/okr/deserializer/DeserializerHelperTest.java b/backend/src/test/java/ch/puzzle/okr/deserializer/DeserializerHelperTest.java
index 293c8167d1..4c7d9d2607 100644
--- a/backend/src/test/java/ch/puzzle/okr/deserializer/DeserializerHelperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/deserializer/DeserializerHelperTest.java
@@ -207,8 +207,8 @@ private static void assertCheckInMetricDto(CheckInMetricDto checkInMetricDto) {
     private static void assertOwner(KeyResultUserDto owner) {
         assertNotNull(owner);
         assertEquals(1000, owner.id());
-        assertEquals("Jaya", owner.firstname());
-        assertEquals("Norris", owner.lastname());
+        assertEquals("Jaya", owner.firstName());
+        assertEquals("Norris", owner.lastName());
     }
 
     private static void assertObjective(KeyResultObjectiveDto objective) {
diff --git a/backend/src/test/java/ch/puzzle/okr/deserializer/KeyResultDeserializerTest.java b/backend/src/test/java/ch/puzzle/okr/deserializer/KeyResultDeserializerTest.java
index 9d719a5dfd..b37cad8378 100644
--- a/backend/src/test/java/ch/puzzle/okr/deserializer/KeyResultDeserializerTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/deserializer/KeyResultDeserializerTest.java
@@ -41,10 +41,9 @@ void setUp() {
         objectMapper = new ObjectMapper();
     }
 
-    @DisplayName("deserialize() should return KeyResultMetricDto for metric json")
+    @DisplayName("deserialize() should call helper with correct params for metric key-result json")
     @Test
-    void deserializeShouldReturnKeyResultMetricDtoForMetricJson() throws Exception {
-
+    void deserializeShouldCallHelperWithCorrectParamsForKeyResultMetricJson() throws Exception {
         when(deserializerHelper.deserializeMetricOrdinal(any(), any(), any())) //
                 .thenReturn(null);
         JsonParser jsonParser = objectMapper.getFactory().createParser(KeyResultTestHelpers.KEY_RESULT_METRIC_JSON);
@@ -62,10 +61,10 @@ private static Stream<Arguments> keyResultTypes() {
                 .of(Arguments.of(KEY_RESULT_METRIC_JSON, "metric"), Arguments.of(KEY_RESULT_ORDINAL_JSON, "ordinal"));
     }
 
-    @DisplayName("deserialize() should call helper with correct params")
+    @DisplayName("getKeyResultType() should return the correct key-result type for given json")
     @ParameterizedTest
     @MethodSource("keyResultTypes")
-    void shouldReturnCorrectKeyResulType(String json, String type) throws Exception {
+    void getKeyResultTypeShouldReturnCorrectTypeForKeyResultJson(String json, String type) throws Exception {
         // arrange
         JsonNode jsonNode = TestHelper.getJsonNode(json);
 
@@ -76,8 +75,9 @@ void shouldReturnCorrectKeyResulType(String json, String type) throws Exception
         assertEquals(type, keyResultType);
     }
 
+    @DisplayName("getKeyResultType() should return null for missing attribute")
     @Test
-    void shouldReturnNullForMissingAttribute() throws Exception {
+    void getKeyResultTypeShouldReturnNullForMissingAttribute() throws Exception {
         // arrange
         JsonNode jsonNode = TestHelper.getJsonNode("");
 
@@ -87,5 +87,4 @@ void shouldReturnNullForMissingAttribute() throws Exception {
         // assert
         assertNull(keyResultType);
     }
-
 }
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/ActionMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/ActionMapperTest.java
index 6dbde44b55..8fe004db81 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/ActionMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/ActionMapperTest.java
@@ -27,7 +27,7 @@ public class ActionMapperTest {
     private static final int PRIORITY = 42;
     private static final boolean IS_CHECKED = true;
     private static final boolean IS_WRITEABLE = true;
-    public static final long KEY_RESULT_ID = 10L;
+    private static final long KEY_RESULT_ID = 10L;
     private final KeyResult keyResult = KeyResultMetric.Builder.builder().withId(KEY_RESULT_ID).build();
 
     private ActionMapper actionMapper;
@@ -43,9 +43,9 @@ void setup() {
         actionMapper = new ActionMapper(keyResultBusinessService);
     }
 
-    @DisplayName("toDto() should map Action to Dto")
+    @DisplayName("Should map action to dto when calling toDto() is called")
     @Test
-    void toDtoShouldMapActionToDto() {
+    void shouldMapActionToDtoWhenToDtoIsCalled() {
         // arrange
         Action action = Action.Builder
                 .builder() //
@@ -53,7 +53,7 @@ void toDtoShouldMapActionToDto() {
                 .withVersion(VERSION) //
                 .withAction(ACTION) //
                 .withPriority(PRIORITY) //
-                .withIsChecked(IS_CHECKED) //
+                .isChecked(IS_CHECKED) //
                 .withKeyResult(keyResult) //
                 .build();
         action.setWriteable(IS_WRITEABLE);
@@ -73,12 +73,12 @@ private void assertActionDto(Action expected, ActionDto actual) {
         assertEquals(expected.getPriority(), actual.priority());
         assertEquals(expected.isChecked(), actual.isChecked());
         assertEquals(expected.getKeyResult().getId(), actual.keyResultId());
-        assertEquals(expected.isWriteable(), actual.writeable());
+        assertEquals(expected.isWriteable(), actual.isWriteable());
     }
 
-    @DisplayName("toActions() should map List of Dtos with KeyResultId to list of Actions.")
+    @DisplayName("Should map a list of dtos with key-result-id to a list of actions when calling toActions()")
     @Test
-    void toActionsShouldMapListOfDtosWithKeyResltIdToListOfActions() {
+    void shouldMapListOfDtosWithKeyResultIdToListOfActionsWhenToActionsIsCalled() {
         // arrange
         when(keyResultBusinessService.getEntityById(keyResult.getId())).thenReturn(keyResult);
 
@@ -101,9 +101,9 @@ void toActionsShouldMapListOfDtosWithKeyResltIdToListOfActions() {
         assertListOfActionsWithKeyResultId(actionDtoList, actionList);
     }
 
-    @DisplayName("toActions() with KeyResult Parameter should map List of Dtos (without a KeyResultId) to list of Actions")
+    @DisplayName("Should map list of dtos (without a key-result-id) to a list of actions when toActions() is called with a Key-result parameter")
     @Test
-    void toActionsWithKeyResultParameterShouldMapListOfDtosToListOfActions() {
+    void shouldMapListOfDtosWithoutKeyResultIdToListOfActionsWhenToActionsIsCalledWithKeyResultParameter() {
         // arrange
         KeyResult keyResultParameter = KeyResultMetric.Builder.builder().withId(20L).build();
         ActionDto actionDtoWithKeyResultIdIsNull = new ActionDto(ID, //
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/AlignmentSelectionMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/AlignmentSelectionMapperTest.java
index 2c70cc5a64..c10906ce34 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/AlignmentSelectionMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/AlignmentSelectionMapperTest.java
@@ -8,21 +8,24 @@
 import ch.puzzle.okr.models.alignment.AlignmentSelection;
 import ch.puzzle.okr.models.alignment.AlignmentSelectionId;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 class AlignmentSelectionMapperTest {
     private final AlignmentSelectionMapper alignmentSelectionMapper = new AlignmentSelectionMapper();
 
+    @DisplayName("Should return an empty list when no objectives are found in toDto()")
     @Test
-    void toDtoShouldReturnEmptyListWhenNoObjectiveFound() {
+    void shouldReturnEmptyListWhenNoObjectivesAreFoundInToDto() {
         List<AlignmentSelection> alignmentSelections = List.of();
         List<AlignmentObjectiveDto> alignmentObjectiveDtos = alignmentSelectionMapper.toDto(alignmentSelections);
 
         assertTrue(alignmentObjectiveDtos.isEmpty());
     }
 
+    @DisplayName("Should return one element when a single objective is found in toDto()")
     @Test
-    void toDtoShouldReturnOneElementWhenObjectiveFound() {
+    void shouldReturnOneElementWhenSingleObjectiveIsFoundInToDto() {
         List<AlignmentSelection> alignmentSelections = List
                 .of(AlignmentSelection.Builder
                         .builder()
@@ -37,8 +40,9 @@ void toDtoShouldReturnOneElementWhenObjectiveFound() {
         assertEquals(0, alignmentObjectiveDtos.get(0).keyResults().size());
     }
 
+    @DisplayName("Should return one element when an objective with a key result is found in toDto()")
     @Test
-    void toDtoShouldReturnOneElementWhenObjectiveWithKeyResultFound() {
+    void shouldReturnOneElementWhenObjectiveWithKeyResultIsFoundInToDto() {
         List<AlignmentSelection> alignmentSelections = List
                 .of(AlignmentSelection.Builder
                         .builder()
@@ -58,8 +62,9 @@ void toDtoShouldReturnOneElementWhenObjectiveWithKeyResultFound() {
         assertEquals(1, alignmentObjectiveDtos.get(0).keyResults().size());
     }
 
+    @DisplayName("Should return one element when an objective with multiple key results is found in toDto()")
     @Test
-    void toDtoShouldReturnOneElementWhenObjectiveWithTwoKeyResultsFound() {
+    void shouldReturnOneElementWhenObjectiveWithMultipleKeyResultsIsFoundInToDto() {
         List<AlignmentSelection> alignmentSelections = List
                 .of(AlignmentSelection.Builder
                         .builder()
@@ -91,8 +96,9 @@ void toDtoShouldReturnOneElementWhenObjectiveWithTwoKeyResultsFound() {
         assertEquals(2, alignmentObjectiveDtos.get(0).keyResults().size());
     }
 
+    @DisplayName("Should return multiple objectives with their respective key results in toDto()")
     @Test
-    void toDtoShouldReturnOneElementWhenTwoObjectivesWithKeyResultsFound() {
+    void shouldReturnMultipleObjectivesWithRespectiveKeyResultsInToDto() {
         List<AlignmentSelection> alignmentSelections = List
                 .of(AlignmentSelection.Builder
                         .builder()
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/CompletedMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/CompletedMapperTest.java
index cb223a37d0..e2b247cb78 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/CompletedMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/CompletedMapperTest.java
@@ -45,9 +45,9 @@ void setUp() {
         completedMapper = new CompletedMapper(objectiveMapper);
     }
 
-    @DisplayName("toDo() should map Completed to Dto")
+    @DisplayName("Should map completed to dto when calling toDto()")
     @Test
-    void toDtoShouldMapCompletedToDto() {
+    void shouldMapCompletedToDto() {
         // arrange
         var completed = Completed.Builder
                 .builder() //
@@ -75,9 +75,9 @@ private void assertCompletedDto(Completed expected, CompletedDto actual) {
         assertEquals(expected.getObjective().getId(), actual.objective().id());
     }
 
-    @DisplayName("toCompleted() should map Dto to Completed")
+    @DisplayName("Should map dto to completed when calling toCompleted()")
     @Test
-    void toCompletedShouldMapDtoToCompleted() {
+    void shouldMapDtoToCompleted() {
         // arrange
         var completedDto = CompletedDtoBuilder
                 .builder()
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/ObjectiveMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/ObjectiveMapperTest.java
index bd610940f3..b73086c4c7 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/ObjectiveMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/ObjectiveMapperTest.java
@@ -57,9 +57,9 @@ void setup() {
         objectiveMapper = new ObjectiveMapper(teamBusinessService, quarterBusinessService);
     }
 
-    @DisplayName("toDto() should map Objective to Dto")
+    @DisplayName("Should map objective to dto when calling toDto()")
     @Test
-    void toDtoShouldMapObjectiveToDto() {
+    void shouldMapObjectiveToDto() {
         // arrange
         Objective objective = Objective.Builder
                 .builder() //
@@ -96,9 +96,9 @@ private void assertObjectiveDto(Objective expected, ObjectiveDto actual) {
         assertEquals(expected.getModifiedOn(), actual.modifiedOn());
     }
 
-    @DisplayName("toObjective() should map Dto to Objective")
+    @DisplayName("Should map dto to objective when calling toObjective()")
     @Test
-    void toObjectiveShouldMapDtoToObjective() {
+    void shouldMapDtoToObjective() {
         // arrange
         when(teamBusinessService.getTeamById(TEAM_ID)).thenReturn(team);
         when(quarterBusinessService.getQuarterById(QUARTER_ID)).thenReturn(quarter);
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/OverviewMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/OverviewMapperTest.java
index b04dedc890..c394e63f8e 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/OverviewMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/OverviewMapperTest.java
@@ -17,6 +17,7 @@
 import ch.puzzle.okr.models.overview.OverviewId;
 import ch.puzzle.okr.test.TestHelper;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -28,16 +29,18 @@ class OverviewMapperTest {
     @InjectMocks
     private OverviewMapper overviewMapper;
 
+    @DisplayName("Should return an empty list when toDto() is called with no team found")
     @Test
-    void toDtoShouldReturnEmptyListWhenNoTeamFound() {
+    void shouldReturnEmptyListWhenToDtoIsCalledWithNoTeamFound() {
         List<Overview> overviews = List.of();
         List<OverviewDto> overviewDtos = overviewMapper.toDto(overviews);
 
         assertTrue(overviewDtos.isEmpty());
     }
 
+    @DisplayName("Should return one element when toDto() is called with a team without objectives")
     @Test
-    void toDtoShouldReturnEmptyListWhenTeamFound() {
+    void shouldReturnOneElementWhenToDtoIsCalledWithTeamWithoutObjectives() {
         List<Overview> overviews = List
                 .of(Overview.Builder
                         .builder()
@@ -50,8 +53,9 @@ void toDtoShouldReturnEmptyListWhenTeamFound() {
         assertEquals(0, overviewDtos.get(0).objectives().size());
     }
 
+    @DisplayName("Should return one element when toDto() is called with a single objective and no key-results")
     @Test
-    void toDtoShouldReturnOneElementWhenObjectiveFound() {
+    void shouldReturnOneElementWhenToDtoIsCalledWithSingleObjectiveAndNoKeyResults() {
         List<Overview> overviews = List
                 .of(Overview.Builder
                         .builder()
@@ -66,8 +70,9 @@ void toDtoShouldReturnOneElementWhenObjectiveFound() {
         assertEquals(0, overviewDtos.get(0).objectives().get(0).keyResults().size());
     }
 
+    @DisplayName("Should return one element when toDto() is called with a single objective and a key-result")
     @Test
-    void toDtoShouldReturnOneElementWhenObjectiveWithKeyResultFound() {
+    void shouldReturnOneElementWhenToDtoIsCalledWithSingleObjectiveAndKeyResult() {
         List<Overview> overviews = List
                 .of(Overview.Builder
                         .builder()
@@ -89,8 +94,9 @@ void toDtoShouldReturnOneElementWhenObjectiveWithKeyResultFound() {
         assertEquals(1, overviewDtos.get(0).objectives().get(0).keyResults().size());
     }
 
+    @DisplayName("Should return one element when toDto() is called with an objective having multiple key results and check-ins")
     @Test
-    void toDtoShouldReturnOneElementWhenObjectiveWithKeyResultAndCheckInsFound() {
+    void shouldReturnOneElementWhenToDtoIsCalledWithObjectiveHavingMultipleKeyResultsAndCheckIns() {
         List<Overview> overviews = List
                 .of(Overview.Builder
                         .builder()
@@ -115,8 +121,9 @@ void toDtoShouldReturnOneElementWhenObjectiveWithKeyResultAndCheckInsFound() {
         assertEquals(1, overviewDtos.get(0).objectives().get(0).keyResults().size());
     }
 
+    @DisplayName("Should return one element when toDto() is called with an objective having two key results and a check-in")
     @Test
-    void toDtoShouldReturnOneElementWhenObjectiveWithTwoKeyResultAndCheckInFound() {
+    void shouldReturnOneElementWhenToDtoIsCalledWithObjectiveHavingTwoKeyResultsAndCheckIn() {
         List<Overview> overviews = List
                 .of(Overview.Builder
                         .builder()
@@ -153,8 +160,9 @@ void toDtoShouldReturnOneElementWhenObjectiveWithTwoKeyResultAndCheckInFound() {
         assertEquals(2, overviewDtos.get(0).objectives().get(0).keyResults().size());
     }
 
+    @DisplayName("Should return one element when toDto() is called with multiple objectives, key results, and check-ins")
     @Test
-    void toDtoShouldReturnOneElementWhenTwoObjectivesWithKeyResultAndCheckInFound() {
+    void shouldReturnOneElementWhenToDtoIsCalledWithMultipleObjectivesKeyResultsAndCheckIns() {
         List<Overview> overviews = List
                 .of(Overview.Builder
                         .builder()
@@ -215,8 +223,9 @@ void toDtoShouldReturnOneElementWhenTwoObjectivesWithKeyResultAndCheckInFound()
         assertEquals("checkIn", ((OverviewKeyResultOrdinalDto) keyResultDto).lastCheckIn().zone());
     }
 
+    @DisplayName("Should return one element when toDto() is called with multiple teams having objectives and key-results")
     @Test
-    void toDtoShouldReturnOneElementWhenTwoTeamsWithObjectivesAndKeyResultsFound() {
+    void shouldReturnOneElementWhenToDtoIsCalledWithMultipleTeamsHavingObjectivesAndKeyResults() {
         List<Overview> overviews = List
                 .of(Overview.Builder
                         .builder()
@@ -268,8 +277,9 @@ void toDtoShouldReturnOneElementWhenTwoTeamsWithObjectivesAndKeyResultsFound() {
         assertEquals(2, overviewDtos.get(1).objectives().get(0).keyResults().size());
     }
 
+    @DisplayName("Should throw an exception when toDto() is called with an unsupported key result type")
     @Test
-    void toDtoShouldThrowExceptionWhenKeyResultTypeNotSupported() {
+    void shouldThrowExceptionWhenToDtoIsCalledWithUnsupportedKeyResultType() {
         List<Overview> overviews = List
                 .of(Overview.Builder
                         .builder()
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/TeamMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/TeamMapperTest.java
index 7ff1416141..1db8df821d 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/TeamMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/TeamMapperTest.java
@@ -21,9 +21,9 @@ public class TeamMapperTest {
     @InjectMocks
     private TeamMapper teamMapper;
 
-    @DisplayName("toDto() should map Team to Dto")
+    @DisplayName("Should map team to dto when calling toDto()")
     @Test
-    void toDtoShouldMapTeamToDto() {
+    void shouldMapTeamToDto() {
         // arrange
         Team team = Team.Builder
                 .builder() //
@@ -45,12 +45,12 @@ private static void assertTeamDto(Team expected, TeamDto actual) {
         assertEquals(expected.getId(), actual.id());
         assertEquals(expected.getVersion(), actual.version());
         assertEquals(expected.getName(), actual.name());
-        assertEquals(expected.isWriteable(), actual.writeable());
+        assertEquals(expected.isWriteable(), actual.isWriteable());
     }
 
-    @DisplayName("toTeam() should map Dto to Team")
+    @DisplayName("Should map dto to team when calling toTeam()")
     @Test
-    void toTeamShouldMapDtoToTeam() {
+    void shouldMapDtoToTeam() {
         // arrange
         TeamDto teamDto = new TeamDto(ID, VERSION, NAME, IS_WRITEABLE);
 
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/UserMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/UserMapperTest.java
index 0c5b30384c..0071e74f58 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/UserMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/UserMapperTest.java
@@ -21,8 +21,8 @@ public class UserMapperTest {
     private static final long USER_TEAM_ID = 100L;
     private static final long ID = 0L;
     private static final int VERSION = 1;
-    private static final String FIRSTNAME = "firstname";
-    private static final String LASTNAME = "lastname";
+    private static final String FIRST_NAME = "firstname";
+    private static final String LAST_NAME = "lastname";
     private static final String EMAIL = "a@b.ch";
     private static final boolean IS_OKR_CHAMPION = true;
 
@@ -35,8 +35,8 @@ public class UserMapperTest {
             .builder() //
             .withId(ID) //
             .withVersion(VERSION) //
-            .withFirstname(FIRSTNAME) //
-            .withLastname(LASTNAME) //
+            .withFirstName(FIRST_NAME) //
+            .withLastName(LAST_NAME) //
             .withEmail(EMAIL) //
             .withUserTeamList(List
                     .of(UserTeam.Builder
@@ -44,37 +44,37 @@ public class UserMapperTest {
                             .withId(USER_TEAM_ID) //
                             .withTeam(Team.Builder.builder().build()) //
                             .build())) //
-            .withOkrChampion(IS_OKR_CHAMPION) //
+            .isOkrChampion(IS_OKR_CHAMPION) //
             .build();
 
-    private final NewUserDto userDto = new NewUserDto(FIRSTNAME, LASTNAME, EMAIL);
+    private final NewUserDto userDto = new NewUserDto(FIRST_NAME, LAST_NAME, EMAIL);
 
     @BeforeEach
     void setup() {
         userMapper = new UserMapper(teamMapper);
     }
 
-    @DisplayName("toDto() without TeamList throws NullPointerException")
+    @DisplayName("Should throw NullPointerException when toDto() is called without teamList")
     @Test
-    void toDtoWithoutTeamListThrowsException() {
+    void shouldThrowExceptionWhenToDtoIsCalledWithoutTeamList() {
         // arrange
         User user = User.Builder
                 .builder() //
                 .withId(ID) //
                 .withVersion(VERSION) //
-                .withFirstname(FIRSTNAME) //
-                .withLastname(LASTNAME) //
+                .withFirstName(FIRST_NAME) //
+                .withLastName(LAST_NAME) //
                 .withEmail(EMAIL) //
-                .withOkrChampion(IS_OKR_CHAMPION) //
+                .isOkrChampion(IS_OKR_CHAMPION) //
                 .build();
 
         // act + assert
         assertThrows(NullPointerException.class, () -> userMapper.toDto(user));
     }
 
-    @DisplayName("toDto() should map User to Dto")
+    @DisplayName("Should map User to Dto when toDto() is called")
     @Test
-    void toDtoShouldMapUserToDto() {
+    void shouldMapUserToDtoWhenToDtoIsCalled() {
         // act
         UserDto userDto = userMapper.toDto(user);
 
@@ -83,9 +83,9 @@ void toDtoShouldMapUserToDto() {
         assertUserDto(user, userDto);
     }
 
-    @DisplayName("toDtos() should map list of Users to Dtos")
+    @DisplayName("Should map list of users to dtos when toDtos() is called")
     @Test
-    void toDtosShouldMapListOfUsersToDtos() {
+    void shouldMapListOfUsersToDtosWhenToDtosIsCalled() {
         // act
         List<UserDto> userDtos = userMapper.toDtos(List.of(user));
 
@@ -97,7 +97,7 @@ void toDtosShouldMapListOfUsersToDtos() {
     private void assertUserDto(User expected, UserDto actual) {
         assertEquals(expected.getId(), actual.id());
         assertEquals(expected.getVersion(), actual.version());
-        assertEquals(expected.getFirstname(), actual.firstname());
+        assertEquals(expected.getFirstName(), actual.firstName());
         assertEquals(expected.isOkrChampion(), actual.isOkrChampion());
         assertEquals(expected.getEmail(), actual.email());
 
@@ -105,9 +105,9 @@ private void assertUserDto(User expected, UserDto actual) {
         assertEquals(expected.getUserTeamList().get(0).getId(), actual.userTeamList().get(0).id());
     }
 
-    @DisplayName("toUser() should map UserDto to User")
+    @DisplayName("Should map user-dto to user when toUser() is called")
     @Test
-    void toUserShouldMapUserDtoToUser() {
+    void shouldMapUserDtoToUserWhenToUserIsCalled() {
         // act
         User user = userMapper.toUser(userDto);
 
@@ -116,9 +116,9 @@ void toUserShouldMapUserDtoToUser() {
         assertUser(userDto, user);
     }
 
-    @DisplayName("toUserList() should map List of UserDtos to List of Users")
+    @DisplayName("Should map list of user-dtos to list of users when toUserList() is called")
     @Test
-    void toUserListShouldMapUserDtoListToUserList() {
+    void shouldMapUserDtoListToUserListWhenToUserListIsCalled() {
         // act
         List<User> users = userMapper.toUserList(List.of(userDto));
 
@@ -128,8 +128,8 @@ void toUserListShouldMapUserDtoListToUserList() {
     }
 
     private void assertUser(NewUserDto expected, User actual) {
-        assertEquals(expected.firstname(), actual.getFirstname());
-        assertEquals(expected.lastname(), actual.getLastname());
+        assertEquals(expected.firstName(), actual.getFirstName());
+        assertEquals(expected.lastName(), actual.getLastName());
         assertEquals(expected.email(), actual.getEmail());
     }
 
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInMapperTest.java
index 81ed42beb1..f31ca59de6 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInMapperTest.java
@@ -43,9 +43,9 @@ void setup() {
         checkInMapper = new CheckInMapper(checkInMetricMapper, checkInOrdinalMapper);
     }
 
-    @DisplayName("toDto() should map CheckInMetric to CheckInMetricDto")
+    @DisplayName("Should map CheckInMetric to CheckInMetricDto when toDto() is called")
     @Test
-    void toDtoShouldMapCheckInMetricToCheckInMetricDto() {
+    void shouldMapCheckInMetricToCheckInMetricDtoWhenToDtoIsCalled() {
         // arrange
         CheckInMetric checkInMetric = TestDataHelper.checkInMetric();
 
@@ -56,9 +56,9 @@ void toDtoShouldMapCheckInMetricToCheckInMetricDto() {
         assertEquals(CheckInMetricDto.class, checkInDto.getClass());
     }
 
-    @DisplayName("toDto() should map CheckInOrdinal to a CheckInOrdinalDto")
+    @DisplayName("Should map CheckInOrdinal to CheckInOrdinalDto when toDto() is called")
     @Test
-    void toDtoShouldMapCheckInOrdinalToCheckInOrdinalDto() {
+    void shouldMapCheckInOrdinalToCheckInOrdinalDtoWhenToDtoIsCalled() {
         // arrange
         CheckInOrdinal checkInOrdinal = TestDataHelper.checkInOrdinal();
 
@@ -69,9 +69,9 @@ void toDtoShouldMapCheckInOrdinalToCheckInOrdinalDto() {
         assertEquals(CheckInOrdinalDto.class, checkInDto.getClass());
     }
 
-    @DisplayName("toCheckIn() should map Dto to CheckInMetric")
+    @DisplayName("Should map Dto to CheckInMetric when toCheckIn() is called")
     @Test
-    void toCheckInShouldMapDtoToCheckInMetric() {
+    void shouldMapDtoToCheckInMetricWhenToCheckInIsCalled() {
         // arrange
         KeyResult keyResult = TestDataHelper.keyResult();
         when(keyResultBusinessService.getEntityById(keyResult.getId())).thenReturn(keyResult);
@@ -85,9 +85,9 @@ void toCheckInShouldMapDtoToCheckInMetric() {
         assertEquals(CheckInMetric.class, check.getClass());
     }
 
-    @DisplayName("toCheckIn() should map Dto to CheckInOrdinal")
+    @DisplayName("Should map Dto to CheckInOrdinal when toCheckIn() is called")
     @Test
-    void toCheckInShouldMapDtoToCheckInOrdinal() {
+    void shouldMapDtoToCheckInOrdinalWhenToCheckInIsCalled() {
         // arrange
         KeyResult keyResult = TestDataHelper.keyResult();
         when(keyResultBusinessService.getEntityById(keyResult.getId())).thenReturn(keyResult);
@@ -101,9 +101,9 @@ void toCheckInShouldMapDtoToCheckInOrdinal() {
         assertEquals(CheckInOrdinal.class, check.getClass());
     }
 
-    @DisplayName("toDto() should throw Exception if CheckIn is not Metric or Ordinal")
+    @DisplayName("Should throw Exception if CheckIn is not Metric or Ordinal when toDto() is called")
     @Test
-    void toDtoShouldThrowExceptionIfCheckInIsNotMetricOrOrdinal() {
+    void shouldThrowExceptionIfCheckInIsNotMetricOrOrdinalWhenToDtoIsCalled() {
         // arrange
         CheckIn checkIn = new CheckIn() {
         };
@@ -115,9 +115,9 @@ void toDtoShouldThrowExceptionIfCheckInIsNotMetricOrOrdinal() {
         assertEquals(HttpStatus.BAD_REQUEST, responseStatusException.getStatusCode());
     }
 
-    @DisplayName("toCheckIn() should throw Exception if CheckIn is not MetricDto or OrdinalDto")
+    @DisplayName("Should throw Exception if CheckIn is not MetricDto or OrdinalDto when toCheckIn() is called")
     @Test
-    void toCheckInShouldThrowExceptionIfCheckInIsNotMetricOrOrdinal() {
+    void shouldThrowExceptionIfCheckInIsNotMetricDtoOrOrdinalDtoWhenToCheckInIsCalled() {
         // arrange
         CheckInDto checkInDto = new CheckInDto() {
         };
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInMetricMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInMetricMapperTest.java
index 9ec42fb3fd..506711cbc7 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInMetricMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInMetricMapperTest.java
@@ -38,9 +38,9 @@ void setup() {
         checkInMetricMapper = new CheckInMetricMapper(keyResultBusinessService);
     }
 
-    @DisplayName("toDto() should map CheckInMetric to Dto")
+    @DisplayName("Should map check-in-metric to dto when calling toDto()")
     @Test
-    void toDtoShouldMapCheckInMetricToDto() {
+    void shouldMapCheckInMetricToDto() {
         // arrange
         CheckInMetric checkInMetric = checkInMetric();
 
@@ -52,9 +52,9 @@ void toDtoShouldMapCheckInMetricToDto() {
         assertCheckInMetricDto(checkInMetric, checkInMetricDto);
     }
 
-    @DisplayName("toCheckInMetric() should map Dto to checkInMetric")
+    @DisplayName("Should map dto to check-in-metric when calling toCheckInMetric()")
     @Test
-    void toCheckInMetricShouldMapDtoToCheckInMetric() {
+    void shouldMapDtoToCheckInMetric() {
         // arrange
         KeyResult keyResult = TestDataHelper.keyResult();
         when(keyResultBusinessService.getEntityById(keyResult.getId())).thenReturn(keyResult);
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInOrdinalMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInOrdinalMapperTest.java
index 9fdde46e16..d668aff672 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInOrdinalMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/checkin/CheckInOrdinalMapperTest.java
@@ -38,9 +38,9 @@ void setup() {
         checkInOrdinalMapper = new CheckInOrdinalMapper(keyResultBusinessService);
     }
 
-    @DisplayName("toDto() should map CheckInOrdinal to Dto")
+    @DisplayName("Should map check-in-ordinal to dto when calling toDto()")
     @Test
-    void toDtoShouldMapCheckInOrdinalToDto() {
+    void shouldMapCheckInOrdinalToDto() {
         // arrange
         CheckInOrdinal checkInOrdinal = checkInOrdinal();
 
@@ -52,9 +52,9 @@ void toDtoShouldMapCheckInOrdinalToDto() {
         assertCheckInOrdinalDto(checkInOrdinal, checkInOrdinalDto);
     }
 
-    @DisplayName("toCheckInOrdinal() should map Dto to checkInOrdinal")
+    @DisplayName("Should map dto to check-in-ordinal when calling toCheckInOrdinal()")
     @Test
-    void toCheckInOrdinalShouldMapDtoToCheckInOrdinal() {
+    void shouldMapDtoToCheckInOrdinal() {
         // arrange
         KeyResult keyResult = TestDataHelper.keyResult();
         when(keyResultBusinessService.getEntityById(keyResult.getId())).thenReturn(keyResult);
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/checkin/helper/AssertHelper.java b/backend/src/test/java/ch/puzzle/okr/mapper/checkin/helper/AssertHelper.java
index c1fa95407a..03ee99d60c 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/checkin/helper/AssertHelper.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/checkin/helper/AssertHelper.java
@@ -20,7 +20,7 @@ public static void assertCheckInMetricDto(CheckInMetric expected, CheckInMetricD
         assertEquals(expected.getCreatedOn(), actual.createdOn());
         assertEquals(expected.getModifiedOn(), actual.modifiedOn());
         assertEquals(expected.getValue(), actual.value());
-        assertEquals(expected.isWriteable(), actual.writeable());
+        assertEquals(expected.isWriteable(), actual.isWriteable());
     }
 
     public static void assertCheckInMetric(CheckInMetricDto expected, CheckInMetric actual) {
@@ -46,7 +46,7 @@ public static void assertCheckInOrdinalDto(CheckInOrdinal expected, CheckInOrdin
         assertEquals(expected.getCreatedOn(), actual.createdOn());
         assertEquals(expected.getModifiedOn(), actual.modifiedOn());
         assertEquals(expected.getZone(), actual.zone());
-        assertEquals(expected.isWriteable(), actual.writeable());
+        assertEquals(expected.isWriteable(), actual.isWriteable());
     }
 
     public static void assertCheckInOrdinal(CheckInOrdinalDto checkInOrdinalDto, CheckInOrdinal checkInOrdinal) {
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultMapperTest.java
index 4d1177b072..26e0615bb9 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultMapperTest.java
@@ -59,9 +59,9 @@ void setup() {
         keyResultMapper = new KeyResultMapper(keyResultOrdinalMapper, keyResultMetricMapper);
     }
 
-    @DisplayName("toDto() should map KeyResultMetric to KeyResultMetricDto")
+    @DisplayName("Should map KeyResultMetric to KeyResultMetricDto when toDto() is called")
     @Test
-    void toDtoShouldMapKeyResultMetricToKeyResultMetricDto() {
+    void shouldMapKeyResultMetricToKeyResultMetricDto() {
         // arrange
         KeyResultMetric keyResultMetric = keyResultMetric();
         List<Action> actions = List.of();
@@ -73,9 +73,9 @@ void toDtoShouldMapKeyResultMetricToKeyResultMetricDto() {
         assertEquals(KeyResultMetricDto.class, keyResultDto.getClass());
     }
 
-    @DisplayName("toDto() should map KeyResultOrdinal to KeyResultOrdinalDto")
+    @DisplayName("Should map KeyResultOrdinal to KeyResultOrdinalDto when toDto() is called")
     @Test
-    void toDtoShouldMapKeyResultOrdinalToKeyResultOrdinalDto() {
+    void shouldMapKeyResultOrdinalToKeyResultOrdinalDto() {
         // arrange
         KeyResultOrdinal keyResultOrdinal = keyResultOrdinal();
         List<Action> actions = List.of();
@@ -87,9 +87,9 @@ void toDtoShouldMapKeyResultOrdinalToKeyResultOrdinalDto() {
         assertEquals(KeyResultOrdinalDto.class, keyResultDto.getClass());
     }
 
-    @DisplayName("toKeyResult() should map KeyResultMetricDto to KeyResultMetric")
+    @DisplayName("Should map KeyResultMetricDto to KeyResultMetric when toKeyResult() is called")
     @Test
-    void toKeyResultShouldMapKeyResultMetricDtoToKeyResultMetric() {
+    void shouldMapKeyResultMetricDtoToKeyResultMetricWhenToKeyResultIsCalled() {
         // arrange
         KeyResultMetricDto keyResultMetricDto = keyResultMetricDto();
 
@@ -100,9 +100,9 @@ void toKeyResultShouldMapKeyResultMetricDtoToKeyResultMetric() {
         assertEquals(KeyResultMetric.class, keyResult.getClass());
     }
 
-    @DisplayName("toKeyResult() should map KeyResultOrdinalDto to KeyResultOrdinal")
+    @DisplayName("Should map KeyResultOrdinalDto to KeyResultOrdinal when toKeyResult() is called")
     @Test
-    void toKeyResultShouldMapKeyResultOrdinalDtoToKeyResultOrdinal() {
+    void shouldMapKeyResultOrdinalDtoToKeyResultOrdinalWhenToKeyResultIsCalled() {
         // arrange
         KeyResultOrdinalDto keyResultOrdinalDto = keyResultOrdinalDto();
 
@@ -113,9 +113,9 @@ void toKeyResultShouldMapKeyResultOrdinalDtoToKeyResultOrdinal() {
         assertEquals(KeyResultOrdinal.class, keyResult.getClass());
     }
 
-    @DisplayName("toDto() should throw Exception if KeyResult is not Metric or Ordinal")
+    @DisplayName("Should throw Exception if KeyResult is not Metric or Ordinal when toDto() is called")
     @Test
-    void toDtoShouldThrowExceptionIfKeyResultIsNotMetricOrOrdinal() {
+    void shouldThrowExceptionIfKeyResultIsNotMetricOrOrdinalWhenToDtoIsCalled() {
         // arrange
         KeyResult keyResult = new KeyResult() {
         };
@@ -128,9 +128,9 @@ void toDtoShouldThrowExceptionIfKeyResultIsNotMetricOrOrdinal() {
         assertEquals(HttpStatus.BAD_REQUEST, responseStatusException.getStatusCode());
     }
 
-    @DisplayName("toKeyResult() should throw Exception if KeyResultDto is not MetricDto or OrdinalDto")
+    @DisplayName("Should throw Exception if KeyResultDto is not MetricDto or OrdinalDto when toKeyResult() is called")
     @Test
-    void toKeyResultShouldThrowExceptionIfKeyResultDtoIsNotMetricOrOrdinal() {
+    void shouldThrowExceptionIfKeyResultDtoIsNotMetricDtoOrOrdinalDtoWhenToKeyResultIsCalled() {
         // arrange
         KeyResultDto keyResultDto = List::of;
 
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultMetricMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultMetricMapperTest.java
index 7c00f6aaa7..de596eddfc 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultMetricMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultMetricMapperTest.java
@@ -59,9 +59,9 @@ void setup() {
                                                           actionMapper);
     }
 
-    @DisplayName("toDto() should map a KeyResultMetric to a Dto")
+    @DisplayName("Should map a KeyResultMetric to a Dto with CheckIn when toDto() is called")
     @Test
-    void toDtoShouldMapKeyResultMetricToDtoWithCheckIn() {
+    void shouldMapKeyResultMetricToDtoWithCheckInWhenToDtoIsCalled() {
         // arrange
         CheckIn checkIn = TestDataHelper.checkInMetric();
         when(checkInBusinessService.getLastCheckInByKeyResultId(anyLong())).thenReturn(checkIn);
@@ -78,9 +78,9 @@ void toDtoShouldMapKeyResultMetricToDtoWithCheckIn() {
         assertKeyResultMetricDtoWithCheckIn(keyResultMetric, keyResultMetricDto, actions);
     }
 
-    @DisplayName("toDto() should map KeyResultMetric to a Dto without CheckIn")
+    @DisplayName("Should map a KeyResultMetric to a Dto without CheckIn when toDto() is called")
     @Test
-    void toDtoShouldMapKeyResultMetricToDtoWithoutCheckIn() {
+    void shouldMapKeyResultMetricToDtoWithoutCheckInWhenToDtoIsCalled() {
         // arrange
         KeyResultMetric keyResultMetric = keyResultMetric();
         List<Action> actions = List.of(action(keyResultMetric));
@@ -94,9 +94,9 @@ void toDtoShouldMapKeyResultMetricToDtoWithoutCheckIn() {
         assertKeyResultMetricDtoWithoutCheckIn(keyResultMetric, keyResultMetricDto, actions);
     }
 
-    @DisplayName("toKeyResultMetric() should map Dto to KeyResultMetric")
+    @DisplayName("Should map a Dto to KeyResultMetric when toKeyResultMetric() is called")
     @Test
-    void toKeyResultMetricShouldMapDtoToKeyResultMetric() {
+    void shouldMapDtoToKeyResultMetricWhenToKeyResultMetricIsCalled() {
         // arrange
         when(userBusinessService.getUserById(anyLong())).thenReturn(owner());
         when(objectiveBusinessService.getEntityById(anyLong())).thenReturn(objective());
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultOrdinalMapperTest.java b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultOrdinalMapperTest.java
index 8fd59853db..8f5d5ae3d4 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultOrdinalMapperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/KeyResultOrdinalMapperTest.java
@@ -60,9 +60,9 @@ void setup() {
                                                             actionMapper);
     }
 
-    @DisplayName("toDto() should map a KeyResultOrdinal with CheckIn to a Dto")
+    @DisplayName("Should map a key-result-ordinal with check-in to a dto when calling toDto()")
     @Test
-    void toDtoShouldMapKeyResultWithCheckInOrdinalToDto() {
+    void shouldMapKeyResultWithCheckInOrdinalToDto() {
         // arrange
         CheckIn checkIn = TestDataHelper.checkInOrdinal();
         when(checkInBusinessService.getLastCheckInByKeyResultId(anyLong())).thenReturn(checkIn);
@@ -79,9 +79,9 @@ void toDtoShouldMapKeyResultWithCheckInOrdinalToDto() {
         assertKeyResultOrdinalDtoWithCheckIn(keyResultOrdinal, keyResultOrdinalDto, actions);
     }
 
-    @DisplayName("toDto() should map a KeyResultOrdinal without CheckIn to a Dto")
+    @DisplayName("Should map a KeyResultOrdinal without CheckIn to a Dto when calling toDto()")
     @Test
-    void toDtoShouldMapKeyResultWithoutCheckInOrdinalToDto() {
+    void shouldMapKeyResultWithoutCheckInOrdinalToDto() {
         // arrange
         KeyResultOrdinal keyResultOrdinal = keyResultOrdinal();
         List<Action> actions = List.of(action(keyResultOrdinal));
@@ -95,9 +95,9 @@ void toDtoShouldMapKeyResultWithoutCheckInOrdinalToDto() {
         assertKeyResultOrdinalDtoWithoutCheckIn(keyResultOrdinal, keyResultOrdinalDto, actions);
     }
 
-    @DisplayName("toKeyResultMetric() should map Dto to KeyResultMetric")
+    @DisplayName("Should map Dto to KeyResultMetric when calling toKeyResultMetric()")
     @Test
-    void toKeyResultMetricShouldMapDtoToKeyResultMetric() {
+    void shouldMapDtoToKeyResultMetric() {
         // arrange
         when(userBusinessService.getUserById(anyLong())).thenReturn(owner());
         when(objectiveBusinessService.getEntityById(anyLong())).thenReturn(objective());
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/AssertHelper.java b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/AssertHelper.java
index 597c9f92e1..7afec389db 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/AssertHelper.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/AssertHelper.java
@@ -159,14 +159,14 @@ private static void assertQuarter(KeyResultQuarterDto expected, Quarter actual)
 
     private static void assertOwnerDto(User expected, KeyResultUserDto actual) {
         assertEquals(expected.getId(), actual.id());
-        assertEquals(expected.getFirstname(), actual.firstname());
-        assertEquals(expected.getLastname(), actual.lastname());
+        assertEquals(expected.getFirstName(), actual.firstName());
+        assertEquals(expected.getLastName(), actual.lastName());
     }
 
     private static void assertOwner(KeyResultUserDto expected, User actual) {
         assertEquals(expected.id(), actual.getId());
-        assertEquals(expected.firstname(), actual.getFirstname());
-        assertEquals(expected.lastname(), actual.getLastname());
+        assertEquals(expected.firstName(), actual.getFirstName());
+        assertEquals(expected.lastName(), actual.getLastName());
     }
 
     private static void assertCheckInMetricDto(KeyResultLastCheckInMetricDto expected,
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataConstants.java b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataConstants.java
index 8e51b53ff3..425ba866d8 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataConstants.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataConstants.java
@@ -21,8 +21,8 @@ public class TestDataConstants {
     public static final boolean CHECK_IN_IS_WRITABLE = true;
 
     public static final long USER_ID = 101L;
-    public static final String USER_FIRSTNAME = "owner firstname";
-    public static final String USER_LASTNAME = "owner lastname";
+    public static final String USER_FIRST_NAME = "owner firstname";
+    public static final String USER_LAST_NAME = "owner lastname";
 
     public static final long QUARTER_ID = 102L;
     public static final String QUARTER_LABEL = "GJ 2024 Q1";
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataDtoHelper.java b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataDtoHelper.java
index 91344c5026..d3a956699e 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataDtoHelper.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataDtoHelper.java
@@ -25,8 +25,8 @@ public static KeyResultLastCheckInOrdinalDto lastCheckInOrdinalDto() {
 
     private static final KeyResultUserDto ownerDto = new KeyResultUserDto( //
                                                                           USER_ID, //
-                                                                          USER_FIRSTNAME, //
-                                                                          USER_LASTNAME //
+                                                                          USER_FIRST_NAME, //
+                                                                          USER_LAST_NAME //
     );
 
     private static final KeyResultQuarterDto quarterDto = new KeyResultQuarterDto( //
diff --git a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataHelper.java b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataHelper.java
index dd69ee4c5f..e426a26c48 100644
--- a/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataHelper.java
+++ b/backend/src/test/java/ch/puzzle/okr/mapper/keyresult/helper/TestDataHelper.java
@@ -76,8 +76,8 @@ public static Objective objective() {
     private static final User owner = User.Builder
             .builder() //
             .withId(USER_ID) //
-            .withFirstname(USER_FIRSTNAME) //
-            .withLastname(USER_LASTNAME) //
+            .withFirstName(USER_FIRST_NAME) //
+            .withLastName(USER_LAST_NAME) //
             .build();
 
     private static final Quarter quarter = Quarter.Builder
@@ -131,7 +131,7 @@ public static Objective objective() {
             .withVersion(ACTION_VERSION) //
             .withAction(ACTION_ACTION) //
             .withPriority(ACTION_PRIORITY) //
-            .withIsChecked(ACTION_IS_CHECKED) //
+            .isChecked(ACTION_IS_CHECKED) //
             .withKeyResult(keyResultMetric) //
             .build();
 
@@ -141,7 +141,7 @@ public static Objective objective() {
             .withVersion(ACTION_VERSION) //
             .withAction(ACTION_ACTION) //
             .withPriority(ACTION_PRIORITY) //
-            .withIsChecked(ACTION_IS_CHECKED) //
+            .isChecked(ACTION_IS_CHECKED) //
             .withKeyResult(keyResultOrdinal) //
             .build();
 
diff --git a/backend/src/test/java/ch/puzzle/okr/models/authorization/AuthorizationUserTest.java b/backend/src/test/java/ch/puzzle/okr/models/authorization/AuthorizationUserTest.java
index b4283d82bc..4cc083ef50 100644
--- a/backend/src/test/java/ch/puzzle/okr/models/authorization/AuthorizationUserTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/models/authorization/AuthorizationUserTest.java
@@ -6,26 +6,29 @@
 import ch.puzzle.okr.models.UserTeam;
 import ch.puzzle.okr.test.TestHelper;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 class AuthorizationUserTest {
 
     private final List<UserTeam> userTeamList = List
-            .of(UserTeam.Builder.builder().withTeam(TestHelper.defaultTeam(1L)).withTeamAdmin(true).build(),
-                UserTeam.Builder.builder().withTeam(TestHelper.defaultTeam(2L)).withTeamAdmin(false).build(),
-                UserTeam.Builder.builder().withTeam(TestHelper.defaultTeam(3L)).withTeamAdmin(true).build(),
-                UserTeam.Builder.builder().withTeam(TestHelper.defaultTeam(4L)).withTeamAdmin(false).build(),
-                UserTeam.Builder.builder().withTeam(TestHelper.defaultTeam(5L)).withTeamAdmin(false).build());
+            .of(UserTeam.Builder.builder().withTeam(TestHelper.defaultTeam(1L)).isTeamAdmin(true).build(),
+                UserTeam.Builder.builder().withTeam(TestHelper.defaultTeam(2L)).isTeamAdmin(false).build(),
+                UserTeam.Builder.builder().withTeam(TestHelper.defaultTeam(3L)).isTeamAdmin(true).build(),
+                UserTeam.Builder.builder().withTeam(TestHelper.defaultTeam(4L)).isTeamAdmin(false).build(),
+                UserTeam.Builder.builder().withTeam(TestHelper.defaultTeam(5L)).isTeamAdmin(false).build());
     private final User user = User.Builder.builder().withUserTeamList(userTeamList).build();
     private final AuthorizationUser authorizationUser = new AuthorizationUser(user);
 
+    @DisplayName("Should return all team-ids when extracting team-ids of a user")
     @Test
-    public void extractTeamIds_shouldReturnAllIds() {
+    public void shouldReturnAllTeamIdsWhenExtractingTeamIdsOfUser() {
         assertEquals(List.of(1L, 2L, 3L, 4L, 5L), authorizationUser.extractTeamIds());
     }
 
+    @DisplayName("Should return correctly if a user is a member in a team")
     @Test
-    public void isUserMemberInTeam_shouldContainAllUsers() {
+    public void shouldCorrectlyCheckIfUserIsMemberInTeam() {
         assertTrue(authorizationUser.isUserMemberInTeam(1L));
         assertTrue(authorizationUser.isUserMemberInTeam(2L));
         assertTrue(authorizationUser.isUserMemberInTeam(3L));
@@ -34,8 +37,9 @@ public void isUserMemberInTeam_shouldContainAllUsers() {
         assertFalse(authorizationUser.isUserMemberInTeam(6L));
     }
 
+    @DisplayName("Should return correctly if a user is an admin in a team")
     @Test
-    public void isUserAdminInTeam_shouldContainAllAdminUsers() {
+    public void shouldCorrectlyCheckIfUserIsAdminInTeam() {
         assertTrue(authorizationUser.isUserAdminInTeam(1L));
         assertTrue(authorizationUser.isUserAdminInTeam(3L));
         assertFalse(authorizationUser.isUserAdminInTeam(2L));
diff --git a/backend/src/test/java/ch/puzzle/okr/models/keyresult/KeyResultTest.java b/backend/src/test/java/ch/puzzle/okr/models/keyresult/KeyResultTest.java
index c6edc5f1f9..3153a833b2 100644
--- a/backend/src/test/java/ch/puzzle/okr/models/keyresult/KeyResultTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/models/keyresult/KeyResultTest.java
@@ -9,7 +9,7 @@
 
 class KeyResultTest {
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "resetId() should set the ID to null for all key result types")
     @MethodSource("provideKeyResults")
     void resetIdShouldSetIdToNull(KeyResult keyResult) {
 
@@ -23,5 +23,4 @@ private static Stream<Arguments> provideKeyResults() {
                 .of(Arguments.of(KeyResultMetric.Builder.builder().withId(1L).build()),
                     Arguments.of(KeyResultOrdinal.Builder.builder().withId(1L).build()));
     }
-
 }
\ No newline at end of file
diff --git a/backend/src/test/java/ch/puzzle/okr/multitenancy/CurrentTenantIdentifierResolverImplTest.java b/backend/src/test/java/ch/puzzle/okr/multitenancy/CurrentTenantIdentifierResolverImplTest.java
index d51702037a..770246fe9b 100644
--- a/backend/src/test/java/ch/puzzle/okr/multitenancy/CurrentTenantIdentifierResolverImplTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/multitenancy/CurrentTenantIdentifierResolverImplTest.java
@@ -8,7 +8,7 @@
 
 public class CurrentTenantIdentifierResolverImplTest {
 
-    @DisplayName("current TenantId is TenantId from TenantContext")
+    @DisplayName("Should return current TenantId from TenantContext")
     @Test
     void currentTenantIdIsTenantIdFromTenantContext() {
         CurrentTenantIdentifierResolverImpl resolver = new CurrentTenantIdentifierResolverImpl();
@@ -16,7 +16,7 @@ void currentTenantIdIsTenantIdFromTenantContext() {
         assertEquals(TenantContext.getCurrentTenant(), tenantIdentifier);
     }
 
-    @DisplayName("validateExistingCurrentSessions is true")
+    @DisplayName("Should validate that existing current sessions are true")
     @Test
     void validateExistingCurrentSessionsIsTrue() {
         CurrentTenantIdentifierResolverImpl resolver = new CurrentTenantIdentifierResolverImpl();
diff --git a/backend/src/test/java/ch/puzzle/okr/multitenancy/HibernateContextTest.java b/backend/src/test/java/ch/puzzle/okr/multitenancy/HibernateContextTest.java
index 53e4b1bce5..8c8ab4b7e2 100644
--- a/backend/src/test/java/ch/puzzle/okr/multitenancy/HibernateContextTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/multitenancy/HibernateContextTest.java
@@ -33,8 +33,7 @@ void setHibernateConfigShouldThrowExceptionIfDbConfigIsNull() {
         assertEquals("Invalid hibernate configuration null", exception.getMessage());
     }
 
-    @DisplayName("setHibernateConfig() should throw exception if db config has null or empty values")
-    @ParameterizedTest
+    @ParameterizedTest(name = "setHibernateConfig() should throw exception if db config has null or empty values")
     @MethodSource("invalidDbConfig")
     void setHibernateConfigShouldThrowExceptionIfDbConfigHasNullOrEmptyValues(String url, String username,
                                                                               String password, String tenant) {
diff --git a/backend/src/test/java/ch/puzzle/okr/multitenancy/SchemaMultiTenantConnectionProviderInternalsTest.java b/backend/src/test/java/ch/puzzle/okr/multitenancy/SchemaMultiTenantConnectionProviderInternalsTest.java
index d160620805..15d3b3b10a 100644
--- a/backend/src/test/java/ch/puzzle/okr/multitenancy/SchemaMultiTenantConnectionProviderInternalsTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/multitenancy/SchemaMultiTenantConnectionProviderInternalsTest.java
@@ -25,9 +25,9 @@ public void registerProvider(String tenantIdentifier, ConnectionProvider connect
         }
     }
 
-    @DisplayName("getConnectionProvider() return ConnectionProvider if TenantId is registered")
+    @DisplayName("Should return ConnectionProvider if tenantId is registered after calling getConnectionProvider()")
     @Test
-    void getConnectionProviderReturnConnectionProviderIfTenantIdIsRegistered() {
+    void getConnectionProviderReturnsConnectionProviderIfTenantIdIsRegistered() {
         // arrange
         ConfigurableConnectionProviderMock mockProvider = new ConfigurableConnectionProviderMock();
         mockProvider.registerProvider(TENANT_ID, mock(ConnectionProvider.class));
@@ -39,7 +39,7 @@ void getConnectionProviderReturnConnectionProviderIfTenantIdIsRegistered() {
         Assertions.assertNotNull(foundConnectionProvider);
     }
 
-    @DisplayName("getConnectionProvider() throws Exception when lookup TenantId is null")
+    @DisplayName("Should throw Exception when lookup tenantId is null after calling getConnectionProvider()")
     @Test
     void getConnectionProviderThrowsExceptionWhenLookupTenantIdIsNull() {
         // arrange
@@ -49,7 +49,7 @@ void getConnectionProviderThrowsExceptionWhenLookupTenantIdIsNull() {
         Assertions.assertThrows(ConnectionProviderException.class, () -> mockProvider.getConnectionProvider(null));
     }
 
-    @DisplayName("selectConnectionProvider() return ConnectionProvider if TenantId is registered")
+    @DisplayName("Should return ConnectionProvider if tenantId is registered after calling selectConnectionProvider()")
     @Test
     void selectConnectionProviderReturnConnectionProviderIfTenantIdIsRegistered() {
         // arrange
@@ -63,7 +63,7 @@ void selectConnectionProviderReturnConnectionProviderIfTenantIdIsRegistered() {
         Assertions.assertNotNull(foundConnectionProvider);
     }
 
-    @DisplayName("getAnyConnectionProvider() return ConnectionProvider for TenantId public")
+    @DisplayName("Should return ConnectionProvider for tenantId 'public' after calling getAnyConnectionProvider()")
     @Test
     void getAnyConnectionProviderReturnConnectionProviderForTenantIdPublic() {
         // arrange
@@ -77,7 +77,7 @@ void getAnyConnectionProviderReturnConnectionProviderForTenantIdPublic() {
         Assertions.assertNotNull(foundConnectionProvider);
     }
 
-    @DisplayName("getConnectionProviderShouldThrowRuntimeExceptionWhenNoPropertiesAreFound")
+    @DisplayName("Should throw RuntimeException when no properties are found after calling getConnectionProvider()")
     @Test
     void getConnectionProviderShouldThrowRuntimeExceptionWhenNoPropertiesAreFound() {
         ConfigurableConnectionProviderMock mockProvider = new ConfigurableConnectionProviderMock();
diff --git a/backend/src/test/java/ch/puzzle/okr/multitenancy/TenantConfigProviderTestIT.java b/backend/src/test/java/ch/puzzle/okr/multitenancy/TenantConfigProviderTestIT.java
index 261538bf80..42ed4e58f1 100644
--- a/backend/src/test/java/ch/puzzle/okr/multitenancy/TenantConfigProviderTestIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/multitenancy/TenantConfigProviderTestIT.java
@@ -74,9 +74,9 @@ private String prefix(String tenantId) {
         return tenantId + "_";
     }
 
-    @DisplayName("getTenantConfigs returns all TenantConfigs as List")
+    @DisplayName("Should return all tenant-configs as a list after calling getTenantConfigs")
     @Test
-    public void testGetTenantConfigs() {
+    public void shouldGetTenantConfigs() {
         TenantConfigProvider configProvider = new TenantConfigProvider(tenantIds, env);
         List<TenantConfigProvider.TenantConfig> tenantConfigs = configProvider.getTenantConfigs();
         for (TenantConfigProvider.TenantConfig config : tenantConfigs) {
@@ -84,29 +84,26 @@ public void testGetTenantConfigs() {
         }
     }
 
-    @DisplayName("getTenantConfigById returns for an existing TenantId the TenantConfig as Optional")
-    @ParameterizedTest
+    @ParameterizedTest(name = "getTenantConfigById returns for an existing TenantId the TenantConfig as Optional")
     @CsvSource({ "pitc, acme" })
-    void testGetTenantConfigByIdForExistingTenantId(String tenantId) {
+    void shouldGetTenantConfigByIdForExistingTenantId(String tenantId) {
         TenantConfigProvider configProvider = new TenantConfigProvider(tenantIds, env);
         Optional<TenantConfigProvider.TenantConfig> config = configProvider.getTenantConfigById(tenantId);
         assertTrue(config.isPresent());
         assertTenantConfigProvider(config.get());
     }
 
-    @DisplayName("getTenantConfigById returns for a non existing TenantId an empty Optional")
-    @ParameterizedTest
+    @ParameterizedTest(name = "getTenantConfigById returns for a non existing TenantId an empty Optional")
     @CsvSource({ "PITC-London" })
-    void testGetTenantConfigByIdForNonExistingTenantId(String nonExistingTenantId) {
+    void shouldGetEmptyTenantConfigForNonExistingTenantId(String nonExistingTenantId) {
         TenantConfigProvider configProvider = new TenantConfigProvider(tenantIds, env);
         Optional<TenantConfigProvider.TenantConfig> config = configProvider.getTenantConfigById(nonExistingTenantId);
         assertTrue(config.isEmpty());
     }
 
-    @DisplayName("getJwkSetUri returns for an existing TenantId the JwkSetUri as Optional")
-    @ParameterizedTest
+    @ParameterizedTest(name = "getJwkSetUri returns for an existing TenantId the JwkSetUri as Optional")
     @CsvSource({ "pitc", "acme" })
-    void testGetJwkSetUriForExistingTenantId(String tenantId) {
+    void shouldGetJwkSetUriForExistingTenantId(String tenantId) {
         // arrange
         TenantConfigProvider configProvider = new TenantConfigProvider(tenantIds, env);
 
@@ -118,10 +115,9 @@ void testGetJwkSetUriForExistingTenantId(String tenantId) {
         assertEquals(prefix(tenantId) + JWK_SET_URI, jwkSetUri.get());
     }
 
-    @DisplayName("getJwkSetUri returns for a non existing TenantId an empty Optional")
-    @ParameterizedTest
+    @ParameterizedTest(name = "getJwkSetUri returns for a non existing TenantId an empty Optional")
     @CsvSource({ "PITC-London" })
-    void testGetJwkSetUriForNonExistingTenantId(String nonExistingTenantId) {
+    void shouldGetEmptyJwkSetUriForNonExistingTenantId(String nonExistingTenantId) {
         TenantConfigProvider configProvider = new TenantConfigProvider(tenantIds, env);
         Optional<String> jwkSetUri = configProvider.getJwkSetUri(nonExistingTenantId);
         assertTrue(jwkSetUri.isEmpty());
diff --git a/backend/src/test/java/ch/puzzle/okr/multitenancy/TenantContextTest.java b/backend/src/test/java/ch/puzzle/okr/multitenancy/TenantContextTest.java
index cbca37d8c5..588d452bfd 100644
--- a/backend/src/test/java/ch/puzzle/okr/multitenancy/TenantContextTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/multitenancy/TenantContextTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 public class TenantContextTest {
@@ -11,13 +12,15 @@ void setUp() {
         TenantContext.setCurrentTenant(null);
     }
 
+    @DisplayName("Default tenant should be 'public'")
     @Test
     void defaultTenantIsPublic() {
         Assertions.assertEquals("public", TenantContext.getCurrentTenant());
     }
 
+    @DisplayName("Should return the tenant set in the context")
     @Test
-    void whenTenantIsSetThenReturnIt() {
+    void shouldGetTenantFromContextAfterItWasSet() {
         String tenant = "okr_acme";
         TenantContext.setCurrentTenant(tenant);
         Assertions.assertEquals(tenant, TenantContext.getCurrentTenant());
diff --git a/backend/src/test/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomizationProviderTestIT.java b/backend/src/test/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomizationProviderTestIT.java
index 94e0be8fed..251886b776 100644
--- a/backend/src/test/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomizationProviderTestIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomizationProviderTestIT.java
@@ -7,7 +7,6 @@
 import java.text.MessageFormat;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.Mock;
@@ -20,7 +19,7 @@ public class TenantClientCustomizationProviderTestIT {
     private static final String BACKGROUND_LOGO = "background-logo";
     private static final String FAVICON = "favicon";
     private static final String TITLE = "title";
-    private static final String HELP_SITE_URL = "helpSiteUrl";
+    private static final String HELP_SITE_URL = "help-site-url";
 
     private static final String CUSTOM_STYLE_NAME = "okr-topbar-background-color";
     private static final String CUSTOM_STYLE_VALUE = "css-custom-value";
@@ -43,7 +42,7 @@ private void setupPropertiesForTenantWithId(String id) {
         mockProperty("okr.tenants.{0}.clientcustomization.background-logo", BACKGROUND_LOGO, id);
         mockProperty("okr.tenants.{0}.clientcustomization.favicon", FAVICON, id);
         mockProperty("okr.tenants.{0}.clientcustomization.title", TITLE, id);
-        mockProperty("okr.tenants.{0}.clientcustomization.helpSiteUrl", HELP_SITE_URL, id);
+        mockProperty("okr.tenants.{0}.clientcustomization.help-site-url", HELP_SITE_URL, id);
         mockProperty("okr.tenants.{0}.clientcustomization.customstyles.okr-topbar-background-color",
                      CUSTOM_STYLE_VALUE,
                      id);
@@ -58,8 +57,7 @@ private String prefix(String tenantId) {
         return tenantId + "_";
     }
 
-    @DisplayName("getTenantClientCustomizationsById() should return TenantClientCustomization")
-    @ParameterizedTest
+    @ParameterizedTest(name = "getTenantClientCustomizationsById() should return TenantClientCustomization")
     @CsvSource({ "pitc", "acme" })
     void getTenantClientCustomizationsByIdShouldReturnTenantClientCustomization(String tenantId) {
         // arrange
diff --git a/backend/src/test/java/ch/puzzle/okr/security/AuthenticationEventsTest.java b/backend/src/test/java/ch/puzzle/okr/security/AuthenticationEventsTest.java
index 371c3a3b33..b9a4a74835 100644
--- a/backend/src/test/java/ch/puzzle/okr/security/AuthenticationEventsTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/security/AuthenticationEventsTest.java
@@ -21,7 +21,7 @@ void prepareTests() {
         TenantContext.setCurrentTenant(DEFAULT_TENANT_ID);
     }
 
-    @DisplayName("onSuccess() puts Token from AuthenticationSuccessEvent in TenantContext")
+    @DisplayName("Should put token from authentication-success-event in tenant-context after calling onSuccess()")
     @Test
     void onSuccessPutsTokenFromAuthenticationSuccessEventInTenantContext() {
         // arrange
diff --git a/backend/src/test/java/ch/puzzle/okr/security/JwtHelperTest.java b/backend/src/test/java/ch/puzzle/okr/security/JwtHelperTest.java
index 750615e0be..a656e613bf 100644
--- a/backend/src/test/java/ch/puzzle/okr/security/JwtHelperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/security/JwtHelperTest.java
@@ -20,8 +20,8 @@
 
 public class JwtHelperTest {
 
-    private static final String TOKEN_CLAIMS_KEY_FIRSTNAME = "given_name";
-    private static final String TOKEN_CLAIMS_KEY_LASTNAME = "family_name";
+    private static final String TOKEN_CLAIMS_KEY_FIRST_NAME = "given_name";
+    private static final String TOKEN_CLAIMS_KEY_LAST_NAME = "family_name";
     private static final String TOKEN_CLAIMS_KEY_EMAIL = "email";
     private static final String HANS = "Hans";
     private static final String MUSTER = "Muster";
@@ -31,7 +31,7 @@ public class JwtHelperTest {
     private static final String PITC = "pitc";
 
     // ok
-    @DisplayName("getUserFromJwt() extracts User data from Token")
+    @DisplayName("Should extract user data from token after calling getUserFromJwt()")
     @Test
     void getUserFromJwtExtractsUserDataFromToken() {
         // arrange
@@ -39,38 +39,38 @@ void getUserFromJwtExtractsUserDataFromToken() {
         when(tokenWithUserDataMock.getClaims())
                 .thenReturn(Map
                         .of( //
-                            TOKEN_CLAIMS_KEY_FIRSTNAME,
+                            TOKEN_CLAIMS_KEY_FIRST_NAME,
                             HANS, //
-                            TOKEN_CLAIMS_KEY_LASTNAME,
+                            TOKEN_CLAIMS_KEY_LAST_NAME,
                             MUSTER, //
                             TOKEN_CLAIMS_KEY_EMAIL,
                             EMAIL //
                         ));
 
         JwtHelper jwtHelper = new JwtHelper(null, //
-                                            TOKEN_CLAIMS_KEY_FIRSTNAME,
-                                            TOKEN_CLAIMS_KEY_LASTNAME,
+                                            TOKEN_CLAIMS_KEY_FIRST_NAME,
+                                            TOKEN_CLAIMS_KEY_LAST_NAME,
                                             TOKEN_CLAIMS_KEY_EMAIL);
 
         // act
         User userFromToken = jwtHelper.getUserFromJwt(tokenWithUserDataMock);
 
         // assert
-        assertEquals(HANS, userFromToken.getFirstname());
-        assertEquals(MUSTER, userFromToken.getLastname());
+        assertEquals(HANS, userFromToken.getFirstName());
+        assertEquals(MUSTER, userFromToken.getLastName());
         assertEquals(EMAIL, userFromToken.getEmail());
     }
 
     // ok
-    @DisplayName("getUserFromJwt() throws Exception if Token not contains User data")
+    @DisplayName("Should throw Exception if token does not contain user data after calling getUserFromJwt()")
     @Test
     void getUserFromJwtThrowsExceptionIfTokenNotContainsUserData() {
         // arrange
         Jwt tokenWithNoUserDataMock = mock(Jwt.class);
 
         JwtHelper jwtHelper = new JwtHelper(null, //
-                                            TOKEN_CLAIMS_KEY_FIRSTNAME,
-                                            TOKEN_CLAIMS_KEY_LASTNAME,
+                                            TOKEN_CLAIMS_KEY_FIRST_NAME,
+                                            TOKEN_CLAIMS_KEY_LAST_NAME,
                                             TOKEN_CLAIMS_KEY_EMAIL);
 
         // act + assert
@@ -81,7 +81,7 @@ void getUserFromJwtThrowsExceptionIfTokenNotContainsUserData() {
         assertEquals(BAD_REQUEST, okrResponseStatusException.getStatusCode());
     }
 
-    @DisplayName("getTenantFromToken() returns Tenant if Tenant found in TenantConfigProvider")
+    @DisplayName("Should return tenant from token if tenant is found in tenant-config-provider after calling getTenantFromToken()")
     @Test
     void getTenantFromTokenReturnsTenantIfTenantFoundInTenantConfigProvider() {
         // arrange
@@ -109,7 +109,7 @@ void getTenantFromTokenReturnsTenantIfTenantFoundInTenantConfigProvider() {
         assertEquals(PITC, tenantFromToken);
     }
 
-    @DisplayName("getTenantFromToken() throws Exception if Tenant not found in TenantConfigProvider")
+    @DisplayName("Should throw Exception if tenant is not found in tenant-config-provider after calling getTenantFromToken()")
     @Test
     void getTenantFromTokenThrowsExceptionIfTenantNotFoundInTenantConfigProvider() {
         // arrange
@@ -124,7 +124,7 @@ void getTenantFromTokenThrowsExceptionIfTenantNotFoundInTenantConfigProvider() {
         assertThrows(EntityNotFoundException.class, () -> jwtHelper.getTenantFromToken(tokenMock));
     }
 
-    @DisplayName("getTenantFromJWTClaimsSet() returns Tenant if Tenant found in TenantConfigProvider")
+    @DisplayName("Should return tenant from JWTClaimsSet if tenant is found in tenant-config-provider after calling getTenantFromJWTClaimsSet()")
     @Test
     void getTenantFromJWTClaimsSetReturnsTenantIfTenantFoundInTenantConfigProvider() throws ParseException {
         // arrange
@@ -152,7 +152,7 @@ void getTenantFromJWTClaimsSetReturnsTenantIfTenantFoundInTenantConfigProvider()
         assertEquals(PITC, tenantFromToken);
     }
 
-    @DisplayName("getTenantFromJWTClaimsSet() throws Exception if ClaimSet can not be parsed")
+    @DisplayName("Should throw Exception if JWTClaimsSet cannot be parsed after calling getTenantFromJWTClaimsSet()")
     @Test
     void getTenantFromJWTClaimsSetThrowsExceptionIfClaimSetCanNotBeParsed() throws ParseException {
         // arrange
diff --git a/backend/src/test/java/ch/puzzle/okr/security/TenantJWSKeySelectorTest.java b/backend/src/test/java/ch/puzzle/okr/security/TenantJWSKeySelectorTest.java
index 42d99ee4ef..25809a894a 100644
--- a/backend/src/test/java/ch/puzzle/okr/security/TenantJWSKeySelectorTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/security/TenantJWSKeySelectorTest.java
@@ -22,7 +22,7 @@ public class TenantJWSKeySelectorTest {
     private static final String MOCK_ALGORITHM = "mock_algorithm";
     private static final String UNKNOWN_TENANT = "unknown tenant";
 
-    @DisplayName("selectKeys() throws Exception if JwkSetUri not found in TenantConfigProvider")
+    @DisplayName("Should throw exception if the JwkSetUri was not found in the tenant-config-provider after calling selectKeys()")
     @Test
     void selectKeysThrowsExceptionIfTenantConfigIsNotFound() {
         // arrange
@@ -47,7 +47,7 @@ void selectKeysThrowsExceptionIfTenantConfigIsNotFound() {
         assertEquals(UNKNOWN_TENANT, illegalArgumentException.getLocalizedMessage());
     }
 
-    @DisplayName("selectKeys() return Key with Mock Algorithm if JwkSetUri is found in TenantConfigProvider")
+    @DisplayName("Should return a key with the mock algorithm if the JwkSetUri is found in the tenant-config-provider after calling selectKeys()")
     @Test
     void selectKeysReturnKeyWithMockAlgorithmIfJwkSetUriIsFound() throws KeySourceException {
         // arrange
diff --git a/backend/src/test/java/ch/puzzle/okr/security/TenantJwtIssuerValidatorTest.java b/backend/src/test/java/ch/puzzle/okr/security/TenantJwtIssuerValidatorTest.java
index e59787ada0..bd92d6e583 100644
--- a/backend/src/test/java/ch/puzzle/okr/security/TenantJwtIssuerValidatorTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/security/TenantJwtIssuerValidatorTest.java
@@ -18,7 +18,7 @@ public class TenantJwtIssuerValidatorTest {
     private static final String PITC = "pitc";
     private static final String ISSUER_URL = "issuerUrl";
 
-    @DisplayName("validate() throws exception if TenantConfig is not found for Tenant PITC")
+    @DisplayName("Should throw exception if the tenant-config is not found for the tenant PITC after calling validate()")
     @Test
     void validateThrowsExceptionIfTenantConfigNotFound() {
         // arrange
@@ -37,9 +37,9 @@ void validateThrowsExceptionIfTenantConfigNotFound() {
         assertEquals("unknown tenant", illegalArgumentException.getLocalizedMessage());
     }
 
-    @DisplayName("validate() return OAuth2TokenValidatorResult if TenantConfig with IssuerUrl is found for Tenant PITC")
+    @DisplayName("Should return OAuth2TokenValidatorResult if tenant-config with the issue-url is found for tenant PITC after calling validate()")
     @Test
-    void validateReturnOAuth2TokenValidatorResultIfTenantConfigWithIssuerUrlIsFound() {
+    void validateReturnsOAuth2TokenValidatorResultIfTenantConfigWithIssuerUrlIsFound() {
         // arrange
         Jwt token = mock(Jwt.class);
 
diff --git a/backend/src/test/java/ch/puzzle/okr/security/helper/ClaimHelperTest.java b/backend/src/test/java/ch/puzzle/okr/security/helper/ClaimHelperTest.java
index 2774d76675..6713ec24e5 100644
--- a/backend/src/test/java/ch/puzzle/okr/security/helper/ClaimHelperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/security/helper/ClaimHelperTest.java
@@ -26,9 +26,9 @@ void setup() {
         helper = new ClaimHelper();
     }
 
-    @DisplayName("getTenantFromClaimsSetUsingClaimTenant() return tenant if claim tenant is found")
+    @DisplayName("Should return tenant if claim tenant is found after calling getTenantFromClaimsSetUsingClaimTenant()")
     @Test
-    void getTenantFromClaimsSetUsingClaimTenantReturnTenantIfClaimTenantFound() throws ParseException {
+    void getTenantFromClaimsSetUsingClaimTenantReturnsTenantIfClaimTenantFound() throws ParseException {
         // arrange
         JWTClaimsSet claimsSetMock = mock(JWTClaimsSet.class);
         when(claimsSetMock.getStringClaim(CLAIM_TENANT)).thenReturn(PITC);
@@ -41,7 +41,7 @@ void getTenantFromClaimsSetUsingClaimTenantReturnTenantIfClaimTenantFound() thro
         assertEquals(PITC, tenant.get());
     }
 
-    @DisplayName("getTenantFromClaimsSetUsingClaimTenant() return empty if claim tenant is not found")
+    @DisplayName("Should return empty if claim tenant is not found after calling getTenantFromClaimsSetUsingClaimTenant()")
     @Test
     void getTenantFromClaimsSetUsingClaimTenantReturnEmptyIfClaimTenantNotFound() {
         // arrange
@@ -54,9 +54,9 @@ void getTenantFromClaimsSetUsingClaimTenantReturnEmptyIfClaimTenantNotFound() {
         assertTrue(tenant.isEmpty());
     }
 
-    @DisplayName("getTenantFromClaimsSetUsingClaimTenant() return empty if claim tenant is found but value is null")
+    @DisplayName("Should return empty if claim tenant is found but value is null after calling getTenantFromClaimsSetUsingClaimTenant()")
     @Test
-    void getTenantFromClaimsSetUsingClaimTenantReturnEmptyIfClaimTenantFoundButValueIsNull() throws ParseException {
+    void getTenantFromClaimsSetUsingClaimTenantReturnsEmptyIfClaimTenantFoundButValueIsNull() throws ParseException {
         // arrange
         JWTClaimsSet claimsSetMock = mock(JWTClaimsSet.class);
         when(claimsSetMock.getStringClaim(CLAIM_TENANT)).thenReturn(null);
@@ -68,9 +68,9 @@ void getTenantFromClaimsSetUsingClaimTenantReturnEmptyIfClaimTenantFoundButValue
         assertTrue(tenant.isEmpty());
     }
 
-    @DisplayName("getTenantFromClaimsSetUsingClaimTenant() return empty if claim tenant is found but parsing of claim failed")
+    @DisplayName("Should return empty if claim tenant is found but parsing of claim failed after calling getTenantFromClaimsSetUsingClaimTenant()")
     @Test
-    void getTenantFromClaimsSetUsingClaimTenantReturnEmptyIfParsingOfClaimFailed() throws ParseException {
+    void getTenantFromClaimsSetUsingClaimTenantReturnsEmptyIfParsingOfClaimFailed() throws ParseException {
         // arrange
         JWTClaimsSet claimsSetMock = mock(JWTClaimsSet.class);
         when(claimsSetMock.getStringClaim(CLAIM_TENANT)).thenThrow(new ParseException("", 0));
@@ -82,10 +82,9 @@ void getTenantFromClaimsSetUsingClaimTenantReturnEmptyIfParsingOfClaimFailed() t
         assertTrue(tenant.isEmpty());
     }
 
-    @DisplayName("getTenantFromClaimsSetUsingClaimIss() return tenant if claim iss is found")
-    @ParameterizedTest
+    @ParameterizedTest(name = "getTenantFromClaimsSetUsingClaimIss() returns tenant if claim iss is found")
     @ValueSource(strings = { "https://sso.puzzle.ch/auth/realms/pitc", "http://localhost:8544/realms/pitc" })
-    void getTenantFromClaimsSetUsingClaimIssReturnTenantIfClaimIssFound(String issUrl) throws ParseException {
+    void getTenantFromClaimsSetUsingClaimIssReturnsTenantIfClaimIssFound(String issUrl) throws ParseException {
         // arrange
         JWTClaimsSet claimsSetMock = mock(JWTClaimsSet.class);
         when(claimsSetMock.getStringClaim(CLAIM_ISS)).thenReturn(issUrl);
@@ -98,9 +97,9 @@ void getTenantFromClaimsSetUsingClaimIssReturnTenantIfClaimIssFound(String issUr
         assertEquals(PITC, tenant.get());
     }
 
-    @DisplayName("getTenantFromClaimsSetUsingClaimIss() return empty if claim iss is not found")
+    @DisplayName("Should return empty if claim iss is not found after calling getTenantFromClaimsSetUsingClaimIss()")
     @Test
-    void getTenantFromClaimsSetUsingClaimIssReturnEmptyIfClaimIssNotFound() {
+    void getTenantFromClaimsSetUsingClaimIssReturnsEmptyIfClaimIssNotFound() {
         // arrange
         JWTClaimsSet claimsSetMock = mock(JWTClaimsSet.class);
 
@@ -111,9 +110,9 @@ void getTenantFromClaimsSetUsingClaimIssReturnEmptyIfClaimIssNotFound() {
         assertTrue(tenant.isEmpty());
     }
 
-    @DisplayName("getTenantFromClaimsSetUsingClaimIss() return empty if claim iss is found but value is null")
+    @DisplayName("Should return empty if claim iss is found but value is null after calling getTenantFromClaimsSetUsingClaimIss()")
     @Test
-    void getTenantFromClaimsSetUsingClaimIssReturnEmptyIfClaimIssFoundButValueIsNull() throws ParseException {
+    void getTenantFromClaimsSetUsingClaimIssReturnsEmptyIfClaimIssFoundButValueIsNull() throws ParseException {
         // arrange
         JWTClaimsSet claimsSetMock = mock(JWTClaimsSet.class);
         when(claimsSetMock.getStringClaim(CLAIM_ISS)).thenReturn(null);
@@ -125,9 +124,9 @@ void getTenantFromClaimsSetUsingClaimIssReturnEmptyIfClaimIssFoundButValueIsNull
         assertTrue(tenant.isEmpty());
     }
 
-    @DisplayName("getTenantFromClaimsSetUsingClaimIss() return empty if parsing of claim failed")
+    @DisplayName("Should return empty if parsing of claim failed after calling getTenantFromClaimsSetUsingClaimIss()")
     @Test
-    void getTenantFromClaimsSetUsingClaimIssReturnEmptyIfParsingOfClaimFailed() throws ParseException {
+    void getTenantFromClaimsSetUsingClaimIssReturnsEmptyIfParsingOfClaimFailed() throws ParseException {
         // arrange
         JWTClaimsSet claimsSetMock = mock(JWTClaimsSet.class);
         when(claimsSetMock.getStringClaim(CLAIM_ISS)).thenThrow(new ParseException("", 0));
diff --git a/backend/src/test/java/ch/puzzle/okr/security/helper/TokenHelperTest.java b/backend/src/test/java/ch/puzzle/okr/security/helper/TokenHelperTest.java
index e258ccfb72..25b7b43de1 100644
--- a/backend/src/test/java/ch/puzzle/okr/security/helper/TokenHelperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/security/helper/TokenHelperTest.java
@@ -25,9 +25,9 @@ void setUp() {
         helper = new TokenHelper();
     }
 
-    @DisplayName("getTenantFromTokenUsingClaimTenant() return tenant if claim tenant is found")
+    @DisplayName("Should return tenant if claim tenant is found after calling getTenantFromTokenUsingClaimTenant()")
     @Test
-    void getTenantFromTokenUsingClaimTenantReturnTenantIfClaimTenantFound() {
+    void getTenantFromTokenUsingClaimTenantReturnsTenantIfClaimTenantFound() {
         // arrange
         Jwt tokenMock = mock(Jwt.class);
         when(tokenMock.getClaimAsString(CLAIM_TENANT)).thenReturn(PITC);
@@ -40,9 +40,9 @@ void getTenantFromTokenUsingClaimTenantReturnTenantIfClaimTenantFound() {
         assertEquals(PITC, tenant.get());
     }
 
-    @DisplayName("getTenantFromTokenUsingClaimTenant() return empty if claim tenant not found")
+    @DisplayName("Should return empty if claim tenant is not found after calling getTenantFromTokenUsingClaimTenant()")
     @Test
-    void getTenantFromTokenUsingClaimTenantReturnEmptyIfClaimTenantNotFound() {
+    void getTenantFromTokenUsingClaimTenantReturnsEmptyIfClaimTenantNotFound() {
         // arrange
         Jwt tokenMock = mock(Jwt.class);
 
@@ -53,9 +53,9 @@ void getTenantFromTokenUsingClaimTenantReturnEmptyIfClaimTenantNotFound() {
         assertTrue(tenant.isEmpty());
     }
 
-    @DisplayName("getTenantFromTokenUsingClaimTenant() return empty if claim tenant is found but value is null")
+    @DisplayName("Should return empty if claim tenant is found but value is null after calling getTenantFromTokenUsingClaimTenant()")
     @Test
-    void getTenantFromTokenUsingClaimTenantReturnEmptyIfClaimTenantFoundButValueIsNull() {
+    void getTenantFromTokenUsingClaimTenantReturnsEmptyIfClaimTenantFoundButValueIsNull() {
         // arrange
         Jwt tokenMock = mock(Jwt.class);
         when(tokenMock.getClaimAsString(CLAIM_TENANT)).thenReturn(null);
@@ -67,10 +67,9 @@ void getTenantFromTokenUsingClaimTenantReturnEmptyIfClaimTenantFoundButValueIsNu
         assertTrue(tenant.isEmpty());
     }
 
-    @DisplayName("getTenantFromTokenUsingClaimIss() return tenant if claim iss is found")
-    @ParameterizedTest
+    @ParameterizedTest(name = "getTenantFromTokenUsingClaimIss() returns tenant if claim iss is found")
     @ValueSource(strings = { "https://sso.puzzle.ch/auth/realms/pitc", "http://localhost:8544/realms/pitc" })
-    void getTenantFromTokenUsingClaimIssReturnTenantIfClaimIssFound(String issUrl) {
+    void getTenantFromTokenUsingClaimIssReturnsTenantIfClaimIssFound(String issUrl) {
         // arrange
         Jwt tokenMock = mock(Jwt.class);
         when(tokenMock.getClaimAsString(CLAIM_ISS)).thenReturn(issUrl);
@@ -83,9 +82,9 @@ void getTenantFromTokenUsingClaimIssReturnTenantIfClaimIssFound(String issUrl) {
         assertEquals(PITC, tenant.get());
     }
 
-    @DisplayName("getTenantFromTokenUsingClaimIss() return empty if claim iss is not found")
+    @DisplayName("Should return empty if claim iss is not found after calling getTenantFromTokenUsingClaimIss()")
     @Test
-    void getTenantFromTokenUsingClaimIssReturnEmptyIfClaimIssNotFound() {
+    void getTenantFromTokenUsingClaimIssReturnsEmptyIfClaimIssNotFound() {
         // arrange
         Jwt tokenMock = mock(Jwt.class);
 
@@ -96,9 +95,9 @@ void getTenantFromTokenUsingClaimIssReturnEmptyIfClaimIssNotFound() {
         assertTrue(tenant.isEmpty());
     }
 
-    @DisplayName("getTenantFromTokenUsingClaimIss() return empty if claim iss is found but value is null")
+    @DisplayName("Should return empty if claim iss is found but value is null after calling getTenantFromTokenUsingClaimIss()")
     @Test
-    void getTenantFromTokenUsingClaimIssReturnEmptyIfClaimIssFoundButValueIsNull() {
+    void getTenantFromTokenUsingClaimIssReturnsEmptyIfClaimIssFoundButValueIsNull() {
         // arrange
         Jwt tokenMock = mock(Jwt.class);
         when(tokenMock.getClaimAsString(CLAIM_ISS)).thenReturn(null);
diff --git a/backend/src/test/java/ch/puzzle/okr/security/helper/UrlHelperTest.java b/backend/src/test/java/ch/puzzle/okr/security/helper/UrlHelperTest.java
index 7e772e34f1..a10b67fd2b 100644
--- a/backend/src/test/java/ch/puzzle/okr/security/helper/UrlHelperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/security/helper/UrlHelperTest.java
@@ -12,10 +12,9 @@ public class UrlHelperTest {
 
     private static final String PITC = "pitc";
 
-    @DisplayName("extractTenantFromIssUrl() return tenant if Url contains slash")
-    @ParameterizedTest
+    @ParameterizedTest(name = "extractTenantFromIssUrl() returns tenant if Url contains slash")
     @ValueSource(strings = { "https://sso.puzzle.ch/auth/realms/pitc", "http://localhost:8544/realms/pitc" })
-    void extractTenantFromIssUrlReturnTenantIfUrlContainSlash(String issUrl) {
+    void extractTenantFromIssUrlReturnsTenantIfUrlContainSlash(String issUrl) {
         // arrange
 
         // act
@@ -26,9 +25,9 @@ void extractTenantFromIssUrlReturnTenantIfUrlContainSlash(String issUrl) {
         assertEquals(PITC, tenantFromIssUrl.get());
     }
 
-    @DisplayName("extractTenantFromIssUrl() return input url if url not contains slash")
+    @DisplayName("Should return a input url if the url does not contain a slash after calling extractTenantFromIssUrl()")
     @Test
-    void extractTenantFromIssUrlReturnInputIfUrlNotContainSlash() {
+    void extractTenantFromIssUrlReturnsInputIfUrlNotContainSlash() {
         // arrange
         String issUrl = "this_is_not_a_valid_url";
 
@@ -40,9 +39,9 @@ void extractTenantFromIssUrlReturnInputIfUrlNotContainSlash() {
         assertEquals(issUrl, tenantFromIssUrl.get());
     }
 
-    @DisplayName("extractTenantFromIssUrl() return empty if url is null")
+    @DisplayName("Should return empty if the url is null after calling extractTenantFromIssUrl()")
     @Test
-    void extractTenantFromIssUrlReturnEmptyIfUrlIsNull() {
+    void extractTenantFromIssUrlReturnsEmptyIfUrlIsNull() {
         // arrange
         String issUrl = null;
 
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/ActionAuthorizationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/ActionAuthorizationServiceTest.java
index 950fc4e9dd..0cb8b828cf 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/ActionAuthorizationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/ActionAuthorizationServiceTest.java
@@ -13,6 +13,7 @@
 import ch.puzzle.okr.models.keyresult.KeyResultMetric;
 import ch.puzzle.okr.service.business.ActionBusinessService;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -38,7 +39,7 @@ class ActionAuthorizationServiceTest {
             .builder()
             .withId(1L)
             .withAction("Neue Katze")
-            .withIsChecked(false)
+            .isChecked(false)
             .withPriority(0)
             .withKeyResult(keyResult)
             .build();
@@ -46,15 +47,15 @@ class ActionAuthorizationServiceTest {
             .builder()
             .withId(2L)
             .withAction("Neues Lama")
-            .withIsChecked(true)
+            .isChecked(true)
             .withPriority(1)
             .withKeyResult(keyResult)
             .build();
     private final List<Action> actionList = List.of(action1, action2);
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should return a list of actions when writable is {0}")
     @ValueSource(booleans = { true, false })
-    void getActionsByKeyResultShouldReturnListOfActions(boolean isWriteable) {
+    void shouldReturnListOfActionsByKeyResultBasedOnWritable(boolean isWriteable) {
         keyResult.setWriteable(isWriteable);
         when(actionBusinessService.getActionsByKeyResultId(anyLong())).thenReturn(actionList);
 
@@ -64,8 +65,9 @@ void getActionsByKeyResultShouldReturnListOfActions(boolean isWriteable) {
         foundActionList.forEach(action -> assertEquals(isWriteable, action.isWriteable()));
     }
 
+    @DisplayName("Should return created action when authorized")
     @Test
-    void createEntityShouldReturnCreatedActionWhenAuthorized() {
+    void shouldReturnCreatedActionWhenAuthorized() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
 
         action1.setWriteable(false);
@@ -78,8 +80,9 @@ void createEntityShouldReturnCreatedActionWhenAuthorized() {
         verify(actionBusinessService, times(1)).createEntities(receivedActionList);
     }
 
+    @DisplayName("Should throw exception when creating entity without authorization")
     @Test
-    void createEntityShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenCreatingEntityWithoutAuthorization() {
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         doThrow(new ResponseStatusException(HttpStatus.UNAUTHORIZED, reason))
@@ -92,8 +95,9 @@ void createEntityShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should update actions when authorized")
     @Test
-    void updateEntitiesShouldUpdateActionWhenAuthorized() {
+    void shouldUpdateActionsWhenAuthorized() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
 
         actionAuthorizationService.updateEntities(actionList);
@@ -101,8 +105,9 @@ void updateEntitiesShouldUpdateActionWhenAuthorized() {
         verify(actionBusinessService, times(1)).updateEntities(actionList);
     }
 
+    @DisplayName("Should throw exception when updating entities without authorization")
     @Test
-    void updateEntitiesShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenUpdatingEntitiesWithoutAuthorization() {
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         doThrow(new ResponseStatusException(HttpStatus.UNAUTHORIZED, reason))
@@ -115,8 +120,9 @@ void updateEntitiesShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should delete entity by ID when authorized")
     @Test
-    void deleteEntityByIdShouldPassThroughWhenAuthorized() {
+    void shouldDeleteEntityByIdWhenAuthorized() {
         Long id = 5L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
 
@@ -125,8 +131,9 @@ void deleteEntityByIdShouldPassThroughWhenAuthorized() {
         verify(actionBusinessService, times(1)).deleteEntityById(id);
     }
 
+    @DisplayName("Should throw exception when deleting entity without authorization")
     @Test
-    void deleteEntityByIdShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenDeletingEntityWithoutAuthorization() {
         Long id = 8L;
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/AuthorizationRegistrationServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/AuthorizationRegistrationServiceIT.java
index 71b0285a5b..eb3756637b 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/AuthorizationRegistrationServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/AuthorizationRegistrationServiceIT.java
@@ -65,8 +65,9 @@ private void assertOkrChampionStatusInDb(String email, boolean expectedOkrChampi
         assertEquals(expectedOkrChampionStatus, userInDb.get().isOkrChampion());
     }
 
+    @DisplayName("Should add the authorization-user to the cache")
     @Test
-    void registerAuthorizationUserShouldAddAuthorizationUserToCache() {
+    void shouldAddAuthorizationUserToCache() {
         // arrange
         Cache cache = cacheManager.getCache(AUTHORIZATION_USER_CACHE);
 
@@ -81,14 +82,14 @@ void registerAuthorizationUserShouldAddAuthorizationUserToCache() {
         userPersistenceService.deleteById(user.getId());
     }
 
-    @DisplayName("registerAuthorizationUser for a user with an email not defined in the application-integration-test.properties should set OkrChampions to false")
+    @DisplayName("Should set isOkrChampion to false for a user with an email not defined in the application-integration-test.properties")
     @Test
-    void registerAuthorizationUser_shouldSetOkrChampionsToFalse() {
+    void shouldSetIsOkrChampionToFalseForUserWithEmailNotInProperties() {
         // arrange
         User user = User.Builder
                 .builder() //
-                .withFirstname("Richard") //
-                .withLastname("Eberhard") //
+                .withFirstName("Richard") //
+                .withLastName("Eberhard") //
                 .withEmail("richard.eberhard@puzzle.ch") // email not found in application-integration-test.properties
                 .build();
 
@@ -118,9 +119,9 @@ void registerAuthorizationUser_shouldSetOkrChampionsToFalse() {
      * user champion. - the OkrChampion status must manually be reset (in the
      * tearDown method) </pre>
      */
+    @DisplayName("Should set isOkrChampion to true for a user with an email defined in the application-integration-test.properties")
     @Test
-    @DisplayName("registerAuthorizationUser for a user with an email defined in the application-integration-test.properties should set OkrChampions to true")
-    void registerAuthorizationUserShouldSetOkrChampionsToTrue() {
+    void shouldSetIsOkrChampionToTrueForUserWithEmailInProperties() {
         // arrange
         assertOkrChampionStatusInDb(EMAIL_WUNDERLAND, false); // pre-condition
 
@@ -131,10 +132,10 @@ void registerAuthorizationUserShouldSetOkrChampionsToTrue() {
         AuthorizationUser processedUser = authorizationRegistrationService
                 .updateOrAddAuthorizationUser(User.Builder
                         .builder() //
-                        .withFirstname("Alice") //
-                        .withLastname("Wunderland") //
+                        .withFirstName("Alice") //
+                        .withLastName("Wunderland") //
                         .withEmail(EMAIL_WUNDERLAND) // user.champion.emails from
-                                                     // application-integration-test.properties
+                        // application-integration-test.properties
                         .build());
 
         // assert
@@ -142,13 +143,14 @@ void registerAuthorizationUserShouldSetOkrChampionsToTrue() {
         assertOkrChampionStatusInDb(processedUser.user().getEmail(), true);
     }
 
+    @DisplayName("Should set firstname and lastname from the token")
     @Test
-    void registerAuthorizationUser_shouldSetFirstnameAndLastnameFromToken() {
+    void shouldSetFirstnameAndLastnameFromToken() {
         // arrange
         User user = User.Builder
                 .builder() //
-                .withFirstname("Richard") //
-                .withLastname("Eberhard") //
+                .withFirstName("Richard") //
+                .withLastName("Eberhard") //
                 .withEmail("richard.eberhard@puzzle.ch") //
                 .build();
         userPersistenceService.save(user);
@@ -157,8 +159,8 @@ void registerAuthorizationUser_shouldSetFirstnameAndLastnameFromToken() {
         String lastNameFromToken = "von Gunten";
         User userFromToken = User.Builder
                 .builder() //
-                .withFirstname(firstNameFromToken) //
-                .withLastname(lastNameFromToken) //
+                .withFirstName(firstNameFromToken) //
+                .withLastName(lastNameFromToken) //
                 .withEmail("richard.eberhard@puzzle.ch") //
                 .build();
 
@@ -168,8 +170,8 @@ void registerAuthorizationUser_shouldSetFirstnameAndLastnameFromToken() {
         // assert
         Optional<User> userFromDB = userPersistenceService.findByEmail(user.getEmail());
         assertTrue(userFromDB.isPresent());
-        assertEquals(userFromDB.get().getFirstname(), firstNameFromToken);
-        assertEquals(userFromDB.get().getLastname(), lastNameFromToken);
+        assertEquals(userFromDB.get().getFirstName(), firstNameFromToken);
+        assertEquals(userFromDB.get().getLastName(), lastNameFromToken);
 
         // cleanup
         userPersistenceService.deleteById(userFromDB.get().getId());
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/AuthorizationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/AuthorizationServiceTest.java
index 8aa1fab898..5176efdaf3 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/AuthorizationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/AuthorizationServiceTest.java
@@ -26,6 +26,7 @@
 import ch.puzzle.okr.test.TestHelper;
 import java.util.Collection;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -61,44 +62,44 @@ class AuthorizationServiceTest {
     private final User user = defaultUserWithTeams(1L, adminTeams, memberTeams);
     private final User okrChampion = defaultOkrChampion(1L);
 
+    @DisplayName("Should return false when user does not have write all role")
     @Test
-    void hasRoleWriteAllShouldReturnTrueWhenContainsRole() {
-        AuthorizationUser authorizationUser = new AuthorizationUser(okrChampion);
-        assertTrue(hasRoleWriteAndReadAll(authorizationUser));
-    }
-
-    @Test
-    void hasRoleWriteAllShouldReturnFalseWhenDoesNotContainsRole() {
+    void shouldReturnFalseWhenUserDoesNotHaveWriteAllRole() {
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
         assertFalse(hasRoleWriteAndReadAll(authorizationUser));
     }
 
+    @DisplayName("Should return true when user is OKR champion for team")
     @Test
-    void hasRoleWriteForTeam_shouldReturnTrueWhenOkrChampion() {
+    void shouldReturnTrueWhenUserIsOkrChampionForTeam() {
         AuthorizationUser authorizationUser = new AuthorizationUser(okrChampion);
         assertTrue(hasRoleWriteForTeam(authorizationUser, 3L));
     }
 
+    @DisplayName("Should return true when user is admin for team")
     @Test
-    void hasRoleWriteForTeam_shouldReturnTrueWhenUserIsAdmin() {
+    void shouldReturnTrueWhenUserIsAdminForTeam() {
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
         assertTrue(hasRoleWriteForTeam(authorizationUser, 1L));
     }
 
+    @DisplayName("Should return true when user is a member of the team")
     @Test
-    void hasRoleWriteForTeam_shouldReturnTrueWhenUserIsInTeam() {
+    void shouldReturnTrueWhenUserIsMemberOfTeam() {
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
         assertTrue(hasRoleWriteForTeam(authorizationUser, 3L));
     }
 
+    @DisplayName("Should return false when user is not a member of the team")
     @Test
-    void hasRoleWriteForTeam_shouldReturnFalseWhenUserIsNotInTeam() {
+    void shouldReturnFalseWhenUserIsNotMemberOfTeam() {
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
         assertFalse(hasRoleWriteForTeam(authorizationUser, 5L));
     }
 
+    @DisplayName("Should return AuthorizationUser from security context")
     @Test
-    void getAuthorizationUserShouldReturnAuthorizationUser() {
+    void shouldReturnAuthorizationUserFromSecurityContext() {
         User user = defaultUser(null);
         Jwt token = mockJwtToken(user);
         AuthorizationUser authorizationUser = defaultAuthorizationUser();
@@ -110,8 +111,9 @@ void getAuthorizationUserShouldReturnAuthorizationUser() {
         assertNotNull(authorizationService.updateOrAddAuthorizationUser());
     }
 
+    @DisplayName("Should allow read access by objective ID when permitted")
     @Test
-    void hasRoleReadByObjectiveIdShouldPassThroughWhenPermitted() {
+    void shouldAllowReadAccessByObjectiveIdWhenPermitted() {
         Long id = 13L;
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
         when(objectivePersistenceService.findObjectiveById(eq(id), eq(authorizationUser), any()))
@@ -120,8 +122,9 @@ void hasRoleReadByObjectiveIdShouldPassThroughWhenPermitted() {
         authorizationService.hasRoleReadByObjectiveId(id, authorizationUser);
     }
 
+    @DisplayName("Should throw exception when objective not found for read by KeyResult ID")
     @Test
-    void hasRoleReadByKeyResultIdShouldThrowExceptionWhenObjectiveNotFound() {
+    void shouldThrowExceptionWhenObjectiveNotFoundForReadByKeyResultId() {
         Long id = 13L;
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
         OkrResponseStatusException expectedException = OkrResponseStatusException
@@ -142,8 +145,9 @@ void hasRoleReadByKeyResultIdShouldThrowExceptionWhenObjectiveNotFound() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(actualException.getReason()));
     }
 
+    @DisplayName("Should allow read access by KeyResult ID when permitted")
     @Test
-    void hasRoleReadByKeyResultIdShouldPassThroughWhenPermitted() {
+    void shouldAllowReadAccessByKeyResultIdWhenPermitted() {
         Long id = 13L;
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
         OkrResponseStatusException expectedException = OkrResponseStatusException
@@ -154,8 +158,9 @@ void hasRoleReadByKeyResultIdShouldPassThroughWhenPermitted() {
         authorizationService.hasRoleReadByKeyResultId(id, authorizationUser);
     }
 
+    @DisplayName("Should throw exception when objective not found for read by CheckIn ID")
     @Test
-    void hasRoleReadByCheckInIdShouldThrowExceptionWhenObjectiveNotFound() {
+    void shouldThrowExceptionWhenObjectiveNotFoundForReadByCheckInId() {
         Long id = 13L;
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
 
@@ -176,45 +181,47 @@ void hasRoleReadByCheckInIdShouldThrowExceptionWhenObjectiveNotFound() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(actualException.getReason()));
     }
 
+    @DisplayName("Should allow read access by CheckIn ID when permitted")
     @Test
-    void hasRoleReadByCheckInIdShouldPassThroughWhenPermitted() {
+    void shouldAllowReadAccessByCheckInIdWhenPermitted() {
         Long id = 13L;
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
-        OkrResponseStatusException expectedException = OkrResponseStatusException
-                .of(NOT_AUTHORIZED_TO_READ, "Check-in");
-
         when(objectivePersistenceService.findObjectiveByCheckInId(eq(id), eq(authorizationUser), any()))
                 .thenReturn(new Objective());
 
         authorizationService.hasRoleReadByCheckInId(id, authorizationUser);
     }
 
+    @DisplayName("Should allow create or update for all objectives when authorized")
     @Test
-    void hasRoleCreateOrUpdateShouldPassThroughWhenAuthorizedForAllObjectives() {
+    void shouldAllowCreateOrUpdateForAllObjectivesWhenAuthorized() {
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(5L).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(okrChampion);
 
         authorizationService.hasRoleCreateOrUpdate(objective, authorizationUser);
     }
 
+    @DisplayName("Should allow create or update when user is admin")
     @Test
-    void hasRoleCreateOrUpdateShouldPassThroughWhenAdmin() {
+    void shouldAllowCreateOrUpdateWhenUserIsAdmin() {
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(1L).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
 
         authorizationService.hasRoleCreateOrUpdate(objective, authorizationUser);
     }
 
+    @DisplayName("Should allow create or update when user is team member")
     @Test
-    void hasRoleCreateOrUpdateShouldPassThroughWhenMember() {
+    void shouldAllowCreateOrUpdateWhenUserIsTeamMember() {
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(3L).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
 
         authorizationService.hasRoleCreateOrUpdate(objective, authorizationUser);
     }
 
+    @DisplayName("Should throw exception for create or update when user is not in team")
     @Test
-    void hasRoleCreateOrUpdateShouldThrowExceptionWhenNotInTeam() {
+    void shouldThrowExceptionForCreateOrUpdateWhenUserIsNotInTeam() {
         var id = otherTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
@@ -231,8 +238,9 @@ void hasRoleCreateOrUpdateShouldThrowExceptionWhenNotInTeam() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should allow create or update for key results when authorized")
     @Test
-    void hasRoleCreateOrUpdateShouldPassThroughWhenAuthorizedForKeyResults() {
+    void shouldAllowCreateOrUpdateForKeyResultsWhenAuthorized() {
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(1L).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(okrChampion);
@@ -244,8 +252,9 @@ void hasRoleCreateOrUpdateShouldPassThroughWhenAuthorizedForKeyResults() {
         authorizationService.hasRoleCreateOrUpdate(keyResult, authorizationUser);
     }
 
+    @DisplayName("Should allow create or update as admin for key results")
     @Test
-    void hasRoleCreateOrUpdateShouldPassThroughWhenAuthorizedAsAdminForKeyResults() {
+    void shouldAllowCreateOrUpdateAsAdminForKeyResults() {
         var id = adminTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
@@ -258,8 +267,9 @@ void hasRoleCreateOrUpdateShouldPassThroughWhenAuthorizedAsAdminForKeyResults()
         authorizationService.hasRoleCreateOrUpdate(keyResult, authorizationUser);
     }
 
+    @DisplayName("Should throw exception when not authorized for key results")
     @Test
-    void hasRoleCreateOrUpdateShouldThrowExceptionWhenNotAuthorizedForKeyResults() {
+    void shouldThrowExceptionWhenNotAuthorizedForKeyResults() {
         var id = otherTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
@@ -281,8 +291,9 @@ void hasRoleCreateOrUpdateShouldThrowExceptionWhenNotAuthorizedForKeyResults() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should allow create or update as admin for team check-ins")
     @Test
-    void hasRoleCreateOrUpdateShouldPassThroughWhenAuthorizedAsAdminForTeamCheckIns() {
+    void shouldPassThroughWhenAuthorizedAsAdminForTeamCheckIns() {
         var id = adminTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
@@ -298,8 +309,9 @@ void hasRoleCreateOrUpdateShouldPassThroughWhenAuthorizedAsAdminForTeamCheckIns(
         authorizationService.hasRoleCreateOrUpdate(checkIn, authorizationUser);
     }
 
+    @DisplayName("Should pass through when authorized as member for team check-ins")
     @Test
-    void hasRoleCreateOrUpdateShouldPassThroughWhenAuthorizedAsMemberForTeamCheckIns() {
+    void shouldPassThroughWhenAuthorizedAsMemberForTeamCheckIns() {
         var id = memberTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
@@ -315,8 +327,9 @@ void hasRoleCreateOrUpdateShouldPassThroughWhenAuthorizedAsMemberForTeamCheckIns
         authorizationService.hasRoleCreateOrUpdate(checkIn, authorizationUser);
     }
 
+    @DisplayName("Should throw exception when not in team for team check-ins")
     @Test
-    void hasRoleCreateOrUpdateShouldThrowExceptionWhenNotInTeamForTeamCheckIns() {
+    void shouldThrowExceptionWhenNotInTeamForTeamCheckIns() {
         var id = otherTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
@@ -340,8 +353,9 @@ void hasRoleCreateOrUpdateShouldThrowExceptionWhenNotInTeamForTeamCheckIns() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should pass through when authorized for all objectives by objective ID")
     @Test
-    void hasRoleCreateOrUpdateByObjectiveIdShouldPassThroughWhenAuthorizedForAllObjectives() {
+    void shouldPassThroughWhenAuthorizedForAllObjectivesByObjectiveId() {
         Long id = 13L;
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(5L).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(okrChampion);
@@ -351,8 +365,9 @@ void hasRoleCreateOrUpdateByObjectiveIdShouldPassThroughWhenAuthorizedForAllObje
         authorizationService.hasRoleCreateOrUpdateByObjectiveId(id, authorizationUser);
     }
 
+    @DisplayName("Should pass through when authorized as admin by objective ID")
     @Test
-    void hasRoleCreateOrUpdateByObjectiveIdShouldPassThroughWhenAuthorizedAsAdmin() {
+    void shouldPassThroughWhenAuthorizedAsAdminByObjectiveId() {
         var id = adminTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
@@ -362,8 +377,9 @@ void hasRoleCreateOrUpdateByObjectiveIdShouldPassThroughWhenAuthorizedAsAdmin()
         authorizationService.hasRoleCreateOrUpdateByObjectiveId(id, authorizationUser);
     }
 
+    @DisplayName("Should pass through when authorized as member by objective ID")
     @Test
-    void hasRoleCreateOrUpdateByObjectiveIdShouldPassThroughWhenAuthorizedAsMember() {
+    void shouldPassThroughWhenAuthorizedAsMemberByObjectiveId() {
         var id = memberTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
@@ -373,8 +389,9 @@ void hasRoleCreateOrUpdateByObjectiveIdShouldPassThroughWhenAuthorizedAsMember()
         authorizationService.hasRoleCreateOrUpdateByObjectiveId(id, authorizationUser);
     }
 
+    @DisplayName("Should throw exception when not in team by objective ID")
     @Test
-    void hasRoleCreateOrUpdateByObjectiveIdShouldThrowExceptionWhenNotInTeam() {
+    void shouldThrowExceptionWhenNotInTeamByObjectiveId() {
         var id = otherTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
@@ -391,19 +408,20 @@ void hasRoleCreateOrUpdateByObjectiveIdShouldThrowExceptionWhenNotInTeam() {
         assertEquals(UNAUTHORIZED, exception.getStatusCode());
         assertThat(expectedErrors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
-
     }
 
+    @DisplayName("Should return true when authorized to write all objectives for team")
     @Test
-    void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedToWriteAllObjectives() {
+    void shouldReturnTrueWhenAuthorizedToWriteAllObjectivesForTeam() {
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(5L).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(okrChampion);
 
         assertTrue(authorizationService.hasRoleWriteForTeam(objective, authorizationUser));
     }
 
+    @DisplayName("Should return true when authorized as admin for team")
     @Test
-    void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedAsAdmin() {
+    void shouldReturnTrueWhenAuthorizedAsAdminForTeam() {
         var id = adminTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
@@ -411,8 +429,9 @@ void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedAsAdmin() {
         assertTrue(authorizationService.hasRoleWriteForTeam(objective, authorizationUser));
     }
 
+    @DisplayName("Should return true when authorized as member for team")
     @Test
-    void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedAsMember() {
+    void shouldReturnTrueWhenAuthorizedAsMemberForTeam() {
         var id = memberTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
@@ -420,8 +439,9 @@ void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedAsMember() {
         assertTrue(authorizationService.hasRoleWriteForTeam(objective, authorizationUser));
     }
 
+    @DisplayName("Should return false when not member of team")
     @Test
-    void hasRoleWriteForTeamShouldReturnFalseWhenNotMemberOfTeam() {
+    void shouldReturnFalseWhenNotMemberOfTeam() {
         var id = otherTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
@@ -429,8 +449,9 @@ void hasRoleWriteForTeamShouldReturnFalseWhenNotMemberOfTeam() {
         assertFalse(authorizationService.hasRoleWriteForTeam(objective, authorizationUser));
     }
 
+    @DisplayName("Should return true when authorized to write all key results for team")
     @Test
-    void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedToWriteAllKeyResults() {
+    void shouldReturnTrueWhenAuthorizedToWriteAllKeyResultsForTeam() {
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(4L).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(okrChampion);
@@ -442,8 +463,9 @@ void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedToWriteAllKeyResults() {
         assertTrue(authorizationService.hasRoleWriteForTeam(keyResult, authorizationUser));
     }
 
+    @DisplayName("Should return true when authorized as admin for key results")
     @Test
-    void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedAsAdminForKeyResults() {
+    void shouldReturnTrueWhenAuthorizedAsAdminForKeyResults() {
         var id = adminTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
@@ -456,8 +478,9 @@ void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedAsAdminForKeyResults() {
         assertTrue(authorizationService.hasRoleWriteForTeam(keyResult, authorizationUser));
     }
 
+    @DisplayName("Should return false when not authorized to write key results")
     @Test
-    void hasRoleWriteForTeamShouldReturnFalseWhenNotAuthorizedToWriteKeyResults() {
+    void shouldReturnFalseWhenNotAuthorizedToWriteKeyResults() {
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(5L).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
         AuthorizationUser authorizationUser = mockAuthorizationUser(user);
@@ -469,8 +492,9 @@ void hasRoleWriteForTeamShouldReturnFalseWhenNotAuthorizedToWriteKeyResults() {
         assertFalse(authorizationService.hasRoleWriteForTeam(keyResult, authorizationUser));
     }
 
+    @DisplayName("Should return true when authorized to write all check-ins for team")
     @Test
-    void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedToWriteAllCheckIns() {
+    void shouldReturnTrueWhenAuthorizedToWriteAllCheckInsForTeam() {
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(5L).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
         CheckIn checkIn = CheckInMetric.Builder.builder().withKeyResult(keyResult).build();
@@ -483,8 +507,9 @@ void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedToWriteAllCheckIns() {
         assertTrue(authorizationService.hasRoleWriteForTeam(checkIn, authorizationUser));
     }
 
+    @DisplayName("Should return true when authorized as admin for check-ins")
     @Test
-    void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedAsAdminForCheckIns() {
+    void shouldReturnTrueWhenAuthorizedAsAdminForCheckIns() {
         var id = adminTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(id).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
@@ -498,8 +523,9 @@ void hasRoleWriteForTeamShouldReturnTrueWhenAuthorizedAsAdminForCheckIns() {
         assertTrue(authorizationService.hasRoleWriteForTeam(checkIn, authorizationUser));
     }
 
+    @DisplayName("Should return false when not authorized to write check-ins")
     @Test
-    void hasRoleWriteForTeamShouldReturnFalseWhenNotAuthorizedToWriteCheckIns() {
+    void shouldReturnFalseWhenNotAuthorizedToWriteCheckIns() {
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(5L).build()).build();
         KeyResult keyResult = KeyResultMetric.Builder.builder().withObjective(objective).build();
         CheckIn checkIn = CheckInMetric.Builder.builder().withKeyResult(keyResult).build();
@@ -512,8 +538,9 @@ void hasRoleWriteForTeamShouldReturnFalseWhenNotAuthorizedToWriteCheckIns() {
         assertFalse(authorizationService.hasRoleWriteForTeam(checkIn, authorizationUser));
     }
 
+    @DisplayName("Should pass through when authorized for all objectives by objective ID for deletion")
     @Test
-    void hasRoleDeleteByObjectiveIdShouldPassThroughWhenAuthorizedForAllObjectives() {
+    void shouldPassThroughWhenAuthorizedForAllObjectivesByObjectiveIdForDeletion() {
         Long id = 13L;
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(5L).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(okrChampion);
@@ -523,8 +550,9 @@ void hasRoleDeleteByObjectiveIdShouldPassThroughWhenAuthorizedForAllObjectives()
         authorizationService.hasRoleDeleteByObjectiveId(id, authorizationUser);
     }
 
+    @DisplayName("Should pass through when authorized for all team key results by key result ID")
     @Test
-    void hasRoleDeleteByKeyResultIdShouldPassThroughWhenAuthorizedForAllTeamsKeyResults() {
+    void shouldPassThroughWhenAuthorizedForAllTeamKeyResultsByKeyResultId() {
         Long id = 13L;
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(1L).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(okrChampion);
@@ -535,8 +563,9 @@ void hasRoleDeleteByKeyResultIdShouldPassThroughWhenAuthorizedForAllTeamsKeyResu
         authorizationService.hasRoleDeleteByKeyResultId(id, authorizationUser);
     }
 
+    @DisplayName("Should pass through when authorized as admin for team check-ins by check-in ID")
     @Test
-    void hasRoleDeleteByCheckInIdShouldPassThroughWhenAuthorizedAsAdminForTeamCheckIns() {
+    void shouldPassThroughWhenAuthorizedAsAdminForTeamCheckInsByCheckInId() {
         var id = adminTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(1L).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
@@ -547,8 +576,9 @@ void hasRoleDeleteByCheckInIdShouldPassThroughWhenAuthorizedAsAdminForTeamCheckI
         authorizationService.hasRoleDeleteByCheckInId(id, authorizationUser);
     }
 
+    @DisplayName("Should pass through when authorized as member for team check-ins by check-in ID")
     @Test
-    void hasRoleDeleteByCheckInIdShouldPassThroughWhenAuthorizedAsMemberForTeamCheckIns() {
+    void shouldPassThroughWhenAuthorizedAsMemberForTeamCheckInsByCheckInId() {
         var id = memberTeams.get(0).getId();
         Objective objective = Objective.Builder.builder().withTeam(Team.Builder.builder().withId(1L).build()).build();
         AuthorizationUser authorizationUser = new AuthorizationUser(user);
@@ -559,8 +589,9 @@ void hasRoleDeleteByCheckInIdShouldPassThroughWhenAuthorizedAsMemberForTeamCheck
         authorizationService.hasRoleDeleteByCheckInId(id, authorizationUser);
     }
 
+    @DisplayName("Should pass through when OKR champion for key results by key result ID")
     @Test
-    void hasRoleDeleteByKeyResultIdShouldPassThroughWhenOkrChampion() {
+    void shouldPassThroughWhenOkrChampionForKeyResultsByKeyResultId() {
         var otherTeamId = otherTeams.get(0).getId();
         Objective objective = Objective.Builder
                 .builder()
@@ -573,8 +604,9 @@ void hasRoleDeleteByKeyResultIdShouldPassThroughWhenOkrChampion() {
         authorizationService.hasRoleDeleteByKeyResultId(1L, authorizationUser);
     }
 
+    @DisplayName("Should pass through when admin for key results by key result ID")
     @Test
-    void hasRoleDeleteByKeyResultIdShouldPassThroughWhenAdmin() {
+    void shouldPassThroughWhenAdminForKeyResultsByKeyResultId() {
         var otherTeamId = adminTeams.get(0).getId();
         Objective objective = Objective.Builder
                 .builder()
@@ -587,8 +619,9 @@ void hasRoleDeleteByKeyResultIdShouldPassThroughWhenAdmin() {
         authorizationService.hasRoleDeleteByKeyResultId(1L, authorizationUser);
     }
 
+    @DisplayName("Should pass through when member for key results by key result ID")
     @Test
-    void hasRoleDeleteByKeyResultIdShouldPassThroughWhenMember() {
+    void shouldPassThroughWhenMemberForKeyResultsByKeyResultId() {
         var otherTeamId = memberTeams.get(0).getId();
         Objective objective = Objective.Builder
                 .builder()
@@ -601,8 +634,9 @@ void hasRoleDeleteByKeyResultIdShouldPassThroughWhenMember() {
         authorizationService.hasRoleDeleteByKeyResultId(1L, authorizationUser);
     }
 
+    @DisplayName("Should throw exception when not in team for key results by key result ID")
     @Test
-    void hasRoleDeleteByKeyResultIdShouldThrowExceptionWhenNotInTeam() {
+    void shouldThrowExceptionWhenNotInTeamForKeyResultsByKeyResultId() {
         var otherTeamId = otherTeams.get(0).getId();
         Objective objective = Objective.Builder
                 .builder()
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/CheckInAuthorizationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/CheckInAuthorizationServiceTest.java
index 96a0c6a2c1..e63ed61ead 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/CheckInAuthorizationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/CheckInAuthorizationServiceTest.java
@@ -10,6 +10,7 @@
 import ch.puzzle.okr.models.authorization.AuthorizationUser;
 import ch.puzzle.okr.models.checkin.CheckIn;
 import ch.puzzle.okr.service.business.CheckInBusinessService;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -29,8 +30,9 @@ class CheckInAuthorizationServiceTest {
 
     private final AuthorizationUser authorizationUser = defaultAuthorizationUser();
 
+    @DisplayName("Should return a check-in when authorized")
     @Test
-    void getEntityByIdShouldReturnCheckInWhenAuthorized() {
+    void shouldReturnCheckInWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(checkInBusinessService.getEntityById(id)).thenReturn(checkInMetric);
@@ -39,8 +41,9 @@ void getEntityByIdShouldReturnCheckInWhenAuthorized() {
         assertEquals(checkInMetric, checkIn);
     }
 
+    @DisplayName("Should return a writeable check-in when authorized")
     @Test
-    void getEntityByIdShouldReturnCheckInWritableWhenAuthorized() {
+    void shouldReturnCheckInWritableWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(authorizationService.hasRoleWriteForTeam(checkInMetric, authorizationUser)).thenReturn(true);
@@ -50,8 +53,9 @@ void getEntityByIdShouldReturnCheckInWritableWhenAuthorized() {
         assertTrue(checkIn.isWriteable());
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized")
     @Test
-    void getEntityByIdShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenUserNotAuthorizedForEntityById() {
         Long id = 13L;
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
@@ -65,8 +69,9 @@ void getEntityByIdShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should return a created check-in when authorized")
     @Test
-    void createEntityShouldReturnCreatedCheckInWhenAuthorized() {
+    void shouldReturnCreatedCheckInWhenAuthorized() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(checkInBusinessService.createEntity(checkInMetric, authorizationUser)).thenReturn(checkInMetric);
 
@@ -74,8 +79,9 @@ void createEntityShouldReturnCreatedCheckInWhenAuthorized() {
         assertEquals(checkInMetric, checkIn);
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to create entity")
     @Test
-    void createEntityShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenUserNotAuthorizedToCreateEntity() {
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         doThrow(new ResponseStatusException(HttpStatus.UNAUTHORIZED, reason))
@@ -88,8 +94,9 @@ void createEntityShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should return an updated check-in when authorized")
     @Test
-    void updateEntityShouldReturnUpdatedCheckInWhenAuthorized() {
+    void shouldReturnUpdatedCheckInWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(checkInBusinessService.updateEntity(id, checkInMetric, authorizationUser)).thenReturn(checkInMetric);
@@ -98,8 +105,9 @@ void updateEntityShouldReturnUpdatedCheckInWhenAuthorized() {
         assertEquals(checkInMetric, checkIn);
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to update entity")
     @Test
-    void updateEntityShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenUserNotAuthorizedToUpdateEntity() {
         Long id = 13L;
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
@@ -114,16 +122,18 @@ void updateEntityShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should successfully delete entity by ID when authorized")
     @Test
-    void deleteEntityByIdShouldPassThroughWhenAuthorized() {
+    void shouldDeleteEntityByIdWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
 
         checkInAuthorizationService.deleteEntityById(id);
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to delete entity by ID")
     @Test
-    void deleteEntityByIdShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenUserNotAuthorizedToDeleteEntityById() {
         Long id = 13L;
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/CompletedAuthorizationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/CompletedAuthorizationServiceTest.java
index e134637ef9..f19c88e7ce 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/CompletedAuthorizationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/CompletedAuthorizationServiceTest.java
@@ -11,6 +11,7 @@
 import ch.puzzle.okr.models.Objective;
 import ch.puzzle.okr.models.authorization.AuthorizationUser;
 import ch.puzzle.okr.service.business.CompletedBusinessService;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -36,8 +37,9 @@ class CompletedAuthorizationServiceTest {
             .withObjective(Objective.Builder.builder().withId(objectiveId).withTitle("Completed 1").build())
             .build();
 
+    @DisplayName("Should return the created object when authorized")
     @Test
-    void createCompletedShouldReturnObjectiveWhenAuthorized() {
+    void shouldReturnCreatedCompletedWhenAuthorized() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(completedBusinessService.createCompleted(newCompleted)).thenReturn(newCompleted);
 
@@ -45,8 +47,9 @@ void createCompletedShouldReturnObjectiveWhenAuthorized() {
         assertEquals(newCompleted, completed);
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to create completed object")
     @Test
-    void createCompletedShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenNotAuthorizedToCreateCompleted() {
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         doThrow(new ResponseStatusException(HttpStatus.UNAUTHORIZED, reason))
@@ -60,15 +63,17 @@ void createCompletedShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should successfully delete completed object by objective ID when authorized")
     @Test
-    void deleteCompletedByObjectiveIdShouldPassThroughWhenAuthorized() {
+    void shouldDeleteCompletedByObjectiveIdWhenAuthorized() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
 
         completedAuthorizationService.deleteCompletedByObjectiveId(13L);
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to delete completed object by objective ID")
     @Test
-    void deleteCompletedByObjectiveIdShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenNotAuthorizedToDeleteCompletedByObjectiveId() {
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         doThrow(new ResponseStatusException(HttpStatus.UNAUTHORIZED, reason))
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/KeyResultAuthorizationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/KeyResultAuthorizationServiceTest.java
index fb01a84d47..688e34abfa 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/KeyResultAuthorizationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/KeyResultAuthorizationServiceTest.java
@@ -35,8 +35,9 @@ class KeyResultAuthorizationServiceTest {
     AuthorizationService authorizationService;
     private final AuthorizationUser authorizationUser = defaultAuthorizationUser();
 
+    @DisplayName("Should return the created key-result when authorized")
     @Test
-    void createEntityShouldReturnKeyResultWhenAuthorized() {
+    void shouldReturnKeyResultWhenAuthorized() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(keyResultBusinessService.createEntity(metricKeyResult, authorizationUser)).thenReturn(metricKeyResult);
 
@@ -44,8 +45,9 @@ void createEntityShouldReturnKeyResultWhenAuthorized() {
         assertEquals(metricKeyResult, keyResult);
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to create key-result")
     @Test
-    void createEntityShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenNotAuthorizedToCreateKeyResult() {
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         doThrow(new ResponseStatusException(HttpStatus.UNAUTHORIZED, reason))
@@ -59,8 +61,9 @@ void createEntityShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should return a key-result when authorized")
     @Test
-    void getEntityByIdShouldReturnKeyResultWhenAuthorized() {
+    void shouldReturnKeyResultByIdWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(keyResultBusinessService.getEntityById(id)).thenReturn(metricKeyResult);
@@ -69,8 +72,9 @@ void getEntityByIdShouldReturnKeyResultWhenAuthorized() {
         assertEquals(metricKeyResult, keyResult);
     }
 
+    @DisplayName("Should return a writable key-result when authorized")
     @Test
-    void getEntityByIdShouldReturnKeyResultWritableWhenAuthorized() {
+    void shouldReturnWritableKeyResultWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(authorizationService.hasRoleWriteForTeam(metricKeyResult, authorizationUser)).thenReturn(true);
@@ -80,8 +84,9 @@ void getEntityByIdShouldReturnKeyResultWritableWhenAuthorized() {
         assertTrue(keyResult.isWriteable());
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to get key-result by ID")
     @Test
-    void getEntityByIdShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenNotAuthorizedToGetKeyResultById() {
         Long id = 13L;
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
@@ -95,20 +100,22 @@ void getEntityByIdShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should return the updated key-result when authorized")
     @Test
-    void updateEntitiesShouldReturnUpdatedKeyResultWhenAuthorized() {
+    void shouldReturnUpdatedKeyResultWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(keyResultBusinessService.updateEntities(id, metricKeyResult, List.of()))
                 .thenReturn(new KeyResultWithActionList(metricKeyResult, List.of()));
 
-        KeyResultWithActionList KeyResult = keyResultAuthorizationService
+        KeyResultWithActionList keyResult = keyResultAuthorizationService
                 .updateEntities(id, metricKeyResult, List.of());
-        assertEquals(metricKeyResult, KeyResult.keyResult());
+        assertEquals(metricKeyResult, keyResult.keyResult());
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to update key-result")
     @Test
-    void updateEntitiesShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenNotAuthorizedToUpdateKeyResult() {
         Long id = 13L;
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
@@ -123,8 +130,9 @@ void updateEntitiesShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should throw an exception for unsupported updateEntity method")
     @Test
-    void updateEntityShouldThrowException() {
+    void shouldThrowExceptionForUnsupportedUpdateEntityMethod() {
         ResponseStatusException exception = assertThrows(ResponseStatusException.class,
                                                          () -> keyResultAuthorizationService
                                                                  .updateEntity(1L, metricKeyResult));
@@ -134,16 +142,18 @@ void updateEntityShouldThrowException() {
                      exception.getReason());
     }
 
+    @DisplayName("Should successfully delete key-result by ID when authorized")
     @Test
-    void deleteEntityByIdShouldPassThroughWhenAuthorized() {
+    void shouldDeleteKeyResultByIdWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
 
         keyResultAuthorizationService.deleteEntityById(id);
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to delete key-result by ID")
     @Test
-    void deleteEntityByIdShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenNotAuthorizedToDeleteKeyResultById() {
         Long id = 13L;
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
@@ -157,8 +167,9 @@ void deleteEntityByIdShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should return a list of check-ins by key-result when authorized")
     @Test
-    void getAllCheckInsByKeyResultShouldReturnListOfCheckInsWhenAuthorized() {
+    void shouldReturnListOfCheckInsByKeyResultWhenAuthorized() {
         long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(keyResultBusinessService.getAllCheckInsByKeyResult(id)).thenReturn(List.of(checkIn1, checkIn1));
@@ -167,9 +178,9 @@ void getAllCheckInsByKeyResultShouldReturnListOfCheckInsWhenAuthorized() {
         assertThat(List.of(checkIn1, checkIn1)).hasSameElementsAs(checkIns);
     }
 
-    @DisplayName("getAllCheckInsByKeyResult() should return empty List if no Checkins are found")
+    @DisplayName("Should return an empty list if no check-ins are found by key-result")
     @Test
-    void getAllCheckInsByKeyResultShouldReturnEmptyListIfNoCheckinsAreFound() {
+    void shouldReturnEmptyListIfNoCheckInsAreFoundByKeyResult() {
         long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(keyResultBusinessService.getAllCheckInsByKeyResult(id)).thenReturn(List.of());
@@ -178,8 +189,9 @@ void getAllCheckInsByKeyResultShouldReturnEmptyListIfNoCheckinsAreFound() {
         assertThat(List.of()).hasSameElementsAs(checkIns);
     }
 
+    @DisplayName("Should return true when the key-result is in use")
     @Test
-    void isImUsedShouldReturnTrueWhenImUsed() {
+    void shouldReturnTrueWhenKeyResultIsInUse() {
         Long id = 13L;
         when(keyResultBusinessService.isImUsed(id, metricKeyResult)).thenReturn(true);
 
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/ObjectiveAuthorizationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/ObjectiveAuthorizationServiceTest.java
index 17abfa6b6e..6beb72135f 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/ObjectiveAuthorizationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/ObjectiveAuthorizationServiceTest.java
@@ -35,8 +35,9 @@ class ObjectiveAuthorizationServiceTest {
 
     private final Objective newObjective = Objective.Builder.builder().withId(5L).withTitle("Objective 1").build();
 
+    @DisplayName("Should return the created objective when authorized")
     @Test
-    void createEntityShouldReturnObjectiveWhenAuthorized() {
+    void shouldReturnCreatedObjectiveWhenAuthorized() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(objectiveBusinessService.createEntity(newObjective, authorizationUser)).thenReturn(newObjective);
 
@@ -44,8 +45,9 @@ void createEntityShouldReturnObjectiveWhenAuthorized() {
         assertEquals(newObjective, objective);
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to create an objective")
     @Test
-    void createEntityShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenNotAuthorizedToCreateObjective() {
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         doThrow(new ResponseStatusException(HttpStatus.UNAUTHORIZED, reason))
@@ -59,8 +61,9 @@ void createEntityShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should return an objective when authorized")
     @Test
-    void getEntityByIdShouldReturnObjectiveWhenAuthorized() {
+    void shouldReturnObjectiveByIdWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(objectiveBusinessService.getEntityById(id)).thenReturn(newObjective);
@@ -69,8 +72,9 @@ void getEntityByIdShouldReturnObjectiveWhenAuthorized() {
         assertEquals(newObjective, objective);
     }
 
+    @DisplayName("Should return a writable objective when authorized")
     @Test
-    void getEntityByIdShouldReturnObjectiveWritableWhenAuthorized() {
+    void shouldReturnWritableObjectiveByIdWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(authorizationService.hasRoleWriteForTeam(newObjective, authorizationUser)).thenReturn(true);
@@ -80,8 +84,9 @@ void getEntityByIdShouldReturnObjectiveWritableWhenAuthorized() {
         assertTrue(objective.isWriteable());
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to get an objective by ID")
     @Test
-    void getEntityByIdShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenNotAuthorizedToGetObjectiveById() {
         Long id = 13L;
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
@@ -95,18 +100,20 @@ void getEntityByIdShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should return the updated objective when authorized")
     @Test
-    void updateEntityShouldReturnUpdatedObjectiveWhenAuthorized() {
+    void shouldReturnUpdatedObjectiveWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(objectiveBusinessService.updateEntity(id, newObjective, authorizationUser)).thenReturn(newObjective);
 
-        Objective Objective = objectiveAuthorizationService.updateEntity(id, newObjective);
-        assertEquals(newObjective, Objective);
+        Objective objective = objectiveAuthorizationService.updateEntity(id, newObjective);
+        assertEquals(newObjective, objective);
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to update an objective")
     @Test
-    void updateEntityShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenNotAuthorizedToUpdateObjective() {
         Long id = 13L;
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
@@ -121,23 +128,26 @@ void updateEntityShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
+    @DisplayName("Should return true when the quarter has changed for an objective")
     @Test
-    void isImUsedShouldReturnTrueWhenQuarterChanged() {
+    void shouldReturnTrueWhenQuarterHasChangedForObjective() {
         when(objectiveBusinessService.isImUsed(newObjective)).thenReturn(true);
 
         assertTrue(objectiveAuthorizationService.isImUsed(newObjective));
     }
 
+    @DisplayName("Should successfully delete an objective by ID when authorized")
     @Test
-    void deleteEntityByIdShouldPassThroughWhenAuthorized() {
+    void shouldDeleteObjectiveByIdWhenAuthorized() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
 
         objectiveAuthorizationService.deleteEntityById(id);
     }
 
+    @DisplayName("Should throw an exception when the user is not authorized to delete an objective by ID")
     @Test
-    void deleteEntityByIdShouldThrowExceptionWhenNotAuthorized() {
+    void shouldThrowExceptionWhenNotAuthorizedToDeleteObjectiveById() {
         Long id = 13L;
         String reason = "junit test reason";
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
@@ -151,10 +161,9 @@ void deleteEntityByIdShouldThrowExceptionWhenNotAuthorized() {
         assertEquals(reason, exception.getReason());
     }
 
-    @DisplayName("duplicateEntity() should throw exception when not authorized")
+    @DisplayName("Should throw an exception when not authorized to duplicate an objective")
     @Test
-    void duplicateEntityShouldThrowExceptionWhenNotAuthorized() {
-        // arrange
+    void shouldThrowExceptionWhenNotAuthorizedToDuplicateObjective() {
         Long idExistingObjective = 13L;
         String reason = "junit test reason";
         Objective objective = Objective.Builder.builder().build();
@@ -167,22 +176,19 @@ void duplicateEntityShouldThrowExceptionWhenNotAuthorized() {
                 .when(authorizationService)
                 .hasRoleCreateOrUpdate(objective, authorizationUser);
 
-        // act
         ResponseStatusException exception = assertThrows(ResponseStatusException.class,
                                                          () -> objectiveAuthorizationService
                                                                  .duplicateEntity(idExistingObjective,
                                                                                   objective,
                                                                                   keyResults));
 
-        // assert
         assertEquals(UNAUTHORIZED, exception.getStatusCode());
         assertEquals(reason, exception.getReason());
     }
 
-    @DisplayName("duplicateEntity() should return duplicated Objective when authorized")
+    @DisplayName("Should return duplicated objective when authorized")
     @Test
-    void duplicateEntityShouldReturnDuplicatedObjectiveWhenAuthorized() {
-        // arrange
+    void shouldReturnDuplicatedObjectiveWhenAuthorized() {
         Long idExistingObjective = 13L;
 
         Objective newObjectiveWithoutKeyResults = Objective.Builder
@@ -204,16 +210,15 @@ void duplicateEntityShouldReturnDuplicatedObjectiveWhenAuthorized() {
                 .duplicateObjective(idExistingObjective, newObjectiveWithoutKeyResults, authorizationUser, keyResults))
                 .thenReturn(newObjectiveWithKeyResults);
 
-        // act
         Objective objective = objectiveAuthorizationService
                 .duplicateEntity(idExistingObjective, newObjectiveWithoutKeyResults, keyResults);
 
-        // assert
         assertEquals(newObjectiveWithKeyResults, objective);
     }
 
+    @DisplayName("Should return all corresponding key-results for an objective by ID")
     @Test
-    void getAllKeyResultsByObjectiveIdShouldReturnCorrectKeyResults() {
+    void shouldReturnAllKeyResultsForObjectiveById() {
         Long id = 13L;
         when(objectiveBusinessService.getAllKeyResultsByObjective(id))
                 .thenReturn(List.of(metricKeyResult, ordinalKeyResult));
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/OverviewAuthorizationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/OverviewAuthorizationServiceTest.java
index a329da5c29..6416bbe492 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/OverviewAuthorizationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/OverviewAuthorizationServiceTest.java
@@ -46,9 +46,9 @@ class OverviewAuthorizationServiceTest {
             .withObjectiveTitle("Objective 1")
             .build();
 
-    @DisplayName("getFilteredOverview() should do nothing when OverviewId is null")
+    @DisplayName("Should do nothing when OverviewId is null")
     @Test
-    void getFilteredOverviewShouldDoNothingWhenOverviewIdIsNull() {
+    void shouldDoNothingWhenOverviewIdIsNull() {
         // arrange
         Overview overviewWithoutOverviewId = mock(Overview.class);
         when(overviewWithoutOverviewId.getOverviewId()).thenReturn(null);
@@ -64,9 +64,9 @@ void getFilteredOverviewShouldDoNothingWhenOverviewIdIsNull() {
         verify(overviewWithoutOverviewId, never()).setWriteable(anyBoolean());
     }
 
-    @DisplayName("getFilteredOverview() should do nothing when TeamId is null")
+    @DisplayName("Should do nothing when TeamId is null")
     @Test
-    void getFilteredOverviewShouldDoNothingWhenTeamIdIsNull() {
+    void shouldDoNothingWhenTeamIdIsNull() {
         // arrange
         OverviewId overviewId = mock(OverviewId.class);
         when(overviewId.getTeamId()).thenReturn(null);
@@ -84,9 +84,9 @@ void getFilteredOverviewShouldDoNothingWhenTeamIdIsNull() {
         verify(overviewWithoutTeamId, never()).setWriteable(anyBoolean());
     }
 
-    @DisplayName("getFilteredOverview() should do nothing when ObjectiveId is null")
+    @DisplayName("Should do nothing when ObjectiveId is null")
     @Test
-    void getFilteredOverviewShouldDoNothingWhenObjectiveIdIsNull() {
+    void shouldDoNothingWhenObjectiveIdIsNull() {
         // arrange
         OverviewId overviewId = mock(OverviewId.class);
         when(overviewId.getObjectiveId()).thenReturn(null);
@@ -104,8 +104,9 @@ void getFilteredOverviewShouldDoNothingWhenObjectiveIdIsNull() {
         verify(overviewWithoutObjectiveId, never()).setWriteable(anyBoolean());
     }
 
+    @DisplayName("Should return the overviews when authorized")
     @Test
-    void getFilteredOverviewShouldReturnOverviewsWhenAuthorized() {
+    void shouldReturnOverviewsWhenAuthorized() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(overviewBusinessService.getFilteredOverview(any(), any(), any(), eq(authorizationUser)))
                 .thenReturn(List.of(overview));
@@ -115,8 +116,9 @@ void getFilteredOverviewShouldReturnOverviewsWhenAuthorized() {
         assertThat(List.of(overview)).hasSameElementsAs(overviews);
     }
 
+    @DisplayName("Should set writable property to true")
     @Test
-    void getFilteredOverviewShouldSetWritableProperlyToTrue() {
+    void shouldSetWritablePropertyToTrue() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(overviewBusinessService.getFilteredOverview(any(), any(), any(), eq(authorizationUser)))
                 .thenReturn(List.of(overview));
@@ -126,8 +128,9 @@ void getFilteredOverviewShouldSetWritableProperlyToTrue() {
         assertTrue(overviews.get(0).isWriteable());
     }
 
+    @DisplayName("Should set writable property to false")
     @Test
-    void getFilteredOverviewShouldSetWritableProperlyToFalse() {
+    void shouldSetWritablePropertyToFalse() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(overviewBusinessService.getFilteredOverview(any(), any(), any(), eq(authorizationUser)))
                 .thenReturn(List.of(overview));
@@ -137,8 +140,9 @@ void getFilteredOverviewShouldSetWritableProperlyToFalse() {
         assertTrue(overviews.get(0).isWriteable());
     }
 
+    @DisplayName("Should return an empty list when not authorized")
     @Test
-    void getFilteredOverviewShouldReturnEmptyListWhenNotAuthorized() {
+    void shouldReturnEmptyListWhenNotAuthorized() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(authorizationUser);
         when(overviewBusinessService.getFilteredOverview(1L, List.of(adminTeamId), "", authorizationUser))
                 .thenReturn(List.of());
@@ -147,9 +151,9 @@ void getFilteredOverviewShouldReturnEmptyListWhenNotAuthorized() {
         assertThat(List.of()).hasSameElementsAs(overviews);
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should return {0} for hasWriteAllAccess based on user role")
     @ValueSource(booleans = { true, false })
-    void hasWriteAllAccessShouldReturnHasRoleWriteAll(boolean hasRoleWriteAll) {
+    void shouldReturnHasWriteAllAccessBasedOnUserRole(boolean hasRoleWriteAll) {
         if (hasRoleWriteAll) {
             when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(okrChampionUser);
         } else {
@@ -159,4 +163,5 @@ void hasWriteAllAccessShouldReturnHasRoleWriteAll(boolean hasRoleWriteAll) {
 
         assertEquals(hasRoleWriteAll, overviewAuthorizationService.hasWriteAllAccess());
     }
+
 }
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/TeamAuthorizationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/TeamAuthorizationServiceTest.java
index 1a5fa86566..d4ccbff48e 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/TeamAuthorizationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/TeamAuthorizationServiceTest.java
@@ -12,6 +12,7 @@
 import ch.puzzle.okr.models.authorization.AuthorizationUser;
 import ch.puzzle.okr.service.business.TeamBusinessService;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -43,8 +44,9 @@ class TeamAuthorizationServiceTest {
                                                                                                  List.of(),
                                                                                                  List.of()));
 
+    @DisplayName("Should return the created team")
     @Test
-    void createEntityShouldReturnTeam() {
+    void shouldReturnCreatedTeam() {
         when(teamBusinessService.createTeam(teamUnderTest, authorizationService.updateOrAddAuthorizationUser()))
                 .thenReturn(teamUnderTest);
 
@@ -52,8 +54,9 @@ void createEntityShouldReturnTeam() {
         assertEquals(teamUnderTest, team);
     }
 
+    @DisplayName("Should return the updated team when authorized as okr-champion")
     @Test
-    void updateEntityShouldReturnUpdatedTeamWhenAuthorizedAsOkrChampion() {
+    void shouldReturnUpdatedTeamWhenAuthorizedAsOkrChampion() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(okrChampionUser);
         when(teamBusinessService.updateTeam(teamUnderTest, id)).thenReturn(teamUnderTest);
@@ -62,8 +65,9 @@ void updateEntityShouldReturnUpdatedTeamWhenAuthorizedAsOkrChampion() {
         assertEquals(teamUnderTest, team);
     }
 
+    @DisplayName("Should return the updated team when authorized as admin-user")
     @Test
-    void updateEntityShouldReturnUpdatedTeamWhenAuthorizedAsAdminUser() {
+    void shouldReturnUpdatedTeamWhenAuthorizedAsAdminUser() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(adminUser);
         when(teamBusinessService.updateTeam(teamUnderTest, id)).thenReturn(teamUnderTest);
@@ -72,8 +76,9 @@ void updateEntityShouldReturnUpdatedTeamWhenAuthorizedAsAdminUser() {
         assertEquals(teamUnderTest, team);
     }
 
+    @DisplayName("Should throw an exception when the user is authorized as a member")
     @Test
-    void updateEntityShouldThrowExceptionWhenAuthorizedAsMemberUser() {
+    void shouldThrowExceptionWhenAuthorizedAsMemberUser() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(memberUser);
         ResponseStatusException exception = assertThrows(ResponseStatusException.class,
@@ -83,8 +88,9 @@ void updateEntityShouldThrowExceptionWhenAuthorizedAsMemberUser() {
         assertEquals("NOT_AUTHORIZED_TO_WRITE", exception.getReason());
     }
 
+    @DisplayName("Should throw an exception when the user is authorized as a user with no teams")
     @Test
-    void updateEntityShouldThrowExceptionWhenAuthorizedAsUserWithNoTeams() {
+    void shouldThrowExceptionWhenAuthorizedAsUserWithNoTeams() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(userWithNoTeams);
         ResponseStatusException exception = assertThrows(ResponseStatusException.class,
@@ -94,20 +100,23 @@ void updateEntityShouldThrowExceptionWhenAuthorizedAsUserWithNoTeams() {
         assertEquals("NOT_AUTHORIZED_TO_WRITE", exception.getReason());
     }
 
+    @DisplayName("Should successfully delete when authorized as an okr-champion")
     @Test
-    void deleteEntityByIdShouldPassThroughWhenAuthorizedAsOkrChampion() {
+    void shouldDeleteSuccessfullyWhenAuthorizedAsOkrChampion() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(okrChampionUser);
         teamAuthorizationService.deleteEntity(teamUnderTest.getId());
     }
 
+    @DisplayName("Should successfully delete when authorized as a team-admin")
     @Test
-    void deleteEntityByIdShouldPassThroughWhenAuthorizedAsTeamAdmin() {
+    void shouldDeleteSuccessfullyWhenAuthorizedAsTeamAdmin() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(adminUser);
         teamAuthorizationService.deleteEntity(teamUnderTest.getId());
     }
 
+    @DisplayName("Should throw an exception when the user is authorized as a member")
     @Test
-    void deleteEntityByIdShouldThrowExceptionWhenAuthorizedAsMemberUser() {
+    void shouldThrowExceptionWhenAuthorizedAsMemberUserForDeletion() {
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(memberUser);
 
         ResponseStatusException exception = assertThrows(ResponseStatusException.class,
@@ -116,8 +125,9 @@ void deleteEntityByIdShouldThrowExceptionWhenAuthorizedAsMemberUser() {
         assertEquals("NOT_AUTHORIZED_TO_DELETE", exception.getReason());
     }
 
+    @DisplayName("Should throw an exception when the user is authorized as a user with no teams for deletion")
     @Test
-    void deleteEntityByIdShouldThrowExceptionWhenAuthorizedAsUserWithNoTeams() {
+    void shouldThrowExceptionWhenAuthorizedAsUserWithNoTeamsForDeletion() {
         Long id = 13L;
         when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(userWithNoTeams);
 
@@ -127,9 +137,9 @@ void deleteEntityByIdShouldThrowExceptionWhenAuthorizedAsUserWithNoTeams() {
         assertEquals("NOT_AUTHORIZED_TO_DELETE", exception.getReason());
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should return all teams with writable={0}")
     @ValueSource(booleans = { true, false })
-    void getAllTeamsShouldReturnAllTeams(boolean isWriteable) {
+    void shouldReturnAllTeamsWithWritableFlag(boolean isWriteable) {
         List<Team> teamList = List.of(teamUnderTest, teamUnderTest);
         if (isWriteable) {
             when(authorizationService.updateOrAddAuthorizationUser()).thenReturn(okrChampionUser);
@@ -143,15 +153,17 @@ void getAllTeamsShouldReturnAllTeams(boolean isWriteable) {
         teams.forEach(team -> assertEquals(isWriteable, team.isWriteable()));
     }
 
+    @DisplayName("Should throw an exception if the user is not authorized to add users to a team")
     @Test
-    void addUsersToTeam_shouldThrowExceptionIfUserNotAuthorized() {
+    void shouldThrowExceptionIfUserNotAuthorizedToAddUsersToTeam() {
         when(authorizationService.updateOrAddAuthorizationUser())
                 .thenReturn(new AuthorizationUser(defaultUserWithTeams(1L, List.of(), List.of())));
         assertThrows(OkrResponseStatusException.class, () -> teamAuthorizationService.addUsersToTeam(1L, List.of()));
     }
 
+    @DisplayName("Should call the teamBusinessService when adding users to a team")
     @Test
-    void addUsersToTeam_shouldCallTeamBusinessService() {
+    void shouldCallTeamBusinessServiceWhenAddingUsersToTeam() {
         var adminTeamId = 1L;
         var adminTeam = defaultTeam(adminTeamId);
         var usersList = List.of(1L, 2L);
@@ -159,6 +171,5 @@ void addUsersToTeam_shouldCallTeamBusinessService() {
                 .thenReturn(new AuthorizationUser(defaultUserWithTeams(1L, List.of(adminTeam), List.of())));
         teamAuthorizationService.addUsersToTeam(adminTeamId, usersList);
         verify(teamBusinessService, times(1)).addUsersToTeam(adminTeamId, usersList);
-
     }
 }
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/UserAuthorizationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/UserAuthorizationServiceTest.java
index 03e38ecd6c..5a27290348 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/UserAuthorizationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/UserAuthorizationServiceTest.java
@@ -32,8 +32,9 @@ public class UserAuthorizationServiceTest {
     User user = defaultUserWithTeams(1L, List.of(defaultTeam(adminTeamId), defaultTeam(memberTeamId)), List.of());
     User user2 = defaultUserWithTeams(2L, List.of(), List.of(defaultTeam(adminTeamId), defaultTeam(memberTeamId)));
 
+    @DisplayName("Should return all users")
     @Test
-    void getAllUsersShouldReturnAllUsers() {
+    void shouldReturnAllUsers() {
         List<User> userList = List.of(user, user2);
         when(userBusinessService.getAllUsers()).thenReturn(userList);
         when(teamAuthorizationService.isUserWriteAllowed(adminTeamId)).thenReturn(true);
@@ -43,8 +44,9 @@ void getAllUsersShouldReturnAllUsers() {
         assertEquals(userList, users);
     }
 
+    @DisplayName("Should set team writable property correctly")
     @Test
-    void getAllUsers_shouldSetTeamWritableCorrectly() {
+    void shouldSetTeamWritableCorrectly() {
         List<User> userList = List.of(user, user2);
         when(userBusinessService.getAllUsers()).thenReturn(userList);
         when(teamAuthorizationService.isUserWriteAllowed(adminTeamId)).thenReturn(true);
@@ -57,8 +59,9 @@ void getAllUsers_shouldSetTeamWritableCorrectly() {
         assertFalse(users.get(1).getUserTeamList().get(1).getTeam().isWriteable());
     }
 
+    @DisplayName("Should call the businessService when setting OKR champion")
     @Test
-    void setOkrChampion_shouldCallBusinessService() {
+    void shouldCallBusinessServiceWhenSettingOkrChampion() {
         var loggedInUser = defaultUser(1L);
         loggedInUser.setOkrChampion(true);
 
@@ -70,8 +73,9 @@ void setOkrChampion_shouldCallBusinessService() {
         verify(userBusinessService, times(1)).setIsOkrChampion(user, true);
     }
 
+    @DisplayName("Should throw an error if logged-in user is not OKR champion")
     @Test
-    void setOkrChampion_shouldThrowErrorIfLoggedInUserIsNotOkrChampion() {
+    void shouldThrowErrorIfLoggedInUserIsNotOkrChampion() {
         var loggedInUser = defaultUser(1L);
         loggedInUser.setOkrChampion(false);
 
@@ -82,8 +86,9 @@ void setOkrChampion_shouldThrowErrorIfLoggedInUserIsNotOkrChampion() {
                      () -> userAuthorizationService.setIsOkrChampion(user.getId(), true));
     }
 
+    @DisplayName("Should call the businessService when creating users")
     @Test
-    void createUsers_shouldCallBusinessService() {
+    void shouldCallBusinessServiceWhenCreatingUsers() {
         var loggedInUser = defaultUser(1L);
         loggedInUser.setOkrChampion(true);
 
@@ -96,8 +101,9 @@ void createUsers_shouldCallBusinessService() {
         verify(userBusinessService, times(1)).createUsers(users);
     }
 
+    @DisplayName("Should throw an error if logged-in user is not OKR champion when creating users")
     @Test
-    void createUsers_shouldThrowErrorIfLoggedInUserIsNotOkrChampion() {
+    void shouldThrowErrorIfLoggedInUserIsNotOkrChampionWhenCreatingUsers() {
         var loggedInUser = defaultUser(1L);
         loggedInUser.setOkrChampion(false);
 
@@ -107,9 +113,9 @@ void createUsers_shouldThrowErrorIfLoggedInUserIsNotOkrChampion() {
                      () -> userAuthorizationService.createUsers(List.of(user, user2)));
     }
 
-    @DisplayName("isUserMemberOfTeams() should return false if user is not member of teams")
+    @DisplayName("Should return false if user is not a member of teams")
     @Test
-    void isUserMemberOfTeamsShouldReturnFalseIfUserIsNotMemberOfTeams() {
+    void shouldReturnFalseIfUserIsNotMemberOfTeams() {
         // arrange
         Long userId = 1L;
         User userWithoutTeams = defaultUser(userId);
@@ -122,9 +128,9 @@ void isUserMemberOfTeamsShouldReturnFalseIfUserIsNotMemberOfTeams() {
         assertFalse(isUserMemberOfTeams);
     }
 
-    @DisplayName("isUserMemberOfTeams() should return true if user is member of teams")
+    @DisplayName("Should return true if user is a member of teams")
     @Test
-    void isUserMemberOfTeamsShouldReturnTrueIfUserIsMemberOfTeams() {
+    void shouldReturnTrueIfUserIsMemberOfTeams() {
         // arrange
         User userWithTeams = user2;
         Long userId = user2.getId();
diff --git a/backend/src/test/java/ch/puzzle/okr/service/authorization/UserUpdateHelperTest.java b/backend/src/test/java/ch/puzzle/okr/service/authorization/UserUpdateHelperTest.java
index 504c8ee5c6..7b0b1b3055 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/authorization/UserUpdateHelperTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/authorization/UserUpdateHelperTest.java
@@ -16,22 +16,22 @@ void setup() {
         helper = new AuthorizationRegistrationService.UserUpdateHelper();
     }
 
-    @DisplayName("update userFromDB with Firstname and Lastname from token")
+    @DisplayName("Should update userFromDB with Firstname and Lastname from token")
     @Test
-    void updateUserFromWithTokenData() {
+    void shouldUpdateUserFromDBWithTokenData() {
         // arrange
         User userFromDB = User.Builder
                 .builder() //
                 .withId(23L) //
-                .withFirstname("firstname_from_db") //
-                .withLastname("lastname_from_db") //
+                .withFirstName("firstname_from_db") //
+                .withLastName("lastname_from_db") //
                 .withEmail("a@b.ch") //
                 .build();
 
         User userFromToken = User.Builder
                 .builder() //
-                .withFirstname("firstname_from_token") //
-                .withLastname("lastname_from_token") //
+                .withFirstName("firstname_from_token") //
+                .withLastName("lastname_from_token") //
                 .build();
 
         // act
@@ -40,12 +40,13 @@ void updateUserFromWithTokenData() {
         // assert
         assertEquals(23L, updatedUser.getId());
         assertEquals("a@b.ch", updatedUser.getEmail());
-        assertEquals("firstname_from_token", updatedUser.getFirstname());
-        assertEquals("lastname_from_token", updatedUser.getLastname());
+        assertEquals("firstname_from_token", updatedUser.getFirstName());
+        assertEquals("lastname_from_token", updatedUser.getLastName());
     }
 
+    @DisplayName("Should not update user as OKR champion when email is not listed")
     @Test
-    void updateUserAsNoChampion() {
+    void shouldNotUpdateUserAsOkrChampionWhenEmailIsNotListed() {
         // arrange
         User noChampionUser = User.Builder.builder().withEmail("no@champions.ch").build();
         TenantConfigProvider.TenantConfig tenantConfig = new TenantConfigProvider.TenantConfig(null, //
@@ -63,8 +64,9 @@ void updateUserAsNoChampion() {
         assertFalse(updatedUser.isOkrChampion());
     }
 
+    @DisplayName("Should update user as OKR champion when email is listed")
     @Test
-    void updateUserAsChampion() {
+    void shouldUpdateUserAsOkrChampionWhenEmailIsListed() {
         // arrange
         User championUser = User.Builder.builder().withEmail("yes@champions.ch").build();
         TenantConfigProvider.TenantConfig tenantConfig = new TenantConfigProvider.TenantConfig(null, //
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/ActionBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/ActionBusinessServiceTest.java
index b1acd4babd..aa53ca65f0 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/ActionBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/ActionBusinessServiceTest.java
@@ -1,6 +1,5 @@
 package ch.puzzle.okr.service.business;
 
-import static ch.puzzle.okr.test.TestHelper.defaultAuthorizationUser;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -8,12 +7,12 @@
 
 import ch.puzzle.okr.models.Action;
 import ch.puzzle.okr.models.Unit;
-import ch.puzzle.okr.models.authorization.AuthorizationUser;
 import ch.puzzle.okr.models.keyresult.KeyResult;
 import ch.puzzle.okr.models.keyresult.KeyResultMetric;
 import ch.puzzle.okr.service.persistence.ActionPersistenceService;
 import ch.puzzle.okr.service.validation.ActionValidationService;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -22,8 +21,6 @@
 
 @ExtendWith(MockitoExtension.class)
 class ActionBusinessServiceTest {
-    private static final AuthorizationUser authorizationUser = defaultAuthorizationUser();
-
     @Mock
     ActionPersistenceService actionPersistenceService;
     @Mock
@@ -43,7 +40,7 @@ class ActionBusinessServiceTest {
             .builder()
             .withId(1L)
             .withAction("Neue Katze")
-            .withIsChecked(false)
+            .isChecked(false)
             .withPriority(0)
             .withKeyResult(metricKeyResult)
             .build();
@@ -51,12 +48,13 @@ class ActionBusinessServiceTest {
             .builder()
             .withId(2L)
             .withAction("Neues Lama")
-            .withIsChecked(true)
+            .isChecked(true)
             .withPriority(1)
             .withKeyResult(metricKeyResult)
             .build();
     private List<Action> actionList = List.of(action1, action2);
 
+    @DisplayName("Should get action by id")
     @Test
     void shouldGetAction() {
         when(actionPersistenceService.findById(action1.getId())).thenReturn(action1);
@@ -69,6 +67,7 @@ void shouldGetAction() {
         assertEquals(action1.isChecked(), action.isChecked());
     }
 
+    @DisplayName("Should get actions from key-result")
     @Test
     void shouldGetActionsFromKeyResult() {
         when(actionPersistenceService.getActionsByKeyResultIdOrderByPriorityAsc(metricKeyResult.getId()))
@@ -78,6 +77,7 @@ void shouldGetActionsFromKeyResult() {
         assertIterableEquals(actions, actionList);
     }
 
+    @DisplayName("Should update multiple actions without key result")
     @Test
     void shouldUpdateMultipleActionsNoKeyResult() {
         when(actionPersistenceService.findById(action1.getId())).thenReturn(action1);
@@ -93,13 +93,14 @@ void shouldUpdateMultipleActionsNoKeyResult() {
         verify(actionPersistenceService, times(2)).findById(any());
     }
 
+    @DisplayName("Should create action when action has no id")
     @Test
     void shouldCreateActionWhenUpdateWithNoId() {
         Action action = Action.Builder
                 .builder()
                 .withAction("Neue Katze")
                 .withPriority(0)
-                .withIsChecked(false)
+                .isChecked(false)
                 .withKeyResult(metricKeyResult)
                 .build();
         actionBusinessService.updateEntities(List.of(action));
@@ -107,14 +108,16 @@ void shouldCreateActionWhenUpdateWithNoId() {
         verify(actionPersistenceService, times(1)).save(action);
     }
 
+    @DisplayName("Should update multiple actions")
     @Test
-    void shouldUpdateMultipleActionsNormal() {
+    void shouldUpdateMultipleActions() {
         actionBusinessService.updateEntities(actionList);
 
         verify(actionPersistenceService, times(1)).save(action1);
         verify(actionPersistenceService, times(1)).save(action2);
     }
 
+    @DisplayName("Should create multiple actions")
     @Test
     void shouldCreateMultipleActions() {
         Action newAction1 = Action.Builder
@@ -122,14 +125,14 @@ void shouldCreateMultipleActions() {
                 .withAction("Neuer Drucker")
                 .withKeyResult(metricKeyResult)
                 .withPriority(0)
-                .withIsChecked(false)
+                .isChecked(false)
                 .build();
         Action newAction2 = Action.Builder
                 .builder()
                 .withAction("Neues Papier")
                 .withKeyResult(metricKeyResult)
                 .withPriority(1)
-                .withIsChecked(false)
+                .isChecked(false)
                 .build();
 
         when(actionPersistenceService.save(newAction1)).thenReturn(action1);
@@ -142,6 +145,7 @@ void shouldCreateMultipleActions() {
         assertIterableEquals(createdActions, actionList);
     }
 
+    @DisplayName("Should create one action")
     @Test
     void shouldCreateOneAction() {
         Action newAction1 = Action.Builder
@@ -149,7 +153,7 @@ void shouldCreateOneAction() {
                 .withAction("Neuer Drucker")
                 .withKeyResult(metricKeyResult)
                 .withPriority(0)
-                .withIsChecked(false)
+                .isChecked(false)
                 .build();
 
         when(actionPersistenceService.save(newAction1)).thenReturn(action1);
@@ -160,6 +164,7 @@ void shouldCreateOneAction() {
         assertIterableEquals(createdActions, List.of(action1));
     }
 
+    @DisplayName("Should delete action")
     @Test
     void shouldDeleteAction() {
         actionBusinessService.deleteEntityById(action1.getId());
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/AlignmentBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/AlignmentBusinessServiceTest.java
index f956707a2e..c36a01536b 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/AlignmentBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/AlignmentBusinessServiceTest.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import javax.swing.*;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
@@ -58,8 +59,9 @@ void setUp() {
         this.alignments.add(KeyResultAlignment.Builder.builder().withId(9L).withTargetKeyResult(keyResult).build());
     }
 
+    @DisplayName("Should throw exception when validation fails")
     @Test
-    void updateEntityShouldThrowExceptionWhenValidationFails() {
+    void shouldThrowExceptionWhenValidationFailsUsingUpdateEntity() {
         doThrow(new OkrResponseStatusException(HttpStatus.BAD_REQUEST, "Error Message"))
                 .when(alignmentValidationService)
                 .validateOnUpdate(eq(1L), any(KeyResultAlignment.class));
@@ -68,8 +70,9 @@ void updateEntityShouldThrowExceptionWhenValidationFails() {
                      () -> alignmentBusinessService.updateEntity(1L, new KeyResultAlignment()));
     }
 
+    @DisplayName("Should save new entity when updating entity")
     @Test
-    void updateEntityShouldSaveNewEntity() {
+    void shouldSaveNewEntityUsingUpdateEntity() {
         Alignment mockedAlignment = mock(Alignment.class);
         when(alignmentPersistenceService.save(any(Alignment.class))).thenAnswer(i -> i.getArguments()[0]);
 
@@ -79,8 +82,9 @@ void updateEntityShouldSaveNewEntity() {
         assertEquals(mockedAlignment, alignment);
     }
 
+    @DisplayName("Should update key-result")
     @Test
-    void updateKeyResultIdShouldUpdateKeyResult() {
+    void shouldUpdateKeyResult() {
         KeyResult mockedKeyresult = mock(KeyResult.class);
         when(alignmentPersistenceService.findByKeyResultAlignmentId(1L)).thenReturn(this.alignments);
 
@@ -91,8 +95,9 @@ void updateKeyResultIdShouldUpdateKeyResult() {
         captor.getAllValues().forEach(c -> assertEquals(c.getAlignmentTarget(), mockedKeyresult));
     }
 
+    @DisplayName("Should update nothing if no key-results are found")
     @Test
-    void updateKeyResultIdShouldUpdateNothingIfNoKeyResultAreFound() {
+    void shouldUpdateNothingIfNoKeyResultAreFound() {
         KeyResult mockedKeyresult = mock(KeyResult.class);
         when(alignmentPersistenceService.findByKeyResultAlignmentId(1L)).thenReturn(List.of());
 
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/AlignmentSelectionBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/AlignmentSelectionBusinessServiceTest.java
index 198c69e0fc..326330dbae 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/AlignmentSelectionBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/AlignmentSelectionBusinessServiceTest.java
@@ -8,6 +8,7 @@
 import ch.puzzle.okr.models.alignment.AlignmentSelectionId;
 import ch.puzzle.okr.service.persistence.AlignmentSelectionPersistenceService;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -35,8 +36,9 @@ private static AlignmentSelection createAlignmentSelection() {
                 .build();
     }
 
+    @DisplayName("Should get alignment selection by quarter id and all teams except ignored team")
     @Test
-    void getAlignmentSelectionByQuarterIdAndTeamIdNotShouldReturnListOfAlignmentSelections() {
+    void shouldReturnListOfAlignmentSelectionsUsingGetAlignmentSelectionByQuarterIdAndTeamIdNot() {
         when(alignmentSelectionPersistenceService.getAlignmentSelectionByQuarterIdAndTeamIdNot(2L, 4L))
                 .thenReturn(List.of(createAlignmentSelection()));
 
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/CheckInBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/CheckInBusinessServiceTest.java
index fc4c173710..b0ac8907fb 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/CheckInBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/CheckInBusinessServiceTest.java
@@ -17,6 +17,7 @@
 import ch.puzzle.okr.models.keyresult.KeyResultOrdinal;
 import ch.puzzle.okr.service.persistence.CheckInPersistenceService;
 import ch.puzzle.okr.service.validation.CheckInValidationService;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -39,8 +40,8 @@ class CheckInBusinessServiceTest {
     private User user = User.Builder
             .builder()
             .withEmail("Email")
-            .withFirstname("Firstname")
-            .withLastname("Lastname")
+            .withFirstName("Firstname")
+            .withLastName("Lastname")
             .build();
     private KeyResult ordinalKeyResult = KeyResultOrdinal.Builder
             .builder()
@@ -77,6 +78,7 @@ class CheckInBusinessServiceTest {
             .withKeyResult(ordinalKeyResult)
             .build();
 
+    @DisplayName("Should get metric check-in")
     @Test
     void shouldGetMetricCheckIn() {
         when(checkInPersistenceService.findById(this.checkInMetric.getId())).thenReturn(this.checkInMetric);
@@ -88,6 +90,7 @@ void shouldGetMetricCheckIn() {
         assertEquals(metricKeyResult.getId(), checkIn.getKeyResult().getId());
     }
 
+    @DisplayName("Should get ordinal check-in")
     @Test
     void shouldGetOrdinalCheckIn() {
         when(checkInPersistenceService.findById(this.checkInOrdinal.getId())).thenReturn(this.checkInOrdinal);
@@ -99,6 +102,7 @@ void shouldGetOrdinalCheckIn() {
         assertEquals(ordinalKeyResult.getId(), checkIn.getKeyResult().getId());
     }
 
+    @DisplayName("Should update metric check-in with no type change")
     @Test
     void shouldUpdateCheckInMetricWhenNoTypeChange() {
         when(checkInPersistenceService.findById(this.checkInMetric.getId())).thenReturn(this.checkInMetric);
@@ -113,6 +117,7 @@ void shouldUpdateCheckInMetricWhenNoTypeChange() {
         assertEquals(this.checkInMetric.getCheckInType(), newCheckIn.getCheckInType());
     }
 
+    @DisplayName("Should update ordinal check-in with no type change")
     @Test
     void shouldUpdateCheckInOrdinalWhenNoTypeChange() {
         when(checkInPersistenceService.findById(this.checkInOrdinal.getId())).thenReturn(this.checkInOrdinal);
@@ -127,6 +132,7 @@ void shouldUpdateCheckInOrdinalWhenNoTypeChange() {
         assertEquals(this.checkInOrdinal.getCheckInType(), newCheckIn.getCheckInType());
     }
 
+    @DisplayName("Should save metric check-in")
     @Test
     void shouldSaveMetricCheckIn() {
         when(checkInPersistenceService.save(any())).thenReturn(this.checkInMetric);
@@ -139,6 +145,7 @@ void shouldSaveMetricCheckIn() {
         assertEquals(((CheckInMetric) this.checkInMetric).getValue(), ((CheckInMetric) createdCheckIn).getValue());
     }
 
+    @DisplayName("Should save ordinal check-in")
     @Test
     void shouldSaveOrdinalCheckIn() {
         when(checkInPersistenceService.save(any())).thenReturn(this.checkInOrdinal);
@@ -151,12 +158,14 @@ void shouldSaveOrdinalCheckIn() {
         assertEquals(((CheckInOrdinal) this.checkInOrdinal).getZone(), ((CheckInOrdinal) createdCheckIn).getZone());
     }
 
+    @DisplayName("Should delete check-in")
     @Test
     void shouldDeleteCheckIn() {
         checkInBusinessService.deleteEntityById(this.checkInOrdinal.getId());
         verify(checkInPersistenceService, times(1)).deleteById(this.checkInOrdinal.getId());
     }
 
+    @DisplayName("Should get all check-ins by key result id")
     @Test
     void shouldGetCheckInsByKeyResultId() {
         checkInBusinessService.getCheckInsByKeyResultId(this.metricKeyResult.getId());
@@ -164,6 +173,7 @@ void shouldGetCheckInsByKeyResultId() {
                 .getCheckInsByKeyResultIdOrderByCheckInDateDesc(this.metricKeyResult.getId());
     }
 
+    @DisplayName("Should get last check-in by key result id")
     @Test
     void shouldGetLastCheckInByKeyResultId() {
         checkInBusinessService.getLastCheckInByKeyResultId(this.ordinalKeyResult.getId());
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/CompletedBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/CompletedBusinessServiceTest.java
index addeb95a4e..9785e53507 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/CompletedBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/CompletedBusinessServiceTest.java
@@ -8,6 +8,7 @@
 import ch.puzzle.okr.models.Objective;
 import ch.puzzle.okr.service.persistence.CompletedPersistenceService;
 import ch.puzzle.okr.service.validation.CompletedValidationService;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -34,8 +35,9 @@ class CompletedBusinessServiceTest {
     @Spy
     private CompletedBusinessService completedBusinessService;
 
+    @DisplayName("Should successfully create completed")
     @Test
-    void saveSuccessFulCompleted() {
+    void shouldSuccessfullyCreateCompleted() {
         Mockito.when(completedPersistenceService.save(any())).thenReturn(successfulCompleted);
 
         Completed completed = Completed.Builder
@@ -53,6 +55,7 @@ void saveSuccessFulCompleted() {
         assertEquals(successfulCompleted, savedCompleted);
     }
 
+    @DisplayName("Should be possible to save completed without comment")
     @Test
     void shouldBePossibleToSaveCompletedWithoutComment() {
         Completed completed = Completed.Builder
@@ -71,6 +74,7 @@ void shouldBePossibleToSaveCompletedWithoutComment() {
         assertEquals(savedCompleted, successfulCompleted);
     }
 
+    @DisplayName("Should delete all key-results and associated check-ins")
     @Test
     void shouldDeleteKeyResultAndAssociatedCheckIns() {
         when(completedPersistenceService.getCompletedByObjectiveId(anyLong())).thenReturn(successfulCompleted);
@@ -80,6 +84,7 @@ void shouldDeleteKeyResultAndAssociatedCheckIns() {
         verify(this.completedPersistenceService, times(1)).deleteById(1L);
     }
 
+    @DisplayName("Should do nothing if completed is null")
     @Test
     void shouldDoNothingIfCompletedIsNull() {
         when(completedPersistenceService.getCompletedByObjectiveId(anyLong())).thenReturn(null);
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/KeyResultBusinessServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/business/KeyResultBusinessServiceIT.java
index 7cbb680aa1..05fbdaee95 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/KeyResultBusinessServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/KeyResultBusinessServiceIT.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,7 +101,7 @@ private static CheckIn createCheckInOrdinal(KeyResult keyResult) {
     private static Action createAction1(KeyResult keyResult) {
         return Action.Builder
                 .builder()
-                .withIsChecked(false)
+                .isChecked(false)
                 .withAction("Neuer Drucker")
                 .withPriority(0)
                 .withKeyResult(keyResult)
@@ -110,13 +111,31 @@ private static Action createAction1(KeyResult keyResult) {
     private static Action createAction2(KeyResult keyResult) {
         return Action.Builder
                 .builder()
-                .withIsChecked(false)
+                .isChecked(false)
                 .withAction("Neues Papier")
                 .withPriority(0)
                 .withKeyResult(keyResult)
                 .build();
     }
 
+    private static void assertKeyResult(KeyResult expected, KeyResult actual) {
+        assertEquals(expected.getTitle(), actual.getTitle());
+        assertEquals(expected.getDescription(), actual.getDescription());
+        assertEquals(expected.getKeyResultType(), actual.getKeyResultType());
+        assertEquals(expected.getModifiedOn(), actual.getModifiedOn());
+        if (expected instanceof KeyResultMetric keyResultMetric) {
+            assertEquals(keyResultMetric.getBaseline(), ((KeyResultMetric) actual).getBaseline());
+            assertEquals(keyResultMetric.getStretchGoal(), ((KeyResultMetric) actual).getStretchGoal());
+            assertEquals(keyResultMetric.getUnit(), ((KeyResultMetric) actual).getUnit());
+        } else if (expected instanceof KeyResultOrdinal keyResultOrdinal) {
+            assertEquals(keyResultOrdinal.getCommitZone(), ((KeyResultOrdinal) actual).getCommitZone());
+            assertEquals(keyResultOrdinal.getStretchZone(), ((KeyResultOrdinal) actual).getStretchZone());
+            assertEquals(keyResultOrdinal.getTargetZone(), ((KeyResultOrdinal) actual).getTargetZone());
+        } else {
+            throw new IllegalArgumentException("keyResultType not supported, " + expected);
+        }
+    }
+
     @BeforeEach
     void setUp() {
         TenantContext.setCurrentTenant(TestHelper.SCHEMA_PITC);
@@ -155,8 +174,9 @@ private Action deleteCreatedAction(Action action) {
         return null;
     }
 
+    @DisplayName("Should update metric key-result and type should stay metric")
     @Test
-    void updateEntitiesShouldUpdateKeyResultWithSameTypeMetric() {
+    void shouldUpdateMetricKeyResultWithSameTypeUsingUpdateEntities() {
         createdKeyResult = keyResultBusinessService.createEntity(createKeyResultMetric(null), authorizationUser);
         createdKeyResult.setTitle(KEY_RESULT_UPDATED);
 
@@ -166,8 +186,9 @@ void updateEntitiesShouldUpdateKeyResultWithSameTypeMetric() {
         assertSameKeyResult(createdKeyResult, updatedKeyResult.keyResult());
     }
 
+    @DisplayName("Should update metric key-result and type should stay metric and keep action list")
     @Test
-    void updateEntitiesShouldUpdateKeyResultWithSameTypeMetricWithActionList() {
+    void shouldUpdateMetricKeyResultWithSameTypeWithActionListUsingUpdateEntities() {
         createdKeyResult = keyResultBusinessService.createEntity(createKeyResultMetric(null), authorizationUser);
         createdKeyResult.setTitle(KEY_RESULT_UPDATED);
         action1 = actionBusinessService.createEntity(createAction1(createdKeyResult));
@@ -180,8 +201,9 @@ void updateEntitiesShouldUpdateKeyResultWithSameTypeMetricWithActionList() {
         assertSameActions(List.of(action1, action2), updatedKeyResult);
     }
 
+    @DisplayName("Should update ordinal key-result and type should stay ordinal")
     @Test
-    void updateEntitiesShouldUpdateKeyResultWithSameTypeOrdinal() {
+    void shouldUpdateOrdinalKeyResultWithSameTypeUsingUpdateEntities() {
         createdKeyResult = keyResultBusinessService.createEntity(createKeyResultOrdinal(null), authorizationUser);
         createdKeyResult.setTitle(KEY_RESULT_UPDATED);
 
@@ -192,11 +214,11 @@ void updateEntitiesShouldUpdateKeyResultWithSameTypeOrdinal() {
     }
 
     @Test
-    void updateEntitiesShouldRecreateKeyResultMetric() {
+    void shouldRecreateOrdinalKeyResultAsMetricUsingUpdateEntities() {
         KeyResult savedKeyResult = keyResultBusinessService
                 .createEntity(createKeyResultOrdinal(null), authorizationUser);
         Long createdKeyResultId = savedKeyResult.getId();
-        KeyResult changedKeyResult = createKeyResultMetric(savedKeyResult.getId());
+        KeyResult changedKeyResult = createKeyResultMetric(createdKeyResultId);
 
         KeyResultWithActionList updatedKeyResult = keyResultBusinessService
                 .updateEntities(changedKeyResult.getId(), changedKeyResult, List.of());
@@ -205,8 +227,9 @@ void updateEntitiesShouldRecreateKeyResultMetric() {
         assertRecreatedKeyResult(updatedKeyResult.keyResult(), createdKeyResultId);
     }
 
+    @DisplayName("Should update ordinal key-result and type should stay ordinal and keep action list")
     @Test
-    void updateEntitiesShouldRecreateKeyResultMetricWithActionList() {
+    void shouldRecreateOrdinalKeyResultAsMetricWithActionListUsingUpdateEntities() {
         KeyResult savedKeyResult = keyResultBusinessService
                 .createEntity(createKeyResultOrdinal(null), authorizationUser);
         action1 = actionBusinessService.createEntity(createAction1(savedKeyResult));
@@ -215,19 +238,20 @@ void updateEntitiesShouldRecreateKeyResultMetricWithActionList() {
         Long createdKeyResultId = changedKeyResult.getId();
 
         KeyResultWithActionList updatedKeyResult = keyResultBusinessService
-                .updateEntities(changedKeyResult.getId(), changedKeyResult, List.of(action1, action2));
+                .updateEntities(createdKeyResultId, changedKeyResult, List.of(action1, action2));
         createdKeyResult = updatedKeyResult.keyResult();
 
         assertRecreatedKeyResult(updatedKeyResult.keyResult(), createdKeyResultId);
         assertSameActions(List.of(action1, action2), updatedKeyResult);
     }
 
+    @DisplayName("Should update metric key-result to ordinal key-result")
     @Test
-    void updateEntitiesShouldRecreateKeyResultOrdinal() {
+    void shouldRecreateMetricKeyResultAsOrdinalUsingUpdateEntities() {
         KeyResult savedKeyResult = keyResultBusinessService
                 .createEntity(createKeyResultMetric(null), authorizationUser);
         Long createdKeyResultId = savedKeyResult.getId();
-        KeyResult changedKeyResult = createKeyResultOrdinal(savedKeyResult.getId());
+        KeyResult changedKeyResult = createKeyResultOrdinal(createdKeyResultId);
 
         KeyResultWithActionList updatedKeyResult = keyResultBusinessService
                 .updateEntities(changedKeyResult.getId(), changedKeyResult, List.of());
@@ -236,8 +260,9 @@ void updateEntitiesShouldRecreateKeyResultOrdinal() {
         assertRecreatedKeyResult(updatedKeyResult.keyResult(), createdKeyResultId);
     }
 
+    @DisplayName("Should update ordinal key-result as metric and keep action list")
     @Test
-    void updateEntitiesShouldUpdateKeyResultWithDifferentTypeAndCheckInMetric() {
+    void shouldUpdateOrdinalKeyResultWithDifferentTypeAndCheckInUsingUpdateEntities() {
         createdKeyResult = keyResultBusinessService.createEntity(createKeyResultOrdinal(null), authorizationUser);
         checkInBusinessService.createEntity(createCheckInOrdinal(createdKeyResult), authorizationUser);
 
@@ -249,8 +274,9 @@ void updateEntitiesShouldUpdateKeyResultWithDifferentTypeAndCheckInMetric() {
         assertUpdatedKeyResult(changedKeyResult, updatedKeyResult.keyResult());
     }
 
+    // No displayname because i dont understand the test
     @Test
-    void updateEntitiesShouldUpdateKeyResultWithDifferentTypeAndCheckInMetricWithActionList() {
+    void shouldUpdateOrdinalKeyResultWithDifferentTypeAndCheckInWithActionListUsingUpdateEntities() {
         createdKeyResult = keyResultBusinessService.createEntity(createKeyResultOrdinal(null), authorizationUser);
         checkInBusinessService.createEntity(createCheckInOrdinal(createdKeyResult), authorizationUser);
         action1 = actionBusinessService.createEntity(createAction1(createdKeyResult));
@@ -267,8 +293,9 @@ void updateEntitiesShouldUpdateKeyResultWithDifferentTypeAndCheckInMetricWithAct
         assertUpdatedActions(List.of(action1, action2), updatedKeyResult);
     }
 
+    // No displayname because i dont understand the test
     @Test
-    void updateEntitiesShouldUpdateKeyResultWithDifferentTypeAndCheckInOrdinal() {
+    void shouldUpdateMetricKeyResultWithDifferentTypeAndCheckInUsingUpdateEntity() {
         createdKeyResult = keyResultBusinessService.createEntity(createKeyResultMetric(null), authorizationUser);
         checkInBusinessService.createEntity(createCheckInMetric(createdKeyResult), authorizationUser);
 
@@ -304,24 +331,6 @@ private void assertUpdatedKeyResult(KeyResult expected, KeyResult actual) {
         assertEquals(expected.getModifiedOn(), actual.getModifiedOn());
     }
 
-    private static void assertKeyResult(KeyResult expected, KeyResult actual) {
-        assertEquals(expected.getTitle(), actual.getTitle());
-        assertEquals(expected.getDescription(), actual.getDescription());
-        assertEquals(expected.getKeyResultType(), actual.getKeyResultType());
-        assertEquals(expected.getModifiedOn(), actual.getModifiedOn());
-        if (expected instanceof KeyResultMetric keyResultMetric) {
-            assertEquals(keyResultMetric.getBaseline(), ((KeyResultMetric) actual).getBaseline());
-            assertEquals(keyResultMetric.getStretchGoal(), ((KeyResultMetric) actual).getStretchGoal());
-            assertEquals(keyResultMetric.getUnit(), ((KeyResultMetric) actual).getUnit());
-        } else if (expected instanceof KeyResultOrdinal keyResultOrdinal) {
-            assertEquals(keyResultOrdinal.getCommitZone(), ((KeyResultOrdinal) actual).getCommitZone());
-            assertEquals(keyResultOrdinal.getStretchZone(), ((KeyResultOrdinal) actual).getStretchZone());
-            assertEquals(keyResultOrdinal.getTargetZone(), ((KeyResultOrdinal) actual).getTargetZone());
-        } else {
-            throw new IllegalArgumentException("keyResultType not supported, " + expected);
-        }
-    }
-
     private void assertSameActions(List<Action> expected, KeyResultWithActionList actual) {
         assertSameKeyResultIds(expected, actual);
         expected.forEach(this::removeKeyResult);
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/KeyResultBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/KeyResultBusinessServiceTest.java
index fe99ce8108..6c635de6ed 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/KeyResultBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/KeyResultBusinessServiceTest.java
@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -69,7 +70,9 @@ void setup() {
                 .withId(5L)
                 .withTitle("Keyresult Metric")
                 .withObjective(objective)
+
                 .withOwner(user)
+
                 .withCreatedBy(user)
                 .build();
         ordinalKeyResult = KeyResultOrdinal.Builder
@@ -108,12 +111,13 @@ void setup() {
                 .withId(3L)
                 .withAction("Neues Haus")
                 .withPriority(1)
-                .withIsChecked(true)
+                .isChecked(true)
                 .withKeyResult(metricKeyResult)
                 .build();
         actions = List.of(action, action);
     }
 
+    @DisplayName("Should return correct metric key-result")
     @Test
     void shouldGetMetricKeyResultById() {
         when(keyResultPersistenceService.findById(1L)).thenReturn(metricKeyResult);
@@ -123,6 +127,7 @@ void shouldGetMetricKeyResultById() {
         assertEquals(5, keyResult.getId());
     }
 
+    @DisplayName("Should return correct ordinal key-result")
     @Test
     void shouldGetOrdinalKeyResultById() {
         when(keyResultPersistenceService.findById(1L)).thenReturn(ordinalKeyResult);
@@ -132,6 +137,7 @@ void shouldGetOrdinalKeyResultById() {
         assertEquals(7, keyResult.getId());
     }
 
+    @DisplayName("Should throw exception when calling updateEntity() instead of updateEntities()")
     @Test
     void shouldThrowExceptionWhenDefaultMethodUsed() {
         IllegalCallerException exception = assertThrows(IllegalCallerException.class,
@@ -143,9 +149,9 @@ void shouldThrowExceptionWhenDefaultMethodUsed() {
         assertEquals("unsupported method 'updateEntity' use updateEntities() instead", exception.getMessage());
     }
 
+    @DisplayName("Should edit metric key-result without changing type")
     @Test
-    void shouldEditMetricKeyResultWhenNoTypeChange() {
-        List<CheckIn> emptyList = Collections.emptyList();
+    void shouldEditMetricKeyResultWithoutTypeChange() {
         KeyResult newKeyresult = spy(KeyResultMetric.Builder
                 .builder()
                 .withId(1L)
@@ -163,9 +169,9 @@ void shouldEditMetricKeyResultWhenNoTypeChange() {
         assertEquals("Keyresult Metric update", newKeyresult.getTitle());
     }
 
+    @DisplayName("Should edit ordinal key-result without changing type")
     @Test
-    void shouldEditOrdinalKeyResultWhenNoTypeChange() {
-        List<CheckIn> emptyList = Collections.emptyList();
+    void shouldEditOrdinalKeyResultWithoutTypeChange() {
         KeyResult newKeyresult = spy(KeyResultOrdinal.Builder
                 .builder()
                 .withId(1L)
@@ -183,8 +189,9 @@ void shouldEditOrdinalKeyResultWhenNoTypeChange() {
         assertEquals("Keyresult Ordinal update", newKeyresult.getTitle());
     }
 
+    @DisplayName("Should edit metric key-result with type change")
     @Test
-    void shouldEditMetricKeyResultWhenATypeChange() {
+    void shouldEditMetricKeyResultWithTypeChange() {
         List<CheckIn> emptyList = Collections.emptyList();
         KeyResult newKeyresult = spy(KeyResultMetric.Builder
                 .builder()
@@ -206,8 +213,9 @@ void shouldEditMetricKeyResultWhenATypeChange() {
         assertEquals("Keyresult Metric update", newKeyresult.getTitle());
     }
 
+    @DisplayName("Should edit ordinal key-result with type change")
     @Test
-    void shouldEditOrdinalKeyResultWhenATypeChange() {
+    void shouldEditOrdinalKeyResultWithTypeChange() {
         List<CheckIn> emptyList = Collections.emptyList();
         KeyResult newKeyresult = spy(KeyResultOrdinal.Builder
                 .builder()
@@ -228,6 +236,7 @@ void shouldEditOrdinalKeyResultWhenATypeChange() {
         assertEquals("Keyresult Ordinal update", newKeyresult.getTitle());
     }
 
+    // No displayname because i dont understand the test
     @Test
     void shouldOnlyEditCoupleOfAttributesFromMetricKeyResultWhenATypeChangeAndCheckIns() {
         List<CheckIn> emptyList = checkIns;
@@ -249,6 +258,7 @@ void shouldOnlyEditCoupleOfAttributesFromMetricKeyResultWhenATypeChangeAndCheckI
         assertEquals("Keyresult Metric update", newKeyresult.getTitle());
     }
 
+    // No displayname because i dont understand the test
     @Test
     void shouldOnlyEditCoupleOfAttributesFromOrdinalKeyResultWhenATypeChangeAndCheckIns() {
         List<CheckIn> emptyList = checkIns;
@@ -270,8 +280,9 @@ void shouldOnlyEditCoupleOfAttributesFromOrdinalKeyResultWhenATypeChangeAndCheck
         assertEquals("Keyresult Ordinal update", newKeyresult.getTitle());
     }
 
+    @DisplayName("Should save metric key-result")
     @Test
-    void saveMetricKeyResult() {
+    void shouldSaveMetricKeyResult() {
         KeyResult newKeyresult = spy(KeyResultMetric.Builder
                 .builder()
                 .withBaseline(4.0)
@@ -288,8 +299,9 @@ void saveMetricKeyResult() {
         assertEquals("Keyresult Metric save", savedKeyResult.getTitle());
     }
 
+    @DisplayName("Should save ordinal key-result")
     @Test
-    void saveOrdinalKeyResult() {
+    void shouldSaveOrdinalKeyResult() {
         KeyResult newKeyresult = spy(KeyResultOrdinal.Builder
                 .builder()
                 .withCommitZone("Eine Pflanze")
@@ -306,6 +318,7 @@ void saveOrdinalKeyResult() {
         assertEquals("Keyresult ordinal save", savedKeyResult.getTitle());
     }
 
+    @DisplayName("Should be possible to save metric key-result without description")
     @Test
     void shouldBePossibleToSaveMetricKeyResultWithoutDescription() {
         KeyResult newKeyresult = spy(KeyResultMetric.Builder
@@ -323,6 +336,7 @@ void shouldBePossibleToSaveMetricKeyResultWithoutDescription() {
         assertEquals("Keyresult Metric save", keyResult.getTitle());
     }
 
+    @DisplayName("Should be possible to save ordinal key-result without description")
     @Test
     void shouldBePossibleToSaveOrdinalKeyResultWithoutDescription() {
         KeyResult newKeyresult = spy(KeyResultOrdinal.Builder
@@ -341,6 +355,7 @@ void shouldBePossibleToSaveOrdinalKeyResultWithoutDescription() {
         assertNull(keyResult.getDescription());
     }
 
+    @DisplayName("Should return all key-results by objective no matter the type")
     @Test
     void shouldGetAllKeyResultsByObjective() {
         when(keyResultPersistenceService.getKeyResultsByObjective(any())).thenReturn(keyResults);
@@ -352,6 +367,7 @@ void shouldGetAllKeyResultsByObjective() {
         assertEquals("Keyresult Ordinal", keyResultList.get(1).getTitle());
     }
 
+    @DisplayName("Should return an empty list when no key-results are found by objective")
     @Test
     void shouldReturnEmptyListWhenNoKeyResultInObjective() {
         when(keyResultPersistenceService.getKeyResultsByObjective(any())).thenReturn(Collections.emptyList());
@@ -361,6 +377,7 @@ void shouldReturnEmptyListWhenNoKeyResultInObjective() {
         assertEquals(0, keyResultList.size());
     }
 
+    @DisplayName("Should get all check-ins by key-result")
     @Test
     void shouldGetAllCheckInsByKeyResult() {
         when(keyResultPersistenceService.findById(1L)).thenReturn(metricKeyResult);
@@ -375,6 +392,7 @@ void shouldGetAllCheckInsByKeyResult() {
         assertEquals("newMail@tese.com", checkInList.get(0).getCreatedBy().getEmail());
     }
 
+    @DisplayName("Should return an empty list when no check-ins are found by key-result")
     @Test
     void shouldReturnEmptyListWhenNoCheckInsInKeyResult() {
         when(keyResultPersistenceService.findById(1L)).thenReturn(metricKeyResult);
@@ -384,8 +402,9 @@ void shouldReturnEmptyListWhenNoCheckInsInKeyResult() {
         assertEquals(0, checkInList.size());
     }
 
+    @DisplayName("Should throw exception when getting check-ins from an non-existent key-result")
     @Test
-    void shouldThrowExceptionWhenGetcheckInsFromNonExistingKeyResult() {
+    void shouldThrowExceptionWhenGettingCheckInsFromNonExistentKeyResult() {
         when(keyResultPersistenceService.findById(1L))
                 .thenThrow(new ResponseStatusException(HttpStatus.NOT_FOUND, "KeyResult with id 1 not found"));
         ResponseStatusException exception = assertThrows(ResponseStatusException.class,
@@ -394,6 +413,7 @@ void shouldThrowExceptionWhenGetcheckInsFromNonExistingKeyResult() {
         assertEquals("KeyResult with id 1 not found", exception.getReason());
     }
 
+    @DisplayName("Should delete key-result and associated check-ins and actions")
     @Test
     void shouldDeleteKeyResultAndAssociatedCheckInsAndActions() {
         when(checkInBusinessService.getCheckInsByKeyResultId(1L)).thenReturn(checkIns);
@@ -406,8 +426,9 @@ void shouldDeleteKeyResultAndAssociatedCheckInsAndActions() {
         verify(keyResultPersistenceService, times(1)).deleteById(1L);
     }
 
+    @DisplayName("Should return false for imUsed on unused metric key-result")
     @Test
-    void shouldReturnImUsedProperlyFalse1() {
+    void shouldReturnFalseForImUsedOnMetricKeyResult() {
         when(checkInBusinessService.getCheckInsByKeyResultId(any())).thenReturn(Collections.emptyList());
 
         boolean returnValue = keyResultBusinessService.isImUsed(1L, metricKeyResult);
@@ -415,8 +436,9 @@ void shouldReturnImUsedProperlyFalse1() {
         assertFalse(returnValue);
     }
 
+    @DisplayName("Should return false for imUsed on unused ordinal key-result")
     @Test
-    void shouldReturnImUsedProperlyFalse2() {
+    void shouldReturnFalseForImUsedOnOrdinalKeyResult() {
         when(checkInBusinessService.getCheckInsByKeyResultId(any())).thenReturn(Collections.emptyList());
 
         boolean returnValue = keyResultBusinessService.isImUsed(1L, ordinalKeyResult);
@@ -424,8 +446,9 @@ void shouldReturnImUsedProperlyFalse2() {
         assertFalse(returnValue);
     }
 
+    @DisplayName("Should return false for isImUsed() on metric key-result with check-ins")
     @Test
-    void shouldReturnImUsedProperlyFalse3() {
+    void shouldReturnFalseForImUsedOnMetricKeyResultWithCheckIns() {
         when(keyResultPersistenceService.findById(any())).thenReturn(metricKeyResult);
         when(checkInBusinessService.getCheckInsByKeyResultId(any())).thenReturn(checkIns);
 
@@ -434,8 +457,9 @@ void shouldReturnImUsedProperlyFalse3() {
         assertFalse(returnValue);
     }
 
+    @DisplayName("Should return true for isImUsed() on ordinal key-result type changing type with check-ins")
     @Test
-    void shouldReturnImUsedProperlyTrue1() {
+    void shouldReturnTrueForImUsedOnKeyResultWithCheckInsAfterTypeChange() {
         when(keyResultPersistenceService.findById(any())).thenReturn(metricKeyResult);
         when(checkInBusinessService.getCheckInsByKeyResultId(any())).thenReturn(checkIns);
 
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/ObjectiveBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/ObjectiveBusinessServiceTest.java
index fe9d31d235..d7c006e688 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/ObjectiveBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/ObjectiveBusinessServiceTest.java
@@ -18,6 +18,7 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -49,8 +50,8 @@ class ObjectiveBusinessServiceTest {
     private final User user = User.Builder
             .builder()
             .withId(1L)
-            .withFirstname("Bob")
-            .withLastname("Kaufmann")
+            .withFirstName("Bob")
+            .withLastName("Kaufmann")
             .withEmail("kaufmann@puzzle.ch")
             .build();
     private final Objective objective = Objective.Builder.builder().withId(5L).withTitle("Objective 1").build();
@@ -73,8 +74,9 @@ class ObjectiveBusinessServiceTest {
             .build();
     private final List<KeyResult> keyResultList = List.of(ordinalKeyResult, ordinalKeyResult, ordinalKeyResult);
 
+    @DisplayName("Should return correct objective on getEntityById()")
     @Test
-    void getOneObjective() {
+    void shouldGetOneObjective() {
         when(objectivePersistenceService.findById(5L)).thenReturn(objective);
 
         Objective realObjective = objectiveBusinessService.getEntityById(5L);
@@ -82,8 +84,9 @@ void getOneObjective() {
         assertEquals("Objective 1", realObjective.getTitle());
     }
 
+    @DisplayName("Should return correct objectives on getEntitiesByTeamId()s")
     @Test
-    void getEntitiesByTeamId() {
+    void shouldGetEntitiesByTeamId() {
         when(objectivePersistenceService.findObjectiveByTeamId(anyLong())).thenReturn(List.of(objective));
 
         List<Objective> entities = objectiveBusinessService.getEntitiesByTeamId(5L);
@@ -91,8 +94,9 @@ void getEntitiesByTeamId() {
         assertThat(entities).hasSameElementsAs(List.of(objective));
     }
 
+    @DisplayName("Should throw exception on getEntityById() when entity does not exist")
     @Test
-    void shouldNotFindTheObjective() {
+    void shouldThrowNotFoundWhenTryingToFindNonExistentObjectiveById() {
         when(objectivePersistenceService.findById(6L))
                 .thenThrow(new ResponseStatusException(NOT_FOUND, "Objective with id 6 not found"));
 
@@ -102,8 +106,9 @@ void shouldNotFindTheObjective() {
         assertEquals("Objective with id 6 not found", exception.getReason());
     }
 
+    @DisplayName("Should create new entity on createEntity()")
     @Test
-    void shouldSaveANewObjective() {
+    void shouldSuccessfullySaveNewObjective() {
         Objective objective = spy(Objective.Builder
                 .builder()
                 .withTitle("Received Objective")
@@ -125,26 +130,9 @@ void shouldSaveANewObjective() {
         assertNull(objective.getCreatedOn());
     }
 
-    @Test
-    void shouldNotThrowResponseStatusExceptionWhenPuttingNullId() {
-        Objective objective1 = Objective.Builder
-                .builder()
-                .withId(null)
-                .withTitle("Title")
-                .withDescription("Description")
-                .withModifiedOn(LocalDateTime.now())
-                .build();
-        when(objectiveBusinessService.createEntity(objective1, authorizationUser)).thenReturn(fullObjective);
-
-        Objective savedObjective = objectiveBusinessService.createEntity(objective1, authorizationUser);
-        assertNull(savedObjective.getId());
-        assertEquals("FullObjective1", savedObjective.getTitle());
-        assertEquals("Bob", savedObjective.getCreatedBy().getFirstname());
-    }
-
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should handle quarters correctly on updateEntity() when objectives and quarters get changed")
     @ValueSource(booleans = { false, true })
-    void updateEntityShouldHandleQuarterCorrectly(boolean hasKeyResultAnyCheckIns) {
+    void shouldHandleQuarterCorrectlyUsingUpdateEntity(boolean hasKeyResultAnyCheckIns) {
         Long id = 27L;
         String title = "Received Objective";
         String description = "The description";
@@ -196,6 +184,7 @@ void updateEntityShouldHandleQuarterCorrectly(boolean hasKeyResultAnyCheckIns) {
         assertEquals(changedObjective.getTitle(), updatedEntity.getTitle());
     }
 
+    @DisplayName("Should delete objective with all key results on deleteEntityById()")
     @Test
     void shouldDeleteObjectiveAndAssociatedKeyResults() {
         when(keyResultBusinessService.getAllKeyResultsByObjective(1L)).thenReturn(keyResultList);
@@ -206,6 +195,7 @@ void shouldDeleteObjectiveAndAssociatedKeyResults() {
         verify(objectiveBusinessService, times(1)).deleteEntityById(1L);
     }
 
+    @DisplayName("Should duplicate objective correctly on duplicateObjective()")
     @Test
     void shouldDuplicateObjective() {
         // arrange
@@ -253,8 +243,9 @@ void shouldDuplicateObjective() {
         verify(keyResultBusinessService, times(2)).createEntity(any(), any());
     }
 
+    @DisplayName("Should get all key result associated with the objective on getAllKeyResultsByObjective()")
     @Test
-    void testGetAllKeyResultsByObjective() {
+    void shouldGetAllKeyResultsByObjective() {
         Long objectiveId = 5L;
 
         KeyResult keyResult1 = new KeyResultMetric();
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/OverviewBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/OverviewBusinessServiceTest.java
index 926211695d..ad7ee1a909 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/OverviewBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/OverviewBusinessServiceTest.java
@@ -17,6 +17,7 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -108,8 +109,9 @@ private static List<Overview> createOverviews(AuthorizationUser authorizationUse
         return overviews;
     }
 
+    @DisplayName("Should return correct list of overviews on getFilteredOverview()")
     @Test
-    void getFilteredOverviewShouldReturnListOfOverviews() {
+    void shouldReturnListOfOverviewsUsingGetFilteredOverview() {
         when(overviewPersistenceService.getFilteredOverview(QUARTER_ID, teamIds, "Objective", authorizationUser))
                 .thenReturn(createOverviews());
 
@@ -126,8 +128,9 @@ void getFilteredOverviewShouldReturnListOfOverviews() {
                 authorizationUser);
     }
 
+    @DisplayName("Should return overviews of current quarter on getFilteredOverview() when quarter id is null")
     @Test
-    void getFilteredOverviewShouldReturnListOfOverviewsWhenQuarterIsNull() {
+    void shouldReturnListOfOverviewsWhenQuarterIsNullUsingGetFilteredOverview() {
         when(overviewPersistenceService.getFilteredOverview(QUARTER_ID, teamIds, "", authorizationUser))
                 .thenReturn(createOverviews());
         when(quarterBusinessService.getCurrentQuarter())
@@ -142,8 +145,9 @@ void getFilteredOverviewShouldReturnListOfOverviewsWhenQuarterIsNull() {
         verify(overviewPersistenceService, times(1)).getFilteredOverview(QUARTER_ID, teamIds, "", authorizationUser);
     }
 
+    @DisplayName("Should return empty list of overviews on getFilteredOverview() when team ids are null")
     @Test
-    void getFilteredOverviewShouldReturnEmptyListOfOverviewsWhenTeamIdsAreNull() {
+    void shouldReturnEmptyListOfOverviewsWhenTeamIdsAreNullUsingGetFilteredOverview() {
         List<Overview> overviews = overviewBusinessService.getFilteredOverview(QUARTER_ID, null, "", authorizationUser);
 
         assertEquals(0, overviews.size());
@@ -154,8 +158,9 @@ void getFilteredOverviewShouldReturnEmptyListOfOverviewsWhenTeamIdsAreNull() {
                 .getFilteredOverview(anyLong(), anyList(), anyString(), eq(authorizationUser));
     }
 
+    @DisplayName("Should throw exception on getFilteredOverview() when quarter id does not exist")
     @Test
-    void getFilteredOverviewShouldReturnExceptionWhenQuarterIdIsNonExistent() {
+    void shouldThrowNotFoundWhenQuarterIdIsNonExistentUsingGetFilteredOverview() {
         doThrow(new ResponseStatusException(HttpStatus.NOT_FOUND))
                 .when(overviewValidationService)
                 .validateOnGet(eq(QUARTER_ID), anyList());
@@ -169,8 +174,9 @@ void getFilteredOverviewShouldReturnExceptionWhenQuarterIdIsNonExistent() {
                 .getFilteredOverview(anyLong(), anyList(), anyString(), eq(authorizationUser));
     }
 
+    @DisplayName("Should throw exception on getFilteredOverview() when team id does not exist")
     @Test
-    void getFilteredOverviewShouldReturnExceptionWhenTeamIdIsNonExistent() {
+    void shouldThrowNotFoundWhenTeamIdIsNonExistentUsingGetFilteredOverview() {
         doThrow(new ResponseStatusException(HttpStatus.NOT_FOUND))
                 .when(overviewValidationService)
                 .validateOnGet(QUARTER_ID, teamIds);
@@ -185,22 +191,9 @@ void getFilteredOverviewShouldReturnExceptionWhenTeamIdIsNonExistent() {
                 .getFilteredOverview(anyLong(), anyList(), any(), eq(authorizationUser));
     }
 
+    @DisplayName("Should return sorted list with teams that include the user first on getFilteredOverview()")
     @Test
-    void getFilteredOverviewShouldThrowExceptionWhenTeamIdIsNonExistent() {
-        doThrow(new ResponseStatusException(HttpStatus.NOT_FOUND))
-                .when(overviewValidationService)
-                .validateOnGet(QUARTER_ID, teamIds);
-        assertThrows(ResponseStatusException.class,
-                     () -> overviewBusinessService.getFilteredOverview(QUARTER_ID, teamIds, "", authorizationUser));
-
-        verify(quarterBusinessService, never()).getCurrentQuarter();
-        verify(overviewValidationService, times(1)).validateOnGet(QUARTER_ID, teamIds);
-        verify(overviewPersistenceService, never())
-                .getFilteredOverview(anyLong(), anyList(), anyString(), eq(authorizationUser));
-    }
-
-    @Test
-    void getFilteredOverviewShouldReturnSortedListUserTeamsFirst() {
+    void shouldReturnSortedListWithUserTeamsFirstUsingGetFilteredOverview() {
         Long firstLevelTeamId = 5L;
         AuthorizationUser user = mockAuthorizationUser(defaultUser(13L));
         when(overviewPersistenceService.getFilteredOverview(QUARTER_ID, teamIds, null, user))
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/QuarterBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/QuarterBusinessServiceTest.java
index 1765144005..df04a48bc7 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/QuarterBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/QuarterBusinessServiceTest.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -41,36 +42,36 @@ class QuarterBusinessServiceTest {
     @Spy
     private QuarterBusinessService quarterBusinessService;
 
-    private static Stream<Arguments> shouldGetFirstMonthFromQuarter() {
-        return Stream.of(Arguments.of(1, 1), Arguments.of(2, 4), Arguments.of(3, 7), Arguments.of(4, 10));
-    }
-
+    @DisplayName("Should return correct quarter on getQuarterById()")
     @Test
     void shouldReturnProperQuarter() {
         quarterBusinessService.getQuarterById(3L);
         verify(quarterValidationService, times(1)).validateOnGet(3L);
         verify(quarterPersistenceService, times(1)).findById(3L);
-
     }
 
+    @DisplayName("Should throw exception on getQuarterById() when id is null")
     @Test
-    void shouldReturnExceptionWhenIdIsNullOnGetQuarter() {
+    void shouldThrowExceptionWhenIdIsNullOnGetQuarter() {
         quarterBusinessService.getQuarterById(null);
         verify(quarterValidationService, times(1)).validateOnGet(null);
     }
 
+    @DisplayName("Should call persistence service on getCurrentQuarter()")
     @Test
     void shouldCallGetCurrentQuarterOnGetCurrentQuarter() {
         quarterBusinessService.getCurrentQuarter();
         verify(quarterPersistenceService, times(1)).getCurrentQuarter();
     }
 
+    @DisplayName("Should call correct method in persistence service on getQuarters()")
     @Test
-    void shouldCallGetQuarters() {
+    void shouldCallGetMostCurrentQuarters() {
         quarterBusinessService.getQuarters();
         verify(quarterPersistenceService).getMostCurrentQuarters();
     }
 
+    @DisplayName("Should also get backlog quarter on getQuarters()")
     @Test
     void shouldGetBacklogQuarter() {
         Quarter realQuarter1 = Quarter.Builder
@@ -104,9 +105,9 @@ void shouldGetBacklogQuarter() {
         assertNull(quarterList.get(0).getEndDate());
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should not generate a new quarter on scheduledGenerationQuarters() when it is not the last month of the quarter such as {0}")
     @ValueSource(ints = { 1, 2, 4, 5, 7, 8, 10, 11 })
-    void shouldNotGenerateQuarterIfNotLastMonth(int month) {
+    void shouldNotGenerateQuarterIfNotLastMonthOfQuarter(int month) {
         ReflectionTestUtils.setField(quarterBusinessService, "quarterStart", 7);
 
         Mockito.when(quarterBusinessService.getCurrentYearMonth()).thenReturn(YearMonth.of(2030, month));
@@ -114,9 +115,9 @@ void shouldNotGenerateQuarterIfNotLastMonth(int month) {
         verify(quarterPersistenceService, never()).save(any());
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should generate new quarter on scheduledGenerationQuarters() when it is the last month of the quarter such as {0}")
     @ValueSource(ints = { 3, 6, 9, 12 })
-    void shouldGenerateQuarterIfLastMonth(int month) {
+    void shouldGenerateQuarterIfLastMonthOfQuarter(int month) {
         ReflectionTestUtils.setField(quarterBusinessService, "quarterStart", 7);
 
         Mockito.when(quarterBusinessService.getCurrentYearMonth()).thenReturn(YearMonth.of(2030, month));
@@ -134,7 +135,7 @@ private static Stream<Arguments> generateQuarterParams() {
                     Arguments.of(2, "xx-yy-xxxx-yyyy-Qzz", YearMonth.of(2030, 1), "30-31-2030-2031-Q2"));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should generate quarters correctly on scheduledGenerationQuarters() with quarter start {0}, format {1}, current month of year {2} and label {3}")
     @MethodSource("generateQuarterParams")
     void shouldGenerateCorrectQuarter(int quarterStart, String quarterFormat, YearMonth currentYearMonth,
                                       String expectedLabel) {
@@ -190,7 +191,7 @@ private static Stream<Arguments> getQuartersParams() {
                     Arguments.of(10, 12, 1));
     }
 
-    @ParameterizedTest(name = "Start month={0}, current month={1} => quarter={2}")
+    @ParameterizedTest(name = "Should get generate quarters on generateQuarters() when start is {0}")
     @MethodSource("getQuartersParams")
     void shouldGetQuartersBasedOnStart(int start, int month, int quarter) {
         ReflectionTestUtils.setField(quarterBusinessService, "quarterStart", start);
@@ -198,6 +199,7 @@ void shouldGetQuartersBasedOnStart(int start, int month, int quarter) {
         assertEquals(quarter, quarters.get(month));
     }
 
+    @DisplayName("Should return null on scheduledGenerationQuarters() when no quarters need to be generated")
     @Test
     void shouldReturnNullWhenNoQuarterGenerationNeeded() {
         Mockito.when(quarterBusinessService.getCurrentYearMonth()).thenReturn(YearMonth.of(2030, 4));
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/TeamBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/TeamBusinessServiceTest.java
index b08ef58e2a..c679590ad0 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/TeamBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/TeamBusinessServiceTest.java
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -70,13 +71,13 @@ void setUp() {
                                 .builder()
                                 .withTeam(team1)
                                 .withUser(defaultUser(2L))
-                                .withTeamAdmin(true)
+                                .isTeamAdmin(true)
                                 .build(),
                             UserTeam.Builder
                                     .builder()
                                     .withTeam(team1)
                                     .withUser(defaultUser(3L))
-                                    .withTeamAdmin(false)
+                                    .isTeamAdmin(false)
                                     .build()));
         this.team2 = Team.Builder.builder().withId(2L).withName("Team 2").build();
         this.team2
@@ -85,13 +86,13 @@ void setUp() {
                                 .builder()
                                 .withTeam(team2)
                                 .withUser(defaultUser(4L))
-                                .withTeamAdmin(true)
+                                .isTeamAdmin(true)
                                 .build(),
                             UserTeam.Builder
                                     .builder()
                                     .withTeam(team2)
                                     .withUser(defaultUser(5L))
-                                    .withTeamAdmin(true)
+                                    .isTeamAdmin(true)
                                     .build()));
         this.team3 = Team.Builder.builder().withId(3L).withName("Team 3").build();
         this.team3.setUserTeamList(List.of());
@@ -106,8 +107,9 @@ void setUp() {
         this.objectiveList = List.of(objective, objective, objective, objectiveCompleted);
     }
 
+    @DisplayName("Should return correct team on getTeamById()")
     @Test
-    void getTeamByIdShouldBeSuccessful() {
+    void shouldSuccessfullyGetTeamById() {
         Long id = team1.getId();
         Mockito.when(teamPersistenceService.findById(id)).thenReturn(team1);
 
@@ -116,8 +118,9 @@ void getTeamByIdShouldBeSuccessful() {
         assertEquals(team1, team);
     }
 
+    @DisplayName("Should return list of all teams on getAllTeams()")
     @Test
-    void getAllTeamsShouldBeSuccessful() {
+    void shouldSuccessfullyGetAllTeams() {
         Mockito.when(teamPersistenceService.findAll()).thenReturn(List.of(team1, team2));
 
         List<Team> teams = teamBusinessService.getAllTeams(defaultAuthorizationUser());
@@ -125,8 +128,9 @@ void getAllTeamsShouldBeSuccessful() {
         assertThat(List.of(team1, team2)).hasSameElementsAs(teams);
     }
 
+    @DisplayName("Should return list of teams with teams that include the users first on getAllTeams()")
     @Test
-    void getAllTeamsSortedShouldReturnSortedListUserTeamsFirst() {
+    void shouldReturnSortedListUserTeamsFirstUsingGetAllTeams() {
         Team userTeam = Team.Builder.builder().withId(1L).withName("UserTeam").withVersion(1).build();
         Team notUserTeam = Team.Builder.builder().withId(2L).withName("NOTUserTeam").withVersion(1).build();
         Team notUserTeam2 = Team.Builder.builder().withId(3L).withName("NOTUserTeam2").withVersion(1).build();
@@ -137,8 +141,8 @@ void getAllTeamsSortedShouldReturnSortedListUserTeamsFirst() {
         AuthorizationUser authUser = new AuthorizationUser(User.Builder
                 .builder()
                 .withId(user.getId())
-                .withFirstname(user.getFirstname())
-                .withLastname(user.getLastname())
+                .withFirstName(user.getFirstName())
+                .withLastName(user.getLastName())
                 .withEmail(user.getEmail())
                 .withUserTeamList(userTeamList)
                 .build());
@@ -148,8 +152,9 @@ void getAllTeamsSortedShouldReturnSortedListUserTeamsFirst() {
         assertEquals(List.of(userTeam, notUserTeam, notUserTeam2), sortedList);
     }
 
+    @DisplayName("Should create new team with user as admin on createTeam()")
     @Test
-    void shouldSaveANewTeam_shouldSetCurrentUserAsAdmin() {
+    void shouldCreateANewTeamAndSetCurrentUserAsAdmin() {
         Team team = Team.Builder.builder().withName("OKR-TEAM").withId(2L).build();
         var user = defaultUserWithTeams(1L, List.of(), List.of());
 
@@ -165,6 +170,7 @@ void shouldSaveANewTeam_shouldSetCurrentUserAsAdmin() {
         assertTrue(user.getUserTeamList().get(0).isTeamAdmin());
     }
 
+    @DisplayName("Should update team on updateTeam()")
     @Test
     void shouldUpdateTeam() {
         Team team = Team.Builder.builder().withId(1L).withName("OKR-TEAM").build();
@@ -173,6 +179,7 @@ void shouldUpdateTeam() {
         verify(cacheService, times(1)).emptyAuthorizationUsersCache();
     }
 
+    @DisplayName("Should delete team and all its objectives on deleteTeam()")
     @Test
     void shouldDeleteTeamAndItsObjectives() {
         var team = defaultTeam(1L);
@@ -189,8 +196,9 @@ void shouldDeleteTeamAndItsObjectives() {
         verify(cacheService, times(2)).emptyAuthorizationUsersCache();
     }
 
+    @DisplayName("Should add user to teams on addUsersToTeam()")
     @Test
-    void addUsersToTeam_shouldAddUsersCorrectly() {
+    void shouldSuccessfullyAddUserToTeam() {
         var teamId = 1L;
         var userIds = List.of(1L, 2L);
 
@@ -203,18 +211,19 @@ void addUsersToTeam_shouldAddUsersCorrectly() {
 
         teamBusinessService.addUsersToTeam(teamId, userIds);
 
-        var user1Teamids = user1.getUserTeamList().stream().map(ut -> ut.getTeam().getId()).toList();
-        assertTrue(user1Teamids.contains(teamId));
+        var user1TeamIds = user1.getUserTeamList().stream().map(ut -> ut.getTeam().getId()).toList();
+        assertTrue(user1TeamIds.contains(teamId));
 
-        var user2Teamids = user2.getUserTeamList().stream().map(ut -> ut.getTeam().getId()).toList();
-        assertTrue(user2Teamids.contains(teamId));
+        var user2TeamIds = user2.getUserTeamList().stream().map(ut -> ut.getTeam().getId()).toList();
+        assertTrue(user2TeamIds.contains(teamId));
 
-        assertFalse(user1Teamids.contains(3L));
-        assertFalse(user2Teamids.contains(3L));
+        assertFalse(user1TeamIds.contains(3L));
+        assertFalse(user2TeamIds.contains(3L));
     }
 
+    @DisplayName("Should remove user from team on removeUserFromTeam()")
     @Test
-    void removeUserFromTeam_shouldRemoveUser() {
+    void shouldSuccessfullyRemoveUserFromTeam() {
         var user = defaultUserWithTeams(1L, List.of(team1), List.of(team2, team3));
         when(userPersistenceService.findById(user.getId())).thenReturn(user);
         when(teamPersistenceService.findById(team2.getId())).thenReturn(team2);
@@ -227,8 +236,9 @@ void removeUserFromTeam_shouldRemoveUser() {
         verify(cacheService, times(1)).emptyAuthorizationUsersCache();
     }
 
+    @DisplayName("Should throw exception on removeUserFromTeam() when team does not exist")
     @Test
-    void removeUserFromTeam_shouldThrowExceptionWhenNoTeamFound() {
+    void shouldThrowExceptionWhenNoTeamFoundUsingRemoveUserFromTeam() {
         var user = defaultUserWithTeams(1L, List.of(team1), List.of(team3));
         when(userPersistenceService.findById(user.getId())).thenReturn(user);
         when(teamPersistenceService.findById(team1.getId())).thenReturn(team1);
@@ -236,8 +246,9 @@ void removeUserFromTeam_shouldThrowExceptionWhenNoTeamFound() {
         assertThrows(RuntimeException.class, () -> teamBusinessService.removeUserFromTeam(team2.getId(), user.getId()));
     }
 
+    @DisplayName("Should throw exception on removeUserFromTeam() when user is the last admin")
     @Test
-    void removeUserFromTeam_shouldThrowExceptionWhenLastAdminShouldBeRemoved() {
+    void shouldThrowExceptionWhenLastAdminGetsRemoved() {
         var user = defaultUserWithTeams(2L, List.of(team1), List.of(team3));
         when(userPersistenceService.findById(user.getId())).thenReturn(user);
         when(teamPersistenceService.findById(team1.getId())).thenReturn(team1);
@@ -247,8 +258,9 @@ void removeUserFromTeam_shouldThrowExceptionWhenLastAdminShouldBeRemoved() {
                      ErrorKey.TRIED_TO_DELETE_LAST_ADMIN.toString());
     }
 
+    @DisplayName("Should update team membership on updateOrAddTeamMembership() when the user is already in the team")
     @Test
-    void updateOrAddTeamMembership_shouldUpdateIfTeamFound() {
+    void shouldUpdateIfTeamFound() {
         var user = defaultUserWithTeams(1L, List.of(team1), List.of(team2, team3));
         when(userPersistenceService.findById(user.getId())).thenReturn(user);
         teamBusinessService.updateOrAddTeamMembership(team2.getId(), user.getId(), true);
@@ -258,8 +270,9 @@ void updateOrAddTeamMembership_shouldUpdateIfTeamFound() {
         verify(cacheService, times(1)).emptyAuthorizationUsersCache();
     }
 
+    @DisplayName("Should throw exception on updateOrAddTeamMembership() when the last admin gets his role removed")
     @Test
-    void updateOrAddTeamMembership_shouldThrowExceptionIfLastAdminShouldBeRemoved() {
+    void shouldThrowExceptionIfLastAdminRoleIsRemoved() {
         var user = defaultUserWithTeams(1L, List.of(team1), List.of());
         team1.setUserTeamList(new ArrayList<>(user.getUserTeamList()));
 
@@ -269,8 +282,9 @@ void updateOrAddTeamMembership_shouldThrowExceptionIfLastAdminShouldBeRemoved()
                      () -> teamBusinessService.updateOrAddTeamMembership(team1.getId(), user.getId(), false));
     }
 
+    @DisplayName("Should add user to team on updateOrAddTeamMembership() when user is not already in the team")
     @Test
-    void updateOrAddTeamMembership_shouldAddTeamIfNoTeamFound() {
+    void shouldAddTeamIfNoTeamFoundUsingUpdateOrAddTeamMembership() {
         var user = defaultUserWithTeams(1L, List.of(), List.of(team2));
         when(userPersistenceService.findById(user.getId())).thenReturn(user);
         when(teamPersistenceService.findById(team1.getId())).thenReturn(team1);
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/UserBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/UserBusinessServiceTest.java
index f7bfb6a83c..3934a57130 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/business/UserBusinessServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/business/UserBusinessServiceTest.java
@@ -14,6 +14,7 @@
 import java.util.List;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -40,53 +41,56 @@ void setUp() {
         User userAlice = User.Builder
                 .builder() //
                 .withId(2L) //
-                .withFirstname("Alice") //
-                .withLastname("Wunderland") //
+                .withFirstName("Alice") //
+                .withLastName("Wunderland") //
                 .withEmail("wunderland@puzzle.ch") //
                 .build();
 
         User userBob = User.Builder
                 .builder() //
                 .withId(9L) //
-                .withFirstname("Bob") //
-                .withLastname("Baumeister") //
+                .withFirstName("Bob") //
+                .withLastName("Baumeister") //
                 .withEmail("baumeister@puzzle.ch") //
                 .build();
 
         userList = Arrays.asList(userAlice, userBob);
     }
 
+    @DisplayName("Should return correct list of all users on getAllUsers()")
     @Test
-    void shouldReturnAllUsersCorrect() throws ResponseStatusException {
+    void shouldReturnAllUsersCorrectly() throws ResponseStatusException {
         Mockito.when(userPersistenceService.findAll()).thenReturn(userList);
 
         List<User> userList = userBusinessService.getAllUsers();
 
         Assertions.assertThat(userList.size()).isEqualTo(2);
         Assertions.assertThat(userList.getFirst().getId()).isEqualTo(2);
-        Assertions.assertThat(userList.getFirst().getFirstname()).isEqualTo("Alice");
-        Assertions.assertThat(userList.get(0).getLastname()).isEqualTo("Wunderland");
+        Assertions.assertThat(userList.getFirst().getFirstName()).isEqualTo("Alice");
+        Assertions.assertThat(userList.get(0).getLastName()).isEqualTo("Wunderland");
         Assertions.assertThat(userList.get(0).getEmail()).isEqualTo("wunderland@puzzle.ch");
         Assertions.assertThat(userList.get(1).getId()).isEqualTo(9);
-        Assertions.assertThat(userList.get(1).getFirstname()).isEqualTo("Bob");
-        Assertions.assertThat(userList.get(1).getLastname()).isEqualTo("Baumeister");
+        Assertions.assertThat(userList.get(1).getFirstName()).isEqualTo("Bob");
+        Assertions.assertThat(userList.get(1).getLastName()).isEqualTo("Baumeister");
         Assertions.assertThat(userList.get(1).getEmail()).isEqualTo("baumeister@puzzle.ch");
     }
 
+    @DisplayName("Should return empty list of users on getAllUsers() when there are no users")
     @Test
-    void shouldReturnEmptyUsers() throws ResponseStatusException {
+    void shouldReturnEmptyListOfUsers() throws ResponseStatusException {
         List<User> userList = userBusinessService.getAllUsers();
 
         Assertions.assertThat(userList.size()).isEqualTo(0);
     }
 
+    @DisplayName("Should return correct user on getUserById()")
     @Test
-    void shouldReturnSingleUserWhenFindingOwnerByValidId() {
+    void shouldReturnSingleUserWhenUserFoundUsingGetUserById() {
         User owner = User.Builder
                 .builder()
                 .withId(1L)
-                .withFirstname("Bob")
-                .withLastname("Kaufmann")
+                .withFirstName("Bob")
+                .withLastName("Kaufmann")
                 .withEmail("kaufmann@puzzle.ch")
                 .build();
         Mockito.when(userPersistenceService.findById(any())).thenReturn(owner);
@@ -94,18 +98,19 @@ void shouldReturnSingleUserWhenFindingOwnerByValidId() {
         User returnedUser = userBusinessService.getUserById(1L);
 
         assertEquals(1L, returnedUser.getId());
-        assertEquals("Bob", returnedUser.getFirstname());
-        assertEquals("Kaufmann", returnedUser.getLastname());
+        assertEquals("Bob", returnedUser.getFirstName());
+        assertEquals("Kaufmann", returnedUser.getLastName());
         assertEquals("kaufmann@puzzle.ch", returnedUser.getEmail());
     }
 
+    @DisplayName("Should return user on getOrCreateUser() when user already exists")
     @Test
-    void getOrCreateUserShouldReturnSingleUserWhenUserFound() {
+    void shouldReturnSingleUserWhenUserFoundUsingGetOrCreateUser() {
         User newUser = User.Builder
                 .builder()
                 .withId(1L)
-                .withFirstname("Bob")
-                .withLastname("Kaufmann")
+                .withFirstName("Bob")
+                .withLastName("Kaufmann")
                 .withEmail("kaufmann@puzzle.ch")
                 .build();
         Mockito.when(userPersistenceService.getOrCreateUser(any())).thenReturn(newUser);
@@ -113,18 +118,19 @@ void getOrCreateUserShouldReturnSingleUserWhenUserFound() {
         User returnedUser = userBusinessService.getOrCreateUser(newUser);
 
         assertEquals(1L, returnedUser.getId());
-        assertEquals("Bob", returnedUser.getFirstname());
-        assertEquals("Kaufmann", returnedUser.getLastname());
+        assertEquals("Bob", returnedUser.getFirstName());
+        assertEquals("Kaufmann", returnedUser.getLastName());
         assertEquals("kaufmann@puzzle.ch", returnedUser.getEmail());
     }
 
+    @DisplayName("Should create new user on getOrCreateUser() when user does not already exist")
     @Test
-    void getOrCreateUserShouldReturnSavedUserWhenUserNotFound() {
+    void shouldReturnSavedUserWhenUserNotFoundUsingGetOrCreateUser() {
         User newUser = User.Builder
                 .builder()
                 .withId(1L)
-                .withFirstname("Bob")
-                .withLastname("Kaufmann")
+                .withFirstName("Bob")
+                .withLastName("Kaufmann")
                 .withEmail("kaufmann@puzzle.ch")
                 .build();
         Mockito.when(userPersistenceService.getOrCreateUser(newUser)).thenReturn(newUser);
@@ -132,18 +138,19 @@ void getOrCreateUserShouldReturnSavedUserWhenUserNotFound() {
         User returnedUser = userBusinessService.getOrCreateUser(newUser);
 
         assertEquals(1L, returnedUser.getId());
-        assertEquals("Bob", returnedUser.getFirstname());
-        assertEquals("Kaufmann", returnedUser.getLastname());
+        assertEquals("Bob", returnedUser.getFirstName());
+        assertEquals("Kaufmann", returnedUser.getLastName());
         assertEquals("kaufmann@puzzle.ch", returnedUser.getEmail());
     }
 
+    @DisplayName("Should throw exception on getOrCreateUser() when user is invalid")
     @Test
-    void getOrCreateUserShouldThrowResponseStatusExceptionWhenInvalidUser() {
+    void shouldThrowResponseStatusExceptionWhenInvalidUserUsingGetOrCreateUser() {
         User newUser = User.Builder
                 .builder()
                 .withId(1L)
-                .withFirstname("Bob")
-                .withLastname("Kaufmann")
+                .withFirstName("Bob")
+                .withLastName("Kaufmann")
                 .withEmail("kaufmann@puzzle.ch")
                 .build();
         Mockito
@@ -158,8 +165,9 @@ void getOrCreateUserShouldThrowResponseStatusExceptionWhenInvalidUser() {
         assertEquals("Not allowed to give an id", exception.getReason());
     }
 
+    @DisplayName("Should set user to okr champion on setIsOkrChampion()")
     @Test
-    void setOkrChampion_shouldSetOkrChampionCorrectly() {
+    void shouldSetOkrChampionCorrectly() {
         var user = TestHelper.defaultUser(1L);
         user.setOkrChampion(false);
 
@@ -169,8 +177,9 @@ void setOkrChampion_shouldSetOkrChampionCorrectly() {
         assertTrue(user.isOkrChampion());
     }
 
+    @DisplayName("Should throw exception on setIsOkrChampion() when the last okr champion is removed")
     @Test
-    void setOkrChampion_shouldThrowExceptionIfLastOkrChampIsRemoved() {
+    void shouldThrowExceptionIfLastOkrChampionIsRemovedUsingSetIsOkrChampion() {
         var user = TestHelper.defaultUser(1L);
         var user2 = TestHelper.defaultUser(2L);
         user.setOkrChampion(true);
@@ -179,8 +188,9 @@ void setOkrChampion_shouldThrowExceptionIfLastOkrChampIsRemoved() {
         assertThrows(OkrResponseStatusException.class, () -> userBusinessService.setIsOkrChampion(user, false));
     }
 
+    @DisplayName("Should not throw exception on setIsOkrChampion() when removing the second to last okr champion")
     @Test
-    void setOkrChampion_shouldNotThrowExceptionIfSecondLastOkrChampIsRemoved() {
+    void shouldNotThrowExceptionIfPenultimateOkrChampionIsRemovedUsingSetOkrChampion() {
         var user = TestHelper.defaultUser(1L);
         var user2 = TestHelper.defaultUser(2L);
         user.setOkrChampion(true);
@@ -193,6 +203,7 @@ void setOkrChampion_shouldNotThrowExceptionIfSecondLastOkrChampIsRemoved() {
         assertFalse(user.isOkrChampion());
     }
 
+    @DisplayName("Should delete user on deleteEntityById()")
     @Test
     void shouldDeleteUser() {
         userBusinessService.deleteEntityById(23L);
diff --git a/backend/src/test/java/ch/puzzle/okr/service/clientconfig/ClientConfigServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/clientconfig/ClientConfigServiceIT.java
index 119b5cb2ce..e49f3b8941 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/clientconfig/ClientConfigServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/clientconfig/ClientConfigServiceIT.java
@@ -7,6 +7,7 @@
 import ch.puzzle.okr.test.SpringIntegrationTest;
 import jakarta.persistence.EntityNotFoundException;
 import java.util.stream.Stream;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -21,10 +22,10 @@ class ClientConfigServiceIT {
     @Autowired
     private ClientConfigService clientConfigService;
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should get correct config on getConfigBasedOnActiveEnv() based on the hostname {0}, active profile {1}, issuer {2} and client id {3}")
     @MethodSource("tenantConfigs")
-    void getConfigBasedOnActiveEnv_validSubdomain_returnsCorrectTenantConfig(String hostname, String activeProfile,
-                                                                             String issuer, String clientId) {
+    void getConfigBasedOnActiveEnvWithValidSubdomainReturnsCorrectTenantConfig(String hostname, String activeProfile,
+                                                                               String issuer, String clientId) {
 
         // arrange + act
         ClientConfigDto clientConfig = clientConfigService.getConfigBasedOnActiveEnv(hostname);
@@ -42,14 +43,16 @@ private static Stream<Arguments> tenantConfigs() {
                             .of("acme.okr.puzzle.ch", "prod", "http://localhost:8544/realms/pitc", "acme_okr_staging"));
     }
 
+    @DisplayName("Should throw exception on getConfigBasedOnActiveEnv() when subDomain is invalid")
     @Test
-    void getConfigBasedOnActiveEnv_invalidSubdomain_throwsException() {
+    void getConfigBasedOnActiveEnvWithInvalidSubdomainThrowsException() {
         assertThrowsExactly(EntityNotFoundException.class,
                             () -> clientConfigService.getConfigBasedOnActiveEnv("foobar.okr.puzzle.ch"));
     }
 
+    @DisplayName("Should return config with correct values on getConfigBasedOnActiveEnv()")
     @Test
-    void getClientConfig_withOtherValues_returnsRightValues() {
+    void getClientConfigWithOtherValuesReturnsCorrectValues() {
         // arrange + act
         ClientConfigDto clientConfig = clientConfigService.getConfigBasedOnActiveEnv("pitc.okr.puzzle.ch");
 
diff --git a/backend/src/test/java/ch/puzzle/okr/service/clientconfig/ClientConfigServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/clientconfig/ClientConfigServiceTest.java
index 2872c53151..a840fa3512 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/clientconfig/ClientConfigServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/clientconfig/ClientConfigServiceTest.java
@@ -11,50 +11,46 @@
 import jakarta.persistence.EntityNotFoundException;
 import java.util.HashMap;
 import java.util.Optional;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
 public class ClientConfigServiceTest {
 
-    @DisplayName("getConfigBasedOnActiveEnv() should be successful when tenant is configured properly")
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should be successful on getConfigBasedOnActiveEnv() when tenant is configured properly with tenant {0} and hostName {1}")
     @CsvSource({ "pitc,pitc.ork.ch", "acme,acme-ork.ch" })
-    void getConfigBasedOnActiveEnvShouldBeSuccessfulWhenTenantIsConfiguredProperly(String tenant, String hostname) {
+    void getConfigBasedOnActiveEnvShouldBeSuccessfulWhenTenantIsConfiguredProperly(String tenant, String hostName) {
         // arrange
         TenantConfigProvider.TenantConfig tenantConfig = getTenantConfig(tenant);
         TenantClientCustomization tenantCustomization = getTenantClientCustomization(tenant);
         ClientConfigService service = getClientConfig(tenantConfig, tenantCustomization, tenant);
 
         // act
-        ClientConfigDto configBasedOnActiveEnv = service.getConfigBasedOnActiveEnv(hostname);
+        ClientConfigDto configBasedOnActiveEnv = service.getConfigBasedOnActiveEnv(hostName);
 
         // assert
         assertClientConfigDto(configBasedOnActiveEnv, tenant);
     }
 
-    @DisplayName("getConfigBasedOnActiveEnv() should throw exception if client customization is not found")
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should throw exception on getConfigBasedOnActiveEnv() when client customization is not found for tenant {0}, hostName {1} and subDomain {2}")
     @CsvSource({ "pitc,pitc.okr.ch,pitc", "acme,acme-okr.ch,acme-okr" })
-    void getConfigBasedOnActiveEnvShouldThrowExceptionIfClientCustomizationIsNotFound(String tenant, String hostname,
-                                                                                      String subdomain) {
+    void getConfigBasedOnActiveEnvShouldThrowExceptionIfClientCustomizationIsNotFound(String tenant, String hostName,
+                                                                                      String subDomain) {
         // arrange
         TenantConfigProvider.TenantConfig tenantConfig = getTenantConfig(tenant);
         ClientConfigService service = getClientConfig(tenantConfig, tenant);
 
         // act + assert
         EntityNotFoundException entityNotFoundException = //
-                assertThrows(EntityNotFoundException.class, () -> service.getConfigBasedOnActiveEnv(hostname));
+                assertThrows(EntityNotFoundException.class, () -> service.getConfigBasedOnActiveEnv(hostName));
 
-        String expectedErrorMessage = "Could not find tenant client customization for subdomain:" + subdomain;
+        String expectedErrorMessage = "Could not find tenant client customization for subDomain:" + subDomain;
         assertEquals(expectedErrorMessage, entityNotFoundException.getMessage());
     }
 
-    @DisplayName("getConfigBasedOnActiveEnv() should throw exception if client config is not found")
-    @ParameterizedTest
+    @ParameterizedTest(name = "Should throw exception getConfigBasedOnActiveEnv when client config is not found for tenant {0}, hostname {1} and subDomain {2} ")
     @CsvSource({ "pitc,pitc.okr.ch,pitc", "acme,acme-okr.ch,acme-okr" })
     void getConfigBasedOnActiveEnvShouldThrowExceptionIfClientConfigIsNotFound(String tenant, String hostname,
-                                                                               String subdomain) {
+                                                                               String subDomain) {
         // arrange
         TenantClientCustomization tenantCustomization = getTenantClientCustomization(tenant);
         ClientConfigService service = getClientConfig(tenantCustomization, tenant);
@@ -63,7 +59,7 @@ void getConfigBasedOnActiveEnvShouldThrowExceptionIfClientConfigIsNotFound(Strin
         EntityNotFoundException entityNotFoundException = //
                 assertThrows(EntityNotFoundException.class, () -> service.getConfigBasedOnActiveEnv(hostname));
 
-        String expectedErrorMessage = "Could not find tenant config for subdomain:" + subdomain;
+        String expectedErrorMessage = "Could not find tenant config for subDomain:" + subDomain;
         assertEquals(expectedErrorMessage, entityNotFoundException.getMessage());
     }
 
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/ActionPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/ActionPersistenceServiceIT.java
index 4647ec9a18..2738a331e3 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/ActionPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/ActionPersistenceServiceIT.java
@@ -15,6 +15,7 @@
 import java.util.List;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.server.ResponseStatusException;
@@ -36,7 +37,7 @@ private static Action createAction(Long id, int version) {
                 .withVersion(version)
                 .withAction("Neue Katze")
                 .withPriority(0)
-                .withIsChecked(false)
+                .isChecked(false)
                 .withKeyResult(KeyResultMetric.Builder
                         .builder()
                         .withBaseline(1.0)
@@ -69,8 +70,9 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
+    @DisplayName("Should create new entity on save()")
     @Test
-    void saveActionShouldSaveNewAction() {
+    void shouldCreateNewEntityWhenSaveIsCalled() {
         Action action = createAction(null);
 
         createdAction = actionPersistenceService.save(action);
@@ -82,8 +84,9 @@ void saveActionShouldSaveNewAction() {
         assertEquals(action.isChecked(), createdAction.isChecked());
     }
 
+    @DisplayName("Should update action on save() when the action has been modified")
     @Test
-    void updateActionShouldUpdateAction() {
+    void shouldUpdateActionWhenSaveIsCalledWithModifiedAction() {
         Action action = createAction(null);
         createdAction = actionPersistenceService.save(action);
         createdAction.setAction(UPDATED_ACTION);
@@ -96,8 +99,9 @@ void updateActionShouldUpdateAction() {
         assertEquals(4, updateAction.getPriority());
     }
 
+    @DisplayName("Should throw exception on save() when the action has already been updated")
     @Test
-    void updateActionShouldThrowExceptionWhenAlreadyUpdated() {
+    void shouldThrowExceptionWhenSaveIsCalledOnAlreadyUpdatedAction() {
         createdAction = actionPersistenceService.save(createAction(null));
         Action changedAction = createAction(createdAction.getId(), 0);
         changedAction.setAction(UPDATED_ACTION);
@@ -111,15 +115,17 @@ void updateActionShouldThrowExceptionWhenAlreadyUpdated() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should return list of all actions on findAll()")
     @Test
-    void getAllActionsShouldReturnListOfAllActions() {
+    void shouldReturnListOfAllActionsWhenFindAllIsCalled() {
         List<Action> actions = actionPersistenceService.findAll();
 
         assertEquals(11, actions.size());
     }
 
+    @DisplayName("Should return list of actions from a key result ordered by ascending priority on getActionsByKeyResultIdOrderByPriorityAsc()")
     @Test
-    void getAllActionsByKeyResultIdShouldReturnListOfAllActionsFromThisKeyResultOrderASC() {
+    void shouldReturnListOfActionsForKeyResultOrderedByPriorityWhenGetActionsByKeyResultIdOrderByPriorityAscIsCalled() {
         List<Action> actions = actionPersistenceService.getActionsByKeyResultIdOrderByPriorityAsc(6L);
 
         assertEquals(3, actions.size());
@@ -128,8 +134,9 @@ void getAllActionsByKeyResultIdShouldReturnListOfAllActionsFromThisKeyResultOrde
         assertEquals(3, actions.get(2).getPriority());
     }
 
+    @DisplayName("Should return correct action on findById()")
     @Test
-    void getActionByIdShouldReturnActionProperly() {
+    void shouldReturnCorrectActionWhenFindByIdIsCalled() {
         Action action = actionPersistenceService.findById(1L);
 
         assertEquals(1L, action.getId());
@@ -139,6 +146,7 @@ void getActionByIdShouldReturnActionProperly() {
         assertEquals(8L, action.getKeyResult().getId());
     }
 
+    @DisplayName("Should delete action on delete()")
     @Test
     void shouldDeleteActionById() {
         Action action = createAction(null);
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/AlignmentPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/AlignmentPersistenceServiceIT.java
index 211c249fe2..05ef18db11 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/AlignmentPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/AlignmentPersistenceServiceIT.java
@@ -17,6 +17,7 @@
 import java.util.List;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.server.ResponseStatusException;
@@ -70,6 +71,7 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
+    @DisplayName("Should save new objective alignment entity on save()")
     @Test
     void saveAlignmentShouldSaveNewObjectiveAlignment() {
         Alignment alignment = createObjectiveAlignment(null);
@@ -81,6 +83,7 @@ void saveAlignmentShouldSaveNewObjectiveAlignment() {
         assertEquals(4L, ((ObjectiveAlignment) createdAlignment).getAlignmentTarget().getId());
     }
 
+    @DisplayName("Should save new key result alignment entity on save()")
     @Test
     void saveAlignmentShouldSaveNewKeyResultAlignment() {
         Alignment alignment = createKeyResultAlignment(null);
@@ -92,6 +95,7 @@ void saveAlignmentShouldSaveNewKeyResultAlignment() {
         assertEquals(8L, ((KeyResultAlignment) createdAlignment).getAlignmentTarget().getId());
     }
 
+    @DisplayName("Should update key result alignment entity on save()")
     @Test
     void updateAlignmentShouldSaveKeyResultAlignment() {
         createdAlignment = alignmentPersistenceService.save(createKeyResultAlignment(null));
@@ -104,6 +108,7 @@ void updateAlignmentShouldSaveKeyResultAlignment() {
         assertEquals(createdAlignment.getVersion() + 1, updatedAlignment.getVersion());
     }
 
+    @DisplayName("Should throw exception on  save() when entity was already updated in the mean time")
     @Test
     void updateAlignmentShouldThrowExceptionWhenAlreadyUpdated() {
         createdAlignment = alignmentPersistenceService.save(createKeyResultAlignment(null));
@@ -120,6 +125,7 @@ void updateAlignmentShouldThrowExceptionWhenAlreadyUpdated() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should return correct list of alignments on findByAlignedObjectiveId()")
     @Test
     void findByAlignedObjectiveIdShouldReturnListOfAlignments() {
         List<Alignment> alignments = alignmentPersistenceService.findByAlignedObjectiveId(4L);
@@ -128,6 +134,7 @@ void findByAlignedObjectiveIdShouldReturnListOfAlignments() {
         alignments.forEach(this::assertAlignment);
     }
 
+    @DisplayName("Should return correct list of key result alignments on findByKeyResultAlignmentId()")
     @Test
     void findByKeyResultAlignmentIdShouldReturnListOfAlignments() {
         List<KeyResultAlignment> alignments = alignmentPersistenceService.findByKeyResultAlignmentId(8L);
@@ -136,6 +143,7 @@ void findByKeyResultAlignmentIdShouldReturnListOfAlignments() {
         assertAlignment(alignments.get(0));
     }
 
+    @DisplayName("Should return correct list of objective alignments on findByObjectiveAlignmentId()")
     @Test
     void findByObjectiveAlignmentIdShouldReturnListOfAlignments() {
         List<ObjectiveAlignment> alignments = alignmentPersistenceService.findByObjectiveAlignmentId(3L);
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/AlignmentSelectionPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/AlignmentSelectionPersistenceServiceIT.java
index 2e790ee582..7f11317059 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/AlignmentSelectionPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/AlignmentSelectionPersistenceServiceIT.java
@@ -12,6 +12,7 @@
 import java.util.stream.Stream;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -30,8 +31,9 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
+    @DisplayName("Should return correct alignment selections on getAlignmentSelectionByQuarterIdAndTeamIdNot()")
     @Test
-    void getAlignmentSelectionByQuarterIdAndTeamIdNotShouldReturnAlignmentSelections() {
+    void shouldReturnAlignmentSelections() {
         List<AlignmentSelection> alignmentSelections = alignmentSelectionPersistenceService
                 .getAlignmentSelectionByQuarterIdAndTeamIdNot(2L, 4L);
 
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaIT.java
index ca93e83964..798475e5a5 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaIT.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -33,8 +34,9 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
+    @DisplayName("Should return objective on findObjectiveById() when user is has first level role")
     @Test
-    void appendObjectiveShouldReturnObjectiveWhenFirstLevelRole() {
+    void shouldReturnObjectiveWhenFindObjectiveByIdIsCalledByUserWithFirstLevelRole() {
         Long objectiveId = 5L;
         AuthorizationUser authorizationUser = defaultAuthorizationUser();
         Objective objective = objectivePersistenceService.findObjectiveById(objectiveId, authorizationUser, null);
@@ -42,8 +44,9 @@ void appendObjectiveShouldReturnObjectiveWhenFirstLevelRole() {
         assertEquals(objectiveId, objective.getId());
     }
 
+    @DisplayName("Should return objective on findObjectiveById() when user is has second level role")
     @Test
-    void appendObjectiveShouldReturnObjectiveWhenSecondLevelRole() {
+    void shouldReturnObjectiveWhenFindObjectiveByIdIsCalledByUserWithSecondLevelRole() {
         Long objectiveId = 6L;
         AuthorizationUser authorizationUser = mockAuthorizationUser(defaultUser(null));
         Objective objective = objectivePersistenceService.findObjectiveById(objectiveId, authorizationUser, null);
@@ -51,8 +54,9 @@ void appendObjectiveShouldReturnObjectiveWhenSecondLevelRole() {
         assertEquals(objectiveId, objective.getId());
     }
 
+    @DisplayName("Should return objective on findObjectiveById() when user is has member level role")
     @Test
-    void appendObjectiveShouldReturnObjectiveWhenMemberRole() {
+    void shouldReturnObjectiveWhenFindObjectiveByIdIsCalledByUserWithMemberLevelRole() {
         Long objectiveId = 6L;
         AuthorizationUser authorizationUser = mockAuthorizationUser(defaultUser(null));
         Objective objective = objectivePersistenceService.findObjectiveById(objectiveId, authorizationUser, null);
@@ -60,8 +64,9 @@ void appendObjectiveShouldReturnObjectiveWhenMemberRole() {
         assertEquals(objectiveId, objective.getId());
     }
 
+    @DisplayName("Should return correct overview on getFilteredOverview() when user has first level role and no team ids are supplied")
     @Test
-    void appendOverviewShouldReturnObjectiveWhenFirstLevelRoleAndTeamIdsEmpty() {
+    void shouldReturnCorrectOverviewWhenGetFilteredOverviewIsCalledByUserWithFirstLevelRoleAndNoTeamIdsSupplied() {
         Long quarterId = 2L;
         AuthorizationUser authorizationUser = defaultAuthorizationUser();
         List<Overview> overviews = overviewPersistenceService
@@ -70,8 +75,9 @@ void appendOverviewShouldReturnObjectiveWhenFirstLevelRoleAndTeamIdsEmpty() {
         assertEquals(18L, overviews.size());
     }
 
+    @DisplayName("Should return correct overview on getFilteredOverview() when user has second level role")
     @Test
-    void appendOverviewShouldReturnObjectiveWhenSecondLevelRole() {
+    void shouldReturnCorrectOverviewWhenGetFilteredOverviewIsCalledByUserWithSecondLevelRole() {
         Long quarterId = 2L;
         AuthorizationUser authorizationUser = mockAuthorizationUser(defaultUser(null));
         List<Overview> overviews = overviewPersistenceService
@@ -80,8 +86,9 @@ void appendOverviewShouldReturnObjectiveWhenSecondLevelRole() {
         assertEquals(6L, overviews.size());
     }
 
+    @DisplayName("Should return correct overview on getFilteredOverview() when user has member level role")
     @Test
-    void appendOverviewShouldReturnObjectiveWhenMemberRole() {
+    void shouldReturnCorrectOverviewWhenGetFilteredOverviewIsCalledByUserWithMemberLevelRole() {
         Long quarterId = 2L;
         AuthorizationUser authorizationUser = mockAuthorizationUser(defaultUser(null));
         List<Overview> overviews = overviewPersistenceService
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaParametersTest.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaParametersTest.java
index 0923b20a22..158fc71913 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaParametersTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaParametersTest.java
@@ -18,7 +18,7 @@
 
 public class AuthorizationCriteriaParametersTest {
 
-    @DisplayName("setParameters() should be successful with default authorization user")
+    @DisplayName("Should be successful on setParameters() with default authorization user")
     @Test
     void setParametersShouldBeSuccessfulWithDefaultAuthorizationUser() {
         // arrange
@@ -38,17 +38,17 @@ void setParametersShouldBeSuccessfulWithDefaultAuthorizationUser() {
         assertEquals(expected, typedQueryMock.getLog());
     }
 
-    @DisplayName("setParameters() should be successful when user is okr champion")
+    @DisplayName("Should be successful on setParameters() when user is okr champion")
     @Test
     void setParametersShouldBeSuccessfulWhenUserIsOkrChampion() {
         // arrange
         var user = User.Builder
                 .builder() //
                 .withId(23L) //
-                .withFirstname("Hanna") //
-                .withLastname("muster") //
+                .withFirstName("Hanna") //
+                .withLastName("muster") //
                 .withEmail("hanna.muster@example.com") //
-                .withOkrChampion(true) //
+                .isOkrChampion(true) //
                 .build();
         var criteria = new AuthorizationCriteria<Objective>();
         TypedQueryMock<Objective> typedQueryMock = new TypedQueryMock<>();
@@ -65,7 +65,7 @@ void setParametersShouldBeSuccessfulWhenUserIsOkrChampion() {
         assertEquals(expected, typedQueryMock.getLog());
     }
 
-    @DisplayName("setParameters() should be successful when team ids or objective query are empty")
+    @DisplayName("Should be successful on setParameters() when team ids or objective query are empty")
     @ParameterizedTest
     @MethodSource("provideListAndString")
     void setParametersShouldBeSuccessfulWhenTeamIdsOrObjectiveQueryAreEmpty(List<Long> teamIds, String objectiveQuery) {
@@ -95,7 +95,7 @@ private static Stream<Arguments> provideListAndString() {
                     Arguments.of(null, ""));
     }
 
-    @DisplayName("setParameters() should be successful when team ids and objective query are not empty")
+    @DisplayName("Should be successful on setParameters() when team ids and objective query are not empty")
     @Test
     void setParametersShouldBeSuccessfulWhenTeamIdsAndObjectiveQueryAreNotEmpty() {
         // arrange
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaTest.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaTest.java
index f409da5784..f8726d3820 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/AuthorizationCriteriaTest.java
@@ -17,7 +17,7 @@
 
 public class AuthorizationCriteriaTest {
 
-    @DisplayName("appendObjective() should be successful with default authorization user")
+    @DisplayName("Should be successful on appendObjective() with default authorization user")
     @Test
     void appendObjectiveShouldBeSuccessfulWithDefaultAuthorizationUser() {
         // arrange
@@ -31,17 +31,17 @@ void appendObjectiveShouldBeSuccessfulWithDefaultAuthorizationUser() {
         assertEquals(expected, current);
     }
 
-    @DisplayName("appendObjective() should be successful when user is okrChampion")
+    @DisplayName("Should be successful on appendObjective() when user is okrChampion")
     @Test
     void appendObjectiveShouldBeSuccessfulWhenUserIsOkrChampion() {
         // arrange
         var user = User.Builder
                 .builder() //
                 .withId(23L) //
-                .withFirstname("Hanna") //
-                .withLastname("muster") //
+                .withFirstName("Hanna") //
+                .withLastName("muster") //
                 .withEmail("hanna.muster@example.com") //
-                .withOkrChampion(true) //
+                .isOkrChampion(true) //
                 .build();
         var criteria = new AuthorizationCriteria<Objective>();
 
@@ -53,8 +53,7 @@ void appendObjectiveShouldBeSuccessfulWhenUserIsOkrChampion() {
         assertEquals(expected, current);
     }
 
-    @DisplayName("appendOverview() should be successful when team ids or objective query are empty")
-    @ParameterizedTest
+    @ParameterizedTest(name = "should be successful on appendOverview() when team ids ({0}) or objectives query ({0}) are empty")
     @MethodSource("provideListAndString")
     void appendOverviewShouldBeSuccessfulWhenTeamIdsOrObjectiveQueryAreEmpty(List<Long> teamIds,
                                                                              String objectiveQuery) {
@@ -78,7 +77,7 @@ private static Stream<Arguments> provideListAndString() {
                     Arguments.of(null, ""));
     }
 
-    @DisplayName("appendOverview() should be successful when team ids and objective query are not empty")
+    @DisplayName("Should be successful on appendOverview() when team ids and objective query are not empty")
     @Test
     void appendOverviewShouldBeSuccessfulWhenTeamIdsAndObjectiveQueryAreNotEmpty() {
         // arrange
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/CheckInPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/CheckInPersistenceServiceIT.java
index a11b61e128..d39da086f4 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/CheckInPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/CheckInPersistenceServiceIT.java
@@ -37,9 +37,9 @@ void tearDown() {
     }
 
     // uses data from V100_0_0__TestData.sql
-    @DisplayName("getCheckInsByKeyResultIdOrderByCheckInDate() should get checkIns by keyResultId and order them by date desc")
+    @DisplayName("Should get checkIns by keyResultId and order them by date desc on getCheckInsByKeyResultIdOrderByCheckInDate() ")
     @Test
-    void getCheckInsByKeyResultIdOrderByCheckInDateShouldGetCheckInsByKeyResultIdAndOrderThemByDateDesc() {
+    void shouldGetCheckInsByKeyResultIdAndOrderThemByDateDesc() {
         // act
         List<CheckIn> checkIns = checkInPersistenceService
                 .getCheckInsByKeyResultIdOrderByCheckInDateDesc(KEY_RESULT_ID);
@@ -56,30 +56,28 @@ private void assertFirstIsCreatedAfterSecond(CheckIn first, CheckIn second) {
     }
 
     // uses data from V100_0_0__TestData.sql
-    @DisplayName("getLastCheckInOfKeyResult() should get last checkIn of keyResult")
+    @DisplayName("Should get last checkIn of keyResult on getLastCheckInOfKeyResult()")
     @Test
-    void getLastCheckInOfKeyResultShouldGetLastCheckInOfKeyResult() {
+    void shouldGetLastCheckInOfKeyResult() {
         // act
         var lastCheckIn = checkInPersistenceService.getLastCheckInOfKeyResult(KEY_RESULT_ID);
 
         // assert
         var allCheckins = checkInPersistenceService.getCheckInsByKeyResultIdOrderByCheckInDateDesc(KEY_RESULT_ID);
         assertLastIsCreatedAfterAllOtherCheckIns(lastCheckIn, allCheckins);
-
     }
 
     private void assertLastIsCreatedAfterAllOtherCheckIns(CheckIn last, List<CheckIn> allCheckIns) {
-        for (CheckIn checkInLoop : allCheckIns) {
-            if (!Objects.equals(checkInLoop.getId(), last.getId())) {
-                assertTrue(last.getCreatedOn().isAfter(checkInLoop.getCreatedOn()));
+        for (CheckIn checkIn : allCheckIns) {
+            if (!Objects.equals(checkIn.getId(), last.getId())) {
+                assertTrue(last.getCreatedOn().isAfter(checkIn.getCreatedOn()));
             }
         }
     }
 
-    @DisplayName("getModelName() should return checkIn")
+    @DisplayName("Should return checkIn on getModelName()")
     @Test
-    void getModelNameShouldReturnCheckIn() {
+    void shouldReturnCheckIn() {
         assertEquals(CHECK_IN, checkInPersistenceService.getModelName());
     }
-
 }
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/CompletedPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/CompletedPersistenceServiceIT.java
index 2e2d44d376..4d661ab2d0 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/CompletedPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/CompletedPersistenceServiceIT.java
@@ -15,6 +15,7 @@
 import java.util.List;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.server.ResponseStatusException;
@@ -24,8 +25,8 @@ class CompletedPersistenceServiceIT {
     @Autowired
     private CompletedPersistenceService completedPersistenceService;
     private Completed createdCompleted;
-    private static final String WIR_HABEN_ES_GUT_GESCHAFFT = "Wir haben es gut geschafft";
-    public static final String GUTE_LERNENDE = "Gute Lernende";
+    private static final String OBJECTIVE_COMMENT = "Wir haben es gut geschafft";
+    public static final String OBJECTIVE_TITLE = "Gute Lernende";
     public static final long OBJECTIVE_ID = 3L;
 
     private static Completed createCompleted(Long id) {
@@ -37,8 +38,8 @@ private static Completed createCompleted(Long id, int version) {
                 .builder()
                 .withId(id)
                 .withVersion(version)
-                .withObjective(Objective.Builder.builder().withId(OBJECTIVE_ID).withTitle(GUTE_LERNENDE).build())
-                .withComment(WIR_HABEN_ES_GUT_GESCHAFFT)
+                .withObjective(Objective.Builder.builder().withId(OBJECTIVE_ID).withTitle(OBJECTIVE_TITLE).build())
+                .withComment(OBJECTIVE_COMMENT)
                 .build();
     }
 
@@ -64,16 +65,18 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
+    @DisplayName("Should save entity on save()")
     @Test
     void saveCompletedShouldSaveCompleted() {
         createdCompleted = completedPersistenceService.save(createCompleted(null));
 
         assertNotNull(createdCompleted.getId());
-        assertEquals(WIR_HABEN_ES_GUT_GESCHAFFT, createdCompleted.getComment());
+        assertEquals(OBJECTIVE_COMMENT, createdCompleted.getComment());
         assertEquals(OBJECTIVE_ID, createdCompleted.getObjective().getId());
-        assertEquals(GUTE_LERNENDE, createdCompleted.getObjective().getTitle());
+        assertEquals(OBJECTIVE_TITLE, createdCompleted.getObjective().getTitle());
     }
 
+    @DisplayName("Should update entity on save() when the entity already exists")
     @Test
     void updateCompletedShouldSaveCompleted() {
         createdCompleted = completedPersistenceService.save(createCompleted(null));
@@ -87,6 +90,7 @@ void updateCompletedShouldSaveCompleted() {
         assertEquals(updateCompleted.getComment(), updatedCompleted.getComment());
     }
 
+    @DisplayName("Should throw exception on save() when entity was already updated in the mean time")
     @Test
     void updateCompletedShouldThrowExceptionWhenAlreadyUpdated() {
         createdCompleted = completedPersistenceService.save(createCompleted(null));
@@ -103,6 +107,7 @@ void updateCompletedShouldThrowExceptionWhenAlreadyUpdated() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should return correct entity on getCompletedByObjectiveId()")
     @Test
     void getCompletedShouldGetCompletedByObjectiveId() {
         Completed savedCompleted = completedPersistenceService.getCompletedByObjectiveId(6L);
@@ -113,8 +118,9 @@ void getCompletedShouldGetCompletedByObjectiveId() {
                      savedCompleted.getObjective().getTitle());
     }
 
+    @DisplayName("Should delete entity on deleteById()")
     @Test
-    void deleteCompletedIdShouldDeleteExistingCompletedByObjectiveId() {
+    void deleteByIdShouldDeleteExistingCompletedByObjectiveId() {
 
         completedPersistenceService.deleteById(3L);
 
@@ -128,6 +134,7 @@ void deleteCompletedIdShouldDeleteExistingCompletedByObjectiveId() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on findById() when id does not exist")
     @Test
     void deleteCompletedShouldThrowExceptionWhenCompletedNotFound() {
         long noExistentId = getNonExistentId();
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/KeyResultPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/KeyResultPersistenceServiceIT.java
index bd99d34753..058c5672e7 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/KeyResultPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/KeyResultPersistenceServiceIT.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -63,10 +64,10 @@ private static KeyResult createKeyResultOrdinal(Long id, int version) {
                 .build();
     }
 
-    private static final String KEY_RESULT_UPDATED = "Updated Key Result";
-    private static final String THIS_IS_DESCRIPTION = "This is a new description";
+    private static final String KEY_RESULT_TITLE = "Updated Key Result";
+    private static final String KEY_RESULT_DESCRIPTION = "This is a new description";
     private static final String MODEL_NOT_FOUND = "MODEL_WITH_ID_NOT_FOUND";
-    private static final String KEYRESULT = "KeyResult";
+    private static final String KEY_RESULT = "KeyResult";
 
     @BeforeEach
     void setUp() {
@@ -88,6 +89,7 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
+    @DisplayName("Should save new key result on save()")
     @Test
     void saveKeyResultShouldSaveNewKeyResult() {
         KeyResult keyResult = createKeyResultMetric(null);
@@ -102,50 +104,54 @@ void saveKeyResultShouldSaveNewKeyResult() {
         assertEquals(keyResult.getDescription(), createdKeyResult.getDescription());
     }
 
+    @DisplayName("Should return correct key result on findById()")
     @Test
-    void getKeyResultByIdShouldReturnKeyResultProperly() {
+    void shouldFindKeyResultById() {
         KeyResult keyResult = keyResultPersistenceService.findById(3L);
 
         assertEquals(3L, keyResult.getId());
         assertEquals("Steigern der URS um 25%", keyResult.getTitle());
     }
 
+    @DisplayName("Should throw exception on findById() when id does not exist")
     @Test
     void getKeyResultByIdShouldThrowExceptionWhenKeyResultNotFound() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> keyResultPersistenceService.findById(321L));
 
-        List<ErrorDto> expectedErrors = List.of(new ErrorDto(MODEL_NOT_FOUND, List.of(KEYRESULT, "321")));
+        List<ErrorDto> expectedErrors = List.of(new ErrorDto(MODEL_NOT_FOUND, List.of(KEY_RESULT, "321")));
 
         assertEquals(NOT_FOUND, exception.getStatusCode());
         assertThat(expectedErrors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on findById() when id is null")
     @Test
     void getKeyResultByIdShouldThrowExceptionWhenKeyResultIdIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> keyResultPersistenceService.findById(null));
 
-        List<ErrorDto> expectedErrors = List.of(new ErrorDto("ATTRIBUTE_NULL", List.of("ID", KEYRESULT)));
+        List<ErrorDto> expectedErrors = List.of(new ErrorDto("ATTRIBUTE_NULL", List.of("ID", KEY_RESULT)));
 
         assertEquals(BAD_REQUEST, exception.getStatusCode());
         assertThat(expectedErrors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should only update entity on recreateEntity() when no type change was done")
     @Test
     void recreateEntityShouldUpdateKeyResultNoTypeChange() {
         KeyResult keyResult = createKeyResultOrdinal(null);
         createdKeyResult = keyResultPersistenceService.save(keyResult);
-        createdKeyResult.setTitle(KEY_RESULT_UPDATED);
+        createdKeyResult.setTitle(KEY_RESULT_TITLE);
         Long keyResultId = createdKeyResult.getId();
 
         KeyResult recreatedKeyResult = keyResultPersistenceService
                 .recreateEntity(createdKeyResult.getId(), createdKeyResult);
 
         assertNotNull(createdKeyResult.getId());
-        assertEquals(KEY_RESULT_UPDATED, recreatedKeyResult.getTitle());
+        assertEquals(KEY_RESULT_TITLE, recreatedKeyResult.getTitle());
         assertEquals(createdKeyResult.getOwner().getId(), recreatedKeyResult.getOwner().getId());
         assertEquals(createdKeyResult.getObjective().getId(), recreatedKeyResult.getObjective().getId());
 
@@ -153,7 +159,7 @@ void recreateEntityShouldUpdateKeyResultNoTypeChange() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> keyResultPersistenceService.findById(keyResultId));
 
-        List<ErrorDto> expectedErrors = List.of(ErrorDto.of(MODEL_NOT_FOUND, List.of(KEYRESULT, keyResultId)));
+        List<ErrorDto> expectedErrors = List.of(ErrorDto.of(MODEL_NOT_FOUND, List.of(KEY_RESULT, keyResultId)));
 
         assertEquals(NOT_FOUND, exception.getStatusCode());
         assertThat(expectedErrors).hasSameElementsAs(exception.getErrors());
@@ -163,6 +169,7 @@ void recreateEntityShouldUpdateKeyResultNoTypeChange() {
         createdKeyResult = recreatedKeyResult;
     }
 
+    @DisplayName("Should change type on recreateEntity() when type change was done")
     @Test
     void recreateEntityShouldUpdateKeyResultWithTypeChange() {
         KeyResult keyResult = createKeyResultMetric(null);
@@ -174,7 +181,7 @@ void recreateEntityShouldUpdateKeyResultWithTypeChange() {
                 .withTargetZone("Hund + Katze")
                 .withStretchZone("Zoo")
                 .withId(createdKeyResult.getId())
-                .withTitle(KEY_RESULT_UPDATED)
+                .withTitle(KEY_RESULT_TITLE)
                 .withObjective(createdKeyResult.getObjective())
                 .withOwner(createdKeyResult.getOwner())
                 .withCreatedBy(createdKeyResult.getCreatedBy())
@@ -186,7 +193,7 @@ void recreateEntityShouldUpdateKeyResultWithTypeChange() {
 
         assertNotNull(createdKeyResult.getId());
         assertEquals(createdKeyResult.getObjective().getId(), recreatedKeyResult.getObjective().getId());
-        assertEquals(KEY_RESULT_UPDATED, recreatedKeyResult.getTitle());
+        assertEquals(KEY_RESULT_TITLE, recreatedKeyResult.getTitle());
         assertEquals(createdKeyResult.getOwner().getId(), recreatedKeyResult.getOwner().getId());
 
         Long keyResultId = createdKeyResult.getId();
@@ -194,7 +201,7 @@ void recreateEntityShouldUpdateKeyResultWithTypeChange() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> keyResultPersistenceService.findById(keyResultId));
 
-        List<ErrorDto> expectedErrors = List.of(ErrorDto.of(MODEL_NOT_FOUND, List.of(KEYRESULT, keyResultId)));
+        List<ErrorDto> expectedErrors = List.of(ErrorDto.of(MODEL_NOT_FOUND, List.of(KEY_RESULT, keyResultId)));
 
         assertEquals(NOT_FOUND, exception.getStatusCode());
         assertThat(expectedErrors).hasSameElementsAs(exception.getErrors());
@@ -204,43 +211,46 @@ void recreateEntityShouldUpdateKeyResultWithTypeChange() {
         createdKeyResult = recreatedKeyResult;
     }
 
+    @DisplayName("Should update key result on updateEntity()")
     @Test
     void updateEntityShouldUpdateKeyResult() {
         KeyResult keyResult = createKeyResultOrdinal(null);
         createdKeyResult = keyResultPersistenceService.save(keyResult);
         KeyResult updateKeyResult = createKeyResultOrdinal(createdKeyResult.getId(), createdKeyResult.getVersion());
-        updateKeyResult.setTitle(KEY_RESULT_UPDATED);
-        updateKeyResult.setDescription(THIS_IS_DESCRIPTION);
+        updateKeyResult.setTitle(KEY_RESULT_TITLE);
+        updateKeyResult.setDescription(KEY_RESULT_DESCRIPTION);
 
         KeyResult updatedKeyResult = keyResultPersistenceService.updateEntity(updateKeyResult);
 
         assertEquals(createdKeyResult.getId(), updatedKeyResult.getId());
         assertEquals(createdKeyResult.getVersion() + 1, updatedKeyResult.getVersion());
-        assertEquals(KEY_RESULT_UPDATED, updatedKeyResult.getTitle());
-        assertEquals(THIS_IS_DESCRIPTION, updatedKeyResult.getDescription());
+        assertEquals(KEY_RESULT_TITLE, updatedKeyResult.getTitle());
+        assertEquals(KEY_RESULT_DESCRIPTION, updatedKeyResult.getDescription());
         assertEquals(createdKeyResult.getOwner().getId(), updatedKeyResult.getOwner().getId());
         assertEquals(createdKeyResult.getObjective().getId(), updatedKeyResult.getObjective().getId());
         assertEquals(createdKeyResult.getModifiedOn(), updatedKeyResult.getModifiedOn());
     }
 
+    @DisplayName("Should throw exception on updateEntity() when entity was already updated in the mean time")
     @Test
     void updateEntityShouldThrowExceptionWhenAlreadyUpdated() {
         KeyResult keyResult = createKeyResultOrdinal(null);
         createdKeyResult = keyResultPersistenceService.save(keyResult);
         KeyResult updateKeyResult = createKeyResultOrdinal(createdKeyResult.getId(), 0);
-        updateKeyResult.setTitle(KEY_RESULT_UPDATED);
-        updateKeyResult.setDescription(THIS_IS_DESCRIPTION);
+        updateKeyResult.setTitle(KEY_RESULT_TITLE);
+        updateKeyResult.setDescription(KEY_RESULT_DESCRIPTION);
 
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> keyResultPersistenceService
                                                                     .updateEntity(updateKeyResult));
-        List<ErrorDto> expectedErrors = List.of(new ErrorDto("DATA_HAS_BEEN_UPDATED", List.of(KEYRESULT)));
+        List<ErrorDto> expectedErrors = List.of(new ErrorDto("DATA_HAS_BEEN_UPDATED", List.of(KEY_RESULT)));
 
         assertEquals(UNPROCESSABLE_ENTITY, exception.getStatusCode());
         assertThat(expectedErrors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should return list of key results on getKeyResultsByObjective()")
     @Test
     void getKeyResultsByObjectiveShouldReturnListOfKeyResults() {
         List<KeyResult> keyResultsByObjective = keyResultPersistenceService.getKeyResultsByObjective(3L);
@@ -248,6 +258,7 @@ void getKeyResultsByObjectiveShouldReturnListOfKeyResults() {
         assertEquals(3, keyResultsByObjective.size());
     }
 
+    @DisplayName("Should delete entity on deleteById()")
     @Test
     void deleteKeyResultByIdShouldDeleteExistingKeyResult() {
         KeyResult keyResult = createKeyResultMetric(null);
@@ -258,13 +269,14 @@ void deleteKeyResultByIdShouldDeleteExistingKeyResult() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> keyResultPersistenceService.findById(keyResultId));
 
-        List<ErrorDto> expectedErrors = List.of(ErrorDto.of(MODEL_NOT_FOUND, List.of(KEYRESULT, keyResultId)));
+        List<ErrorDto> expectedErrors = List.of(ErrorDto.of(MODEL_NOT_FOUND, List.of(KEY_RESULT, keyResultId)));
 
         assertEquals(NOT_FOUND, exception.getStatusCode());
         assertThat(expectedErrors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on deleteById() when id does not exist")
     @Test
     void deleteKeyResultShouldThrowExceptionWhenKeyResultNotFound() {
         long nonExistentId = getNonExistentId();
@@ -272,7 +284,7 @@ void deleteKeyResultShouldThrowExceptionWhenKeyResultNotFound() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> keyResultPersistenceService.findById(nonExistentId));
 
-        List<ErrorDto> expectedErrors = List.of(ErrorDto.of(MODEL_NOT_FOUND, List.of(KEYRESULT, nonExistentId)));
+        List<ErrorDto> expectedErrors = List.of(ErrorDto.of(MODEL_NOT_FOUND, List.of(KEY_RESULT, nonExistentId)));
 
         assertEquals(NOT_FOUND, exception.getStatusCode());
         assertThat(expectedErrors).hasSameElementsAs(exception.getErrors());
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/ObjectivePersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/ObjectivePersistenceServiceIT.java
index b2f83eb360..a3d6c9350c 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/ObjectivePersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/ObjectivePersistenceServiceIT.java
@@ -74,9 +74,9 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
-    @DisplayName("findObjectiveById() should return objective properly")
+    @DisplayName("Should return correct objective on findObjectiveById()")
     @Test
-    void findObjectiveByIdShouldReturnObjectiveProperly() {
+    void shouldFindObjectiveById() {
         // act
         var objective = objectivePersistenceService
                 .findObjectiveById(ID_OF_OBJECTIVE_3, authorizationUser, NO_RESULT_EXCEPTION);
@@ -85,9 +85,9 @@ void findObjectiveByIdShouldReturnObjectiveProperly() {
         assertObjective(ID_OF_OBJECTIVE_3, TITLE_OF_OBJECTIVE_3, objective);
     }
 
-    @DisplayName("findObjectiveById() should throw exception when objective not found")
+    @DisplayName("Should throw exception on findObjectiveById() when objective not found")
     @Test
-    void findObjectiveByIdShouldThrowExceptionWhenObjectiveNotFound() {
+    void shouldThrowExceptionWhenObjectiveNotFoundOnFindObjectiveById() {
         // act
         var exception = assertThrows(OkrResponseStatusException.class,
                                      () -> objectivePersistenceService
@@ -100,9 +100,9 @@ void findObjectiveByIdShouldThrowExceptionWhenObjectiveNotFound() {
         assertResponseStatusException(UNAUTHORIZED, expectedErrors, exception);
     }
 
-    @DisplayName("findObjectiveById() should throw exception when objective id is null")
+    @DisplayName("Should throw exception on findObjectiveById() when objective id is null")
     @Test
-    void findObjectiveByIdShouldThrowExceptionWhenObjectiveIdIsNull() {
+    void shouldThrowExceptionWhenObjectiveIdIsNullOnFindObjectiveById() {
         // act
         var exception = assertThrows(OkrResponseStatusException.class,
                                      () -> objectivePersistenceService
@@ -113,9 +113,9 @@ void findObjectiveByIdShouldThrowExceptionWhenObjectiveIdIsNull() {
         assertResponseStatusException(BAD_REQUEST, expectedErrors, exception);
     }
 
-    @DisplayName("findObjectiveByKeyResultId() should return objective properly")
+    @DisplayName("Should return correct objective on findObjectiveByKeyResultId()")
     @Test
-    void findObjectiveByKeyResultIdShouldReturnObjectiveProperly() {
+    void shouldFindObjectiveByKeyResultId() {
         // act
         var objective = objectivePersistenceService
                 .findObjectiveByKeyResultId(ID_OF_KEY_RESULT_5, authorizationUser, NO_RESULT_EXCEPTION);
@@ -124,9 +124,9 @@ void findObjectiveByKeyResultIdShouldReturnObjectiveProperly() {
         assertObjective(ID_OF_OBJECTIVE_3, TITLE_OF_OBJECTIVE_3, objective);
     }
 
-    @DisplayName("findObjectiveByKeyResultId() should throw exception when objective not found")
+    @DisplayName("Should throw exception on findObjectiveByKeyResultId() when objective not found")
     @Test
-    void findObjectiveByKeyResultIdShouldThrowExceptionWhenObjectiveNotFound() {
+    void shouldThrowExceptionWhenObjectiveNotFoundOnFindObjectiveByKeyResultId() {
         // act
         var exception = assertThrows(OkrResponseStatusException.class,
                                      () -> objectivePersistenceService
@@ -139,9 +139,9 @@ void findObjectiveByKeyResultIdShouldThrowExceptionWhenObjectiveNotFound() {
         assertResponseStatusException(UNAUTHORIZED, expectedErrors, exception);
     }
 
-    @DisplayName("findObjectiveByKeyResultId() should throw exception when objective id is null")
+    @DisplayName("Should throw exception on findObjectiveByKeyResultId() when objective id is null")
     @Test
-    void findObjectiveByKeyResultIdShouldThrowExceptionWhenObjectiveIdIsNull() {
+    void shouldThrowExceptionWhenObjectiveIdIsNullOnFindObjectiveByKeyResultId() {
         // act
         var exception = assertThrows(OkrResponseStatusException.class,
                                      () -> objectivePersistenceService
@@ -152,9 +152,9 @@ void findObjectiveByKeyResultIdShouldThrowExceptionWhenObjectiveIdIsNull() {
         assertResponseStatusException(BAD_REQUEST, expectedErrors, exception);
     }
 
-    @DisplayName("findObjectiveByCheckInId() should return objective properly")
+    @DisplayName("Should return correct objective on findObjectiveByCheckInId()")
     @Test
-    void findObjectiveByCheckInIdShouldReturnObjectiveProperly() {
+    void shouldFindObjectiveByCheckInId() {
         // act
         var objective = objectivePersistenceService
                 .findObjectiveByCheckInId(ID_OF_CHECK_IN_7, authorizationUser, NO_RESULT_EXCEPTION);
@@ -163,9 +163,9 @@ void findObjectiveByCheckInIdShouldReturnObjectiveProperly() {
         assertObjective(ID_OF_OBJECTIVE_3, TITLE_OF_OBJECTIVE_3, objective);
     }
 
-    @DisplayName("findObjectiveByCheckInId() should throw exception when objective not found")
+    @DisplayName("Should throw exception on findObjectiveByCheckInId() when objective not found")
     @Test
-    void findObjectiveByCheckInIdShouldThrowExceptionWhenObjectiveNotFound() {
+    void shouldThrowExceptionWhenObjectiveNotFoundOnFindObjectiveByCheckInId() {
         // act
         var exception = assertThrows(OkrResponseStatusException.class,
                                      () -> objectivePersistenceService
@@ -178,9 +178,9 @@ void findObjectiveByCheckInIdShouldThrowExceptionWhenObjectiveNotFound() {
         assertResponseStatusException(UNAUTHORIZED, expectedErrors, exception);
     }
 
-    @DisplayName("findObjectiveByCheckInId() should throw exception when objective id is null")
+    @DisplayName("Should throw exception on findObjectiveByCheckInId() when objective id is null")
     @Test
-    void findObjectiveByCheckInIdShouldThrowExceptionWhenObjectiveIdIsNull() {
+    void shouldThrowExceptionWhenObjectiveIdIsNullOnFindObjectiveByCheckInId() {
         // act
         var exception = assertThrows(OkrResponseStatusException.class,
                                      () -> objectivePersistenceService
@@ -193,9 +193,9 @@ void findObjectiveByCheckInIdShouldThrowExceptionWhenObjectiveIdIsNull() {
         assertResponseStatusException(BAD_REQUEST, expectedErrors, exception);
     }
 
-    @DisplayName("findObjectiveByTeamId() should return objectives of team properly")
+    @DisplayName("Should return correct objective on findObjectiveByTeamId()")
     @Test
-    void findObjectiveByTeamIdShouldReturnObjectivesOfTeamProperly() {
+    void shouldFindObjectivesByTeamId() {
         // act
         var objectives = objectivePersistenceService.findObjectiveByTeamId(ID_OF_TEAM_6);
 
@@ -206,9 +206,9 @@ void findObjectiveByTeamIdShouldReturnObjectivesOfTeamProperly() {
         assertObjective(ID_OF_OBJECTIVE_10, TITLE_OF_OBJECTIVE_10, objectives.get(2));
     }
 
-    @DisplayName("findObjectiveByTeamId() should return empty list when objective not found")
+    @DisplayName("Should return empty list on findObjectiveByTeamId() when objective not found")
     @Test
-    void findObjectiveByTeamIdShouldReturnEmptyListWhenObjectiveNotFound() {
+    void shouldReturnEmptyListWhenObjectiveNotFoundOnFindObjectiveByTeamId() {
         // act
         var objectives = objectivePersistenceService.findObjectiveByTeamId(INVALID_TEAM_ID);
 
@@ -216,9 +216,9 @@ void findObjectiveByTeamIdShouldReturnEmptyListWhenObjectiveNotFound() {
         assertTrue(objectives.isEmpty());
     }
 
-    @DisplayName("findObjectiveByTeamId() should return empty list when objective id is null")
+    @DisplayName("Should return empty list on findObjectiveByTeamId() when objective id is null")
     @Test
-    void findObjectiveByTeamIdShouldReturnEmptyListWhenObjectiveIdIsNull() {
+    void shouldReturnEmptyListWhenObjectiveIdIsNullOnFindObjectiveByTeamId() {
         // act
         var objectives = objectivePersistenceService.findObjectiveByTeamId(null);
 
@@ -226,9 +226,9 @@ void findObjectiveByTeamIdShouldReturnEmptyListWhenObjectiveIdIsNull() {
         assertTrue(objectives.isEmpty());
     }
 
-    @DisplayName("countByTeamAndQuarter() should return number of objectives for current quarter")
+    @DisplayName("Should return correct number of objectives for current quarter on findObjectiveByTeamId()")
     @Test
-    void countByTeamAndQuarterShouldReturnNumberOfObjectivesForCurrentQuarter() {
+    void shouldReturnNumberOfObjectivesForCurrentQuarterOnCountByTeamAndQuarter() {
         // arrange: there are 3 objectives for the current quarter (id 2) for team with
         // id 6
         var team = Team.Builder.builder().withId(ID_OF_TEAM_6).build();
@@ -241,7 +241,7 @@ void countByTeamAndQuarterShouldReturnNumberOfObjectivesForCurrentQuarter() {
         assertEquals(3, count);
     }
 
-    @DisplayName("countByTeamAndQuarter() should return zero when team or quarter is not valid or null")
+    @DisplayName("Should return zero on findObjectiveByTeamId() when team or quarter is not valid or null")
     @ParameterizedTest
     @MethodSource("invalidTeamsAndQuarters")
     void countByTeamAndQuarterShouldReturnZeroWhenTeamOrQuarterIsNotValidOrNull(Team team, Quarter quarter) {
@@ -274,9 +274,9 @@ private static Stream<Arguments> invalidTeamsAndQuarters() {
                     arguments(null, null));
     }
 
-    @DisplayName("getModelName() should return Objective")
+    @DisplayName("Should return objective on getModelName()")
     @Test
-    void getModelNameShouldReturnObjective() {
+    void shouldReturnObjectiveOnGetModelName() {
         assertEquals(OBJECTIVE, objectivePersistenceService.getModelName());
     }
 
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/OverviewPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/OverviewPersistenceServiceIT.java
index 1eb6486749..61f3c5056c 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/OverviewPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/OverviewPersistenceServiceIT.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -56,6 +57,7 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
+    @DisplayName("Should return correct overview on getFilteredOverview() when team ids are set")
     @Test
     void getFilteredOverviewShouldReturnOverviewsWhenTeamIdsSet() {
         List<Overview> overviews = overviewPersistenceService
@@ -64,6 +66,7 @@ void getFilteredOverviewShouldReturnOverviewsWhenTeamIdsSet() {
         assertThat(expectedOverviewIds.subList(5, 18)).hasSameElementsAs(getOverviewIds(overviews));
     }
 
+    @DisplayName("Should return correct overview on getFilteredOverview() when team ids are not set")
     @Test
     void getFilteredOverviewShouldReturnOverviewsWhenTeamIdsEmpty() {
         List<Overview> overviews = overviewPersistenceService.getFilteredOverview(2L, List.of(), "", authorizationUser);
@@ -71,6 +74,7 @@ void getFilteredOverviewShouldReturnOverviewsWhenTeamIdsEmpty() {
         assertThat(expectedOverviewIds.subList(0, 18)).hasSameElementsAs(getOverviewIds(overviews));
     }
 
+    @DisplayName("Should return correct overview on getFilteredOverview() when query is set")
     @Test
     void getFilteredOverviewShouldReturnOverviewsWhenObjectiveQuery() {
         List<Overview> overviews = overviewPersistenceService
@@ -79,6 +83,7 @@ void getFilteredOverviewShouldReturnOverviewsWhenObjectiveQuery() {
         assertThat(expectedOverviewIds.subList(5, 8)).hasSameElementsAs(getOverviewIds(overviews));
     }
 
+    @DisplayName("Should return correct overview on getFilteredOverview() when quarter has no objectives")
     @Test
     void getFilteredOverviewShouldReturnOverviewsWhenQuarterWithoutObjectives() {
         List<Overview> overviews = overviewPersistenceService
@@ -87,6 +92,7 @@ void getFilteredOverviewShouldReturnOverviewsWhenQuarterWithoutObjectives() {
         assertThat(expectedOverviewIds.subList(17, 20)).hasSameElementsAs(getOverviewIds(overviews));
     }
 
+    @DisplayName("Should return empty overview on getFilteredOverview() when query is set and no objectives are present")
     @Test
     void getFilteredOverviewShouldReturnOverviewsWhenQuarterWithoutObjectivesAndObjectiveQuery() {
         List<Overview> overviews = overviewPersistenceService
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/PersistenceBaseTestIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/PersistenceBaseTestIT.java
index a6e3a8a132..0031d1fc17 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/PersistenceBaseTestIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/PersistenceBaseTestIT.java
@@ -54,7 +54,7 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
-    @DisplayName("findById() should return single entity if entity with id exists")
+    @DisplayName("Should return single entity on findById() when entity with id exists")
     @Test
     void findByIdShouldReturnSingleEntityIfEntityWithIdExists() {
         var foundUser = persistenceBase.findById(USER_PACO_ID);
@@ -63,7 +63,7 @@ void findByIdShouldReturnSingleEntityIfEntityWithIdExists() {
         assertUser("Paco", "Eggimann", "peggimann@puzzle.ch", foundUser);
     }
 
-    @DisplayName("findById() should throw exception if entity with id does not exist")
+    @DisplayName("Should throw exception on findById() when entity with id does not exist")
     @Test
     void findByIdShouldThrowExceptionIfEntityWithIdDoesNotExist() {
         var exception = assertThrows(ResponseStatusException.class,
@@ -73,7 +73,7 @@ void findByIdShouldThrowExceptionIfEntityWithIdDoesNotExist() {
         assertErrorKey("MODEL_WITH_ID_NOT_FOUND", exception);
     }
 
-    @DisplayName("findById() should throw exception if id is null")
+    @DisplayName("Should throw exception on findById() when id is null")
     @Test
     void findByIdShouldThrowExceptionIfIdIsNull() {
         var exception = assertThrows(ResponseStatusException.class, () -> persistenceBase.findById(null));
@@ -82,7 +82,7 @@ void findByIdShouldThrowExceptionIfIdIsNull() {
         assertErrorKey("ATTRIBUTE_NULL", exception);
     }
 
-    @DisplayName("findAll() should return all entities as list")
+    @DisplayName("Should return all entities as list on findAll()")
     @Test
     void findAllShouldReturnAllEntitiesAsList() throws ResponseStatusException {
         var userList = persistenceBase.findAll();
@@ -90,7 +90,7 @@ void findAllShouldReturnAllEntitiesAsList() throws ResponseStatusException {
         assertThat(userList.size()).isGreaterThanOrEqualTo(7);
     }
 
-    @DisplayName("save() should add new entity")
+    @DisplayName("Should add new entity on save()")
     @Test
     void saveShouldAddNewEntity() throws ResponseStatusException {
         User uniqueUser = createUserWithUniqueName("Fritz");
@@ -100,7 +100,7 @@ void saveShouldAddNewEntity() throws ResponseStatusException {
         assertUser("Fritz", "Muster", "hans.muster@puzzle.ch", createdUser);
     }
 
-    @DisplayName("save() should throw exception in the case of optimistic locking failure")
+    @DisplayName("Should throw exception on save() in the case of optimistic locking failure")
     @Test
     void saveShouldThrowExceptionInTheCaseOfOptimisticLockingFailure() throws ResponseStatusException {
         // arrange
@@ -122,7 +122,7 @@ public String getModelName() {
         assertErrorKey("DATA_HAS_BEEN_UPDATED", exception);
     }
 
-    @DisplayName("save() existing entity with different data should update existing entity")
+    @DisplayName("Should updated existing entity with new data on save()")
     @Test
     void saveExistingEntityWithDifferentDataShouldUpdateExistingEntity() throws ResponseStatusException {
         // arrange
@@ -132,19 +132,19 @@ void saveExistingEntityWithDifferentDataShouldUpdateExistingEntity() throws Resp
         var foundUser = persistenceBase.findById(createdUserId);
 
         // pro-condition
-        assertEquals("Ueli", createdUser.getFirstname());
+        assertEquals("Ueli", createdUser.getFirstName());
 
         // act
-        foundUser.setFirstname("Pekka");
+        foundUser.setFirstName("Pekka");
         persistenceBase.save(foundUser);
         foundUser = persistenceBase.findById(createdUserId);
 
         // assert
         assertEquals(createdUserId, foundUser.getId());
-        assertEquals("Pekka", foundUser.getFirstname());
+        assertEquals("Pekka", foundUser.getFirstName());
     }
 
-    @DisplayName("deleteById() should delete entity")
+    @DisplayName("Should delete entity on deleteById()")
     @Test
     void deleteByIdShouldDeleteEntity() throws ResponseStatusException {
         // arrange
@@ -161,8 +161,8 @@ void deleteByIdShouldDeleteEntity() throws ResponseStatusException {
 
     private static void assertUser(String expectedFirstName, String expectedLastName, String expectedEmail,
                                    User currentUser) {
-        assertEquals(expectedFirstName, currentUser.getFirstname());
-        assertEquals(expectedLastName, currentUser.getLastname());
+        assertEquals(expectedFirstName, currentUser.getFirstName());
+        assertEquals(expectedLastName, currentUser.getLastName());
         assertEquals(expectedEmail, currentUser.getEmail());
     }
 
@@ -180,8 +180,8 @@ private void assertEntityNotFound(long entityId) {
     private static User createUserWithUniqueName(String name) {
         return User.Builder
                 .builder()
-                .withFirstname(name)
-                .withLastname("Muster")
+                .withFirstName(name)
+                .withLastName("Muster")
                 .withEmail("hans.muster@puzzle.ch")
                 .build();
     }
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/QuarterPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/QuarterPersistenceServiceIT.java
index 4dd6d02829..e3b2a9e47c 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/QuarterPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/QuarterPersistenceServiceIT.java
@@ -34,7 +34,7 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
-    @DisplayName("getMostCurrentQuarters() should return current quarter and future quarter and GJForTests quarter")
+    @DisplayName("Should return current, future and GJForTests quarter on getMostCurrentQuarters()")
     @Test
     void getMostCurrentQuartersShouldReturnCurrentQuarterAndFutureQuarterAndGJForTestsQuarter() {
         List<Quarter> quarterListFromFunction = quarterPersistenceService.getMostCurrentQuarters();
@@ -60,8 +60,9 @@ private void assertCurrentQuarterIsFoundOnce(List<Quarter> quarters) {
         assertEquals(1, foundCurrentQuartersCount);
     }
 
+    @DisplayName("Should return current quarter on getCurrentQuarter()")
     @Test
-    void shouldReturnCurrentQuarter() {
+    void shouldGetCurrentQuarter() {
         Quarter quarter = quarterPersistenceService.getCurrentQuarter();
 
         assertTrue(LocalDate.now().isEqual(quarter.getStartDate()) || //
@@ -74,7 +75,7 @@ void shouldReturnCurrentQuarter() {
         assertNotNull(quarter.getLabel());
     }
 
-    @DisplayName("findByLabel() should return single Quarter when label is valid")
+    @DisplayName("Should return single Quarter on findByLabel() when label is valid")
     @Test
     void findByLabelShouldReturnSingleQuarterWhenLabelIsValid() {
         // arrange + act
@@ -87,7 +88,7 @@ void findByLabelShouldReturnSingleQuarterWhenLabelIsValid() {
         assertEquals(LocalDate.of(2000, 9, 30), returnedQuarter.getEndDate());
     }
 
-    @DisplayName("findByLabel() should return null when label is not valid")
+    @DisplayName("Should return null on findByLabel() when label is not valid")
     @Test
     void findByLabelShouldReturnNullWhenLabelIsNotValid() {
         // arrange + act
@@ -97,7 +98,7 @@ void findByLabelShouldReturnNullWhenLabelIsNotValid() {
         assertNull(returnedQuarter);
     }
 
-    @DisplayName("findByLabel() should return null when label is null")
+    @DisplayName("Should return null on findByLabel() when label is null")
     @Test
     void findByLabelShouldReturnNullWhenLabelIsNull() {
         // arrange + act
@@ -107,7 +108,7 @@ void findByLabelShouldReturnNullWhenLabelIsNull() {
         assertNull(returnedQuarter);
     }
 
-    @DisplayName("getModelName() should return Quarter")
+    @DisplayName("Should return quarter on getModelName()")
     @Test
     void getModelNameShouldReturnQuarter() {
         assertEquals(QUARTER, quarterPersistenceService.getModelName());
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/TeamPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/TeamPersistenceServiceIT.java
index 74f2e0f50f..7679007c26 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/TeamPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/TeamPersistenceServiceIT.java
@@ -25,7 +25,7 @@ void setUp() {
     }
 
     // uses data from V100_0_0__TestData.sql
-    @DisplayName("findTeamsByName() should return teams with matching name")
+    @DisplayName("Should return teams with matching name on findTeamsByName()")
     @Test
     void findTeamsByNameShouldReturnTeamsWithMatchingName() {
         List<Team> teams = teamPersistenceService.findTeamsByName("LoremIpsum");
@@ -35,7 +35,7 @@ void findTeamsByNameShouldReturnTeamsWithMatchingName() {
         assertEquals("LoremIpsum", teams.get(0).getName());
     }
 
-    @DisplayName("getModelName() should return Team")
+    @DisplayName("Should return team on getModelName()")
     @Test
     void getModelNameShouldReturnTeam() {
         assertEquals(TEAM, teamPersistenceService.getModelName());
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/UserPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/UserPersistenceServiceIT.java
index 8fe2ac1b85..5a463b81f2 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/UserPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/UserPersistenceServiceIT.java
@@ -40,14 +40,14 @@ void tearDown() {
         TenantContext.setCurrentTenant(null);
     }
 
-    @DisplayName("save() should save user with empty user team list")
+    @DisplayName("Should save user on save() with empty user team list")
     @Test
     void saveShouldSaveUserWithEmptyUserTeamList() {
         // arrange
         var newUser = User.Builder
                 .builder() //
-                .withFirstname("Hans") //
-                .withLastname("Muster") //
+                .withFirstName("Hans") //
+                .withLastName("Muster") //
                 .withEmail("muster@puzzle.ch") //
                 .withUserTeamList(List.of())
                 .build();
@@ -60,14 +60,14 @@ void saveShouldSaveUserWithEmptyUserTeamList() {
         assertUser("Hans", "Muster", "muster@puzzle.ch", createdUser);
     }
 
-    @DisplayName("save() should save user with null value for user team list")
+    @DisplayName("Should save user with null value for user team list on save()")
     @Test
     void saveShouldSaveUserWithNullUserTeamList() {
         // arrange
         var newUser = User.Builder
                 .builder() //
-                .withFirstname("Hans") //
-                .withLastname("Muster") //
+                .withFirstName("Hans") //
+                .withLastName("Muster") //
                 .withEmail("muster@puzzle.ch") //
                 .withUserTeamList(null)
                 .build();
@@ -80,14 +80,14 @@ void saveShouldSaveUserWithNullUserTeamList() {
         assertUser("Hans", "Muster", "muster@puzzle.ch", createdUser);
     }
 
-    @DisplayName("saveAll() should save all users in the input list")
+    @DisplayName("Should save all users in the input list on saveAll()")
     @Test
     void saveAllShouldSaveAllUsersInTheInputList() {
         // arrange
         var newUser = User.Builder
                 .builder() //
-                .withFirstname("Hans") //
-                .withLastname("Muster") //
+                .withFirstName("Hans") //
+                .withLastName("Muster") //
                 .withEmail("muster@puzzle.ch") //
                 .build();
 
@@ -102,7 +102,7 @@ void saveAllShouldSaveAllUsersInTheInputList() {
         assertUser("Hans", "Muster", "muster@puzzle.ch", createdUser);
     }
 
-    @DisplayName("getOrCreateUser() should return single user when user found")
+    @DisplayName("Should return single user on getOrCreateUser() when user found")
     @Test
     void getOrCreateUserShouldReturnSingleUserWhenUserFound() {
         // arrange
@@ -115,15 +115,15 @@ void getOrCreateUserShouldReturnSingleUserWhenUserFound() {
         assertUser(11L, "Alice", "Wunderland", "wunderland@puzzle.ch", returnedUser);
     }
 
-    @DisplayName("getOrCreateUser() should return saved user when user not found")
+    @DisplayName("Should return saved user on getOrCreateUser() when user not found")
     @Test
     void getOrCreateUserShouldReturnSavedUserWhenUserNotFound() {
         // arrange
         var newUser = User.Builder
                 .builder() //
                 .withId(null) //
-                .withFirstname("firstname") //
-                .withLastname("lastname") //
+                .withFirstName("firstname") //
+                .withLastName("lastname") //
                 .withEmail("lastname@puzzle.ch") //
                 .build();
 
@@ -136,30 +136,30 @@ void getOrCreateUserShouldReturnSavedUserWhenUserNotFound() {
     }
 
     // uses data from V100_0_0__TestData.sql
-    @DisplayName("findByEmail() should return user if email is found")
+    @DisplayName("Should return user on findByEmail() when email is found")
     @Test
     void findByEmailShouldReturnUserIfEmailIsFound() {
         Optional<User> user = userPersistenceService.findByEmail("gl@gl.com");
 
         assertTrue(user.isPresent());
-        assertEquals("Jaya", user.get().getFirstname());
-        assertEquals("Norris", user.get().getLastname());
+        assertEquals("Jaya", user.get().getFirstName());
+        assertEquals("Norris", user.get().getLastName());
     }
 
-    @DisplayName("findByEmail() should return empty optional if email is not found")
+    @DisplayName("Should return empty optional on findByEmail() when email is not found")
     @Test
     void findByEmailShouldReturnEmptyOptionalIfEmailIsNotFound() {
         assertTrue(userPersistenceService.findByEmail("not_valid@gl.com").isEmpty());
     }
 
-    @DisplayName("findByEmail() should return empty optional if email is null")
+    @DisplayName("Should return empty optional on findByEmail() when email is null")
     @Test
     void findByEmailShouldReturnEmptyOptionalIfEmailIsNull() {
         assertTrue(userPersistenceService.findByEmail(null).isEmpty());
     }
 
     // uses data from V100_0_0__TestData.sql
-    @DisplayName("findAllOkrChampions() should return all okr champions")
+    @DisplayName("Should return all okr champions on findAllOkrChampions()")
     @Test
     void findAllOkrChampionsShouldReturnAllOkrChampions() {
         // act
@@ -170,7 +170,7 @@ void findAllOkrChampionsShouldReturnAllOkrChampions() {
         assertUser(61L, "Jaya", "Norris", "gl@gl.com", allOkrChampions.getFirst());
     }
 
-    @DisplayName("getModelName() should return user")
+    @DisplayName("Should return user on getModelName()")
     @Test
     void getModelNameShouldReturnUser() {
         assertEquals(USER, userPersistenceService.getModelName());
@@ -182,14 +182,14 @@ private void assertUser(Long id, String firstName, String lastName, String email
     }
 
     private void assertUser(String firstName, String lastName, String email, User currentUser) {
-        assertEquals(firstName, currentUser.getFirstname());
-        assertEquals(lastName, currentUser.getLastname());
+        assertEquals(firstName, currentUser.getFirstName());
+        assertEquals(lastName, currentUser.getLastName());
         assertEquals(email, currentUser.getEmail());
     }
 
-    @DisplayName("deleteById() should delete user when user found")
+    @DisplayName("Should delete user on deleteById() when user exists")
     @Test
-    void deleteByIdShouldDeleteUserWhenUserFound() {
+    void deleteByIdShouldDeleteUserWhenUserExists() {
         // arrange
         User user = createUser();
 
@@ -207,8 +207,8 @@ private User createUser() {
         User newUser = User.Builder
                 .builder() //
                 .withId(null) //
-                .withFirstname("firstname") //
-                .withLastname("lastname") //
+                .withFirstName("firstname") //
+                .withLastName("lastname") //
                 .withEmail("lastname@puzzle.ch") //
                 .build();
         createdUser = userPersistenceService.getOrCreateUser(newUser);
@@ -216,7 +216,7 @@ private User createUser() {
         return createdUser;
     }
 
-    @DisplayName("deleteById() should throw exception when Id is null")
+    @DisplayName("Should throw exception on deleteById() when Id is null")
     @Test
     void deleteByIdShouldThrowExceptionWhenIdIsNull() {
         InvalidDataAccessApiUsageException exception = assertThrows(InvalidDataAccessApiUsageException.class, //
diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/UserTeamPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/UserTeamPersistenceServiceIT.java
index 7b11855395..54de9cf902 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/UserTeamPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/UserTeamPersistenceServiceIT.java
@@ -32,7 +32,7 @@ public class UserTeamPersistenceServiceIT {
         TenantContext.setCurrentTenant(TestHelper.SCHEMA_PITC);
     }
 
-    @DisplayName("delete() should remove single user from team")
+    @DisplayName("Should remove single user from team on delete()")
     @Test
     @Transactional
     void deleteShouldRemoveSingleUserFromTeam() {
@@ -55,7 +55,7 @@ void deleteShouldRemoveSingleUserFromTeam() {
         assertUserIsRemovedFromTeam(ID_OF_USER_ALICE, ID_OF_TEAM_LOREM, 2);
     }
 
-    @DisplayName("deleteAll() should remove list of users from team")
+    @DisplayName("Should remove list of users from team on deleteAll()")
     @Test
     @Transactional
     void deleteAllShouldRemoveListOfUsersFromTeam() {
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/ActionValidationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/ActionValidationServiceTest.java
index 28b6351ec0..2482ec4f2d 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/ActionValidationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/ActionValidationServiceTest.java
@@ -41,7 +41,7 @@ class ActionValidationServiceTest {
             .builder() //
             .withId(null) //
             .withAction("Neue Katze") //
-            .withIsChecked(false) //
+            .isChecked(false) //
             .withPriority(0) //
             .withKeyResult(keyResult)
             .build();
@@ -50,7 +50,7 @@ class ActionValidationServiceTest {
             .builder() //
             .withId(2L) //
             .withAction("Neues Lama") //
-            .withIsChecked(true) // //
+            .isChecked(true) // //
             .withPriority(1)
             .withKeyResult(keyResult)
             .build();
@@ -90,7 +90,7 @@ private static Stream<Arguments> actionPairArgument() {
                                                        .builder() //
                                                        .withId(id)
                                                        .withAction("Action")
-                                                       .withIsChecked(false)
+                                                       .isChecked(false)
                                                        .withPriority(1) //
                                                        .withKeyResult(null)
                                                        .build(),
@@ -99,7 +99,7 @@ private static Stream<Arguments> actionPairArgument() {
                                                        .builder() //
                                                        .withId(id)
                                                        .withAction("Action")
-                                                       .withIsChecked(false)
+                                                       .isChecked(false)
                                                        .withPriority(1) //
                                                        .withKeyResult(null)
                                                        .build())),
@@ -110,7 +110,7 @@ private static Stream<Arguments> actionPairArgument() {
                                                        .builder() //
                                                        .withId(id)
                                                        .withAction("Action")
-                                                       .withIsChecked(false)
+                                                       .isChecked(false)
                                                        .withPriority(1) //
                                                        .withKeyResult(keyResult)
                                                        .build(),
@@ -119,7 +119,7 @@ private static Stream<Arguments> actionPairArgument() {
                                                        .builder() //
                                                        .withId(id)
                                                        .withAction("Action")
-                                                       .withIsChecked(false)
+                                                       .isChecked(false)
                                                        .withPriority(1) //
                                                        .withKeyResult(null)
                                                        .build())),
@@ -130,7 +130,7 @@ private static Stream<Arguments> actionPairArgument() {
                                                        .builder() //
                                                        .withId(id)
                                                        .withAction("Action")
-                                                       .withIsChecked(false)
+                                                       .isChecked(false)
                                                        .withPriority(1) //
                                                        .withKeyResult(null)
                                                        .build(),
@@ -139,7 +139,7 @@ private static Stream<Arguments> actionPairArgument() {
                                                        .builder() //
                                                        .withId(id)
                                                        .withAction("Action")
-                                                       .withIsChecked(false)
+                                                       .isChecked(false)
                                                        .withPriority(1)
                                                        .withKeyResult(keyResult)
                                                        .build())));
@@ -150,16 +150,18 @@ void setUp() {
         Mockito.lenient().when(actionPersistenceService.getModelName()).thenReturn("Action");
     }
 
+    @DisplayName("Should be successful on validateOnCreate() when action is valid")
     @Test
-    void validateOnCreateShouldBeSuccessfulWhenActionIsValid() {
+    void shouldBeSuccessfulOnValidateOnCreateWhenActionIsValid() {
         validator.validateOnCreate(action1);
 
         verify(validator, times(1)).throwExceptionWhenModelIsNull(action1);
         verify(validator, times(1)).validate(action1);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when model is null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenModelIsNull() {
         // arrange
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnCreate(null));
@@ -171,8 +173,9 @@ void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should be successful on validateOnCreate() when id is not null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenIdIsNotNull() {
         // arrange
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnCreate(action2));
@@ -184,15 +187,15 @@ void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnCreate() when model has invalid text {0}")
     @MethodSource("actionValidationArguments")
-    void validateOnCreateShouldThrowExceptionWhenActionIsInvalid(String actionText, List<ErrorDto> errors) {
+    void shouldThrowExceptionOnValidateOnCreateWhenActionIsInvalid(String actionText, List<ErrorDto> errors) {
         // arrange
         Action action = Action.Builder
                 .builder()
                 .withId(null)
                 .withAction(actionText)
-                .withIsChecked(false)
+                .isChecked(false)
                 .withPriority(1)
                 .withKeyResult(keyResult)
                 .build();
@@ -204,10 +207,11 @@ void validateOnCreateShouldThrowExceptionWhenActionIsInvalid(String actionText,
         assertOkrResponseStatusException(exception, errors);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when attributes are missing")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
+    void shouldThrowExceptionOnValidateOnCreateWhenAttrsAreMissing() {
         // arrange
-        Action actionInvalid = Action.Builder.builder().withIsChecked(true).build();
+        Action actionInvalid = Action.Builder.builder().isChecked(true).build();
 
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -220,8 +224,9 @@ void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should be successful on validateOnUpdate() when action is valid")
     @Test
-    void validateOnUpdateShouldBeSuccessfulWhenActionIsValid() {
+    void shouldBeSuccessfulOnValidateOnUpdateWhenActionIsValid() {
         // arrange
         when(actionPersistenceService.findById(anyLong())).thenReturn(action2);
 
@@ -237,8 +242,9 @@ void validateOnUpdateShouldBeSuccessfulWhenActionIsValid() {
         verify(validator, times(1)).validate(action2);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when model is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenModelIsNull() {
         // arrange
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(1L, null));
@@ -250,8 +256,9 @@ void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenIdIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(null, action1));
@@ -265,8 +272,9 @@ void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id has changed")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdHasChanged() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenIdHasChanged() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(1L, action2));
@@ -281,8 +289,9 @@ void validateOnUpdateShouldThrowExceptionWhenIdHasChanged() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when no entity can be found")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenEntityDoesNotExist() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenEntityDoesNotExist() {
         // arrange
         String reason = "MODEL_WITH_ID_NOT_FOUND";
         when(actionPersistenceService.findById(anyLong()))
@@ -300,10 +309,10 @@ void validateOnUpdateShouldThrowExceptionWhenEntityDoesNotExist() {
         assertEquals("MODEL_WITH_ID_NOT_FOUND", exception.getReason());
     }
 
-    @DisplayName("validateOnUpdate() should throw exception when KeyResult is not set")
+    @DisplayName("Should throw exception on validateOnUpdate() when KeyResult is not set")
     @ParameterizedTest
     @MethodSource("actionPairArgument")
-    void validateOnUpdateShouldThrowExceptionWhenKeyResultNotSet(ActionPair actionPair) {
+    void shouldThrowExceptionOnValidateOnUpdateWhenKeyResultNotSet(ActionPair actionPair) {
         // arrange
         Action action = actionPair.action();
         Action saveAction = actionPair.saveAction();
@@ -325,14 +334,15 @@ void validateOnUpdateShouldThrowExceptionWhenKeyResultNotSet(ActionPair actionPa
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when key result id has changed")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenKeyResultIdHasChanged() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenKeyResultIdHasChanged() {
         // arrange
         Action action = Action.Builder
                 .builder()
                 .withId(action2.getId())
                 .withAction("Action")
-                .withIsChecked(false)
+                .isChecked(false)
                 .withPriority(1)
                 .withKeyResult(KeyResultMetric.Builder.builder().withId(11L).withTitle("KR Title").build())
                 .build();
@@ -352,15 +362,15 @@ void validateOnUpdateShouldThrowExceptionWhenKeyResultIdHasChanged() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnUpdate() when model has invalid text {0}")
     @MethodSource("actionValidationArguments")
-    void validateOnUpdateShouldThrowExceptionWhenTitleIsInvalid(String actionText, List<ErrorDto> errors) {
+    void shouldThrowExceptionOnValidateOnUpdateWhenTitleIsInvalid(String actionText, List<ErrorDto> errors) {
         // arrange
         Action action = Action.Builder
                 .builder()
                 .withId(3L)
                 .withAction(actionText)
-                .withIsChecked(false)
+                .isChecked(false)
                 .withPriority(1)
                 .withKeyResult(keyResult)
                 .build();
@@ -372,10 +382,11 @@ void validateOnUpdateShouldThrowExceptionWhenTitleIsInvalid(String actionText, L
         assertOkrResponseStatusException(exception, errors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when key result is missing in model")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenKeyResultIsMissing() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenKeyResultIsMissing() {
         // arrange
-        Action actionInvalid = Action.Builder.builder().withId(11L).withIsChecked(true).build();
+        Action actionInvalid = Action.Builder.builder().withId(11L).isChecked(true).build();
         when(actionPersistenceService.findById(anyLong())).thenReturn(actionInvalid);
 
         // act + assert
@@ -388,15 +399,11 @@ void validateOnUpdateShouldThrowExceptionWhenKeyResultIsMissing() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when attributes are missing")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenAttrsAreMissing() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenAttrsAreMissing() {
         // arrange
-        Action actionInvalid = Action.Builder
-                .builder()
-                .withId(11L)
-                .withIsChecked(true)
-                .withKeyResult(keyResult)
-                .build();
+        Action actionInvalid = Action.Builder.builder().withId(11L).isChecked(true).withKeyResult(keyResult).build();
         when(actionPersistenceService.findById(anyLong())).thenReturn(actionInvalid);
 
         // act + assert
@@ -409,9 +416,9 @@ void validateOnUpdateShouldThrowExceptionWhenAttrsAreMissing() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @DisplayName("validateOnGetByKeyResultId() should be successful when id is not null")
+    @DisplayName("Should be successful on validateOnGetByKeyResultId() when id is not null")
     @Test
-    void validateOnGetByKeyResultIdShouldBeSuccessfulWhenIdIsNotNull() {
+    void shouldBeSuccessfulInValidateOnGetByKeyResultIdWhenIdIsNotNull() {
         // arrange
         Long id = 1L;
         doNothing().when(keyResultValidationService).validateOnGet(id);
@@ -421,9 +428,9 @@ void validateOnGetByKeyResultIdShouldBeSuccessfulWhenIdIsNotNull() {
         verify(actionPersistenceService, never()).getModelName();
     }
 
-    @DisplayName("validateOnGetByKeyResultId() should throw exception when id is null")
+    @DisplayName("Should throw exception on validateOnGetByKeyResultId() when id is null")
     @Test
-    void validateOnGetByKeyResultIdShouldThrowExceptionWhenIdIsNull() {
+    void shouldThrowExceptionOnValidateOnGetByKeyResultIdWhenIdIsNull() {
         // arrange
         Long id = null;
         doThrow(OkrResponseStatusException.class).when(keyResultValidationService).validateOnGet(id);
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/AlignmentValidationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/AlignmentValidationServiceTest.java
index 2f6ae1b47d..ad6fb39d74 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/AlignmentValidationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/AlignmentValidationServiceTest.java
@@ -2,9 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import ch.puzzle.okr.ErrorKey;
 import ch.puzzle.okr.dto.ErrorDto;
@@ -13,6 +11,7 @@
 import ch.puzzle.okr.models.alignment.KeyResultAlignment;
 import ch.puzzle.okr.service.persistence.AlignmentPersistenceService;
 import java.util.List;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -24,21 +23,22 @@
 
 @ExtendWith(MockitoExtension.class)
 class AlignmentValidationServiceTest {
+    private final Alignment keyResultAlignment = new KeyResultAlignment();
     @MockitoBean
     AlignmentPersistenceService alignmentPersistenceService = Mockito.mock(AlignmentPersistenceService.class);
-    private final Alignment keyResultAlignment = new KeyResultAlignment();
-
     @Spy
     @InjectMocks
     private AlignmentValidationService validator;
 
+    @DisplayName("Should throw exception on validateOnCreate()")
     @Test
-    void validateOnCreateShouldThrowException() {
+    void shouldThrowExceptionOnValidateOnCreate() {
         assertThrows(UnsupportedOperationException.class, () -> validator.validateOnCreate(keyResultAlignment));
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenIdIsNull() {
         when(alignmentPersistenceService.getModelName()).thenReturn("Alignment");
 
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -50,8 +50,9 @@ void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
         verify(validator, times(1)).throwExceptionWhenIdIsNull(null);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id of alignment is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdOfAlignmentIsNull() {
+    void shouldThrowExceptionOnValidateOnValidateOnUpdateWhenIdOfAlignmentIsNull() {
         when(alignmentPersistenceService.getModelName()).thenReturn("Alignment");
         Alignment alignment = KeyResultAlignment.Builder.builder().withId(null).build();
 
@@ -65,8 +66,9 @@ void validateOnUpdateShouldThrowExceptionWhenIdOfAlignmentIsNull() {
 
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id has changed")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdHasChanged() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenIdHasChanged() {
         Alignment alignment = KeyResultAlignment.Builder.builder().withId(3L).build();
 
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -78,8 +80,9 @@ void validateOnUpdateShouldThrowExceptionWhenIdHasChanged() {
         verify(validator, times(1)).throwExceptionWhenIdHasChanged(1L, 3L);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when model is invalid")
     @Test
-    void validateOnUpdateShouldValidateDto() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenModelIsInvalid() {
         when(alignmentPersistenceService.getModelName()).thenReturn("Alignment");
         Alignment alignment = KeyResultAlignment.Builder.builder().withId(2L).withAlignedObjective(null).withVersion(1)
                 .build();
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/CheckInValidationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/CheckInValidationServiceTest.java
index 1792f668c2..f62a2e66e1 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/CheckInValidationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/CheckInValidationServiceTest.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -39,8 +40,8 @@ class CheckInValidationServiceTest {
     private final User user = User.Builder
             .builder()
             .withId(1L)
-            .withFirstname("Ruedi")
-            .withLastname("Grochde")
+            .withFirstName("Ruedi")
+            .withLastName("Grochde")
             .withEmail("grochde@puzzle.ch")
             .build();
     private final Team team = Team.Builder.builder().withId(1L).withName("Team4").build();
@@ -127,14 +128,16 @@ void setUp() {
         when(checkInPersistenceService.getModelName()).thenReturn("CheckIn");
     }
 
+    @DisplayName("Should be successful on validateOnGet() when id is valid")
     @Test
-    void validateOnGetShouldBeSuccessfulWhenValidCheckInId() {
+    void shouldBeSuccessfulOnValidateOnGetWhenValidCheckInId() {
         validator.validateOnGet(1L);
         verify(validator, times(1)).throwExceptionWhenIdIsNull(1L);
     }
 
+    @DisplayName("Should throw exception on validateOnGet() when id is null")
     @Test
-    void validateOnGetShouldThrowExceptionIfCheckInIdIsNull() {
+    void shouldThrowExceptionOnValidateOnGetIfCheckInIdIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnGet(null));
@@ -145,8 +148,9 @@ void validateOnGetShouldThrowExceptionIfCheckInIdIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should be successful on validateOnCreate() when check in is valid")
     @Test
-    void validateOnCreateShouldBeSuccessfulWhenCheckInIsValid() {
+    void shouldBeSuccessfulOnValidateOnCreateWhenCheckInIsValid() {
         when(checkInPersistenceService.findById(checkInMetric.getId())).thenReturn(checkInMetric);
 
         validator.validateOnCreate(checkInMetric);
@@ -156,8 +160,9 @@ void validateOnCreateShouldBeSuccessfulWhenCheckInIsValid() {
         verify(validator, times(1)).validate(checkInMetric);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when model is null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenModelIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnCreate(null));
@@ -166,8 +171,9 @@ void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when id is not null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenIdIsNotNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnCreate(fullCheckIn));
@@ -176,10 +182,10 @@ void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnCreate() when confidence has invalid value {0}")
     @MethodSource("confidenceValidationArguments")
-    void validateOnCreateShouldThrowExceptionWhenConfidenceIsInvalid(Integer confidence,
-                                                                     List<ErrorDto> expectedErrors) {
+    void shouldThrowExceptionOnValidateOnCreateWhenConfidenceIsInvalid(Integer confidence,
+                                                                       List<ErrorDto> expectedErrors) {
 
         // arrange
         CheckIn checkIn = CheckInMetric.Builder
@@ -200,8 +206,9 @@ void validateOnCreateShouldThrowExceptionWhenConfidenceIsInvalid(Integer confide
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when attributes are missing")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
+    void shouldThrowExceptionOnValidateOnCreateWhenAttrsAreMissing() {
         // arrange
         CheckIn checkInInvalid = CheckInMetric.Builder
                 .builder() //
@@ -223,6 +230,7 @@ void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should be successful on validateOnUpdate()")
     @Test
     void validateOnUpdateShouldBeSuccessfulWhenCheckInIsValid() {
         when(checkInPersistenceService.findById(checkInOrdinal.getId())).thenReturn(checkInOrdinal);
@@ -235,8 +243,9 @@ void validateOnUpdateShouldBeSuccessfulWhenCheckInIsValid() {
         verify(validator, times(1)).validate(checkInOrdinal);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when model is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenModelIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(1L, null));
@@ -245,8 +254,9 @@ void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenIdIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(null, checkInOrdinal));
@@ -258,8 +268,9 @@ void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id has changed")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdIsHasChanged() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenIdIsHasChanged() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(2L, checkInOrdinal));
@@ -272,10 +283,10 @@ void validateOnUpdateShouldThrowExceptionWhenIdIsHasChanged() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnUpdate() when confidence has invalid value {0}")
     @MethodSource("confidenceValidationArguments")
-    void validateOnUpdateShouldThrowExceptionWhenConfidenceIsInvalid(Integer confidence,
-                                                                     List<ErrorDto> expectedErrors) {
+    void shouldThrowExceptionOnValidateOnUpdateWhenConfidenceIsInvalid(Integer confidence,
+                                                                       List<ErrorDto> expectedErrors) {
 
         // arrange
         Long id = 2L;
@@ -299,8 +310,9 @@ void validateOnUpdateShouldThrowExceptionWhenConfidenceIsInvalid(Integer confide
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when check ins are empty")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenCheckInsOfKeyResultIsEmpty() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenCheckInsOfKeyResultIsEmpty() {
         // arrange
         Long id = 2L;
         CheckIn checkIn = CheckInMetric.Builder
@@ -338,8 +350,9 @@ void validateOnUpdateShouldThrowExceptionWhenCheckInsOfKeyResultIsEmpty() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when attributes are missing")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenAttrsAreMissing() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenAttrsAreMissing() {
         // arrange
         Long id = 11L;
         CheckIn checkInInvalid = CheckInMetric.Builder
@@ -363,15 +376,17 @@ void validateOnUpdateShouldThrowExceptionWhenAttrsAreMissing() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should be successful on validateOnDelete() when id is valid")
     @Test
-    void validateOnDeleteShouldBeSuccessfulWhenValidKeyResultId() {
+    void shouldBeSuccessfulOnValidateOnDeleteWhenValidKeyResultId() {
         validator.validateOnDelete(1L);
         verify(validator, times(1)).throwExceptionWhenIdIsNull(1L);
         verify(validator, times(1)).doesEntityExist(1L);
     }
 
+    @DisplayName("Should throw exception on validateOnDelete() when id is null")
     @Test
-    void validateOnDeleteShouldThrowExceptionIfKeyResultIdIsNull() {
+    void shouldThrowExceptionOnValidateOnDeleteWhenKeyResultIdIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnDelete(null));
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/CompletedValidationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/CompletedValidationServiceTest.java
index 38849e0379..3cbbb6a865 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/CompletedValidationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/CompletedValidationServiceTest.java
@@ -45,8 +45,8 @@ void setUp() {
         this.user = User.Builder
                 .builder()
                 .withId(1L)
-                .withFirstname("Bob")
-                .withLastname("Kaufmann")
+                .withFirstName("Bob")
+                .withLastName("Kaufmann")
                 .withEmail("kaufmann@puzzle.ch")
                 .build();
         this.team = Team.Builder.builder().withId(1L).withName("Team1").build();
@@ -95,16 +95,18 @@ private static Stream<Arguments> nameValidationArguments() {
                                                        List.of("comment", "Completed", "0", "4096")))));
     }
 
+    @DisplayName("Should be successful on validateOnCreate() when model is valid")
     @Test
-    void validateOnCreateShouldBeSuccessfulWhenCompletedIsValid() {
+    void shouldBeSuccessfulOnValidateOnCreateWhenCompletedIsValid() {
         validator.validateOnCreate(this.validCompleted);
 
         verify(validator, times(1)).throwExceptionWhenModelIsNull(this.validCompleted);
         verify(validator, times(1)).validate(this.validCompleted);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when model is null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenModelIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnCreate(null));
@@ -113,8 +115,9 @@ void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when id is not null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenIdIsNotNull() {
         // arrange
         Completed completed = Completed.Builder
                 .builder() //
@@ -131,9 +134,9 @@ void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnCreate() when model has invalid comment {0}")
     @MethodSource("nameValidationArguments")
-    void validateOnCreateShouldThrowExceptionWhenCommentIsInvalid(String comment, List<ErrorDto> expectedErrors) {
+    void shouldThrowExceptionOnValidateOnCreateWhenCommentIsInvalid(String comment, List<ErrorDto> expectedErrors) {
         // arrange
         Completed completed = Completed.Builder
                 .builder() //
@@ -148,8 +151,9 @@ void validateOnCreateShouldThrowExceptionWhenCommentIsInvalid(String comment, Li
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when attributes are missing")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
+    void shouldThrowExceptionOnValidateOnCreateWhenAttrsAreMissing() {
         // arrange
         Completed completedInvalid = Completed.Builder
                 .builder() //
@@ -166,9 +170,9 @@ void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @DisplayName("validateOnUpdate() should throw exception")
+    @DisplayName("Should throw exception on validateOnUpdate()")
     @Test
-    void validateOnUpdateShouldThrowException() {
+    void shouldThrowOnValidateOnUpdateException() {
         // arrange
         Long id = 1L;
         Completed completed = Completed.Builder.builder().build();
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/KeyResultValidationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/KeyResultValidationServiceTest.java
index 9428f12c87..7d36ff3eb5 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/KeyResultValidationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/KeyResultValidationServiceTest.java
@@ -41,8 +41,8 @@ class KeyResultValidationServiceTest {
     private final User user = User.Builder
             .builder()
             .withId(1L)
-            .withFirstname("Bob")
-            .withLastname("Kaufmann")
+            .withFirstName("Bob")
+            .withLastName("Kaufmann")
             .withEmail("kaufmann@puzzle.ch")
             .build();
     private final Quarter quarter = Quarter.Builder.builder().withId(1L).withLabel("GJ 22/23-Q2").build();
@@ -133,16 +133,18 @@ private static Stream<Arguments> nameValidationArguments() {
                                           new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("title", "KeyResult")))));
     }
 
+    @DisplayName("Should be successful on validateOnGet() when id is valid")
     @Test
-    void validateOnGetShouldBeSuccessfulWhenValidKeyResultId() {
+    void shouldBeSuccessfulOnValidateOnGetWhenValidKeyResultId() {
         validator.validateOnGet(1L);
 
         verify(validator, times(1)).validateOnGet(1L);
         verify(validator, times(1)).throwExceptionWhenIdIsNull(1L);
     }
 
+    @DisplayName("Should throw exception on validateOnGet() when id is null")
     @Test
-    void validateOnGetShouldThrowExceptionIfKeyResultIdIsNull() {
+    void shouldThrowExceptionOnValidateOnGetIfKeyResultIdIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnGet(null));
@@ -153,16 +155,18 @@ void validateOnGetShouldThrowExceptionIfKeyResultIdIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should be successful on validateOnCreate() when key result is valid")
     @Test
-    void validateOnCreateShouldBeSuccessfulWhenKeyResultIsValid() {
+    void shouldBeSuccessfulOnValidateOnCreateWhenKeyResultIsValid() {
         validator.validateOnCreate(fullKeyResult);
 
         verify(validator, times(1)).throwExceptionWhenModelIsNull(fullKeyResult);
         verify(validator, times(1)).validate(fullKeyResult);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when key result is null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenModelIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnCreate(null));
@@ -171,8 +175,9 @@ void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when id is not null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenIdIsNotNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnCreate(keyResultMetric));
@@ -181,9 +186,9 @@ void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnCreate() when model has invalid name {0}")
     @MethodSource("nameValidationArguments")
-    void validateOnCreateShouldThrowExceptionWhenTitleIsInvalid(String title, List<ErrorDto> errors) {
+    void shouldThrowExceptionOnValidateOnCreateWhenTitleIsInvalid(String title, List<ErrorDto> errors) {
         // arrange
         KeyResult keyResult = KeyResultMetric.Builder
                 .builder() //
@@ -204,8 +209,9 @@ void validateOnCreateShouldThrowExceptionWhenTitleIsInvalid(String title, List<E
         assertOkrResponseStatusException(exception, errors);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when attributes are missing")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
+    void shouldThrowExceptionOnValidateOnCreateWhenAttrsAreMissing() {
         // arrange
         KeyResult keyResultInvalid = KeyResultMetric.Builder
                 .builder() //
@@ -229,8 +235,9 @@ void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should be successful on validateOnUpdate() when model is valid")
     @Test
-    void validateOnUpdateShouldBeSuccessfulWhenKeyResultIsValid() {
+    void shouldBeSuccessfulOnValidateOnUpdateWhenKeyResultIsValid() {
         // arrange
         Long id = 5L;
         KeyResult keyResult = KeyResultMetric.Builder
@@ -259,8 +266,9 @@ void validateOnUpdateShouldBeSuccessfulWhenKeyResultIsValid() {
         verify(validator, times(1)).validate(keyResult);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when model is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenModelIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(1L, null));
@@ -269,8 +277,9 @@ void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenIdIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(null, keyResultOrdinal));
@@ -282,8 +291,9 @@ void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id has changed")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdHasChanged() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenIdHasChanged() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(1L, keyResultMetric));
@@ -296,9 +306,9 @@ void validateOnUpdateShouldThrowExceptionWhenIdHasChanged() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnUpdate() when model has invalid name {0}")
     @MethodSource("nameValidationArguments")
-    void validateOnUpdateShouldThrowExceptionWhenTitleIsInvalid(String title, List<ErrorDto> errors) {
+    void shouldThrowExceptionOnValidateOnUpdateWhenTitleIsInvalid(String title, List<ErrorDto> errors) {
         // arrange
         Long id = 3L;
         KeyResult keyResult = KeyResultMetric.Builder
@@ -322,8 +332,9 @@ void validateOnUpdateShouldThrowExceptionWhenTitleIsInvalid(String title, List<E
         assertOkrResponseStatusException(exception, errors);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when attributes are missing")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenAttrsAreMissing() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenAttrsAreMissing() {
         // arrange
         Long id = 11L;
         KeyResult keyResultInvalid = KeyResultMetric.Builder
@@ -349,19 +360,21 @@ void validateOnUpdateShouldThrowExceptionWhenAttrsAreMissing() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
+    @DisplayName("Should be successful on validateOnDelete() when id is valid")
     @Test
-    void validateOnDeleteShouldBeSuccessfulWhenValidKeyResultId() {
-        validator.validateOnGet(1L);
+    void shouldBeSuccessfulOnValidateOnDeleteWhenValidKeyResultId() {
+        validator.validateOnDelete(1L);
 
-        verify(validator, times(1)).validateOnGet(1L);
+        verify(validator, times(1)).validateOnDelete(1L);
         verify(validator, times(1)).throwExceptionWhenIdIsNull(1L);
     }
 
+    @DisplayName("Should throw exception on validateOnDelete() when id is valid")
     @Test
-    void validateOnDeleteShouldThrowExceptionIfKeyResultIdIsNull() {
+    void shouldThrowExceptionOnValidateOnDeleteWhenKeyResultIdIsNull() {
         // act + assert
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnGet(null));
+                                                            () -> validator.validateOnDelete(null));
 
         verify(validator, times(1)).throwExceptionWhenIdIsNull(null);
 
@@ -369,9 +382,9 @@ void validateOnDeleteShouldThrowExceptionIfKeyResultIdIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @DisplayName("validateOnUpdate() should throw exception when Objective Id (of input and saved KeyResuslt) has changed")
+    @DisplayName("Should throw exception on validateOnUpdate() when objective id (of input and saved KeyResult) has changed")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenObjectiveIdOfKeyResultHasChanged() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenObjectiveIdOfKeyResultHasChanged() {
         // arrange
         Long keyResultId = 1L;
         Long objectiveId = 2L;
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/ObjectiveValidationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/ObjectiveValidationServiceTest.java
index 2fae85f0be..2fca6abb81 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/ObjectiveValidationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/ObjectiveValidationServiceTest.java
@@ -20,6 +20,7 @@
 import java.util.stream.Stream;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -38,7 +39,7 @@ class ObjectiveValidationServiceTest {
     @MockBean
     ObjectivePersistenceService objectivePersistenceService = Mockito.mock(ObjectivePersistenceService.class);
 
-    Objective objective1;
+    Objective objective;
     Objective objectiveMinimal;
     User user;
     Quarter quarter;
@@ -82,8 +83,8 @@ void setUp() {
         this.user = User.Builder
                 .builder()
                 .withId(1L)
-                .withFirstname("Bob")
-                .withLastname("Kaufmann")
+                .withFirstName("Bob")
+                .withLastName("Kaufmann")
                 .withEmail("kaufmann@puzzle.ch")
                 .build();
         this.team = Team.Builder.builder().withId(1L).withName("Team1").build();
@@ -95,7 +96,7 @@ void setUp() {
                 .withEndDate(LocalDate.of(2022, 3, 31))
                 .build();
 
-        this.objective1 = Objective.Builder
+        this.objective = Objective.Builder
                 .builder()
                 .withId(1L)
                 .withTitle("Objective 1")
@@ -120,7 +121,7 @@ void setUp() {
                 .withCreatedOn(LocalDateTime.MAX)
                 .build();
 
-        when(objectivePersistenceService.findById(1L)).thenReturn(objective1);
+        when(objectivePersistenceService.findById(1L)).thenReturn(objective);
         when(objectivePersistenceService.getModelName()).thenReturn("Objective");
         doThrow(new OkrResponseStatusException(HttpStatus.NOT_FOUND,
                                                String
@@ -131,37 +132,27 @@ void setUp() {
                 .findById(2L);
     }
 
+    @DisplayName("Should be successful on validateOnGet() when id is valid")
     @Test
-    void validateOnGetShouldBeSuccessfulWhenValidObjectiveId() {
+    void shouldBeSuccessfulOnValidateOnGetWhenValidObjectiveId() {
         validator.validateOnGet(1L);
 
         verify(validator, times(1)).validateOnGet(1L);
         verify(validator, times(1)).throwExceptionWhenIdIsNull(1L);
     }
 
+    @DisplayName("Should be successful on validateOnCreate() when objective is valid")
     @Test
-    void validateOnGetShouldThrowExceptionIfObjectiveIdIsNull() {
-        OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnGet(null));
-
-        verify(validator, times(1)).throwExceptionWhenIdIsNull(null);
-        List<ErrorDto> expectedErrors = List.of(new ErrorDto("ATTRIBUTE_NULL", List.of("ID", "Objective")));
-
-        assertEquals(BAD_REQUEST, exception.getStatusCode());
-        assertThat(expectedErrors).hasSameElementsAs(exception.getErrors());
-        assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
-    }
-
-    @Test
-    void validateOnCreateShouldBeSuccessfulWhenTeamIsValid() {
+    void shouldBeSuccessfulOnValidateOnGetWhenTeamIsValid() {
         validator.validateOnCreate(objectiveMinimal);
 
         verify(validator, times(1)).throwExceptionWhenModelIsNull(objectiveMinimal);
         verify(validator, times(1)).validate(objectiveMinimal);
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when objective is null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenModelIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnCreate(null));
 
@@ -172,10 +163,11 @@ void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when id is not null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenIdIsNotNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnCreate(objective1));
+                                                            () -> validator.validateOnCreate(objective));
 
         List<ErrorDto> expectedErrors = List.of(new ErrorDto("ATTRIBUTE_NOT_NULL", List.of("ID", "Objective")));
 
@@ -184,9 +176,9 @@ void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnCreate() when model has invalid name {0}")
     @MethodSource("nameValidationArguments")
-    void validateOnCreateShouldThrowExceptionWhenTitleIsInvalid(String title, List<ErrorDto> expectedErrors) {
+    void shouldThrowExceptionOnValidateOnCreateWhenTitleIsInvalid(String title, List<ErrorDto> expectedErrors) {
         Objective objective = Objective.Builder
                 .builder()
                 .withId(null)
@@ -208,8 +200,9 @@ void validateOnCreateShouldThrowExceptionWhenTitleIsInvalid(String title, List<E
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when attributes are missing")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
+    void shouldThrowExceptionOnValidateOnCreateWhenAttrsAreMissing() {
         Objective objectiveInvalid = Objective.Builder
                 .builder()
                 .withId(null)
@@ -230,8 +223,9 @@ void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when model was modified")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenAttrModifiedByIsSet() {
+    void shouldThrowExceptionOnValidateOnCreateWhenAttrModifiedByIsSet() {
         Objective objectiveInvalid = Objective.Builder
                 .builder()
                 .withId(null)
@@ -250,15 +244,16 @@ void validateOnCreateShouldThrowExceptionWhenAttrModifiedByIsSet() {
                 .of(new ErrorDto("ATTRIBUTE_SET_FORBIDDEN",
                                  List
                                          .of("ModifiedBy",
-                                             "User{id=1, version=0, firstname='Bob', lastname='Kaufmann', email='kaufmann@puzzle.ch', isOkrChampion='false'}")));
+                                             "User{id=1, version=0, firstName='Bob', lastName='Kaufmann', email='kaufmann@puzzle.ch', okrChampion='false'}")));
 
         assertEquals(BAD_REQUEST, exception.getStatusCode());
         assertThat(expectedErrors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when start date is null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenStartDateIsNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenStartDateIsNull() {
         Quarter invalidQuarter = Quarter.Builder
                 .builder()
                 .withId(1L)
@@ -285,8 +280,9 @@ void validateOnCreateShouldThrowExceptionWhenStartDateIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnCreate() when end date is null")
     @Test
-    void validateOnCreateShouldThrowExceptionWhenEndDateIsNull() {
+    void shouldThrowExceptionOnValidateOnCreateWhenEndDateIsNull() {
         Quarter invalidQuarter = Quarter.Builder
                 .builder()
                 .withId(1L)
@@ -313,18 +309,20 @@ void validateOnCreateShouldThrowExceptionWhenEndDateIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be successful on validateOnCreate() when model is valid")
     @Test
-    void validateOnUpdateShouldBeSuccessfulWhenObjectiveIsValid() {
-        validator.validateOnUpdate(objective1.getId(), objective1);
+    void shouldBeSuccessfulOnValidateOnCreateWhenObjectiveIsValid() {
+        validator.validateOnUpdate(objective.getId(), objective);
 
-        verify(validator, times(1)).throwExceptionWhenModelIsNull(objective1);
-        verify(validator, times(1)).throwExceptionWhenIdIsNull(objective1.getId());
-        verify(validator, times(1)).throwExceptionWhenIdHasChanged(objective1.getId(), objective1.getId());
-        verify(validator, times(1)).validate(objective1);
+        verify(validator, times(1)).throwExceptionWhenModelIsNull(objective);
+        verify(validator, times(1)).throwExceptionWhenIdIsNull(objective.getId());
+        verify(validator, times(1)).throwExceptionWhenIdHasChanged(objective.getId(), objective.getId());
+        verify(validator, times(1)).validate(objective);
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when model date is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenModelIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(1L, null));
 
@@ -335,8 +333,9 @@ void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenIdIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnUpdate(null, objectiveMinimal));
 
@@ -349,14 +348,15 @@ void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when id has changed")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenIdHasChanged() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenIdHasChanged() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnUpdate(7L, objective1));
+                                                            () -> validator.validateOnUpdate(7L, objective));
 
-        verify(validator, times(1)).throwExceptionWhenModelIsNull(objective1);
-        verify(validator, times(1)).throwExceptionWhenIdIsNull(objective1.getId());
-        verify(validator, times(1)).throwExceptionWhenIdHasChanged(7L, objective1.getId());
+        verify(validator, times(1)).throwExceptionWhenModelIsNull(objective);
+        verify(validator, times(1)).throwExceptionWhenIdIsNull(objective.getId());
+        verify(validator, times(1)).throwExceptionWhenIdHasChanged(7L, objective.getId());
         List<ErrorDto> expectedErrors = List.of(new ErrorDto("ATTRIBUTE_CHANGED", List.of("ID", "7", "1")));
 
         assertEquals(BAD_REQUEST, exception.getStatusCode());
@@ -364,9 +364,9 @@ void validateOnUpdateShouldThrowExceptionWhenIdHasChanged() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnUpdate() when model has invalid name {0}")
     @MethodSource("nameValidationArguments")
-    void validateOnUpdateShouldThrowExceptionWhenTitleIsInvalid(String title, List<ErrorDto> expectedErrors) {
+    void shouldThrowExceptionOnValidateOnUpdateWhenTitleIsInvalid(String title, List<ErrorDto> expectedErrors) {
         Objective objective = Objective.Builder
                 .builder()
                 .withId(3L)
@@ -390,8 +390,9 @@ void validateOnUpdateShouldThrowExceptionWhenTitleIsInvalid(String title, List<E
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when attributes are missing")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenAttrsAreMissing() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenAttrsAreMissing() {
         Objective objective = Objective.Builder
                 .builder()
                 .withId(5L)
@@ -414,8 +415,9 @@ void validateOnUpdateShouldThrowExceptionWhenAttrsAreMissing() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when modifiedBy is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenAttrModifiedByIsNotSet() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenAttrModifiedByIsNotSet() {
         Objective objectiveInvalid = Objective.Builder
                 .builder()
                 .withId(1L)
@@ -438,8 +440,9 @@ void validateOnUpdateShouldThrowExceptionWhenAttrModifiedByIsNotSet() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when start date is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenStartDateIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenStartDateIsNull() {
         Quarter invalidQuarter = Quarter.Builder
                 .builder()
                 .withId(1L)
@@ -467,8 +470,9 @@ void validateOnUpdateShouldThrowExceptionWhenStartDateIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when end date is null")
     @Test
-    void validateOnUpdateShouldThrowExceptionWhenEndDateIsNull() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenEndDateIsNull() {
         Quarter invalidQuarter = Quarter.Builder
                 .builder()
                 .withId(1L)
@@ -496,8 +500,9 @@ void validateOnUpdateShouldThrowExceptionWhenEndDateIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when team has changed")
     @Test
-    void validateOnUpdateShouldThrowExceptionWheTeamHasChanged() {
+    void shouldThrowExceptionOnValidateOnUpdateWhenTeamHasChanged() {
         Objective savedObjective = Objective.Builder
                 .builder()
                 .withId(1L)
@@ -531,9 +536,9 @@ void validateOnUpdateShouldThrowExceptionWheTeamHasChanged() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnCreate() when the objective is in the backlog and the state is {0} instead of draft")
     @EnumSource(value = State.class, names = { "DRAFT" }, mode = EnumSource.Mode.EXCLUDE)
-    void validateOnCreateShouldThrowExceptionWhenQuarterIsBacklogAndStateIsNotDraft(State state) {
+    void shouldThrowExceptionOnValidateOnCreateWhenQuarterIsBacklogAndStateIsNotDraft(State state) {
         Quarter backlogQuarter = Quarter.Builder
                 .builder()
                 .withId(BACK_LOG_QUARTER_ID)
@@ -562,9 +567,9 @@ void validateOnCreateShouldThrowExceptionWhenQuarterIsBacklogAndStateIsNotDraft(
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateOnUpdate() when the objective is in the backlog and the state is {0} instead of DRAFT")
     @EnumSource(value = State.class, names = { "DRAFT" }, mode = EnumSource.Mode.EXCLUDE)
-    void validateOnUpdateShouldThrowExceptionWhenQuarterIsBacklogAndStateIsNotDraft(State state) {
+    void shouldThrowExceptionOnValidateOnUpdateWhenQuarterIsBacklogAndStateIsNotDraft(State state) {
         Quarter backlogQuarter = Quarter.Builder
                 .builder()
                 .withId(BACK_LOG_QUARTER_ID)
@@ -595,8 +600,9 @@ void validateOnUpdateShouldThrowExceptionWhenQuarterIsBacklogAndStateIsNotDraft(
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be successful on validateOnUpdate() when the objective is in the backlog and the state is DRAFT")
     @Test
-    void validateOnUpdateShouldPassWhenQuarterIsBacklogAndStateIsDraft() {
+    void shouldPassOnValidateOnUpdateWhenQuarterIsBacklogAndStateIsDraft() {
         Quarter backlogQuarter = Quarter.Builder
                 .builder()
                 .withId(BACK_LOG_QUARTER_ID)
@@ -620,16 +626,9 @@ void validateOnUpdateShouldPassWhenQuarterIsBacklogAndStateIsDraft() {
         assertDoesNotThrow(() -> validator.validateOnUpdate(1L, validObjective));
     }
 
+    @DisplayName("Should throw exception on validateOnGet() when id is null")
     @Test
-    void validateOnDeleteShouldBeSuccessfulWhenValidObjectiveId() {
-        validator.validateOnGet(1L);
-
-        verify(validator, times(1)).validateOnGet(1L);
-        verify(validator, times(1)).throwExceptionWhenIdIsNull(1L);
-    }
-
-    @Test
-    void validateOnDeleteShouldThrowExceptionIfObjectiveIdIsNull() {
+    void shouldThrowExceptionOnValidateOnGetWhenObjectiveIdIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
                                                             () -> validator.validateOnGet(null));
 
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/OverviewValidationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/OverviewValidationServiceTest.java
index 742017d560..d14d13308a 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/OverviewValidationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/OverviewValidationServiceTest.java
@@ -5,6 +5,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -22,26 +23,29 @@ class OverviewValidationServiceTest {
     @InjectMocks
     OverviewValidationService validator;
 
+    @DisplayName("Should be successful on validateQuarter() when quarter id is valid")
     @Test
-    void validateOnGetShouldCallQuarterValidator() {
+    void shouldBeSuccessfulOnValidateQuarterWhenQuarterIdIsValid() {
         validator.validateQuarter(QUARTER_ID);
         verify(quarterValidationService, times(1)).validateOnGet(QUARTER_ID);
         verify(quarterValidationService, times(1)).doesEntityExist(QUARTER_ID);
     }
 
+    @DisplayName("Should be successful on validateTeam() when team id is valid")
     @Test
-    void validateOnGetShouldCallTeamValidator() {
+    void shouldBeSuccessfulOnValidateTeamWhenTeamIdIsValid() {
         validator.validateTeam(TEAM_ID);
         verify(teamValidationService, times(1)).validateOnGet(TEAM_ID);
         verify(teamValidationService, times(1)).doesEntityExist(TEAM_ID);
     }
 
+    @DisplayName("Should be successful on validateOnGet() when quarter and teams are valid")
     @Test
-    void validateOnGetShouldCallQuarterValidatorAndTeamValidator() {
+    void shouldBeSuccessfulOnValidateOnGetWhenQuarterAndTeamsAreValid() {
         validator.validateOnGet(QUARTER_ID, teamIds);
         verify(quarterValidationService, times(1)).validateOnGet(QUARTER_ID);
         verify(quarterValidationService, times(1)).doesEntityExist(QUARTER_ID);
         verify(teamValidationService, times(teamIds.size())).validateOnGet(anyLong());
         verify(teamValidationService, times(teamIds.size())).doesEntityExist(anyLong());
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/QuarterValidationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/QuarterValidationServiceTest.java
index d5ba366f20..366133ca71 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/QuarterValidationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/QuarterValidationServiceTest.java
@@ -31,9 +31,9 @@ class QuarterValidationServiceTest {
     @InjectMocks
     private QuarterValidationService validator;
 
-    @DisplayName("throwExceptionWhenStartEndDateQuarterIsNull() should do nothing when Quarter Label is Backlog")
+    @DisplayName("Should do nothing on throwExceptionWhenStartEndDateQuarterIsNull() when quarter label is backlog")
     @Test
-    void throwExceptionWhenStartEndDateQuarterIsNullShouldDoNothingWhenQuarterLabelIsBacklog() {
+    void shouldThrowExceptionWhenStartEndDateQuarterIsNullShouldDoNothingWhenQuarterLabelIsBacklog() {
         // arrange
         Quarter quarter = mock(Quarter.class);
         when(quarter.getLabel()).thenReturn(BACK_LOG_QUARTER_LABEL);
@@ -46,9 +46,9 @@ void throwExceptionWhenStartEndDateQuarterIsNullShouldDoNothingWhenQuarterLabelI
         verify(quarter, never()).getEndDate();
     }
 
-    @DisplayName("throwExceptionWhenStartEndDateQuarterIsNull() should throw Exception when StartDate is null")
+    @DisplayName("Should throw exception on throwExceptionWhenStartEndDateQuarterIsNull() when start date is null")
     @Test
-    void throwExceptionWhenStartEndDateQuarterIsNullShouldThrowExceptionWhenStartDateIsNull() {
+    void shouldThrowExceptionWhenStartEndDateQuarterIsNullShouldThrowExceptionWhenStartDateIsNull() {
         // arrange
         Quarter quarter = mock(Quarter.class);
         when(quarter.getLabel()).thenReturn("no Backlog");
@@ -61,9 +61,9 @@ void throwExceptionWhenStartEndDateQuarterIsNullShouldThrowExceptionWhenStartDat
         assertEquals(BAD_REQUEST, okrResponseStatusException.getStatusCode());
     }
 
-    @DisplayName("throwExceptionWhenStartEndDateQuarterIsNull() should throw Exception when EndDate is null")
+    @DisplayName("Should throw exception on throwExceptionWhenStartEndDateQuarterIsNull() when end date is null")
     @Test
-    void throwExceptionWhenStartEndDateQuarterIsNullShouldThrowExceptionWhenEndDateIsNull() {
+    void shouldThrowExceptionWhenStartEndDateQuarterIsNullShouldThrowExceptionWhenEndDateIsNull() {
         // arrange
         Quarter quarter = mock(Quarter.class);
         when(quarter.getLabel()).thenReturn("no Backlog");
@@ -77,9 +77,9 @@ void throwExceptionWhenStartEndDateQuarterIsNullShouldThrowExceptionWhenEndDateI
         assertEquals(BAD_REQUEST, okrResponseStatusException.getStatusCode());
     }
 
-    @DisplayName("throwExceptionWhenStartEndDateQuarterIsNull should do nothing when both dates are not null")
+    @DisplayName("Should do nothing on throwExceptionWhenStartEndDateQuarterIsNull() when both dates are not null")
     @Test
-    void throwExceptionWhenStartEndDateQuarterIsNullShouldDoNothingWhenBothDatesAreNotNull() {
+    void shouldThrowExceptionWhenStartEndDateQuarterIsNullShouldDoNothingWhenBothDatesAreNotNull() {
         // arrange
         Quarter quarter = mock(Quarter.class);
         when(quarter.getLabel()).thenReturn("no Backlog");
@@ -92,22 +92,24 @@ void throwExceptionWhenStartEndDateQuarterIsNullShouldDoNothingWhenBothDatesAreN
         // assert (does nothing ... so nothing to check here)
     }
 
+    @DisplayName("Should throw exception when validateOnCreate() is called")
     @Test
-    void validateOnCreateShouldThrowException() {
+    void shouldThrowExceptionOnValidateOnCreate() {
         Exception exception = assertThrows(IllegalCallerException.class, () -> validator.validateOnCreate(any()));
         assertEquals("This method must not be called", exception.getMessage());
     }
 
+    @DisplayName("Should throw exception when validateOnUpdate() is called")
     @Test
-    void validateOnUpdateShouldThrowException() {
+    void shouldThrowExceptionOnValidateOnUpdate() {
         Exception exception = assertThrows(IllegalCallerException.class,
                                            () -> validator.validateOnUpdate(anyLong(), any()));
         assertEquals("This method must not be called because there is no update of quarters", exception.getMessage());
     }
 
-    @DisplayName("validateOnGeneration() should throw exception when StartDate is null")
+    @DisplayName("Should throw exception on validateOnGeneration() when start date is null")
     @Test
-    void validateOnGenerationShouldThrowExceptionWhenStartDateIsNull() {
+    void shouldThrowExceptionOnValidateOnGenerationWhenStartDateIsNull() {
         // arrange
         Quarter quarter = mock(Quarter.class);
         when(quarter.getStartDate()).thenReturn(null);
@@ -123,9 +125,9 @@ void validateOnGenerationShouldThrowExceptionWhenStartDateIsNull() {
                                          List.of(new ErrorDto("ATTRIBUTE_NULL", List.of("StartDate", "Any Label"))));
     }
 
-    @DisplayName("validateOnGeneration() should throw exception when EndDate is null")
+    @DisplayName("Should throw exception on validateOnGeneration() when end date is null")
     @Test
-    void validateOnGenerationShouldThrowExceptionWhenEndDateIsNull() {
+    void shouldThrowExceptionOnValidateOnGenerationWhenBothDatesAreNull() {
         // arrange
         Quarter quarter = mock(Quarter.class);
         when(quarter.getStartDate()).thenReturn(LocalDate.now());
@@ -142,9 +144,9 @@ void validateOnGenerationShouldThrowExceptionWhenEndDateIsNull() {
                                          List.of(new ErrorDto("ATTRIBUTE_NULL", List.of("EndDate", "Any Label"))));
     }
 
-    @DisplayName("validateOnGeneration() should do nothing when both dates are not null")
+    @DisplayName("Should do nothing on validateOnGeneration() when both dates are not null")
     @Test
-    void validateOnGenerationShouldDoNothingWhenBothDatesAreNotNull() {
+    void shouldDoNothingOnValidateOnGenerationWhenBothDatesAreNotNull() {
         // arrange
         Quarter quarter = mock(Quarter.class);
         when(quarter.getStartDate()).thenReturn(LocalDate.now());
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/TeamValidationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/TeamValidationServiceTest.java
index cd4bb9a9b4..8fae5fa05c 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/TeamValidationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/TeamValidationServiceTest.java
@@ -12,6 +12,7 @@
 import ch.puzzle.okr.test.TestHelper;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.BDDMockito;
@@ -57,6 +58,7 @@ void setUp() {
     @InjectMocks
     private TeamValidationService validator;
 
+    @DisplayName("Should be successful on validateOnGet() when team id is valid")
     @Test
     void validateOnGetShouldBeSuccessfulWhenValidTeamId() {
         validator.validateOnGet(1L);
@@ -65,6 +67,7 @@ void validateOnGetShouldBeSuccessfulWhenValidTeamId() {
         verify(validator, times(1)).throwExceptionWhenIdIsNull(1L);
     }
 
+    @DisplayName("Should throw exception on validateOnGet() when team id is null")
     @Test
     void validateOnGetShouldThrowExceptionIfTeamIdIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -78,18 +81,20 @@ void validateOnGetShouldThrowExceptionIfTeamIdIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be successful on validateOnDelete() when team id is valid")
     @Test
     void validateOnDeleteShouldBeSuccessfulWhenValidTeamId() {
-        validator.validateOnGet(1L);
+        validator.validateOnDelete(1L);
 
-        verify(validator, times(1)).validateOnGet(1L);
+        verify(validator, times(1)).validateOnDelete(1L);
         verify(validator, times(1)).throwExceptionWhenIdIsNull(1L);
     }
 
+    @DisplayName("Should be throw exception on validateOnDelete() when team id is null")
     @Test
     void validateOnDeleteShouldThrowExceptionIfTeamIdIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnGet(null));
+                                                            () -> validator.validateOnDelete(null));
 
         verify(validator, times(1)).throwExceptionWhenIdIsNull(null);
         List<ErrorDto> expectedErrors = List.of(new ErrorDto("ATTRIBUTE_NULL", List.of("ID", "Team")));
@@ -99,6 +104,7 @@ void validateOnDeleteShouldThrowExceptionIfTeamIdIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be throw exception on validateOnCreate() when team id is not null")
     @Test
     void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -111,6 +117,7 @@ void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be throw exception on validateOnCreate() when team already exists")
     @Test
     void validateOnCreateShouldThrowExceptionWhenTeamAlreadyExists() {
         BDDMockito.given(teamPersistenceService.findTeamsByName(anyString())).willReturn(List.of(team1));
@@ -124,6 +131,7 @@ void validateOnCreateShouldThrowExceptionWhenTeamAlreadyExists() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be throw exception on validateOnCreate() when model is null")
     @Test
     void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -136,6 +144,7 @@ void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be throw exception on validateOnCreate() when team name is null")
     @Test
     void validateOnCreateShouldThrowExceptionWhenModelIsNameIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -152,6 +161,7 @@ void validateOnCreateShouldThrowExceptionWhenModelIsNameIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be throw exception on validateOnUpdate() when team id is null")
     @Test
     void validateOnUpdateShouldThrowExceptionWhenModelIdIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -167,6 +177,7 @@ void validateOnUpdateShouldThrowExceptionWhenModelIdIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be throw exception on validateOnUpdate() when model and id are null")
     @Test
     void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -179,6 +190,7 @@ void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be throw exception on validateOnUpdate() when team name is null")
     @Test
     void validateOnUpdateShouldThrowExceptionWhenModelIsNameIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/UserValidationServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/UserValidationServiceTest.java
index d229e06346..6a69a13292 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/UserValidationServiceTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/UserValidationServiceTest.java
@@ -15,6 +15,7 @@
 import java.util.stream.Stream;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -34,7 +35,6 @@ class UserValidationServiceTest {
     @MockBean
     UserPersistenceService userPersistenceService = Mockito.mock(UserPersistenceService.class);
 
-    User user1;
     User userMinimal;
     User user;
 
@@ -45,15 +45,15 @@ void setUp() {
         user = User.Builder
                 .builder()
                 .withId(1L)
-                .withFirstname("Bob")
-                .withLastname("Kaufmann")
+                .withFirstName("Bob")
+                .withLastName("Kaufmann")
                 .withEmail("kaufmann@puzzle.ch")
                 .build();
 
         userMinimal = User.Builder
                 .builder()
-                .withFirstname("Max")
-                .withLastname("Mustermann")
+                .withFirstName("Max")
+                .withLastName("Mustermann")
                 .withEmail("max@mustermann.com")
                 .build();
 
@@ -75,47 +75,47 @@ void setUp() {
     private static Stream<Arguments> firstNameValidationArguments() {
         return Stream
                 .of(arguments(StringUtils.repeat('1', 51),
-                              List.of(new ErrorDto("ATTRIBUTE_SIZE_BETWEEN", List.of("firstname", "User", "2", "50")))),
+                              List.of(new ErrorDto("ATTRIBUTE_SIZE_BETWEEN", List.of("firstName", "User", "2", "50")))),
                     arguments(StringUtils.repeat('1', 1),
-                              List.of(new ErrorDto("ATTRIBUTE_SIZE_BETWEEN", List.of("firstname", "User", "2", "50")))),
+                              List.of(new ErrorDto("ATTRIBUTE_SIZE_BETWEEN", List.of("firstName", "User", "2", "50")))),
                     arguments("",
                               List
-                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("firstname", "User")),
+                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("firstName", "User")),
                                           new ErrorDto("ATTRIBUTE_SIZE_BETWEEN",
-                                                       List.of("firstname", "User", "2", "50")))),
+                                                       List.of("firstName", "User", "2", "50")))),
                     arguments(" ",
                               List
-                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("firstname", "User")),
+                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("firstName", "User")),
                                           new ErrorDto("ATTRIBUTE_SIZE_BETWEEN",
-                                                       List.of("firstname", "User", "2", "50")))),
-                    arguments("         ", List.of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("firstname", "User")))),
+                                                       List.of("firstName", "User", "2", "50")))),
+                    arguments("         ", List.of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("firstName", "User")))),
                     arguments(null,
                               List
-                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("firstname", "User")),
-                                          new ErrorDto("ATTRIBUTE_NOT_NULL", List.of("firstname", "User")))));
+                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("firstName", "User")),
+                                          new ErrorDto("ATTRIBUTE_NOT_NULL", List.of("firstName", "User")))));
     }
 
     private static Stream<Arguments> lastNameValidationArguments() {
         return Stream
                 .of(arguments(StringUtils.repeat('1', 51),
-                              List.of(new ErrorDto("ATTRIBUTE_SIZE_BETWEEN", List.of("lastname", "User", "2", "50")))),
+                              List.of(new ErrorDto("ATTRIBUTE_SIZE_BETWEEN", List.of("lastName", "User", "2", "50")))),
                     arguments(StringUtils.repeat('1', 1),
-                              List.of(new ErrorDto("ATTRIBUTE_SIZE_BETWEEN", List.of("lastname", "User", "2", "50")))),
+                              List.of(new ErrorDto("ATTRIBUTE_SIZE_BETWEEN", List.of("lastName", "User", "2", "50")))),
                     arguments("",
                               List
-                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("lastname", "User")),
+                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("lastName", "User")),
                                           new ErrorDto("ATTRIBUTE_SIZE_BETWEEN",
-                                                       List.of("lastname", "User", "2", "50")))),
+                                                       List.of("lastName", "User", "2", "50")))),
                     arguments(" ",
                               List
-                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("lastname", "User")),
+                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("lastName", "User")),
                                           new ErrorDto("ATTRIBUTE_SIZE_BETWEEN",
-                                                       List.of("lastname", "User", "2", "50")))),
-                    arguments("         ", List.of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("lastname", "User")))),
+                                                       List.of("lastName", "User", "2", "50")))),
+                    arguments("         ", List.of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("lastName", "User")))),
                     arguments(null,
                               List
-                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("lastname", "User")),
-                                          new ErrorDto("ATTRIBUTE_NOT_NULL", List.of("lastname", "User")))));
+                                      .of(new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("lastName", "User")),
+                                          new ErrorDto("ATTRIBUTE_NOT_NULL", List.of("lastName", "User")))));
     }
 
     private static Stream<Arguments> emailValidationArguments() {
@@ -149,6 +149,7 @@ private static Stream<Arguments> emailValidationArguments() {
                                           new ErrorDto("ATTRIBUTE_NOT_BLANK", List.of("email", "User")))));
     }
 
+    @DisplayName("Should be successful on validateOnGet() when user id is valid")
     @Test
     void validateOnGetShouldBeSuccessfulWhenValidUserId() {
         validator.validateOnGet(1L);
@@ -157,6 +158,7 @@ void validateOnGetShouldBeSuccessfulWhenValidUserId() {
         verify(validator, times(1)).throwExceptionWhenIdIsNull(1L);
     }
 
+    @DisplayName("Should throw exception on validateOnGet() when id is null")
     @Test
     void validateOnGetShouldThrowExceptionIfUserIdIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -169,6 +171,7 @@ void validateOnGetShouldThrowExceptionIfUserIdIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be successful on validateOnGetOrCreate() when user is valid")
     @Test
     void validateOnGetOrCreateShouldBeSuccessful() {
         validator.validateOnGetOrCreate(userMinimal);
@@ -177,6 +180,7 @@ void validateOnGetOrCreateShouldBeSuccessful() {
         verify(validator, times(1)).validate(userMinimal);
     }
 
+    @DisplayName("Should throw exception on validateOnGetOrCreate() when model is null")
     @Test
     void validateOnGetOrCreateShouldThrowExceptionWhenModelIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -190,6 +194,7 @@ void validateOnGetOrCreateShouldThrowExceptionWhenModelIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be successful on validateOnCreate() when user is valid")
     @Test
     void validateOnCreateShouldBeSuccessfulWhenUserIsValid() {
         validator.validateOnCreate(userMinimal);
@@ -198,6 +203,7 @@ void validateOnCreateShouldBeSuccessfulWhenUserIsValid() {
         verify(validator, times(1)).validate(userMinimal);
     }
 
+    @DisplayName("Should throw exception on validateCreate() when model is null")
     @Test
     void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -210,6 +216,7 @@ void validateOnCreateShouldThrowExceptionWhenModelIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateCreate() when id is not null")
     @Test
     void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -222,67 +229,63 @@ void validateOnCreateShouldThrowExceptionWhenIdIsNotNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateCreate() when model has invalid first name '{0}'")
     @MethodSource("firstNameValidationArguments")
     void validateOnCreateShouldThrowExceptionWhenFirstnameIsInvalid(String name, List<ErrorDto> errors) {
-        User user2 = User.Builder
+        User user = User.Builder
                 .builder()
                 .withEmail("max@mail.com")
-                .withFirstname(name)
-                .withLastname("lastname")
+                .withFirstName(name)
+                .withLastName("lastname")
                 .build();
 
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnCreate(user2));
+                                                            () -> validator.validateOnCreate(user));
 
         assertEquals(BAD_REQUEST, exception.getStatusCode());
         assertThat(errors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(errors).contains(exception.getReason()));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateCreate() when model has invalid last name '{0}'")
     @MethodSource("lastNameValidationArguments")
     void validateOnCreateShouldThrowExceptionWhenLastnameIsInvalid(String name, List<ErrorDto> errors) {
-        User user2 = User.Builder
+        User user = User.Builder
                 .builder()
                 .withEmail("max@mail.com")
-                .withFirstname("firstname")
-                .withLastname(name)
+                .withFirstName("firstname")
+                .withLastName(name)
                 .build();
 
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnCreate(user2));
+                                                            () -> validator.validateOnCreate(user));
 
         assertEquals(BAD_REQUEST, exception.getStatusCode());
         assertThat(errors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(errors).contains(exception.getReason()));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should throw exception on validateCreate() when model has invalid email '{0}'")
     @MethodSource("emailValidationArguments")
     void validateOnCreateShouldThrowExceptionWhenEmailIsInvalid(String email, List<ErrorDto> errors) {
-        User user2 = User.Builder
-                .builder()
-                .withEmail(email)
-                .withFirstname("firstname")
-                .withLastname("lastname")
-                .build();
+        User user = User.Builder.builder().withEmail(email).withFirstName("firstname").withLastName("lastname").build();
 
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnCreate(user2));
+                                                            () -> validator.validateOnCreate(user));
 
         assertEquals(BAD_REQUEST, exception.getStatusCode());
         assertThat(errors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(errors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateCreate() when model is missing attributes")
     @Test
     void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
         User userInvalid = User.Builder
                 .builder()
                 .withId(null)
-                .withLastname("Lastname")
-                .withFirstname("firstname")
+                .withLastName("Lastname")
+                .withFirstName("firstname")
                 .withEmail("falseemail")
                 .build();
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -295,6 +298,7 @@ void validateOnCreateShouldThrowExceptionWhenAttrsAreMissing() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be successful on validateCreate() when user is valid")
     @Test
     void validateOnUpdateShouldBeSuccessfulWhenUserIsValid() {
         validator.validateOnUpdate(user.getId(), user);
@@ -305,6 +309,7 @@ void validateOnUpdateShouldBeSuccessfulWhenUserIsValid() {
         verify(validator, times(1)).validate(user);
     }
 
+    @DisplayName("Should be throw exception on validateOnUpdate() when model is null")
     @Test
     void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -317,6 +322,7 @@ void validateOnUpdateShouldThrowExceptionWhenModelIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be throw exception on validateOnUpdate() when id is null")
     @Test
     void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -332,6 +338,7 @@ void validateOnUpdateShouldThrowExceptionWhenIdIsNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be throw exception on validateOnUpdate() when id has changed")
     @Test
     void validateOnUpdateShouldThrowExceptionWhenIdHasChanged() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -348,70 +355,71 @@ void validateOnUpdateShouldThrowExceptionWhenIdHasChanged() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should be throw exception on validateOnUpdate() when model has invalid first name {0}")
     @MethodSource("firstNameValidationArguments")
     void validateOnUpdateShouldThrowExceptionWhenFirstnameIsInvalid(String name, List<ErrorDto> errors) {
-        User user2 = User.Builder
+        User user = User.Builder
                 .builder()
                 .withId(3L)
                 .withEmail("max@mail.com")
-                .withFirstname(name)
-                .withLastname("lastname")
+                .withFirstName(name)
+                .withLastName("lastname")
                 .build();
 
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnUpdate(3L, user2));
+                                                            () -> validator.validateOnUpdate(3L, user));
 
         assertEquals(BAD_REQUEST, exception.getStatusCode());
         assertThat(errors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(errors).contains(exception.getReason()));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should be throw exception on validateOnUpdate() when model has invalid last name {0}")
     @MethodSource("lastNameValidationArguments")
     void validateOnUpdateShouldThrowExceptionWhenLastnameIsInvalid(String name, List<ErrorDto> errors) {
-        User user2 = User.Builder
+        User user = User.Builder
                 .builder()
                 .withId(3L)
                 .withEmail("max@mail.com")
-                .withFirstname("firstname")
-                .withLastname(name)
+                .withFirstName("firstname")
+                .withLastName(name)
                 .build();
 
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnUpdate(3L, user2));
+                                                            () -> validator.validateOnUpdate(3L, user));
 
         assertEquals(BAD_REQUEST, exception.getStatusCode());
         assertThat(errors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(errors).contains(exception.getReason()));
     }
 
-    @ParameterizedTest
+    @ParameterizedTest(name = "should be throw exception on validateOnUpdate() when model has invalid email {0}")
     @MethodSource("emailValidationArguments")
     void validateOnUpdateShouldThrowExceptionWhenEmailIsInvalid(String email, List<ErrorDto> errors) {
-        User user2 = User.Builder
+        User user = User.Builder
                 .builder()
                 .withId(3L)
                 .withEmail(email)
-                .withFirstname("firstname")
-                .withLastname("lastname")
+                .withFirstName("firstname")
+                .withLastName("lastname")
                 .build();
 
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
-                                                            () -> validator.validateOnUpdate(3L, user2));
+                                                            () -> validator.validateOnUpdate(3L, user));
 
         assertEquals(BAD_REQUEST, exception.getStatusCode());
         assertThat(errors).hasSameElementsAs(exception.getErrors());
         assertTrue(TestHelper.getAllErrorKeys(errors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should throw exception on validateOnUpdate() when model is missing attributes")
     @Test
     void validateOnUpdateShouldThrowExceptionWhenAttrsAreMissing() {
         User userInvalid = User.Builder
                 .builder()
                 .withId(3L)
-                .withLastname("Lastname")
-                .withFirstname("firstname")
+                .withLastName("Lastname")
+                .withFirstName("firstname")
                 .withEmail("falseemail")
                 .build();
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -424,6 +432,7 @@ void validateOnUpdateShouldThrowExceptionWhenAttrsAreMissing() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should not throw error on validateAuthorisationToken() when token is valid")
     @Test
     void validateAuthorisationTokenShouldNotThrowError() {
         assertDoesNotThrow(() -> validator.validateAuthorisationToken(mockJwt));
@@ -431,6 +440,7 @@ void validateAuthorisationTokenShouldNotThrowError() {
         verify(validator).validateAuthorisationToken(mockJwt);
     }
 
+    @DisplayName("Should throw error on validateAuthorisationToken() when token is null")
     @Test
     void validateAuthorisationTokenShouldThrowErrorWhenNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
@@ -443,6 +453,7 @@ void validateAuthorisationTokenShouldThrowErrorWhenNull() {
         assertTrue(TestHelper.getAllErrorKeys(expectedErrors).contains(exception.getReason()));
     }
 
+    @DisplayName("Should be successful on validateOnDelete() when model is valid")
     @Test
     void validateOnDeleteShouldBeSuccessfulWhenValidObjectiveId() {
         validator.validateOnDelete(1L);
@@ -451,6 +462,7 @@ void validateOnDeleteShouldBeSuccessfulWhenValidObjectiveId() {
         verify(validator, times(1)).throwExceptionWhenIdIsNull(1L);
     }
 
+    @DisplayName("Should throw exception on validateOnGet() when model is null")
     @Test
     void validateOnDeleteShouldThrowExceptionIfObjectiveIdIsNull() {
         OkrResponseStatusException exception = assertThrows(OkrResponseStatusException.class,
diff --git a/backend/src/test/java/ch/puzzle/okr/service/validation/ValidationBaseTest.java b/backend/src/test/java/ch/puzzle/okr/service/validation/ValidationBaseTest.java
index 0b4b1318ad..1cc52d6c18 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/validation/ValidationBaseTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/validation/ValidationBaseTest.java
@@ -44,7 +44,7 @@ void getPersistenceServiceShouldReturnNotNull() {
         assertNotNull(persistenceService);
     }
 
-    @DisplayName("validateOnGet() should be successful when Id is valid")
+    @DisplayName("Should be successful when Id is valid")
     @Test
     void validateOnGetShouldBeSuccessfulWhenIdIsValid() {
         Long id = 1L;
@@ -52,7 +52,7 @@ void validateOnGetShouldBeSuccessfulWhenIdIsValid() {
         verify(validator, times(1)).validateOnGet(anyLong());
     }
 
-    @DisplayName("validateOnGet() should throw exception when Id is null")
+    @DisplayName("Should throw exception when Id is null")
     @Test
     void validateOnGetShouldThrowExceptionWhenIdIsNull() {
         // arrange
@@ -68,7 +68,7 @@ void validateOnGetShouldThrowExceptionWhenIdIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @DisplayName("validateOnDelete() should be successful when Id is valid")
+    @DisplayName("Should be successful when Id is valid")
     @Test
     void validateOnDeleteShouldBeSuccessfulWhenIdIsValid() {
         // arrange
@@ -83,7 +83,7 @@ void validateOnDeleteShouldBeSuccessfulWhenIdIsValid() {
         assertEquals(quarter, validatedQuarter);
     }
 
-    @DisplayName("validateOnDelete() should throw exception when Id is null")
+    @DisplayName("Should throw exception when Id is null")
     @Test
     void validateOnDeleteShouldThrowExceptionWhenIdIsNull() {
         // arrange
@@ -99,7 +99,7 @@ void validateOnDeleteShouldThrowExceptionWhenIdIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @DisplayName("throwExceptionWhenModelIsNull() should should be successful when model is valid")
+    @DisplayName("Should not throw exception when model is valid")
     @Test
     void throwExceptionWhenModelIsNullShouldBeSuccessfulWhenModelIsValid() {
         // act
@@ -111,7 +111,7 @@ void throwExceptionWhenModelIsNullShouldBeSuccessfulWhenModelIsValid() {
         verify(quarterPersistenceService, never()).getModelName();
     }
 
-    @DisplayName("throwExceptionWhenModelIsNull() should throw exception when model is null")
+    @DisplayName("Should throw exception when model is null")
     @Test
     void throwExceptionWhenModelIsNullShouldThrowExceptionWhenModelIsNull() {
         // arrange
@@ -127,7 +127,7 @@ void throwExceptionWhenModelIsNullShouldThrowExceptionWhenModelIsNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @DisplayName("throwExceptionWhenIdIsNotNull() should be successful when Id is null")
+    @DisplayName("Should be successful exception when Id is null")
     @Test
     void throwExceptionWhenIdIsNotNullShouldBeSuccessfulWhenIdIsNull() {
         Long id = null;
@@ -135,7 +135,7 @@ void throwExceptionWhenIdIsNotNullShouldBeSuccessfulWhenIdIsNull() {
         verify(quarterPersistenceService, never()).getModelName();
     }
 
-    @DisplayName("throwExceptionWhenIdIsNotNull() should throw exception when Id is not null")
+    @DisplayName("Should throw exception when Id is not null")
     @Test
     void throwExceptionWhenIdIsNotNullShouldThrowExceptionWhenIdIsNotNull() {
         // arrange
@@ -151,7 +151,7 @@ void throwExceptionWhenIdIsNotNullShouldThrowExceptionWhenIdIsNotNull() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @DisplayName("throwExceptionWhenIdHasChanged() should be successful when Ids are equal")
+    @DisplayName("Should be successful when Ids are equal")
     @Test
     void throwExceptionWhenIdHasChangedShouldBeSuccessfulWhenIdsAreEqual() {
         Long id = 1L;
@@ -160,7 +160,7 @@ void throwExceptionWhenIdHasChangedShouldBeSuccessfulWhenIdsAreEqual() {
         verify(quarterPersistenceService, never()).getModelName();
     }
 
-    @DisplayName("throwExceptionWhenIdHasChanged() should throw exception when Ids are not equal")
+    @DisplayName("Should throw exception when Ids are not equal")
     @Test
     void throwExceptionWhenIdHasChangedShouldThrowExceptionWhenIdsAreNotEqual() {
         // arrange
@@ -179,7 +179,7 @@ void throwExceptionWhenIdHasChangedShouldThrowExceptionWhenIdsAreNotEqual() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @DisplayName("validate() should be successful when constraint in model class is not violated")
+    @DisplayName("Should be successful when constraint in model class is not violated")
     @Test
     void validateShouldBeSuccessfulWhenConstraintInModelClassIsNotViolated() {
         // arrange
@@ -191,7 +191,7 @@ void validateShouldBeSuccessfulWhenConstraintInModelClassIsNotViolated() {
         verify(quarterPersistenceService, never()).getModelName();
     }
 
-    @DisplayName("validate() should throw exception when when constraint in model class is violated")
+    @DisplayName("Should throw exception when when constraint in model class is violated")
     @Test
     void validateShouldThrowExceptionWhenWhenConstraintInModelClassIsViolated() {
         // arrange
@@ -207,7 +207,7 @@ void validateShouldThrowExceptionWhenWhenConstraintInModelClassIsViolated() {
         assertOkrResponseStatusException(exception, expectedErrors);
     }
 
-    @DisplayName("validate() should throw exception when one of several constraints in model class is violated")
+    @DisplayName("Should throw exception when one of several constraints in model class is violated")
     @Test
     void validateShouldThrowExceptionWhenOneOfSeveralConstraintsInModelClassIsViolated() {
         // arrange
diff --git a/backend/src/test/java/ch/puzzle/okr/test/CheckInTestHelpers.java b/backend/src/test/java/ch/puzzle/okr/test/CheckInTestHelpers.java
index 189ba7815f..f7093a3560 100644
--- a/backend/src/test/java/ch/puzzle/okr/test/CheckInTestHelpers.java
+++ b/backend/src/test/java/ch/puzzle/okr/test/CheckInTestHelpers.java
@@ -22,8 +22,8 @@ public class CheckInTestHelpers {
     public static final String INITIATIVES_1 = "Initiatives1";
     public static final String INITIATIVES_2 = "Initiatives2";
 
-    public static final String CHECK_IN_5_URL = "/api/v2/checkIns/5";
-    public static final String CHECK_IN_BASE_URL = "/api/v2/checkIns";
+    public static final String CHECK_IN_5_URL = "/api/v2/checkins/5";
+    public static final String CHECK_IN_BASE_URL = "/api/v2/checkins";
 
     public static final String JSON_CHANGE_INFO = "changeinfo";
     public static final String JSON_INITIATIVES = "initiatives";
@@ -51,7 +51,7 @@ public class CheckInTestHelpers {
             .withConfidence(5)
             .withChangeInfo(CHANGE_INFO)
             .withInitiatives(INITIATIVES)
-            .withCreatedBy(User.Builder.builder().withId(1L).withFirstname("Frank").build())
+            .withCreatedBy(User.Builder.builder().withId(1L).withFirstName("Frank").build())
             .withKeyResult(KeyResultMetric.Builder
                     .builder()
                     .withBaseline(3.0)
@@ -64,7 +64,7 @@ public class CheckInTestHelpers {
             .builder()
             .withZone(Zone.COMMIT)
             .withId(4L)
-            .withCreatedBy(User.Builder.builder().withId(2L).withFirstname("Robert").build())
+            .withCreatedBy(User.Builder.builder().withId(2L).withFirstName("Robert").build())
             .withCreatedOn(LocalDateTime.MAX)
             .withChangeInfo(CHANGE_INFO)
             .withInitiatives(INITIATIVES)
@@ -109,7 +109,7 @@ public class CheckInTestHelpers {
               "createdOn": null,
               "modifiedOn": null,
               "value": 23.0,
-              "writeable": false
+              "isWriteable": false
             }
             """;
 
@@ -124,7 +124,7 @@ public class CheckInTestHelpers {
             "createdOn": null,
             "modifiedOn": null,
             "zone": "STRETCH",
-            "writeable": false
+            "isWriteable": false
             }
             """;
 
diff --git a/backend/src/test/java/ch/puzzle/okr/test/KeyResultTestHelpers.java b/backend/src/test/java/ch/puzzle/okr/test/KeyResultTestHelpers.java
index ce37dc45b4..710e8ec1db 100644
--- a/backend/src/test/java/ch/puzzle/okr/test/KeyResultTestHelpers.java
+++ b/backend/src/test/java/ch/puzzle/okr/test/KeyResultTestHelpers.java
@@ -33,8 +33,8 @@ public class KeyResultTestHelpers {
     public static final String STRETCH_ZONE = "Ein Wald";
     public static final String QUARTER_LABEL = "GJ 22/23-Q4";
     public static final Zone LAST_CHECK_IN_ZONE = Zone.COMMIT;
-    public static final String FIRSTNAME = "Johnny";
-    public static final String LASTNAME = "Appleseed";
+    public static final String FIRST_NAME = "Johnny";
+    public static final String LAST_NAME = "Appleseed";
     public static final String START_DATE = "-999999999-01-01";
     public static final Unit KEY_RESULT_UNIT = Unit.FTE;
     public static final String KEY_RESULT_CREATED_ON = "-999999999-01-01T00:00:00";
@@ -47,7 +47,7 @@ public class KeyResultTestHelpers {
     public static final String JSON_PATH_DESCRIPTION = "$.description";
     public static final String JSON_PATH_KEY_RESULT_TYPE = "$.keyResultType";
     public static final String JSON_PATH_STRETCH_GOAL = "$.stretchGoal";
-    public static final String JSON_PATH_OWNER_FIRSTNAME = "$.owner.firstname";
+    public static final String JSON_PATH_OWNER_FIRST_NAME = "$.owner.firstName";
     public static final String JSON_PATH_OBJECTIVE_STATE = "$.objective.state";
     public static final String JSON_PATH_ID_LAST_CHECK_IN_VALUE = "$.lastCheckIn.value";
     public static final String JSON_PATH_LAST_CHECK_IN_CONFIDENCE = "$.lastCheckIn.confidence";
@@ -80,8 +80,8 @@ public class KeyResultTestHelpers {
     public static final User user = User.Builder
             .builder()
             .withId(1L)
-            .withFirstname("Bob")
-            .withLastname("Kaufmann")
+            .withFirstName("Bob")
+            .withLastName("Kaufmann")
             .withEmail("kaufmann@puzzle.ch")
             .build();
     public static final KeyResult metricKeyResult = KeyResultMetric.Builder
@@ -130,7 +130,7 @@ public class KeyResultTestHelpers {
                                                                       12D,
                                                                       true);
 
-    public static final KeyResultUserDto keyResultUserDto = new KeyResultUserDto(1L, FIRSTNAME, LASTNAME);
+    public static final KeyResultUserDto keyResultUserDto = new KeyResultUserDto(1L, FIRST_NAME, LAST_NAME);
     public static final KeyResultQuarterDto keyResultQuarterDto = new KeyResultQuarterDto(1L,
                                                                                           QUARTER_LABEL,
                                                                                           LocalDate.MIN,
@@ -352,8 +352,8 @@ public class KeyResultTestHelpers {
               "stretchZone": "5",
               "owner": {
                 "id": 1000,
-                "firstname": "Jaya",
-                "lastname": "Norris"
+                "firstName": "Jaya",
+                "lastName": "Norris"
               },
               "objective": {
                 "id": 1000,
@@ -363,7 +363,7 @@ public class KeyResultTestHelpers {
               "lastCheckIn": null,
               "createdOn": null,
               "modifiedOn": null,
-              "writeable": false,
+              "isWriteable": false,
               "actionList": []
             }
             """;
@@ -380,8 +380,8 @@ public class KeyResultTestHelpers {
               "unit": "NUMBER",
               "owner": {
                 "id": 1000,
-                "firstname": "Jaya",
-                "lastname": "Norris"
+                "firstName": "Jaya",
+                "lastName": "Norris"
               },
               "objective": {
                 "id": 1000,
@@ -391,7 +391,7 @@ public class KeyResultTestHelpers {
               "lastCheckIn": null,
               "createdOn": null,
               "modifiedOn": null,
-              "writeable": false,
+              "isWriteable": false,
               "actionList": []
             }
             """;
diff --git a/backend/src/test/java/ch/puzzle/okr/test/TestHelper.java b/backend/src/test/java/ch/puzzle/okr/test/TestHelper.java
index fcfc6d1345..5eaf2ccb11 100644
--- a/backend/src/test/java/ch/puzzle/okr/test/TestHelper.java
+++ b/backend/src/test/java/ch/puzzle/okr/test/TestHelper.java
@@ -24,16 +24,16 @@ private TestHelper() {
 
     public static final String SCHEMA_PITC = "pitc";
 
-    private static final String FIRSTNAME = "Bob";
-    private static final String LASTNAME = "Kaufmann";
+    private static final String FIRST_NAME = "Bob";
+    private static final String LAST_NAME = "Kaufmann";
     private static final String EMAIL = "kaufmann@puzzle.ch";
 
     public static User defaultUser(Long id) {
         return User.Builder
                 .builder()
                 .withId(id)
-                .withFirstname(FIRSTNAME)
-                .withLastname(LASTNAME)
+                .withFirstName(FIRST_NAME)
+                .withLastName(LAST_NAME)
                 .withEmail(EMAIL)
                 .build();
     }
@@ -48,7 +48,7 @@ public static User defaultUserWithTeams(Long userId, List<Team> adminTeams, List
         var user = defaultUser(userId);
         var adminUserTeams = adminTeams
                 .stream()
-                .map(t -> UserTeam.Builder.builder().withTeamAdmin(true).withTeam(t).withUser(user).build());
+                .map(t -> UserTeam.Builder.builder().isTeamAdmin(true).withTeam(t).withUser(user).build());
         var memberUserTeams = memberTeams
                 .stream()
                 .map(t -> UserTeam.Builder.builder().withTeam(t).withUser(user).build());
@@ -68,37 +68,37 @@ public static UserTeam defaultUserTeam(Long id, User user) {
     }
 
     public static AuthorizationUser defaultAuthorizationUser() {
-        return mockAuthorizationUser(1L, FIRSTNAME, LASTNAME, EMAIL, false);
+        return mockAuthorizationUser(1L, FIRST_NAME, LAST_NAME, EMAIL, false);
     }
 
     public static AuthorizationUser mockAuthorizationUser(User user) {
         return mockAuthorizationUser(user
-                .getId(), user.getFirstname(), user.getLastname(), user.getEmail(), user.isOkrChampion());
+                .getId(), user.getFirstName(), user.getLastName(), user.getEmail(), user.isOkrChampion());
     }
 
-    public static AuthorizationUser mockAuthorizationUser(Long id, String firstname, String lastname, String email,
+    public static AuthorizationUser mockAuthorizationUser(Long id, String firstName, String lastName, String email,
                                                           boolean isOkrChampion) {
         User user = User.Builder
                 .builder() //
                 .withId(id) //
-                .withFirstname(firstname) //
-                .withLastname(lastname) //
+                .withFirstName(firstName) //
+                .withLastName(lastName) //
                 .withEmail(email) //
-                .withOkrChampion(isOkrChampion) //
+                .isOkrChampion(isOkrChampion) //
                 .build();
         user.setUserTeamList(List.of(defaultUserTeam(1L, user)));
         return new AuthorizationUser(user);
     }
 
     public static Jwt defaultJwtToken() {
-        return mockJwtToken(FIRSTNAME, LASTNAME, EMAIL);
+        return mockJwtToken(FIRST_NAME, LAST_NAME, EMAIL);
     }
 
     public static Jwt mockJwtToken(User user) {
-        return mockJwtToken(user.getFirstname(), user.getLastname(), user.getEmail());
+        return mockJwtToken(user.getFirstName(), user.getLastName(), user.getEmail());
     }
 
-    public static Jwt mockJwtToken(String firstname, String lastname, String email) {
+    public static Jwt mockJwtToken(String firstName, String lastName, String email) {
         String exampleToken = "MockToken";
 
         Map<String, Object> headers = new HashMap<>();
@@ -106,8 +106,8 @@ public static Jwt mockJwtToken(String firstname, String lastname, String email)
         headers.put("typ", "JWT");
 
         Map<String, Object> claims = new HashMap<>();
-        claims.put("given_name", firstname);
-        claims.put("family_name", lastname);
+        claims.put("given_name", firstName);
+        claims.put("family_name", lastName);
         claims.put("email", email);
         claims.put("exp", Instant.now().plusSeconds(3600).getEpochSecond()); // Expires in 1 hour
 
diff --git a/backend/src/test/java/ch/puzzle/okr/test/dto/builder/ObjectiveDtoBuilder.java b/backend/src/test/java/ch/puzzle/okr/test/dto/builder/ObjectiveDtoBuilder.java
index c8a2b55344..857e38bb20 100644
--- a/backend/src/test/java/ch/puzzle/okr/test/dto/builder/ObjectiveDtoBuilder.java
+++ b/backend/src/test/java/ch/puzzle/okr/test/dto/builder/ObjectiveDtoBuilder.java
@@ -74,7 +74,7 @@ public ObjectiveDtoBuilder withModifiedOn(LocalDateTime modifiedOn) {
         return this;
     }
 
-    public ObjectiveDtoBuilder withWriteable(boolean writeable) {
+    public ObjectiveDtoBuilder isWriteable(boolean writeable) {
         this.writeable = writeable;
         return this;
     }
diff --git a/backend/src/test/java/ch/puzzle/okr/util/quarter/check/QuarterRangeCheckerTest.java b/backend/src/test/java/ch/puzzle/okr/util/quarter/check/QuarterRangeCheckerTest.java
index 6b65465213..248502bfe4 100644
--- a/backend/src/test/java/ch/puzzle/okr/util/quarter/check/QuarterRangeCheckerTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/util/quarter/check/QuarterRangeCheckerTest.java
@@ -10,9 +10,9 @@
 
 public class QuarterRangeCheckerTest {
 
-    @DisplayName("nowIsInQuarter() should return false if Quarter is null")
+    @DisplayName("Should return false if Quarter is null when nowIsInQuarter() is called")
     @Test
-    void nowIsInQuarterShouldReturnFalseIfQuarterIsNull() {
+    void shouldReturnFalseIfQuarterIsNullWhenNowIsInQuarterIsCalled() {
         // arrange
         Quarter quarter = null;
         LocalDate now = LocalDate.now();
@@ -21,9 +21,9 @@ void nowIsInQuarterShouldReturnFalseIfQuarterIsNull() {
         assertFalse(QuarterRangeChecker.nowIsInQuarter(now, quarter));
     }
 
-    @DisplayName("nowIsInQuarter() should return false if now is null")
+    @DisplayName("Should return false if now is null when nowIsInQuarter() is called")
     @Test
-    void nowIsInQuarterShouldReturnFalseIfNowIsNull() {
+    void shouldReturnFalseIfNowIsNullWhenNowIsInQuarterIsCalled() {
         // arrange
         Quarter quarter = Quarter.Builder.builder().build();
         LocalDate now = null;
@@ -32,36 +32,36 @@ void nowIsInQuarterShouldReturnFalseIfNowIsNull() {
         assertFalse(QuarterRangeChecker.nowIsInQuarter(now, quarter));
     }
 
-    @DisplayName("nowIsInQuarter() should return true if now matches Quarter StartDate")
+    @DisplayName("Should return true if now matches Quarter StartDate when nowIsInQuarter() is called")
     @Test
-    void nowIsInQuarterShouldReturnTrueIfNowMatchesQuarterStartDate() {
+    void shouldReturnTrueIfNowMatchesQuarterStartDateWhenNowIsInQuarterIsCalled() {
         // arrange
         LocalDate startDate = LocalDate.of(2024, 7, 1);
         Quarter quarter = quarter(startDate, null);
 
-        LocalDate nowMatchesQuarterStartDate = LocalDate.of(2024, 7, 1);
+        LocalDate nowMatchingQuarterStartDate = LocalDate.of(2024, 7, 1);
 
         // act + assert
-        assertTrue(QuarterRangeChecker.nowIsInQuarter(nowMatchesQuarterStartDate, quarter));
+        assertTrue(QuarterRangeChecker.nowIsInQuarter(nowMatchingQuarterStartDate, quarter));
     }
 
-    @DisplayName("nowIsInQuarter() should return true if now matches Quarter EndDate")
+    @DisplayName("Should return true if now matches Quarter EndDate when nowIsInQuarter() is called")
     @Test
-    void nowIsInQuarterShouldReturnTrueIfNowMatchesQuarterEndDate() {
+    void shouldReturnTrueIfNowMatchesQuarterEndDateWhenNowIsInQuarterIsCalled() {
         // arrange
         LocalDate startDate = LocalDate.of(2024, 7, 1);
         LocalDate endDate = LocalDate.of(2024, 9, 30);
         Quarter quarter = quarter(startDate, endDate);
 
-        LocalDate nowMatchesQuarterEndDate = LocalDate.of(2024, 9, 30);
+        LocalDate nowMatchingQuarterEndDate = LocalDate.of(2024, 9, 30);
 
         // act + assert
-        assertTrue(QuarterRangeChecker.nowIsInQuarter(nowMatchesQuarterEndDate, quarter));
+        assertTrue(QuarterRangeChecker.nowIsInQuarter(nowMatchingQuarterEndDate, quarter));
     }
 
-    @DisplayName("nowIsInQuarter() should return true if now is between Quarter StartDate and EndDate")
+    @DisplayName("Should return true if now is between Quarter StartDate and EndDate when nowIsInQuarter() is called")
     @Test
-    void nowIsInQuarterShouldReturnTrueIfNowIsBetweenQuarterStartDateAndEndDate() {
+    void shouldReturnTrueIfNowIsBetweenQuarterStartDateAndEndDateWhenNowIsInQuarterIsCalled() {
         // arrange
         LocalDate startDate = LocalDate.of(2024, 7, 1);
         LocalDate endDate = LocalDate.of(2024, 9, 30);
@@ -73,9 +73,9 @@ void nowIsInQuarterShouldReturnTrueIfNowIsBetweenQuarterStartDateAndEndDate() {
         assertTrue(QuarterRangeChecker.nowIsInQuarter(nowBetweenQuarterStartEndDate, quarter));
     }
 
-    @DisplayName("nowIsInQuarter() should return false if now is before Quarter StartDate")
+    @DisplayName("Should return false if now is before Quarter StartDate when nowIsInQuarter() is called")
     @Test
-    void nowIsInQuarterShouldReturnFalseIfNowIsBeforeQuarterStartDate() {
+    void shouldReturnFalseIfNowIsBeforeQuarterStartDateWhenNowIsInQuarterIsCalled() {
         // arrange
         LocalDate startDate = LocalDate.of(2024, 7, 1);
         LocalDate endDate = LocalDate.of(2024, 9, 30);
@@ -87,9 +87,9 @@ void nowIsInQuarterShouldReturnFalseIfNowIsBeforeQuarterStartDate() {
         assertFalse(QuarterRangeChecker.nowIsInQuarter(nowBeforeQuarterStartDate, quarter));
     }
 
-    @DisplayName("nowIsInQuarter() should return false if now is after Quarter EndDate")
+    @DisplayName("Should return false if now is after Quarter EndDate when nowIsInQuarter() is called")
     @Test
-    void nowIsInQuarterShouldReturnFalseIfNowIsAfterQuarterEndDate() {
+    void shouldReturnFalseIfNowIsAfterQuarterEndDateWhenNowIsInQuarterIsCalled() {
         // arrange
         LocalDate startDate = LocalDate.of(2024, 7, 1);
         LocalDate endDate = LocalDate.of(2024, 9, 30);
diff --git a/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/QuarterLabelTest.java b/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/QuarterLabelTest.java
index 2d4b3be6f0..b5b522b355 100644
--- a/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/QuarterLabelTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/QuarterLabelTest.java
@@ -4,15 +4,13 @@
 
 import java.time.LocalDate;
 import java.util.stream.Stream;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 public class QuarterLabelTest {
 
-    @DisplayName("label() should return label with year and quarter info")
-    @ParameterizedTest
+    @ParameterizedTest(name = "label() should return label with year and quarter info")
     @MethodSource("datesAndLabels")
     void labelShouldReturnLabelWithYearAndQuarterInfo(LocalDate date, String expectedLabel) {
         QuarterLabel quarterLabel = new QuarterLabel(date);
diff --git a/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/QuartersTest.java b/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/QuartersTest.java
index cb33187b06..e8fb2cf7be 100644
--- a/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/QuartersTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/QuartersTest.java
@@ -13,8 +13,7 @@
 
 public class QuartersTest {
 
-    @DisplayName("currentQuarter() should find current quarter for now and 12 months in future")
-    @ParameterizedTest
+    @ParameterizedTest(name = "currentQuarter() should find current quarter for now and 12 months in future")
     @MethodSource("futureDatesAndLabels")
     void currentQuarterShouldFindCurrentQuarterForNowAnd12MonthsInFuture(LocalDate date, String expectedLabelFirstYear,
                                                                          String expectedLabelSecondYear) {
@@ -22,12 +21,12 @@ void currentQuarterShouldFindCurrentQuarterForNowAnd12MonthsInFuture(LocalDate d
         // arrange
         Quarters nowQuarters = new Quarters(date.getYear());
 
-        LocalDate in3Months = date.plusMonths(3);
-        Quarters in3MonthQuarters = new Quarters(in3Months.getYear());
+        LocalDate inThreeMonths = date.plusMonths(3);
+        Quarters inThreeMonthsQuarters = new Quarters(inThreeMonths.getYear());
 
         // act
         QuarterData currentQuarter = nowQuarters.currentQuarter(date);
-        QuarterData nextQuarter = in3MonthQuarters.currentQuarter(in3Months);
+        QuarterData nextQuarter = inThreeMonthsQuarters.currentQuarter(inThreeMonths);
 
         // assert
         assertEquals(expectedLabelFirstYear, currentQuarter.toString());
@@ -104,21 +103,20 @@ private static Stream<Arguments> futureDatesAndLabels() {
                                 "('GJ 25/26-Q2', '2025-10-01', '2025-12-31')"));
     }
 
-    @DisplayName("currentQuarter() should find current quarter for now and 7 months in past")
-    @ParameterizedTest
+    @ParameterizedTest(name = "currentQuarter() should find current quarter for now and seven months in past")
     @MethodSource("pastDatesAndLabels")
-    void currentQuarterShouldFindCurrentQuarterForNowAnd7MonthsInPast(LocalDate date, String expectedLabelFirstYear,
-                                                                      String expectedLabelSecondYear) {
+    void currentQuarterShouldFindCurrentQuarterForNowAndSevenMonthsInPast(LocalDate date, String expectedLabelFirstYear,
+                                                                          String expectedLabelSecondYear) {
 
         // arrange
         Quarters nowQuarters = new Quarters(date.getYear());
 
-        LocalDate in3Months = date.plusMonths(3);
-        Quarters in3MonthsQuarters = new Quarters(in3Months.getYear());
+        LocalDate inThreeMonths = date.plusMonths(3);
+        Quarters inThreeMonthsQuarters = new Quarters(inThreeMonths.getYear());
 
         // act
         QuarterData currentQuarter = nowQuarters.currentQuarter(date);
-        QuarterData nextQuarter = in3MonthsQuarters.currentQuarter(in3Months);
+        QuarterData nextQuarter = inThreeMonthsQuarters.currentQuarter(inThreeMonths);
 
         // assert
         assertEquals(expectedLabelFirstYear, currentQuarter.toString());
@@ -170,26 +168,25 @@ private static Stream<Arguments> pastDatesAndLabels() {
                                 "('GJ 24/25-Q2', '2024-10-01', '2024-12-31')"));
     }
 
-    @DisplayName("currentQuarter() should throw exception if no matching quarter is found for now")
+    @DisplayName("Should throw exception if no matching quarter is found when calling currentQuarter()")
     @Test
-    void currentQuarterShouldThrowExceptionIfNoMatchingQuarterIsFoundForNow() {
+    void shouldThrowExceptionIfNoMatchingQuarterIsFoundForNow() {
         // arrange
         LocalDate now = LocalDate.of(2024, 7, 15);
         Quarters allQuartersOfCurrentYear = new Quarters(now.getYear());
 
-        LocalDate in2Years = now.plusYears(2);
+        LocalDate inTwoYears = now.plusYears(2);
 
         // act
         RuntimeException exception = assertThrows(RuntimeException.class,
-                                                  () -> allQuartersOfCurrentYear.currentQuarter(in2Years));
+                                                  () -> allQuartersOfCurrentYear.currentQuarter(inTwoYears));
 
         // assert
         assertEquals(RuntimeException.class, exception.getClass());
         assertEquals("No current quarter found for 2026-07-15", exception.getMessage());
     }
 
-    @DisplayName("currentQuarter() should find current quarter for boundary dates")
-    @ParameterizedTest
+    @ParameterizedTest(name = "currentQuarter() should find current quarter for boundary dates")
     @MethodSource("boundaryDatesAndLabels")
     void currentQuarterShouldFindCurrentQuarterForBoundaryDates(LocalDate date, String expectedLabel) {
         // arrange
diff --git a/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/h2/QuarterFunctionTest.java b/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/h2/QuarterFunctionTest.java
index 41fa7e0cfa..e5840cae5c 100644
--- a/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/h2/QuarterFunctionTest.java
+++ b/backend/src/test/java/ch/puzzle/okr/util/quarter/generate/h2/QuarterFunctionTest.java
@@ -8,9 +8,9 @@
 
 public class QuarterFunctionTest {
 
-    @DisplayName("QuarterFunction should return correct current quarter data")
+    @DisplayName("Should return correct current quarter data")
     @Test
-    void quarterFunctionShouldReturnCorrectCurrentQuarterData() {
+    void shouldReturnCorrectCurrentQuarterData() {
         // arrange
         initQuarterData();
 
@@ -25,9 +25,9 @@ void quarterFunctionShouldReturnCorrectCurrentQuarterData() {
         assertEquals(expectedCurrent, currentQuarter);
     }
 
-    @DisplayName("QuarterFunction should return correct next quarter data")
+    @DisplayName("Should return correct next quarter data")
     @Test
-    void quarterFunctionShouldReturnCorrectNextQuarterData() {
+    void shouldReturnCorrectNextQuarterData() {
         // arrange
         initQuarterData();
 
diff --git a/frontend/cypress.config.ts b/frontend/cypress.config.ts
index 47f5248cf0..b372c1367b 100644
--- a/frontend/cypress.config.ts
+++ b/frontend/cypress.config.ts
@@ -9,6 +9,6 @@ export default defineConfig({
     viewportHeight: 1080
   },
   env: {
-    login_url: 'http://localhost:8544'
+    LOGIN_URL: 'http://localhost:8544'
   }
 });
diff --git a/frontend/cypress/e2e/check-in.cy.ts b/frontend/cypress/e2e/check-in.cy.ts
index a725b088da..d7cdd63fef 100644
--- a/frontend/cypress/e2e/check-in.cy.ts
+++ b/frontend/cypress/e2e/check-in.cy.ts
@@ -7,300 +7,298 @@ import CheckInDialog from '../support/helper/dom-helper/dialogs/checkInDialog';
 import CheckInHistoryDialog from '../support/helper/dom-helper/dialogs/checkInHistoryDialog';
 import ConfirmDialog from '../support/helper/dom-helper/dialogs/confirmDialog';
 
-describe('OKR Check-in e2e tests', () => {
-  describe('tests via click', () => {
-    let overviewPage = new CyOverviewPage();
-    let keyresultDetailPage = new KeyResultDetailPage();
+describe('okr check-in', () => {
+  let overviewPage = new CyOverviewPage();
+  let keyResultDetailPage = new KeyResultDetailPage();
 
-    beforeEach(() => {
-      overviewPage = new CyOverviewPage();
-      keyresultDetailPage = new KeyResultDetailPage();
-      cy.loginAsUser(users.gl);
-    });
+  beforeEach(() => {
+    overviewPage = new CyOverviewPage();
+    keyResultDetailPage = new KeyResultDetailPage();
+    cy.loginAsUser(users.gl);
+  });
 
-    it(`Create checkin metric`, () => {
-      overviewPage
-        .addKeyResult()
-        .fillKeyResultTitle('Very important keyresult')
-        .withMetricValues(Unit.PERCENT, '21', '51')
-        .fillKeyResultDescription('This is my description')
-        .submit();
-      keyresultDetailPage
-        .visit('Very important keyresult')
-        .createCheckIn()
-        .checkForDialogTextMetric()
-        .fillMetricCheckInValue('30')
-        .setCheckInConfidence(6)
-        .fillCheckInCommentary('We bought a new house')
-        .fillCheckInInitiatives('We have to buy more PCs')
-        .submit();
-      cy.contains('30%');
-      cy.contains('6/10');
-      cy.contains('Letztes Check-in (' + getCurrentDate() + ')');
-      cy.contains('We bought a new house');
-    });
+  it(`should create check-in metric`, () => {
+    overviewPage
+      .addKeyResult()
+      .fillKeyResultTitle('Very important keyresult')
+      .withMetricValues(Unit.PERCENT, '21', '51')
+      .fillKeyResultDescription('This is my description')
+      .submit();
+    keyResultDetailPage
+      .visit('Very important keyresult')
+      .createCheckIn()
+      .checkForDialogTextMetric()
+      .fillMetricCheckInValue('30')
+      .setCheckInConfidence(6)
+      .fillCheckInCommentary('We bought a new house')
+      .fillCheckInInitiatives('We have to buy more PCs')
+      .submit();
+    cy.contains('30%');
+    cy.contains('6/10');
+    cy.contains('Letztes Check-in (' + getCurrentDate() + ')');
+    cy.contains('We bought a new house');
+  });
 
-    it(`Create checkin metric with confidence 0`, () => {
-      overviewPage
-        .addKeyResult()
-        .fillKeyResultTitle('Very important keyresult')
-        .withMetricValues(Unit.PERCENT, '21', '51')
-        .fillKeyResultDescription('This is my description')
-        .submit();
-      keyresultDetailPage
-        .visit('Very important keyresult')
-        .createCheckIn()
-        .fillMetricCheckInValue('30')
-        .setCheckInConfidence(0)
-        .fillCheckInCommentary('We bought a new house')
-        .fillCheckInInitiatives('We have to buy more PCs')
-        .submit();
+  it(`should create check-in metric with confidence 0`, () => {
+    overviewPage
+      .addKeyResult()
+      .fillKeyResultTitle('Very important keyresult')
+      .withMetricValues(Unit.PERCENT, '21', '51')
+      .fillKeyResultDescription('This is my description')
+      .submit();
+    keyResultDetailPage
+      .visit('Very important keyresult')
+      .createCheckIn()
+      .fillMetricCheckInValue('30')
+      .setCheckInConfidence(0)
+      .fillCheckInCommentary('We bought a new house')
+      .fillCheckInInitiatives('We have to buy more PCs')
+      .submit();
 
-      cy.contains('30%');
-      cy.contains('6/10');
-      cy.contains('Letztes Check-in (' + getCurrentDate() + ')');
-      cy.contains('We bought a new house');
-    });
+    cy.contains('30%');
+    cy.contains('6/10');
+    cy.contains('Letztes Check-in (' + getCurrentDate() + ')');
+    cy.contains('We bought a new house');
+  });
 
-    it(`Create checkin metric with value below baseline`, () => {
-      overviewPage
-        .addKeyResult()
-        .fillKeyResultTitle('This will not be good')
-        .withMetricValues(Unit.PERCENT, '21', '52')
-        .fillKeyResultDescription('This is my description')
-        .submit();
-      keyresultDetailPage
-        .visit('This will not be good')
-        .createCheckIn()
-        .fillMetricCheckInValue('5')
-        .setCheckInConfidence(5)
-        .submit();
+  it(`should create check-in metric with value below baseline`, () => {
+    overviewPage
+      .addKeyResult()
+      .fillKeyResultTitle('This will not be good')
+      .withMetricValues(Unit.PERCENT, '21', '52')
+      .fillKeyResultDescription('This is my description')
+      .submit();
+    keyResultDetailPage
+      .visit('This will not be good')
+      .createCheckIn()
+      .fillMetricCheckInValue('5')
+      .setCheckInConfidence(5)
+      .submit();
 
-      cy.contains('5%');
-      cy.contains('!');
-      cy.contains('5/10');
-      cy.contains('Letztes Check-in (' + getCurrentDate() + ')');
-    });
+    cy.contains('5%');
+    cy.contains('!');
+    cy.contains('5/10');
+    cy.contains('Letztes Check-in (' + getCurrentDate() + ')');
+  });
 
-    it('Create checkin ordinal', () => {
-      overviewPage
-        .addKeyResult()
-        .fillKeyResultTitle('A new ordinal keyresult for our company')
-        .withOrdinalValues('New house', 'New car', 'New pool')
-        .fillKeyResultDescription('This is my description')
-        .submit();
-      keyresultDetailPage
-        .visit('A new ordinal keyresult for our company')
-        .createCheckIn()
-        .checkForDialogTextOrdinal()
-        .selectOrdinalCheckInZone('commit')
-        .setCheckInConfidence(6)
-        .fillCheckInCommentary('There is a new car')
-        .fillCheckInInitiatives('Buy a new pool')
-        .submit();
+  it('should create check-in ordinal', () => {
+    overviewPage
+      .addKeyResult()
+      .fillKeyResultTitle('A new ordinal keyresult for our company')
+      .withOrdinalValues('New house', 'New car', 'New pool')
+      .fillKeyResultDescription('This is my description')
+      .submit();
+    keyResultDetailPage
+      .visit('A new ordinal keyresult for our company')
+      .createCheckIn()
+      .checkForDialogTextOrdinal()
+      .selectOrdinalCheckInZone('commit')
+      .setCheckInConfidence(6)
+      .fillCheckInCommentary('There is a new car')
+      .fillCheckInInitiatives('Buy a new pool')
+      .submit();
 
-      cy.contains('6/10');
-      cy.contains('There is a new car');
-      cy.contains('Letztes Check-in (' + getCurrentDate() + ')');
-    });
+    cy.contains('6/10');
+    cy.contains('There is a new car');
+    cy.contains('Letztes Check-in (' + getCurrentDate() + ')');
+  });
 
-    it('Should generate checkin list', () => {
-      overviewPage
-        .addKeyResult()
-        .fillKeyResultTitle('This will give a checkin list')
-        .withMetricValues(Unit.PERCENT, '21', '52')
-        .fillKeyResultDescription('This is my description')
-        .submit();
-      keyresultDetailPage
-        .visit('This will give a checkin list')
-        .createCheckIn()
-        .fillMetricCheckInValue('30')
-        .setCheckInConfidence(5)
-        .fillCheckInCommentary('We bought a new house')
-        .fillCheckInInitiatives('We have to buy more PCs')
-        .submit();
-      keyresultDetailPage
-        .createCheckIn()
-        .fillMetricCheckInValue('50')
-        .setCheckInConfidence(6)
-        .fillCheckInCommentary('This was a good idea')
-        .fillCheckInInitiatives('Will be difficult')
-        .submit();
-      keyresultDetailPage
-        .showAllCheckins()
-        .checkForAttribute('Confidence:', '5 / 10')
-        .checkForAttribute('Confidence:', '6 / 10')
-        .checkForAttribute('Veränderungen:', 'We bought a new house')
-        .checkForAttribute('Veränderungen:', 'This was a good idea')
-        .checkForAttribute('Massnahmen:', 'We have to buy more PCs')
-        .checkForAttribute('Massnahmen:', 'Will be difficult');
+  it('should generate check-in list', () => {
+    overviewPage
+      .addKeyResult()
+      .fillKeyResultTitle('This will give a checkin list')
+      .withMetricValues(Unit.PERCENT, '21', '52')
+      .fillKeyResultDescription('This is my description')
+      .submit();
+    keyResultDetailPage
+      .visit('This will give a checkin list')
+      .createCheckIn()
+      .fillMetricCheckInValue('30')
+      .setCheckInConfidence(5)
+      .fillCheckInCommentary('We bought a new house')
+      .fillCheckInInitiatives('We have to buy more PCs')
+      .submit();
+    keyResultDetailPage
+      .createCheckIn()
+      .fillMetricCheckInValue('50')
+      .setCheckInConfidence(6)
+      .fillCheckInCommentary('This was a good idea')
+      .fillCheckInInitiatives('Will be difficult')
+      .submit();
+    keyResultDetailPage
+      .showAllCheckins()
+      .checkForAttribute('Confidence:', '5 / 10')
+      .checkForAttribute('Confidence:', '6 / 10')
+      .checkForAttribute('Veränderungen:', 'We bought a new house')
+      .checkForAttribute('Veränderungen:', 'This was a good idea')
+      .checkForAttribute('Massnahmen:', 'We have to buy more PCs')
+      .checkForAttribute('Massnahmen:', 'Will be difficult');
 
-      cy.contains('Check-in History');
-      cy.contains(getCurrentDate());
-      cy.contains('Wert: 30%');
-      cy.contains('Wert: 50%');
-    });
+    cy.contains('Check-in History');
+    cy.contains(getCurrentDate());
+    cy.contains('Wert: 30%');
+    cy.contains('Wert: 50%');
+  });
 
-    it('Edit metric checkin', () => {
-      overviewPage
-        .addKeyResult()
-        .fillKeyResultTitle('Here we edit a metric checkin')
-        .withMetricValues(Unit.CHF, '10', '300')
-        .fillKeyResultDescription('This is my description')
-        .submit();
-      keyresultDetailPage
-        .visit('Here we edit a metric checkin')
-        .createCheckIn()
-        .fillMetricCheckInValue('30')
-        .setCheckInConfidence(5)
-        .fillCheckInCommentary('Here we are')
-        .fillCheckInInitiatives('A cat would be great')
-        .submit();
-      cy.contains('Aktuell: 30 CHF');
-      keyresultDetailPage.showAllCheckins();
-      cy.contains('Check-in History');
-      cy.contains('Wert: 30 CHF');
-      CheckInHistoryDialog.do()
-        .editLatestCheckIn();
-      cy.contains('Here we edit a metric checkin');
-      cy.contains('30 CHF');
-      cy.contains('Confidence um Target Zone (213 CHF) zu erreichen');
-      cy.contains('5/10');
-      cy.contains('Here we are');
-      cy.contains('A cat would be great');
-      CheckInDialog.do()
-        .fillMetricCheckInValue('200')
-        .fillCheckInCommentary('We bought a new sheep')
-        .submit();
-      cy.contains('200 CHF');
-      cy.contains('We bought a new sheep');
-    });
+  it('should edit metric check-in', () => {
+    overviewPage
+      .addKeyResult()
+      .fillKeyResultTitle('Here we edit a metric checkin')
+      .withMetricValues(Unit.CHF, '10', '300')
+      .fillKeyResultDescription('This is my description')
+      .submit();
+    keyResultDetailPage
+      .visit('Here we edit a metric checkin')
+      .createCheckIn()
+      .fillMetricCheckInValue('30')
+      .setCheckInConfidence(5)
+      .fillCheckInCommentary('Here we are')
+      .fillCheckInInitiatives('A cat would be great')
+      .submit();
+    cy.contains('Aktuell: 30 CHF');
+    keyResultDetailPage.showAllCheckins();
+    cy.contains('Check-in History');
+    cy.contains('Wert: 30 CHF');
+    CheckInHistoryDialog.do()
+      .editLatestCheckIn();
+    cy.contains('Here we edit a metric checkin');
+    cy.contains('30 CHF');
+    cy.contains('Confidence um Target Zone (213 CHF) zu erreichen');
+    cy.contains('5/10');
+    cy.contains('Here we are');
+    cy.contains('A cat would be great');
+    CheckInDialog.do()
+      .fillMetricCheckInValue('200')
+      .fillCheckInCommentary('We bought a new sheep')
+      .submit();
+    cy.contains('200 CHF');
+    cy.contains('We bought a new sheep');
+  });
 
-    it('Should generate right labels in checkin history list', () => {
-      overviewPage
-        .addKeyResult()
-        .fillKeyResultTitle('A new KeyResult for checking checkin list')
-        .withMetricValues(Unit.EUR, '10', '300')
-        .fillKeyResultDescription('This is my description')
-        .submit();
-      keyresultDetailPage
-        .visit('A new KeyResult for checking checkin list')
-        .createCheckIn()
-        .fillMetricCheckInValue('30')
-        .setCheckInConfidence(5)
-        .fillCheckInCommentary('Here we are')
-        .fillCheckInInitiatives('A cat would be great')
-        .submit();
-      cy.contains('Aktuell: 30 EUR');
-      keyresultDetailPage.showAllCheckins();
-      cy.contains('Check-in History');
-      cy.contains('Wert: 30 EUR');
-      CheckInHistoryDialog.do()
-        .close();
-      keyresultDetailPage.close();
+  it('should generate correct labels in check-in history list', () => {
+    overviewPage
+      .addKeyResult()
+      .fillKeyResultTitle('A new KeyResult for checking checkin list')
+      .withMetricValues(Unit.EUR, '10', '300')
+      .fillKeyResultDescription('This is my description')
+      .submit();
+    keyResultDetailPage
+      .visit('A new KeyResult for checking checkin list')
+      .createCheckIn()
+      .fillMetricCheckInValue('30')
+      .setCheckInConfidence(5)
+      .fillCheckInCommentary('Here we are')
+      .fillCheckInInitiatives('A cat would be great')
+      .submit();
+    cy.contains('Aktuell: 30 EUR');
+    keyResultDetailPage.showAllCheckins();
+    cy.contains('Check-in History');
+    cy.contains('Wert: 30 EUR');
+    CheckInHistoryDialog.do()
+      .close();
+    keyResultDetailPage.close();
 
-      overviewPage
-        .addKeyResult()
-        .fillKeyResultTitle('There is another kr with fte')
-        .withMetricValues(Unit.FTE, '10', '300')
-        .fillKeyResultDescription('This is my description')
-        .submit();
-      keyresultDetailPage
-        .visit('There is another kr with fte')
-        .createCheckIn()
-        .fillMetricCheckInValue('30')
-        .setCheckInConfidence(5)
-        .fillCheckInCommentary('Here we are')
-        .fillCheckInInitiatives('A cat would be great')
-        .submit();
-      cy.contains('Aktuell: 30 FTE');
-      keyresultDetailPage.showAllCheckins();
-      cy.contains('Check-in History');
-      cy.contains('Wert: 30 FTE');
-    });
+    overviewPage
+      .addKeyResult()
+      .fillKeyResultTitle('There is another kr with fte')
+      .withMetricValues(Unit.FTE, '10', '300')
+      .fillKeyResultDescription('This is my description')
+      .submit();
+    keyResultDetailPage
+      .visit('There is another kr with fte')
+      .createCheckIn()
+      .fillMetricCheckInValue('30')
+      .setCheckInConfidence(5)
+      .fillCheckInCommentary('Here we are')
+      .fillCheckInInitiatives('A cat would be great')
+      .submit();
+    cy.contains('Aktuell: 30 FTE');
+    keyResultDetailPage.showAllCheckins();
+    cy.contains('Check-in History');
+    cy.contains('Wert: 30 FTE');
+  });
 
-    it('Edit ordinal checkin', () => {
-      overviewPage
-        .addKeyResult()
-        .fillKeyResultTitle('For editing ordinal checkin')
-        .withOrdinalValues('New house', 'New car', 'New pool')
-        .fillKeyResultDescription('This is my description')
-        .submit();
-      keyresultDetailPage
-        .visit('For editing ordinal checkin')
-        .createCheckIn()
-        .selectOrdinalCheckInZone('fail')
-        .setCheckInConfidence(6)
-        .fillCheckInCommentary('There is a new car')
-        .fillCheckInInitiatives('Buy now a new pool')
-        .submit();
-      keyresultDetailPage.showAllCheckins()
-        .editLatestCheckIn();
-      cy.contains('For editing ordinal checkin');
-      cy.contains('Confidence um Target Zone zu erreichen');
-      cy.contains('6/10');
-      cy.contains('There is a new car');
-      cy.contains('Buy now a new pool');
-      CheckInDialog.do()
-        .selectOrdinalCheckInZone('stretch')
-        .fillCheckInCommentary('We bought a new dog')
-        .submit();
-      cy.contains('We bought a new dog');
-      cy.contains('Buy now a new pool');
-      cy.contains('STRETCH');
-    });
+  it('should edit ordinal check-in', () => {
+    overviewPage
+      .addKeyResult()
+      .fillKeyResultTitle('For editing ordinal checkin')
+      .withOrdinalValues('New house', 'New car', 'New pool')
+      .fillKeyResultDescription('This is my description')
+      .submit();
+    keyResultDetailPage
+      .visit('For editing ordinal checkin')
+      .createCheckIn()
+      .selectOrdinalCheckInZone('fail')
+      .setCheckInConfidence(6)
+      .fillCheckInCommentary('There is a new car')
+      .fillCheckInInitiatives('Buy now a new pool')
+      .submit();
+    keyResultDetailPage.showAllCheckins()
+      .editLatestCheckIn();
+    cy.contains('For editing ordinal checkin');
+    cy.contains('Confidence um Target Zone zu erreichen');
+    cy.contains('6/10');
+    cy.contains('There is a new car');
+    cy.contains('Buy now a new pool');
+    CheckInDialog.do()
+      .selectOrdinalCheckInZone('stretch')
+      .fillCheckInCommentary('We bought a new dog')
+      .submit();
+    cy.contains('We bought a new dog');
+    cy.contains('Buy now a new pool');
+    cy.contains('STRETCH');
+  });
 
-    it(`Should display confirm dialog when creating checkin on draft objective`, () => {
-      overviewPage.addObjective()
-        .fillObjectiveTitle('draft objective title')
-        .selectQuarter('3')
-        .submitDraftObjective();
-      overviewPage.visitNextQuarter();
-      overviewPage
-        .addKeyResult(undefined, 'draft objective title')
-        .fillKeyResultTitle('I am a metric keyresult for testing')
-        .withMetricValues(Unit.PERCENT, '21', '52')
-        .fillKeyResultDescription('This is my description')
-        .submit();
-      keyresultDetailPage.visit('I am a metric keyresult for testing');
-      keyresultDetailPage.elements.addCheckin()
-        .click();
-      ConfirmDialog.do()
-        .checkTitle('Check-in im Draft-Status');
-      ConfirmDialog.do()
-        .checkDescription('Dein Objective befindet sich noch im DRAFT Status. Möchtest du das Check-in trotzdem erfassen?');
-    });
+  it(`should display confirm dialog when creating check-in on draft objective`, () => {
+    overviewPage.addObjective()
+      .fillObjectiveTitle('draft objective title')
+      .selectQuarter('3')
+      .submitDraftObjective();
+    overviewPage.visitNextQuarter();
+    overviewPage
+      .addKeyResult(undefined, 'draft objective title')
+      .fillKeyResultTitle('I am a metric keyresult for testing')
+      .withMetricValues(Unit.PERCENT, '21', '52')
+      .fillKeyResultDescription('This is my description')
+      .submit();
+    keyResultDetailPage.visit('I am a metric keyresult for testing');
+    keyResultDetailPage.elements.addCheckin()
+      .click();
+    ConfirmDialog.do()
+      .checkTitle('Check-in im Draft-Status');
+    ConfirmDialog.do()
+      .checkDescription('Dein Objective befindet sich noch im DRAFT Status. Möchtest du das Check-in trotzdem erfassen?');
+  });
 
-    it(`Should only display last value div if last checkin is present`, () => {
-      const objectiveName = uniqueSuffix('new objective');
+  it(`should only display last value div if last check-in is present`, () => {
+    const objectiveName = uniqueSuffix('new objective');
 
-      overviewPage.addObjective()
-        .fillObjectiveTitle(objectiveName)
-        .selectQuarter('3')
-        .submit();
-      overviewPage.visitNextQuarter();
-      overviewPage
-        .addKeyResult(undefined, objectiveName)
-        .fillKeyResultTitle('I am a keyresult metric')
-        .withMetricValues(Unit.PERCENT, '45', '60')
-        .fillKeyResultDescription('Description')
-        .submit();
-      keyresultDetailPage.visit('I am a keyresult metric')
-        .createCheckIn();
-      cy.getByTestId('old-checkin-value')
-        .should('not.exist');
-      CheckInDialog.do()
-        .fillMetricCheckInValue('10')
-        .setCheckInConfidence(0)
-        .fillCheckInCommentary('changeinfo')
-        .fillCheckInInitiatives('initiatives')
-        .submit();
-      cy.contains(`Letztes Check-in (${getCurrentDate()})`);
-      keyresultDetailPage.createCheckIn();
-      cy.contains('Letzter Wert')
-        .siblings('div')
-        .contains('10%');
-    });
+    overviewPage.addObjective()
+      .fillObjectiveTitle(objectiveName)
+      .selectQuarter('3')
+      .submit();
+    overviewPage.visitNextQuarter();
+    overviewPage
+      .addKeyResult(undefined, objectiveName)
+      .fillKeyResultTitle('I am a keyresult metric')
+      .withMetricValues(Unit.PERCENT, '45', '60')
+      .fillKeyResultDescription('Description')
+      .submit();
+    keyResultDetailPage.visit('I am a keyresult metric')
+      .createCheckIn();
+    cy.getByTestId('old-checkin-value')
+      .should('not.exist');
+    CheckInDialog.do()
+      .fillMetricCheckInValue('10')
+      .setCheckInConfidence(0)
+      .fillCheckInCommentary('changeinfo')
+      .fillCheckInInitiatives('initiatives')
+      .submit();
+    cy.contains(`Letztes Check-in (${getCurrentDate()})`);
+    keyResultDetailPage.createCheckIn();
+    cy.contains('Letzter Wert')
+      .siblings('div')
+      .contains('10%');
   });
 });
 
diff --git a/frontend/cypress/e2e/duplicate-objective.cy.ts b/frontend/cypress/e2e/duplicate-objective.cy.ts
index 896c841339..186781b45a 100644
--- a/frontend/cypress/e2e/duplicate-objective.cy.ts
+++ b/frontend/cypress/e2e/duplicate-objective.cy.ts
@@ -10,12 +10,12 @@ beforeEach(() => {
   cy.loginAsUser(users.gl);
 });
 
-describe('Functionality of duplicating objectives and their belonging keyResults', () => {
+describe('functionality of duplicating objectives and their belonging key-results', () => {
   const firstKeyResultName = 'New structure that rewards funny guys and innovation before the end of Q1.';
   const secondKeyResultName = 'Monthly town halls between our people and leadership teams over the next four months.';
   const thirdKeyResultName = 'High employee satisfaction scores (80%+) throughout the year.';
 
-  it('Should be able to duplicate a objective into this quarter, including all keyResults', () => {
+  it('should be able to duplicate a objective into this quarter, including all keyResults', () => {
     const duplicatedTitle = 'This is a duplicated objective with all keyResults';
 
     overviewPage
@@ -32,7 +32,7 @@ describe('Functionality of duplicating objectives and their belonging keyResults
       .should('exist');
   });
 
-  it('Should be able to duplicate a objective into this quarter, only including one keyResult', () => {
+  it('should be able to duplicate a objective into this quarter, only including one key-result', () => {
     const duplicatedTitle = 'This is a duplicated objective with one keyResult';
 
     overviewPage
@@ -50,8 +50,8 @@ describe('Functionality of duplicating objectives and their belonging keyResults
       .should('not.contain', thirdKeyResultName);
   });
 
-  it('Should not show option to select keyResults when objective with no keyResults is being duplicated', () => {
-    const duplicatedTitle = 'This is a duplicated objective without any keyResults';
+  it('should not show option to select key-results when objective with no key-results is being duplicated', () => {
+    const duplicatedTitle = 'This is a duplicated objective without any key-results';
 
     overviewPage.duplicateObjective('should not appear on staging, no sea takimata sanctus est Lorem ipsum dolor sit amet.');
     cy.contains('Key Results:')
@@ -64,8 +64,8 @@ describe('Functionality of duplicating objectives and their belonging keyResults
       .should('exist');
   });
 
-  it('Should be able to duplicate a objective into the next quarter, including all keyResults', () => {
-    const duplicatedTitle = 'This is a default objective with all keyResults in quarter 3!';
+  it('should be able to duplicate a objective into the next quarter, including all key-results', () => {
+    const duplicatedTitle = 'This is a default objective with all key-results in quarter 3!';
 
     overviewPage
       .duplicateObjective('Build a company culture that kills the competition.')
@@ -84,7 +84,7 @@ describe('Functionality of duplicating objectives and their belonging keyResults
       .should('exist');
   });
 
-  it('Should not duplicate objective when cancel button is clicked', () => {
+  it('should not duplicate objective when cancel button is clicked', () => {
     const duplicatedTitle = 'This is a never existing objective';
 
     overviewPage
@@ -98,10 +98,10 @@ describe('Functionality of duplicating objectives and their belonging keyResults
   });
 });
 
-describe('Verify functionality of scoring adjustment on duplicated objectives', () => {
-  const keyresultDetailPage = new KeyResultDetailPage();
+describe('verify functionality of scoring adjustment on duplicated objectives', () => {
+  const keyResultDetailPage = new KeyResultDetailPage();
 
-  it('Duplicate ordinal checkin and validate value of scoring component', () => {
+  it('should not duplicate check-ins with objective', () => {
     overviewPage
       .addKeyResult('Puzzle ITC', 'Wir wollen die Kundenzufriedenheit steigern')
       .fillKeyResultTitle('stretch keyresult for testing')
@@ -109,7 +109,7 @@ describe('Verify functionality of scoring adjustment on duplicated objectives',
       .submit();
 
     cy.contains('stretch keyresult for testing');
-    keyresultDetailPage
+    keyResultDetailPage
       .visit('stretch keyresult for testing')
       .createCheckIn()
       .selectOrdinalCheckInZone('stretch')
@@ -120,7 +120,7 @@ describe('Verify functionality of scoring adjustment on duplicated objectives',
 
     cy.intercept('GET', '**/overview?*')
       .as('indexPage');
-    keyresultDetailPage.close();
+    keyResultDetailPage.close();
     cy.wait('@indexPage');
 
     overviewPage
diff --git a/frontend/cypress/e2e/key-result.cy.ts b/frontend/cypress/e2e/key-result.cy.ts
index 45d45af130..f8d8902d4d 100644
--- a/frontend/cypress/e2e/key-result.cy.ts
+++ b/frontend/cypress/e2e/key-result.cy.ts
@@ -4,7 +4,7 @@ import KeyResultDetailPage from '../support/helper/dom-helper/pages/keyResultDet
 import { Unit } from '../../src/app/shared/types/enums/Unit';
 import KeyResultDialog from '../support/helper/dom-helper/dialogs/keyResultDialog';
 
-describe('OKR Overview', () => {
+describe('okr key-result', () => {
   let overviewPage = new CyOverviewPage();
   let keyResultDetailPage = new KeyResultDetailPage();
 
@@ -14,7 +14,7 @@ describe('OKR Overview', () => {
     cy.loginAsUser(users.gl);
   });
 
-  it('Create new metric KeyResult', () => {
+  it('should create new metric key-result', () => {
     overviewPage
       .addKeyResult()
       .checkForDialogTextMetric()
@@ -38,7 +38,7 @@ describe('OKR Overview', () => {
     cy.contains('Key Result bearbeiten');
   });
 
-  it('Create new ordinal KeyResult', () => {
+  it('should create new ordinal key-result', () => {
     overviewPage
       .addKeyResult()
       .fillKeyResultTitle('I am a ordinal keyresult')
@@ -66,7 +66,7 @@ describe('OKR Overview', () => {
     cy.contains('Key Result bearbeiten');
   });
 
-  it('Create new KeyResult and Save and New', () => {
+  it('should create new key-result and save and new', () => {
     overviewPage
       .addKeyResult()
       .checkForDialogTextMetric()
@@ -80,7 +80,7 @@ describe('OKR Overview', () => {
       .checkForDialogTextMetric();
   });
 
-  it('Create and edit KeyResult with Action Plan', () => {
+  it('should create and edit key-result with action plan', () => {
     overviewPage
       .addKeyResult()
       .fillKeyResultTitle('This is a keyresult with an action plan')
@@ -104,11 +104,11 @@ describe('OKR Overview', () => {
     cy.contains('A new company');
 
     keyResultDetailPage.editKeyResult();
-    cy.getByTestId('actionInput')
+    cy.getByTestId('action-input')
       .should('have.length', 3);
   });
 
-  it('Edit a KeyResult without type change', () => {
+  it('should edit a key-result without type change', () => {
     overviewPage
       .addKeyResult()
       .fillKeyResultTitle('We want not to change keyresult title')
@@ -122,17 +122,17 @@ describe('OKR Overview', () => {
     cy.getByTestId('submit')
       .should('not.be.disabled');
     cy.contains('Key Result bearbeiten');
-    cy.getByTestId('titleInput')
+    cy.getByTestId('title-input')
       .should('have.value', 'We want not to change keyresult title');
-    cy.getByTestId('commitZone')
+    cy.getByTestId('commit-zone')
       .should('have.value', 'My commit zone');
-    cy.getByTestId('targetZone')
+    cy.getByTestId('target-zone')
       .should('have.value', 'My target zone');
-    cy.getByTestId('stretchZone')
+    cy.getByTestId('stretch-zone')
       .should('have.value', 'My stretch goal');
-    cy.getByTestId('ownerInput')
+    cy.getByTestId('owner-input')
       .should('have.value', 'Jaya Norris');
-    cy.getByTestId('descriptionInput')
+    cy.getByTestId('description-input')
       .should('have.value', 'This is my description');
 
     KeyResultDialog.do()
@@ -149,7 +149,7 @@ describe('OKR Overview', () => {
     cy.contains('This is my new description');
   });
 
-  it('Edit a KeyResult with type change', () => {
+  it('should edit a key-result with type change', () => {
     overviewPage
       .addKeyResult()
       .fillKeyResultTitle('Here we want to change keyresult title')
@@ -165,17 +165,17 @@ describe('OKR Overview', () => {
     cy.getByTestId('submit')
       .should('not.be.disabled');
     cy.contains('Key Result bearbeiten');
-    cy.getByTestId('titleInput')
+    cy.getByTestId('title-input')
       .should('have.value', 'Here we want to change keyresult title');
-    cy.getByTestId('commitZone')
+    cy.getByTestId('commit-zone')
       .should('have.value', 'My commit zone');
-    cy.getByTestId('targetZone')
+    cy.getByTestId('target-zone')
       .should('have.value', 'My target zone');
-    cy.getByTestId('stretchZone')
+    cy.getByTestId('stretch-zone')
       .should('have.value', 'My stretch goal');
-    cy.getByTestId('ownerInput')
+    cy.getByTestId('owner-input')
       .should('have.value', 'Jaya Norris');
-    cy.getByTestId('descriptionInput')
+    cy.getByTestId('description-input')
       .should('have.value', 'This is my description');
 
     KeyResultDialog.do()
@@ -217,11 +217,11 @@ describe('OKR Overview', () => {
     keyResultDetailPage.visit('Here we want to create a checkin')
       .editKeyResult();
 
-    cy.getByTestId('metricTab')
+    cy.getByTestId('metric-tab')
       .should('have.class', 'non-active');
   });
 
-  it('Check validation in keyresult dialog', () => {
+  it('should check validation in key-result dialog', () => {
     overviewPage.addKeyResult()
       .checkForDialogTextMetric();
     cy.getByTestId('submit')
@@ -234,7 +234,7 @@ describe('OKR Overview', () => {
     cy.getByTestId('submit')
       .should('not.be.disabled');
 
-    cy.getByTestId('titleInput')
+    cy.getByTestId('title-input')
       .clear();
     cy.getByTestId('submit')
       .should('be.disabled');
@@ -260,7 +260,7 @@ describe('OKR Overview', () => {
       .withMetricValues(Unit.PERCENT, '45', '52');
     cy.getByTestId('submit')
       .should('not.be.disabled');
-    cy.getByTestId('stretchGoal')
+    cy.getByTestId('stretch-goal')
       .clear();
     cy.getByTestId('submit')
       .should('be.disabled');
@@ -276,14 +276,14 @@ describe('OKR Overview', () => {
       .withMetricValues(Unit.PERCENT, '45', '83');
     cy.getByTestId('submit')
       .should('not.be.disabled');
-    cy.getByTestId('ownerInput')
+    cy.getByTestId('owner-input')
       .clear();
     cy.getByTestId('submit')
       .should('be.disabled');
 
-    cy.getByTestId('ownerInput')
+    cy.getByTestId('owner-input')
       .type('abc');
-    cy.getByTestId('titleInput')
+    cy.getByTestId('title-input')
       .type('Hello');
     cy.getByTestId('submit')
       .should('be.disabled');
@@ -294,7 +294,7 @@ describe('OKR Overview', () => {
     cy.getByTestId('submit')
       .should('not.be.disabled');
 
-    cy.getByTestId('ordinalTab')
+    cy.getByTestId('ordinal-tab')
       .click();
     cy.getByTestId('submit')
       .should('be.disabled');
@@ -304,7 +304,7 @@ describe('OKR Overview', () => {
     cy.getByTestId('submit')
       .should('not.be.disabled');
 
-    cy.getByTestId('commitZone')
+    cy.getByTestId('commit-zone')
       .clear();
     cy.getByTestId('submit')
       .should('be.disabled');
@@ -314,7 +314,7 @@ describe('OKR Overview', () => {
       .withOrdinalValues('Commit', 'Target', 'Stretch');
     cy.getByTestId('submit')
       .should('not.be.disabled');
-    cy.getByTestId('targetZone')
+    cy.getByTestId('target-zone')
       .clear();
     cy.getByTestId('submit')
       .should('be.disabled');
@@ -324,7 +324,7 @@ describe('OKR Overview', () => {
       .withOrdinalValues('Commit', 'Target', 'Stretch');
     cy.getByTestId('submit')
       .should('not.be.disabled');
-    cy.getByTestId('stretchZone')
+    cy.getByTestId('stretch-zone')
       .clear();
     cy.getByTestId('submit')
       .should('be.disabled');
@@ -336,7 +336,7 @@ describe('OKR Overview', () => {
       .should('not.be.disabled');
   });
 
-  it('Delete existing keyresult', () => {
+  it('should delete existing key-result', () => {
     overviewPage
       .addKeyResult()
       .fillKeyResultTitle('A keyresult to delete')
diff --git a/frontend/cypress/e2e/login.cy.ts b/frontend/cypress/e2e/login.cy.ts
index 2ab584f05c..bdff63f5b1 100644
--- a/frontend/cypress/e2e/login.cy.ts
+++ b/frontend/cypress/e2e/login.cy.ts
@@ -1,40 +1,40 @@
 import * as users from '../fixtures/users.json';
 
-describe('OKR Login', () => {
+describe('okr login', () => {
   beforeEach(() => {
     cy.loginAsUser(users.gl);
   });
 
-  it('Login and check correct name is displayed', () => {
+  it('should display correct username after login', () => {
     cy.title()
       .should('equal', 'Puzzle OKR');
-    cy.getByTestId('user-name')
+    cy.getByTestId('username')
       .contains(users.gl.name);
   });
 
-  it('Login  and logout', () => {
+  it('should login and logout', () => {
     cy.title()
       .should('equal', 'Puzzle OKR');
     cy.getByTestId('user-options')
       .click();
     cy.getByTestId('logout')
       .click();
-    cy.origin(Cypress.env('login_url'), () => {
+    cy.origin(Cypress.env('LOGIN_URL'), () => {
       cy.url()
-        .should('include', Cypress.env('login_url'));
+        .should('include', Cypress.env('LOGIN_URL'));
       cy.get('#kc-page-title')
         .contains('Sign in to your account');
     });
   });
 
-  it('Click on the Hilfe button should open a new tab with the correct URL', () => {
+  it('should open correct help page when clicking help button', () => {
     cy.window()
       .then((win) => {
         cy.stub(win, 'open')
           .as('openWindow');
       });
 
-    cy.get('#hilfeButton')
+    cy.get('#help-button')
       .click();
     cy.get('@openWindow')
       .should('be.calledWith', 'https://wiki.puzzle.ch/Puzzle/OKRs');
diff --git a/frontend/cypress/e2e/objective-backlog.cy.ts b/frontend/cypress/e2e/objective-backlog.cy.ts
index f14d53ba52..d3df96c62e 100644
--- a/frontend/cypress/e2e/objective-backlog.cy.ts
+++ b/frontend/cypress/e2e/objective-backlog.cy.ts
@@ -2,7 +2,7 @@ import * as users from '../fixtures/users.json';
 import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage';
 import ObjectiveDialog from '../support/helper/dom-helper/dialogs/objectiveDialog';
 
-describe('OKR Objective Backlog e2e tests', () => {
+describe('okr objective backlog', () => {
   let overviewPage = new CyOverviewPage();
 
   beforeEach(() => {
@@ -10,7 +10,7 @@ describe('OKR Objective Backlog e2e tests', () => {
     cy.loginAsUser(users.gl);
   });
 
-  it(`Create Objective in backlog quarter should not have save button`, () => {
+  it(`should not have save button when creating objective in backlog quarter`, () => {
     overviewPage
       .addObjective()
       .fillObjectiveTitle('Objective in quarter backlog')
@@ -27,7 +27,7 @@ describe('OKR Objective Backlog e2e tests', () => {
     cy.contains('Objective in quarter backlog');
   });
 
-  it(`Edit Objective and move to backlog`, () => {
+  it(`should edit objective and move it to backlog`, () => {
     overviewPage.addObjective()
       .fillObjectiveTitle('Move to another quarter on edit')
       .submitDraftObjective();
@@ -50,7 +50,7 @@ describe('OKR Objective Backlog e2e tests', () => {
     cy.contains('This goes now to backlog');
   });
 
-  it(`Edit ongoing Objective can not choose backlog in quarter select`, () => {
+  it(`should not be able to select backlog quarter when editing ongoing objective`, () => {
     overviewPage.addObjective()
       .fillObjectiveTitle('We can not move this to backlog')
       .submit();
@@ -67,7 +67,7 @@ describe('OKR Objective Backlog e2e tests', () => {
       .should('not.contain', 'Backlog');
   });
 
-  it(`Can release Objective to another quarter from backlog`, () => {
+  it(`should release objective to another quarter from backlog`, () => {
     overviewPage.visitBacklogQuarter();
     overviewPage.addObjective()
       .fillObjectiveTitle('We can not release this')
@@ -105,7 +105,7 @@ describe('OKR Objective Backlog e2e tests', () => {
     cy.contains('This is our first released objective');
   });
 
-  it(`Can edit Objective title in backlog`, () => {
+  it(`should edit objective title in backlog`, () => {
     overviewPage.visitBacklogQuarter();
     overviewPage.addObjective()
       .fillObjectiveTitle('This is possible for edit')
@@ -124,7 +124,7 @@ describe('OKR Objective Backlog e2e tests', () => {
     overviewPage.getObjectiveByNameAndState('My new title', 'draft');
   });
 
-  it(`Can edit Objective in backlog and change quarter`, () => {
+  it(`should edit objective in backlog and change quarter`, () => {
     overviewPage.visitBacklogQuarter();
     overviewPage.addObjective()
       .fillObjectiveTitle('This goes to other quarter later')
@@ -144,7 +144,7 @@ describe('OKR Objective Backlog e2e tests', () => {
     overviewPage.getObjectiveByNameAndState('This goes to other quarter later', 'draft');
   });
 
-  it(`Can duplicate in backlog`, () => {
+  it(`should duplicate objective in backlog`, () => {
     overviewPage.visitBacklogQuarter();
     overviewPage.addObjective()
       .fillObjectiveTitle('Ready for duplicate in backlog')
@@ -164,7 +164,7 @@ describe('OKR Objective Backlog e2e tests', () => {
     overviewPage.getObjectiveByNameAndState('This is a new duplication in backlog', 'draft');
   });
 
-  it('should duplicate from backlog', () => {
+  it('should duplicate objective from backlog to another quarter', () => {
     overviewPage.visitBacklogQuarter();
     overviewPage.addObjective()
       .fillObjectiveTitle('Ready for duplicate to another quarter')
@@ -189,7 +189,7 @@ describe('OKR Objective Backlog e2e tests', () => {
       .should('exist');
   });
 
-  it(`Can duplicate ongoing Objective to backlog`, () => {
+  it(`should duplicate ongoing objective to backlog`, () => {
     overviewPage.addObjective()
       .fillObjectiveTitle('Possible to duplicate into backlog')
       .submit();
diff --git a/frontend/cypress/e2e/objective-crud.cy.ts b/frontend/cypress/e2e/objective-crud.cy.ts
index c2af9c5754..22bf882b66 100644
--- a/frontend/cypress/e2e/objective-crud.cy.ts
+++ b/frontend/cypress/e2e/objective-crud.cy.ts
@@ -2,7 +2,7 @@ import * as users from '../fixtures/users.json';
 import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage';
 import ObjectiveDialog from '../support/helper/dom-helper/dialogs/objectiveDialog';
 
-describe('CRUD operations', () => {
+describe('crud operations', () => {
   let overviewPage = new CyOverviewPage();
 
   beforeEach(() => {
@@ -18,7 +18,7 @@ describe('CRUD operations', () => {
     'draft-icon.svg']].forEach(([objectiveTitle,
     buttonTestId,
     icon]) => {
-    it(`Create objective, no keyresults`, () => {
+    it(`should create objective without key-results`, () => {
       overviewPage.addObjective()
         .fillObjectiveTitle(objectiveTitle)
         .selectQuarter('3');
@@ -32,7 +32,7 @@ describe('CRUD operations', () => {
     });
   });
 
-  it(`Create objective, should display error message`, () => {
+  it(`should display error message when title not set`, () => {
     overviewPage.addObjective();
     cy.getByTestId('title')
       .first()
@@ -47,7 +47,7 @@ describe('CRUD operations', () => {
       .should('not.be.disabled');
   });
 
-  it(`Create objective, cancel`, () => {
+  it(`should cancel creating an objective`, () => {
     const objectiveTitle = 'this is a canceled objective';
     overviewPage.addObjective()
       .selectQuarter('3')
@@ -57,7 +57,7 @@ describe('CRUD operations', () => {
       .should('not.exist');
   });
 
-  it(`Delete existing objective`, () => {
+  it(`should delete existing objective`, () => {
     overviewPage.getFirstObjective()
       .findByTestId('three-dot-menu')
       .click();
@@ -69,7 +69,7 @@ describe('CRUD operations', () => {
       .submit();
   });
 
-  it(`Open objective aside via click`, () => {
+  it(`should open objective detail view via click`, () => {
     overviewPage.getFirstObjective()
       .find('.title')
       .click();
@@ -77,7 +77,7 @@ describe('CRUD operations', () => {
       .should('include', 'objective');
   });
 
-  it(`update objective`, () => {
+  it(`should edit objective`, () => {
     const updatedTitle = 'This is an updated title';
     overviewPage.getFirstObjective()
       .findByTestId('three-dot-menu')
@@ -90,7 +90,7 @@ describe('CRUD operations', () => {
       .should('exist');
   });
 
-  it(`Duplicate objective`, () => {
+  it(`should duplicate objective`, () => {
     const duplicatedTitle = 'This is a duplicated objective';
     overviewPage.getFirstObjective()
       .findByTestId('three-dot-menu')
diff --git a/frontend/cypress/e2e/objective.cy.ts b/frontend/cypress/e2e/objective.cy.ts
index b7dec8295e..f437e050d7 100644
--- a/frontend/cypress/e2e/objective.cy.ts
+++ b/frontend/cypress/e2e/objective.cy.ts
@@ -3,7 +3,7 @@ import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage';
 import ObjectiveDialog from '../support/helper/dom-helper/dialogs/objectiveDialog';
 import ConfirmDialog from '../support/helper/dom-helper/dialogs/confirmDialog';
 
-describe('OKR Objective e2e tests', () => {
+describe('okr objective', () => {
   let overviewPage = new CyOverviewPage();
   beforeEach(() => {
     overviewPage = new CyOverviewPage();
@@ -11,7 +11,7 @@ describe('OKR Objective e2e tests', () => {
   });
 
   describe('tests via click', () => {
-    it(`Release Objective from Draft to Ongoing`, () => {
+    it(`should release objective from draft to ongoing`, () => {
       overviewPage.addObjective()
         .fillObjectiveTitle('A objective in state draft')
         .submitDraftObjective();
@@ -31,7 +31,7 @@ describe('OKR Objective e2e tests', () => {
         .should('exist');
     });
 
-    it(`Complete Objective with Successful`, () => {
+    it(`should complete objective with successful`, () => {
       overviewPage.addObjective()
         .fillObjectiveTitle('We want to complete this successful')
         .submit();
@@ -58,7 +58,7 @@ describe('OKR Objective e2e tests', () => {
       overviewPage.getObjectiveByNameAndState('We want to complete this successful', 'successful');
     });
 
-    it(`Complete Objective with Not-Successful`, () => {
+    it(`should complete objective with not-successful`, () => {
       overviewPage.addObjective()
         .fillObjectiveTitle('A not successful objective')
         .submit();
@@ -84,7 +84,7 @@ describe('OKR Objective e2e tests', () => {
       overviewPage.getObjectiveByNameAndState('A not successful objective', 'not-successful');
     });
 
-    it(`Reopen Successful Objective`, () => {
+    it(`should reopen successful objective`, () => {
       overviewPage.addObjective()
         .fillObjectiveTitle('This objective will be reopened after')
         .submit();
@@ -119,7 +119,7 @@ describe('OKR Objective e2e tests', () => {
         .should('exist');
     });
 
-    it(`Cancel Reopen Successful Objective`, () => {
+    it(`should cancel reopening successful objective`, () => {
       overviewPage.addObjective()
         .fillObjectiveTitle('The reopening of this objective will be canceled')
         .submit();
@@ -155,7 +155,7 @@ describe('OKR Objective e2e tests', () => {
         .should('exist');
     });
 
-    it('Cancel Ongoing objective back to draft state', () => {
+    it('should cancel putting ongoing objective back to draft state', () => {
       overviewPage.addObjective()
         .fillObjectiveTitle('This objective will be returned to draft state')
         .submit();
@@ -176,7 +176,7 @@ describe('OKR Objective e2e tests', () => {
         .should('exist');
     });
 
-    it('Ongoing objective back to draft state', () => {
+    it('should put ongoing objective back to draft state', () => {
       overviewPage
         .addObjective()
         .fillObjectiveTitle('Putting this objective back to draft state will be canceled')
@@ -198,7 +198,7 @@ describe('OKR Objective e2e tests', () => {
         .should('exist');
     });
 
-    it(`Search for Objective`, () => {
+    it(`should search and find objectives`, () => {
       overviewPage.addObjective()
         .fillObjectiveTitle('Search after this objective')
         .submit();
@@ -213,10 +213,10 @@ describe('OKR Objective e2e tests', () => {
       cy.scrollTo(0, 0);
       cy.wait(500);
 
-      cy.getByTestId('objectiveSearch')
+      cy.getByTestId('objective-search')
         .first()
         .click();
-      cy.getByTestId('objectiveSearch')
+      cy.getByTestId('objective-search')
         .first()
         .type('Search after')
         .wait(350);
@@ -225,7 +225,7 @@ describe('OKR Objective e2e tests', () => {
       cy.contains('We dont want to search for this')
         .should('not.exist');
 
-      cy.getByTestId('objectiveSearch')
+      cy.getByTestId('objective-search')
         .first()
         .as('objective-search')
         .clear();
@@ -258,7 +258,7 @@ describe('OKR Objective e2e tests', () => {
         .should('not.exist');
     });
 
-    it(`Create Objective in other quarter`, () => {
+    it(`should create objective in other quarter`, () => {
       overviewPage.addObjective()
         .fillObjectiveTitle('Objective in quarter 3')
         .selectQuarter('3')
@@ -272,7 +272,7 @@ describe('OKR Objective e2e tests', () => {
       cy.contains('Objective in quarter 3');
     });
 
-    it(`Edit Objective and move to other quarter`, () => {
+    it(`should edit objective and move it to another quarter`, () => {
       overviewPage.addObjective()
         .fillObjectiveTitle('Move to another quarter on edit')
         .submit();
@@ -296,7 +296,7 @@ describe('OKR Objective e2e tests', () => {
   });
 
   describe('tests via keyboard', () => {
-    it(`Open objective aside via enter`, () => {
+    it(`should open objective aside via enter`, () => {
       cy.getByTestId('objective')
         .first()
         .find('[tabindex]')
diff --git a/frontend/cypress/e2e/overview.cy.ts b/frontend/cypress/e2e/overview.cy.ts
index 770428a26e..d3c39a6efb 100644
--- a/frontend/cypress/e2e/overview.cy.ts
+++ b/frontend/cypress/e2e/overview.cy.ts
@@ -1,17 +1,17 @@
 import * as users from '../fixtures/users.json';
 import FilterHelper from '../support/helper/dom-helper/filterHelper';
 
-describe('OKR Overview', () => {
+describe('okr overview', () => {
   beforeEach(() => {
     cy.loginAsUser(users.gl);
   });
 
-  it('should have the current quarter with label Aktuell', () => {
-    cy.getByTestId('quarterFilter')
+  it('should have the current quarter with label "Aktuell"', () => {
+    cy.getByTestId('quarter-filter')
       .contains('Aktuell');
   });
 
-  it('Check order of teams', () => {
+  it('should have correctly ordered teams', () => {
     FilterHelper.do()
       .optionShouldNotBeSelected('Alle')
       .toggleOption('Alle');
@@ -31,7 +31,7 @@ describe('OKR Overview', () => {
       });
   });
 
-  it('Check font ', () => {
+  it('should use correct font', () => {
     cy.get('.team-title')
       .first()
       .invoke('css', 'font-family')
diff --git a/frontend/cypress/e2e/routing.cy.ts b/frontend/cypress/e2e/routing.cy.ts
index e08fb94367..22b2b2c99c 100644
--- a/frontend/cypress/e2e/routing.cy.ts
+++ b/frontend/cypress/e2e/routing.cy.ts
@@ -1,41 +1,39 @@
 import * as users from '../fixtures/users.json';
 import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage';
-import TeammanagementPage from '../support/helper/dom-helper/pages/teammanagementPage';
+import TeamManagementPage from '../support/helper/dom-helper/pages/teamManagementPage';
 
-describe('Routing', () => {
+describe('okr routing', () => {
   beforeEach(() => {
     cy.loginAsUser(users.gl);
   });
 
-  describe('Route via url', () => {
-    it('should route to overview', () => {
-      // Visit autocalls the validatePage method
-      CyOverviewPage.do()
-        .visitViaURL();
-    });
+  it('should route to overview', () => {
+    // Visit autocalls the validatePage method
+    CyOverviewPage.do()
+      .visitViaURL();
+  });
 
-    it('should route to teammanagement', () => {
-      // Visit autocalls the validatePage method
-      TeammanagementPage.do()
-        .visitViaURL();
-    });
+  it('should route to team-management', () => {
+    // Visit autocalls the validatePage method
+    TeamManagementPage.do()
+      .visitViaURL();
+  });
 
-    it('should route from overview to team management ', () => {
-      CyOverviewPage.do()
-        .visitViaURL()
-        .visitTeammanagement();
-    });
+  it('should route from overview to team-management ', () => {
+    CyOverviewPage.do()
+      .visitViaURL()
+      .visitTeamManagement();
+  });
 
-    it('should route from team management to Overview via back button', () => {
-      TeammanagementPage.do()
-        .visitViaURL()
-        .backToOverview();
-    });
+  it('should route from team-management to overview via back button', () => {
+    TeamManagementPage.do()
+      .visitViaURL()
+      .backToOverview();
+  });
 
-    it('should route from team management to Overview via logo', () => {
-      TeammanagementPage.do()
-        .visitViaURL()
-        .visitOverview();
-    });
+  it('should route from team-management to overview via logo', () => {
+    TeamManagementPage.do()
+      .visitViaURL()
+      .visitOverview();
   });
 });
diff --git a/frontend/cypress/e2e/scoring.cy.ts b/frontend/cypress/e2e/scoring.cy.ts
index 4c7e421b78..58ed5c3939 100644
--- a/frontend/cypress/e2e/scoring.cy.ts
+++ b/frontend/cypress/e2e/scoring.cy.ts
@@ -4,13 +4,13 @@ import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage';
 import { Unit } from '../../src/app/shared/types/enums/Unit';
 import KeyResultDetailPage from '../support/helper/dom-helper/pages/keyResultDetailPage';
 
-describe('Scoring component e2e tests', () => {
+describe('okr scoring', () => {
   let overviewPage = new CyOverviewPage();
-  let keyresultDetailPage = new KeyResultDetailPage();
+  let keyResultDetailPage = new KeyResultDetailPage();
 
   beforeEach(() => {
     overviewPage = new CyOverviewPage();
-    keyresultDetailPage = new KeyResultDetailPage();
+    keyResultDetailPage = new KeyResultDetailPage();
     cy.loginAsUser(users.gl);
   });
 
@@ -28,22 +28,24 @@ describe('Scoring component e2e tests', () => {
       100,
       100]
   ].forEach(([baseline,
-    stretchgoal,
+    stretchGoal,
     value]) => {
-    it('Create metric checkin and validate value of scoring component', () => {
-      setupMetricKR(
-        `Metric kr with check-in value ${value}`, baseline, stretchgoal, value
+    it('should display correct value on scoring component after creating metric check-in', () => {
+      setupMetricKr(
+
+        `Metric kr with check-in value ${value}`, baseline, stretchGoal, value
+
       );
-      const percentage = getPercentageMetric(baseline, stretchgoal, value);
+      const percentage = getPercentageMetric(baseline, stretchGoal, value);
       cy.validateScoring(false, percentage);
-      cy.get('.keyResult-detail-attribute-show')
+      cy.get('.key-result-detail-attribute-show')
         .contains('Aktuell')
         .parent()
         .not(':contains(!)')
         .should('have.css', 'border-color')
         .and('not.equal', 'rgb(186, 56, 56)');
 
-      keyresultDetailPage.close();
+      keyResultDetailPage.close();
       cy.validateScoring(true, percentage);
 
       overviewPage
@@ -58,21 +60,21 @@ describe('Scoring component e2e tests', () => {
   [200,
     100,
     250]].forEach(([baseline,
-    stretchgoal,
+    stretchGoal,
     value]) => {
     it('show indicator that value is negative', () => {
-      setupMetricKR(
-        `Check indicator with value ${value}`, baseline, stretchgoal, value
+      setupMetricKr(
+        `Check indicator with value ${value}`, baseline, stretchGoal, value
       );
       cy.validateScoring(false, 0);
-      cy.get('.keyResult-detail-attribute-show')
+      cy.get('.key-result-detail-attribute-show')
         .contains('Aktuell')
         .parent()
         .contains('!')
         .should('have.css', 'border-color')
         .and('equal', 'rgb(186, 56, 56)');
 
-      keyresultDetailPage.close();
+      keyResultDetailPage.close();
       cy.validateScoring(true, 0);
 
       overviewPage.getKeyResultByName(`Check indicator with value ${value}`)
@@ -86,7 +88,7 @@ describe('Scoring component e2e tests', () => {
     ['target'],
     ['stretch']
   ].forEach(([zoneName]) => {
-    it('Create ordinal checkin and validate value of scoring component', () => {
+    it('should create ordinal checkin and validate value of scoring component', () => {
       overviewPage
         .addKeyResult()
         .fillKeyResultTitle('Ordinal scoring keyresult')
@@ -95,7 +97,7 @@ describe('Scoring component e2e tests', () => {
         .fillKeyResultDescription('This is my description')
         .submit();
 
-      keyresultDetailPage
+      keyResultDetailPage
         .visit('Ordinal scoring keyresult')
         .createCheckIn()
         .selectOrdinalCheckInZone(zoneName as 'fail' | 'commit' | 'target' | 'stretch')
@@ -105,19 +107,19 @@ describe('Scoring component e2e tests', () => {
         .submit();
       const percentage = getPercentageOrdinal(zoneName);
       cy.validateScoring(false, percentage);
-      keyresultDetailPage.close();
+      keyResultDetailPage.close();
       cy.validateScoring(true, percentage);
     });
   });
 });
 
-function setupMetricKR(
-  name: string, baseline: number, stretchgoal: number, value: number
+function setupMetricKr(
+  name: string, baseline: number, stretchGoal: number, value: number
 ) {
   CyOverviewPage.do()
     .addKeyResult()
     .fillKeyResultTitle(name)
-    .withMetricValues(Unit.PERCENT, baseline.toString(), stretchgoal.toString())
+    .withMetricValues(Unit.PERCENT, baseline.toString(), stretchGoal.toString())
     .submit();
   KeyResultDetailPage.do()
     .visit(name)
diff --git a/frontend/cypress/e2e/tab.cy.ts b/frontend/cypress/e2e/tab.cy.ts
index ad08374842..d531804d74 100644
--- a/frontend/cypress/e2e/tab.cy.ts
+++ b/frontend/cypress/e2e/tab.cy.ts
@@ -3,7 +3,7 @@ import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage';
 import { Unit } from '../../src/app/shared/types/enums/Unit';
 import KeyResultDetailPage from '../support/helper/dom-helper/pages/keyResultDetailPage';
 
-describe('Tab workflow tests', () => {
+describe('tabbing workflows', () => {
   let overviewPage = new CyOverviewPage();
   beforeEach(() => {
     cy.loginAsUser(users.gl);
@@ -35,8 +35,8 @@ describe('Tab workflow tests', () => {
     cy.pressUntilContains('Logout', 'ArrowDown');
     focusedShouldHaveTestId('logout');
     cy.realPress('Escape');
-    tabAndCheck('quarterFilter', 'GJ');
-    tabAndCheck('objectiveSearch');
+    tabAndCheck('quarter-filter', 'GJ');
+    tabAndCheck('objective-search');
     cy.tabForward();
     cy.focused()
       .children('img')
@@ -54,10 +54,10 @@ describe('Tab workflow tests', () => {
     tabAndCheck('objective');
     tabAndCheck('three-dot-menu');
     tabAndCheck('key-result');
-    tabAndCheck('add-keyResult', 'Key Result hinzufügen');
+    tabAndCheck('add-key-result', 'Key Result hinzufügen');
   });
 
-  describe('Objective', () => {
+  describe('objective', () => {
     it('should be able to tab objective dialog', () => {
       tabAndCheck('add-objective', 'Objective hinzufügen');
       cy.realPress('Enter');
@@ -154,44 +154,44 @@ describe('Tab workflow tests', () => {
         .focus();
       cy.realPress('Enter')
         .tabForward();
-      focusedShouldHaveTestId('closeDrawer');
-      tabAndCheck('add-keyResult-objective-detail', 'Key Result hinzufügen');
+      focusedShouldHaveTestId('close-drawer');
+      tabAndCheck('add-key-result-objective-detail', 'Key Result hinzufügen');
       tabAndCheck('edit-objective', 'Objective bearbeiten');
     });
   });
 
-  describe('Keyresult & Check-In', () => {
-    it('Should be able to tab Keyresult dialog', () => {
-      tabAndCheck('add-keyResult', 'Key Result hinzufügen');
+  describe('keyresult & checkin', () => {
+    it('should be able to tab key-result dialog', () => {
+      tabAndCheck('add-key-result', 'Key Result hinzufügen');
       cy.realPress('Enter');
       focusedShouldHaveTestId('close-dialog');
-      tabAndCheck('titleInput');
+      tabAndCheck('title-input');
       cy.focused()
         .type('Title');
       tabAndCheck('unit');
       tabAndCheck('baseline');
-      tabAndCheck('stretchGoal');
-      tabAndCheck('ownerInput');
-      tabAndCheck('descriptionInput');
-      tabAndCheck('actionInput');
+      tabAndCheck('stretch-goal');
+      tabAndCheck('owner-input');
+      tabAndCheck('description-input');
+      tabAndCheck('action-input');
       tabAndCheck('add-action-plan-line', 'Weitere Action hinzufügen');
-      tabAndCheck('ordinalTab', 'Ordinal');
+      tabAndCheck('ordinal-tab', 'Ordinal');
       cy.realPress('Enter');
-      tabAndCheck('commitZone');
+      tabAndCheck('commit-zone');
       cy.focused()
         .type('Commit');
-      tabAndCheck('targetZone');
+      tabAndCheck('target-zone');
       cy.focused()
         .type('Target');
-      tabAndCheck('stretchZone');
+      tabAndCheck('stretch-zone');
       cy.focused()
         .type('Stretch');
       tabAndCheck('submit', 'Speichern');
-      tabAndCheck('saveAndNew', 'Speichern & Neu');
+      tabAndCheck('save-and-new', 'Speichern & Neu');
       tabAndCheck('cancel', 'Abbrechen');
     });
 
-    it('Should tab keyresult detail view', () => {
+    it('should tab key-result detail view', () => {
       overviewPage.getObjectiveByState('ongoing')
         .findByTestId('key-result')
         .first()
@@ -210,7 +210,7 @@ describe('Tab workflow tests', () => {
       tabAndCheck('edit-keyResult', 'Key Result bearbeiten');
     });
 
-    it('Should tab create-check-in metric', () => {
+    it('should tab create check-in metric', () => {
       overviewPage
         .addOngoingKeyResult()
         .fillKeyResultTitle('A metric Keyresult for tabbing tests')
@@ -235,7 +235,7 @@ describe('Tab workflow tests', () => {
       tabAndCheck('cancel', 'Abbrechen');
     });
 
-    it('Should tab create-check-in ordinal', () => {
+    it('should tab create check-in ordinal', () => {
       overviewPage
         .addOngoingKeyResult()
         .fillKeyResultTitle('A ordinal Keyresult for tabbing tests')
@@ -274,8 +274,8 @@ describe('Tab workflow tests', () => {
     });
   });
 
-  describe('Team management', () => {
-    it('Should tab team management', () => {
+  describe('team-management', () => {
+    it('should tab team-management', () => {
       tabAndCheck('team-management', 'Teamverwaltung');
       cy.realPress('Enter');
       tabAndCheck('routerLink-to-overview', 'Zurück zur OKR Übersicht');
@@ -284,7 +284,7 @@ describe('Tab workflow tests', () => {
       tabAndCheck('all-teams-selector', 'Alle Teams (4)');
       tabAndCheck('invite-member', 'Member registrieren');
     });
-    it('Should tab create team', () => {
+    it('should tab create team', () => {
       cy.getByTestId('team-management')
         .click();
       tabAndCheck('add-team');
@@ -297,7 +297,7 @@ describe('Tab workflow tests', () => {
       tabAndCheck('save', 'Speichern');
       tabAndCheck('cancel', 'Abbrechen');
     });
-    it('Should tab register member', () => {
+    it('should tab register member', () => {
       cy.getByTestId('team-management')
         .click();
       tabAndCheck('invite-member');
@@ -315,7 +315,7 @@ describe('Tab workflow tests', () => {
       tabAndCheck('invite', 'Einladen');
       tabAndCheck('new-member-cancel', 'Abbrechen');
     });
-    it('Should tab edit member', () => {
+    it('should tab edit member', () => {
       cy.getByTestId('team-management')
         .click();
       cy.pressUntilContains('Alice Wunderland', 'Tab');
diff --git a/frontend/cypress/e2e/team-management.cy.ts b/frontend/cypress/e2e/team-management.cy.ts
new file mode 100644
index 0000000000..f41ac166ec
--- /dev/null
+++ b/frontend/cypress/e2e/team-management.cy.ts
@@ -0,0 +1,595 @@
+import * as users from '../fixtures/users.json';
+import { uniqueSuffix } from '../support/helper/utils';
+import ConfirmDialog from '../support/helper/dom-helper/dialogs/confirmDialog';
+import TeamManagementPage from '../support/helper/dom-helper/pages/teamManagementPage';
+import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage';
+import InviteMembersDialog from '../support/helper/dom-helper/dialogs/inviteMembersDialog';
+import FilterHelper from '../support/helper/dom-helper/filterHelper';
+
+describe('okr team-management', () => {
+  const teamName = uniqueSuffix('New Team');
+  const nameEsha = users.bl.name;
+
+  describe('routing to overview', () => {
+    beforeEach(() => {
+      cy.loginAsUser(users.gl);
+    });
+
+    it('should preserve team-filter', () => {
+      CyOverviewPage.do()
+        .visitViaURL();
+      FilterHelper.do()
+        .toggleOption('/BBT')
+        .toggleOption('Puzzle ITC');
+      checkTeamsSelected();
+      CyOverviewPage.do()
+        .visitTeamManagement();
+      checkTeamsSelected();
+      TeamManagementPage.do()
+        .backToOverview();
+      checkTeamsSelected();
+      CyOverviewPage.do()
+        .visitTeamManagement();
+      TeamManagementPage.do()
+        .visitOverview();
+      checkTeamsSelected();
+    });
+
+    function checkTeamsSelected() {
+      FilterHelper.do()
+        .optionShouldBeSelected('LoremIpsum')
+        .optionShouldBeSelected('/BBT');
+    }
+  });
+
+  describe('as "GL"', () => {
+    let teamManagementPage: TeamManagementPage;
+    before(() => {
+      // login as bl to ensure this user exists in database
+      cy.loginAsUser(users.bl);
+      cy.getByTestId('username')
+        .click();
+      cy.getByTestId('logout')
+        .click();
+    });
+
+    beforeEach(() => {
+      cy.loginAsUser(users.gl);
+      teamManagementPage = TeamManagementPage.do()
+        .visitViaURL();
+    });
+
+    it('should create team', () => {
+      cy.intercept('POST', '**/teams')
+        .as('addTeam');
+
+      teamManagementPage.addTeam()
+        .fillName(teamName)
+        .submit();
+      cy.wait('@addTeam');
+      cy.contains(teamName);
+    });
+
+    it('should not be able to remove last admin from team', () => {
+      cy.intercept('PUT', '**/removeuser')
+        .as('removeUser');
+
+      cy.get('app-team-list .mat-mdc-list-item')
+        .contains(teamName)
+        .click();
+      cy.getByTestId('member-list-more')
+        .click();
+      cy.getByTestId('remove-from-member-list')
+        .click();
+
+      ConfirmDialog.do()
+        .checkTitle('Mitglied entfernen')
+        .checkDescription(`Möchtest du Jaya Norris wirklich aus dem Team '${teamName}' entfernen?`)
+        .submit();
+
+      cy.wait('@removeUser');
+
+      cy.contains('Der letzte Administrator eines Teams kann nicht entfernt werden')
+        .should('exist');
+    });
+
+    it('should not remove user when canceling in confirm dialog', () => {
+      cy.intercept('PUT', '**/removeuser')
+        .as('removeUser');
+
+      cy.get('app-team-list .mat-mdc-list-item')
+        .contains(teamName)
+        .click();
+      cy.getByTestId('member-list-more')
+        .click();
+      cy.getByTestId('remove-from-member-list')
+        .click();
+
+      // cancel dialog
+      ConfirmDialog.do()
+        .checkTitle('Mitglied entfernen')
+        .checkDescription(`Möchtest du Jaya Norris wirklich aus dem Team '${teamName}' entfernen?`)
+        .cancel();
+
+      cy.get('@removeUser.all')
+        .then((interceptions) => {
+          expect(interceptions).to.have.length(0);
+        });
+    });
+
+    it('should edit team', () => {
+      cy.intercept('GET', '**/users')
+        .as('getUsers');
+      cy.intercept('GET', '**/teams')
+        .as('getTeams');
+
+      cy.get('app-team-list .mat-mdc-list-item')
+        .contains('LoremIpsum')
+        .click();
+      editTeamNameAndTest('IpsumLorem');
+      cy.visit('team-management');
+
+      cy.wait(['@getUsers',
+        '@getTeams']);
+
+      cy.contains('LoremIpsum')
+        .should('not.exist');
+      cy.contains('IpsumLorem')
+        .should('exist');
+      // set old team name again
+      cy.get('app-team-list .mat-mdc-list-item')
+        .contains('IpsumLorem')
+        .click();
+      editTeamNameAndTest('LoremIpsum');
+    });
+
+    it('should delete team', () => {
+      // Click delete button and cancel
+      teamManagementPage.deleteTeam(teamName)
+        .cancel();
+
+      // try again and confirm dialog
+      teamManagementPage.deleteTeam(teamName)
+        .submit();
+    });
+
+    describe('search', () => {
+      it('should search and find user', () => {
+        teamManagementPage.elements
+          .teamSearch()
+          .fill('pa')
+          .shouldHaveOption('Paco Eggimann (peggimann@puzzle.ch)')
+          .shouldHaveOption('Paco Egiman (egiman@puzzle.ch)')
+          .selectOption('Robin Papierer (papierer@puzzle.ch)');
+
+        cy.contains('app-member-detail h2', 'Robin Papierer');
+      });
+
+      it('should search and find team', () => {
+        teamManagementPage.elements.teamSearch()
+          .fill('we are')
+          .selectOption('we are cube.³');
+
+        cy.contains('app-member-list h2', 'we are cube.³');
+      });
+
+      it('should find users and teams when search matches both', () => {
+        teamManagementPage.elements
+          .teamSearch()
+          .fill('puz')
+          .shouldHaveLabel('Members')
+          .shouldHaveLabel('Teams')
+          .shouldHaveOption('Paco Eggimann (peggimann@puzzle.ch)')
+          .shouldHaveOption('Paco Egiman (egiman@puzzle.ch)')
+          .shouldHaveOption('Robin Papierer (papierer@puzzle.ch)')
+          .shouldHaveOption('Puzzle ITC');
+      });
+    });
+
+    describe('invite members', () => {
+      it('should invite two members', () => {
+        teamManagementPage.elements.registerMember()
+          .click();
+        const firstNames = InviteMembersDialog.do()
+          .enterUser('Claudia', 'Meier', 'claudia.meier@test.ch')
+          .addAnotherUser()
+          .enterUser('Stefan', 'Schmidt', 'stefan.schmidt@test.ch')
+          .addAnotherUser()
+          .getFirstnames();
+
+        // test error messages
+        fillOutNewUser('Robin', '', 'papierer');
+        cy.getByTestId('invite')
+          .click();
+        cy.contains('Angabe benötigt');
+        cy.contains('E-Mail ungültig');
+        cy.getByTestId('email-col_2')
+          .focus();
+        cy.realType('@puzzle.ch');
+        cy.contains('E-Mail ungültig')
+          .should('not.exist');
+        cy.contains('E-Mail existiert bereits');
+        cy.tabBackward();
+        cy.realType('Papirer');
+        cy.contains('Angabe benötigt')
+          .should('not.exist');
+
+        // delete last entry
+        cy.tabForward();
+        cy.tabForward();
+        cy.realPress('Enter');
+        cy.contains('papiererr@puzzle.ch')
+          .should('not.exist');
+
+        // save
+        cy.getByTestId('invite')
+          .click();
+        cy.contains('Die Members wurden erfolgreich registriert');
+        firstNames.forEach((email) => cy.contains(email));
+      });
+    });
+
+    it('should navigate to bobs profile and add him to "BBT" and "LoremIpsum"', () => {
+      cy.intercept('PUT', '**/updateaddteammembership/*')
+        .as('updateEsha');
+
+      navigateToUser(nameEsha);
+
+      // add to team bbt as admin
+      cy.get('app-member-detail')
+        .findByTestId('add-user')
+        .click();
+      cy.get('app-member-detail')
+        .findByTestId('select-team-dropdown')
+        .click();
+      cy.getByTestId('select-team-dropdown-option')
+        .contains('/BBT')
+        .click();
+      cy.get('app-member-detail')
+        .findByTestId('select-team-role')
+        .click();
+      cy.getByTestId('select-team-role-admin')
+        .click();
+      cy.get('app-member-detail')
+        .findByTestId('add-user-to-team-save')
+        .click();
+
+      cy.wait('@updateEsha');
+
+      // add to team loremipsum as member
+      cy.get('app-member-detail')
+        .findByTestId('add-user')
+        .click();
+      cy.get('app-member-detail')
+        .findByTestId('select-team-dropdown')
+        .click();
+
+      // team BBT should not be in list anymore
+      cy.getByTestId('select-team-dropdown-option')
+        .should('not.contain', '/BBT');
+
+      cy.getByTestId('select-team-dropdown-option')
+        .contains('LoremIpsum')
+        .click();
+      cy.get('app-member-detail')
+        .findByTestId('select-team-role')
+        .click();
+      cy.getByTestId('select-team-role-member')
+        .click();
+      cy.get('app-member-detail')
+        .findByTestId('add-user-to-team-save')
+        .click();
+
+      cy.wait('@updateEsha');
+      // check table
+      checkRolesForEsha();
+
+      closeOverlay();
+
+      let foundEsha = false;
+      cy.get('app-member-list tbody tr')
+        .each(($row) => {
+          const usernameCell = $row.find('td:nth-child(2)');
+          if (usernameCell.text()
+            .trim() === nameEsha) {
+            foundEsha = true;
+            const roleCell = $row.find('td:nth-child(3)');
+            const teamsCell = $row.find('td:nth-child(4)');
+            expect(roleCell.text()
+              .trim()).to.equal('Team-Admin, Team-Member');
+            expect(teamsCell.text()
+              .trim()).to.equal('/BBT, LoremIpsum');
+            return false;
+          }
+          return true;
+        })
+        .then(() => {
+          expect(foundEsha).to.be.true;
+        });
+    });
+
+    it('should navigate to user "Esha" and set as okr champion', () => {
+      navigateToUser(nameEsha);
+      cy.getByTestId('edit-okr-champion-readonly')
+        .contains('OKR Champion:');
+      cy.getByTestId('edit-okr-champion-readonly')
+        .contains('Nein');
+      cy.getByTestId('edit-okr-champion-edit')
+        .click();
+      cy.getByTestId('edit-okr-champion-readonly')
+        .should('not.exist');
+      cy.getByTestId('edit-okr-champion-checkbox')
+        .click();
+      cy.getByTestId('edit-okr-champion-readonly')
+        .contains('OKR Champion:');
+      cy.getByTestId('edit-okr-champion-readonly')
+        .contains('Ja');
+      cy.contains('Der Member wurde erfolgreich aktualisiert.');
+
+      // reset okr champion to false
+      cy.getByTestId('edit-okr-champion-edit')
+        .click();
+      cy.getByTestId('edit-okr-champion-checkbox')
+        .click();
+      cy.getByTestId('edit-okr-champion-readonly')
+        .contains('OKR Champion:');
+      cy.getByTestId('edit-okr-champion-readonly')
+        .contains('Nein');
+
+      // test click outside of element
+      cy.getByTestId('edit-okr-champion-edit')
+        .click();
+      cy.get('app-member-detail')
+        .find('h2')
+        .click();
+      // checkbox should hide again
+      cy.getByTestId('edit-okr-champion-readonly')
+        .contains('OKR Champion:');
+      cy.getByTestId('edit-okr-champion-readonly')
+        .contains('Nein');
+    });
+  });
+
+  describe('as "BL"', () => {
+    beforeEach(() => {
+      cy.loginAsUser(users.bl);
+      cy.getByTestId('team-management')
+        .click();
+      cy.intercept('GET', '**/users/*')
+        .as('getEsha');
+    });
+
+    it('should have correct roles on user "Esha"', () => {
+      cy.get('td')
+        .contains(nameEsha)
+        .click();
+      cy.wait('@getEsha');
+
+      checkRolesForEsha();
+      closeOverlay();
+    });
+
+    it('should not be able to edit team "LoremIpsum"', () => {
+      cy.get('app-team-management')
+        .contains('LoremIpsum')
+        .click();
+      cy.getByTestId('teamMoreButton')
+        .should('not.exist');
+      cy.getByTestId('editTeamButton')
+        .should('not.exist');
+      cy.getByTestId('member-list-more')
+        .should('not.exist');
+      cy.getByTestId('edit-role')
+        .should('not.exist');
+    });
+
+    it('should be able to edit team "/BBT" and edit its name', () => {
+      cy.get('app-team-management')
+        .contains('/BBT')
+        .click();
+      cy.getByTestId('teamMoreButton')
+        .should('exist');
+      editTeamNameAndTest('/BBT_edit');
+      // restore old name
+      editTeamNameAndTest('/BBT');
+    });
+
+    it('should add members to team "/BBT"', () => {
+      cy.get('app-team-management')
+        .contains('/BBT')
+        .click();
+      cy.getByTestId('add-team-member')
+        .click();
+      cy.getByTestId('search-member-to-add')
+        .click();
+
+      // esha should not exist (is already member of team)
+      const matOption = '.cdk-overlay-container mat-option';
+      cy.get(matOption)
+        .contains(nameEsha)
+        .should('not.exist');
+
+      // add findus peterson
+      cy.getByTestId('search-member-to-add')
+        .as('member-search')
+        .click();
+      cy.get('@member-search')
+        .type('Find');
+      cy.contains(matOption, 'Findus Peterson')
+        .click();
+
+      // add robin papierer
+      cy.getByTestId('search-member-to-add')
+        .click();
+      cy.get(matOption)
+        .contains('Findus Peterson')
+        .should('not.exist');
+      cy.get(matOption)
+        .contains('Robin Papierer')
+        .click();
+
+      // check if Findus and Robin exists in table
+      const allMemberTableTr = '#all-member-table tbody tr';
+      cy.get(allMemberTableTr)
+        .eq(0)
+        .should('contain', 'Findus Peterson');
+      cy.get(allMemberTableTr)
+        .eq(1)
+        .should('contain', 'Robin Papierer');
+
+      // remove robin papierer from list
+      cy.get(allMemberTableTr + ' button')
+        .eq(1)
+        .click();
+      cy.get(allMemberTableTr)
+        .eq(1)
+        .should('not.exist');
+
+      cy.getByTestId('save')
+        .click();
+    });
+
+    it('should change role of "Findus Peterson" to team "Admin"', () => {
+      cy.get('app-team-management')
+        .contains('/BBT')
+        .click();
+
+      cy.get('app-member-list tbody tr')
+        .each(($row) => {
+          const usernameCell = $row.find('td:nth-child(2)');
+          if (usernameCell.text()
+            .trim() !== 'Findus Peterson') {
+            return;
+          }
+          $row.find(`[data-testId='edit-role']`)
+            .click();
+          cy.wait(500); // wait for dialog to open
+        })
+        .then(() => {
+          cy.getByTestId('select-team-role')
+            .click();
+          cy.getByTestId('select-team-role-admin')
+            .click();
+          cy.getByTestId('select-team-role')
+            .should('not.exist');
+          cy.contains('Das Team wurde erfolgreich aktualisiert.');
+        });
+    });
+
+    it('should not be able to add "Findus Peterson" to further teams', () => {
+      navigateToUser('Findus Peterson');
+
+      /*
+       * current user BL (Esha Harris) is only admin in /BBT team.
+       * That's why 'add-team-member' should be disabled
+       */
+      cy.get('app-member-detail')
+        .getByTestId('add-user')
+        .should('be.disabled');
+    });
+
+    it('should remove "BBT" membership from "Findus Peterson"', () => {
+      navigateToUser('Findus Peterson');
+      cy.getByTestId('delete-team-member')
+        .click();
+
+      ConfirmDialog.do()
+        .checkTitle('Mitglied entfernen')
+        .checkDescription(`Möchtest du Findus Peterson wirklich aus dem Team '/BBT' entfernen?`)
+        .submit();
+
+      cy.get('app-member-detail')
+        .contains('/BBT')
+        .should('not.exist');
+    });
+
+    it('should remove added memberships from "Esha"', () => {
+      cy.intercept('PUT', '**/removeuser')
+        .as('removeUser');
+
+      navigateToUser(nameEsha);
+      cy.getByTestId('delete-team-member')
+        .eq(0)
+        .click();
+
+      ConfirmDialog.do()
+        .checkTitle('Mitglied entfernen')
+        .checkDescription(`Möchtest du ${nameEsha} wirklich aus dem Team '/BBT' entfernen?`)
+        .submit();
+
+      cy.wait('@removeUser');
+
+      cy.getByTestId('delete-team-member')
+        .eq(0)
+        .click();
+
+      ConfirmDialog.do()
+        .checkTitle('Mitglied entfernen')
+        .checkDescription(`Möchtest du ${nameEsha} wirklich aus dem Team 'LoremIpsum' entfernen?`)
+        .submit();
+
+      cy.get('app-member-detail')
+        .should('not.contain', '/BBT')
+        .and('not.contain', 'LoremIpsum');
+    });
+
+    it('should not be able to edit okr champion state of user "Esha"', () => {
+      navigateToUser(nameEsha);
+      cy.getByTestId('edit-okr-champion-readonly')
+        .should('exist');
+      cy.getByTestId('edit-okr-champion-edit')
+        .should('not.exist');
+    });
+  });
+});
+
+function closeOverlay() {
+  cy.get('.cdk-overlay-backdrop')
+    .click(-50, -50, { force: true });
+}
+
+function checkRolesForEsha() {
+  cy.get('app-member-detail tbody tr')
+    .eq(0)
+    .should('contain', '/BBT')
+    .and('contain', 'Team-Admin');
+  cy.get('app-member-detail tbody tr')
+    .eq(1)
+    .should('contain', 'LoremIpsum')
+    .and('contain', 'Team-Member');
+}
+
+function editTeamNameAndTest(teamName: string) {
+  cy.intercept('PUT', '**/teams/*')
+    .as('saveTeam');
+  cy.getByTestId('editTeamButton')
+    .click();
+  cy.getByTestId('add-team-name')
+    .as('team-name')
+    .click();
+  cy.get('@team-name')
+    .clear();
+  cy.get('@team-name')
+    .type(teamName);
+  cy.getByTestId('save')
+    .click();
+  cy.wait('@saveTeam');
+  cy.contains(teamName);
+}
+
+function navigateToUser(username: string) {
+  cy.intercept('GET', '**/users/*')
+    .as('getUser');
+  cy.get('td')
+    .contains(username)
+    .click();
+  cy.wait('@getUser');
+}
+
+function fillOutNewUser(firstName: string, lastName: string, email: string) {
+  cy.realType(firstName);
+  cy.tabForward();
+  cy.realType(lastName);
+  cy.tabForward();
+  cy.realType(email);
+}
diff --git a/frontend/cypress/e2e/team.cy.ts b/frontend/cypress/e2e/team.cy.ts
index 50a88bc4a0..39ff2aee3c 100644
--- a/frontend/cypress/e2e/team.cy.ts
+++ b/frontend/cypress/e2e/team.cy.ts
@@ -1,147 +1,145 @@
 import * as users from '../fixtures/users.json';
 import FilterHelper from '../support/helper/dom-helper/filterHelper';
 import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage';
-import TeammanagementPage from '../support/helper/dom-helper/pages/teammanagementPage';
-
-describe('OKR team e2e tests', () => {
-  describe('tests via click', () => {
-    beforeEach(() => {
-      cy.loginAsUser(users.gl);
-      CyOverviewPage.do()
-        .visitCurrentQuarter();
-    });
-
-    it('Should select teams from teamfilter', () => {
-      const filterHelper = FilterHelper.do()
-        .optionShouldBeSelected('Puzzle ITC')
-        .optionShouldBeSelected('LoremIpsum')
-        .optionShouldNotBeSelected('Alle')
-        .optionShouldNotBeSelected('/BBT')
-        .optionShouldNotBeSelected('we are cube');
-
-      filterHelper
-        .toggleOption('Alle')
-        .optionShouldBeSelected('Alle', false)
-        .optionShouldBeSelected('/BBT')
-        .optionShouldBeSelected('Puzzle ITC')
-        .optionShouldBeSelected('LoremIpsum')
-        .optionShouldBeSelected('we are cube');
-
-      filterHelper
-        .toggleOption('/BBT')
-        .optionShouldBeSelected('/BBT')
-        .optionShouldNotBeSelected('Alle')
-        .optionShouldNotBeSelected('Puzzle ITC')
-        .optionShouldNotBeSelected('LoremIpsum')
-        .optionShouldNotBeSelected('we are cube');
-
-      filterHelper
-        .toggleOption('Puzzle ITC')
-        .optionShouldBeSelected('/BBT')
-        .optionShouldNotBeSelected('Alle')
-        .optionShouldBeSelected('Puzzle ITC')
-        .optionShouldNotBeSelected('LoremIpsum')
-        .optionShouldNotBeSelected('we are cube');
-    });
-
-    it('Deselect all teams from filter will display text on overview', () => {
-      const filterHelper = FilterHelper.do()
-        .optionShouldBeSelected('Puzzle ITC')
-        .optionShouldBeSelected('LoremIpsum')
-        .optionShouldNotBeSelected('Alle')
-        .optionShouldNotBeSelected('/BBT')
-        .optionShouldNotBeSelected('we are cube');
-
-      filterHelper.toggleOption('Puzzle ITC')
-        .toggleOption('LoremIpsum');
-
-      cy.contains('Kein Team ausgewählt');
-    });
-
-    it('URL changes to the selected teams', () => {
-      const filterHelper = FilterHelper.do()
-        .optionShouldBeSelected('Puzzle ITC')
-        .optionShouldBeSelected('LoremIpsum')
-        .optionShouldNotBeSelected('Alle')
-        .optionShouldNotBeSelected('/BBT')
-        .optionShouldNotBeSelected('we are cube');
-
-      filterHelper.validateUrlParameter('teams', ['5',
+import TeamManagementPage from '../support/helper/dom-helper/pages/teamManagementPage';
+
+describe('okr team', () => {
+  beforeEach(() => {
+    cy.loginAsUser(users.gl);
+    CyOverviewPage.do()
+      .visitCurrentQuarter();
+  });
+
+  it('should select teams from team-filter', () => {
+    const filterHelper = FilterHelper.do()
+      .optionShouldBeSelected('Puzzle ITC')
+      .optionShouldBeSelected('LoremIpsum')
+      .optionShouldNotBeSelected('Alle')
+      .optionShouldNotBeSelected('/BBT')
+      .optionShouldNotBeSelected('we are cube');
+
+    filterHelper
+      .toggleOption('Alle')
+      .optionShouldBeSelected('Alle', false)
+      .optionShouldBeSelected('/BBT')
+      .optionShouldBeSelected('Puzzle ITC')
+      .optionShouldBeSelected('LoremIpsum')
+      .optionShouldBeSelected('we are cube');
+
+    filterHelper
+      .toggleOption('/BBT')
+      .optionShouldBeSelected('/BBT')
+      .optionShouldNotBeSelected('Alle')
+      .optionShouldNotBeSelected('Puzzle ITC')
+      .optionShouldNotBeSelected('LoremIpsum')
+      .optionShouldNotBeSelected('we are cube');
+
+    filterHelper
+      .toggleOption('Puzzle ITC')
+      .optionShouldBeSelected('/BBT')
+      .optionShouldNotBeSelected('Alle')
+      .optionShouldBeSelected('Puzzle ITC')
+      .optionShouldNotBeSelected('LoremIpsum')
+      .optionShouldNotBeSelected('we are cube');
+  });
+
+  it('should display info text on overview when deselecting all teams from filter', () => {
+    const filterHelper = FilterHelper.do()
+      .optionShouldBeSelected('Puzzle ITC')
+      .optionShouldBeSelected('LoremIpsum')
+      .optionShouldNotBeSelected('Alle')
+      .optionShouldNotBeSelected('/BBT')
+      .optionShouldNotBeSelected('we are cube');
+
+    filterHelper.toggleOption('Puzzle ITC')
+      .toggleOption('LoremIpsum');
+
+    cy.contains('Kein Team ausgewählt');
+  });
+
+  it('should change query params to reflect selected teams', () => {
+    const filterHelper = FilterHelper.do()
+      .optionShouldBeSelected('Puzzle ITC')
+      .optionShouldBeSelected('LoremIpsum')
+      .optionShouldNotBeSelected('Alle')
+      .optionShouldNotBeSelected('/BBT')
+      .optionShouldNotBeSelected('we are cube');
+
+    filterHelper.validateUrlParameter('teams', ['5',
+      '6']);
+
+    filterHelper.toggleOption('/BBT')
+      .validateUrlParameter('teams', ['4',
+        '5',
         '6']);
+    filterHelper.toggleOption('Puzzle ITC')
+      .toggleOption('LoremIpsum')
+      .toggleOption('/BBT');
+    cy.url()
+      .should('not.include', 'teams=');
+  });
+
+  it('should select teams from query params', () => {
+    cy.url()
+      .should('not.include', 'teams');
+
+    cy.visit('/?quarter=2&teams=4,5,8');
+    FilterHelper.do()
+      .optionShouldNotBeSelected('Alle')
+      .optionShouldBeSelected('/BBT')
+      .optionShouldBeSelected('Puzzle ITC')
+      .optionShouldBeSelected('we are cube')
+      .optionShouldNotBeSelected('LoremIpsum');
+  });
 
-      filterHelper.toggleOption('/BBT')
-        .validateUrlParameter('teams', ['4',
-          '5',
-          '6']);
-      filterHelper.toggleOption('Puzzle ITC')
-        .toggleOption('LoremIpsum')
-        .toggleOption('/BBT');
-      cy.url()
-        .should('not.include', 'teams=');
-    });
-
-    it('Select teams by url', () => {
-      cy.url()
-        .should('not.include', 'teams');
-
-      cy.visit('/?quarter=2&teams=4,5,8');
-      FilterHelper.do()
-        .optionShouldNotBeSelected('Alle')
-        .optionShouldBeSelected('/BBT')
-        .optionShouldBeSelected('Puzzle ITC')
-        .optionShouldBeSelected('we are cube')
-        .optionShouldNotBeSelected('LoremIpsum');
-    });
-
-    it('should display less button on mobile header', () => {
-      const teammanagementPage = TeammanagementPage.do()
-        .visitViaURL();
-      cy.intercept('POST', '**/teams')
-        .as('addTeam');
-
-      teammanagementPage.addTeam()
-        .fillName('X-Team')
-        .submit();
-      cy.wait('@addTeam');
-      cy.contains('X-Team');
-      teammanagementPage.addTeam()
-        .fillName('Y-Team')
-        .submit();
-      cy.wait('@addTeam');
-      cy.contains('Y-Team');
-      teammanagementPage.addTeam()
-        .fillName('Z-Team')
-        .submit();
-      cy.wait('@addTeam');
-      cy.contains('Z-Team');
-
-      teammanagementPage.visitOverview();
-
-      // set viewport to < 768 to trigger mobile header
-      cy.viewport(767, 1200);
-
-      cy.getByTestId('expansion-panel-header')
-        .click();
-      cy.contains('Weniger');
-
-      // reset viewport
-      cy.viewport(Cypress.config('viewportWidth'), Cypress.config('viewportHeight'));
-
-      cy.visit(`${teammanagementPage.getURL()}`);
-      cy.intercept('DELETE', '**/teams/*')
-        .as('deleteTeam');
-
-      teammanagementPage.deleteTeam('X-Team')
-        .submit();
-      cy.wait('@deleteTeam');
-
-      teammanagementPage.deleteTeam('Y-Team')
-        .submit();
-      cy.wait('@deleteTeam');
-
-      teammanagementPage.deleteTeam('Z-Team')
-        .submit();
-      cy.wait('@deleteTeam');
-    });
+  it('should display less button on mobile header', () => {
+    const teamManagementPage = TeamManagementPage.do()
+      .visitViaURL();
+    cy.intercept('POST', '**/teams')
+      .as('addTeam');
+
+    teamManagementPage.addTeam()
+      .fillName('X-Team')
+      .submit();
+    cy.wait('@addTeam');
+    cy.contains('X-Team');
+    teamManagementPage.addTeam()
+      .fillName('Y-Team')
+      .submit();
+    cy.wait('@addTeam');
+    cy.contains('Y-Team');
+    teamManagementPage.addTeam()
+      .fillName('Z-Team')
+      .submit();
+    cy.wait('@addTeam');
+    cy.contains('Z-Team');
+
+    teamManagementPage.visitOverview();
+
+    // set viewport to < 768 to trigger mobile header
+    cy.viewport(767, 1200);
+
+    cy.getByTestId('expansion-panel-header')
+      .click();
+    cy.contains('Weniger');
+
+    // reset viewport
+    cy.viewport(Cypress.config('viewportWidth'), Cypress.config('viewportHeight'));
+
+    cy.visit(`${teamManagementPage.getURL()}`);
+    cy.intercept('DELETE', '**/teams/*')
+      .as('deleteTeam');
+
+    teamManagementPage.deleteTeam('X-Team')
+      .submit();
+    cy.wait('@deleteTeam');
+
+    teamManagementPage.deleteTeam('Y-Team')
+      .submit();
+    cy.wait('@deleteTeam');
+
+    teamManagementPage.deleteTeam('Z-Team')
+      .submit();
+    cy.wait('@deleteTeam');
   });
 });
diff --git a/frontend/cypress/e2e/teammanagement.cy.ts b/frontend/cypress/e2e/teammanagement.cy.ts
index 07432f14fc..e69de29bb2 100644
--- a/frontend/cypress/e2e/teammanagement.cy.ts
+++ b/frontend/cypress/e2e/teammanagement.cy.ts
@@ -1,595 +0,0 @@
-import * as users from '../fixtures/users.json';
-import { uniqueSuffix } from '../support/helper/utils';
-import ConfirmDialog from '../support/helper/dom-helper/dialogs/confirmDialog';
-import TeammanagementPage from '../support/helper/dom-helper/pages/teammanagementPage';
-import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage';
-import InviteMembersDialog from '../support/helper/dom-helper/dialogs/inviteMembersDialog';
-import FilterHelper from '../support/helper/dom-helper/filterHelper';
-
-describe('Team management tests', () => {
-  const teamName = uniqueSuffix('New Team');
-  const nameEsha = users.bl.name;
-
-  describe('Routing to overview', () => {
-    beforeEach(() => {
-      cy.loginAsUser(users.gl);
-    });
-
-    it('should preserve team filter', () => {
-      CyOverviewPage.do()
-        .visitViaURL();
-      FilterHelper.do()
-        .toggleOption('/BBT')
-        .toggleOption('Puzzle ITC');
-      checkTeamsSelected();
-      CyOverviewPage.do()
-        .visitTeammanagement();
-      checkTeamsSelected();
-      TeammanagementPage.do()
-        .backToOverview();
-      checkTeamsSelected();
-      CyOverviewPage.do()
-        .visitTeammanagement();
-      TeammanagementPage.do()
-        .visitOverview();
-      checkTeamsSelected();
-    });
-
-    function checkTeamsSelected() {
-      FilterHelper.do()
-        .optionShouldBeSelected('LoremIpsum')
-        .optionShouldBeSelected('/BBT');
-    }
-  });
-
-  describe('As GL', () => {
-    let teammanagementPage: TeammanagementPage;
-    before(() => {
-      // login as bl to ensure this user exists in database
-      cy.loginAsUser(users.bl);
-      cy.getByTestId('user-name')
-        .click();
-      cy.getByTestId('logout')
-        .click();
-    });
-
-    beforeEach(() => {
-      cy.loginAsUser(users.gl);
-      teammanagementPage = TeammanagementPage.do()
-        .visitViaURL();
-    });
-
-    it('Create team', () => {
-      cy.intercept('POST', '**/teams')
-        .as('addTeam');
-
-      teammanagementPage.addTeam()
-        .fillName(teamName)
-        .submit();
-      cy.wait('@addTeam');
-      cy.contains(teamName);
-    });
-
-    it('Try to remove last admin of team should not work', () => {
-      cy.intercept('PUT', '**/removeuser')
-        .as('removeUser');
-
-      cy.get('app-team-list .mat-mdc-list-item')
-        .contains(teamName)
-        .click();
-      cy.getByTestId('member-list-more')
-        .click();
-      cy.getByTestId('remove-from-member-list')
-        .click();
-
-      ConfirmDialog.do()
-        .checkTitle('Mitglied entfernen')
-        .checkDescription(`Möchtest du Jaya Norris wirklich aus dem Team '${teamName}' entfernen?`)
-        .submit();
-
-      cy.wait('@removeUser');
-
-      cy.contains('Der letzte Administrator eines Teams kann nicht entfernt werden')
-        .should('exist');
-    });
-
-    it('clicking cancel in dialog when removing user should not remove user', () => {
-      cy.intercept('PUT', '**/removeuser')
-        .as('removeUser');
-
-      cy.get('app-team-list .mat-mdc-list-item')
-        .contains(teamName)
-        .click();
-      cy.getByTestId('member-list-more')
-        .click();
-      cy.getByTestId('remove-from-member-list')
-        .click();
-
-      // cancel dialog
-      ConfirmDialog.do()
-        .checkTitle('Mitglied entfernen')
-        .checkDescription(`Möchtest du Jaya Norris wirklich aus dem Team '${teamName}' entfernen?`)
-        .cancel();
-
-      cy.get('@removeUser.all')
-        .then((interceptions) => {
-          expect(interceptions).to.have.length(0);
-        });
-    });
-
-    it('Edit team', () => {
-      cy.intercept('GET', '**/users')
-        .as('getUsers');
-      cy.intercept('GET', '**/teams')
-        .as('getTeams');
-
-      cy.get('app-team-list .mat-mdc-list-item')
-        .contains('LoremIpsum')
-        .click();
-      editTeamNameAndTest('IpsumLorem');
-      cy.visit('team-management');
-
-      cy.wait(['@getUsers',
-        '@getTeams']);
-
-      cy.contains('LoremIpsum')
-        .should('not.exist');
-      cy.contains('IpsumLorem')
-        .should('exist');
-      // set old team name again
-      cy.get('app-team-list .mat-mdc-list-item')
-        .contains('IpsumLorem')
-        .click();
-      editTeamNameAndTest('LoremIpsum');
-    });
-
-    it('Delete team', () => {
-      // Click delete button and cancel
-      teammanagementPage.deleteTeam(teamName)
-        .cancel();
-
-      // try again and confirm dialog
-      teammanagementPage.deleteTeam(teamName)
-        .submit();
-    });
-
-    describe('Search', () => {
-      it('Search user', () => {
-        teammanagementPage.elements
-          .teamSearch()
-          .fill('pa')
-          .shouldHaveOption('Paco Eggimann (peggimann@puzzle.ch)')
-          .shouldHaveOption('Paco Egiman (egiman@puzzle.ch)')
-          .selectOption('Robin Papierer (papierer@puzzle.ch)');
-
-        cy.contains('app-member-detail h2', 'Robin Papierer');
-      });
-
-      it('Search team', () => {
-        teammanagementPage.elements.teamSearch()
-          .fill('we are')
-          .selectOption('we are cube.³');
-
-        cy.contains('app-member-list h2', 'we are cube.³');
-      });
-
-      it('Search mixed', () => {
-        teammanagementPage.elements
-          .teamSearch()
-          .fill('puz')
-          .shouldHaveLabel('Members')
-          .shouldHaveLabel('Teams')
-          .shouldHaveOption('Paco Eggimann (peggimann@puzzle.ch)')
-          .shouldHaveOption('Paco Egiman (egiman@puzzle.ch)')
-          .shouldHaveOption('Robin Papierer (papierer@puzzle.ch)')
-          .shouldHaveOption('Puzzle ITC');
-      });
-    });
-
-    describe('invite members', () => {
-      it('invite two members', () => {
-        teammanagementPage.elements.registerMember()
-          .click();
-        const firstNames = InviteMembersDialog.do()
-          .enterUser('Claudia', 'Meier', 'claudia.meier@test.ch')
-          .addAnotherUser()
-          .enterUser('Stefan', 'Schmidt', 'stefan.schmidt@test.ch')
-          .addAnotherUser()
-          .getFirstNames();
-
-        // test error messages
-        fillOutNewUser('Robin', '', 'papierer');
-        cy.getByTestId('invite')
-          .click();
-        cy.contains('Angabe benötigt');
-        cy.contains('E-Mail ungültig');
-        cy.getByTestId('email-col_2')
-          .focus();
-        cy.realType('@puzzle.ch');
-        cy.contains('E-Mail ungültig')
-          .should('not.exist');
-        cy.contains('E-Mail existiert bereits');
-        cy.tabBackward();
-        cy.realType('Papirer');
-        cy.contains('Angabe benötigt')
-          .should('not.exist');
-
-        // delete last entry
-        cy.tabForward();
-        cy.tabForward();
-        cy.realPress('Enter');
-        cy.contains('papiererr@puzzle.ch')
-          .should('not.exist');
-
-        // save
-        cy.getByTestId('invite')
-          .click();
-        cy.contains('Die Members wurden erfolgreich registriert');
-        firstNames.forEach((email) => cy.contains(email));
-      });
-    });
-
-    it('Navigate to Bobs profile and add him to BBT and LoremIpsum', () => {
-      cy.intercept('PUT', '**/updateaddteammembership/*')
-        .as('updateEsha');
-
-      navigateToUser(nameEsha);
-
-      // add to team bbt as admin
-      cy.get('app-member-detail')
-        .findByTestId('add-user')
-        .click();
-      cy.get('app-member-detail')
-        .findByTestId('select-team-dropdown')
-        .click();
-      cy.getByTestId('select-team-dropdown-option')
-        .contains('/BBT')
-        .click();
-      cy.get('app-member-detail')
-        .findByTestId('select-team-role')
-        .click();
-      cy.getByTestId('select-team-role-admin')
-        .click();
-      cy.get('app-member-detail')
-        .findByTestId('add-user-to-team-save')
-        .click();
-
-      cy.wait('@updateEsha');
-
-      // add to team loremipsum as member
-      cy.get('app-member-detail')
-        .findByTestId('add-user')
-        .click();
-      cy.get('app-member-detail')
-        .findByTestId('select-team-dropdown')
-        .click();
-
-      // team BBT should not be in list anymore
-      cy.getByTestId('select-team-dropdown-option')
-        .should('not.contain', '/BBT');
-
-      cy.getByTestId('select-team-dropdown-option')
-        .contains('LoremIpsum')
-        .click();
-      cy.get('app-member-detail')
-        .findByTestId('select-team-role')
-        .click();
-      cy.getByTestId('select-team-role-member')
-        .click();
-      cy.get('app-member-detail')
-        .findByTestId('add-user-to-team-save')
-        .click();
-
-      cy.wait('@updateEsha');
-      // check table
-      checkRolesForEsha();
-
-      closeOverlay();
-
-      let foundEsha = false;
-      cy.get('app-member-list tbody tr')
-        .each(($row) => {
-          const usernameCell = $row.find('td:nth-child(2)');
-          if (usernameCell.text()
-            .trim() === nameEsha) {
-            foundEsha = true;
-            const roleCell = $row.find('td:nth-child(3)');
-            const teamsCell = $row.find('td:nth-child(4)');
-            expect(roleCell.text()
-              .trim()).to.equal('Team-Admin, Team-Member');
-            expect(teamsCell.text()
-              .trim()).to.equal('/BBT, LoremIpsum');
-            return false;
-          }
-          return true;
-        })
-        .then(() => {
-          expect(foundEsha).to.be.true;
-        });
-    });
-
-    it('Navigate to user Esha and set as okr champion', () => {
-      navigateToUser(nameEsha);
-      cy.getByTestId('edit-okr-champion-readonly')
-        .contains('OKR Champion:');
-      cy.getByTestId('edit-okr-champion-readonly')
-        .contains('Nein');
-      cy.getByTestId('edit-okr-champion-edit')
-        .click();
-      cy.getByTestId('edit-okr-champion-readonly')
-        .should('not.exist');
-      cy.getByTestId('edit-okr-champion-checkbox')
-        .click();
-      cy.getByTestId('edit-okr-champion-readonly')
-        .contains('OKR Champion:');
-      cy.getByTestId('edit-okr-champion-readonly')
-        .contains('Ja');
-      cy.contains('Der Member wurde erfolgreich aktualisiert.');
-
-      // reset okr champion to false
-      cy.getByTestId('edit-okr-champion-edit')
-        .click();
-      cy.getByTestId('edit-okr-champion-checkbox')
-        .click();
-      cy.getByTestId('edit-okr-champion-readonly')
-        .contains('OKR Champion:');
-      cy.getByTestId('edit-okr-champion-readonly')
-        .contains('Nein');
-
-      // test click outside of element
-      cy.getByTestId('edit-okr-champion-edit')
-        .click();
-      cy.get('app-member-detail')
-        .find('h2')
-        .click();
-      // checkbox should hide again
-      cy.getByTestId('edit-okr-champion-readonly')
-        .contains('OKR Champion:');
-      cy.getByTestId('edit-okr-champion-readonly')
-        .contains('Nein');
-    });
-  });
-
-  describe('As BL', () => {
-    beforeEach(() => {
-      cy.loginAsUser(users.bl);
-      cy.getByTestId('team-management')
-        .click();
-      cy.intercept('GET', '**/users/*')
-        .as('getEsha');
-    });
-
-    it('should check if correct roles for BL are set', () => {
-      cy.get('td')
-        .contains(nameEsha)
-        .click();
-      cy.wait('@getEsha');
-
-      checkRolesForEsha();
-      closeOverlay();
-    });
-
-    it('should check if team loremIpsum cannot be edited', () => {
-      cy.get('app-team-management')
-        .contains('LoremIpsum')
-        .click();
-      cy.getByTestId('teamMoreButton')
-        .should('not.exist');
-      cy.getByTestId('editTeamButton')
-        .should('not.exist');
-      cy.getByTestId('member-list-more')
-        .should('not.exist');
-      cy.getByTestId('edit-role')
-        .should('not.exist');
-    });
-
-    it('should check if team /BBT can be edited and edit name', () => {
-      cy.get('app-team-management')
-        .contains('/BBT')
-        .click();
-      cy.getByTestId('teamMoreButton')
-        .should('exist');
-      editTeamNameAndTest('/BBT_edit');
-      // restore old name
-      editTeamNameAndTest('/BBT');
-    });
-
-    it('should add members to team /BBT', () => {
-      cy.get('app-team-management')
-        .contains('/BBT')
-        .click();
-      cy.getByTestId('add-team-member')
-        .click();
-      cy.getByTestId('search-member-to-add')
-        .click();
-
-      // esha should not exist (is already member of team)
-      const matOption = '.cdk-overlay-container mat-option';
-      cy.get(matOption)
-        .contains(nameEsha)
-        .should('not.exist');
-
-      // add findus peterson
-      cy.getByTestId('search-member-to-add')
-        .as('member-search')
-        .click();
-      cy.get('@member-search')
-        .type('Find');
-      cy.contains(matOption, 'Findus Peterson')
-        .click();
-
-      // add robin papierer
-      cy.getByTestId('search-member-to-add')
-        .click();
-      cy.get(matOption)
-        .contains('Findus Peterson')
-        .should('not.exist');
-      cy.get(matOption)
-        .contains('Robin Papierer')
-        .click();
-
-      // check if Findus and Robin exists in table
-      const allMemberTableTr = '#all-member-table tbody tr';
-      cy.get(allMemberTableTr)
-        .eq(0)
-        .should('contain', 'Findus Peterson');
-      cy.get(allMemberTableTr)
-        .eq(1)
-        .should('contain', 'Robin Papierer');
-
-      // remove robin papierer from list
-      cy.get(allMemberTableTr + ' button')
-        .eq(1)
-        .click();
-      cy.get(allMemberTableTr)
-        .eq(1)
-        .should('not.exist');
-
-      cy.getByTestId('save')
-        .click();
-    });
-
-    it('should change role of Findus Peterson to Team Admin', () => {
-      cy.get('app-team-management')
-        .contains('/BBT')
-        .click();
-
-      cy.get('app-member-list tbody tr')
-        .each(($row) => {
-          const usernameCell = $row.find('td:nth-child(2)');
-          if (usernameCell.text()
-            .trim() !== 'Findus Peterson') {
-            return;
-          }
-          $row.find(`[data-testId='edit-role']`)
-            .click();
-          cy.wait(500); // wait for dialog to open
-        })
-        .then(() => {
-          cy.getByTestId('select-team-role')
-            .click();
-          cy.getByTestId('select-team-role-admin')
-            .click();
-          cy.getByTestId('select-team-role')
-            .should('not.exist');
-          cy.contains('Das Team wurde erfolgreich aktualisiert.');
-        });
-    });
-
-    it('should test that Findus Peterson cannot be added to further teams', () => {
-      navigateToUser('Findus Peterson');
-
-      /*
-       * current user BL (Esha Harris) is only admin in /BBT team.
-       * That's why 'add-team-member' should be disabled
-       */
-      cy.get('app-member-detail')
-        .getByTestId('add-user')
-        .should('be.disabled');
-    });
-
-    it('should remove BBT membership of findus', () => {
-      navigateToUser('Findus Peterson');
-      cy.getByTestId('delete-team-member')
-        .click();
-
-      ConfirmDialog.do()
-        .checkTitle('Mitglied entfernen')
-        .checkDescription(`Möchtest du Findus Peterson wirklich aus dem Team '/BBT' entfernen?`)
-        .submit();
-
-      cy.get('app-member-detail')
-        .contains('/BBT')
-        .should('not.exist');
-    });
-
-    it('should remove added memberships from esha', () => {
-      cy.intercept('PUT', '**/removeuser')
-        .as('removeUser');
-
-      navigateToUser(nameEsha);
-      cy.getByTestId('delete-team-member')
-        .eq(0)
-        .click();
-
-      ConfirmDialog.do()
-        .checkTitle('Mitglied entfernen')
-        .checkDescription(`Möchtest du ${nameEsha} wirklich aus dem Team '/BBT' entfernen?`)
-        .submit();
-
-      cy.wait('@removeUser');
-
-      cy.getByTestId('delete-team-member')
-        .eq(0)
-        .click();
-
-      ConfirmDialog.do()
-        .checkTitle('Mitglied entfernen')
-        .checkDescription(`Möchtest du ${nameEsha} wirklich aus dem Team 'LoremIpsum' entfernen?`)
-        .submit();
-
-      cy.get('app-member-detail')
-        .should('not.contain', '/BBT')
-        .and('not.contain', 'LoremIpsum');
-    });
-
-    it('Navigate to user Esha and check if okr champion is not editable', () => {
-      navigateToUser(nameEsha);
-      cy.getByTestId('edit-okr-champion-readonly')
-        .should('exist');
-      cy.getByTestId('edit-okr-champion-edit')
-        .should('not.exist');
-    });
-  });
-});
-
-function closeOverlay() {
-  cy.get('.cdk-overlay-backdrop')
-    .click(-50, -50, { force: true });
-}
-
-function checkRolesForEsha() {
-  cy.get('app-member-detail tbody tr')
-    .eq(0)
-    .should('contain', '/BBT')
-    .and('contain', 'Team-Admin');
-  cy.get('app-member-detail tbody tr')
-    .eq(1)
-    .should('contain', 'LoremIpsum')
-    .and('contain', 'Team-Member');
-}
-
-function editTeamNameAndTest(teamName: string) {
-  cy.intercept('PUT', '**/teams/*')
-    .as('saveTeam');
-  cy.getByTestId('editTeamButton')
-    .click();
-  cy.getByTestId('add-team-name')
-    .as('team-name')
-    .click();
-  cy.get('@team-name')
-    .clear();
-  cy.get('@team-name')
-    .type(teamName);
-  cy.getByTestId('save')
-    .click();
-  cy.wait('@saveTeam');
-  cy.contains(teamName);
-}
-
-function navigateToUser(userName: string) {
-  cy.intercept('GET', '**/users/*')
-    .as('getUser');
-  cy.get('td')
-    .contains(userName)
-    .click();
-  cy.wait('@getUser');
-}
-
-function fillOutNewUser(firstname: string, lastname: string, email: string) {
-  cy.realType(firstname);
-  cy.tabForward();
-  cy.realType(lastname);
-  cy.tabForward();
-  cy.realType(email);
-}
diff --git a/frontend/cypress/support/commands.ts b/frontend/cypress/support/commands.ts
index 44e1c93e5a..e8a1ce80f8 100644
--- a/frontend/cypress/support/commands.ts
+++ b/frontend/cypress/support/commands.ts
@@ -66,7 +66,7 @@ function loginWithCredentials(username: string, password: string) {
   cy.visit('/');
   cy.intercept('GET', '**/users/current')
     .as('getCurrentUser');
-  cy.origin(Cypress.env('login_url'), { args: { username,
+  cy.origin(Cypress.env('LOGIN_URL'), { args: { username,
     password } }, ({ username, password }) => {
     cy.get('input[name="username"]')
       .type(username);
@@ -79,9 +79,9 @@ function loginWithCredentials(username: string, password: string) {
   cy.url()
     .then((url) => {
       const currentUrl = new URL(url);
-      const baseURL = new URL(Cypress.config().baseUrl!);
+      const baseUrl = new URL(Cypress.config().baseUrl!);
       expect(currentUrl.pathname)
-        .equal(baseURL.pathname);
+        .equal(baseUrl.pathname);
     });
 }
 
diff --git a/frontend/cypress/support/helper/dom-helper/dialogs/inviteMembersDialog.ts b/frontend/cypress/support/helper/dom-helper/dialogs/inviteMembersDialog.ts
index 01379e7966..450b97edc7 100644
--- a/frontend/cypress/support/helper/dom-helper/dialogs/inviteMembersDialog.ts
+++ b/frontend/cypress/support/helper/dom-helper/dialogs/inviteMembersDialog.ts
@@ -3,7 +3,7 @@ import { uniqueSuffix } from '../../utils';
 import Chainable = Cypress.Chainable;
 
 export default class InviteMembersDialog extends Dialog {
-  private readonly firstnames: string[] = [];
+  private readonly firstNames: string[] = [];
 
   override validatePage() {
     super.validatePage();
@@ -15,10 +15,10 @@ export default class InviteMembersDialog extends Dialog {
   enterUser(firstName: string, lastName: string, email: string) {
     firstName = uniqueSuffix(firstName);
     email = uniqueSuffix(email);
-    this.firstnames.push(firstName);
-    const firstNameInput = cy.get('[formcontrolname="firstname"]')
+    this.firstNames.push(firstName);
+    const firstNameInput = cy.get('[formcontrolname="firstName"]')
       .last();
-    const lastNameInput = cy.get('[formcontrolname="lastname"]')
+    const lastNameInput = cy.get('[formcontrolname="lastName"]')
       .last();
     const emailInput = cy.get('[formcontrolname="email"]')
       .last();
@@ -34,14 +34,14 @@ export default class InviteMembersDialog extends Dialog {
     return this;
   }
 
-  getFirstNames() {
-    return this.firstnames;
+  getFirstnames() {
+    return this.firstNames;
   }
 
   override submit() {
     cy.getByTestId('invite')
       .click();
-    return this.firstnames;
+    return this.firstNames;
   }
 
   getPage(): Chainable {
diff --git a/frontend/cypress/support/helper/dom-helper/dialogs/keyResultDialog.ts b/frontend/cypress/support/helper/dom-helper/dialogs/keyResultDialog.ts
index b724f5131a..c8483fd139 100644
--- a/frontend/cypress/support/helper/dom-helper/dialogs/keyResultDialog.ts
+++ b/frontend/cypress/support/helper/dom-helper/dialogs/keyResultDialog.ts
@@ -5,36 +5,36 @@ import Chainable = Cypress.Chainable;
 
 export default class KeyResultDialog extends Dialog {
   fillKeyResultTitle(title: string) {
-    this.fillInputByTestId('titleInput', title);
+    this.fillInputByTestId('title-input', title);
     return this;
   }
 
   fillKeyResultDescription(description: string) {
-    this.fillInputByTestId('descriptionInput', description);
+    this.fillInputByTestId('description-input', description);
     return this;
   }
 
   withMetricValues(unit: Unit, baseline: string, stretchGoal: string) {
-    cy.getByTestId('metricTab')
+    cy.getByTestId('metric-tab')
       .click();
     cy.getByTestId('unit')
       .select(unit);
     this.fillInputByTestId('baseline', baseline);
-    this.fillInputByTestId('stretchGoal', stretchGoal);
+    this.fillInputByTestId('stretch-goal', stretchGoal);
     return this;
   }
 
   withOrdinalValues(commitZone: string, targetZone: string, stretchGoal: string) {
-    cy.getByTestId('ordinalTab')
+    cy.getByTestId('ordinal-tab')
       .click();
-    this.fillInputByTestId('commitZone', commitZone);
-    this.fillInputByTestId('targetZone', targetZone);
-    this.fillInputByTestId('stretchZone', stretchGoal);
+    this.fillInputByTestId('commit-zone', commitZone);
+    this.fillInputByTestId('target-zone', targetZone);
+    this.fillInputByTestId('stretch-zone', stretchGoal);
     return this;
   }
 
   fillOwner(owner: string) {
-    this.fillInputByTestId('ownerInput', owner);
+    this.fillInputByTestId('owner-input', owner);
     cy.realPress('ArrowDown')
       .realPress('Enter');
     return this;
@@ -43,7 +43,7 @@ export default class KeyResultDialog extends Dialog {
   addActionPlanElement(action: string) {
     cy.getByTestId('add-action-plan-line')
       .click();
-    cy.getByTestId('actionInput')
+    cy.getByTestId('action-input')
       .filter((k, el) => {
         return (el as HTMLInputElement).value.trim() === '';
       })
@@ -53,7 +53,7 @@ export default class KeyResultDialog extends Dialog {
   }
 
   deleteKeyResult() {
-    cy.getByTestId('delete-keyResult')
+    cy.getByTestId('delete-key-result')
       .click();
     return new ConfirmDialog();
   }
@@ -94,7 +94,7 @@ export default class KeyResultDialog extends Dialog {
   }
 
   saveAndNew() {
-    cy.getByTestId('saveAndNew')
+    cy.getByTestId('save-and-new')
       .click();
   }
 
diff --git a/frontend/cypress/support/helper/dom-helper/filterHelper.ts b/frontend/cypress/support/helper/dom-helper/filterHelper.ts
index 36bb077a4a..aab16bf130 100644
--- a/frontend/cypress/support/helper/dom-helper/filterHelper.ts
+++ b/frontend/cypress/support/helper/dom-helper/filterHelper.ts
@@ -3,8 +3,8 @@ import { PageObjectMapperBase } from './pageObjectMapperBase';
 export default class FilterHelper extends PageObjectMapperBase {
   validatePage(): void {}
 
-  optionShouldBeSelected(text: string, onOverview = true): this {
-    if (onOverview) {
+  optionShouldBeSelected(text: string, isOnOverview = true): this {
+    if (isOnOverview) {
       cy.contains('h1:visible', text)
         .should('have.length', 1);
     }
diff --git a/frontend/cypress/support/helper/dom-helper/pageObjectMapperBase.ts b/frontend/cypress/support/helper/dom-helper/pageObjectMapperBase.ts
index ac4a103a8e..f3e4948188 100644
--- a/frontend/cypress/support/helper/dom-helper/pageObjectMapperBase.ts
+++ b/frontend/cypress/support/helper/dom-helper/pageObjectMapperBase.ts
@@ -17,14 +17,14 @@ export abstract class PageObjectMapperBase {
     return this;
   }
 
-  validateUrlParameter(key: string, value: any[]) {
+  validateUrlParameter(key: string, values: any[]) {
     cy.url()
       .then((url) => {
         const params = new URL(url).searchParams;
         const queryParamValues = params.get(key)
           ?.split(',');
-        expect(queryParamValues).to.have.length(value.length);
-        value.forEach((v) => expect(queryParamValues).to.include(v));
+        expect(queryParamValues).to.have.length(values.length);
+        values.forEach((v) => expect(queryParamValues).to.include(v));
       });
   }
 }
diff --git a/frontend/cypress/support/helper/dom-helper/pages/overviewPage.ts b/frontend/cypress/support/helper/dom-helper/pages/overviewPage.ts
index 7e302c890b..87b20f8ccc 100644
--- a/frontend/cypress/support/helper/dom-helper/pages/overviewPage.ts
+++ b/frontend/cypress/support/helper/dom-helper/pages/overviewPage.ts
@@ -7,7 +7,7 @@ import { filterByKeyResultName, getKeyResults } from '../../keyResultHelper';
 export default class CyOverviewPage extends Page {
   elements = {
     logo: () => cy.getByTestId('logo'),
-    teammanagement: () => cy.getByTestId('team-management')
+    teamManagement: () => cy.getByTestId('team-management')
   };
 
   visitGJForTests() {
@@ -47,21 +47,21 @@ export default class CyOverviewPage extends Page {
   addKeyResult(teamName?: string, objectiveName?: string) {
     if (teamName && objectiveName) {
       this.getObjectiveByTeamAndName(teamName, objectiveName)
-        .findByTestId('add-keyResult')
+        .findByTestId('add-key-result')
         .first()
         .click();
     } else if (teamName) {
       this.getTeamByName(teamName)
-        .findByTestId('add-keyResult')
+        .findByTestId('add-key-result')
         .first()
         .click();
     } else if (objectiveName) {
       this.getObjectiveByName(objectiveName)
-        .findByTestId('add-keyResult')
+        .findByTestId('add-key-result')
         .first()
         .click();
     } else {
-      cy.getByTestId('add-keyResult')
+      cy.getByTestId('add-key-result')
         .first()
         .click();
     }
@@ -71,7 +71,7 @@ export default class CyOverviewPage extends Page {
 
   addOngoingKeyResult() {
     this.getObjectiveByState('ongoing')
-      .findByTestId('add-keyResult')
+      .findByTestId('add-key-result')
       .first()
       .click();
 
@@ -158,9 +158,9 @@ export default class CyOverviewPage extends Page {
     return cy.get('@keyResult');
   }
 
-  getKeyResultsByName(keyresultName: string) {
+  getKeyResultsByName(keyResultName: string) {
     return getKeyResults()
-      .filter(filterByKeyResultName(keyresultName));
+      .filter(filterByKeyResultName(keyResultName));
   }
 
   selectFromThreeDotMenu(optionName: string) {
@@ -187,8 +187,8 @@ export default class CyOverviewPage extends Page {
     return new ObjectiveDialog();
   }
 
-  visitTeammanagement(): void {
-    this.elements.teammanagement()
+  visitTeamManagement(): void {
+    this.elements.teamManagement()
       .click();
   }
 
diff --git a/frontend/cypress/support/helper/dom-helper/pages/teamManagementPage.ts b/frontend/cypress/support/helper/dom-helper/pages/teamManagementPage.ts
new file mode 100644
index 0000000000..7448750447
--- /dev/null
+++ b/frontend/cypress/support/helper/dom-helper/pages/teamManagementPage.ts
@@ -0,0 +1,74 @@
+import { Page } from './page';
+import TeamDialog from '../dialogs/teamDialog';
+import AngularSearchBox from '../angularSearchBox';
+import ConfirmDialog from '../dialogs/confirmDialog';
+
+export default class TeamManagementPage extends Page {
+  elements = {
+    logo: () => cy.getByTestId('logo'),
+    teamManagement: () => cy.getByTestId('team-management'),
+    backToOverview: () => cy.getByTestId('routerLink-to-overview'),
+    teamMenu: () => cy.get('app-team-list'),
+    memberHeader: () => cy.get('#member-header'),
+    registerMember: () => cy.getByTestId('invite-member'),
+    addTeam: () => cy.getByTestId('add-team'),
+    teamSearch: () => AngularSearchBox.from('app-team-management-banner [data-testId="teamManagementSearch"]')
+  };
+
+  override validatePage() {
+    this.elements.teamManagement()
+      .contains('Teamverwaltung');
+    this.elements.backToOverview()
+      .contains('Zurück zur OKR Übersicht');
+    this.elements.addTeam()
+      .contains('Team erfassen');
+    this.elements.teamMenu()
+      .contains('Alle Teams');
+    this.elements.memberHeader()
+      .contains('Alle Teams');
+    this.elements.memberHeader()
+      .contains('Members:');
+    this.elements.registerMember()
+      .contains('Member registrieren');
+  }
+
+  protected doVisit(): this {
+    this.elements.logo()
+      .click();
+    return this;
+  }
+
+  backToOverview(): void {
+    this.elements.backToOverview()
+      .click();
+  }
+
+  visitOverview(): void {
+    this.elements.logo()
+      .click();
+  }
+
+  addTeam(): TeamDialog {
+    this.elements.addTeam()
+      .click();
+    return new TeamDialog();
+  }
+
+  deleteTeam(teamName: string) {
+    cy.get('app-team-list .mat-mdc-list-item')
+      .contains(teamName)
+      .click();
+    cy.getByTestId('teamMoreButton')
+      .click();
+    cy.getByTestId('teamDeleteButton')
+      .click();
+
+    return ConfirmDialog.do()
+      .checkTitle('Team löschen')
+      .checkDescription(`Möchtest du das Team '${teamName}' wirklich löschen? Zugehörige Objectives werden dadurch in allen Quartalen ebenfalls gelöscht!`);
+  }
+
+  getURL(): string {
+    return 'team-management';
+  }
+}
diff --git a/frontend/cypress/support/helper/dom-helper/pages/teammanagementPage.ts b/frontend/cypress/support/helper/dom-helper/pages/teammanagementPage.ts
index 44af69d882..e69de29bb2 100644
--- a/frontend/cypress/support/helper/dom-helper/pages/teammanagementPage.ts
+++ b/frontend/cypress/support/helper/dom-helper/pages/teammanagementPage.ts
@@ -1,74 +0,0 @@
-import { Page } from './page';
-import TeamDialog from '../dialogs/teamDialog';
-import AngularSearchBox from '../angularSearchBox';
-import ConfirmDialog from '../dialogs/confirmDialog';
-
-export default class TeammanagementPage extends Page {
-  elements = {
-    logo: () => cy.getByTestId('logo'),
-    teammanagement: () => cy.getByTestId('team-management'),
-    backToOverview: () => cy.getByTestId('routerLink-to-overview'),
-    teamMenu: () => cy.get('app-team-list'),
-    memberHeader: () => cy.get('#member-header'),
-    registerMember: () => cy.getByTestId('invite-member'),
-    addTeam: () => cy.getByTestId('add-team'),
-    teamSearch: () => AngularSearchBox.from('app-team-management-banner [data-testId="teamManagementSearch"]')
-  };
-
-  override validatePage() {
-    this.elements.teammanagement()
-      .contains('Teamverwaltung');
-    this.elements.backToOverview()
-      .contains('Zurück zur OKR Übersicht');
-    this.elements.addTeam()
-      .contains('Team erfassen');
-    this.elements.teamMenu()
-      .contains('Alle Teams');
-    this.elements.memberHeader()
-      .contains('Alle Teams');
-    this.elements.memberHeader()
-      .contains('Members:');
-    this.elements.registerMember()
-      .contains('Member registrieren');
-  }
-
-  protected doVisit(): this {
-    this.elements.logo()
-      .click();
-    return this;
-  }
-
-  backToOverview(): void {
-    this.elements.backToOverview()
-      .click();
-  }
-
-  visitOverview(): void {
-    this.elements.logo()
-      .click();
-  }
-
-  addTeam(): TeamDialog {
-    this.elements.addTeam()
-      .click();
-    return new TeamDialog();
-  }
-
-  deleteTeam(teamName: string) {
-    cy.get('app-team-list .mat-mdc-list-item')
-      .contains(teamName)
-      .click();
-    cy.getByTestId('teamMoreButton')
-      .click();
-    cy.getByTestId('teamDeleteButton')
-      .click();
-
-    return ConfirmDialog.do()
-      .checkTitle('Team löschen')
-      .checkDescription(`Möchtest du das Team '${teamName}' wirklich löschen? Zugehörige Objectives werden dadurch in allen Quartalen ebenfalls gelöscht!`);
-  }
-
-  getURL(): string {
-    return 'team-management';
-  }
-}
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 26f879b242..3b7dd96e24 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -3808,9 +3808,9 @@
       }
     },
     "node_modules/@inquirer/figures": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.8.tgz",
-      "integrity": "sha512-tKd+jsmhq21AP1LhexC0pPwsCxEhGgAkg28byjJAd+xhmIs8LUX8JbUc3vBf3PhLxWiB5EvyBE5X7JSPAqMAqg==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.9.tgz",
+      "integrity": "sha512-BXvGj0ehzrngHTPTDqUoDT3NXL8U0RxUk2zJm2A66RhCEIWdtU1v6GuUqNAgArW4PQ9CinqIWyHdQgdwOj06zQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6050,17 +6050,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.1.tgz",
-      "integrity": "sha512-Ncvsq5CT3Gvh+uJG0Lwlho6suwDfUXH0HztslDf5I+F2wAFAZMRwYLEorumpKLzmO2suAXZ/td1tBg4NZIi9CQ==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.2.tgz",
+      "integrity": "sha512-adig4SzPLjeQ0Tm+jvsozSGiCliI2ajeURDGHjZ2llnA+A67HihCQ+a3amtPhUakd1GlwHxSRvzOZktbEvhPPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.18.1",
-        "@typescript-eslint/type-utils": "8.18.1",
-        "@typescript-eslint/utils": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1",
+        "@typescript-eslint/scope-manager": "8.18.2",
+        "@typescript-eslint/type-utils": "8.18.2",
+        "@typescript-eslint/utils": "8.18.2",
+        "@typescript-eslint/visitor-keys": "8.18.2",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -6080,17 +6080,17 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.1.tgz",
-      "integrity": "sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.2.tgz",
+      "integrity": "sha512-y7tcq4StgxQD4mDr9+Jb26dZ+HTZ/SkfqpXSiqeUXZHxOUyjWDKsmwKhJ0/tApR08DgOhrFAoAhyB80/p3ViuA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.18.1",
-        "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/typescript-estree": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1",
+        "@typescript-eslint/scope-manager": "8.18.2",
+        "@typescript-eslint/types": "8.18.2",
+        "@typescript-eslint/typescript-estree": "8.18.2",
+        "@typescript-eslint/visitor-keys": "8.18.2",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6106,14 +6106,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.1.tgz",
-      "integrity": "sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.2.tgz",
+      "integrity": "sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1"
+        "@typescript-eslint/types": "8.18.2",
+        "@typescript-eslint/visitor-keys": "8.18.2"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6124,14 +6124,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.1.tgz",
-      "integrity": "sha512-jAhTdK/Qx2NJPNOTxXpMwlOiSymtR2j283TtPqXkKBdH8OAMmhiUfP0kJjc/qSE51Xrq02Gj9NY7MwK+UxVwHQ==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.2.tgz",
+      "integrity": "sha512-AB/Wr1Lz31bzHfGm/jgbFR0VB0SML/hd2P1yxzKDM48YmP7vbyJNHRExUE/wZsQj2wUCvbWH8poNHFuxLqCTnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.18.1",
-        "@typescript-eslint/utils": "8.18.1",
+        "@typescript-eslint/typescript-estree": "8.18.2",
+        "@typescript-eslint/utils": "8.18.2",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -6148,9 +6148,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
-      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.2.tgz",
+      "integrity": "sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6162,14 +6162,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.1.tgz",
-      "integrity": "sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.2.tgz",
+      "integrity": "sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1",
+        "@typescript-eslint/types": "8.18.2",
+        "@typescript-eslint/visitor-keys": "8.18.2",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -6189,16 +6189,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.1.tgz",
-      "integrity": "sha512-8vikiIj2ebrC4WRdcAdDcmnu9Q/MXXwg+STf40BVfT8exDqBCUPdypvzcUPxEqRGKg9ALagZ0UWcYCtn+4W2iQ==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.2.tgz",
+      "integrity": "sha512-Cr4A0H7DtVIPkauj4sTSXVl+VBWewE9/o40KcF3TV9aqDEOWoXF3/+oRXNby3DYzZeCATvbdksYsGZzplwnK/Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.18.1",
-        "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/typescript-estree": "8.18.1"
+        "@typescript-eslint/scope-manager": "8.18.2",
+        "@typescript-eslint/types": "8.18.2",
+        "@typescript-eslint/typescript-estree": "8.18.2"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6213,13 +6213,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.1.tgz",
-      "integrity": "sha512-Vj0WLm5/ZsD013YeUKn+K0y8p1M0jPpxOkKdbD1wB0ns53a5piVY02zjf072TblEweAbcYiFiPoSMF3kp+VhhQ==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.2.tgz",
+      "integrity": "sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/types": "8.18.2",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -9107,9 +9107,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.74",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.74.tgz",
-      "integrity": "sha512-ck3//9RC+6oss/1Bh9tiAVFy5vfSKbRHAFh7Z3/eTRkEqJeWgymloShB17Vg3Z4nmDNp35vAd1BZ6CMW4Wt6Iw==",
+      "version": "1.5.76",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz",
+      "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==",
       "dev": true,
       "license": "ISC"
     },
@@ -9189,9 +9189,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz",
+      "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9994,9 +9994,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz",
+      "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -11229,9 +11229,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.0.tgz",
-      "integrity": "sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13448,9 +13448,9 @@
       }
     },
     "node_modules/memfs": {
-      "version": "4.15.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.15.0.tgz",
-      "integrity": "sha512-q9MmZXd2rRWHS6GU3WEm3HyiXZyyoA1DqdOhEq0lxPBmKb5S7IAOwX0RgUCwJfqjelDCySa5h8ujOy24LqsWcw==",
+      "version": "4.15.1",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.15.1.tgz",
+      "integrity": "sha512-ufCzgFwiVnR6R9cCYuvwznJdhdYXEvFl0hpnM4cCtVaVkHuqBR+6fo2sqt1SSMdp+uiHw9GyPZr3OMM5tqjSmQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -17170,22 +17170,22 @@
       "license": "MIT"
     },
     "node_modules/tldts": {
-      "version": "6.1.68",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.68.tgz",
-      "integrity": "sha512-JKF17jROiYkjJPT73hUTEiTp2OBCf+kAlB+1novk8i6Q6dWjHsgEjw9VLiipV4KTJavazXhY1QUXyQFSem2T7w==",
+      "version": "6.1.69",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.69.tgz",
+      "integrity": "sha512-Oh/CqRQ1NXNY7cy9NkTPUauOWiTro0jEYZTioGbOmcQh6EC45oribyIMJp0OJO3677r13tO6SKdWoGZUx2BDFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^6.1.68"
+        "tldts-core": "^6.1.69"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "6.1.68",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.68.tgz",
-      "integrity": "sha512-85TdlS/DLW/gVdf2oyyzqp3ocS30WxjaL4la85EArl9cHUR/nizifKAJPziWewSZjDZS71U517/i6ciUeqtB5Q==",
+      "version": "6.1.69",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.69.tgz",
+      "integrity": "sha512-nygxy9n2PBUFQUtAXAc122gGo+04/j5qr5TGQFZTHafTKYvmARVXt2cA5rgero2/dnXUfkdPtiJoKmrd3T+wdA==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index d73c397344..6329caf02e 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -2,13 +2,13 @@ import { inject, NgModule } from '@angular/core';
 import { ResolveFn, RouterModule, Routes } from '@angular/router';
 import { OverviewComponent } from './components/overview/overview.component';
 import { of } from 'rxjs';
-import { SidepanelComponent } from './shared/sidepanel/sidepanel.component';
+import { SidePanelComponent } from './shared/side-panel/side-panel.component';
 import { authGuard } from './guards/auth.guard';
 import { UserService } from './services/user.service';
 import { User } from './shared/types/model/User';
 import { OAuthService } from 'angular-oauth2-oidc';
 import { ObjectiveDetailComponent } from './components/objective-detail/objective-detail.component';
-import { KeyresultDetailComponent } from './components/keyresult-detail/keyresult-detail.component';
+import { KeyResultDetailComponent } from './components/key-result-detail/key-result-detail.component';
 
 const currentUserResolver: ResolveFn<User | undefined> = () => {
   const oauthService = inject(OAuthService);
@@ -28,14 +28,14 @@ const routes: Routes = [
     },
     children: [{
       path: 'details',
-      component: SidepanelComponent,
+      component: SidePanelComponent,
       children: [{
         path: 'objective/:id',
         component: ObjectiveDetailComponent
       },
       {
         path: 'keyresult/:id',
-        component: KeyresultDetailComponent
+        component: KeyResultDetailComponent
       }]
     }],
     canActivate: [authGuard]
diff --git a/frontend/src/app/app.component.spec.ts b/frontend/src/app/app.component.spec.ts
index 3d1bda7afb..da41e72992 100644
--- a/frontend/src/app/app.component.spec.ts
+++ b/frontend/src/app/app.component.spec.ts
@@ -17,7 +17,7 @@ import { OverviewComponent } from './components/overview/overview.component';
 import { ObjectiveDetailComponent } from './components/objective-detail/objective-detail.component';
 import { CommonModule } from '@angular/common';
 
-const oauthServiceMock = {
+const oAuthServiceMock = {
   configure(environment: AuthConfig): void {},
   initCodeFlow(): void {},
   setupAutomaticSilentRefresh(): void {},
@@ -63,7 +63,7 @@ describe('AppComponent', () => {
         CommonModule
       ],
       providers: [{ provide: OAuthService,
-        useValue: oauthServiceMock }],
+        useValue: oAuthServiceMock }],
       declarations: [AppComponent,
         OverviewComponent],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 053e984698..cbe6714480 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -37,8 +37,8 @@ import { TeamComponent } from './components/team/team.component';
 import { OverviewComponent } from './components/overview/overview.component';
 import { ObjectiveComponent } from './components/objective/objective.component';
 import { CommonModule, NgOptimizedImage } from '@angular/common';
-import { KeyresultComponent } from './components/keyresult/keyresult.component';
-import { KeyresultDetailComponent } from './components/keyresult-detail/keyresult-detail.component';
+import { KeyResultComponent } from './components/key-result/key-result.component';
+import { KeyResultDetailComponent } from './components/key-result-detail/key-result-detail.component';
 import { ObjectiveDetailComponent } from './components/objective-detail/objective-detail.component';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { ConfidenceComponent } from './components/confidence/confidence.component';
@@ -51,16 +51,16 @@ import { QuarterFilterComponent } from './components/quarter-filter/quarter-filt
 import { TeamFilterComponent } from './components/team-filter/team-filter.component';
 import { MatChipsModule } from '@angular/material/chips';
 import { Router } from '@angular/router';
-import { KeyresultTypeComponent } from './components/keyresult-type/keyresult-type.component';
+import { KeyResultTypeComponent } from './components/key-result-type/key-result-type.component';
 import { ObjectiveFilterComponent } from './components/objective-filter/objective-filter.component';
 import { ActionPlanComponent } from './components/action-plan/action-plan.component';
 import { CdkDrag, CdkDragHandle, CdkDropList } from '@angular/cdk/drag-drop';
 import { SharedModule } from './shared/shared.module';
-import { OauthInterceptor } from './interceptors/oauth.interceptor';
-import { ErrorInterceptor } from './interceptors/error-interceptor.service';
+import { OAuthInterceptor } from './interceptors/o-auth.interceptor';
+import { ErrorInterceptor } from './interceptors/error.interceptor';
 import { CustomRouter } from './shared/customRouter';
 import { KeyResultFormComponent } from './components/key-result-form/key-result-form.component';
-import { KeyresultDialogComponent } from './components/keyresult-dialog/keyresult-dialog.component';
+import { KeyResultDialogComponent } from './components/key-result-dialog/key-result-dialog.component';
 import { CheckInHistoryDialogComponent } from './components/check-in-history-dialog/check-in-history-dialog.component';
 import { CheckInFormMetricComponent } from './components/checkin/check-in-form-metric/check-in-form-metric.component';
 import { CheckInFormOrdinalComponent } from './components/checkin/check-in-form-ordinal/check-in-form-ordinal.component';
@@ -107,19 +107,19 @@ export const MY_FORMATS = {
     TeamComponent,
     OverviewComponent,
     ObjectiveComponent,
-    KeyresultComponent,
+    KeyResultComponent,
     ApplicationTopBarComponent,
     ConfidenceComponent,
-    KeyresultDetailComponent,
+    KeyResultDetailComponent,
     ObjectiveDetailComponent,
     ApplicationBannerComponent,
     QuarterFilterComponent,
     TeamFilterComponent,
-    KeyresultTypeComponent,
+    KeyResultTypeComponent,
     ObjectiveFilterComponent,
     ActionPlanComponent,
     KeyResultFormComponent,
-    KeyresultDialogComponent,
+    KeyResultDialogComponent,
     CheckInHistoryDialogComponent,
     CheckInFormMetricComponent,
     CheckInFormOrdinalComponent,
@@ -181,7 +181,7 @@ export const MY_FORMATS = {
     { provide: MAT_DATE_FORMATS,
       useValue: MY_FORMATS },
     { provide: HTTP_INTERCEPTORS,
-      useClass: OauthInterceptor,
+      useClass: OAuthInterceptor,
       multi: true },
     { provide: HTTP_INTERCEPTORS,
       useClass: ErrorInterceptor,
diff --git a/frontend/src/app/components/action-plan/action-plan.component.html b/frontend/src/app/components/action-plan/action-plan.component.html
index 364623195b..b53bef2fb5 100644
--- a/frontend/src/app/components/action-plan/action-plan.component.html
+++ b/frontend/src/app/components/action-plan/action-plan.component.html
@@ -1,5 +1,5 @@
 <div class="okr-form-row okr-form-label-input-container">
-  <label for="actionlist" class="okr-form-label">Action Plan (optional)</label>
+  <label for="action-list" class="okr-form-label">Action Plan (optional)</label>
   <div
     cdkDropList
     *ngIf="control?.getValue()"
@@ -7,7 +7,7 @@
     (keydown.enter)="preventAddingNewItems($event)"
     class="okr-form-col d-flex flex-column gap-2"
     (cdkDropListDropped)="drop($event)"
-    id="actionlist"
+    id="action-list"
   >
     <div
       class="action-point-item"
@@ -20,7 +20,6 @@
           class="icons"
           src="../../../assets/icons/drag_indicator.svg"
           alt="Drag indicator"
-          [attr.data-testId]="'dragIcon'"
         />
       </div>
       <input
@@ -31,7 +30,7 @@
         (input)="updateActionTexts(this.control.value!)"
         class="action-input"
         [value]="action.action"
-        [attr.data-testId]="'actionInput'"
+        [attr.data-testId]="'action-input'"
       />
       <img
         tabindex="0"
diff --git a/frontend/src/app/components/action-plan/action-plan.component.spec.ts b/frontend/src/app/components/action-plan/action-plan.component.spec.ts
index 5259e2c93e..943111a5fb 100644
--- a/frontend/src/app/components/action-plan/action-plan.component.spec.ts
+++ b/frontend/src/app/components/action-plan/action-plan.component.spec.ts
@@ -54,7 +54,7 @@ describe('ActionPlanComponent', () => {
       .toBeTruthy();
   });
 
-  it('should remove item from actionplan array', () => {
+  it('should remove item from action-plan array', () => {
     component.control = new BehaviorSubject<Action[] | null>([action1,
       action2]);
     actionServiceMock.deleteAction.mockReturnValue(of(null));
@@ -74,7 +74,7 @@ describe('ActionPlanComponent', () => {
       .toBe(0);
   });
 
-  it('should remove item from actionplan without opening dialog when action has no text and id', () => {
+  it('should remove item from action-plan without opening dialog when action has no text and id', () => {
     const dialogSpy = jest.spyOn(component.dialogService, 'open');
     component.control = new BehaviorSubject<Action[] | null>([action3]);
 
diff --git a/frontend/src/app/components/application-banner/application-banner.component.html b/frontend/src/app/components/application-banner/application-banner.component.html
index 62f600d334..6df0e795b5 100644
--- a/frontend/src/app/components/application-banner/application-banner.component.html
+++ b/frontend/src/app/components/application-banner/application-banner.component.html
@@ -1,4 +1,4 @@
-<div id="okrBanner" #okrBanner>
+<div id="okr-banner" #okrBanner>
   <div class="d-flex flex-row">
     <div class="w-100 h-100 m-0 d-flex" slot="content">
       <section class="d-none d-md-flex">
diff --git a/frontend/src/app/components/application-banner/application-banner.component.spec.ts b/frontend/src/app/components/application-banner/application-banner.component.spec.ts
index 339dbded88..16738c5b52 100644
--- a/frontend/src/app/components/application-banner/application-banner.component.spec.ts
+++ b/frontend/src/app/components/application-banner/application-banner.component.spec.ts
@@ -82,7 +82,7 @@ describe('ApplicationBannerComponent', () => {
       .toBeTruthy();
   });
 
-  it('should should hide banner if scrolled down', fakeAsync(() => {
+  it('should hide banner if scrolled down', fakeAsync(() => {
     // Set bannerHeight to default
     const bannerHeight = 160;
     // Scroll more than the height of the banner
@@ -97,7 +97,7 @@ describe('ApplicationBannerComponent', () => {
 
     // Assert that banner is hidden was changed
     fixture.detectChanges();
-    expect(fixture.debugElement.query(By.css('#okrBanner')).attributes['style'])
+    expect(fixture.debugElement.query(By.css('#okr-banner')).attributes['style'])
       .toContain('top: -' + (PUZZLE_TOP_BAR_HEIGHT + bannerHeight));
   }));
 
@@ -113,11 +113,11 @@ describe('ApplicationBannerComponent', () => {
 
     // Assert that banner is visible
     fixture.detectChanges();
-    expect(fixture.debugElement.query(By.css('#okrBanner')).attributes['style'])
+    expect(fixture.debugElement.query(By.css('#okr-banner')).attributes['style'])
       .toContain('top: ' + PUZZLE_TOP_BAR_HEIGHT);
   }));
 
-  it('should call setOKRBannerStyle() when changing header appearance', () => {
+  it('should call refreshBanner() when changing header appearance', () => {
     jest.spyOn(component, 'refreshBanner')
       .mockReturnValue();
 
@@ -131,7 +131,7 @@ describe('ApplicationBannerComponent', () => {
       .toHaveBeenCalled();
   });
 
-  it('should call correct method after call scroll()', () => {
+  it('should call changeHeaderAppearance() after calling scroll()', () => {
     jest.spyOn(component, 'changeHeaderAppearance');
 
     component.scroll();
diff --git a/frontend/src/app/components/application-top-bar/application-top-bar.component.html b/frontend/src/app/components/application-top-bar/application-top-bar.component.html
index 432fecbb55..43a9ea9ef5 100644
--- a/frontend/src/app/components/application-top-bar/application-top-bar.component.html
+++ b/frontend/src/app/components/application-top-bar/application-top-bar.component.html
@@ -1,11 +1,11 @@
-<div id="topBarHeight">
-  <div id="okrTopbar">
+<div id="top-bar-height">
+  <div id="okr-top-bar">
     <a
       routerLink="/"
       queryParamsHandling="preserve"
       class="d-flex h-100 align-items-center ps-4"
-    >
-      <img
+
+    >  <img
         [attr.data-testId]="'logo'"
         alt="okr-logo"
         height="32"
@@ -17,7 +17,7 @@
       <button
         routerLink="team-management"
         [attr.data-testId]="'team-management'"
-        class="topBarEntry btn visible-by-default"
+        class="top-bar-entry btn visible-by-default"
         queryParamsHandling="preserve"
       >
         <mat-icon
@@ -30,8 +30,8 @@
 
       <button
         *ngIf="this.helpSiteUrl | async as helpSiteUrl"
-        id="hilfeButton"
-        class="topBarEntry btn"
+        id="help-button"
+        class="top-bar-entry btn"
         [attr.data-testId]="'help-button'"
         (click)="window.open(helpSiteUrl, '_blank')"
       >
@@ -48,15 +48,15 @@
         (menuOpened)="menuIsOpen = true"
         [attr.data-testId]="'user-options'"
         [matMenuTriggerFor]="menu"
-        class="topBarEntry flex-nowrap btn"
+        class="top-bar-entry flex-nowrap btn"
       >
         <mat-icon
           aria-hidden="false"
           aria-label="person icon"
           fontIcon="person_outline"
-          id="topbar-user"
+          id="top-bar-user"
         ></mat-icon>
-        <span [attr.data-testId]="'user-name'" class="fw-normal fs-6 d-none d-md-flex">{{ userFullName }}</span>
+        <span [attr.data-testId]="'username'" class="fw-normal fs-6 d-none d-md-flex">{{ userFullName }}</span>
         <mat-icon *ngIf="!menuIsOpen">expand_more</mat-icon>
         <mat-icon *ngIf="menuIsOpen">expand_less</mat-icon>
       </button>
diff --git a/frontend/src/app/components/application-top-bar/application-top-bar.component.scss b/frontend/src/app/components/application-top-bar/application-top-bar.component.scss
index 30b03d13db..7870d88d89 100644
--- a/frontend/src/app/components/application-top-bar/application-top-bar.component.scss
+++ b/frontend/src/app/components/application-top-bar/application-top-bar.component.scss
@@ -1,6 +1,6 @@
 @import '../style/variables';
 
-#topBarHeight {
+#top-bar-height {
   height: $top-bar-height;
 }
 
@@ -8,7 +8,7 @@ span.d-none.d-md-flex {
   font-size: 16px;
 }
 
-#okrTopbar {
+#okr-top-bar {
   display: flex;
   position: fixed;
   top: 0;
@@ -19,7 +19,7 @@ span.d-none.d-md-flex {
   background-color: var(--okr-topbar-background-color);
 }
 
-.topBarEntry {
+.top-bar-entry {
   display: flex;
   justify-content: center;
   align-items: center;
diff --git a/frontend/src/app/components/application-top-bar/application-top-bar.component.ts b/frontend/src/app/components/application-top-bar/application-top-bar.component.ts
index dca10dac5a..91a1d197db 100644
--- a/frontend/src/app/components/application-top-bar/application-top-bar.component.ts
+++ b/frontend/src/app/components/application-top-bar/application-top-bar.component.ts
@@ -4,7 +4,7 @@ import { BehaviorSubject, Subscription } from 'rxjs';
 import { ConfigService } from '../../services/config.service';
 import { NavigationEnd, Router } from '@angular/router';
 import { UserService } from '../../services/user.service';
-import { getFullNameFromUser } from '../../shared/types/model/User';
+import { getFullNameOfUser } from '../../shared/types/model/User';
 
 @Component({
   selector: 'app-application-top-bar',
@@ -24,7 +24,7 @@ export class ApplicationTopBarComponent implements OnInit, OnDestroy {
   private subscription?: Subscription;
 
   constructor(
-    private oauthService: OAuthService,
+    private oAuthService: OAuthService,
     private userService: UserService,
     private configService: ConfigService,
     private router: Router,
@@ -53,7 +53,7 @@ export class ApplicationTopBarComponent implements OnInit, OnDestroy {
     const currentUrlTree = this.router.createUrlTree([], { queryParams: {} });
     this.router.navigateByUrl(currentUrlTree)
       .then(() => {
-        this.oauthService.logOut();
+        this.oAuthService.logOut();
       });
   }
 
@@ -61,7 +61,7 @@ export class ApplicationTopBarComponent implements OnInit, OnDestroy {
     // user is loaded on base route resolver. We have to wait until routing is done.
     this.router.events.subscribe((val) => {
       if (!this.userFullName && val instanceof NavigationEnd) {
-        this.userFullName = getFullNameFromUser(this.userService.getCurrentUser());
+        this.userFullName = getFullNameOfUser(this.userService.getCurrentUser());
         this.cd.markForCheck();
       }
     });
diff --git a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.html b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.html
index 28afdb4aae..cc6af7d11b 100644
--- a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.html
+++ b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.html
@@ -12,7 +12,7 @@
               class="col-auto"
               mat-icon-button
               (click)="openCheckInDialogForm(checkIn)"
-              *ngIf="!isComplete && checkIn.writeable"
+              *ngIf="!isComplete && checkIn.isWriteable"
               [attr.data-testId]="'edit-check-in'"
             >
               <img
diff --git a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.spec.ts b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.spec.ts
index 1f01408053..333ea339f5 100644
--- a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.spec.ts
+++ b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.spec.ts
@@ -62,7 +62,7 @@ describe('CheckInHistoryDialogComponent', () => {
       .toBeTruthy();
   });
 
-  it.skip('should not display edit check-in button if writeable is false', async() => {
+  it.skip('should not display edit check-in button if is-writeable is false', async() => {
     const buttons = fixture.debugElement.queryAll(By.css('button'));
     expect(buttons.length)
       .toBe(1);
diff --git a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.ts b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.ts
index e562dba5b4..9ccea9d58b 100644
--- a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.ts
+++ b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.ts
@@ -14,8 +14,7 @@ import { CheckInOrdinalMin } from '../../shared/types/model/CheckInOrdinalMin';
 
 @Component({
   selector: 'app-check-in-history-dialog',
-  templateUrl: './check-in-history-dialog.component.html',
-  styleUrls: ['./check-in-history-dialog.component.scss']
+  templateUrl: './check-in-history-dialog.component.html'
 })
 export class CheckInHistoryDialogComponent implements OnInit {
   keyResult!: KeyResult;
diff --git a/frontend/src/app/components/checkin/check-in-form-metric/metric-check-in-directive.spec.ts b/frontend/src/app/components/checkin/check-in-form-metric/metric-check-in-directive.spec.ts
index 8498b4133d..4ef1d3d017 100644
--- a/frontend/src/app/components/checkin/check-in-form-metric/metric-check-in-directive.spec.ts
+++ b/frontend/src/app/components/checkin/check-in-form-metric/metric-check-in-directive.spec.ts
@@ -1,7 +1,7 @@
 import { MetricCheckInDirective } from './metric-check-in-directive';
 
 describe('MetricCheckInDirective', () => {
-  it('create an instance', () => {
+  it('should create an instance', () => {
     const directive = new MetricCheckInDirective();
     expect(directive)
       .toBeTruthy();
diff --git a/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.spec.ts b/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.spec.ts
index 62dd6f82e8..d29249e2b0 100644
--- a/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.spec.ts
+++ b/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.spec.ts
@@ -54,35 +54,35 @@ describe('CheckInFormOrdinalComponent', () => {
       .toBe('');
   }));
 
-  it('should set zone to Fail', waitForAsync(async() => {
+  it('should be able to set zone to fail', waitForAsync(async() => {
     const radioButtons = await loader.getAllHarnesses(MatRadioButtonHarness);
     await radioButtons[0].check();
     expect(component.dialogForm.controls['value'].value)
       .toBe(Zone.FAIL);
   }));
 
-  it('should set zone to Commit', waitForAsync(async() => {
+  it('should be able to set zone to commit', waitForAsync(async() => {
     const radioButtons = await loader.getAllHarnesses(MatRadioButtonHarness);
     await radioButtons[1].check();
     expect(component.dialogForm.controls['value'].value)
       .toBe(Zone.COMMIT);
   }));
 
-  it('should set zone to Target', waitForAsync(async() => {
+  it('should be able to set zone to target', waitForAsync(async() => {
     const radioButtons = await loader.getAllHarnesses(MatRadioButtonHarness);
     await radioButtons[2].check();
     expect(component.dialogForm.controls['value'].value)
       .toBe(Zone.TARGET);
   }));
 
-  it('should set zone to Stretch', waitForAsync(async() => {
+  it('should be able to set zone to stretch', waitForAsync(async() => {
     const radioButtons = await loader.getAllHarnesses(MatRadioButtonHarness);
     await radioButtons[3].check();
     expect(component.dialogForm.controls['value'].value)
       .toBe(Zone.STRETCH);
   }));
 
-  it('should be able to switch options ', waitForAsync(async() => {
+  it('should be able to switch options', waitForAsync(async() => {
     const radioButtons = await loader.getAllHarnesses(MatRadioButtonHarness);
     await radioButtons[3].check();
     await radioButtons[1].check();
diff --git a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.html b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.html
index e979005f62..9415130720 100644
--- a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.html
+++ b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.html
@@ -27,14 +27,14 @@
       </div>
 
       <div class="okr-form-row okr-form-label-input-container">
-        <label class="okr-form-label okr-form-col" for="changeInfo">Kommentar/ Veränderung seit letztem Check-in (optional):</label
+        <label class="okr-form-label okr-form-col" for="change-info">Kommentar/ Veränderung seit letztem Check-in (optional):</label
         >
         <div class="okr-form-input">
           <textarea
             [attr.data-testId]="'changeInfo'"
             [ngClass]="formInputCheck(dialogForm, 'changeInfo')"
             class="big-dialog-form-field"
-            id="changeInfo"
+            id="change-info"
             formControlName="changeInfo"
           ></textarea>
           <mat-error *ngIf="hasFormFieldErrors(dialogForm, 'changeInfo')">
@@ -80,7 +80,7 @@
           </span>
           zu erreichen:
         </label>
-        <app-confidence [checkIn]="checkIn" [edit]="true"></app-confidence>
+        <app-confidence [checkIn]="checkIn" [isEdit]="true"></app-confidence>
       </div>
     </form>
   </ng-container>
diff --git a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.spec.ts b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.spec.ts
index a9988b3081..888f537e6b 100644
--- a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.spec.ts
+++ b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.spec.ts
@@ -94,7 +94,7 @@ describe('CheckInFormComponent', () => {
       .toBeTruthy();
   });
 
-  it('should save check-in correctly if key result is metric', waitForAsync(async() => {
+  it('should save check-in correctly if key-result is metric', waitForAsync(async() => {
     component.checkIn = checkInMetric;
     component.keyResult = keyResultMetric;
     component.dialogForm.controls['value'].setValue(checkInMetric?.value!.toString());
@@ -120,7 +120,7 @@ describe('CheckInFormComponent', () => {
       .toHaveBeenCalled();
   }));
 
-  it('should save check-in correctly if key result is ordinal', waitForAsync(async() => {
+  it('should save check-in correctly if key-result is ordinal', waitForAsync(async() => {
     component.checkIn = checkInOrdinal;
     component.keyResult = keyResultOrdinal;
     component.dialogForm.controls['value'].setValue(checkInOrdinal?.zone!.toString());
@@ -157,7 +157,7 @@ describe('CheckInFormComponent', () => {
       });
   }));
 
-  it('should set default values if last check-in of key result is not null', waitForAsync(async() => {
+  it('should set default values if last check-in of key-result is not null', waitForAsync(async() => {
     component.keyResult = keyResultOrdinal;
     component.ngOnInit();
     component.setDefaultValues();
@@ -171,7 +171,7 @@ describe('CheckInFormComponent', () => {
       });
   }));
 
-  it('should set default values with actionList on KeyResult', waitForAsync(async() => {
+  it('should set default values with actionList on key-result', waitForAsync(async() => {
     component.keyResult = keyResultActions;
     component.ngOnInit();
     component.setDefaultValues();
@@ -186,7 +186,7 @@ describe('CheckInFormComponent', () => {
       });
   }));
 
-  it('should call actionService when saving CheckIn', waitForAsync(async() => {
+  it('should call action-service when saving check-in', waitForAsync(async() => {
     checkInServiceMock.saveCheckIn.mockReturnValue(of(true));
     actionServiceMock.updateActions.mockReturnValue(of(true));
 
diff --git a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts
index b1e1343eb5..3298e393e1 100644
--- a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts
+++ b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts
@@ -27,8 +27,6 @@ export class CheckInFormComponent implements OnInit {
 
   currentDate: Date;
 
-  continued = false;
-
   dialogForm = new FormGroup({
     value: new FormControl<string>('', [Validators.required]),
     confidence: new FormControl<number>(5, [Validators.required,
diff --git a/frontend/src/app/components/confidence/confidence.component.html b/frontend/src/app/components/confidence/confidence.component.html
index 2a603e5205..c05e24cff0 100644
--- a/frontend/src/app/components/confidence/confidence.component.html
+++ b/frontend/src/app/components/confidence/confidence.component.html
@@ -1,10 +1,12 @@
 <span class="okr-form-row bg-inherit flex-nowrap align-items-center mx-0" *ngIf="checkIn.confidence || checkIn.confidence === 0">
-  <div class="bg-inherit d-flex justify-content-center align-items-center w-auto" [ngClass]="[edit ? 'keyResult-attribute-edit' : 'keyResult-attribute-show', isDetail ? 'height' : '']">
-    <p class="fw-normal text-black p-0" data-testid="confidence">{{ checkIn.confidence }}/{{ max }}</p>
+  <div class="bg-inherit d-flex justify-content-center align-items-center w-auto" [ngClass]="[isEdit ? 'key-result-attribute-edit' : 'key-result-attribute-show', isDetail ? 'height' : '']">
+    <p class="fw-normal text-black sub-title-key-result p-0" [attr.data-testId]="'confidence'">
+      {{ checkIn.confidence }}/{{ max }}
+    </p>
   </div>
 
   <mat-slider
-    *ngIf="edit"
+    *ngIf="isEdit"
     [max]="max"
     [min]="min"
     [step]="1"
diff --git a/frontend/src/app/components/confidence/confidence.component.spec.ts b/frontend/src/app/components/confidence/confidence.component.spec.ts
index f29a6e0b80..6c6e4b623f 100644
--- a/frontend/src/app/components/confidence/confidence.component.spec.ts
+++ b/frontend/src/app/components/confidence/confidence.component.spec.ts
@@ -27,7 +27,7 @@ describe('ConfidenceComponent', () => {
     component = fixture.componentInstance;
     loader = TestbedHarnessEnvironment.loader(fixture);
     component.checkIn = checkInMetric;
-    component.edit = true;
+    component.isEdit = true;
   });
 
   it('should create', () => {
@@ -38,14 +38,14 @@ describe('ConfidenceComponent', () => {
   it.each([[{ confidence: 8 } as CheckInMin,
     '8'],
   [null,
-    '5']])('should set confidence of component with right value', async(checkIn: CheckInMin | null, expected: string) => {
+    '5']])('should set confidence of component with correct value', async(checkIn: CheckInMin | null, expected: string) => {
     component.checkIn = checkIn!;
     component.ngOnChanges({
       checkIn: new SimpleChange(null, component.checkIn, true)
     });
     fixture.detectChanges();
     await fixture.whenStable();
-    const textField = fixture.debugElement.query(By.css("[data-testid='confidence']"));
+    const textField = fixture.debugElement.query(By.css("[data-testId='confidence']"));
     const expectedLabel = expected + '/' + component.max;
     const sliderInputField = fixture.debugElement.query(By.css('mat-slider > input '));
 
@@ -57,7 +57,7 @@ describe('ConfidenceComponent', () => {
 
   it.each([[true],
     [false]])('should show slider on based on input var', async(editable) => {
-    component.edit = editable;
+    component.isEdit = editable;
     fixture.detectChanges();
     const slider = fixture.debugElement.query(By.css('mat-slider'));
 
diff --git a/frontend/src/app/components/confidence/confidence.component.ts b/frontend/src/app/components/confidence/confidence.component.ts
index bfe2b48af6..2255288e73 100644
--- a/frontend/src/app/components/confidence/confidence.component.ts
+++ b/frontend/src/app/components/confidence/confidence.component.ts
@@ -12,7 +12,7 @@ export class ConfidenceComponent implements OnChanges {
 
   max = 10;
 
-  @Input() edit = true;
+  @Input() isEdit = true;
 
   @Input() isDetail = true;
 
diff --git a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.html b/frontend/src/app/components/key-result-detail/key-result-detail.component.html
similarity index 88%
rename from frontend/src/app/components/keyresult-detail/keyresult-detail.component.html
rename to frontend/src/app/components/key-result-detail/key-result-detail.component.html
index f0d14bda8a..6be9fbb3ef 100644
--- a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.html
+++ b/frontend/src/app/components/key-result-detail/key-result-detail.component.html
@@ -30,7 +30,7 @@ <h4>
               src="../../../assets/icons/person-icon.svg"
               width="10"
             />
-            <h4 *ngIf="keyResult.owner as owner">{{ owner.firstname }} {{ owner.lastname }}</h4>
+            <h4 *ngIf="keyResult.owner as owner">{{ owner.firstName }} {{ owner.lastName }}</h4>
           </span>
           <h4 *ngIf="keyResult?.objective?.quarter as quarter">{{ quarter.label }}</h4>
         </section>
@@ -45,7 +45,7 @@ <h4 *ngIf="keyResult?.objective?.quarter as quarter">{{ quarter.label }}</h4>
             <h4 class="confidence-label">Confidence</h4>
             <app-confidence
               [checkIn]="getKeyResultWithCorrectType(keyResult).lastCheckIn!"
-              [edit]="false"
+              [isEdit]="false"
               class="bg-display-element"
             ></app-confidence>
           </span>
@@ -54,12 +54,12 @@ <h4 class="confidence-label">Confidence</h4>
         <section class="d-flex gap-4 flex-row mb-2-rem">
           <ng-container *ngIf="keyResult.keyResultType == 'metric' && castToMetric(keyResult) as keyResultMetric">
             <div class="d-flex justify-content-start w-100 metric-label-div">
-              <p class="keyResult-detail-attribute-show rounded-5 p-2 d-flex justify-content-center metric-col">
+              <p class="key-result-detail-attribute-show rounded-5 p-2 d-flex justify-content-center metric-col">
                 Baseline: {{ keyResultMetric.baseline | unitTransformation: keyResultMetric.unit }}
               </p>
               <p
                 *ngIf="keyResultMetric.lastCheckIn as lastCheckIn"
-                class="keyResult-detail-attribute-show rounded-5 p-2 metric-col d-flex justify-content-center gap-1"
+                class="key-result-detail-attribute-show rounded-5 p-2 metric-col d-flex justify-content-center gap-1"
                 [ngClass]="{
                   'border-error': calculateCurrentPercentage(keyResultMetric) < 1,
                 }"
@@ -70,7 +70,7 @@ <h4 class="confidence-label">Confidence</h4>
                   {{ +lastCheckIn.value | unitTransformation: keyResultMetric.unit }}
                 </span>
               </p>
-              <p class="keyResult-detail-attribute-show rounded-5 p-2 metric-col d-flex justify-content-center">
+              <p class="key-result-detail-attribute-show rounded-5 p-2 metric-col d-flex justify-content-center">
                 Stretch Goal: {{ keyResultMetric.stretchGoal | unitTransformation: keyResultMetric.unit }}
               </p>
             </div>
@@ -80,19 +80,19 @@ <h4 class="confidence-label">Confidence</h4>
             <div class="d-flex justify-content-between w-100 ordinal-div mb-4">
               <div class="ordinal-col h-auto">
                 <h4 class="mb-1">Commit</h4>
-                <p class="keyResult-detail-attribute-show ordinal-box p-3 h-100">
+                <p class="key-result-detail-attribute-show ordinal-box p-3 h-100">
                   {{ keyResultOrdinal.commitZone }}
                 </p>
               </div>
               <div class="ordinal-col h-auto">
                 <h4 class="mb-1">Target</h4>
-                <p class="keyResult-detail-attribute-show ordinal-box p-3 h-100">
+                <p class="key-result-detail-attribute-show ordinal-box p-3 h-100">
                   {{ keyResultOrdinal.targetZone }}
                 </p>
               </div>
               <div class="ordinal-col h-auto">
                 <h4 class="mb-1">Stretch</h4>
-                <p class="keyResult-detail-attribute-show ordinal-box p-3 h-100">
+                <p class="key-result-detail-attribute-show ordinal-box p-3 h-100">
                   {{ keyResultOrdinal.stretchZone }}
                 </p>
               </div>
@@ -145,7 +145,7 @@ <h3 class="mb-1">Letztes Check-in ({{ checkIn.createdOn | date: DATE_FORMAT }})<
 
         <div class="d-flex align-items-center flex-row justify-content-start">
           <button
-            *ngIf="!isComplete && keyResult.writeable"
+            *ngIf="!isComplete && keyResult.isWriteable"
             cdkFocusInitial
             color="primary"
             mat-flat-button
@@ -155,7 +155,7 @@ <h3 class="mb-1">Letztes Check-in ({{ checkIn.createdOn | date: DATE_FORMAT }})<
             Check-in erfassen
           </button>
           <button
-            *ngIf="!isComplete && keyResult.writeable"
+            *ngIf="!isComplete && keyResult.isWriteable"
             (click)="openEditKeyResultDialog(keyResult)"
             class="ms-2"
             [attr.data-testId]="'edit-keyResult'"
diff --git a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.scss b/frontend/src/app/components/key-result-detail/key-result-detail.component.scss
similarity index 97%
rename from frontend/src/app/components/keyresult-detail/keyresult-detail.component.scss
rename to frontend/src/app/components/key-result-detail/key-result-detail.component.scss
index 262f78b386..bc742c0c57 100644
--- a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.scss
+++ b/frontend/src/app/components/key-result-detail/key-result-detail.component.scss
@@ -8,7 +8,7 @@ h3 {
   font-variation-settings: 'wght' 600 !important;
 }
 
-.keyResult-detail-attribute-show {
+.key-result-detail-attribute-show {
   background-color: $display-element;
   height: auto;
 }
diff --git a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.spec.ts b/frontend/src/app/components/key-result-detail/key-result-detail.component.spec.ts
similarity index 88%
rename from frontend/src/app/components/keyresult-detail/keyresult-detail.component.spec.ts
rename to frontend/src/app/components/key-result-detail/key-result-detail.component.spec.ts
index 5422ef8cf3..095dfe84ba 100644
--- a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.spec.ts
+++ b/frontend/src/app/components/key-result-detail/key-result-detail.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KeyresultDetailComponent } from './keyresult-detail.component';
+import { KeyResultDetailComponent } from './key-result-detail.component';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { TranslateModule } from '@ngx-translate/core';
@@ -26,9 +26,9 @@ const activatedRouteMock = {
   }
 };
 
-describe('KeyresultDetailComponent', () => {
-  let component: KeyresultDetailComponent;
-  let fixture: ComponentFixture<KeyresultDetailComponent>;
+describe('KeyResultDetailComponent', () => {
+  let component: KeyResultDetailComponent;
+  let fixture: ComponentFixture<KeyResultDetailComponent>;
 
   beforeEach(async() => {
     await TestBed.configureTestingModule({
@@ -38,7 +38,7 @@ describe('KeyresultDetailComponent', () => {
         MatIconModule,
         TranslateModule.forRoot()
       ],
-      declarations: [KeyresultDetailComponent,
+      declarations: [KeyResultDetailComponent,
         ScoringComponent,
         ConfidenceComponent],
       providers: [{
@@ -56,7 +56,7 @@ describe('KeyresultDetailComponent', () => {
       .mockReturnValue(of(keyResult));
     activatedRouteMock.snapshot.paramMap.get.mockReturnValue(of(1));
 
-    fixture = TestBed.createComponent(KeyresultDetailComponent);
+    fixture = TestBed.createComponent(KeyResultDetailComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
@@ -72,13 +72,13 @@ describe('KeyresultDetailComponent', () => {
       .toThrowError('keyresult id is undefined');
   });
 
-  it('should display edit keyresult button if writeable is true', async() => {
+  it('should display edit key-result button if writeable is true', async() => {
     const button = fixture.debugElement.query(By.css('[data-testId="edit-keyResult"]'));
     expect(button)
       .toBeTruthy();
   });
 
-  it('should not display edit keyresult button if writeable is false', async() => {
+  it('should not display edit key-result button if writeable is false', async() => {
     jest.spyOn(keyResultServiceMock, 'getFullKeyResult')
       .mockReturnValue(of(keyResultWriteableFalse));
     component.ngOnInit();
diff --git a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.ts b/frontend/src/app/components/key-result-detail/key-result-detail.component.ts
similarity index 90%
rename from frontend/src/app/components/keyresult-detail/keyresult-detail.component.ts
rename to frontend/src/app/components/key-result-detail/key-result-detail.component.ts
index 69ab2a4f3f..e233d061a9 100644
--- a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.ts
+++ b/frontend/src/app/components/key-result-detail/key-result-detail.component.ts
@@ -11,20 +11,20 @@ import { CloseState } from '../../shared/types/enums/CloseState';
 import { CheckInFormComponent } from '../checkin/check-in-form/check-in-form.component';
 import { State } from '../../shared/types/enums/State';
 import { DATE_FORMAT } from '../../shared/constantLibary';
-import { calculateCurrentPercentage, isLastCheckInNegative } from '../../shared/common';
-import { KeyresultDialogComponent } from '../keyresult-dialog/keyresult-dialog.component';
+import { calculateCurrentPercentage } from '../../shared/common';
+import { KeyResultDialogComponent } from '../key-result-dialog/key-result-dialog.component';
 import { DialogService } from '../../services/dialog.service';
 import { KeyresultMin } from '../../shared/types/model/KeyresultMin';
 import { KeyResultMetricMin } from '../../shared/types/model/KeyResultMetricMin';
 import { KeyResultOrdinalMin } from '../../shared/types/model/KeyResultOrdinalMin';
 
 @Component({
-  selector: 'app-keyresult-detail',
-  templateUrl: './keyresult-detail.component.html',
-  styleUrls: ['./keyresult-detail.component.scss'],
+  selector: 'app-key-result-detail',
+  templateUrl: './key-result-detail.component.html',
+  styleUrls: ['./key-result-detail.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class KeyresultDetailComponent implements OnInit, OnDestroy {
+export class KeyResultDetailComponent implements OnInit, OnDestroy {
   @Input() keyResultId!: number;
 
   keyResult$: BehaviorSubject<KeyResult> = new BehaviorSubject<KeyResult>({} as KeyResult);
@@ -35,8 +35,6 @@ export class KeyresultDetailComponent implements OnInit, OnDestroy {
 
   protected readonly DATE_FORMAT = DATE_FORMAT;
 
-  protected readonly isLastCheckInNegative = isLastCheckInNegative;
-
   constructor(
     private keyResultService: KeyresultService,
     private refreshDataService: RefreshDataService,
@@ -82,7 +80,7 @@ export class KeyresultDetailComponent implements OnInit, OnDestroy {
     return keyResult as KeyResultMetric;
   }
 
-  castToOrdinal(keyResult: KeyResult) {
+  castToOrdinal(keyResult: KeyResult): KeyResultOrdinal {
     return keyResult as KeyResultOrdinal;
   }
 
@@ -101,7 +99,7 @@ export class KeyresultDetailComponent implements OnInit, OnDestroy {
 
   openEditKeyResultDialog(keyResult: KeyResult) {
     this.dialogService
-      .open(KeyresultDialogComponent, {
+      .open(KeyResultDialogComponent, {
         data: {
           objective: keyResult.objective,
           keyResult: keyResult
diff --git a/frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.html b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.html
similarity index 92%
rename from frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.html
rename to frontend/src/app/components/key-result-dialog/key-result-dialog.component.html
index 8c7bb7ca08..d9a80b8bb4 100644
--- a/frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.html
+++ b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.html
@@ -16,7 +16,7 @@
       </button>
       <button
         *ngIf="!data.keyResult"
-        [attr.data-testId]="'saveAndNew'"
+        [attr.data-testId]="'save-and-new'"
         (click)="openNew()"
         mat-stroked-button
         [disabled]="keyResultForm.invalid || invalidOwner()"
@@ -36,7 +36,7 @@
         color="primary"
         mat-button
         (click)="deleteKeyResult()"
-        [attr.data-testId]="'delete-keyResult'"
+        [attr.data-testId]="'delete-key-result'"
       >
         Key Result löschen
       </button>
diff --git a/frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.scss b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.scss
similarity index 100%
rename from frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.scss
rename to frontend/src/app/components/key-result-dialog/key-result-dialog.component.scss
diff --git a/frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.spec.ts b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.spec.ts
similarity index 94%
rename from frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.spec.ts
rename to frontend/src/app/components/key-result-dialog/key-result-dialog.component.spec.ts
index 397a27b534..78238a606b 100644
--- a/frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.spec.ts
+++ b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.spec.ts
@@ -1,4 +1,4 @@
-import { KeyresultDialogComponent } from './keyresult-dialog.component';
+import { KeyResultDialogComponent } from './key-result-dialog.component';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { KeyresultService } from '../../services/keyresult.service';
 import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
@@ -16,7 +16,7 @@ import { MatSelectModule } from '@angular/material/select';
 import { MatRadioModule } from '@angular/material/radio';
 import { KeyResultObjective } from '../../shared/types/model/KeyResultObjective';
 import { OAuthService } from 'angular-oauth2-oidc';
-import { KeyresultTypeComponent } from '../keyresult-type/keyresult-type.component';
+import { KeyResultTypeComponent } from '../key-result-type/key-result-type.component';
 import { ActionPlanComponent } from '../action-plan/action-plan.component';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { DragDropModule } from '@angular/cdk/drag-drop';
@@ -29,14 +29,14 @@ import { MatDividerModule } from '@angular/material/divider';
 import { DialogTemplateCoreComponent } from '../../shared/custom/dialog-template-core/dialog-template-core.component';
 import { Quarter } from '../../shared/types/model/Quarter';
 
-describe('KeyresultDialogComponent', () => {
-  let component: KeyresultDialogComponent;
-  let fixture: ComponentFixture<KeyresultDialogComponent>;
+describe('KeyResultDialogComponent', () => {
+  let component: KeyResultDialogComponent;
+  let fixture: ComponentFixture<KeyResultDialogComponent>;
   let keyResultService: KeyresultService;
 
-  const oauthMockService = {
+  const oAuthMockService = {
     getIdentityClaims() {
-      return { name: users[1].firstname + ' ' + users[1].lastname };
+      return { name: users[1].firstName + ' ' + users[1].lastName };
     }
   };
 
@@ -284,20 +284,20 @@ describe('KeyresultDialogComponent', () => {
           },
           {
             provide: OAuthService,
-            useValue: oauthMockService
+            useValue: oAuthMockService
           }
         ],
         declarations: [
-          KeyresultDialogComponent,
+          KeyResultDialogComponent,
           KeyResultFormComponent,
-          KeyresultTypeComponent,
+          KeyResultTypeComponent,
           ActionPlanComponent,
           DialogTemplateCoreComponent
         ]
       })
         .compileComponents();
 
-      fixture = TestBed.createComponent(KeyresultDialogComponent);
+      fixture = TestBed.createComponent(KeyResultDialogComponent);
       component = fixture.componentInstance;
 
       userService.getCurrentUser.mockReturnValue(testUser);
@@ -445,7 +445,7 @@ describe('KeyresultDialogComponent', () => {
           },
           {
             provide: OAuthService,
-            useValue: oauthMockService
+            useValue: oAuthMockService
           },
           {
             provide: MAT_DIALOG_DATA,
@@ -454,16 +454,16 @@ describe('KeyresultDialogComponent', () => {
           }
         ],
         declarations: [
-          KeyresultDialogComponent,
+          KeyResultDialogComponent,
           KeyResultFormComponent,
           DialogTemplateCoreComponent,
           ActionPlanComponent,
-          KeyresultTypeComponent
+          KeyResultTypeComponent
         ]
       })
         .compileComponents();
 
-      fixture = TestBed.createComponent(KeyresultDialogComponent);
+      fixture = TestBed.createComponent(KeyResultDialogComponent);
       component = fixture.componentInstance;
       fixture.detectChanges();
       keyResultService = TestBed.inject(KeyresultService);
@@ -474,7 +474,7 @@ describe('KeyresultDialogComponent', () => {
       mockUserService.getUsers.mockReset();
     });
 
-    it('should use KeyResult value from data input', waitForAsync(() => {
+    it('should use key-result value from data input', waitForAsync(() => {
       const formObject = fixture.componentInstance.keyResultForm.value;
       expect(formObject.title)
         .toBe('Der Titel ist hier');
@@ -610,7 +610,7 @@ describe('KeyresultDialogComponent', () => {
           },
           {
             provide: OAuthService,
-            useValue: oauthMockService
+            useValue: oAuthMockService
           },
           {
             provide: MAT_DIALOG_DATA,
@@ -619,16 +619,16 @@ describe('KeyresultDialogComponent', () => {
           }
         ],
         declarations: [
-          KeyresultDialogComponent,
+          KeyResultDialogComponent,
           KeyResultFormComponent,
           DialogTemplateCoreComponent,
           ActionPlanComponent,
-          KeyresultTypeComponent
+          KeyResultTypeComponent
         ]
       })
         .compileComponents();
 
-      fixture = TestBed.createComponent(KeyresultDialogComponent);
+      fixture = TestBed.createComponent(KeyResultDialogComponent);
       component = fixture.componentInstance;
       fixture.detectChanges();
       keyResultService = TestBed.inject(KeyresultService);
@@ -638,7 +638,7 @@ describe('KeyresultDialogComponent', () => {
       mockUserService.getUsers.mockReset();
     });
 
-    it('should use KeyResult value from data input', waitForAsync(() => {
+    it('should use key-result value from data input', waitForAsync(() => {
       const formObject = fixture.componentInstance.keyResultForm.value;
       expect(formObject.title)
         .toBe('Der Titel ist hier');
diff --git a/frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.ts b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.ts
similarity index 92%
rename from frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.ts
rename to frontend/src/app/components/key-result-dialog/key-result-dialog.component.ts
index af9422eb4e..67ff3b5679 100644
--- a/frontend/src/app/components/keyresult-dialog/keyresult-dialog.component.ts
+++ b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.ts
@@ -12,11 +12,11 @@ import { KeyresultService } from '../../services/keyresult.service';
 import { DialogService } from '../../services/dialog.service';
 
 @Component({
-  selector: 'app-keyresult-dialog',
-  templateUrl: './keyresult-dialog.component.html',
-  styleUrls: ['./keyresult-dialog.component.scss']
+  selector: 'app-key-result-dialog',
+  templateUrl: './key-result-dialog.component.html',
+  styleUrls: ['./key-result-dialog.component.scss']
 })
-export class KeyresultDialogComponent {
+export class KeyResultDialogComponent {
   keyResultForm = new FormGroup({
     title: new FormControl<string>('', [Validators.required,
       Validators.minLength(2),
@@ -39,7 +39,7 @@ export class KeyresultDialogComponent {
       keyResult: KeyResult; },
     private keyResultService: KeyresultService,
     public dialogService: DialogService,
-    public dialogRef: MatDialogRef<KeyresultDialogComponent>
+    public dialogRef: MatDialogRef<KeyResultDialogComponent>
   ) {}
 
   isMetricKeyResult() {
@@ -70,7 +70,7 @@ export class KeyresultDialogComponent {
 
   deleteKeyResult() {
     this.dialogService
-      .openConfirmDialog('CONFIRMATION.DELETE.KEYRESULT')
+      .openConfirmDialog('CONFIRMATION.DELETE.KEY_RESULT')
       .afterClosed()
       .subscribe((result) => {
         if (result) {
diff --git a/frontend/src/app/components/key-result-form/key-result-form.component.html b/frontend/src/app/components/key-result-form/key-result-form.component.html
index 1697565fe0..3d33f023b4 100644
--- a/frontend/src/app/components/key-result-form/key-result-form.component.html
+++ b/frontend/src/app/components/key-result-form/key-result-form.component.html
@@ -3,7 +3,7 @@
     <label class="okr-form-label okr-form-col" for="title">Titel</label>
     <div class="okr-form-input">
       <textarea
-        [attr.data-testId]="'titleInput'"
+        [attr.data-testId]="'title-input'"
         class="big-dialog-form-field"
         [ngClass]="formInputCheck(keyResultForm, 'title')"
         formControlName="title"
@@ -15,11 +15,11 @@
     </div>
   </div>
 
-  <app-keyresult-type
+  <app-key-result-type
     (formValidityEmitter)="updateFormValidity()"
-    [keyresult]="keyResult"
+    [keyResult]="keyResult"
     [keyResultForm]="keyResultForm"
-  ></app-keyresult-type>
+  ></app-key-result-type>
 
   <div class="okr-form-row okr-form-label-input-container">
     <label class="okr-form-label okr-form-col" for="owner">Owner</label>
@@ -28,14 +28,14 @@
         (keydown.enter)="$event.preventDefault()"
         [ngClass]="invalidOwner() ? 'dialog-form-field-error' : 'dialog-form-field'"
         class="owner-input"
-        [attr.data-testId]="'ownerInput'"
+        [attr.data-testId]="'owner-input'"
         [matAutocomplete]="auto"
         formControlName="owner"
         id="owner"
       />
-      <mat-autocomplete #auto="matAutocomplete" [displayWith]="getUserNameFromUser.bind(this)">
+      <mat-autocomplete #auto="matAutocomplete" [displayWith]="getFullNameOfUser.bind(this)">
         <mat-option *ngFor="let user of filteredUsers$ | async" [value]="user">
-          {{ user.firstname + " " + user.lastname }}
+          {{ user.firstName + " " + user.lastName }}
         </mat-option>
       </mat-autocomplete>
       <mat-error *ngIf="invalidOwner()">
@@ -48,7 +48,7 @@
     <label class="okr-form-label okr-form-col" for="description">Beschreibung (optional)</label>
     <div class="okr-form-input">
       <textarea
-        [attr.data-testId]="'descriptionInput'"
+        [attr.data-testId]="'description-input'"
         class="big-dialog-form-field"
         [ngClass]="formInputCheck(keyResultForm, 'description')"
         formControlName="description"
diff --git a/frontend/src/app/components/key-result-form/key-result-form.component.spec.ts b/frontend/src/app/components/key-result-form/key-result-form.component.spec.ts
index 7127efb2e1..7a38d35625 100644
--- a/frontend/src/app/components/key-result-form/key-result-form.component.spec.ts
+++ b/frontend/src/app/components/key-result-form/key-result-form.component.spec.ts
@@ -15,7 +15,7 @@ import { MatRadioModule } from '@angular/material/radio';
 import { KeyResultObjective } from '../../shared/types/model/KeyResultObjective';
 import { User } from '../../shared/types/model/User';
 import { OAuthService } from 'angular-oauth2-oidc';
-import { KeyresultTypeComponent } from '../keyresult-type/keyresult-type.component';
+import { KeyResultTypeComponent } from '../key-result-type/key-result-type.component';
 import { ActionPlanComponent } from '../action-plan/action-plan.component';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { DragDropModule } from '@angular/cdk/drag-drop';
@@ -36,9 +36,9 @@ describe('KeyResultFormComponent', () => {
   let component: KeyResultFormComponent;
   let fixture: ComponentFixture<KeyResultFormComponent>;
 
-  const oauthMockService = {
+  const oAuthMockService = {
     getIdentityClaims() {
-      return { name: users[1].firstname + ' ' + users[1].lastname };
+      return { name: users[1].firstName + ' ' + users[1].lastName };
     }
   };
 
@@ -126,7 +126,7 @@ describe('KeyResultFormComponent', () => {
           },
           {
             provide: OAuthService,
-            useValue: oauthMockService
+            useValue: oAuthMockService
           },
           provideRouter([]),
           provideHttpClient(),
@@ -135,7 +135,7 @@ describe('KeyResultFormComponent', () => {
         declarations: [
           KeyResultFormComponent,
           DialogTemplateCoreComponent,
-          KeyresultTypeComponent,
+          KeyResultTypeComponent,
           ActionPlanComponent
         ]
       })
@@ -172,7 +172,7 @@ describe('KeyResultFormComponent', () => {
         .toBeFalsy();
     }));
 
-    it('should return right filtered user', () => {
+    it('should return correct filtered user', () => {
       let userObservable: Observable<User[]> = component.filter('baum');
 
       userObservable.subscribe((userList) => {
@@ -187,9 +187,9 @@ describe('KeyResultFormComponent', () => {
       });
     });
 
-    it('should return label from user', () => {
-      const userName: string = component.getUserNameFromUser(testUser);
-      expect(userName)
+    it('should get full name of user', () => {
+      const fullName: string = component.getFullNameOfUser(testUser);
+      expect(fullName)
         .toEqual('Bob Baumeister');
     });
 
@@ -209,7 +209,7 @@ describe('KeyResultFormComponent', () => {
         unit: 'CHF',
         createdOn: new Date(),
         modifiedOn: new Date(),
-        writeable: true
+        isWriteable: true
       };
       component.setMetricValuesInForm(fullKeyResultMetric);
 
@@ -237,7 +237,7 @@ describe('KeyResultFormComponent', () => {
         stretchZone: 'Eine Ziege',
         createdOn: new Date(),
         modifiedOn: new Date(),
-        writeable: true
+        isWriteable: true
       };
       component.setOrdinalValuesInForm(fullKeyResultOrdinal);
 
@@ -249,7 +249,7 @@ describe('KeyResultFormComponent', () => {
         .toEqual('Eine Ziege');
     });
 
-    it('should get metric value right', () => {
+    it('should correctly check if key-result is metric or ordinal', () => {
       expect(component.isMetricKeyResult())
         .toBeTruthy();
       component.keyResultForm.patchValue({ keyResultType: 'ordinal' });
@@ -257,15 +257,15 @@ describe('KeyResultFormComponent', () => {
         .toBeFalsy();
     });
 
-    it('should get username from user right', () => {
+    it('should get correct full name from user object', () => {
       const user = users[0];
-      expect(component.getUserNameFromUser(user))
+      expect(component.getFullNameOfUser(user))
         .toEqual('Bob Baumeister');
-      expect(component.getUserNameFromUser(null!))
+      expect(component.getFullNameOfUser(null!))
         .toEqual('');
     });
 
-    it('should get keyresult id right', () => {
+    it('should get correct key-result id', () => {
       expect(component.getKeyResultId())
         .toEqual(null);
       component.keyResult = keyResultOrdinal;
@@ -273,9 +273,9 @@ describe('KeyResultFormComponent', () => {
         .toEqual(101);
     });
 
-    it('should get username from oauthService  right', () => {
-      expect(component.getLoggedInUserName())
-        .toEqual(testUser.firstname + ' ' + testUser.lastname);
+    it('should get correct username from o-auth-service', () => {
+      expect(component.getFullNameOfLoggedInUser())
+        .toEqual(testUser.firstName + ' ' + testUser.lastName);
     });
   });
 });
diff --git a/frontend/src/app/components/key-result-form/key-result-form.component.ts b/frontend/src/app/components/key-result-form/key-result-form.component.ts
index 9f5fb36f00..7fd70a3585 100644
--- a/frontend/src/app/components/key-result-form/key-result-form.component.ts
+++ b/frontend/src/app/components/key-result-form/key-result-form.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { getFullNameFromUser, User } from '../../shared/types/model/User';
+import { getFullNameOfUser, User } from '../../shared/types/model/User';
 import { KeyResult } from '../../shared/types/model/KeyResult';
 import { KeyResultMetric } from '../../shared/types/model/KeyResultMetric';
 import { KeyResultOrdinal } from '../../shared/types/model/KeyResultOrdinal';
@@ -8,7 +8,6 @@ import { BehaviorSubject, filter, map, Observable, of, startWith, Subject, switc
 import { UserService } from '../../services/user.service';
 import { Action } from '../../shared/types/model/Action';
 import { formInputCheck, hasFormFieldErrors } from '../../shared/common';
-import { OAuthService } from 'angular-oauth2-oidc';
 import { TranslateService } from '@ngx-translate/core';
 
 @Component({
@@ -37,7 +36,6 @@ export class KeyResultFormComponent implements OnInit, OnDestroy {
   keyResult!: KeyResult | null;
 
   constructor(public userService: UserService,
-    private oauthService: OAuthService,
     private translate: TranslateService) {}
 
   ngOnInit(): void {
@@ -79,9 +77,9 @@ export class KeyResultFormComponent implements OnInit, OnDestroy {
 
       this.users$.pipe(takeUntil(this.unsubscribe$))
         .subscribe((users) => {
-          const loggedInUser = this.getLoggedInUserName();
+          const loggedInUser = this.getFullNameOfLoggedInUser();
           users.forEach((user) => {
-            if (getFullNameFromUser(user) === loggedInUser) {
+            if (getFullNameOfUser(user) === loggedInUser) {
               this.keyResultForm.controls['owner'].setValue(user);
             }
           });
@@ -127,7 +125,7 @@ export class KeyResultFormComponent implements OnInit, OnDestroy {
 
   filter(value: string): Observable<User[]> {
     const filterValue = value.toLowerCase();
-    return this.users$.pipe(map((users) => users.filter((user) => getFullNameFromUser(user)
+    return this.users$.pipe(map((users) => users.filter((user) => getFullNameOfUser(user)
       .toLowerCase()
       .includes(filterValue))));
   }
@@ -139,8 +137,8 @@ export class KeyResultFormComponent implements OnInit, OnDestroy {
     );
   }
 
-  getUserNameFromUser(user: User): string {
-    return user ? getFullNameFromUser(user) : '';
+  getFullNameOfUser(user: User): string {
+    return user ? getFullNameOfUser(user) : '';
   }
 
   getKeyResultId(): number | null {
@@ -149,7 +147,7 @@ export class KeyResultFormComponent implements OnInit, OnDestroy {
 
   updateFormValidity() {}
 
-  getLoggedInUserName() {
-    return this.getUserNameFromUser(this.userService.getCurrentUser());
+  getFullNameOfLoggedInUser() {
+    return this.getFullNameOfUser(this.userService.getCurrentUser());
   }
 }
diff --git a/frontend/src/app/components/keyresult-type/keyresult-type.component.html b/frontend/src/app/components/key-result-type/key-result-type.component.html
similarity index 85%
rename from frontend/src/app/components/keyresult-type/keyresult-type.component.html
rename to frontend/src/app/components/key-result-type/key-result-type.component.html
index bdfad5d30e..59622ff963 100644
--- a/frontend/src/app/components/keyresult-type/keyresult-type.component.html
+++ b/frontend/src/app/components/key-result-type/key-result-type.component.html
@@ -2,7 +2,7 @@
   <button
     [style.cursor]="typeChangeAllowed ? 'pointer' : 'default'"
     [ngClass]="{ active: isMetric, 'non-active': !isMetric }"
-    [attr.data-testId]="'metricTab'"
+    [attr.data-testId]="'metric-tab'"
     class="tab-title"
     (click)="switchKeyResultType('metric')"
     (keydown.enter)="switchKeyResultType('metric')"
@@ -13,7 +13,7 @@
   <button
     [style.cursor]="typeChangeAllowed ? 'pointer' : 'default'"
     [ngClass]="{ active: !isMetric, 'non-active': isMetric }"
-    [attr.data-testId]="'ordinalTab'"
+    [attr.data-testId]="'ordinal-tab'"
     class="tab-title"
     (click)="switchKeyResultType('ordinal')"
     (keydown.enter)="switchKeyResultType('ordinal')"
@@ -68,14 +68,14 @@
 
     <div class="col">
       <div class="okr-form-row">
-        <label class="okr-form-label okr-form-col" for="stretchGoal">Stretch Goal</label>
+        <label class="okr-form-label okr-form-col" for="stretch-goal">Stretch Goal</label>
         <div class="col">
           <input
-            [attr.data-testId]="'stretchGoal'"
+            [attr.data-testId]="'stretch-goal'"
             class="dialog-form-field"
             [ngClass]="formInputCheck(keyResultForm, 'stretchGoal')"
             formControlName="stretchGoal"
-            id="stretchGoal"
+            id="stretch-goal"
           />
           <mat-error *ngIf="hasFormFieldErrors(keyResultForm, 'stretchGoal')">
             <span>{{ getErrorMessage("MUST_BE_NUMBER", "Stretch Goal", null, null) }}</span>
@@ -90,14 +90,14 @@
   <form [formGroup]="keyResultForm" class="okr-form-row row-cols-1 row-cols-md-3">
     <div class="col">
       <div class="okr-form-row">
-        <label class="okr-form-label okr-form-col" for="commitZone">Commit Zone</label>
+        <label class="okr-form-label okr-form-col" for="commit-zone">Commit Zone</label>
         <div class="col">
           <textarea
             class="big-dialog-form-field"
             [ngClass]="formInputCheck(keyResultForm, 'commitZone')"
             formControlName="commitZone"
-            id="commitZone"
-            [attr.data-testId]="'commitZone'"
+            id="commit-zone"
+            [attr.data-testId]="'commit-zone'"
           ></textarea>
           <mat-error *ngIf="hasFormFieldErrors(keyResultForm, 'commitZone')">
             <span>{{ getErrorMessage("SIZE_BETWEEN", "Commit Zone", 1, 400) }}</span>
@@ -108,14 +108,14 @@
 
     <div class="col">
       <div class="okr-form-row">
-        <label class="okr-form-label okr-form-col" for="targetZone">Target Zone</label>
+        <label class="okr-form-label okr-form-col" for="target-zone">Target Zone</label>
         <div class="col">
           <textarea
-            [attr.data-testId]="'targetZone'"
+            [attr.data-testId]="'target-zone'"
             class="big-dialog-form-field"
             [ngClass]="formInputCheck(keyResultForm, 'targetZone')"
             formControlName="targetZone"
-            id="targetZone"
+            id="target-zone"
           ></textarea>
           <mat-error *ngIf="hasFormFieldErrors(keyResultForm, 'targetZone')">
             <span>{{ getErrorMessage("SIZE_BETWEEN", "Target Zone", 1, 400) }}</span>
@@ -126,14 +126,14 @@
 
     <div class="col">
       <div class="okr-form-row">
-        <label class="okr-form-label okr-form-col" for="stretchZone">Stretch Goal</label>
+        <label class="okr-form-label okr-form-col" for="stretch-zone">Stretch Goal</label>
         <div class="col">
           <textarea
-            [attr.data-testId]="'stretchZone'"
+            [attr.data-testId]="'stretch-zone'"
             class="big-dialog-form-field"
             [ngClass]="formInputCheck(keyResultForm, 'stretchZone')"
             formControlName="stretchZone"
-            id="stretchZone"
+            id="stretch-zone"
           ></textarea>
           <mat-error *ngIf="hasFormFieldErrors(keyResultForm, 'stretchZone')">
             <span>{{ getErrorMessage("SIZE_BETWEEN", "Stretch Zone", 1, 400) }}</span>
diff --git a/frontend/src/app/components/keyresult-type/keyresult-type.component.scss b/frontend/src/app/components/key-result-type/key-result-type.component.scss
similarity index 100%
rename from frontend/src/app/components/keyresult-type/keyresult-type.component.scss
rename to frontend/src/app/components/key-result-type/key-result-type.component.scss
diff --git a/frontend/src/app/components/keyresult-type/keyresult-type.component.spec.ts b/frontend/src/app/components/key-result-type/key-result-type.component.spec.ts
similarity index 91%
rename from frontend/src/app/components/keyresult-type/keyresult-type.component.spec.ts
rename to frontend/src/app/components/key-result-type/key-result-type.component.spec.ts
index e42bef5c18..2650b4e0c3 100644
--- a/frontend/src/app/components/keyresult-type/keyresult-type.component.spec.ts
+++ b/frontend/src/app/components/key-result-type/key-result-type.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import * as de from '../../../assets/i18n/de.json';
 
-import { KeyresultTypeComponent } from './keyresult-type.component';
+import { KeyResultTypeComponent } from './key-result-type.component';
 import { KeyResult } from '../../shared/types/model/KeyResult';
 import { keyResultMetric, keyResultOrdinal, testUser } from '../../shared/testData';
 import { TranslateTestingModule } from 'ngx-translate-testing';
@@ -9,9 +9,9 @@ import { By } from '@angular/platform-browser';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 import { User } from '../../shared/types/model/User';
 
-describe('KeyresultTypeComponent', () => {
-  let component: KeyresultTypeComponent;
-  let fixture: ComponentFixture<KeyresultTypeComponent>;
+describe('KeyResultTypeComponent', () => {
+  let component: KeyResultTypeComponent;
+  let fixture: ComponentFixture<KeyResultTypeComponent>;
 
   const metricKeyResult: KeyResult = keyResultMetric;
   const ordinalKeyResult: KeyResult = keyResultOrdinal;
@@ -67,17 +67,17 @@ describe('KeyresultTypeComponent', () => {
   describe('Edit Metric', () => {
     beforeEach(() => {
       TestBed.configureTestingModule({
-        declarations: [KeyresultTypeComponent],
+        declarations: [KeyResultTypeComponent],
         imports: [TranslateTestingModule.withTranslations({
           de: de
         }),
         ReactiveFormsModule]
       });
-      fixture = TestBed.createComponent(KeyresultTypeComponent);
+      fixture = TestBed.createComponent(KeyResultTypeComponent);
       component = fixture.componentInstance;
       component.keyResultForm = metricKeyResultForm;
       fixture.detectChanges();
-      component.keyresult = metricKeyResult;
+      component.keyResult = metricKeyResult;
       fixture.detectChanges();
     });
 
@@ -105,7 +105,7 @@ describe('KeyresultTypeComponent', () => {
         .toBeNull();
     });
 
-    it('should switch type of KeyResult', () => {
+    it('should switch type of key-result', () => {
       component.isMetric = true;
       component.typeChangeAllowed = true;
 
@@ -135,7 +135,7 @@ describe('KeyresultTypeComponent', () => {
 
       expect(component.isMetric)
         .toBeTruthy();
-      const ordinalTab = fixture.debugElement.query(By.css('[data-testId="ordinalTab"]'));
+      const ordinalTab = fixture.debugElement.query(By.css('[data-testId="ordinal-tab"]'));
       ordinalTab.nativeElement.click();
       expect(component.isMetric)
         .toBeFalsy();
@@ -145,17 +145,17 @@ describe('KeyresultTypeComponent', () => {
   describe('Edit Ordinal', () => {
     beforeEach(() => {
       TestBed.configureTestingModule({
-        declarations: [KeyresultTypeComponent],
+        declarations: [KeyResultTypeComponent],
         imports: [TranslateTestingModule.withTranslations({
           de: de
         }),
         ReactiveFormsModule]
       });
-      fixture = TestBed.createComponent(KeyresultTypeComponent);
+      fixture = TestBed.createComponent(KeyResultTypeComponent);
       component = fixture.componentInstance;
       component.keyResultForm = ordinalKeyResultForm;
       fixture.detectChanges();
-      component.keyresult = ordinalKeyResult;
+      component.keyResult = ordinalKeyResult;
       fixture.detectChanges();
     });
 
@@ -181,7 +181,7 @@ describe('KeyresultTypeComponent', () => {
         .toEqual('Stretch');
     });
 
-    it('should switch type of KeyResult', () => {
+    it('should switch type of key-result', () => {
       component.isMetric = true;
       component.typeChangeAllowed = true;
 
@@ -213,7 +213,7 @@ describe('KeyresultTypeComponent', () => {
 
       expect(component.isMetric)
         .toBeFalsy();
-      const metricTab = fixture.debugElement.query(By.css('[data-testId="metricTab"]'));
+      const metricTab = fixture.debugElement.query(By.css('[data-testId="metric-tab"]'));
       metricTab.nativeElement.click();
       expect(component.isMetric)
         .toBeTruthy();
@@ -223,17 +223,17 @@ describe('KeyresultTypeComponent', () => {
   describe('Create', () => {
     beforeEach(() => {
       TestBed.configureTestingModule({
-        declarations: [KeyresultTypeComponent],
+        declarations: [KeyResultTypeComponent],
         imports: [TranslateTestingModule.withTranslations({
           de: de
         }),
         ReactiveFormsModule]
       });
-      fixture = TestBed.createComponent(KeyresultTypeComponent);
+      fixture = TestBed.createComponent(KeyResultTypeComponent);
       component = fixture.componentInstance;
       component.keyResultForm = emptyKeyResultForm;
       fixture.detectChanges();
-      component.keyresult = {} as KeyResult;
+      component.keyResult = {} as KeyResult;
       fixture.detectChanges();
     });
 
@@ -257,7 +257,7 @@ describe('KeyresultTypeComponent', () => {
         .toBeNull();
     });
 
-    it('should switch type of KeyResult', () => {
+    it('should switch type of key-result', () => {
       component.isMetric = true;
       component.typeChangeAllowed = true;
 
@@ -287,7 +287,7 @@ describe('KeyresultTypeComponent', () => {
 
       expect(component.isMetric)
         .toBeTruthy();
-      const ordinalTab = fixture.debugElement.query(By.css('[data-testId="ordinalTab"]'));
+      const ordinalTab = fixture.debugElement.query(By.css('[data-testId="ordinal-tab"]'));
       ordinalTab.nativeElement.click();
       expect(component.isMetric)
         .toBeFalsy();
diff --git a/frontend/src/app/components/keyresult-type/keyresult-type.component.ts b/frontend/src/app/components/key-result-type/key-result-type.component.ts
similarity index 89%
rename from frontend/src/app/components/keyresult-type/keyresult-type.component.ts
rename to frontend/src/app/components/key-result-type/key-result-type.component.ts
index e988cef30f..3c143d8a71 100644
--- a/frontend/src/app/components/keyresult-type/keyresult-type.component.ts
+++ b/frontend/src/app/components/key-result-type/key-result-type.component.ts
@@ -8,14 +8,14 @@ import { formInputCheck, hasFormFieldErrors } from '../../shared/common';
 import { TranslateService } from '@ngx-translate/core';
 
 @Component({
-  selector: 'app-keyresult-type',
-  templateUrl: './keyresult-type.component.html',
-  styleUrls: ['./keyresult-type.component.scss']
+  selector: 'app-key-result-type',
+  templateUrl: './key-result-type.component.html',
+  styleUrls: ['./key-result-type.component.scss']
 })
-export class KeyresultTypeComponent implements OnInit {
+export class KeyResultTypeComponent implements OnInit {
   @Input() keyResultForm!: FormGroup;
 
-  @Input() keyresult!: KeyResult | null;
+  @Input() keyResult!: KeyResult | null;
 
   @Output() formValidityEmitter = new EventEmitter<boolean>();
 
@@ -32,12 +32,12 @@ export class KeyresultTypeComponent implements OnInit {
   constructor(private translate: TranslateService) {}
 
   ngOnInit(): void {
-    if (this.keyresult) {
-      this.typeChangeAllowed = (this.keyresult as KeyResultMetric | KeyResultOrdinal).lastCheckIn?.id == null;
-      this.isMetric = this.keyresult.keyResultType == 'metric';
+    if (this.keyResult) {
+      this.typeChangeAllowed = (this.keyResult as KeyResultMetric | KeyResultOrdinal).lastCheckIn?.id == null;
+      this.isMetric = this.keyResult.keyResultType == 'metric';
       this.isMetric
-        ? this.keyResultForm.patchValue({ ...this.castToMetric(this.keyresult) })
-        : this.keyResultForm.patchValue({ ...this.castToOrdinal(this.keyresult) });
+        ? this.keyResultForm.patchValue({ ...this.castToMetric(this.keyResult) })
+        : this.keyResultForm.patchValue({ ...this.castToOrdinal(this.keyResult) });
     }
     this.switchValidators();
   }
diff --git a/frontend/src/app/components/keyresult/keyresult.component.html b/frontend/src/app/components/key-result/key-result.component.html
similarity index 87%
rename from frontend/src/app/components/keyresult/keyresult.component.html
rename to frontend/src/app/components/key-result/key-result.component.html
index 6aa06cd6b1..8df3aa5c12 100644
--- a/frontend/src/app/components/keyresult/keyresult.component.html
+++ b/frontend/src/app/components/key-result/key-result.component.html
@@ -14,20 +14,20 @@ <h3 class="linebreak mb-3">{{ keyResult.title }}</h3>
   <div class="d-flex justify-content-between mt-2">
     <div class="d-flex justify-content-center align-items-center flex-wrap">
       <h4 class="text-nowrap me-2">Letztes Check-in</h4>
-      <span class="keyResult-attribute-show">{{
+      <span class="key-result-attribute-show">{{
         getKeyResultWithCorrectType().lastCheckIn == null
         ? "Keines"
         : (getKeyResultWithCorrectType().lastCheckIn!.createdOn | date: DATE_FORMAT)
         }}</span>
     </div>
 
-    <div class="d-flex align-items-center flex-wrap justify-content-end keyResult-overview-attribute">
+    <div class="d-flex align-items-center flex-wrap justify-content-end">
       <h4 class="me-2">Confidence</h4>
       <app-confidence
-        [edit]="false"
+        [isEdit]="false"
         [isDetail]="false"
         [checkIn]="getKeyResultWithCorrectType().lastCheckIn!"
-        class="bg-keyResult-attribute"
+        class="bg-key-result-attribute"
       ></app-confidence>
     </div>
   </div>
diff --git a/frontend/src/app/components/keyresult/keyresult.component.scss b/frontend/src/app/components/key-result/key-result.component.scss
similarity index 100%
rename from frontend/src/app/components/keyresult/keyresult.component.scss
rename to frontend/src/app/components/key-result/key-result.component.scss
diff --git a/frontend/src/app/components/keyresult/keyresult.component.spec.ts b/frontend/src/app/components/key-result/key-result.component.spec.ts
similarity index 75%
rename from frontend/src/app/components/keyresult/keyresult.component.spec.ts
rename to frontend/src/app/components/key-result/key-result.component.spec.ts
index 88fc5f84dc..b1d5df7555 100644
--- a/frontend/src/app/components/keyresult/keyresult.component.spec.ts
+++ b/frontend/src/app/components/key-result/key-result.component.spec.ts
@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { KeyresultComponent } from './keyresult.component';
+import { KeyResultComponent } from './key-result.component';
 import { keyResultMetricMin } from '../../shared/testData';
 import { MatDialogModule } from '@angular/material/dialog';
 import { ScoringComponent } from '../../shared/custom/scoring/scoring.component';
 import { ConfidenceComponent } from '../confidence/confidence.component';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
-describe('KeyresultComponent', () => {
-  let component: KeyresultComponent;
-  let fixture: ComponentFixture<KeyresultComponent>;
+describe('KeyResultComponent', () => {
+  let component: KeyResultComponent;
+  let fixture: ComponentFixture<KeyResultComponent>;
 
   beforeEach(async() => {
     await TestBed.configureTestingModule({
-      declarations: [KeyresultComponent,
+      declarations: [KeyResultComponent,
         ScoringComponent,
         ConfidenceComponent],
       imports: [MatDialogModule],
@@ -20,7 +20,7 @@ describe('KeyresultComponent', () => {
     })
       .compileComponents();
 
-    fixture = TestBed.createComponent(KeyresultComponent);
+    fixture = TestBed.createComponent(KeyResultComponent);
     component = fixture.componentInstance;
     component.keyResult = keyResultMetricMin;
     fixture.detectChanges();
diff --git a/frontend/src/app/components/keyresult/keyresult.component.ts b/frontend/src/app/components/key-result/key-result.component.ts
similarity index 86%
rename from frontend/src/app/components/keyresult/keyresult.component.ts
rename to frontend/src/app/components/key-result/key-result.component.ts
index 791fc5eaf8..65a653b2c5 100644
--- a/frontend/src/app/components/keyresult/keyresult.component.ts
+++ b/frontend/src/app/components/key-result/key-result.component.ts
@@ -6,12 +6,12 @@ import { KeyResultMetricMin } from '../../shared/types/model/KeyResultMetricMin'
 import { KeyResultOrdinalMin } from '../../shared/types/model/KeyResultOrdinalMin';
 
 @Component({
-  selector: 'app-keyresult',
-  templateUrl: './keyresult.component.html',
-  styleUrls: ['./keyresult.component.scss'],
+  selector: 'app-key-result',
+  templateUrl: './key-result.component.html',
+  styleUrls: ['./key-result.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class KeyresultComponent {
+export class KeyResultComponent {
   @Input() keyResult!: KeyresultMin;
 
   protected readonly DATE_FORMAT = DATE_FORMAT;
diff --git a/frontend/src/app/components/objective-detail/objective-detail.component.html b/frontend/src/app/components/objective-detail/objective-detail.component.html
index d571c2477d..9e9b5094c8 100644
--- a/frontend/src/app/components/objective-detail/objective-detail.component.html
+++ b/frontend/src/app/components/objective-detail/objective-detail.component.html
@@ -11,7 +11,7 @@ <h2 class="title" [attr.data-testId]="'objective-title'">{{ objective.title }}</
           class="d-flex align-items-center justify-content-center"
           mat-icon-button
           (click)="backToOverview()"
-          [attr.data-testId]="'closeDrawer'"
+          [attr.data-testId]="'close-drawer'"
         >
           <mat-icon class="d-flex justify-content-center align-items-center">close</mat-icon>
         </button>
@@ -30,10 +30,10 @@ <h3 class="mb-1">Beschrieb</h3>
 
         <div class="d-flex align-items-center flex-row justify-content-start" *ngIf="objective.state.toUpperCase() != 'SUCCESSFUL' && objective.state.toUpperCase() != 'NOTSUCCESSFUL'">
           <button
-            *ngIf="objective.writeable"
+            *ngIf="objective.isWriteable"
             mat-flat-button
             (click)="openAddKeyResultDialog()"
-            [attr.data-testId]="'add-keyResult-objective-detail'"
+            [attr.data-testId]="'add-key-result-objective-detail'"
             mat-button
             color="primary"
             disableRipple="true"
@@ -43,7 +43,7 @@ <h3 class="mb-1">Beschrieb</h3>
           </button>
           <button
             (click)="openEditObjectiveDialog()"
-            *ngIf="objective.writeable"
+            *ngIf="objective.isWriteable"
             class="ms-2"
             [attr.data-testId]="'edit-objective'"
             color="primary"
diff --git a/frontend/src/app/components/objective-detail/objective-detail.component.spec.ts b/frontend/src/app/components/objective-detail/objective-detail.component.spec.ts
index 6a00efe244..56bcb79888 100644
--- a/frontend/src/app/components/objective-detail/objective-detail.component.spec.ts
+++ b/frontend/src/app/components/objective-detail/objective-detail.component.spec.ts
@@ -72,17 +72,17 @@ describe('ObjectiveDetailComponent', () => {
       .toContain(objective.description);
   });
 
-  it('should display add keyresult button if writeable is true', async() => {
+  it('should display add key-result button if writeable is true', async() => {
     fixture.detectChanges();
-    const button = fixture.debugElement.query(By.css('[data-testId="add-keyResult-objective-detail"]'));
+    const button = fixture.debugElement.query(By.css('[data-testId="add-key-result-objective-detail"]'));
     expect(button)
       .toBeTruthy();
   });
 
-  it('should not display add keyresult button if writeable is false', async() => {
+  it('should not display add key-result button if writeable is false', async() => {
     objectiveService.getFullObjective.mockReturnValue(of(objectiveWriteableFalse));
     fixture.detectChanges();
-    const button = fixture.debugElement.query(By.css('[data-testId="add-keyResult-objective-detail"]'));
+    const button = fixture.debugElement.query(By.css('[data-testId="add-key-result-objective-detail"]'));
     expect(button)
       .toBeFalsy();
   });
diff --git a/frontend/src/app/components/objective-detail/objective-detail.component.ts b/frontend/src/app/components/objective-detail/objective-detail.component.ts
index d9c32f9249..9901370500 100644
--- a/frontend/src/app/components/objective-detail/objective-detail.component.ts
+++ b/frontend/src/app/components/objective-detail/objective-detail.component.ts
@@ -3,7 +3,7 @@ import { Objective } from '../../shared/types/model/Objective';
 import { ObjectiveService } from '../../services/objective.service';
 import { BehaviorSubject, catchError, EMPTY } from 'rxjs';
 import { RefreshDataService } from '../../services/refresh-data.service';
-import { KeyresultDialogComponent } from '../keyresult-dialog/keyresult-dialog.component';
+import { KeyResultDialogComponent } from '../key-result-dialog/key-result-dialog.component';
 import { ObjectiveFormComponent } from '../../shared/dialog/objective-dialog/objective-form.component';
 import { ActivatedRoute, Router } from '@angular/router';
 import { DialogService } from '../../services/dialog.service';
@@ -49,7 +49,7 @@ export class ObjectiveDetailComponent implements OnInit {
 
   openAddKeyResultDialog() {
     this.dialogService
-      .open(KeyresultDialogComponent, {
+      .open(KeyResultDialogComponent, {
         data: {
           objective: this.objective$.getValue(),
           keyResult: null
diff --git a/frontend/src/app/components/objective-filter/objective-filter.component.html b/frontend/src/app/components/objective-filter/objective-filter.component.html
index 0c9fabb556..1b5127949c 100644
--- a/frontend/src/app/components/objective-filter/objective-filter.component.html
+++ b/frontend/src/app/components/objective-filter/objective-filter.component.html
@@ -14,7 +14,7 @@
       [(ngModel)]="query"
       (input)="refresh.next()"
       [ngModelOptions]="{ standalone: true }"
-      [attr.data-testId]="'objectiveSearch'"
+      [attr.data-testId]="'objective-search'"
     />
   </mat-form-field>
 
diff --git a/frontend/src/app/components/objective-filter/objective-filter.component.spec.ts b/frontend/src/app/components/objective-filter/objective-filter.component.spec.ts
index 68601268d8..566ff90ac5 100644
--- a/frontend/src/app/components/objective-filter/objective-filter.component.spec.ts
+++ b/frontend/src/app/components/objective-filter/objective-filter.component.spec.ts
@@ -27,7 +27,7 @@ describe('ObjectiveFilterComponent', () => {
     return Promise.resolve(true);
   };
 
-  const oauthServiceMock = {
+  const oAuthServiceMock = {
     hasValidIdToken: jest.fn()
   };
 
@@ -41,7 +41,7 @@ describe('ObjectiveFilterComponent', () => {
       },
       {
         provide: OAuthService,
-        useValue: oauthServiceMock
+        useValue: oAuthServiceMock
       }],
       imports: [
         HttpClientTestingModule,
@@ -70,12 +70,12 @@ describe('ObjectiveFilterComponent', () => {
     loader.getHarness(MatInputHarness)
       .then((search) => {
         jest.spyOn(router, 'navigate');
-        jest.spyOn(component, 'updateURL');
+        jest.spyOn(component, 'updateUrl');
         search.setValue('this is a test');
         fixture.detectChanges();
         component.refresh.next();
         tick(200);
-        expect(component.updateURL)
+        expect(component.updateUrl)
           .toHaveBeenCalledTimes(0);
         tick(200);
         expect(router.navigate)
@@ -85,7 +85,7 @@ describe('ObjectiveFilterComponent', () => {
       });
   }));
 
-  it('should read from query  correctly', fakeAsync(() => {
+  it('should read from query correctly', fakeAsync(() => {
     const searchPromise = loader.getHarness(MatInputHarness);
     const routerPromise = RouterTestingHarness.create();
 
diff --git a/frontend/src/app/components/objective-filter/objective-filter.component.ts b/frontend/src/app/components/objective-filter/objective-filter.component.ts
index ab4c587236..10c01c803b 100644
--- a/frontend/src/app/components/objective-filter/objective-filter.component.ts
+++ b/frontend/src/app/components/objective-filter/objective-filter.component.ts
@@ -17,10 +17,10 @@ export class ObjectiveFilterComponent implements OnInit {
   constructor(private router: Router,
     private route: ActivatedRoute) {
     this.refresh.pipe(debounceTime(300))
-      .subscribe(() => this.updateURL());
+      .subscribe(() => this.updateUrl());
   }
 
-  updateURL() {
+  updateUrl() {
     const sanitizedQuery = sanitize(this.query);
     const params = { objectiveQuery: sanitizedQuery };
     const optionalParams = optionalReplaceWithNulls(params);
diff --git a/frontend/src/app/components/objective/objective.component.html b/frontend/src/app/components/objective/objective.component.html
index fa44b0f4e4..d6f92996e9 100644
--- a/frontend/src/app/components/objective/objective.component.html
+++ b/frontend/src/app/components/objective/objective.component.html
@@ -38,14 +38,13 @@ <h2 class="title fit-content">{{ objective.title }}</h2>
       </section>
 
       <section class="d-flex px-3 gap-3 flex-column">
-        <app-keyresult
+        <app-key-result
           *ngFor="let keyResult of objective.keyResults; trackBy: trackByFn"
           class="border-0 p-0"
           (click)="$event.stopPropagation()"
           (keydown.enter)="$event.stopPropagation()"
           [keyResult]="keyResult"
-          [attr.data-testId]="'keyresult'"
-        ></app-keyresult>
+        ></app-key-result>
       </section>
 
       <section class="p-0 py-2 m-0">
@@ -54,7 +53,7 @@ <h2 class="title fit-content">{{ objective.title }}</h2>
           mat-button
           color="primary"
           class="fw-bold px-0 pe-2 ms-2"
-          [attr.data-testId]="'add-keyResult'"
+          [attr.data-testId]="'add-key-result'"
           (click)="openAddKeyResultDialog(objective); $event.stopPropagation()"
           (keydown.enter)="$event.stopPropagation()"
         >
diff --git a/frontend/src/app/components/objective/objective.component.spec.ts b/frontend/src/app/components/objective/objective.component.spec.ts
index 5c4106124f..daa6c2c4ff 100644
--- a/frontend/src/app/components/objective/objective.component.spec.ts
+++ b/frontend/src/app/components/objective/objective.component.spec.ts
@@ -7,10 +7,9 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
 import { State } from '../../shared/types/enums/State';
-import { OverviewService } from '../../services/overview.service';
 import { objectiveMin } from '../../shared/testData';
 import { MatMenuHarness } from '@angular/material/menu/testing';
-import { KeyresultComponent } from '../keyresult/keyresult.component';
+import { KeyResultComponent } from '../key-result/key-result.component';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatTooltipModule } from '@angular/material/tooltip';
@@ -24,10 +23,6 @@ import { ObjectiveService } from '../../services/objective.service';
 import { CompletedService } from '../../services/completed.servce';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
-const overviewServiceMock = {
-  getObjectiveWithKeyresults: jest.fn()
-};
-
 const objectiveServiceMock = {
   getFullObjective: jest.fn()
 };
@@ -42,15 +37,13 @@ describe('ObjectiveColumnComponent', () => {
   let fixture: ComponentFixture<ObjectiveComponent>;
   let loader: HarnessLoader;
   beforeEach(() => {
-    overviewServiceMock.getObjectiveWithKeyresults.mockReset();
-
     TestBed.configureTestingModule({
       declarations: [
         ObjectiveComponent,
-        KeyresultComponent,
+        KeyResultComponent,
         ScoringComponent,
         ConfidenceComponent,
-        KeyresultComponent
+        KeyResultComponent
       ],
       imports: [
         MatMenuModule,
@@ -64,15 +57,11 @@ describe('ObjectiveColumnComponent', () => {
           de: de
         })
       ],
-      providers: [
-        { provide: OverviewService,
-          useValue: overviewServiceMock },
-        { provide: ObjectiveService,
-          useValue: objectiveServiceMock },
-        { provide: CompletedService,
-          useValue: completedServiceMock },
-        provideHttpClient(withInterceptorsFromDi())
-      ]
+      providers: [{ provide: ObjectiveService,
+        useValue: objectiveServiceMock },
+      { provide: CompletedService,
+        useValue: completedServiceMock },
+      provideHttpClient(withInterceptorsFromDi())]
     })
       .compileComponents();
 
@@ -88,11 +77,11 @@ describe('ObjectiveColumnComponent', () => {
       .toBeTruthy();
   });
 
-  test('Mat-menu should open and close', async() => {
+  test('mat-menu should open and close', async() => {
     component.isWritable = true;
     fixture.detectChanges();
 
-    const menu = await loader.getHarness(MatMenuHarness.with({ selector: '[data-testid="three-dot-menu"]' }));
+    const menu = await loader.getHarness(MatMenuHarness.with({ selector: '[data-testId="three-dot-menu"]' }));
     expect(await menu.isOpen())
       .toBeFalsy();
     await menu.open();
@@ -112,27 +101,27 @@ describe('ObjectiveColumnComponent', () => {
       'assets/icons/successful-icon.svg'],
     [State.NOTSUCCESSFUL,
       'assets/icons/not-successful-icon.svg']
-  ])('Status-indicator should change based on the state given by the service', (state: State, path) => {
+  ])('status-indicator should change based on the state given by the service', (state: State, path) => {
     component.objective = { ...objectiveMin,
       state: state };
     fixture.detectChanges();
-    const image = fixture.debugElement.query(By.css('[data-testid="objective-state"]'));
+    const image = fixture.debugElement.query(By.css('[data-testId="objective-state"]'));
     const statusIndicatorSrc = image.attributes['src'];
     expect(statusIndicatorSrc)
       .toBe(path);
   });
 
-  test('Mat-menu should not be present if writeable is false', async() => {
+  test('mat-menu should not be present if is-writeable is false', async() => {
     component.isWritable = false;
     fixture.detectChanges();
-    const menu = fixture.debugElement.query(By.css('[data-testid="objective-menu"]'));
+    const menu = fixture.debugElement.query(By.css('[data-testId="objective-menu"]'));
     expect(menu)
       .toBeFalsy();
   });
 
-  test('Create keyresult button should not be present if writeable is false', async() => {
+  test('create key-result button should not be present if is-writeable is false', async() => {
     component.isWritable = false;
-    const button = fixture.debugElement.query(By.css('[data-testId="add-keyResult"]'));
+    const button = fixture.debugElement.query(By.css('[data-testId="add-key-result"]'));
     expect(button)
       .toBeFalsy();
   });
diff --git a/frontend/src/app/components/objective/objective.component.ts b/frontend/src/app/components/objective/objective.component.ts
index 9596777046..0bb37dd142 100644
--- a/frontend/src/app/components/objective/objective.component.ts
+++ b/frontend/src/app/components/objective/objective.component.ts
@@ -4,7 +4,7 @@ import { Router } from '@angular/router';
 import { distinct, map, ReplaySubject, take } from 'rxjs';
 import { RefreshDataService } from '../../services/refresh-data.service';
 import { trackByFn } from '../../shared/common';
-import { KeyresultDialogComponent } from '../keyresult-dialog/keyresult-dialog.component';
+import { KeyResultDialogComponent } from '../key-result-dialog/key-result-dialog.component';
 import { TranslateService } from '@ngx-translate/core';
 import { DialogService } from '../../services/dialog.service';
 import { ObjectiveMenuActionsService, ObjectiveMenuEntry } from '../../services/objective-menu-actions.service';
@@ -66,7 +66,7 @@ export class ObjectiveComponent {
 
   openAddKeyResultDialog(objective: ObjectiveMin) {
     this.dialogService
-      .open(KeyresultDialogComponent, {
+      .open(KeyResultDialogComponent, {
         data: {
           objective: objective,
           keyResult: null
diff --git a/frontend/src/app/components/overview/overview.component.html b/frontend/src/app/components/overview/overview.component.html
index e51aef2418..1e2203d729 100644
--- a/frontend/src/app/components/overview/overview.component.html
+++ b/frontend/src/app/components/overview/overview.component.html
@@ -1,10 +1,10 @@
-<app-application-banner id="bannerComponent"></app-application-banner>
+<app-application-banner id="banner-component"></app-application-banner>
 <div
   id="overview"
   class="overview-container px-sm-4"
   [ngStyle]="{ 'padding-top.px': overviewPadding | async }"
->
-  <app-team *ngFor="let overviewEntity of overviewEntities$ | async; trackBy: trackByFn" [overviewEntity]="overviewEntity">
+
+>  <app-team *ngFor="let overviewEntity of overviewEntities$ | async; trackBy: trackByFn" [overviewEntity]="overviewEntity">
   </app-team>
   <div *ngIf="(overviewEntities$ | async)?.length == 0" class="d-flex align-items-center flex-column pt-5 gap-5">
     <p id="no-team-text">Kein Team ausgewählt</p>
diff --git a/frontend/src/app/components/overview/overview.component.spec.ts b/frontend/src/app/components/overview/overview.component.spec.ts
index 4d75cf23f8..6a6c8c3ddd 100644
--- a/frontend/src/app/components/overview/overview.component.spec.ts
+++ b/frontend/src/app/components/overview/overview.component.spec.ts
@@ -149,9 +149,9 @@ describe('OverviewComponent', () => {
       [],
       'a a'
     ]
-  ])('should load overview based on queryparams',
+  ])('should load overview based on query-params',
     async(
-      query: string, quarterParam?: number, teamsParam?: number[], objectiveQueryParam?: string
+      query: string, quarterParam?: number, teamsParam?: number[], objectiveParam?: string
     ) => {
       jest.spyOn(overviewService, 'getOverview');
       jest.spyOn(component, 'loadOverview');
@@ -160,12 +160,12 @@ describe('OverviewComponent', () => {
       routerHarness.detectChanges();
       component.loadOverviewWithParams();
       expect(overviewService.getOverview)
-        .toHaveBeenCalledWith(quarterParam, teamsParam, objectiveQueryParam);
+        .toHaveBeenCalledWith(quarterParam, teamsParam, objectiveParam);
       expect(component.loadOverview)
-        .toHaveBeenCalledWith(quarterParam, teamsParam, objectiveQueryParam);
+        .toHaveBeenCalledWith(quarterParam, teamsParam, objectiveParam);
     });
 
-  it('should refresh overview Entities after getOverview is called', async() => {
+  it('should refresh overview entities after getOverview() is called', async() => {
     jest.spyOn(component.overviewEntities$, 'next');
     jest.spyOn(component, 'loadOverview');
     component.loadOverview();
diff --git a/frontend/src/app/components/quarter-filter/quarter-filter.component.html b/frontend/src/app/components/quarter-filter/quarter-filter.component.html
index 023d0b9307..4c62f80791 100644
--- a/frontend/src/app/components/quarter-filter/quarter-filter.component.html
+++ b/frontend/src/app/components/quarter-filter/quarter-filter.component.html
@@ -6,7 +6,7 @@
   <mat-select
     [(ngModel)]="currentQuarterId"
     (ngModelChange)="changeDisplayedQuarter()"
-    [attr.data-testId]="'quarterFilter'"
+    [attr.data-testId]="'quarter-filter'"
     ngDefaultControl
   >
     <mat-option *ngFor="let quarter of quarters | async" [value]="quarter.id">
diff --git a/frontend/src/app/components/team-filter/team-filter.component.html b/frontend/src/app/components/team-filter/team-filter.component.html
index 25c9aa1bcc..ac8c3c9f7f 100644
--- a/frontend/src/app/components/team-filter/team-filter.component.html
+++ b/frontend/src/app/components/team-filter/team-filter.component.html
@@ -1,10 +1,6 @@
 <mat-chip-listbox class="chip-list overflow-hidden w-100 d-grid">
   <button (click)="toggleAll()" class="icon-button focus-outline mt-1 me-1">
-    <mat-chip
-      [attr.data-testId]="'team-filter-alle'"
-      [highlighted]="activeTeams.length == (this.teams$ | async)?.length"
-      color="primary"
-    >
+    <mat-chip [highlighted]="activeTeams.length == (this.teams$ | async)?.length" color="primary">
       <p>Alle</p>
     </mat-chip>
   </button>
diff --git a/frontend/src/app/components/team-filter/team-filter.component.spec.ts b/frontend/src/app/components/team-filter/team-filter.component.spec.ts
index acfde2bc6e..d62e60d2f0 100644
--- a/frontend/src/app/components/team-filter/team-filter.component.spec.ts
+++ b/frontend/src/app/components/team-filter/team-filter.component.spec.ts
@@ -84,7 +84,7 @@ describe('TeamFilterComponent', () => {
       .toHaveBeenCalledTimes(1);
   }));
 
-  it('should select the right chips', waitForAsync(async() => {
+  it('should select the correct chips', waitForAsync(async() => {
     const teamIds = teamList.map((e) => e.id)
       .filter((e, i) => i < 2);
     jest.spyOn(component.teams$, 'next');
@@ -106,7 +106,7 @@ describe('TeamFilterComponent', () => {
       .toHaveBeenCalledTimes(1);
   }));
 
-  it('activeTeams array should contain every team when all teams are shown', waitForAsync(async() => {
+  it('should have all teams in activeTeams array when all teams are shown', waitForAsync(async() => {
     const teamIds = teamList.map((e) => e.id);
     jest.spyOn(component.teams$, 'next');
     jest.spyOn(component, 'changeTeamFilterParams');
@@ -127,7 +127,7 @@ describe('TeamFilterComponent', () => {
       .toHaveBeenCalledTimes(1);
   }));
 
-  it('change filter params and reload', fakeAsync(async() => {
+  it('should update route after updating filter', fakeAsync(async() => {
     component.activeTeams = teamList.map((e) => e.id)
       .filter((e, i) => i < 2);
     const routerHarness = await RouterTestingHarness.create();
@@ -167,7 +167,7 @@ describe('TeamFilterComponent', () => {
     [[3],
       3,
       []]
-  ])('toggle Selection', (activeTeams: number[], selected: number, expected: number[]) => {
+  ])('should toggle Selection', (activeTeams: number[], selected: number, expected: number[]) => {
     component.activeTeams = activeTeams;
     jest.spyOn(component, 'areAllTeamsShown');
     jest.spyOn(component, 'changeTeamFilterParams');
@@ -198,7 +198,7 @@ describe('TeamFilterComponent', () => {
       2,
       4],
     false]
-  ])('are all teams shown', (activeTeams: number[], expected: boolean) => {
+  ])('should correctly determine if all teams are shown', (activeTeams: number[], expected: boolean) => {
     component.activeTeams = activeTeams;
     expect(component.areAllTeamsShown())
       .toBe(expected);
@@ -222,7 +222,7 @@ describe('TeamFilterComponent', () => {
       2,
       3],
     []]
-  ])('select all', (currentTeams: number[], expectedTeams: number[]) => {
+  ])('should correctly select all teams', (currentTeams: number[], expectedTeams: number[]) => {
     component.activeTeams = currentTeams;
     jest.spyOn(component, 'changeTeamFilterParams');
     component.toggleAll();
@@ -298,7 +298,7 @@ describe('TeamFilterComponent', () => {
     3],
   '1,2,3'],
   [[],
-    null]])('changeTeamFilterParams', async(currentTeams: number[], routingTeams: string | null) => {
+    null]])('should navigate after filter update', async(currentTeams: number[], routingTeams: string | null) => {
     component.activeTeams = currentTeams;
 
     jest.spyOn(router, 'navigate');
@@ -317,19 +317,19 @@ describe('TeamFilterComponent', () => {
       { id: 1,
         version: 0,
         name: 'Team D',
-        writeable: true },
+        isWriteable: true },
       { id: 2,
         version: 0,
         name: 'Team C',
-        writeable: true },
+        isWriteable: true },
       { id: 3,
         version: 0,
         name: 'Team B',
-        writeable: true },
+        isWriteable: true },
       { id: 4,
         version: 0,
         name: 'Team A',
-        writeable: true }
+        isWriteable: true }
     ];
 
     component.teams$ = new BehaviorSubject(teams);
@@ -343,19 +343,19 @@ describe('TeamFilterComponent', () => {
         { id: 4,
           version: 0,
           name: 'Team A',
-          writeable: true },
+          isWriteable: true },
         { id: 3,
           version: 0,
           name: 'Team B',
-          writeable: true },
+          isWriteable: true },
         { id: 2,
           version: 0,
           name: 'Team C',
-          writeable: true },
+          isWriteable: true },
         { id: 1,
           version: 0,
           name: 'Team D',
-          writeable: true }
+          isWriteable: true }
       ]);
   });
 });
diff --git a/frontend/src/app/components/team/team.component.html b/frontend/src/app/components/team/team.component.html
index 3821f4296b..ccd7c5a6bb 100644
--- a/frontend/src/app/components/team/team.component.html
+++ b/frontend/src/app/components/team/team.component.html
@@ -5,7 +5,7 @@ <h1 class="team-title">{{ OVEntity.team.name }}</h1>
     </div>
     <button
       (click)="createObjective()"
-      *ngIf="OVEntity.writeable"
+      *ngIf="OVEntity.isWriteable"
       id="add-objective"
       [attr.data-testId]="'add-objective'"
       class="px-0 mt-1 mb-3 pe-2 h-50 align-new-icon"
@@ -28,7 +28,7 @@ <h1 class="team-title">{{ OVEntity.team.name }}</h1>
     <app-objective-column
       *ngFor="let objective of OVEntity.objectives; trackBy: trackByObjectiveId"
       [attr.data-testId]="'objective'"
-      [isWritable]="OVEntity.writeable"
+      [isWritable]="OVEntity.isWriteable"
       [objective]="objective"
       class="col-xs-12 col-md-6 col-xl-4 pb-3 column-width"
       id="objective-column"
diff --git a/frontend/src/app/components/team/team.component.spec.ts b/frontend/src/app/components/team/team.component.spec.ts
index 4f042ec920..c86612e161 100644
--- a/frontend/src/app/components/team/team.component.spec.ts
+++ b/frontend/src/app/components/team/team.component.spec.ts
@@ -5,7 +5,7 @@ import { overViewEntity1, overViewEntity2 } from '../../shared/testData';
 import { ObjectiveComponent } from '../objective/objective.component';
 import { RouterTestingModule } from '@angular/router/testing';
 import { MatMenuModule } from '@angular/material/menu';
-import { KeyresultComponent } from '../keyresult/keyresult.component';
+import { KeyResultComponent } from '../key-result/key-result.component';
 import { MatDialogModule } from '@angular/material/dialog';
 import { By } from '@angular/platform-browser';
 import { RefreshDataService } from '../../services/refresh-data.service';
@@ -64,7 +64,7 @@ describe('TeamComponent', () => {
       declarations: [
         TeamComponent,
         ObjectiveComponent,
-        KeyresultComponent,
+        KeyResultComponent,
         ConfidenceComponent,
         ScoringComponent
       ],
@@ -110,7 +110,7 @@ describe('TeamComponent', () => {
 
   it('should not display add objective button if writeable is false', () => {
     component.overviewEntity = { ...overViewEntity2 };
-    component.overviewEntity.writeable = false;
+    component.overviewEntity.isWriteable = false;
     fixture.detectChanges();
     const button = fixture.debugElement.query(By.css('[data-testId="add-objective"]'));
     expect(button)
diff --git a/frontend/src/app/components/team/team.component.ts b/frontend/src/app/components/team/team.component.ts
index 6e86c8f7fb..5c88d30db7 100644
--- a/frontend/src/app/components/team/team.component.ts
+++ b/frontend/src/app/components/team/team.component.ts
@@ -3,7 +3,7 @@ import { OverviewEntity } from '../../shared/types/model/OverviewEntity';
 import { ObjectiveFormComponent } from '../../shared/dialog/objective-dialog/objective-form.component';
 import { RefreshDataService } from '../../services/refresh-data.service';
 import { Objective } from '../../shared/types/model/Objective';
-import { KeyresultDialogComponent } from '../keyresult-dialog/keyresult-dialog.component';
+import { KeyResultDialogComponent } from '../key-result-dialog/key-result-dialog.component';
 import { ObjectiveMin } from '../../shared/types/model/ObjectiveMin';
 import { DialogService } from '../../services/dialog.service';
 import { ConfigService } from '../../services/config.service';
@@ -53,7 +53,7 @@ export class TeamComponent {
 
   openAddKeyResultDialog(objective: Objective) {
     this.dialogService
-      .open(KeyresultDialogComponent, {
+      .open(KeyResultDialogComponent, {
         data: {
           objective: objective,
           keyResult: null
diff --git a/frontend/src/app/guards/auth.guard.spec.ts b/frontend/src/app/guards/auth.guard.spec.ts
index 5687143c4d..b49a969bb5 100644
--- a/frontend/src/app/guards/auth.guard.spec.ts
+++ b/frontend/src/app/guards/auth.guard.spec.ts
@@ -18,7 +18,7 @@ const routerMock = {
 
 const route = { queryParamMap: new Map() };
 
-describe('authGuard', () => {
+describe('AuthGuard', () => {
   const executeGuard: CanActivateFn = (...guardParameters) => TestBed.runInInjectionContext(() => authGuard(...guardParameters));
 
   beforeEach(() => {
@@ -51,7 +51,7 @@ describe('authGuard', () => {
       .toBeTruthy();
   });
 
-  it('should not call initCodeFlow if token is valid and call router if state param exist', async() => {
+  it('should not call initCodeFlow() if token is valid and call router if state param exist', async() => {
     jest.spyOn(oAuthMock, 'hasValidIdToken')
       .mockReturnValue(true);
     route.queryParamMap.set('state', 1234);
@@ -82,7 +82,7 @@ describe('authGuard', () => {
     expect(routerMock.navigateByUrl).not.toHaveBeenCalled();
   });
 
-  it('should call initCodeFlow if token is invalid', async() => {
+  it('should call initCodeFlow() if token is invalid', async() => {
     jest.spyOn(oAuthMock, 'hasValidIdToken')
       .mockReturnValue(false);
     const result = await runAuthGuardWithContext(authGuard);
diff --git a/frontend/src/app/guards/auth.guard.ts b/frontend/src/app/guards/auth.guard.ts
index cbccbc8166..12b281b8d3 100644
--- a/frontend/src/app/guards/auth.guard.ts
+++ b/frontend/src/app/guards/auth.guard.ts
@@ -3,17 +3,17 @@ import { inject } from '@angular/core';
 import { OAuthService } from 'angular-oauth2-oidc';
 
 export const authGuard: CanActivateFn = (route, state) => {
-  const oauthService = inject(OAuthService);
+  const oAuthService = inject(OAuthService);
   const router = inject(Router);
-  return oauthService.loadDiscoveryDocumentAndTryLogin()
+  return oAuthService.loadDiscoveryDocumentAndTryLogin()
     .then(async() => {
     // if the login failed initialize code flow
-      const validToken = oauthService.hasValidIdToken();
+      const validToken = oAuthService.hasValidIdToken();
       if (!validToken) {
-        oauthService.initCodeFlow();
+        oAuthService.initCodeFlow();
         return false;
       }
-      oauthService.setupAutomaticSilentRefresh();
+      oAuthService.setupAutomaticSilentRefresh();
       // redirect route to remove state query param. do it only, if this param exist to avoid infinite loop
       if (route.queryParamMap.get('state')) {
         await router.navigateByUrl('');
diff --git a/frontend/src/app/interceptors/error.interceptor.spec.ts b/frontend/src/app/interceptors/error.interceptor.spec.ts
index ca08601121..7117ea72ea 100644
--- a/frontend/src/app/interceptors/error.interceptor.spec.ts
+++ b/frontend/src/app/interceptors/error.interceptor.spec.ts
@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { ErrorInterceptor } from './error-interceptor.service';
+import { ErrorInterceptor } from './error.interceptor';
 import { ToasterService } from '../services/toaster.service';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { Router } from '@angular/router';
@@ -33,12 +33,12 @@ describe('ErrorInterceptor', () => {
       .toBeTruthy();
   });
 
-  it.each([['test',
-    0],
-  ['objective',
-    1],
-  ['keyresult',
-    1]])('handleDrawerError on route %p should be called %p times', (url: string, isCalledTimes: number) => {
+  it.each([[0,
+    'test'],
+  [1,
+    'objective'],
+  [1,
+    'keyresult']])('should call handleDrawerError %p times when routing to %p', (isCalledTimes: number, url: string) => {
     const requestMock = { url: url };
     jest.spyOn(router, 'navigate');
 
@@ -51,7 +51,7 @@ describe('ErrorInterceptor', () => {
   it.each([['NOT_AUTHORIZED_TO_READ',
     ['Objective']],
   ['NOT_AUTHORIZED_TO_WRITE',
-    ['Check-in']]])('handleErrorToaster should show correct toaster', (key: string, params: string[]) => {
+    ['Check-in']]])('should show correct error toaster when calling handleErrorToaster()', (key: string, params: string[]) => {
     const ERROR_PREFIX = 'ERROR.';
     jest.spyOn(translator, 'instant');
     jest.spyOn(toaster, 'showError');
@@ -97,7 +97,7 @@ describe('ErrorInterceptor', () => {
     'KEYRESULT',
     ToasterType.SUCCESS,
     'Keyresult wurde gelöscht'
-  ]])('handleSuccessToaster should show toaster ',
+  ]])('should show correct success toaster when calling handleSuccessToaster()',
     (
       url: string, code: number, method: HttpType, key: string, toasterType: ToasterType, message: string
     ) => {
@@ -140,26 +140,27 @@ describe('ErrorInterceptor', () => {
     200,
     HttpType.GET,
     'KEYRESULT'
-  ]])('handleSuccessToaster should not show toaster ', (url: string, code: number, method: HttpType) => {
-    jest.spyOn(translator, 'instant');
-    jest.spyOn(toaster, 'showCustomToaster');
-    jest.spyOn(interceptor, 'getSuccessMessageKey')
-      .mockReturnValue(undefined);
+  ]])('should not show toaster if handleSuccessToaster() returns undefined',
+    (url: string, code: number, method: HttpType) => {
+      jest.spyOn(translator, 'instant');
+      jest.spyOn(toaster, 'showCustomToaster');
+      jest.spyOn(interceptor, 'getSuccessMessageKey')
+        .mockReturnValue(undefined);
 
-    const requestMock = {
-      url: url,
-      status: code
-    };
+      const requestMock = {
+        url: url,
+        status: code
+      };
 
-    interceptor.handleSuccessToaster(requestMock, method);
-    expect(interceptor.getSuccessMessageKey)
-      .toBeCalledWith(url, code, method);
+      interceptor.handleSuccessToaster(requestMock, method);
+      expect(interceptor.getSuccessMessageKey)
+        .toBeCalledWith(url, code, method);
 
-    expect(translator.instant)
-      .toBeCalledTimes(0);
-    expect(toaster.showCustomToaster)
-      .toBeCalledTimes(0);
-  });
+      expect(translator.instant)
+        .toBeCalledTimes(0);
+      expect(toaster.showCustomToaster)
+        .toBeCalledTimes(0);
+    });
 
   it.each([
     [
@@ -261,38 +262,39 @@ describe('ErrorInterceptor', () => {
     ],
 
     [
-      '/checkIns/1',
+      '/checkins/1',
       200,
       HttpType.GET,
       undefined
     ],
     [
-      '/checkIns/1',
+      '/checkins/1',
       200,
       HttpType.PUT,
       { key: 'CHECK_IN.PUT',
         toasterType: ToasterType.SUCCESS }
     ],
     [
-      '/checkIns/1',
+      '/checkins/1',
       200,
       HttpType.POST,
       { key: 'CHECK_IN.POST',
         toasterType: ToasterType.SUCCESS }
     ],
     [
-      '/checkIns/1',
+      '/checkins/1',
       200,
       HttpType.DELETE,
       undefined
     ]
-  ])('getSuccessMessageKey should work', (
-    url: string, code: number, method: HttpType, result: any
-  ) => {
-    const successMessageKey = interceptor.getSuccessMessageKey(url, code, method);
-    expect(successMessageKey)
-      .toStrictEqual(result);
-  });
+  ])('should get correct success message object when calling getSuccessMessageKey()',
+    (
+      url: string, code: number, method: HttpType, result: any
+    ) => {
+      const successMessageKey = interceptor.getSuccessMessageKey(url, code, method);
+      expect(successMessageKey)
+        .toStrictEqual(result);
+    });
 
   it.each([['http://localhost:4200/',
     'http://localhost:4200/api/objecive/1',
@@ -302,7 +304,7 @@ describe('ErrorInterceptor', () => {
     false],
   ['http://localhost:4200/',
     'http://habasch:4200/objecive/1',
-    false]])('checkIfSuccessToasterIsShown should work as intended',
+    false]])('should correctly determine if toaster is shown with checkIfSuccessToasterIsShown()',
     (currentURL: string, requestURL: string, result: boolean) => {
       const requestMock = { url: requestURL };
       window.location.assign(currentURL);
diff --git a/frontend/src/app/interceptors/error-interceptor.service.ts b/frontend/src/app/interceptors/error.interceptor.ts
similarity index 96%
rename from frontend/src/app/interceptors/error-interceptor.service.ts
rename to frontend/src/app/interceptors/error.interceptor.ts
index 23ad72a6b9..7030262795 100644
--- a/frontend/src/app/interceptors/error-interceptor.service.ts
+++ b/frontend/src/app/interceptors/error.interceptor.ts
@@ -73,12 +73,12 @@ export class ErrorInterceptor implements HttpInterceptor {
         if (toasterMessage.method == method) {
           for (const codeKey of toasterMessage.keysForCode || []) {
             if (codeKey.code == statusCode) {
-              const messageKey = value.KEY + '.' + codeKey.key;
+              const messageKey = value.key + '.' + codeKey.key;
               return { key: messageKey,
                 toasterType: codeKey.toaster };
             }
           }
-          const messageKey = value.KEY + '.' + method;
+          const messageKey = value.key + '.' + method;
           return { key: messageKey,
             toasterType: ToasterType.SUCCESS };
         }
diff --git a/frontend/src/app/interceptors/oauth.interceptor.spec.ts b/frontend/src/app/interceptors/o-auth.interceptor.spec.ts
similarity index 77%
rename from frontend/src/app/interceptors/oauth.interceptor.spec.ts
rename to frontend/src/app/interceptors/o-auth.interceptor.spec.ts
index 23c1370842..0d6273eb41 100644
--- a/frontend/src/app/interceptors/oauth.interceptor.spec.ts
+++ b/frontend/src/app/interceptors/o-auth.interceptor.spec.ts
@@ -1,10 +1,10 @@
 import { TestBed } from '@angular/core/testing';
 
-import { OauthInterceptor } from './oauth.interceptor';
+import { OAuthInterceptor } from './o-auth.interceptor';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { DateTimeProvider, OAuthLogger, OAuthService, UrlHelperService } from 'angular-oauth2-oidc';
 
-describe('OauthInterceptor', () => {
+describe('OAuthInterceptor', () => {
   beforeEach(() => TestBed.configureTestingModule({
     imports: [HttpClientTestingModule],
     providers: [
@@ -17,7 +17,7 @@ describe('OauthInterceptor', () => {
   }));
 
   it('should be created', () => {
-    const interceptor: OauthInterceptor = TestBed.inject(OauthInterceptor);
+    const interceptor: OAuthInterceptor = TestBed.inject(OAuthInterceptor);
     expect(interceptor)
       .toBeTruthy();
   });
diff --git a/frontend/src/app/interceptors/oauth.interceptor.ts b/frontend/src/app/interceptors/o-auth.interceptor.ts
similarity index 76%
rename from frontend/src/app/interceptors/oauth.interceptor.ts
rename to frontend/src/app/interceptors/o-auth.interceptor.ts
index 28934d09fc..3abaf71994 100644
--- a/frontend/src/app/interceptors/oauth.interceptor.ts
+++ b/frontend/src/app/interceptors/o-auth.interceptor.ts
@@ -6,19 +6,19 @@ import { OAuthService } from 'angular-oauth2-oidc';
 @Injectable({
   providedIn: 'root'
 })
-export class OauthInterceptor implements HttpInterceptor {
-  constructor(private oauthService: OAuthService) {}
+export class OAuthInterceptor implements HttpInterceptor {
+  constructor(private oAuthService: OAuthService) {}
 
   intercept(req: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
     if (!req.url.match(/^(\/)?api/)) {
       return next.handle(req);
     }
 
-    return merge(of(this.oauthService.getAccessToken())
+    return merge(of(this.oAuthService.getAccessToken())
       .pipe(filter((token) => !!token)),
-    this.oauthService.events.pipe(filter((e) => e.type === 'token_received'),
+    this.oAuthService.events.pipe(filter((e) => e.type === 'token_received'),
       timeout(500),
-      map((_) => this.oauthService.getAccessToken())))
+      map((_) => this.oAuthService.getAccessToken())))
       .pipe(take(1),
         mergeMap((token) => {
           if (token) {
diff --git a/frontend/src/app/services/check-in.service.ts b/frontend/src/app/services/check-in.service.ts
index 873e31be05..150d48f7b3 100644
--- a/frontend/src/app/services/check-in.service.ts
+++ b/frontend/src/app/services/check-in.service.ts
@@ -16,9 +16,9 @@ export class CheckInService {
 
   saveCheckIn(checkIn: CheckIn) {
     if (checkIn.id) {
-      return this.httpclient.put<any>('/api/v2/checkIns/' + checkIn.id, checkIn);
+      return this.httpclient.put<any>('/api/v2/checkins/' + checkIn.id, checkIn);
     } else {
-      return this.httpclient.post<any>('/api/v2/checkIns', checkIn);
+      return this.httpclient.post<any>('/api/v2/checkins', checkIn);
     }
   }
 }
diff --git a/frontend/src/app/services/objective-menu-actions.service.spec.ts b/frontend/src/app/services/objective-menu-actions.service.spec.ts
index 2f252f5f1d..70b57d8dcf 100644
--- a/frontend/src/app/services/objective-menu-actions.service.spec.ts
+++ b/frontend/src/app/services/objective-menu-actions.service.spec.ts
@@ -34,12 +34,17 @@ describe('ObjectiveMenuActionsService', () => {
   });
 
   describe('getMenu', () => {
+    afterEach(() => {
+      expect(specificMenuEntriesSpy)
+        .toHaveBeenCalledTimes(1);
+    });
+
     it('should return default and specific menu entries for an ongoing objective', () => {
       const spyOn = jest.spyOn(service as any, 'getOngoingMenuActions');
 
-      const objectiveMinLocal: ObjectiveMin = objectiveMin;
-      objectiveMinLocal.state = State.ONGOING;
-      service.getMenu(objectiveMinLocal);
+      const ongoingObjectiveMin: ObjectiveMin = objectiveMin;
+      ongoingObjectiveMin.state = State.ONGOING;
+      service.getMenu(ongoingObjectiveMin);
       expect(spyOn)
         .toHaveBeenCalledTimes(1);
     });
@@ -47,9 +52,9 @@ describe('ObjectiveMenuActionsService', () => {
     it('should return draft menu entries for a draft objective', () => {
       const spyOn = jest.spyOn(service as any, 'getDraftMenuActions');
 
-      const objectiveMinLocal: ObjectiveMin = objectiveMin;
-      objectiveMinLocal.state = State.DRAFT;
-      service.getMenu(objectiveMinLocal);
+      const draftObjectiveMin: ObjectiveMin = objectiveMin;
+      draftObjectiveMin.state = State.DRAFT;
+      service.getMenu(draftObjectiveMin);
       expect(spyOn)
         .toHaveBeenCalledTimes(1);
     });
@@ -57,9 +62,9 @@ describe('ObjectiveMenuActionsService', () => {
     it('should return completed menu entries for a successful objective', () => {
       const spyOn = jest.spyOn(service as any, 'getCompletedMenuActions');
 
-      const objectiveMinLocal: ObjectiveMin = objectiveMin;
-      objectiveMinLocal.state = State.SUCCESSFUL;
-      service.getMenu(objectiveMinLocal);
+      const successfulObjectiveMin: ObjectiveMin = objectiveMin;
+      successfulObjectiveMin.state = State.SUCCESSFUL;
+      service.getMenu(successfulObjectiveMin);
       expect(spyOn)
         .toHaveBeenCalledTimes(1);
     });
@@ -67,20 +72,16 @@ describe('ObjectiveMenuActionsService', () => {
     it('should return completed menu entries for a non-successful objective', () => {
       const spyOn = jest.spyOn(service as any, 'getCompletedMenuActions');
 
-      const objectiveMinLocal: ObjectiveMin = objectiveMin;
-      objectiveMinLocal.state = State.NOTSUCCESSFUL;
-      service.getMenu(objectiveMinLocal);
+      const notSuccessfulObjectiveMinLocal: ObjectiveMin = objectiveMin;
+      notSuccessfulObjectiveMinLocal.state = State.NOTSUCCESSFUL;
+      service.getMenu(notSuccessfulObjectiveMinLocal);
       expect(spyOn)
         .toHaveBeenCalledTimes(1);
     });
-    afterEach(() => {
-      expect(specificMenuEntriesSpy)
-        .toHaveBeenCalledTimes(1);
-    });
   });
 
-  describe('getReleaseAction', () => {
-    it('should return release from backlog action for an objective in backlog quarter', () => {
+  describe('get correct release action', () => {
+    it('should return release from backlog action for an objective in the backlog quarter', () => {
       jest.spyOn(service as any, 'isInBacklogQuarter')
         .mockReturnValue(true);
       const spyOn = jest.spyOn(service as any, 'isInBacklogQuarter')
@@ -91,7 +92,7 @@ describe('ObjectiveMenuActionsService', () => {
         .toHaveBeenCalledTimes(1);
     });
 
-    it('should return release from quarter action for an objective in non-backlog quarter', () => {
+    it('should return release from quarter action for an objective in a non-backlog quarter', () => {
       const spyOn = jest.spyOn(service as any, 'isInBacklogQuarter')
         .mockReturnValue(false);
       // @ts-expect-error
diff --git a/frontend/src/app/services/toaster.service.spec.ts b/frontend/src/app/services/toaster.service.spec.ts
index fbcaf5934c..b75c3992dd 100644
--- a/frontend/src/app/services/toaster.service.spec.ts
+++ b/frontend/src/app/services/toaster.service.spec.ts
@@ -6,7 +6,7 @@ import { ToasterType } from '../shared/types/enums/ToasterType';
 
 describe('ToasterService', () => {
   let service: ToasterService;
-  let toastr: ToastrService;
+  let toaster: ToastrService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -14,7 +14,7 @@ describe('ToasterService', () => {
       providers: [ToasterService]
     });
     service = TestBed.inject(ToasterService);
-    toastr = TestBed.inject(ToastrService);
+    toaster = TestBed.inject(ToastrService);
   });
 
   it('should be created', () => {
@@ -22,25 +22,25 @@ describe('ToasterService', () => {
       .toBeTruthy();
   });
 
-  it('showSuccess should call right method', () => {
-    jest.spyOn(toastr, 'success');
+  it('should call right method for showSuccess', () => {
+    jest.spyOn(toaster, 'success');
     service.showSuccess('test');
-    expect(toastr.success)
-      .toBeCalledWith('test', 'Erfolgreich!');
+    expect(toaster.success)
+      .toHaveBeenCalledWith('test', 'Erfolgreich!');
   });
 
-  it('showError should call right method', () => {
-    jest.spyOn(toastr, 'error');
+  it('should call right method for showError', () => {
+    jest.spyOn(toaster, 'error');
     service.showError('test');
-    expect(toastr.error)
-      .toBeCalledWith('test', 'Fehler!');
+    expect(toaster.error)
+      .toHaveBeenCalledWith('test', 'Fehler!');
   });
 
-  it('showWarn should call right method', () => {
-    jest.spyOn(toastr, 'warning');
+  it('should call right method for showWarn', () => {
+    jest.spyOn(toaster, 'warning');
     service.showWarn('test');
-    expect(toastr.warning)
-      .toBeCalledWith('test', 'Warnung!');
+    expect(toaster.warning)
+      .toHaveBeenCalledWith('test', 'Warnung!');
   });
 
   it.each([
@@ -56,12 +56,12 @@ describe('ToasterService', () => {
     [999,
       'message',
       'showSuccess']
-  ])('showWarn should call right method', (toasterType: number, message: string, func: any) => {
+  ])('should call right method for dynamic toaster', (toasterType: number, message: string, func: any) => {
     const spy = jest.spyOn(service, func);
 
     service.showCustomToaster(message, toasterType);
 
     expect(spy)
-      .toBeCalledWith(message);
+      .toHaveBeenCalledWith(message);
   });
 });
diff --git a/frontend/src/app/services/user.service.spec.ts b/frontend/src/app/services/user.service.spec.ts
index e425387c66..d51d35e7b3 100644
--- a/frontend/src/app/services/user.service.spec.ts
+++ b/frontend/src/app/services/user.service.spec.ts
@@ -26,17 +26,17 @@ describe('UserService', () => {
       .toBeTruthy();
   });
 
-  it('getUsers should only reload users when they are not loaded yet', (done) => {
+  it('should only reload getUsers when they are not loaded yet', (done) => {
     const spy = jest.spyOn(service, 'reloadUsers');
     service.getUsers()
       .subscribe(() => {
         expect(spy)
-          .toBeCalledTimes(1);
+          .toHaveBeenCalledTimes(1);
         httpMock.expectOne(URL);
         service.getUsers()
           .subscribe((users) => {
             expect(spy)
-              .toBeCalledTimes(1);
+              .toHaveBeenCalledTimes(1);
             expect(users)
               .toStrictEqual([]);
             done();
@@ -44,14 +44,14 @@ describe('UserService', () => {
       });
   });
 
-  it('get current user should throw error, when not loaded', () => {
+  it('should throw error if current User is not loaded', () => {
     expect(() => service.getCurrentUser())
-      .toThrowError('user should not be undefined here');
+      .toThrow('user should not be undefined here');
   });
 
-  it('init current user should load user', (done) => {
+  it('should load current user after user init', (done) => {
     expect(() => service.getCurrentUser())
-      .toThrowError('user should not be undefined here');
+      .toThrow('user should not be undefined here');
     service.getOrInitCurrentUser()
       .subscribe(() => {
         expect(service.getCurrentUser())
@@ -62,7 +62,7 @@ describe('UserService', () => {
     req.flush(users[0]);
   });
 
-  it('setIsOkrChampion should call put operation, reloadUsers and reloadCurrentUser', fakeAsync(() => {
+  it('should call put operation, reloadUsers and reloadCurrentUser when setIsOkrChampion is called', fakeAsync(() => {
     service.setIsOkrChampion(testUser, true)
       .subscribe();
     const req = httpMock.expectOne(`api/v1/users/${testUser.id}/isokrchampion/true`);
@@ -76,7 +76,7 @@ describe('UserService', () => {
     req3.flush({});
   }));
 
-  it('createUsers should call createAll and reloadUsers', fakeAsync(() => {
+  it('should call createAll and reloadUsers when createUsers is called', fakeAsync(() => {
     service.createUsers(users)
       .subscribe();
     const req = httpMock.expectOne(`api/v1/users/createall`);
@@ -88,7 +88,7 @@ describe('UserService', () => {
     req2.flush({});
   }));
 
-  it('deleteUser should call /userId and reloadUsers', fakeAsync(() => {
+  it('should call /userId and reloadUsers when deleteUser is called', fakeAsync(() => {
     service.deleteUser(testUser)
       .subscribe();
     const req = httpMock.expectOne(`api/v1/users/${testUser.id}`);
diff --git a/frontend/src/app/shared/constantLibary.ts b/frontend/src/app/shared/constantLibary.ts
index 0d12f58144..da60551f3b 100644
--- a/frontend/src/app/shared/constantLibary.ts
+++ b/frontend/src/app/shared/constantLibary.ts
@@ -3,7 +3,7 @@ import { ToasterType } from './types/enums/ToasterType';
 import { HttpStatusCode } from '@angular/common/http';
 
 type MessageKeyMap = Record<string, {
-  KEY: string;
+  key: string;
   methods: {
     method: HttpType;
     keysForCode?: {
@@ -21,7 +21,6 @@ export const SUCCESS_MESSAGE_KEY_PREFIX = 'SUCCESS.';
 export const ERROR_MESSAGE_KEY_PREFIX = 'ERROR.';
 
 export const DATE_FORMAT = 'dd.MM.yyyy';
-export const CONFIRM_DIALOG_WIDTH = '450px';
 export const DRAWER_ROUTES = ['objective',
   'keyresult'];
 
@@ -29,13 +28,13 @@ export const GJ_REGEX_PATTERN = /^GJ \d{2}\/\d{2}-Q\d$/;
 
 export const SUCCESS_MESSAGE_MAP: MessageKeyMap = {
   teams: {
-    KEY: 'TEAM',
+    key: 'TEAM',
     methods: [{ method: HttpType.POST },
       { method: HttpType.PUT },
       { method: HttpType.DELETE }]
   },
   objectives: {
-    KEY: 'OBJECTIVE',
+    key: 'OBJECTIVE',
     methods: [{ method: HttpType.POST },
       { method: HttpType.DELETE },
       {
@@ -48,7 +47,7 @@ export const SUCCESS_MESSAGE_MAP: MessageKeyMap = {
       }]
   },
   keyresults: {
-    KEY: 'KEY_RESULT',
+    key: 'KEY_RESULT',
     methods: [{ method: HttpType.POST },
       { method: HttpType.DELETE },
       {
@@ -60,13 +59,13 @@ export const SUCCESS_MESSAGE_MAP: MessageKeyMap = {
         }]
       }]
   },
-  checkIns: {
-    KEY: 'CHECK_IN',
+  checkins: {
+    key: 'CHECK_IN',
     methods: [{ method: HttpType.POST },
       { method: HttpType.PUT }]
   },
   user: {
-    KEY: 'USERS',
+    key: 'USERS',
     methods: [{ method: HttpType.PUT },
       { method: HttpType.POST },
       { method: HttpType.DELETE }]
diff --git a/frontend/src/app/shared/custom/scoring/scoring.component.html b/frontend/src/app/shared/custom/scoring/scoring.component.html
index 03cf5ed3f8..335371564a 100644
--- a/frontend/src/app/shared/custom/scoring/scoring.component.html
+++ b/frontend/src/app/shared/custom/scoring/scoring.component.html
@@ -54,7 +54,7 @@ <h5 class="text-center stretch-label">Stretch</h5>
         [src]="'assets/icons/star-' + iconPath + '-icon.svg'"
         [attr.data-testId]="'stretch'"
         alt="Star-Icon"
-        class="starIcon"
+        class="star-icon"
       />
     </div>
   </div>
diff --git a/frontend/src/app/shared/custom/scoring/scoring.component.scss b/frontend/src/app/shared/custom/scoring/scoring.component.scss
index cd0c366aa8..7c5a2379d3 100644
--- a/frontend/src/app/shared/custom/scoring/scoring.component.scss
+++ b/frontend/src/app/shared/custom/scoring/scoring.component.scss
@@ -31,7 +31,7 @@
   margin-left: 16px;
 }
 
-.starIcon {
+.star-icon {
   display: block;
   width: 21px;
   height: 21px;
diff --git a/frontend/src/app/shared/custom/scoring/scoring.component.spec.ts b/frontend/src/app/shared/custom/scoring/scoring.component.spec.ts
index 7c331b9f75..cc758fbc23 100644
--- a/frontend/src/app/shared/custom/scoring/scoring.component.spec.ts
+++ b/frontend/src/app/shared/custom/scoring/scoring.component.spec.ts
@@ -83,7 +83,7 @@ describe('ScoringComponent', () => {
         target: 101,
         className: 'score-stretch',
         borderClass: 'none' }]
-    ])('should set styles correctly', async(object: any) => {
+    ])('should set styles correctly for given values', async(object: any) => {
       component.targetPercent = object.target;
       component.commitPercent = object.commit;
       component.failPercent = object.fail;
@@ -156,7 +156,7 @@ describe('ScoringComponent', () => {
     [{ zoneValue: Zone.TARGET,
       fail: 100,
       commit: 100,
-      target: 100 }]])('should set percentages correctly', (object: any) => {
+      target: 100 }]])('should set percentages correctly for ordinal zone', (object: any) => {
       // Reset component
       component.targetPercent = 0;
       component.commitPercent = 0;
diff --git a/frontend/src/app/shared/custom/scoring/scoring.component.ts b/frontend/src/app/shared/custom/scoring/scoring.component.ts
index 5912d506c7..0fd045d332 100644
--- a/frontend/src/app/shared/custom/scoring/scoring.component.ts
+++ b/frontend/src/app/shared/custom/scoring/scoring.component.ts
@@ -13,7 +13,7 @@ import {
 import { Zone } from '../../types/enums/Zone';
 import { KeyResultMetricMin } from '../../types/model/KeyResultMetricMin';
 import { Observable, of } from 'rxjs';
-import { calculateCurrentPercentage, isLastCheckInNegative } from '../../common';
+import { calculateCurrentPercentage } from '../../common';
 import { KeyResultOrdinalMin } from '../../types/model/KeyResultOrdinalMin';
 import { CheckInOrdinalMin } from '../../types/model/CheckInOrdinalMin';
 
@@ -40,8 +40,6 @@ export class ScoringComponent implements OnInit, AfterViewInit, OnChanges {
 
   stretched = false;
 
-  protected readonly isLastCheckInNegative = isLastCheckInNegative;
-
   @ViewChild('fail')
   private failElement: ElementRef<HTMLSpanElement> | undefined = undefined;
 
@@ -51,9 +49,6 @@ export class ScoringComponent implements OnInit, AfterViewInit, OnChanges {
   @ViewChild('target')
   private targetElement: ElementRef<HTMLSpanElement> | undefined = undefined;
 
-  @ViewChild('valueLabel')
-  private valueLabel: ElementRef<HTMLSpanElement> | undefined = undefined;
-
   constructor(private changeDetectionRef: ChangeDetectorRef) {
     this.labelPercentage = new Observable<number>();
   }
@@ -75,13 +70,6 @@ export class ScoringComponent implements OnInit, AfterViewInit, OnChanges {
     this.commitElement!.nativeElement.style.width = this.commitPercent + '%';
     this.targetElement!.nativeElement.style.width = this.targetPercent + '%';
 
-    if (this.valueLabel != undefined && this.keyResult.keyResultType == 'metric') {
-      this.labelPercentage.subscribe((value) => {
-        this.valueLabel!.nativeElement.style.width = value + '%';
-        this.changeDetectionRef.detectChanges();
-      });
-    }
-
     // Set color of scoring component
     const scoringClass = this.getScoringColorClassAndSetBorder();
     if (scoringClass !== null) {
diff --git a/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.html b/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.html
deleted file mode 100644
index 8c8f2f5a80..0000000000
--- a/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<app-dialog-template-core>
-  <ng-container title> This is an example dialog </ng-container>
-
-  <ng-container content>
-    <form [formGroup]="dialogForm" (ngSubmit)="save()">
-      <mat-form-field>
-        <mat-label>Name</mat-label>
-        <input
-          matInput
-          formControlName="name"
-          placeholder="Ex. Tom"
-        />
-        <div *ngIf="isTouchedOrDirty('name')">
-          <mat-error *ngFor="let errorKey of getErrorKeysOfFormField('name')">
-            <span>{{ errorMessages[errorKey.toUpperCase()] }}</span>
-          </mat-error>
-        </div>
-      </mat-form-field>
-
-      <mat-radio-group formControlName="gender">
-        <mat-radio-button value="male">Male</mat-radio-button>
-        <mat-radio-button value="female">Female</mat-radio-button>
-        <mat-radio-button value="other">Other</mat-radio-button>
-      </mat-radio-group>
-      <div *ngIf="isTouchedOrDirty('gender')">
-        <mat-error *ngFor="let errorKey of getErrorKeysOfFormField('gender')">
-          <span>{{ errorMessages[errorKey.toUpperCase()] }}</span>
-        </mat-error>
-      </div>
-
-      <mat-form-field>
-        <mat-label>Please select a hobby</mat-label>
-        <mat-select name="hobbies" formControlName="hobby">
-          <mat-option [value]="hobby" *ngFor="let hobby of hobbies">{{ hobby }}</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <div *ngIf="isTouchedOrDirty('hobby')">
-        <mat-error *ngFor="let errorKey of getErrorKeysOfFormField('hobby')">
-          <span>{{ errorMessages[errorKey.toUpperCase()] }}</span>
-        </mat-error>
-      </div>
-    </form>
-  </ng-container>
-
-  <ng-container actions>
-    <div class="col-auto">
-      <button
-        [attr.data-testId]="'submit'"
-        mat-flat-button
-        type="submit"
-        [mat-dialog-close]="true"
-        [disabled]="!dialogForm.valid"
-      >
-        Save
-      </button>
-      <button mat-button mat-dialog-close>Cancel</button>
-    </div>
-  </ng-container>
-</app-dialog-template-core>
diff --git a/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.spec.ts b/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.spec.ts
deleted file mode 100644
index bc1410f763..0000000000
--- a/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.spec.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { ExampleDialogComponent } from './example-dialog.component';
-import { HarnessLoader } from '@angular/cdk/testing';
-import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
-import { MatSelectModule } from '@angular/material/select';
-import { MatInputModule } from '@angular/material/input';
-import { MatRadioModule } from '@angular/material/radio';
-import { ReactiveFormsModule } from '@angular/forms';
-import { MatRadioButtonHarness } from '@angular/material/radio/testing';
-import { MatInputHarness } from '@angular/material/input/testing';
-import { MatSelectHarness } from '@angular/material/select/testing';
-import { By } from '@angular/platform-browser';
-// @ts-ignore
-import * as errorData from '../../../../assets/errors/error-messages.json';
-import { ObjectiveComponent } from '../../../components/objective/objective.component';
-import { MatOptionHarness } from '@angular/material/core/testing';
-
-describe('ExampleDialogComponent', () => {
-  let component: ExampleDialogComponent;
-  let fixture: ComponentFixture<ExampleDialogComponent>;
-  let loader: HarnessLoader;
-
-  const errors = errorData;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        MatDialogModule,
-        NoopAnimationsModule,
-        MatSelectModule,
-        MatInputModule,
-        MatRadioModule,
-        ReactiveFormsModule
-      ],
-      providers: [{
-        provide: MatDialogRef,
-        useValue: {}
-      },
-      {
-        provide: MAT_DIALOG_DATA,
-        useValue: {}
-      }],
-      declarations: [ExampleDialogComponent,
-        ObjectiveComponent]
-    })
-      .compileComponents();
-    fixture = TestBed.createComponent(ExampleDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-    loader = TestbedHarnessEnvironment.loader(fixture);
-  });
-
-  it('should create', fakeAsync(() => {
-    expect(component)
-      .toBeTruthy();
-  }));
-
-  it('should be able to set name', waitForAsync(async() => {
-    // Insert values into name input
-    const nameInput = await loader.getHarness(MatInputHarness);
-    await nameInput.setValue('Name');
-
-    // Check if save button is disabled
-    const submitButton = fixture.debugElement.query(By.css('[data-testId="submit"]'));
-    expect(await submitButton.nativeElement.disabled)
-      .toBeTruthy();
-
-    // Validate if object was created correctly
-    const formObject = fixture.componentInstance.dialogForm.value;
-    expect(formObject.name)
-      .toBe('Name');
-  }));
-
-  it('should be able to set buttons', waitForAsync(async() => {
-    // Check radio button
-    const buttons = await loader.getAllHarnesses(MatRadioButtonHarness);
-    await buttons[0].check();
-
-    // Check if save button is disabled
-    const submitButton = fixture.debugElement.query(By.css('[data-testId="submit"]'));
-    expect(await submitButton.nativeElement.disabled)
-      .toBeTruthy();
-
-    // Validate if object was created correctly
-    const formObject = fixture.componentInstance.dialogForm.value;
-    expect(formObject.name)
-      .toBe('');
-    expect(formObject.gender)
-      .toBe(await buttons[0].getValue());
-  }));
-
-  it('should be able to set select', async() => {
-    let option = '';
-    // Get mat-select element and click it (dropdown)
-    await loader.getHarness(MatSelectHarness)
-      .then(fakeAsync((matSelect: MatSelectHarness) => {
-        matSelect.open();
-        advance();
-        matSelect.getOptions()
-          .then((selectOptions) => {
-            selectOptions[0].click();
-            advance();
-            selectOptions[0].getText()
-              .then((value) => (option = value));
-          });
-      }));
-
-    // Check if save button is disabled
-    const submitButton = fixture.debugElement.query(By.css('[data-testId="submit"]'));
-    expect(await submitButton.nativeElement.disabled)
-      .toBeTruthy();
-
-    // Validate if object was created correctly
-    const formObject = fixture.componentInstance.dialogForm.value;
-    expect(formObject.name)
-      .toBe('');
-    expect(option)
-      .toBe(formObject.hobby);
-  });
-
-  it('should display error message of too short input', waitForAsync(async() => {
-    // Insert values into name input which don't match length validator
-    const nameInput = await loader.getHarness(MatInputHarness);
-    await nameInput.setValue('Na');
-
-    // Verify error message
-    const errorMessage = fixture.debugElement.query(By.css('mat-error'));
-    expect(errorMessage.nativeElement.textContent)
-      .toContain(errors.MINLENGTH);
-
-    // Check if submit button is disabled
-    const submitButton = fixture.debugElement.query(By.css('[data-testId="submit"]'));
-    expect(submitButton.nativeElement.disabled)
-      .toBeTruthy();
-  }));
-
-  it('should display error message of required dropdown', waitForAsync(async() => {
-    // Open and close mat-select element to trigger validation
-    const matSelect = await loader.getHarness(MatSelectHarness);
-    await matSelect.open();
-    await matSelect.close();
-
-    // Verify error message
-    const errorMessage = fixture.debugElement.query(By.css('mat-error'));
-    expect(errorMessage.nativeElement.textContent)
-      .toContain(errors.REQUIRED);
-
-    // Check if submit button is disabled
-    const submitButton = fixture.debugElement.query(By.css('[data-testId="submit"]'));
-    expect(submitButton.nativeElement.disabled)
-      .toBeTruthy();
-  }));
-
-  it('should not save form unless radio button is checked', async() => {
-    // Insert value into input
-    const nameInput = loader.getHarness(MatInputHarness);
-    const matSelect = loader.getHarness(MatSelectHarness);
-    const radioButtons = loader.getAllHarnesses(MatRadioButtonHarness);
-
-    // Verify that the submit button is disabled because the radio button is not checked yet
-    const submitButton = fixture.debugElement.query(By.css('[data-testId="submit"]'));
-    expect(submitButton.nativeElement.disabled)
-      .toBeTruthy();
-
-    await Promise.all([nameInput,
-      matSelect,
-      radioButtons])
-      .then(fakeAsync(([nameInput,
-        matSelect,
-        radioButtons]: [MatInputHarness, MatSelectHarness, MatRadioButtonHarness[]]) => {
-        nameInput.setValue('Name');
-        advance();
-        matSelect.open()
-          .then(() => {
-            matSelect.getOptions()
-              .then((options: MatOptionHarness[]) => {
-                options[1].click();
-                radioButtons[1].check();
-                advance();
-                // Check submit button and form output
-                Promise.all([radioButtons[1].getValue(),
-                  options[1].getText()])
-                  .then(([gender,
-                    hobby]) => {
-                    const formObject = fixture.componentInstance.dialogForm.value;
-                    expect(submitButton.nativeElement.disabled)
-                      .toBeFalsy();
-                    expect(formObject.name)
-                      .toBe('Name');
-                    expect(gender)
-                      .toBe('female');
-                    expect(hobby)
-                      .toBe(formObject.hobby);
-                  });
-              });
-          });
-      }));
-  });
-
-  function advance(duration = 100) {
-    tick(duration);
-    fixture.detectChanges();
-    tick(duration);
-  }
-});
diff --git a/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.ts b/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.ts
deleted file mode 100644
index 6581465a38..0000000000
--- a/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Component, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import errorMessages from '../../../../assets/errors/error-messages.json';
-import { formInputCheck } from '../../common';
-
-@Component({
-  selector: 'app-example-dialog',
-  templateUrl: './example-dialog.component.html'
-})
-export class ExampleDialogComponent {
-  hobbies = [
-    'fishing',
-    'football',
-    'videogames',
-    'tennis',
-    'other'
-  ];
-
-  protected readonly errorMessages: any = errorMessages;
-
-  protected readonly formInputCheck = formInputCheck;
-
-  dialogForm = new FormGroup({
-    name: new FormControl<string>('', [Validators.required,
-      Validators.minLength(3),
-      Validators.maxLength(50)]),
-    gender: new FormControl<string>('', [Validators.required]),
-    hobby: new FormControl<string>('', [Validators.required])
-  });
-
-  constructor(public dialog: MatDialogRef<ExampleDialogComponent>,
-    @Inject(MAT_DIALOG_DATA) private data: any) {}
-
-  save() {
-    this.dialog.close({ data: this.dialogForm.value });
-  }
-
-  isTouchedOrDirty(name: string) {
-    return this.dialogForm.get(name)?.dirty || this.dialogForm.get(name)?.touched;
-  }
-
-  // Check if any errors are present if not return empty array if yes return error keys
-  getErrorKeysOfFormField(name: string) {
-    const errors = this.dialogForm.get(name)?.errors;
-    return errors == null ? [] : Object.keys(errors);
-  }
-}
diff --git a/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.spec.ts b/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.spec.ts
index 760968a1c1..7676870fae 100644
--- a/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.spec.ts
+++ b/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.spec.ts
@@ -155,7 +155,7 @@ describe('ObjectiveDialogComponent', () => {
         // Prepare data
         const title = 'title';
         const description = 'description';
-        const createKeyresults = true;
+        const createKeyResults = true;
         let quarter = 0;
         let team = 0;
         teamService.getAllTeams()
@@ -193,7 +193,7 @@ describe('ObjectiveDialogComponent', () => {
         expect(rawFormValue.title)
           .toBe(title);
         expect(rawFormValue.createKeyResults)
-          .toBe(createKeyresults);
+          .toBe(createKeyResults);
 
         objectiveService.createObjective.mockReturnValue(of({ ...objective,
           state: state }));
@@ -201,7 +201,7 @@ describe('ObjectiveDialogComponent', () => {
 
         expect(dialogMock.close)
           .toHaveBeenCalledWith({
-            addKeyResult: createKeyresults,
+            addKeyResult: createKeyResults,
             delete: false,
             objective: {
               description: description,
@@ -212,7 +212,7 @@ describe('ObjectiveDialogComponent', () => {
               state: State[state as keyof typeof State],
               teamId: 2,
               title: title,
-              writeable: true
+              isWriteable: true
             },
             teamId: 1
           });
diff --git a/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.spec.ts b/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.spec.ts
index 86a5f6bbad..9e37a967da 100644
--- a/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.spec.ts
+++ b/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.spec.ts
@@ -2,55 +2,49 @@ import { UnitTransformationPipe } from './unit-transformation.pipe';
 import { Unit } from '../../types/enums/Unit';
 
 describe('UnitTransformationPipe', () => {
-  it('create an instance', () => {
+  it('should create an instance', () => {
     const pipe = new UnitTransformationPipe();
     expect(pipe)
       .toBeTruthy();
   });
 
-  it('Format Percent label', () => {
+  it('should format percent label based on value', () => {
     const pipe = new UnitTransformationPipe();
     expect(pipe.transform(1, Unit.PERCENT))
       .toBe('1%');
   });
 
-  it('Format FTE label', () => {
+  it('should format FTE label based on value', () => {
     const pipe = new UnitTransformationPipe();
     expect(pipe.transform(1, Unit.FTE))
       .toBe('1 ' + Unit.FTE);
   });
 
-  it('Format CHF label', () => {
+  it('should format CHF label based on value', () => {
     const pipe = new UnitTransformationPipe();
     expect(pipe.transform(1, Unit.CHF))
       .toBe('1 ' + Unit.CHF);
   });
 
-  it('Format EUR label', () => {
+  it('should format EUR label based on value', () => {
     const pipe = new UnitTransformationPipe();
     expect(pipe.transform(1, Unit.EUR))
       .toBe('1 ' + Unit.EUR);
   });
 
-  it('Format Number label', () => {
+  it('should format Number label based on value', () => {
     const pipe = new UnitTransformationPipe();
     expect(pipe.transform(1, Unit.NUMBER))
       .toBe('1');
   });
 
-  it('should format as Percent', () => {
-    const pipe = new UnitTransformationPipe();
-    expect(pipe.transform(38, Unit.PERCENT))
-      .toBe('38%');
-  });
-
-  it('should format as Number', () => {
+  it('should format as Number with delimiter based on value', () => {
     const pipe = new UnitTransformationPipe();
     expect(pipe.transform(38000, Unit.NUMBER))
       .toBe("38'000");
   });
 
-  it('should format as CHF as double value', () => {
+  it('should format as Number with two digits after dot', () => {
     const pipe = new UnitTransformationPipe();
     expect(pipe.transform(380.987, Unit.NUMBER))
       .toBe('380.99');
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 4c6c53185e..4d457d5358 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { CommonModule, NgOptimizedImage } from '@angular/common';
-import { ExampleDialogComponent } from './dialog/example-dialog/example-dialog.component';
 import { ObjectiveFormComponent } from './dialog/objective-dialog/objective-form.component';
 import { ConfirmDialogComponent } from './dialog/confirm-dialog/confirm-dialog.component';
 import { ScoringComponent } from './custom/scoring/scoring.component';
@@ -14,7 +13,7 @@ import { MatRadioModule } from '@angular/material/radio';
 import { MatIconModule } from '@angular/material/icon';
 import { OkrTangramComponent } from './custom/okr-tangram/okr-tangram.component';
 import { MatButtonModule } from '@angular/material/button';
-import { SidepanelComponent } from './sidepanel/sidepanel.component';
+import { SidePanelComponent } from './side-panel/side-panel.component';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { CdkConnectedOverlay, CdkOverlayOrigin } from '@angular/cdk/overlay';
 import { A11yModule } from '@angular/cdk/a11y';
@@ -28,14 +27,13 @@ import { MatTooltip } from '@angular/material/tooltip';
 
 @NgModule({
   declarations: [
-    ExampleDialogComponent,
     ObjectiveFormComponent,
     ConfirmDialogComponent,
     UnitTransformationPipe,
     ScoringComponent,
     CompleteDialogComponent,
     OkrTangramComponent,
-    SidepanelComponent,
+    SidePanelComponent,
     SpinnerComponent,
     DialogTemplateCoreComponent
   ],
@@ -62,14 +60,13 @@ import { MatTooltip } from '@angular/material/tooltip';
     MatTooltip
   ],
   exports: [
-    ExampleDialogComponent,
     ObjectiveFormComponent,
     ConfirmDialogComponent,
     ScoringComponent,
     CompleteDialogComponent,
     OkrTangramComponent,
     UnitTransformationPipe,
-    SidepanelComponent,
+    SidePanelComponent,
     SpinnerComponent,
     DialogTemplateCoreComponent
   ]
diff --git a/frontend/src/app/shared/sidepanel/sidepanel.component.html b/frontend/src/app/shared/side-panel/side-panel.component.html
similarity index 93%
rename from frontend/src/app/shared/sidepanel/sidepanel.component.html
rename to frontend/src/app/shared/side-panel/side-panel.component.html
index 23827ade92..24a12b6015 100644
--- a/frontend/src/app/shared/sidepanel/sidepanel.component.html
+++ b/frontend/src/app/shared/side-panel/side-panel.component.html
@@ -16,7 +16,7 @@
       [cdkTrapFocusAutoCapture]="true"
       cdkScrollable="false"
       cdkTrapFocus
-      class="bg-white w-100 sidepanel overflow-y-auto"
+      class="bg-white w-100 side-panel overflow-y-auto"
       [ngClass]="{ right: loaded }"
       [style.right]="right"
     >
diff --git a/frontend/src/app/shared/sidepanel/sidepanel.component.scss b/frontend/src/app/shared/side-panel/side-panel.component.scss
similarity index 93%
rename from frontend/src/app/shared/sidepanel/sidepanel.component.scss
rename to frontend/src/app/shared/side-panel/side-panel.component.scss
index a60a843a8a..b7bed23fe3 100644
--- a/frontend/src/app/shared/sidepanel/sidepanel.component.scss
+++ b/frontend/src/app/shared/side-panel/side-panel.component.scss
@@ -3,7 +3,7 @@
   padding: 32px;
 }
 
-.sidepanel {
+.side-panel {
   transition: right 300ms;
   position: relative;
   right: -100%;
diff --git a/frontend/src/app/shared/sidepanel/sidepanel.component.ts b/frontend/src/app/shared/side-panel/side-panel.component.ts
similarity index 86%
rename from frontend/src/app/shared/sidepanel/sidepanel.component.ts
rename to frontend/src/app/shared/side-panel/side-panel.component.ts
index 124725eac0..5f0d4d353e 100644
--- a/frontend/src/app/shared/sidepanel/sidepanel.component.ts
+++ b/frontend/src/app/shared/side-panel/side-panel.component.ts
@@ -12,12 +12,12 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { ConnectedPosition } from '@angular/cdk/overlay'; // ESM
 
 @Component({
-  selector: 'app-sidepanel',
-  templateUrl: './sidepanel.component.html',
-  styleUrls: ['./sidepanel.component.scss'],
+  selector: 'app-side-panel',
+  templateUrl: './side-panel.component.html',
+  styleUrls: ['./side-panel.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class SidepanelComponent implements OnInit, AfterContentInit, OnDestroy {
+export class SidePanelComponent implements OnInit, AfterContentInit, OnDestroy {
   leaveKeys = ['Escape'];
 
   right = '-100%';
diff --git a/frontend/src/app/shared/testData.ts b/frontend/src/app/shared/testData.ts
index 28be1e9f73..e75ef1d89a 100644
--- a/frontend/src/app/shared/testData.ts
+++ b/frontend/src/app/shared/testData.ts
@@ -26,35 +26,35 @@ export const marketingTeamWriteable: Team = {
   id: 1,
   version: 2,
   name: 'Marketing Team',
-  writeable: true
+  isWriteable: true
 };
 
 export const marketingTeamNotWriteable: Team = {
   id: 1,
   version: 3,
   name: 'Marketing Team',
-  writeable: false
+  isWriteable: false
 };
 
 export const team1: Team = {
   id: 1,
   version: 2,
   name: 'Team1',
-  writeable: false
+  isWriteable: false
 };
 
 export const team2: Team = {
   id: 2,
   version: 3,
   name: 'Team2',
-  writeable: false
+  isWriteable: false
 };
 
 export const team3: Team = {
   id: 3,
   version: 4,
   name: 'Team3',
-  writeable: false
+  isWriteable: false
 };
 
 export const teamList = [team1,
@@ -122,7 +122,7 @@ export const checkInMetric: CheckInMetricMin = {
   createdOn: '2023-07-20T12:34:56Z' as unknown as Date,
   initiatives: 'Initiatives metric',
   changeInfo: 'Changeinfo metric',
-  writeable: true
+  isWriteable: true
 } as CheckInMetricMin;
 
 export const checkInMetricWriteableFalse: CheckInMetricMin = {
@@ -133,7 +133,7 @@ export const checkInMetricWriteableFalse: CheckInMetricMin = {
   createdOn: '2023-07-20T12:34:56Z' as unknown as Date,
   initiatives: 'Initiatives metric writeable false',
   changeInfo: 'Changeinfo metric writeable false',
-  writeable: false
+  isWriteable: false
 } as CheckInMetricMin;
 
 export const checkInOrdinal: CheckInOrdinalMin = {
@@ -144,7 +144,7 @@ export const checkInOrdinal: CheckInOrdinalMin = {
   createdOn: '2023-07-22T08:45:21Z' as unknown as Date,
   initiatives: 'Initiatives ordinal',
   changeInfo: 'Changeinfo ordinal',
-  writeable: true
+  isWriteable: true
 } as CheckInOrdinalMin;
 
 export const keyResultMetricMin: KeyResultMetricMin = {
@@ -176,7 +176,7 @@ export const keyResultMetricMinScoring: KeyResultMetricMin = {
     modifiedOn: new Date(),
     changeInfo: 'Half way through',
     initiatives: 'Quality before quantity',
-    writeable: true
+    isWriteable: true
   },
   type: 'keyResult'
 } as KeyResultMetricMin;
@@ -198,7 +198,7 @@ export const keyResultMetricMinScoringInversion: KeyResultMetricMin = {
     modifiedOn: new Date(),
     changeInfo: 'More Changes',
     initiatives: 'Some initatives',
-    writeable: true
+    isWriteable: true
   },
   type: 'keyResult'
 } as KeyResultMetricMin;
@@ -288,7 +288,7 @@ export const overViewEntity1: OverviewEntity = {
   objectives: [objectiveMin,
     objectiveMin,
     objectiveMin] as ObjectiveMin[],
-  writeable: true
+  isWriteable: true
 };
 
 export const overViewEntity2: OverviewEntity = {
@@ -296,7 +296,7 @@ export const overViewEntity2: OverviewEntity = {
   objectives: [objectiveMin,
     objectiveMin,
     objectiveMin] as ObjectiveMin[],
-  writeable: true
+  isWriteable: true
 };
 
 export const overViewEntityResponse1: any = {
@@ -346,7 +346,7 @@ export const objective: Objective = {
   quarterId: 2,
   quarterLabel: 'GJ 22/23-Q2',
   state: State.SUCCESSFUL,
-  writeable: true
+  isWriteable: true
 };
 
 export const objectiveWriteableFalse: Objective = {
@@ -358,7 +358,7 @@ export const objectiveWriteableFalse: Objective = {
   quarterId: 2,
   quarterLabel: 'GJ 22/23-Q2',
   state: State.NOTSUCCESSFUL,
-  writeable: false
+  isWriteable: false
 };
 
 export const firstCheckIn: CheckInMetricMin = {
@@ -369,7 +369,7 @@ export const firstCheckIn: CheckInMetricMin = {
   changeInfo: '',
   initiatives: '',
   createdOn: new Date(),
-  writeable: true
+  isWriteable: true
 };
 
 export const secondCheckIn: CheckInMetricMin = {
@@ -380,13 +380,13 @@ export const secondCheckIn: CheckInMetricMin = {
   changeInfo: '',
   initiatives: '',
   createdOn: new Date(),
-  writeable: true
+  isWriteable: true
 };
 
 export const testUser: User = {
   id: 1,
-  firstname: 'Bob',
-  lastname: 'Baumeister',
+  firstName: 'Bob',
+  lastName: 'Baumeister',
   isOkrChampion: false,
   userTeamList: [{
     id: 1,
@@ -400,24 +400,24 @@ export const users: User[] = [
   testUser,
   {
     id: 2,
-    firstname: 'Paco',
-    lastname: 'Egiman',
+    firstName: 'Paco',
+    lastName: 'Egiman',
     isOkrChampion: true,
     userTeamList: [],
     email: 'peggimann@puzzle.ch'
   },
   {
     id: 3,
-    firstname: 'Robin',
-    lastname: 'Papier',
+    firstName: 'Robin',
+    lastName: 'Papier',
     isOkrChampion: false,
     userTeamList: [],
     email: 'robin.papier@puzzle.ch'
   },
   {
     id: 4,
-    firstname: 'Key Result',
-    lastname: 'Owner',
+    firstName: 'Key Result',
+    lastName: 'Owner',
     isOkrChampion: false,
     userTeamList: [],
     email: 'keyresult.owner@puzzle.ch'
@@ -452,12 +452,12 @@ export const keyResult: KeyResultOrdinal = {
     modifiedOn: new Date(),
     changeInfo: 'info',
     initiatives: 'some',
-    writeable: true
+    isWriteable: true
   } as CheckInOrdinal,
   createdOn: new Date(),
   modifiedOn: new Date(),
   actionList: null,
-  writeable: true
+  isWriteable: true
 };
 
 export const keyResultOrdinal: KeyResultOrdinal = {
@@ -488,12 +488,12 @@ export const keyResultOrdinal: KeyResultOrdinal = {
     modifiedOn: new Date(),
     changeInfo: 'Does not look good',
     initiatives: 'We have to be faster',
-    writeable: true
+    isWriteable: true
   } as CheckInOrdinal,
   createdOn: new Date(),
   modifiedOn: new Date(),
   actionList: [],
-  writeable: true
+  isWriteable: true
 };
 
 export const keyResultWriteableFalse: KeyResultOrdinal = {
@@ -524,12 +524,12 @@ export const keyResultWriteableFalse: KeyResultOrdinal = {
     modifiedOn: new Date(),
     changeInfo: 'Also not writeable',
     initiatives: 'Perhaps make it writeable',
-    writeable: false
+    isWriteable: false
   } as CheckInOrdinal,
   createdOn: new Date(),
   modifiedOn: new Date(),
   actionList: [],
-  writeable: false
+  isWriteable: false
 };
 
 export const keyResultMetric: KeyResultMetric = {
@@ -560,13 +560,13 @@ export const keyResultMetric: KeyResultMetric = {
     modifiedOn: new Date(),
     changeInfo: 'So far so good',
     initiatives: 'Work a bit harder',
-    writeable: true
+    isWriteable: true
   } as CheckInMetric,
   createdOn: new Date(),
   modifiedOn: new Date(),
   actionList: [action1,
     action2],
-  writeable: true
+  isWriteable: true
 };
 
 export const keyResultActions: KeyResultMetric = {
@@ -595,11 +595,11 @@ export const keyResultActions: KeyResultMetric = {
     modifiedOn: new Date(),
     changeInfo: 'So far so good',
     initiatives: 'Work a bit harder',
-    writeable: true
+    isWriteable: true
   } as CheckInMetric,
   createdOn: new Date(),
   modifiedOn: new Date(),
   actionList: [action1,
     action2],
-  writeable: true
+  isWriteable: true
 };
diff --git a/frontend/src/app/shared/types/menu-entry.ts b/frontend/src/app/shared/types/menu-entry.ts
deleted file mode 100644
index 83339960c9..0000000000
--- a/frontend/src/app/shared/types/menu-entry.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ComponentType } from '@angular/cdk/overlay';
-
-export interface MenuEntry {
-  displayName: string;
-  dialog?: {
-    dialog: ComponentType<any>;
-    data: any;
-  };
-  route?: string;
-  action?: string;
-}
diff --git a/frontend/src/app/shared/types/model/CheckIn.ts b/frontend/src/app/shared/types/model/CheckIn.ts
index a42ddbcf42..dc805a8256 100644
--- a/frontend/src/app/shared/types/model/CheckIn.ts
+++ b/frontend/src/app/shared/types/model/CheckIn.ts
@@ -7,5 +7,5 @@ export interface CheckIn {
   createdBy: string;
   createdOn: Date;
   modifiedOn: Date;
-  writeable: boolean;
+  isWriteable: boolean;
 }
diff --git a/frontend/src/app/shared/types/model/CheckInMin.ts b/frontend/src/app/shared/types/model/CheckInMin.ts
index 93723d2d31..18cf283f0f 100644
--- a/frontend/src/app/shared/types/model/CheckInMin.ts
+++ b/frontend/src/app/shared/types/model/CheckInMin.ts
@@ -5,5 +5,5 @@ export interface CheckInMin {
   createdOn: Date;
   changeInfo: string;
   initiatives: string;
-  writeable: boolean;
+  isWriteable: boolean;
 }
diff --git a/frontend/src/app/shared/types/model/KeyResult.ts b/frontend/src/app/shared/types/model/KeyResult.ts
index ae9adaff26..ee240564c7 100644
--- a/frontend/src/app/shared/types/model/KeyResult.ts
+++ b/frontend/src/app/shared/types/model/KeyResult.ts
@@ -14,5 +14,5 @@ export interface KeyResult {
   createdOn: Date;
   modifiedOn: Date;
   actionList: Action[] | null;
-  writeable: boolean;
+  isWriteable: boolean;
 }
diff --git a/frontend/src/app/shared/types/model/NewUser.ts b/frontend/src/app/shared/types/model/NewUser.ts
index f793306897..1547b4e928 100644
--- a/frontend/src/app/shared/types/model/NewUser.ts
+++ b/frontend/src/app/shared/types/model/NewUser.ts
@@ -1,5 +1,5 @@
 export interface NewUser {
-  firstname: string;
-  lastname: string;
+  firstName: string;
+  lastName: string;
   email: string;
 }
diff --git a/frontend/src/app/shared/types/model/NewUserForm.ts b/frontend/src/app/shared/types/model/NewUserForm.ts
index 800df9f04a..48a6479ce0 100644
--- a/frontend/src/app/shared/types/model/NewUserForm.ts
+++ b/frontend/src/app/shared/types/model/NewUserForm.ts
@@ -1,5 +1,5 @@
 export interface NewUserForm<T> {
-  firstname: T;
+  firstName: T;
   email: T;
-  lastname: T;
+  lastName: T;
 }
diff --git a/frontend/src/app/shared/types/model/Objective.ts b/frontend/src/app/shared/types/model/Objective.ts
index 4126c61fd5..5f3228c0b0 100644
--- a/frontend/src/app/shared/types/model/Objective.ts
+++ b/frontend/src/app/shared/types/model/Objective.ts
@@ -13,5 +13,5 @@ export interface Objective {
   createdOn?: Date;
   modifiedOn?: Date;
   createdBy?: User;
-  writeable: boolean;
+  isWriteable: boolean;
 }
diff --git a/frontend/src/app/shared/types/model/OverviewEntity.ts b/frontend/src/app/shared/types/model/OverviewEntity.ts
index e679a6101f..ad28459b90 100644
--- a/frontend/src/app/shared/types/model/OverviewEntity.ts
+++ b/frontend/src/app/shared/types/model/OverviewEntity.ts
@@ -4,5 +4,5 @@ import { TeamMin } from './TeamMin';
 export interface OverviewEntity {
   team: TeamMin;
   objectives: ObjectiveMin[];
-  writeable: boolean;
+  isWriteable: boolean;
 }
diff --git a/frontend/src/app/shared/types/model/Team.ts b/frontend/src/app/shared/types/model/Team.ts
index 09655edffb..78fe20b945 100644
--- a/frontend/src/app/shared/types/model/Team.ts
+++ b/frontend/src/app/shared/types/model/Team.ts
@@ -2,5 +2,5 @@ export interface Team {
   id: number;
   version: number;
   name: string;
-  writeable: boolean;
+  isWriteable: boolean;
 }
diff --git a/frontend/src/app/shared/types/model/User.ts b/frontend/src/app/shared/types/model/User.ts
index 736edc9bb9..0fe87fbe6b 100644
--- a/frontend/src/app/shared/types/model/User.ts
+++ b/frontend/src/app/shared/types/model/User.ts
@@ -3,8 +3,8 @@ import { UserTableEntry } from './UserTableEntry';
 
 export interface User {
   id: number;
-  firstname: string;
-  lastname: string;
+  firstName: string;
+  lastName: string;
   email: string;
   userTeamList: UserTeam[];
   isOkrChampion: boolean;
@@ -14,6 +14,6 @@ export const extractTeamsFromUser = (user: User) => {
   return user.userTeamList.map((u) => u.team);
 };
 
-export const getFullNameFromUser = (user: User | UserTableEntry) => {
-  return `${user.firstname} ${user.lastname}`;
+export const getFullNameOfUser = (user: User | UserTableEntry) => {
+  return `${user.firstName} ${user.lastName}`;
 };
diff --git a/frontend/src/app/shared/types/model/UserTableEntry.ts b/frontend/src/app/shared/types/model/UserTableEntry.ts
index eb631f0d11..e667294ba3 100644
--- a/frontend/src/app/shared/types/model/UserTableEntry.ts
+++ b/frontend/src/app/shared/types/model/UserTableEntry.ts
@@ -4,8 +4,8 @@ import { UserTeam } from './UserTeam';
 
 export interface UserTableEntry {
   id: number;
-  firstname: string;
-  lastname: string;
+  firstName: string;
+  lastName: string;
   email: string;
   teams: string[];
   roles: string[];
@@ -30,7 +30,7 @@ export const convertFromUsers = (users: User[], teamId: number | null): UserTabl
       .filter((u) => u.userTeamList.length)
       .map((u) => convertFromUser(u));
   }
-  return userTableEntries.sort((a, b) => a.firstname.localeCompare(b.firstname));
+  return userTableEntries.sort((a, b) => a.firstName.localeCompare(b.firstName));
 };
 
 export const convertFromUser = (user: User): UserTableEntry => {
@@ -45,8 +45,8 @@ export const convertFromUser = (user: User): UserTableEntry => {
 
   return {
     id: user.id,
-    firstname: user.firstname,
-    lastname: user.lastname,
+    firstName: user.firstName,
+    lastName: user.lastName,
     email: user.email,
     teams,
     roles,
diff --git a/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.scss b/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.scss
index 4f1ff31381..7aac676500 100644
--- a/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.scss
+++ b/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.scss
@@ -1,9 +1,5 @@
 @import '../style/variables';
 
-.input-fields {
-  margin-bottom: 0.5rem;
-}
-
 mat-select {
   outline: 1px solid #a4a4af;
   padding: 0.437rem 0.625rem 0.375rem 0.2rem !important;
diff --git a/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.spec.ts b/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.spec.ts
index 032d4f5208..e71f9c4839 100644
--- a/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.spec.ts
+++ b/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.spec.ts
@@ -104,20 +104,20 @@ describe('TeamManagementComponent', () => {
   });
 
   it('should call service method to update team if data input is not null', async() => {
-    component.data = { team: marketingTeamWriteable };
-    component.teamForm.setValue(teamFormObject);
     jest.spyOn(teamServiceMock, 'updateTeam')
       .mockReturnValue(of(teamFormObject));
+    component.data = { team: marketingTeamWriteable };
+    component.teamForm.setValue(teamFormObject);
     fixture.detectChanges();
     component.saveTeam();
+
     expect(teamServiceMock.updateTeam)
       .toHaveBeenCalled();
     expect(teamServiceMock.updateTeam)
-      .toHaveBeenCalledWith({
-        ...teamFormObject,
+      .toHaveBeenCalledWith(expect.objectContaining({
         id: marketingTeamWriteable.id,
         version: marketingTeamWriteable.version
-      } as Team);
+      }));
   });
 
   it('should set team values in from on init if data is not null', async() => {
diff --git a/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.spec.ts b/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.spec.ts
index 8c01c8952e..bab83efc1a 100644
--- a/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.spec.ts
+++ b/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.spec.ts
@@ -113,14 +113,14 @@ describe('AddMemberToTeamDialogComponent', () => {
       });
   });
 
-  it('should set teamname correctly', () => {
+  it('should set team name correctly im title', () => {
     expect(component.getDialogTitle())
       .toBe(`Members zu Team ${team1.name} hinzufügen`);
   });
 
-  it('should return correct display value', () => {
+  it('should return correct display value for given user', () => {
     expect(component.getDisplayValue(users[0]))
-      .toBe(`${users[0].firstname} ${users[0].lastname} (${users[0].email})`);
+      .toBe(`${users[0].firstName} ${users[0].lastName} (${users[0].email})`);
   });
 
   it('should add user to selected users and restore search value', () => {
diff --git a/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.ts b/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.ts
index 4ecb860cb7..983b49ed15 100644
--- a/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.ts
+++ b/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.ts
@@ -98,7 +98,7 @@ export class AddMemberToTeamDialogComponent implements OnInit, OnDestroy {
     if (!user) {
       return '';
     }
-    return `${user.firstname} ${user.lastname} (${user.email})`;
+    return `${user.firstName} ${user.lastName} (${user.email})`;
   }
 
   selectUser(user: User) {
diff --git a/frontend/src/app/team-management/add-user-team/add-user-team.component.html b/frontend/src/app/team-management/add-user-team/add-user-team.component.html
index 26e8fa59f6..613d75e839 100644
--- a/frontend/src/app/team-management/add-user-team/add-user-team.component.html
+++ b/frontend/src/app/team-management/add-user-team/add-user-team.component.html
@@ -2,21 +2,21 @@
   <div
     class="tooltip-wrapper"
     [matTooltip]="'Der User ist bereits in allen Teams in welchen Sie Admin sind'"
-    [matTooltipDisabled]="!addButtonDisabled(selectableAdminTeams)"
+    [matTooltipDisabled]="!isAddButtonDisabled(selectableAdminTeams)"
   >
     <button
-      *ngIf="showAddButton(allAdminTeams$ | async)"
+      *ngIf="isAddButtonVisible(allAdminTeams$ | async)"
       (click)="createUserTeam(selectableAdminTeams[0])"
       [attr.data-testId]="'add-user'"
       class="mdc-button px-0 pe-2"
-      [disabled]="addButtonDisabled(selectableAdminTeams)"
+      [disabled]="isAddButtonDisabled(selectableAdminTeams)"
       color="primary"
       mat-button
     >
       <span class="d-flex align-items-center add-text">
         <img
           [src]="
-            addButtonDisabled(selectableAdminTeams)
+            isAddButtonDisabled(selectableAdminTeams)
               ? '/assets/icons/new-icon-disabled.svg'
               : '/assets/icons/new-icon.svg'
           "
diff --git a/frontend/src/app/team-management/add-user-team/add-user-team.component.spec.ts b/frontend/src/app/team-management/add-user-team/add-user-team.component.spec.ts
index 2a06fc1cdf..3738493f4b 100644
--- a/frontend/src/app/team-management/add-user-team/add-user-team.component.spec.ts
+++ b/frontend/src/app/team-management/add-user-team/add-user-team.component.spec.ts
@@ -45,9 +45,9 @@ describe('AddUserTeamComponent', () => {
   });
 
   it('should filter selectableAdminTeams correctly', (done) => {
-    team1Copy.writeable = true;
-    team2Copy.writeable = true;
-    team3Copy.writeable = false;
+    team1Copy.isWriteable = true;
+    team2Copy.isWriteable = true;
+    team3Copy.isWriteable = false;
     component.ngOnInit();
     component.selectableAdminTeams$!.subscribe((teams) => {
       expect(teams.length)
@@ -59,9 +59,9 @@ describe('AddUserTeamComponent', () => {
   });
 
   it('should filter allAdminTeams correctly', (done) => {
-    team1Copy.writeable = true;
-    team2Copy.writeable = true;
-    team3Copy.writeable = false;
+    team1Copy.isWriteable = true;
+    team2Copy.isWriteable = true;
+    team3Copy.isWriteable = false;
     component.ngOnInit();
     component.allAdminTeams$!.subscribe((teams) => {
       expect(teams.length)
@@ -70,13 +70,13 @@ describe('AddUserTeamComponent', () => {
         .toBe(team1Copy.id);
       expect(teams[1].id)
         .toBe(team2Copy.id);
-      expect(component.showAddButton(teams))
+      expect(component.isAddButtonVisible(teams))
         .toBeTruthy();
       done();
     });
   });
 
-  it('createUserTeam should create the userTeam', () => {
+  it('should create the userTeam when createUserTeam is called', () => {
     component.createUserTeam(team1Copy);
     expect(component.userTeam)
       .toStrictEqual({
@@ -87,10 +87,10 @@ describe('AddUserTeamComponent', () => {
 
   it('save should throw exception if userTeam is undefined', () => {
     expect(() => component.save())
-      .toThrowError('UserTeam should be defined here');
+      .toThrow('UserTeam should be defined here');
   });
 
-  it('save should emit addUserTeam event and set userTeam to undefined', (done) => {
+  it('should emit addUserTeam event and set userTeam to undefined after save', (done) => {
     component.userTeam = testUser.userTeamList[0];
     component.addUserTeam.subscribe(() => {
       done();
@@ -102,25 +102,25 @@ describe('AddUserTeamComponent', () => {
 
   it('should test showAddButton', () => {
     component.userTeam = testUser.userTeamList[0];
-    expect(component.showAddButton(null))
+    expect(component.isAddButtonVisible(null))
       .toBeFalsy();
-    expect(component.showAddButton([team1Copy,
+    expect(component.isAddButtonVisible([team1Copy,
       team2Copy]))
       .toBeFalsy();
     component.userTeam = undefined;
-    expect(component.showAddButton([]))
+    expect(component.isAddButtonVisible([]))
       .toBeFalsy();
-    expect(component.showAddButton([team1Copy,
+    expect(component.isAddButtonVisible([team1Copy,
       team2Copy]))
       .toBeTruthy();
   });
 
   it('should test addButtonDisabled', () => {
-    expect(component.addButtonDisabled([team1Copy]))
+    expect(component.isAddButtonDisabled([team1Copy]))
       .toBeFalsy();
-    expect(component.addButtonDisabled([]))
+    expect(component.isAddButtonDisabled([]))
       .toBeTruthy();
-    expect(component.addButtonDisabled(null))
+    expect(component.isAddButtonDisabled(null))
       .toBeTruthy();
   });
 });
diff --git a/frontend/src/app/team-management/add-user-team/add-user-team.component.ts b/frontend/src/app/team-management/add-user-team/add-user-team.component.ts
index c61c8be9fc..52bd31dd67 100644
--- a/frontend/src/app/team-management/add-user-team/add-user-team.component.ts
+++ b/frontend/src/app/team-management/add-user-team/add-user-team.component.ts
@@ -23,7 +23,7 @@ export class AddUserTeamComponent implements OnInit, OnDestroy {
 
   allAdminTeams$: Observable<Team[]> | undefined;
 
-  private unsubscribe$ = new Subject<void>();
+  private readonly unsubscribe$ = new Subject<void>();
 
   constructor(private readonly teamService: TeamService) {}
 
@@ -31,7 +31,7 @@ export class AddUserTeamComponent implements OnInit, OnDestroy {
     this.allAdminTeams$ = this.teamService.getAllTeams()
       .pipe(takeUntil(this.unsubscribe$),
         map((teams) => {
-          return teams.filter((t) => t.writeable);
+          return teams.filter((t) => t.isWriteable);
         }));
 
     this.selectableAdminTeams$ = combineLatest([this.allAdminTeams$,
@@ -66,11 +66,11 @@ export class AddUserTeamComponent implements OnInit, OnDestroy {
     this.userTeam = undefined;
   }
 
-  showAddButton(adminTeams: Team[] | null) {
+  isAddButtonVisible(adminTeams: Team[] | null) {
     return !this.userTeam && adminTeams?.length;
   }
 
-  addButtonDisabled(selectableAdminTeams: Team[] | null) {
+  isAddButtonDisabled(selectableAdminTeams: Team[] | null) {
     return !selectableAdminTeams?.length;
   }
 }
diff --git a/frontend/src/app/team-management/delete-user/delete-user.component.spec.ts b/frontend/src/app/team-management/delete-user/delete-user.component.spec.ts
index 5c528383b2..35fbfc714b 100644
--- a/frontend/src/app/team-management/delete-user/delete-user.component.spec.ts
+++ b/frontend/src/app/team-management/delete-user/delete-user.component.spec.ts
@@ -42,8 +42,8 @@ describe('DeleteUserComponent', () => {
     component = fixture.componentInstance;
     component.user = {
       id: 2,
-      firstname: 'Hans',
-      lastname: 'Muster',
+      firstName: 'Hans',
+      lastName: 'Muster',
       isOkrChampion: false,
       userTeamList: [],
       email: 'hans.muster@puzzle.ch'
@@ -66,7 +66,7 @@ describe('DeleteUserComponent', () => {
       .toBeTruthy();
   });
 
-  it('deleteUser() should delete user and reload users', () => {
+  it('should delete and reload users after deleteUser is called', () => {
     // arrange
     userServiceMock.deleteUser.mockReturnValue(of(userServiceMock.deleteUser));
     dialogRefMock.afterClosed.mockReturnValue(of('some data'));
@@ -84,7 +84,7 @@ describe('DeleteUserComponent', () => {
       .toHaveBeenCalledTimes(1);
   });
 
-  it('deleteUser() should not reload users when UserService throws an error', () => {
+  it('should not reload users when UserService throws an error after deleteUser() is called', () => {
     // arrange
     function createErrorSubject() {
       const myError = new Subject<any>();
@@ -108,7 +108,7 @@ describe('DeleteUserComponent', () => {
       .toHaveBeenCalledTimes(0);
   });
 
-  it('deleteUserWithChecks() should not delete user which is member of a Team', () => {
+  it('should check deleteUserWithChecks() should not delete user which is member of a Team', () => {
     // arrange (user is member of team Lorem)
     component.userIsMemberOfTeams = true;
     component.user.userTeamList = [{
@@ -117,7 +117,7 @@ describe('DeleteUserComponent', () => {
         id: 1,
         version: 2,
         name: 'Lorem',
-        writeable: true
+        isWriteable: true
       },
       isTeamAdmin: false
     }];
@@ -138,7 +138,7 @@ describe('DeleteUserComponent', () => {
       });
   });
 
-  it('deleteUserWithChecks() should not delete user which has KeyResults', () => {
+  it('should not delete user which has KeyResults when deleteUserWithChecks() is called ', () => {
     // arrange (user has KeyResult one)
     component.userIsMemberOfTeams = false;
     component.userOkrData = {
@@ -215,7 +215,7 @@ describe('DeleteUserComponent', () => {
         id: 1,
         version: 2,
         name: 'Lorem',
-        writeable: true
+        isWriteable: true
       },
       isTeamAdmin: false
     }]);
diff --git a/frontend/src/app/team-management/delete-user/delete-user.component.ts b/frontend/src/app/team-management/delete-user/delete-user.component.ts
index 58ddf7fad1..cb1cf99a91 100644
--- a/frontend/src/app/team-management/delete-user/delete-user.component.ts
+++ b/frontend/src/app/team-management/delete-user/delete-user.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit, OnDestroy } from '@angular/core';
 import { UserService } from '../../services/user.service';
-import { getFullNameFromUser, User } from '../../shared/types/model/User';
+import { getFullNameOfUser, User } from '../../shared/types/model/User';
 import { Location } from '@angular/common';
 import { Observable, Subject, takeUntil, tap } from 'rxjs';
 import { UserTeam } from '../../shared/types/model/UserTeam';
@@ -79,12 +79,12 @@ export class DeleteUserComponent implements OnInit, OnDestroy {
   deleteUserWithChecks() {
     if (this.isUserMemberOfTeams()) {
       const dialogTitle = `User kann nicht gelöscht werden`;
-      const dialogText = `${getFullNameFromUser(this.user)} ist in folgenden Teams und kann daher nicht gelöscht werden: ${this.dialogDetailsUserTeams()}`;
+      const dialogText = `${getFullNameOfUser(this.user)} ist in folgenden Teams und kann daher nicht gelöscht werden: ${this.getDialogDetailsUserTeams()}`;
       this.showUnableToDeleteUserDialog(dialogTitle, dialogText);
       return;
     } else if (this.isUserOwnerOfKeyResults()) {
       const dialogTitle = `User kann nicht gelöscht werden`;
-      const dialogText = `${getFullNameFromUser(this.user)} ist Owner folgender KeyResults und kann daher nicht gelöscht werden: \n\n${this.dialogDetailsUserKeyResults()}`;
+      const dialogText = `${getFullNameOfUser(this.user)} ist Owner folgender KeyResults und kann daher nicht gelöscht werden: \n\n${this.dialogDetailsUserKeyResults()}`;
       this.showUnableToDeleteUserDialog(dialogTitle, dialogText);
       return;
     }
@@ -99,7 +99,7 @@ export class DeleteUserComponent implements OnInit, OnDestroy {
     return this.userOkrData !== undefined ? this.userOkrData.keyResults.length > 0 : true;
   }
 
-  dialogDetailsUserTeams() {
+  getDialogDetailsUserTeams() {
     if (this.userOkrData) {
       return this.user.userTeamList //
         .map((userTeam) => userTeam.team.name)
@@ -131,7 +131,7 @@ export class DeleteUserComponent implements OnInit, OnDestroy {
   deleteUser() {
     const data: ConfirmDialogData = {
       title: `User löschen`,
-      text: `Möchtest du den User ${this.user.firstname} ${this.user.lastname} wirklich löschen?`,
+      text: `Möchtest du den User ${this.user.firstName} ${this.user.lastName} wirklich löschen?`,
       yesButtonState: ButtonState.VisibleEnabled,
       noButtonState: ButtonState.VisibleEnabled,
       closeButtonState: ButtonState.Hidden
@@ -150,7 +150,7 @@ export class DeleteUserComponent implements OnInit, OnDestroy {
                   this.location.back();
                 },
                 error: () => {
-                  throw Error(`unable to delete user ${getFullNameFromUser(this.user)} (with id ${this.user.id})`);
+                  throw Error(`unable to delete user ${getFullNameOfUser(this.user)} (with id ${this.user.id})`);
                 }
               }))
             .subscribe();
@@ -158,5 +158,5 @@ export class DeleteUserComponent implements OnInit, OnDestroy {
       });
   }
 
-  protected readonly getFullNameFromUser = getFullNameFromUser;
+  protected readonly getFullNameFromUser = getFullNameOfUser;
 }
diff --git a/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.spec.ts b/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.spec.ts
index 052c844d55..eec79520b7 100644
--- a/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.spec.ts
+++ b/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.spec.ts
@@ -18,14 +18,14 @@ describe('InviteUserDialogComponent', () => {
   let component: InviteUserDialogComponent;
   let fixture: ComponentFixture<InviteUserDialogComponent>;
 
-  const user1 = { firstname: 'user1',
-    lastname: '1user',
+  const user1 = { firstName: 'user1',
+    lastName: '1user',
     email: 'user1@user.ch' };
-  const user2 = { firstname: 'user2',
-    lastname: '2user',
+  const user2 = { firstName: 'user2',
+    lastName: '2user',
     email: 'user2@user.ch' };
-  const user3 = { firstname: 'user3',
-    lastname: '3user',
+  const user3 = { firstName: 'user3',
+    lastName: '3user',
     email: 'user3@user.ch' };
 
   const userServiceMock = {
@@ -114,11 +114,11 @@ describe('InviteUserDialogComponent', () => {
     tick();
 
     expect(userServiceMock.createUsers)
-      .toBeCalledTimes(1);
+      .toHaveBeenCalledTimes(1);
     expect(userServiceMock.createUsers)
-      .toBeCalledWith(component.form.value);
+      .toHaveBeenCalledWith(component.form.value);
     expect(dialogRefMock.close)
-      .toBeCalledTimes(1);
+      .toHaveBeenCalledTimes(1);
   }));
 
   it('registerUsers should not call createUsers form is not valid', fakeAsync(() => {
@@ -126,8 +126,8 @@ describe('InviteUserDialogComponent', () => {
     tick();
 
     expect(userServiceMock.createUsers)
-      .toBeCalledTimes(0);
+      .toHaveBeenCalledTimes(0);
     expect(dialogRefMock.close)
-      .toBeCalledTimes(0);
+      .toHaveBeenCalledTimes(0);
   }));
 });
diff --git a/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.ts b/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.ts
index e008c91fee..2b6770f138 100644
--- a/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.ts
+++ b/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.ts
@@ -52,9 +52,9 @@ export class InviteUserDialogComponent {
 
   private createUserFormGroup() {
     return this.formBuilder.group({
-      firstname: this.formBuilder.control('', [Validators.required,
+      firstName: this.formBuilder.control('', [Validators.required,
         Validators.minLength(1)]),
-      lastname: this.formBuilder.control('', [Validators.required,
+      lastName: this.formBuilder.control('', [Validators.required,
         Validators.minLength(1)]),
       email: this.formBuilder.control('', [
         Validators.required,
diff --git a/frontend/src/app/team-management/member-detail/member-detail.component.html b/frontend/src/app/team-management/member-detail/member-detail.component.html
index cc25ec3977..a0f6456ec2 100644
--- a/frontend/src/app/team-management/member-detail/member-detail.component.html
+++ b/frontend/src/app/team-management/member-detail/member-detail.component.html
@@ -20,7 +20,7 @@ <h2>
       </button>
     </div>
     <div class="w-100">
-      <app-edit-okr-champion [user]="userRef" (okrChampionChange)="isOkrChampionChange($event, userRef)"></app-edit-okr-champion>
+      <app-edit-okr-champion [user]="userRef" (okrChampionChange)="setIsOkrChampion($event, userRef)"></app-edit-okr-champion>
     </div>
     <div class="w-100">
       <table
diff --git a/frontend/src/app/team-management/member-detail/member-detail.component.ts b/frontend/src/app/team-management/member-detail/member-detail.component.ts
index b338e4cf44..222d245cfd 100644
--- a/frontend/src/app/team-management/member-detail/member-detail.component.ts
+++ b/frontend/src/app/team-management/member-detail/member-detail.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { UserService } from '../../services/user.service';
 import { BehaviorSubject, filter, mergeMap, Subject, takeUntil, tap } from 'rxjs';
-import { getFullNameFromUser, User } from '../../shared/types/model/User';
+import { getFullNameOfUser, User } from '../../shared/types/model/User';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { Team } from '../../shared/types/model/Team';
 import { UserTeam } from '../../shared/types/model/UserTeam';
@@ -34,7 +34,7 @@ export class MemberDetailComponent implements OnInit, OnDestroy {
     'role',
     'delete'];
 
-  readonly getFullNameFromUser = getFullNameFromUser;
+  readonly getFullNameFromUser = getFullNameOfUser;
 
   constructor(
     private readonly userService: UserService,
@@ -64,7 +64,7 @@ export class MemberDetailComponent implements OnInit, OnDestroy {
   private loadUser(userId: number) {
     this.userService
       .getUserById(userId)
-      .pipe(tap((user) => this.setSelectedUserIsLoggedinUser(user)))
+      .pipe(tap((user) => this.setSelectedUserIsLoggedInUser(user)))
       .subscribe((user) => {
         this.user = user;
         this.currentUserTeams$.next(user.userTeamList);
@@ -72,7 +72,7 @@ export class MemberDetailComponent implements OnInit, OnDestroy {
       });
   }
 
-  private setSelectedUserIsLoggedinUser(selectedUser: User) {
+  private setSelectedUserIsLoggedInUser(selectedUser: User) {
     this.selectedUserIsLoggedInUser = selectedUser.id === this.userService.getCurrentUser().id;
   }
 
@@ -86,7 +86,7 @@ export class MemberDetailComponent implements OnInit, OnDestroy {
 
   removeUserFromTeam(userTeam: UserTeam, user: User) {
     const i18nData = {
-      user: getFullNameFromUser(user),
+      user: getFullNameOfUser(user),
       team: userTeam.team.name
     };
     this.dialogService
@@ -127,14 +127,14 @@ export class MemberDetailComponent implements OnInit, OnDestroy {
   }
 
   isDeletable(userTeam: UserTeam): boolean {
-    return userTeam.team.writeable || this.selectedUserIsLoggedInUser;
+    return userTeam.team.isWriteable || this.selectedUserIsLoggedInUser;
   }
 
   navigateBack() {
     this.router.navigate(['../'], { relativeTo: this.route.parent });
   }
 
-  isOkrChampionChange(okrChampion: boolean, user: User) {
+  setIsOkrChampion(okrChampion: boolean, user: User) {
     this.userService.setIsOkrChampion(user, okrChampion)
       .subscribe(() => {
         this.loadUser(user.id);
diff --git a/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.ts b/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.ts
index 995decf6a9..6ad19aa984 100644
--- a/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.ts
+++ b/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.ts
@@ -3,7 +3,7 @@ import { UserTableEntry } from '../../../shared/types/model/UserTableEntry';
 import { MatTableDataSource } from '@angular/material/table';
 import { BehaviorSubject } from 'rxjs';
 import { Team } from '../../../shared/types/model/Team';
-import { getFullNameFromUser } from '../../../shared/types/model/User';
+import { getFullNameOfUser } from '../../../shared/types/model/User';
 import { getRouteToUserDetails } from '../../../shared/routeUtils';
 
 @Component({
@@ -24,5 +24,5 @@ export class MemberListMobileComponent implements OnInit {
     return getRouteToUserDetails(userTableEntry.id, this.selectedTeam$.value?.id);
   }
 
-  protected readonly getFullNameFromUser = getFullNameFromUser;
+  protected readonly getFullNameFromUser = getFullNameOfUser;
 }
diff --git a/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.html b/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.html
index db89cc08af..2f1b477057 100644
--- a/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.html
+++ b/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.html
@@ -14,7 +14,7 @@
     <th mat-header-cell *matHeaderCellDef>Name</th>
     <td mat-cell *matCellDef="let element">
       <a [routerLink]="getMemberDetailsLink(element, selectedTeam$.value)">
-        {{ element.firstname }} {{ element.lastname }}
+        {{ element.firstName }} {{ element.lastName }}
       </a>
     </td>
   </ng-container>
@@ -58,7 +58,7 @@
   <ng-container matColumnDef="menu">
     <th mat-header-cell *matHeaderCellDef></th>
     <td mat-cell *matCellDef="let element">
-      <div class="menu" *ngIf="selectedTeam$.value?.writeable">
+      <div class="menu" *ngIf="selectedTeam$.value?.isWriteable">
         <app-puzzle-icon-button
           (click)="$event.stopPropagation()"
           [matMenuTriggerFor]="userMenu"
diff --git a/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.spec.ts b/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.spec.ts
index 47521af029..6c00e9edd6 100644
--- a/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.spec.ts
+++ b/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.spec.ts
@@ -90,7 +90,7 @@ describe('MemberListTableComponent', () => {
 
   it('should set displayedColumns for admin team correctly', fakeAsync(() => {
     const team = { ...team1 };
-    team.writeable = true;
+    team.isWriteable = true;
     component.selectedTeam$.next(team);
     tick();
     expect(component.displayedColumns)
@@ -123,13 +123,13 @@ describe('MemberListTableComponent', () => {
     tick();
 
     expect(teamServiceMock.removeUserFromTeam)
-      .toBeCalledTimes(1);
+      .toHaveBeenCalledTimes(1);
     expect(teamServiceMock.removeUserFromTeam)
-      .toBeCalledWith(entry.id, component.selectedTeam$.value);
+      .toHaveBeenCalledWith(entry.id, component.selectedTeam$.value);
     expect(userServiceMock.reloadUsers)
-      .toBeCalledTimes(1);
+      .toHaveBeenCalledTimes(1);
     expect(userServiceMock.reloadCurrentUser)
-      .toBeCalledTimes(1);
+      .toHaveBeenCalledTimes(1);
   }));
 
   it('removeMemberFromTeam should not call removeUserFromTeam and reloadUsers if not confirmed', fakeAsync(() => {
diff --git a/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.ts b/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.ts
index 1a1e7cd2ba..f4d1dc3829 100644
--- a/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.ts
+++ b/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.ts
@@ -54,7 +54,7 @@ export class MemberListTableComponent implements OnInit, OnDestroy {
 
   private setColumnForTeam(team: Team) {
     this.displayedColumns = [...this.teamColumns];
-    if (team.writeable) {
+    if (team.isWriteable) {
       this.displayedColumns.push('menu');
     }
   }
@@ -67,7 +67,7 @@ export class MemberListTableComponent implements OnInit, OnDestroy {
     event.stopPropagation();
     event.preventDefault();
     const i18nData = {
-      user: `${entry.firstname} ${entry.lastname}`,
+      user: `${entry.firstName} ${entry.lastName}`,
       team: this.selectedTeam$.value?.name
     };
     this.dialogService
diff --git a/frontend/src/app/team-management/member-list/member-list.component.html b/frontend/src/app/team-management/member-list/member-list.component.html
index 7ef133bd37..c3d5668668 100644
--- a/frontend/src/app/team-management/member-list/member-list.component.html
+++ b/frontend/src/app/team-management/member-list/member-list.component.html
@@ -4,7 +4,7 @@
       <div class="d-flex px-3">
         <h2 *ngIf="selectedTeam$.value">{{ selectedTeam$.value!.name }}</h2>
         <app-puzzle-icon-button
-          *ngIf="selectedTeam$.value?.writeable"
+          *ngIf="selectedTeam$.value?.isWriteable"
           (click)="editTeam()"
           [attr.data-testId]="'editTeamButton'"
           icon="edit.svg"
@@ -53,7 +53,7 @@ <h2 *ngIf="!selectedTeam$.value">Alle Teams</h2>
         </span>
       </button>
     </div>
-    <div class="menu mx-2" *ngIf="selectedTeam$.value?.writeable">
+    <div class="menu mx-2" *ngIf="selectedTeam$.value?.isWriteable">
       <app-puzzle-icon-button
         icon="three-dot-menu-icon.svg"
         alt="Menu Icon"
diff --git a/frontend/src/app/team-management/member-list/member-list.component.spec.ts b/frontend/src/app/team-management/member-list/member-list.component.spec.ts
index dc06fe2ddc..e43d2a4b8f 100644
--- a/frontend/src/app/team-management/member-list/member-list.component.spec.ts
+++ b/frontend/src/app/team-management/member-list/member-list.component.spec.ts
@@ -106,10 +106,10 @@ describe('MemberListComponent', () => {
 
     expect(userTableEntry.id)
       .toBe(user.id);
-    expect(userTableEntry.firstname)
-      .toBe(user.firstname);
-    expect(userTableEntry.lastname)
-      .toBe(user.lastname);
+    expect(userTableEntry.firstName)
+      .toBe(user.firstName);
+    expect(userTableEntry.lastName)
+      .toBe(user.lastName);
     expect(userTableEntry.email)
       .toBe(user.email);
     expect(userTableEntry.roles)
@@ -177,7 +177,7 @@ describe('MemberListComponent', () => {
     // test that it makes a deep copy
     expect(userTableEntries).not.toBe(usersCopy);
     // should be sorted
-    expect(userTableEntries.map((ut) => ut.firstname))
+    expect(userTableEntries.map((ut) => ut.firstName))
       .toStrictEqual([
         'Bob',
         'Key Result',
@@ -284,11 +284,11 @@ describe('MemberListComponent', () => {
     expect(component.showAddMemberToTeam())
       .toBeFalsy();
     const teamCopy = { ...team1 };
-    teamCopy.writeable = false;
+    teamCopy.isWriteable = false;
     component.selectedTeam$.next(teamCopy);
     expect(component.showAddMemberToTeam())
       .toBeFalsy();
-    teamCopy.writeable = true;
+    teamCopy.isWriteable = true;
     expect(component.showAddMemberToTeam())
       .toBeTruthy();
   });
diff --git a/frontend/src/app/team-management/member-list/member-list.component.ts b/frontend/src/app/team-management/member-list/member-list.component.ts
index 2b2f264691..0d885bbf64 100644
--- a/frontend/src/app/team-management/member-list/member-list.component.ts
+++ b/frontend/src/app/team-management/member-list/member-list.component.ts
@@ -129,7 +129,7 @@ export class MemberListComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   showAddMemberToTeam() {
-    return this.selectedTeam$.value?.writeable;
+    return this.selectedTeam$.value?.isWriteable;
   }
 
   editTeam(): void {
diff --git a/frontend/src/app/team-management/new-user/new-user.component.html b/frontend/src/app/team-management/new-user/new-user.component.html
index e8213c4cb7..842d8b8f3b 100644
--- a/frontend/src/app/team-management/new-user/new-user.component.html
+++ b/frontend/src/app/team-management/new-user/new-user.component.html
@@ -1,40 +1,40 @@
 <div class="d-flex w-100" [formGroup]="userFormGroup">
-  <div class="firstname equal-sized-col">
+  <div class="equal-sized-col">
     <div class="input-style">
       @if (index === 0) {
-      <label [for]="'firstName-col_' + index">Vorname&nbsp;*</label>
+      <label [for]="'first-name-col-' + index">Vorname&nbsp;*</label>
       }
       <input
         type="text"
         class="value-field dialog-form-field"
-        formControlName="firstname"
+        formControlName="firstName"
         #firstInput
-        [id]="'firstName-col_' + index"
-        [name]="'firstName-col_' + index"
+        [id]="'first-name-col-' + index"
+        [name]="'first-name-col-' + index"
         [attr.data-testId]="'new-member-first-name'"
       />
       <mat-error>
-        @if (firstname.errors?.["required"] && triedToSubmit) {
+        @if (firstName.errors?.["required"] && triedToSubmit) {
         <span>Angabe benötigt</span>
         }
       </mat-error>
     </div>
   </div>
-  <div class="lastname equal-sized-col">
+  <div class="equal-sized-col">
     <div class="input-style equal-sized-col">
       @if (index === 0) {
-      <label [for]="'lastname-col_' + index">Nachname&nbsp;*</label>
+      <label [for]="'last-name-col-' + index">Nachname&nbsp;*</label>
       }
       <input
         type="text"
-        [id]="'lastname-col_' + index"
-        [name]="'lastname-col_' + index"
+        [id]="'last-name-col-' + index"
+        [name]="'last-name-col-' + index"
         class="value-field dialog-form-field"
-        formControlName="lastname"
+        formControlName="lastName"
         [attr.data-testId]="'new-member-last-name'"
       />
       <mat-error>
-        @if (lastname.errors?.["required"] && triedToSubmit) {
+        @if (lastName.errors?.["required"] && triedToSubmit) {
         <span>Angabe benötigt</span>
         }
       </mat-error>
@@ -67,11 +67,11 @@
   <div class="remove">
     <div class="input-style equal-sized-col dialog-form-field">
       @if (index === 0) {
-      <label [for]="'delete-col_' + index">&nbsp;</label>
+      <label [for]="'delete-col-' + index">&nbsp;</label>
       }
       <app-puzzle-icon-button
         (click)="remove()"
-        [id]="'delete-col_' + index"
+        [id]="'delete-col-' + index"
         icon="delete-icon.svg"
         alt="Remove User Icon"
       ></app-puzzle-icon-button>
diff --git a/frontend/src/app/team-management/new-user/new-user.component.spec.ts b/frontend/src/app/team-management/new-user/new-user.component.spec.ts
index c39f8c50bd..cf87240b91 100644
--- a/frontend/src/app/team-management/new-user/new-user.component.spec.ts
+++ b/frontend/src/app/team-management/new-user/new-user.component.spec.ts
@@ -31,8 +31,8 @@ describe('NewUserComponent', () => {
     component = fixture.componentInstance;
 
     component.userFormGroup = new FormGroup<NewUserForm<FormControl>>({
-      firstname: new FormControl<any>('user1'),
-      lastname: new FormControl<any>('user'),
+      firstName: new FormControl<any>('user1'),
+      lastName: new FormControl<any>('user'),
       email: new FormControl<any>('test@test.ch')
     });
 
diff --git a/frontend/src/app/team-management/new-user/new-user.component.ts b/frontend/src/app/team-management/new-user/new-user.component.ts
index c0c8f5cc8d..8f2379cda2 100644
--- a/frontend/src/app/team-management/new-user/new-user.component.ts
+++ b/frontend/src/app/team-management/new-user/new-user.component.ts
@@ -41,12 +41,12 @@ export class NewUserComponent implements AfterViewInit {
     this.removeUser.emit();
   }
 
-  get firstname() {
-    return this.userFormGroup.controls.firstname;
+  get firstName() {
+    return this.userFormGroup.controls.firstName;
   }
 
-  get lastname() {
-    return this.userFormGroup.controls.lastname;
+  get lastName() {
+    return this.userFormGroup.controls.lastName;
   }
 
   get email() {
diff --git a/frontend/src/app/team-management/okr-champion.pipe.spec.ts b/frontend/src/app/team-management/okr-champion.pipe.spec.ts
index ee7058ad4f..87d09f5af9 100644
--- a/frontend/src/app/team-management/okr-champion.pipe.spec.ts
+++ b/frontend/src/app/team-management/okr-champion.pipe.spec.ts
@@ -5,7 +5,7 @@ describe('OkrChampionPipe', () => {
     instant: () => 'Ja'
   } as any;
 
-  it('create an instance', () => {
+  it('should create an instance', () => {
     const pipe = new OkrChampionPipe(translateMock);
     expect(pipe)
       .toBeTruthy();
diff --git a/frontend/src/app/team-management/search-team-management/search-team-management.component.spec.ts b/frontend/src/app/team-management/search-team-management/search-team-management.component.spec.ts
index 3e381802cf..36a1d53410 100644
--- a/frontend/src/app/team-management/search-team-management/search-team-management.component.spec.ts
+++ b/frontend/src/app/team-management/search-team-management/search-team-management.component.spec.ts
@@ -7,6 +7,7 @@ import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FilteredTeam, FilteredUser, SearchTeamManagementComponent } from './search-team-management.component';
 import { TranslateTestingModule } from 'ngx-translate-testing';
+// @ts-ignore
 import * as de from '../../../assets/i18n/de.json';
 import { MatIconModule } from '@angular/material/icon';
 import { ReactiveFormsModule } from '@angular/forms';
@@ -23,48 +24,48 @@ const teams: Team[] = [
     id: 1,
     version: 1,
     name: 'ZZ the Puzzle Team - Keyword',
-    writeable: false
+    isWriteable: false
   },
   {
     id: 2,
     version: 1,
     name: 'The Puzzle Team - Keyword',
-    writeable: false
+    isWriteable: false
   },
   {
     id: 3,
     version: 1,
     name: 'Puzzle Team - No',
-    writeable: false
+    isWriteable: false
   },
   {
     id: 4,
     version: 1,
     name: 'Team Ruedi - Noname',
-    writeable: false
+    isWriteable: false
   }
 ];
 
 const users: User[] = [{
   id: 2,
-  firstname: 'Pete',
-  lastname: 'Parrot',
+  firstName: 'Pete',
+  lastName: 'Parrot',
   email: 'parrot@puzzle.ch',
   userTeamList: [],
   isOkrChampion: false
 },
 {
   id: 1,
-  firstname: 'Martin',
-  lastname: 'Käser',
+  firstName: 'Martin',
+  lastName: 'Käser',
   email: 'kaeser@puzzle.ch',
   userTeamList: [],
   isOkrChampion: false
 },
 {
   id: 3,
-  firstname: 'Ruedi',
-  lastname: 'Peters',
+  firstName: 'Ruedi',
+  lastName: 'Peters',
   email: 'rpeter@gmail.com',
   userTeamList: [],
   isOkrChampion: false
diff --git a/frontend/src/app/team-management/search-team-management/search-team-management.component.ts b/frontend/src/app/team-management/search-team-management/search-team-management.component.ts
index e692b77021..47b9f13d8c 100644
--- a/frontend/src/app/team-management/search-team-management/search-team-management.component.ts
+++ b/frontend/src/app/team-management/search-team-management/search-team-management.component.ts
@@ -121,7 +121,7 @@ export class SearchTeamManagementComponent {
 
   private updateTeamsAndUsers(teams: Team[], users: User[]) {
     this.teams = [...teams].sort((a, b) => a.name.localeCompare(b.name));
-    this.users = users.sort((a, b) => (a.firstname + a.lastname).localeCompare(b.firstname + b.lastname));
+    this.users = users.sort((a, b) => (a.firstName + a.lastName).localeCompare(b.firstName + b.lastName));
     this.applyFilter(this.searchValue$.getValue());
   }
 
@@ -137,12 +137,12 @@ export class SearchTeamManagementComponent {
 
   private filterUsers(users: User[], filterValue: string): FilteredUser[] {
     return users
-      .filter((user) => this.containsText(user.firstname + user.lastname + user.email, filterValue))
+      .filter((user) => this.containsText(user.firstName + user.lastName + user.email, filterValue))
 
       .map((user) => ({
         ...user,
-        displayValue: `${user.firstname} ${user.lastname} (${user.email})`,
-        htmlValue: this.formatText(`${user.firstname} ${user.lastname} (${user.email})`, filterValue)
+        displayValue: `${user.firstName} ${user.lastName} (${user.email})`,
+        htmlValue: this.formatText(`${user.firstName} ${user.lastName} (${user.email})`, filterValue)
       }));
   }
 
diff --git a/frontend/src/app/team-management/show-edit-role/show-edit-role.component.scss b/frontend/src/app/team-management/show-edit-role/show-edit-role.component.scss
index c9c4398c0f..471f825f45 100644
--- a/frontend/src/app/team-management/show-edit-role/show-edit-role.component.scss
+++ b/frontend/src/app/team-management/show-edit-role/show-edit-role.component.scss
@@ -3,6 +3,7 @@
   flex-direction: row;
   align-items: center;
 }
+
 app-puzzle-icon-button {
   margin-left: 0.5rem;
 }
diff --git a/frontend/src/app/team-management/show-edit-role/show-edit-role.component.spec.ts b/frontend/src/app/team-management/show-edit-role/show-edit-role.component.spec.ts
index 348bda27cd..0cf62465ad 100644
--- a/frontend/src/app/team-management/show-edit-role/show-edit-role.component.spec.ts
+++ b/frontend/src/app/team-management/show-edit-role/show-edit-role.component.spec.ts
@@ -3,6 +3,7 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testin
 import { ShowEditRoleComponent } from './show-edit-role.component';
 import { testUser } from '../../shared/testData';
 import { TranslateTestingModule } from 'ngx-translate-testing';
+// @ts-ignore
 import * as de from '../../../assets/i18n/de.json';
 
 describe('ShowEditRoleComponent', () => {
@@ -30,14 +31,14 @@ describe('ShowEditRoleComponent', () => {
       .toBeTruthy();
   });
 
-  it('saveIsAdmin should set edit to false', () => {
+  it('should set edit to false using saveIsAdmin', () => {
     component.edit = true;
     component.saveIsAdmin(true);
     expect(component.edit)
       .toBeFalsy();
   });
 
-  it('setEditAsync should set edit to given value', fakeAsync(() => {
+  it('should set edit to given value using setEditAsync', fakeAsync(() => {
     component.edit = false;
     const mouseEvent = {
       stopPropagation: () => undefined
diff --git a/frontend/src/app/team-management/show-edit-role/show-edit-role.component.ts b/frontend/src/app/team-management/show-edit-role/show-edit-role.component.ts
index cb57ebb83a..06e4ce09f2 100644
--- a/frontend/src/app/team-management/show-edit-role/show-edit-role.component.ts
+++ b/frontend/src/app/team-management/show-edit-role/show-edit-role.component.ts
@@ -52,6 +52,6 @@ export class ShowEditRoleComponent {
   }
 
   isEditable() {
-    return this.userTeam.team.writeable;
+    return this.userTeam.team.isWriteable;
   }
 }
diff --git a/frontend/src/app/team-management/team-management-banner/team-management-banner.component.html b/frontend/src/app/team-management/team-management-banner/team-management-banner.component.html
index 9d592fb33d..39c9a68072 100644
--- a/frontend/src/app/team-management/team-management-banner/team-management-banner.component.html
+++ b/frontend/src/app/team-management/team-management-banner/team-management-banner.component.html
@@ -1,4 +1,4 @@
-<div id="okrBanner" class="container-fluid">
+<div id="okr-banner" class="container-fluid">
   <div class="row first-line">
     <div class="col-12">
       <a
diff --git a/frontend/src/app/team-management/team-management-banner/team-management-banner.component.scss b/frontend/src/app/team-management/team-management-banner/team-management-banner.component.scss
index 979ed0b788..82747f3e6f 100644
--- a/frontend/src/app/team-management/team-management-banner/team-management-banner.component.scss
+++ b/frontend/src/app/team-management/team-management-banner/team-management-banner.component.scss
@@ -1,6 +1,6 @@
 @import '../../../style/_variables.scss';
 
-#okrBanner {
+#okr-banner {
   position: relative;
   height: 140px; // height of okr-tangram
 
diff --git a/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.spec.ts b/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.spec.ts
index b0bfa092a7..3a432fbd1f 100644
--- a/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.spec.ts
+++ b/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.spec.ts
@@ -102,7 +102,7 @@ describe('TeamManagementMobileFilterComponent', () => {
       .toStrictEqual(teamList);
   }));
 
-  it('navigate should navigate to team ', () => {
+  it('should navigate to team ', () => {
     component.navigate(team1);
     expect(routerMock.navigateByUrl)
       .toBeCalledTimes(1);
@@ -110,7 +110,7 @@ describe('TeamManagementMobileFilterComponent', () => {
       .toBeCalledWith(getRouteToTeam(team1.id));
   });
 
-  it('navigate should navigate to all teams ', () => {
+  it('should navigate to all teams ', () => {
     component.navigate(component.ALL_TEAMS);
     expect(routerMock.navigateByUrl)
       .toBeCalledTimes(1);
diff --git a/frontend/src/app/team-management/team-management-routing.module.ts b/frontend/src/app/team-management/team-management-routing.module.ts
index 0bf2e5db25..c1a4e3d618 100644
--- a/frontend/src/app/team-management/team-management-routing.module.ts
+++ b/frontend/src/app/team-management/team-management-routing.module.ts
@@ -1,12 +1,12 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { TeamManagementComponent } from './team-management.component';
-import { SidepanelComponent } from '../shared/sidepanel/sidepanel.component';
+import { SidePanelComponent } from '../shared/side-panel/side-panel.component';
 import { MemberDetailComponent } from './member-detail/member-detail.component';
 
 const children = [{
   path: 'details',
-  component: SidepanelComponent,
+  component: SidePanelComponent,
   children: [{
     path: 'member/:id',
     component: MemberDetailComponent
diff --git a/frontend/src/app/team-management/team-role-dropdown/team-role-dropdown.component.spec.ts b/frontend/src/app/team-management/team-role-dropdown/team-role-dropdown.component.spec.ts
index 25da7cd1bf..1463c6dfbc 100644
--- a/frontend/src/app/team-management/team-role-dropdown/team-role-dropdown.component.spec.ts
+++ b/frontend/src/app/team-management/team-role-dropdown/team-role-dropdown.component.spec.ts
@@ -34,14 +34,14 @@ describe('TeamRoleDropdownComponent', () => {
       .toBeTruthy();
   });
 
-  it('component onInit should create formControl', () => {
+  it('should create formControl using onInit', () => {
     component.isAdmin = false;
     component.ngOnInit();
     expect(JSON.stringify(component.adminControl))
       .toStrictEqual(JSON.stringify(new FormControl(component.isAdmin, [Validators.required])));
   });
 
-  it('triggerIsAdminChange should submit next value', (done) => {
+  it('should submit next value using triggerIsAdminChange', (done) => {
     component.isAdminChange.pipe(takeLast(1))
       .subscribe((val) => {
         expect(val)
diff --git a/frontend/src/assets/i18n/de.json b/frontend/src/assets/i18n/de.json
index be9c8d61a4..e8be22ed64 100644
--- a/frontend/src/assets/i18n/de.json
+++ b/frontend/src/assets/i18n/de.json
@@ -55,7 +55,7 @@
         "TITLE": "Objective löschen",
         "TEXT": "Möchtest du dieses Objective wirklich löschen? Zugehörige Key Results werden dadurch ebenfalls gelöscht!"
       },
-      "KEYRESULT":{
+      "KEY_RESULT":{
         "TITLE": "Key Result löschen",
         "TEXT": "Möchtest du dieses Key Result wirklich löschen? Zugehörige Check-ins werden dadurch ebenfalls gelöscht!"
       },
diff --git a/frontend/src/style/_variables.scss b/frontend/src/style/_variables.scss
index 708d48ea2b..a5e1366c9c 100644
--- a/frontend/src/style/_variables.scss
+++ b/frontend/src/style/_variables.scss
@@ -11,8 +11,8 @@ $dark-grey-border: #5d6974;
 
 $top-bar-height: 48px;
 
-$keyResult-attribute-bg: #ffffff;
-$keyResult-attribute-edit-border: #ddddddff;
+$key-result-attribute-bg: #ffffff;
+$key-result-attribute-edit-border: #ddddddff;
 
 $error-color: #b3261b;
 $display-element: #f5f5f5;
diff --git a/frontend/src/style/custom_bootstrap.scss b/frontend/src/style/custom_bootstrap.scss
index 301c6548d9..ec230cb903 100644
--- a/frontend/src/style/custom_bootstrap.scss
+++ b/frontend/src/style/custom_bootstrap.scss
@@ -3,7 +3,7 @@ $theme-colors: (
   'pz-dark-blue': $pz-dark-blue,
   'eggshell': $eggshell,
   'display-element': $display-element,
-  'keyResult-attribute': $keyResult-attribute-bg,
+  'key-result-attribute': $key-result-attribute-bg,
   'error': $error,
 );
 $enable-negative-margins: true;
diff --git a/frontend/src/style/styles.scss b/frontend/src/style/styles.scss
index 73e52ffc83..20a2d37374 100644
--- a/frontend/src/style/styles.scss
+++ b/frontend/src/style/styles.scss
@@ -98,15 +98,15 @@ body.okr {
   width: fit-content;
 }
 
-.keyResult-attribute-show {
-  background-color: $keyResult-attribute-bg;
+.key-result-attribute-show {
+  background-color: $key-result-attribute-bg;
   padding: 0.25em 0.75rem;
   border-radius: 2px;
 }
 
-.keyResult-attribute-edit {
-  @extend .keyResult-attribute-show;
-  border: solid $keyResult-attribute-edit-border 1px;
+.key-result-attribute-edit {
+  @extend .key-result-attribute-show;
+  border: solid $key-result-attribute-edit-border 1px;
 }
 
 .dialog-data-show {
@@ -260,6 +260,12 @@ mat-form-field.quarter-filter .mat-mdc-text-field-wrapper {
   margin-bottom: 1rem;
 }
 
+.sub-title-key-result {
+  font-family: Roboto, 'sans-serif';
+  font-variation-settings: 'wght' 400;
+  font-size: 0.9rem !important;
+}
+
 * {
   line-height: 115% !important;
 }
@@ -301,7 +307,7 @@ img.add-cross-button {
   margin-bottom: 2rem !important;
 }
 
-#okrBanner {
+#okr-banner {
   position: fixed;
   width: 100%;
   height: min-content;
@@ -310,7 +316,7 @@ img.add-cross-button {
   background: var(--okr-banner-background-color);
 }
 
-app-team-management-banner > #okrBanner {
+app-team-management-banner > #okr-banner {
   position: relative;
 }