diff --git a/tool/src/org/antlr/v4/tool/interp/InterpreterRuleContext.java b/runtime/Java/src/org/antlr/v4/runtime/InterpreterRuleContext.java
similarity index 96%
rename from tool/src/org/antlr/v4/tool/interp/InterpreterRuleContext.java
rename to runtime/Java/src/org/antlr/v4/runtime/InterpreterRuleContext.java
index e804af126..231f4797c 100644
--- a/tool/src/org/antlr/v4/tool/interp/InterpreterRuleContext.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/InterpreterRuleContext.java
@@ -27,9 +27,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.antlr.v4.tool.interp;
+package org.antlr.v4.runtime;
 
-import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.misc.Nullable;
 
 /** This object is used by the ParserInterpreter and is the same as a regular
diff --git a/tool/src/org/antlr/v4/tool/interp/ParserInterpreter.java b/tool/src/org/antlr/v4/tool/interp/ParserInterpreter.java
index 082c7b5e6..c0d1bbc8e 100644
--- a/tool/src/org/antlr/v4/tool/interp/ParserInterpreter.java
+++ b/tool/src/org/antlr/v4/tool/interp/ParserInterpreter.java
@@ -30,10 +30,11 @@
 
 package org.antlr.v4.tool.interp;
 
-import org.antlr.runtime.Token;
 import org.antlr.v4.runtime.FailedPredicateException;
+import org.antlr.v4.runtime.InterpreterRuleContext;
 import org.antlr.v4.runtime.Parser;
 import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.TokenStream;
 import org.antlr.v4.runtime.atn.ATN;
 import org.antlr.v4.runtime.atn.ATNState;
@@ -213,7 +214,7 @@ public class ParserInterpreter extends Parser {
 		case Transition.RANGE:
 		case Transition.SET:
 		case Transition.NOT_SET:
-			if (!transition.matches(_input.LA(1), Token.MIN_TOKEN_TYPE, 65535)) {
+			if (!transition.matches(_input.LA(1), Token.MIN_USER_TOKEN_TYPE, 65535)) {
 				_errHandler.recoverInline(this);
 			}
 			matchWildcard();