diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorCodeParser.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorCodeParser.cs
index 84be0bc674..aa586e6b22 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorCodeParser.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorCodeParser.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc.Razor.Host;
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
 using Microsoft.AspNet.Razor.Tokenizer.Symbols;
 
 namespace Microsoft.AspNet.Mvc.Razor
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorParser.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorParser.cs
index 94a0faf16d..dd7ecf656b 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorParser.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorParser.cs
@@ -1,15 +1,14 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.Parser.TagHelpers;
 using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Text;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.Razor
@@ -45,7 +44,7 @@ namespace Microsoft.AspNet.Mvc.Razor
         /// <inheritdoc />
         protected override IEnumerable<TagHelperDescriptor> GetTagHelperDescriptors(
             [NotNull] Block documentRoot,
-            [NotNull] ParserErrorSink errorSink)
+            [NotNull] ErrorSink errorSink)
         {
             var visitor = new GlobalImportTagHelperDirectiveSpanVisitor(
                 TagHelperDescriptorResolver,
@@ -120,7 +119,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             public GlobalImportTagHelperDirectiveSpanVisitor(
                 ITagHelperDescriptorResolver descriptorResolver,
                 IEnumerable<TagHelperDirectiveDescriptor> globalImportDirectiveDescriptors,
-                ParserErrorSink errorSink)
+                ErrorSink errorSink)
                 : base(descriptorResolver, errorSink)
             {
                 _globalImportDirectiveDescriptors = globalImportDirectiveDescriptors;
@@ -128,7 +127,7 @@ namespace Microsoft.AspNet.Mvc.Razor
 
             protected override TagHelperDescriptorResolutionContext GetTagHelperDescriptorResolutionContext(
                 IEnumerable<TagHelperDirectiveDescriptor> descriptors,
-                ParserErrorSink errorSink)
+                ErrorSink errorSink)
             {
                 var directivesToImport = MergeDirectiveDescriptors(descriptors, _globalImportDirectiveDescriptors);
 
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationMessage.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationMessage.cs
index 2b26894776..789903bf00 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationMessage.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationMessage.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNet.Razor;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Runtime;
 
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorErrorExtensions.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorErrorExtensions.cs
index 0f8c94da8f..abbd19b039 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorErrorExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorErrorExtensions.cs
@@ -2,8 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNet.Razor;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs
index 37c82d949f..5e33869980 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs
@@ -7,7 +7,6 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Security.Claims;
-using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.Rendering;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs
index c4a6bcf5af..d00d85f9f6 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs
@@ -3,10 +3,10 @@
 
 using System;
 using Microsoft.AspNet.Mvc.Razor.Directives;
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Generator.Compiler.CSharp;
-using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Xunit;
 
@@ -153,7 +153,7 @@ MyType1
                                          "MyNamespace",
                                          string.Empty,
                                          shouldGenerateLinePragmas: true),
-                new ParserErrorSink());
+                new ErrorSink());
         }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs
index 566624941e..572c85a2c1 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs
@@ -3,10 +3,10 @@
 
 using System;
 using Microsoft.AspNet.Mvc.Razor.Directives;
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Generator.Compiler.CSharp;
-using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Xunit;
 
@@ -109,7 +109,7 @@ Environment.NewLine +
                                          "MyNamespace",
                                          string.Empty,
                                          shouldGenerateLinePragmas: true),
-                new ParserErrorSink());
+                new ErrorSink());
         }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcCSharpRazorCodeParserTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcCSharpRazorCodeParserTest.cs
index 7697e2cc56..5a61d6adbe 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcCSharpRazorCodeParserTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcCSharpRazorCodeParserTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Parser;
@@ -491,7 +492,7 @@ namespace Microsoft.AspNet.Mvc.Razor
                 codeParser,
                 markupParser,
                 markupParser,
-                new ParserErrorSink());
+                new ErrorSink());
             codeParser.Context = context;
             markupParser.Context = context;
             markupParser.ParseDocument();
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
index 41da3bd244..7cde79870f 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
@@ -11,7 +11,6 @@ using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Generator.Compiler.CSharp;
 using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Text;
 using Microsoft.Framework.Internal;
 using Xunit;
 
@@ -69,7 +68,7 @@ namespace Microsoft.AspNet.Mvc.Razor
                     host.DefaultNamespace,
                     rootedFilePath,
                     shouldGenerateLinePragmas: true),
-                new ParserErrorSink());
+                new ErrorSink());
             var codeBuilder = new CSharpCodeBuilder(codeBuilderContext);
             host.ChunkInheritanceUtility = chunkInheritanceUtility;
 
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs
index 3abbe53a72..19e76f1aa1 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Text;
 using Moq;
 using Xunit;
 
@@ -160,7 +160,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             var parser = new TestableMvcRazorParser(baseParser, codeTrees, defaultInheritedChunks: new Chunk[0]);
 
             // Act
-            parser.GetTagHelperDescriptorsPublic(block, errorSink: new ParserErrorSink()).ToArray();
+            parser.GetTagHelperDescriptorsPublic(block, errorSink: new ErrorSink()).ToArray();
 
             // Assert
             Assert.NotNull(descriptors);
@@ -203,7 +203,7 @@ namespace Microsoft.AspNet.Mvc.Razor
 
             public IEnumerable<TagHelperDescriptor> GetTagHelperDescriptorsPublic(
                 Block documentRoot,
-                ParserErrorSink errorSink)
+                ErrorSink errorSink)
             {
                 return GetTagHelperDescriptors(documentRoot, errorSink);
             }
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs
index 372c400d38..9d97b236af 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler.CSharp;
-using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.TagHelpers;
 using Xunit;
 
@@ -32,7 +32,7 @@ namespace Microsoft.AspNet.Mvc.Razor
                                                             rootNamespace: string.Empty,
                                                             sourceFile: string.Empty,
                                                             shouldGenerateLinePragmas: true);
-            var errorSink = new ParserErrorSink();
+            var errorSink = new ErrorSink();
             var context = new CodeBuilderContext(generatorContext, errorSink);
 
             // Act
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/RawTextSymbol.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/RawTextSymbol.cs
index 04cd180354..a503d6a330 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/RawTextSymbol.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/RawTextSymbol.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.Text;
 using Microsoft.AspNet.Razor.Tokenizer.Symbols;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanConstructor.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanConstructor.cs
index 12e05f455c..0f3c9c014a 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanConstructor.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanConstructor.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Editor;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
 using Microsoft.AspNet.Razor.Tokenizer.Symbols;
 
 namespace Microsoft.AspNet.Mvc.Razor
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanFactory.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanFactory.cs
index 019a1c9d24..30de25a40d 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanFactory.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanFactory.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.Text;
 using Microsoft.AspNet.Razor.Tokenizer;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanFactoryExtensions.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanFactoryExtensions.cs
index 3214b3871c..81a242a65c 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanFactoryExtensions.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory/SpanFactoryExtensions.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
index 2015c9e160..002eadb26a 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Generator.Compiler;
-using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.TagHelpers;
 using Moq;
@@ -50,7 +49,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
         public void Compile_ReturnsFailedResultIfParseFails()
         {
             // Arrange
-            var errorSink = new ParserErrorSink();
+            var errorSink = new ErrorSink();
             errorSink.OnError(new RazorError("some message", 1, 1, 1, 1));
             var generatorResult = new GeneratorResults(
                     new Block(new BlockBuilder { Type = BlockType.Comment }),
@@ -89,7 +88,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
             var generatorResult = new GeneratorResults(
                     new Block(new BlockBuilder { Type = BlockType.Comment }),
                     Enumerable.Empty<TagHelperDescriptor>(),
-                    new ParserErrorSink(),
+                    new ErrorSink(),
                     new CodeBuilderResult(code, new LineMapping[0]),
                     new CodeTree());
             var host = new Mock<IMvcRazorHost>();
@@ -121,7 +120,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
             return new GeneratorResults(
                     new Block(new BlockBuilder { Type = BlockType.Comment }),
                     Enumerable.Empty<TagHelperDescriptor>(),
-                    new ParserErrorSink(),
+                    new ErrorSink(),
                     new CodeBuilderResult("", new LineMapping[0]),
                     new CodeTree());
         }
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/MvcRazorCodeParserTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/MvcRazorCodeParserTest.cs
index f33fcfabe7..014a27ec30 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/MvcRazorCodeParserTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/MvcRazorCodeParserTest.cs
@@ -269,7 +269,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Host.Test
                 codeParser,
                 markupParser,
                 markupParser,
-                new ParserErrorSink());
+                new ErrorSink());
             codeParser.Context = context;
             markupParser.Context = context;
             markupParser.ParseDocument();
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Precompilation/RazorErrorExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Precompilation/RazorErrorExtensionsTest.cs
index ed0f61f051..2f444d0059 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/Precompilation/RazorErrorExtensionsTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Precompilation/RazorErrorExtensionsTest.cs
@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNet.Razor;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.Razor.Precompilation
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/SpanFactory.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/SpanFactory.cs
index d8ca9e59b1..809b5555ba 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/SpanFactory.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/SpanFactory.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.Editor;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;