diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorParser.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorParser.cs
index 5b3784de1c..ef03fd653c 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorParser.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorParser.cs
@@ -89,7 +89,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             return descriptors;
         }
 
-        private class ViewStartAddRemoveTagHelperVisitor : AddOrRemoveTagHelperSpanVisitor
+        private class ViewStartAddRemoveTagHelperVisitor : TagHelperDirectiveSpanVisitor
         {
             private readonly IEnumerable<TagHelperDirectiveDescriptor> _viewStartDirectiveDescriptors;
 
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs
index b046cb2b7c..cc3213a446 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs
@@ -63,10 +63,10 @@ namespace Microsoft.AspNet.Mvc.Razor
             Assert.NotNull(descriptors);
             Assert.Equal(2, descriptors.Count);
 
-            Assert.Equal("Remove Tag Helper", descriptors[0].LookupText);
+            Assert.Equal("Remove Tag Helper", descriptors[0].DirectiveText);
             Assert.Equal(SourceLocation.Undefined, descriptors[0].Location);
 
-            Assert.Equal("Add Tag Helper", descriptors[1].LookupText);
+            Assert.Equal("Add Tag Helper", descriptors[1].DirectiveText);
             Assert.Equal(TagHelperDirectiveType.AddTagHelper, descriptors[1].DirectiveType);
             Assert.Equal(SourceLocation.Undefined, descriptors[1].Location);
         }