diff --git a/soql/src/main/java/li/strolch/soql/core/QueryProcessor.java b/soql/src/main/java/li/strolch/soql/core/QueryProcessor.java
index 45c6aaed9..244efe45b 100644
--- a/soql/src/main/java/li/strolch/soql/core/QueryProcessor.java
+++ b/soql/src/main/java/li/strolch/soql/core/QueryProcessor.java
@@ -155,7 +155,7 @@ public class QueryProcessor {
 	private CompiledStatement compile(ParseTree tree) {
 
 		ParseTreeWalker walker = new ParseTreeWalker();
-		SOQLListener listener = new SOQLListener();
+		StrolchSOQLListener listener = new StrolchSOQLListener();
 		walker.walk(listener, tree);
 
 		CompiledStatement soqlStatement = new CompiledStatement();
diff --git a/soql/src/main/java/li/strolch/soql/core/SOQLListener.java b/soql/src/main/java/li/strolch/soql/core/StrolchSOQLListener.java
similarity index 99%
rename from soql/src/main/java/li/strolch/soql/core/SOQLListener.java
rename to soql/src/main/java/li/strolch/soql/core/StrolchSOQLListener.java
index 4e3594d42..fcee2bb63 100644
--- a/soql/src/main/java/li/strolch/soql/core/SOQLListener.java
+++ b/soql/src/main/java/li/strolch/soql/core/StrolchSOQLListener.java
@@ -10,7 +10,7 @@ import li.strolch.soql.core.expresssion.*;
 /**
  * @author msmock
  */
-public class SOQLListener extends SOQLBaseListener {
+public class StrolchSOQLListener extends SOQLBaseListener {
 
 	// the map of entities declared in the FROM clause with their nicknames as keys
 	private final Map<String, String> entities = new HashMap<>();
diff --git a/soql/src/test/java/li/strolch/soql/core/BaseTest.java b/soql/src/test/java/li/strolch/soql/core/BaseTest.java
index d62c98336..229e5c05f 100644
--- a/soql/src/test/java/li/strolch/soql/core/BaseTest.java
+++ b/soql/src/test/java/li/strolch/soql/core/BaseTest.java
@@ -49,7 +49,7 @@ public abstract class BaseTest {
 	CompiledStatement compile(final ParseTree tree) {
 
 		final ParseTreeWalker walker = new ParseTreeWalker();
-		final SOQLListener listener = new SOQLListener();
+		final StrolchSOQLListener listener = new StrolchSOQLListener();
 		walker.walk(listener, tree);
 
 		final CompiledStatement soqlStatement = new CompiledStatement();