diff --git a/test/se/vidstige/jadb/test/fakes/AdbResponder.java b/test/se/vidstige/jadb/test/fakes/AdbProtocolHandler.java
similarity index 95%
rename from test/se/vidstige/jadb/test/fakes/AdbResponder.java
rename to test/se/vidstige/jadb/test/fakes/AdbProtocolHandler.java
index 3ce1698..b8ee61b 100644
--- a/test/se/vidstige/jadb/test/fakes/AdbResponder.java
+++ b/test/se/vidstige/jadb/test/fakes/AdbProtocolHandler.java
@@ -7,10 +7,10 @@ import java.io.OutputStreamWriter;
 import java.net.Socket;
 import java.nio.charset.Charset;
 
-public class AdbResponder implements Runnable {
+public class AdbProtocolHandler implements Runnable {
 	private Socket socket;
 
-	public AdbResponder(Socket socket) {
+	public AdbProtocolHandler(Socket socket) {
 		this.socket = socket;
 	}
 
diff --git a/test/se/vidstige/jadb/test/fakes/AdbServer.java b/test/se/vidstige/jadb/test/fakes/AdbServer.java
index 697d08d..2e49a93 100644
--- a/test/se/vidstige/jadb/test/fakes/AdbServer.java
+++ b/test/se/vidstige/jadb/test/fakes/AdbServer.java
@@ -20,7 +20,7 @@ public class AdbServer extends SocketServer {
 
     @Override
     protected Runnable createResponder(Socket socket) {
-        return new AdbResponder(socket);
+        return new AdbProtocolHandler(socket);
     }
 
     public static void main(String[] args)