diff --git a/ProtocolLib/src/com/comphenix/protocol/async/AsyncFilterManager.java b/ProtocolLib/src/com/comphenix/protocol/async/AsyncFilterManager.java
index c11a7b04..6ad4f219 100644
--- a/ProtocolLib/src/com/comphenix/protocol/async/AsyncFilterManager.java
+++ b/ProtocolLib/src/com/comphenix/protocol/async/AsyncFilterManager.java
@@ -44,15 +44,15 @@ public class AsyncFilterManager {
 	}
 	
 	public AsyncListenerHandler registerAsyncHandler(Plugin plugin, PacketListener listener) {
-		AsyncListenerHandler token = new AsyncListenerHandler(plugin, mainThread, this, listener);
+		AsyncListenerHandler handler = new AsyncListenerHandler(plugin, mainThread, this, listener);
 		
 		// Add listener to either or both processing queue
 		if (hasValidWhitelist(listener.getSendingWhitelist()))
-			serverProcessingQueue.addListener(token, listener.getSendingWhitelist());
+			serverProcessingQueue.addListener(handler, listener.getSendingWhitelist());
 		if (hasValidWhitelist(listener.getReceivingWhitelist()))
-			clientProcessingQueue.addListener(token, listener.getReceivingWhitelist());
+			clientProcessingQueue.addListener(handler, listener.getReceivingWhitelist());
 		
-		return token;
+		return handler;
 	}
 	
 	private boolean hasValidWhitelist(ListeningWhitelist whitelist) {
@@ -61,25 +61,25 @@ public class AsyncFilterManager {
 	
 	/**
 	 * Unregisters and closes the given asynchronous handler.
-	 * @param listenerToken - asynchronous handler.
+	 * @param handler - asynchronous handler.
 	 */
-	public void unregisterAsyncHandler(AsyncListenerHandler listenerToken) {
-		if (listenerToken == null)
+	public void unregisterAsyncHandler(AsyncListenerHandler handler) {
+		if (handler == null)
 			throw new IllegalArgumentException("listenerToken cannot be NULL");
 		
-		listenerToken.cancel();	
+		handler.cancel();	
 	}
 	
-	// Called by ListenerToken
-	void unregisterAsyncHandlerInternal(AsyncListenerHandler listenerToken) {
+	// Called by AsyncListenerHandler
+	void unregisterAsyncHandlerInternal(AsyncListenerHandler handler) {
 		
-		PacketListener listener = listenerToken.getAsyncListener();
+		PacketListener listener = handler.getAsyncListener();
 		
 		// Just remove it from the queue(s)
 		if (hasValidWhitelist(listener.getSendingWhitelist()))
-			serverProcessingQueue.removeListener(listenerToken, listener.getSendingWhitelist());
+			serverProcessingQueue.removeListener(handler, listener.getSendingWhitelist());
 		if (hasValidWhitelist(listener.getReceivingWhitelist()))
-			clientProcessingQueue.removeListener(listenerToken, listener.getReceivingWhitelist());
+			clientProcessingQueue.removeListener(handler, listener.getReceivingWhitelist());
 	}
 	
 	/**
diff --git a/ProtocolLib/src/com/comphenix/protocol/async/AsyncListenerHandler.java b/ProtocolLib/src/com/comphenix/protocol/async/AsyncListenerHandler.java
index b400b8e1..4521831d 100644
--- a/ProtocolLib/src/com/comphenix/protocol/async/AsyncListenerHandler.java
+++ b/ProtocolLib/src/com/comphenix/protocol/async/AsyncListenerHandler.java
@@ -122,10 +122,10 @@ public class AsyncListenerHandler {
 				
 				// Now, get the next non-cancelled listener
 				for (; marker.getListenerTraversal().hasNext(); ) {
-					AsyncListenerHandler token = marker.getListenerTraversal().next().getListener();
+					AsyncListenerHandler handler = marker.getListenerTraversal().next().getListener();
 					
-					if (!token.isCancelled()) {
-						token.enqueuePacket(packet);
+					if (!handler.isCancelled()) {
+						handler.enqueuePacket(packet);
 						continue mainLoop;
 					}
 				}
diff --git a/ProtocolLib/src/com/comphenix/protocol/async/PacketProcessingQueue.java b/ProtocolLib/src/com/comphenix/protocol/async/PacketProcessingQueue.java
index c67d9d20..80554803 100644
--- a/ProtocolLib/src/com/comphenix/protocol/async/PacketProcessingQueue.java
+++ b/ProtocolLib/src/com/comphenix/protocol/async/PacketProcessingQueue.java
@@ -117,9 +117,9 @@ class PacketProcessingQueue extends AbstractConcurrentListenerMultimap<AsyncList
 	
 	public void cleanupAll() {
 		// Cancel all the threads and every listener
-		for (PrioritizedListener<AsyncListenerHandler> token : values()) {
-			if (token != null) {
-				token.getListener().cancel();
+		for (PrioritizedListener<AsyncListenerHandler> handler : values()) {
+			if (handler != null) {
+				handler.getListener().cancel();
 			}
 		}