diff --git a/jOOQ-sql-console/src/main/java/org/jooq/debug/console/Console.java b/jOOQ-sql-console/src/main/java/org/jooq/debug/console/Console.java
index 2d40692aa1..b3f2c89b1b 100644
--- a/jOOQ-sql-console/src/main/java/org/jooq/debug/console/Console.java
+++ b/jOOQ-sql-console/src/main/java/org/jooq/debug/console/Console.java
@@ -90,7 +90,7 @@ import javax.swing.event.DocumentListener;
 
 import org.jooq.Record;
 import org.jooq.Table;
-import org.jooq.debug.console.remote.SqlRemoteQueryDebuggerClient;
+import org.jooq.debug.console.remote.RemoteDebuggerClient;
 
 /**
  * @author Christopher Deckers
@@ -464,7 +464,7 @@ public class Console extends JFrame {
     		return;
     	}
     	try {
-    		new SqlRemoteQueryDebuggerClient(args[0], Integer.parseInt(args[1]));
+    		new RemoteDebuggerClient(args[0], Integer.parseInt(args[1]));
     	} catch(Exception e) {
     		e.printStackTrace();
     		return;
diff --git a/jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/SqlRemoteQueryDebuggerClient.java b/jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/RemoteDebuggerClient.java
similarity index 94%
rename from jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/SqlRemoteQueryDebuggerClient.java
rename to jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/RemoteDebuggerClient.java
index fa5fa95247..363ac1b91b 100644
--- a/jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/SqlRemoteQueryDebuggerClient.java
+++ b/jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/RemoteDebuggerClient.java
@@ -52,11 +52,11 @@ import org.jooq.debug.DebuggerResultSetData;
 /**
  * @author Christopher Deckers
  */
-public class SqlRemoteQueryDebuggerClient {
+public class RemoteDebuggerClient {
 
 	private Socket socket;
 
-	public SqlRemoteQueryDebuggerClient(String ip, int port) throws Exception {
+	public RemoteDebuggerClient(String ip, int port) throws Exception {
 		socket = new Socket(ip, port);
 		Thread thread = new Thread("SQL Remote Debugger Client on port " + port) {
 			@Override
diff --git a/jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/SqlRemoteQueryDebuggerServer.java b/jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/RemoteDebuggerServer.java
similarity index 95%
rename from jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/SqlRemoteQueryDebuggerServer.java
rename to jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/RemoteDebuggerServer.java
index d19e6b345b..72f65243ed 100644
--- a/jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/SqlRemoteQueryDebuggerServer.java
+++ b/jOOQ-sql-console/src/main/java/org/jooq/debug/console/remote/RemoteDebuggerServer.java
@@ -52,12 +52,12 @@ import org.jooq.debug.DebuggerResultSetData;
 /**
  * @author Christopher Deckers
  */
-public class SqlRemoteQueryDebuggerServer {
+public class RemoteDebuggerServer {
 
 	private final Object LOCK = new Object();
 	private ServerSocket serverSocket;
 
-	public SqlRemoteQueryDebuggerServer(final int port) {
+	public RemoteDebuggerServer(final int port) {
 		Thread serverThread = new Thread("SQL Remote Debugger Server on port " + port) {
 			@Override
 			public void run() {