diff --git a/financer-web-client/src/main/java/de/financer/util/ControllerUtils.java b/financer-web-client/src/main/java/de/financer/util/ControllerUtils.java
index 6c5ebd4..fd23bab 100644
--- a/financer-web-client/src/main/java/de/financer/util/ControllerUtils.java
+++ b/financer-web-client/src/main/java/de/financer/util/ControllerUtils.java
@@ -6,12 +6,11 @@ import de.financer.model.Account;
 import de.financer.model.AccountGroup;
 import de.financer.model.AccountStatus;
 import de.financer.model.RecurringTransaction;
-import de.financer.util.comparator.AccountByTypeByIdComparator;
+import de.financer.util.comparator.AccountByTypeByGroupNameByIdComparator;
 import org.apache.commons.collections4.IterableUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.ui.Model;
 
-import java.text.DateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
@@ -33,7 +32,7 @@ public class ControllerUtils {
         return IterableUtils.toList(accounts).stream()
                             .filter((acc) -> AccountStatus.OPEN
                                     .equals(acc.getStatus()) || showClosed)
-                            .sorted(new AccountByTypeByIdComparator())
+                            .sorted(new AccountByTypeByGroupNameByIdComparator())
                             .collect(Collectors.toList());
     }
 
diff --git a/financer-web-client/src/main/java/de/financer/util/comparator/AccountByTypeByIdComparator.java b/financer-web-client/src/main/java/de/financer/util/comparator/AccountByTypeByGroupNameByIdComparator.java
similarity index 93%
rename from financer-web-client/src/main/java/de/financer/util/comparator/AccountByTypeByIdComparator.java
rename to financer-web-client/src/main/java/de/financer/util/comparator/AccountByTypeByGroupNameByIdComparator.java
index 3c0c79d..31caad3 100644
--- a/financer-web-client/src/main/java/de/financer/util/comparator/AccountByTypeByIdComparator.java
+++ b/financer-web-client/src/main/java/de/financer/util/comparator/AccountByTypeByGroupNameByIdComparator.java
@@ -6,7 +6,7 @@ import de.financer.model.AccountType;
 import java.util.Comparator;
 import java.util.Map;
 
-public class AccountByTypeByIdComparator implements Comparator<Account> {
+public class AccountByTypeByGroupNameByIdComparator implements Comparator<Account> {
     //@formatter:off
     private static final Map<AccountType, Integer> SORT_ORDER = Map.of(AccountType.BANK, 1,
                                                                        AccountType.CASH, 2,