diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
index 8b254a84..a24145b6 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
@@ -28,7 +28,7 @@ package com.github.games647.fastlogin.bukkit;
 import com.github.games647.fastlogin.bukkit.command.CrackedCommand;
 import com.github.games647.fastlogin.bukkit.command.PremiumCommand;
 import com.github.games647.fastlogin.bukkit.listener.ConnectionListener;
-import com.github.games647.fastlogin.bukkit.listener.PaperPreLoginListener;
+import com.github.games647.fastlogin.bukkit.listener.PaperCacheListener;
 import com.github.games647.fastlogin.bukkit.listener.protocollib.ProtocolLibListener;
 import com.github.games647.fastlogin.bukkit.listener.protocollib.SkinApplyListener;
 import com.github.games647.fastlogin.bukkit.listener.protocolsupport.ProtocolSupportListener;
@@ -131,7 +131,7 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
 
         //if server is using paper - we need to add one more listener to correct the usercache usage
         if (PaperLib.isPaper()) {
-            pluginManager.registerEvents(new PaperPreLoginListener(this), this);
+            pluginManager.registerEvents(new PaperCacheListener(this), this);
         }
 
         //register commands using a unique name
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/PaperPreLoginListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/PaperCacheListener.java
similarity index 95%
rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/PaperPreLoginListener.java
rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/PaperCacheListener.java
index 396cb2cf..884960ca 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/PaperPreLoginListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/PaperCacheListener.java
@@ -35,11 +35,11 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result;
 
-public class PaperPreLoginListener implements Listener {
+public class PaperCacheListener implements Listener {
 
     private final FastLoginBukkit plugin;
 
-    public PaperPreLoginListener(final FastLoginBukkit plugin) {
+    public PaperCacheListener(final FastLoginBukkit plugin) {
         this.plugin = plugin;
     }
 
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
index 3aa8e765..23c5f6ac 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
@@ -52,9 +52,8 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
     private final Player player;
     private final String username;
 
-
-    public NameCheckTask(FastLoginBukkit plugin, PacketEvent packetEvent, Random random,
-                         Player player, String username, PublicKey publicKey) {
+    public NameCheckTask(FastLoginBukkit plugin, Random random, Player player, PacketEvent packetEvent,
+                         String username, PublicKey publicKey) {
         super(plugin.getCore(), plugin.getCore().getAuthPluginHook());
 
         this.plugin = plugin;
@@ -68,7 +67,7 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
     @Override
     public void run() {
         try {
-            super.onLogin(username, new ProtocolLibLoginSource(packetEvent, player, random, publicKey));
+            super.onLogin(username, new ProtocolLibLoginSource(player, random, publicKey));
         } finally {
             ProtocolLibrary.getProtocolManager().getAsynchronousManager().signalPacketTransmission(packetEvent);
         }
@@ -87,7 +86,7 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
     public void requestPremiumLogin(ProtocolLibLoginSource source, StoredProfile profile
             , String username, boolean registered) {
         try {
-            source.setOnlineMode();
+            source.enableOnlinemode();
         } catch (Exception ex) {
             plugin.getLog().error("Cannot send encryption packet. Falling back to cracked login for: {}", profile, ex);
             return;
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java
index 47018615..4d76b809 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java
@@ -64,7 +64,8 @@ public class ProtocolLibListener extends PacketAdapter {
     }
 
     public static void register(FastLoginBukkit plugin, RateLimiter rateLimiter) {
-        //they will be created with a static builder, because otherwise it will throw a NoClassDefFoundError
+        // they will be created with a static builder, because otherwise it will throw a NoClassDefFoundError
+        // TODO: make synchronous processing, but do web or database requests async
         ProtocolLibrary.getProtocolManager()
                 .getAsynchronousManager()
                 .registerAsyncHandler(new ProtocolLibListener(plugin, rateLimiter))
@@ -74,7 +75,7 @@ public class ProtocolLibListener extends PacketAdapter {
     @Override
     public void onPacketReceiving(PacketEvent packetEvent) {
         if (packetEvent.isCancelled()
-                || plugin.getCore().getAuthPluginHook()== null
+                || plugin.getCore().getAuthPluginHook() == null
                 || !plugin.isServerFullyStarted()) {
             return;
         }
@@ -120,7 +121,7 @@ public class ProtocolLibListener extends PacketAdapter {
         plugin.getLog().trace("GameProfile {} with {} connecting", sessionKey, username);
 
         packetEvent.getAsyncMarker().incrementProcessingDelay();
-        Runnable nameCheckTask = new NameCheckTask(plugin, packetEvent, random, player, username, keyPair.getPublic());
+        Runnable nameCheckTask = new NameCheckTask(plugin, random, player, packetEvent, username, keyPair.getPublic());
         plugin.getScheduler().runAsync(nameCheckTask);
     }
 }
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibLoginSource.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibLoginSource.java
index 4e9691f4..f35569db 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibLoginSource.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibLoginSource.java
@@ -28,7 +28,6 @@ package com.github.games647.fastlogin.bukkit.listener.protocollib;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import com.github.games647.fastlogin.core.shared.LoginSource;
@@ -46,7 +45,6 @@ import static com.comphenix.protocol.PacketType.Login.Server.ENCRYPTION_BEGIN;
 
 class ProtocolLibLoginSource implements LoginSource {
 
-    private final PacketEvent packetEvent;
     private final Player player;
 
     private final Random random;
@@ -55,15 +53,14 @@ class ProtocolLibLoginSource implements LoginSource {
     private final String serverId = "";
     private byte[] verifyToken;
 
-    public ProtocolLibLoginSource(PacketEvent packetEvent, Player player, Random random, PublicKey publicKey) {
-        this.packetEvent = packetEvent;
+    public ProtocolLibLoginSource(Player player, Random random, PublicKey publicKey) {
         this.player = player;
         this.random = random;
         this.publicKey = publicKey;
     }
 
     @Override
-    public void setOnlineMode() throws Exception {
+    public void enableOnlinemode() throws Exception {
         verifyToken = EncryptionUtil.generateVerifyToken(random);
 
         /*
@@ -109,7 +106,7 @@ class ProtocolLibLoginSource implements LoginSource {
 
     @Override
     public InetSocketAddress getAddress() {
-        return packetEvent.getPlayer().getAddress();
+        return player.getAddress();
     }
 
     public String getServerId() {
@@ -123,8 +120,7 @@ class ProtocolLibLoginSource implements LoginSource {
     @Override
     public String toString() {
         return this.getClass().getSimpleName() + '{' +
-                "packetEvent=" + packetEvent +
-                ", player=" + player +
+                "player=" + player +
                 ", random=" + random +
                 ", serverId='" + serverId + '\'' +
                 ", verifyToken=" + Arrays.toString(verifyToken) +
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolLoginSource.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolLoginSource.java
index 6c05caf7..2e98178b 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolLoginSource.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolLoginSource.java
@@ -40,7 +40,7 @@ public class ProtocolLoginSource implements LoginSource {
     }
 
     @Override
-    public void setOnlineMode() {
+    public void enableOnlinemode() {
         loginStartEvent.setOnlineMode(true);
     }
 
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java
index 57eec20a..d25bb492 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java
@@ -112,7 +112,7 @@ public class ProtocolSupportListener extends JoinManagement<Player, CommandSende
     @Override
     public void requestPremiumLogin(ProtocolLoginSource source, StoredProfile profile, String username
             , boolean registered) {
-        source.setOnlineMode();
+        source.enableOnlinemode();
 
         String ip = source.getAddress().getAddress().getHostAddress();
         plugin.getCore().getPendingLogin().put(ip + username, new Object());
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java
index 4d2c6a70..ae944077 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java
@@ -46,7 +46,7 @@ public class BungeeLoginSource implements LoginSource {
     }
 
     @Override
-    public void setOnlineMode() {
+    public void enableOnlinemode() {
         connection.setOnlineMode(true);
     }
 
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncPremiumCheck.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncPremiumCheck.java
index 410b1e44..47e32db2 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncPremiumCheck.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncPremiumCheck.java
@@ -78,7 +78,7 @@ public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, CommandSend
     @Override
     public void requestPremiumLogin(BungeeLoginSource source, StoredProfile profile,
                                     String username, boolean registered) {
-        source.setOnlineMode();
+        source.enableOnlinemode();
         plugin.getSession().put(source.getConnection(), new BungeeLoginSession(username, registered, profile));
 
         String ip = source.getAddress().getAddress().getHostAddress();
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/LoginSource.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/LoginSource.java
index df33aa83..a338559e 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/shared/LoginSource.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/LoginSource.java
@@ -29,7 +29,7 @@ import java.net.InetSocketAddress;
 
 public interface LoginSource {
 
-    void setOnlineMode() throws Exception;
+    void enableOnlinemode() throws Exception;
 
     void kick(String message) throws Exception;