diff --git a/src/de/steamwar/velocitycore/ArenaMode.java b/src/de/steamwar/velocitycore/ArenaMode.java
index a185dcb..83fdfe2 100644
--- a/src/de/steamwar/velocitycore/ArenaMode.java
+++ b/src/de/steamwar/velocitycore/ArenaMode.java
@@ -118,4 +118,9 @@ public class ArenaMode extends GameModeConfig {
         return getServer().getChatNames().isEmpty();
     }
 
+    public String getSchemTypeOrInternalName() {
+        Schematic schematic = getSchematic();
+        if (schematic == null) return internalName;
+        return schematic.getType();
+    }
 }
diff --git a/src/de/steamwar/velocitycore/commands/RankCommand.java b/src/de/steamwar/velocitycore/commands/RankCommand.java
index 5254d52..ed409b7 100644
--- a/src/de/steamwar/velocitycore/commands/RankCommand.java
+++ b/src/de/steamwar/velocitycore/commands/RankCommand.java
@@ -48,10 +48,10 @@ public class RankCommand extends SWCommand {
             if (!mode.isRanked())
                 continue;
 
-            Optional<Integer> elo = UserElo.getElo(user.getId(), mode.getSchemType());
+            Optional<Integer> elo = UserElo.getElo(user.getId(), mode.getSchemTypeOrInternalName());
             Message eloMsg;
             if (elo.isPresent()) {
-                int placement = UserElo.getPlacement(elo.get(), mode.getSchemType());
+                int placement = UserElo.getPlacement(elo.get(), mode.getSchemTypeOrInternalName());
                 eloMsg = new Message("RANK_PLACED", placement, elo.get());
             } else {
                 eloMsg = new Message("RANK_UNPLACED");
diff --git a/src/de/steamwar/velocitycore/listeners/ChatListener.java b/src/de/steamwar/velocitycore/listeners/ChatListener.java
index 5c7ba7c..4128c67 100644
--- a/src/de/steamwar/velocitycore/listeners/ChatListener.java
+++ b/src/de/steamwar/velocitycore/listeners/ChatListener.java
@@ -52,10 +52,7 @@ public class ChatListener extends BasicListener {
 
     private static final Logger cmdLogger = Logger.getLogger("Command logger");
 
-    private static final List<String> rankedModes = ArenaMode.getAllModes().stream().filter(ArenaMode::isRanked).map(arenaMode -> {
-        if (arenaMode.getSchematic() != null) return arenaMode.getSchemType();
-        return arenaMode.getChatName();
-    }).toList();
+    private static final List<String> rankedModes = ArenaMode.getAllModes().stream().filter(ArenaMode::isRanked).map(ArenaMode::getSchemTypeOrInternalName).toList();
 
     @Subscribe(order = PostOrder.FIRST)
     public void fixCommands(CommandExecuteEvent e) {