diff --git a/bungee/src/main/java/org/geysermc/floodgate/handler/BungeeDataHandler.java b/bungee/src/main/java/org/geysermc/floodgate/handler/BungeeDataHandler.java
index f83c47ce..df0e4369 100644
--- a/bungee/src/main/java/org/geysermc/floodgate/handler/BungeeDataHandler.java
+++ b/bungee/src/main/java/org/geysermc/floodgate/handler/BungeeDataHandler.java
@@ -26,7 +26,7 @@
 package org.geysermc.floodgate.handler;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.geysermc.floodgate.player.HandshakeHandler.ResultType;
+import static org.geysermc.floodgate.player.FloodgateHandshakeHandler.ResultType;
 
 import com.google.inject.Inject;
 import io.netty.channel.Channel;
@@ -45,8 +45,8 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.api.player.PropertyKey;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
-import org.geysermc.floodgate.player.HandshakeHandler;
-import org.geysermc.floodgate.player.HandshakeHandler.HandshakeResult;
+import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
+import org.geysermc.floodgate.player.FloodgateHandshakeHandler.HandshakeResult;
 import org.geysermc.floodgate.util.BedrockData;
 import org.geysermc.floodgate.util.ReflectionUtils;
 
@@ -84,7 +84,7 @@ public final class BungeeDataHandler {
     @Inject private Plugin plugin;
     @Inject private ProxyFloodgateConfig config;
     @Inject private ProxyFloodgateApi api;
-    @Inject private HandshakeHandler handler;
+    @Inject private FloodgateHandshakeHandler handler;
     @Inject private FloodgateLogger logger;
 
     public void handlePreLogin(PreLoginEvent event) {
diff --git a/common/src/main/java/org/geysermc/floodgate/module/CommonModule.java b/common/src/main/java/org/geysermc/floodgate/module/CommonModule.java
index 7161294f..b0550078 100644
--- a/common/src/main/java/org/geysermc/floodgate/module/CommonModule.java
+++ b/common/src/main/java/org/geysermc/floodgate/module/CommonModule.java
@@ -51,7 +51,7 @@ import org.geysermc.floodgate.crypto.Base64Topping;
 import org.geysermc.floodgate.crypto.FloodgateCipher;
 import org.geysermc.floodgate.crypto.KeyProducer;
 import org.geysermc.floodgate.inject.CommonPlatformInjector;
-import org.geysermc.floodgate.player.HandshakeHandler;
+import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
 import org.geysermc.floodgate.util.LanguageManager;
 
 @RequiredArgsConstructor
@@ -131,7 +131,7 @@ public class CommonModule extends AbstractModule {
 
     @Provides
     @Singleton
-    public HandshakeHandler handshakeHandler(
+    public FloodgateHandshakeHandler handshakeHandler(
             HandshakeHandlersImpl handshakeHandlers,
             SimpleFloodgateApi api,
             FloodgateCipher cipher,
@@ -139,7 +139,7 @@ public class CommonModule extends AbstractModule {
             @Named("playerAttribute") AttributeKey<FloodgatePlayer> playerAttribute,
             FloodgateLogger logger
     ) {
-        return new HandshakeHandler(
+        return new FloodgateHandshakeHandler(
                 handshakeHandlers,
                 api,
                 cipher,
diff --git a/common/src/main/java/org/geysermc/floodgate/player/HandshakeHandler.java b/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
similarity index 99%
rename from common/src/main/java/org/geysermc/floodgate/player/HandshakeHandler.java
rename to common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
index 2abc2196..2a7d407d 100644
--- a/common/src/main/java/org/geysermc/floodgate/player/HandshakeHandler.java
+++ b/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
@@ -56,7 +56,7 @@ import org.geysermc.floodgate.util.RawSkin;
 import org.geysermc.floodgate.util.Utils;
 
 @RequiredArgsConstructor
-public final class HandshakeHandler {
+public final class FloodgateHandshakeHandler {
     private final HandshakeHandlersImpl handshakeHandlers;
     private final SimpleFloodgateApi api;
     private final FloodgateCipher cipher;
diff --git a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java
index 07e4f529..7b117f02 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java
@@ -31,11 +31,11 @@ import io.netty.channel.Channel;
 import org.geysermc.floodgate.api.inject.InjectorAddon;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.config.FloodgateConfig;
-import org.geysermc.floodgate.player.HandshakeHandler;
+import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
 import org.geysermc.floodgate.util.Utils;
 
 public final class SpigotDataAddon implements InjectorAddon {
-    @Inject private HandshakeHandler handshakeHandler;
+    @Inject private FloodgateHandshakeHandler handshakeHandler;
     @Inject private FloodgateConfig config;
     @Inject private FloodgateLogger logger;
 
diff --git a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java
index 9bccb57f..235822cb 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java
@@ -48,8 +48,8 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.api.player.PropertyKey;
 import org.geysermc.floodgate.config.FloodgateConfig;
-import org.geysermc.floodgate.player.HandshakeHandler;
-import org.geysermc.floodgate.player.HandshakeHandler.HandshakeResult;
+import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
+import org.geysermc.floodgate.player.FloodgateHandshakeHandler.HandshakeResult;
 import org.geysermc.floodgate.util.BedrockData;
 import org.geysermc.floodgate.util.ReflectionUtils;
 
@@ -157,7 +157,7 @@ public final class SpigotDataHandler extends SimpleChannelInboundHandler<Object>
 
     /* per player stuff */
     private final FloodgateConfig config;
-    private final HandshakeHandler handshakeHandler;
+    private final FloodgateHandshakeHandler handshakeHandler;
     private final FloodgateLogger logger;
     private Object networkManager;
     private FloodgatePlayer player;
diff --git a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java
index 0039fd10..bee136ef 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java
@@ -33,11 +33,11 @@ import org.geysermc.floodgate.api.ProxyFloodgateApi;
 import org.geysermc.floodgate.api.inject.InjectorAddon;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
-import org.geysermc.floodgate.player.HandshakeHandler;
+import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
 import org.geysermc.floodgate.util.Utils;
 
 public final class VelocityDataAddon implements InjectorAddon {
-    @Inject private HandshakeHandler handshakeHandler;
+    @Inject private FloodgateHandshakeHandler handshakeHandler;
     @Inject private ProxyFloodgateConfig config;
     @Inject private ProxyFloodgateApi api;
     @Inject private FloodgateLogger logger;
diff --git a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
index 8dda1d96..9185427c 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
@@ -42,8 +42,8 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.api.player.PropertyKey;
 import org.geysermc.floodgate.config.ProxyFloodgateConfig;
-import org.geysermc.floodgate.player.HandshakeHandler;
-import org.geysermc.floodgate.player.HandshakeHandler.HandshakeResult;
+import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
+import org.geysermc.floodgate.player.FloodgateHandshakeHandler.HandshakeResult;
 
 @RequiredArgsConstructor
 public final class VelocityProxyDataHandler extends SimpleChannelInboundHandler<Object> {
@@ -70,7 +70,7 @@ public final class VelocityProxyDataHandler extends SimpleChannelInboundHandler<
     }
 
     private final ProxyFloodgateConfig config;
-    private final HandshakeHandler handshakeHandler;
+    private final FloodgateHandshakeHandler handshakeHandler;
     private final AttributeKey<String> kickMessageAttribute;
     private final FloodgateLogger logger;
     private boolean done;