diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Contributors.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Contributors.java
index b3c79f723..947a79942 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Contributors.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Contributors.java
@@ -36,6 +36,7 @@ public class Contributors {
             new Contributor("Antonok", CODE),
             new Contributor("Argetan", CODE),
             new Contributor("Aurelien", CODE, LANG),
+            new Contributor("Binero", CODE),
             new Contributor("BrainStone", CODE),
             new Contributor("Catalina", LANG),
             new Contributor("Elguerrero", LANG),
diff --git a/Plan/fabric/build.gradle b/Plan/fabric/build.gradle
index 794c9cd26..9e56c5178 100644
--- a/Plan/fabric/build.gradle
+++ b/Plan/fabric/build.gradle
@@ -8,9 +8,9 @@ dependencies {
 
     shadow "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
 
-    minecraft "com.mojang:minecraft:1.20.2"
-    mappings "net.fabricmc:yarn:1.20.2+build.1:v2"
-    modImplementation "net.fabricmc:fabric-loader:0.14.22"
+    minecraft "com.mojang:minecraft:1.20.4"
+    mappings "net.fabricmc:yarn:1.20.4+build.3:v2"
+    modImplementation "net.fabricmc:fabric-loader:0.15.2"
     modImplementation('me.lucko:fabric-permissions-api:0.3-SNAPSHOT')
 
     // Fabric API
@@ -24,7 +24,7 @@ dependencies {
     ]
 
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, "0.89.1+1.20.2"))
+        modImplementation(fabricApi.module(it, "0.91.2+1.20.4"))
     }
 
     testImplementation project(path: ":common", configuration: 'testArtifacts')
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/FabricSensor.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/FabricSensor.java
index 0db763447..0cd667786 100644
--- a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/FabricSensor.java
+++ b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/FabricSensor.java
@@ -48,7 +48,7 @@ public class FabricSensor implements ServerSensor<ServerWorld> {
         //Returns the ticks per second of the last 100 ticks
         double totalTickLength = 0;
         int count = 0;
-        for (long tickLength : server.lastTickLengths) {
+        for (long tickLength : server.getTickTimes()) {
             if (tickLength == 0) continue; // Ignore uninitialized values in array
             totalTickLength += Math.max(tickLength, TimeUnit.MILLISECONDS.toNanos(50));
             count++;
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/domain/FabricPlayerData.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/domain/FabricPlayerData.java
index 616a147e3..e1e67c758 100644
--- a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/domain/FabricPlayerData.java
+++ b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/domain/FabricPlayerData.java
@@ -45,7 +45,7 @@ public class FabricPlayerData implements PlatformPlayerData {
 
     @Override
     public String getName() {
-        return player.getEntityName();
+        return player.getNameForScoreboard();
     }
 
     @Override
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/mixin/ServerCommandSourceMixin.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/mixin/ServerCommandSourceMixin.java
index db9d3dcf7..7300b2b87 100644
--- a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/mixin/ServerCommandSourceMixin.java
+++ b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/mixin/ServerCommandSourceMixin.java
@@ -58,7 +58,7 @@ public abstract class ServerCommandSourceMixin implements CMDSender {
 
     @Override
     public Optional<String> getPlayerName() {
-        return getPlayer().map(ServerPlayerEntity::getEntityName);
+        return getPlayer().map(ServerPlayerEntity::getNameForScoreboard);
     }
 
     @Override