diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs
index 77d61566..c488b998 100644
--- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs
+++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.6 (2005-12-22): "Expressions/Expression.g" -> "ExpressionLexer.cs"$
+// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$
 
 namespace Spring.Expressions.Parser
 {
@@ -126,18 +126,18 @@ namespace Spring.Expressions.Parser
 			caseSensitiveLiterals = true;
 			setCaseSensitive(true);
 			literals = new Hashtable(100, (float) 0.4, null, Comparer.Default);
-			literals.Add("false", 6);
 			literals.Add("true", 7);
 			literals.Add("and", 8);
+			literals.Add("matches", 15);
 			literals.Add("in", 11);
 			literals.Add("xor", 10);
 			literals.Add("null", 16);
-			literals.Add("matches", 15);
-			literals.Add("or", 9);
 			literals.Add("between", 13);
+			literals.Add("or", 9);
 			literals.Add("is", 12);
 			literals.Add("like", 14);
 			literals.Add("new", 49);
+			literals.Add("false", 6);
 		}
 		
 		override public IToken nextToken()			//throws TokenStreamException
diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs
index 68dc0f1f..29d44bd3 100644
--- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs
+++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.6 (2005-12-22): "Expressions/Expression.g" -> "ExpressionParser.cs"$
+// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionParser.cs"$
 
 namespace Spring.Expressions.Parser
 {
diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs
index db21e18b..7d3fb74d 100644
--- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs
+++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.6 (2005-12-22): "Expressions/Expression.g" -> "ExpressionLexer.cs"$
+// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$
 
 namespace Spring.Expressions.Parser
 {
diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt
index 55f23d35..bd2a5021 100644
--- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt
+++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.6 (2005-12-22): Expressions/Expression.g -> ExpressionParserTokenTypes.txt$
+// $ANTLR 2.7.6 (2005-12-22): Expression.g -> ExpressionParserTokenTypes.txt$
 ExpressionParser    // output token vocab name
 EXPR=4
 OPERAND=5