diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
index 61f52fa86..66ac0bc41 100644
--- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
+++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
@@ -137,7 +137,7 @@
     <Compile Include="CodeGeneration\Commands\CodeGenerationCommandsTests.cs" />
     <Compile Include="SimpleScriptingTests\ExpressionEvaluatorTests.cs" />
     <Compile Include="SimpleScriptingTests\ExpressionParserTests.cs" />
-    <Compile Include="SimpleScriptingTests\ExpressionLexerTests.cs" />
+    <Compile Include="SimpleScriptingTests\ExpressionTokenizerTests.cs" />
     <Compile Include="SimpleScriptingTests\SimpleScriptingTests.cs" />
     <Compile Include="DatabaseEnabledTestsBase.cs" />
     <Compile Include="Media\Extensions\LongExtensionsTests.cs" />
diff --git a/src/Orchard.Tests.Modules/SimpleScriptingTests/ExpressionLexerTests.cs b/src/Orchard.Tests.Modules/SimpleScriptingTests/ExpressionTokenizerTests.cs
similarity index 96%
rename from src/Orchard.Tests.Modules/SimpleScriptingTests/ExpressionLexerTests.cs
rename to src/Orchard.Tests.Modules/SimpleScriptingTests/ExpressionTokenizerTests.cs
index 350305bc4..5ed3c800a 100644
--- a/src/Orchard.Tests.Modules/SimpleScriptingTests/ExpressionLexerTests.cs
+++ b/src/Orchard.Tests.Modules/SimpleScriptingTests/ExpressionTokenizerTests.cs
@@ -3,7 +3,7 @@ using Orchard.Widgets.SimpleScripting;
 
 namespace Orchard.Tests.Modules.SimpleScriptingTests {
     [TestFixture]
-    public class ExpressionLexerTests {
+    public class ExpressionTokenizerTests {
 
         [Test]
         public void LexerShouldProcessSingleQuotedStringLiteral() {