diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpBlockTest.cs
index f530020333..6e7f36da26 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpBlockTest.cs
@@ -9,20 +9,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class CSharpBlockTest : CsHtmlCodeParserTestBase
     {
         [Fact]
-        public void ParseBlock_NestedCodeBlockWithCSharpAt()
+        public void NestedCodeBlockWithCSharpAt()
         {
             ParseBlockTest("{ if (true) { var val = @x; if (val != 3) { } } }");
         }
 
         [Fact]
-        public void ParseBlock_NestedCodeBlockWithMarkupSetsDotAsMarkup()
+        public void NestedCodeBlockWithMarkupSetsDotAsMarkup()
         {
             ParseBlockTest("if (true) { @if(false) { <div>@something.</div> } }");
         }
 
         [Fact]
-        public void BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideSingleLineComments()
+        public void BalancingBracketsIgnoresStringLiteralCharactersAndBrackets()
         {
+            // BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideSingleLineComments
             SingleSpanBlockTest(@"if(foo) {
     // bar } "" baz '
     zoop();
@@ -46,102 +47,107 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForKeyword()
+        public void SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword()
         {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForKeyword
             SingleSpanBlockTest(
                 "for(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); }");
         }
 
         [Fact]
-        public void ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForeachKeyword()
+        public void SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword()
         {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForeachKeyword
             SingleSpanBlockTest(
                 "foreach(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); }");
         }
 
         [Fact]
-        public void ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsWhileKeyword()
+        public void SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword()
         {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsWhileKeyword
             SingleSpanBlockTest(
                 "while(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); }");
         }
 
         [Fact]
-        public void ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsUsingKeywordFollowedByParen()
+        public void SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen()
         {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsUsingKeywordFollowedByParen
             SingleSpanBlockTest(
                 "using(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsUsingsNestedWithinOtherBlocks()
+        public void SupportsUsingsNestedWithinOtherBlocks()
         {
             SingleSpanBlockTest(
                 "if(foo) { using(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); } }");
         }
 
         [Fact]
-        public void ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches()
+        public void SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches()
         {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches
             SingleSpanBlockTest(
                 "if(int i = 0; i < 10; new Foo { Bar = \"baz\" }) { Debug.WriteLine(@\"foo } bar\"); }");
         }
 
         [Fact]
-        public void ParseBlockAllowsEmptyBlockStatement()
+        public void AllowsEmptyBlockStatement()
         {
             SingleSpanBlockTest("if(false) { }");
         }
 
         [Fact]
-        public void ParseBlockTerminatesParenBalancingAtEOF()
+        public void TerminatesParenBalancingAtEOF()
         {
             ImplicitExpressionTest("Html.En(code()");
         }
 
         [Fact]
-        public void ParseBlockSupportsBlockCommentBetweenIfAndElseClause()
+        public void SupportsBlockCommentBetweenIfAndElseClause()
         {
             SingleSpanBlockTest(
                 "if(foo) { bar(); } /* Foo */ /* Bar */ else { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsRazorCommentBetweenIfAndElseClause()
+        public void SupportsRazorCommentBetweenIfAndElseClause()
         {
             RunRazorCommentBetweenClausesTest(
                 "if(foo) { bar(); } ", " else { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsBlockCommentBetweenElseIfAndElseClause()
+        public void SupportsBlockCommentBetweenElseIfAndElseClause()
         {
             SingleSpanBlockTest(
                 "if(foo) { bar(); } else if(bar) { baz(); } /* Foo */ /* Bar */ else { biz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsRazorCommentBetweenElseIfAndElseClause()
+        public void SupportsRazorCommentBetweenElseIfAndElseClause()
         {
             RunRazorCommentBetweenClausesTest(
                 "if(foo) { bar(); } else if(bar) { baz(); } ", " else { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsBlockCommentBetweenIfAndElseIfClause()
+        public void SupportsBlockCommentBetweenIfAndElseIfClause()
         {
             SingleSpanBlockTest(
                 "if(foo) { bar(); } /* Foo */ /* Bar */ else if(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsRazorCommentBetweenIfAndElseIfClause()
+        public void SupportsRazorCommentBetweenIfAndElseIfClause()
         {
             RunRazorCommentBetweenClausesTest("if(foo) { bar(); } ", " else if(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsLineCommentBetweenIfAndElseClause()
+        public void SupportsLineCommentBetweenIfAndElseClause()
         {
             SingleSpanBlockTest(@"if(foo) { bar(); }
 // Foo
@@ -150,7 +156,7 @@ else { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsLineCommentBetweenElseIfAndElseClause()
+        public void SupportsLineCommentBetweenElseIfAndElseClause()
         {
             SingleSpanBlockTest(@"if(foo) { bar(); } else if(bar) { baz(); }
 // Foo
@@ -159,7 +165,7 @@ else { biz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsLineCommentBetweenIfAndElseIfClause()
+        public void SupportsLineCommentBetweenIfAndElseIfClause()
         {
             SingleSpanBlockTest(@"if(foo) { bar(); }
 // Foo
@@ -168,7 +174,7 @@ else if(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockParsesElseIfBranchesOfIfStatement()
+        public void ParsesElseIfBranchesOfIfStatement()
         {
             const string ifStatement = @"if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
     Debug.WriteLine(@""foo } bar"");
@@ -182,7 +188,7 @@ else if(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockParsesMultipleElseIfBranchesOfIfStatement()
+        public void ParsesMultipleElseIfBranchesOfIfStatement()
         {
             const string ifStatement = @"if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
     Debug.WriteLine(@""foo } bar"");
@@ -195,7 +201,7 @@ else if(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch()
+        public void ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch()
         {
             const string ifStatement = @"if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
     Debug.WriteLine(@""foo } bar"");
@@ -210,7 +216,7 @@ else if(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockStopsParsingCodeAfterElseBranch()
+        public void StopsParsingCodeAfterElseBranch()
         {
             const string ifStatement = @"if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
     Debug.WriteLine(@""foo } bar"");
@@ -225,7 +231,7 @@ else if(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockStopsParsingIfIfStatementNotFollowedByElse()
+        public void StopsParsingIfIfStatementNotFollowedByElse()
         {
             const string document = @"if(int i = 0; i < 10; new Foo { Bar = ""baz"" }) {
     Debug.WriteLine(@""foo } bar"");
@@ -235,7 +241,7 @@ else if(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockAcceptsElseIfWithNoCondition()
+        public void AcceptsElseIfWithNoCondition()
         {
             // We don't want to be a full C# parser - If the else if is missing it's condition, the C# compiler
             // can handle that, we have all the info we need to keep parsing
@@ -249,46 +255,46 @@ else if(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockCorrectlyParsesDoWhileBlock()
+        public void CorrectlyParsesDoWhileBlock()
         {
             SingleSpanBlockTest(
                 "do { var foo = bar; } while(foo != bar);");
         }
 
         [Fact]
-        public void ParseBlockCorrectlyParsesDoWhileBlockMissingSemicolon()
+        public void CorrectlyParsesDoWhileBlockMissingSemicolon()
         {
             SingleSpanBlockTest("do { var foo = bar; } while(foo != bar)");
         }
 
         [Fact]
-        public void ParseBlockCorrectlyParsesDoWhileBlockMissingWhileCondition()
+        public void CorrectlyParsesDoWhileBlockMissingWhileCondition()
         {
             SingleSpanBlockTest("do { var foo = bar; } while");
         }
 
         [Fact]
-        public void ParseBlockCorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon()
+        public void CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon()
         {
             SingleSpanBlockTest(
                 "do { var foo = bar; } while;");
         }
 
         [Fact]
-        public void ParseBlockCorrectlyParsesDoWhileBlockMissingWhileClauseEntirely()
+        public void CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely()
         {
             SingleSpanBlockTest("do { var foo = bar; } narf;");
         }
 
         [Fact]
-        public void ParseBlockSupportsBlockCommentBetweenDoAndWhileClause()
+        public void SupportsBlockCommentBetweenDoAndWhileClause()
         {
             SingleSpanBlockTest(
                 "do { var foo = bar; } /* Foo */ /* Bar */ while(true);");
         }
 
         [Fact]
-        public void ParseBlockSupportsLineCommentBetweenDoAndWhileClause()
+        public void SupportsLineCommentBetweenDoAndWhileClause()
         {
             SingleSpanBlockTest(@"do { var foo = bar; }
 // Foo
@@ -297,21 +303,22 @@ while(true);");
         }
 
         [Fact]
-        public void ParseBlockSupportsRazorCommentBetweenDoAndWhileClause()
+        public void SupportsRazorCommentBetweenDoAndWhileClause()
         {
             RunRazorCommentBetweenClausesTest(
                 "do { var foo = bar; } ", " while(true);");
         }
 
         [Fact]
-        public void ParseBlockCorrectlyParsesMarkupInDoWhileBlock()
+        public void CorrectlyParsesMarkupInDoWhileBlock()
         {
             ParseBlockTest("@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);");
         }
 
         [Fact]
-        public void ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsSwitchKeyword()
+        public void SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword()
         {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsSwitchKeyword
             SingleSpanBlockTest(@"switch(foo) {
     case 0:
         break;
@@ -327,119 +334,120 @@ while(true);");
         }
 
         [Fact]
-        public void ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsLockKeyword()
+        public void ThenBalancesBracesIfFirstIdentifierIsLockKeyword()
         {
+            // ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsLockKeyword
             SingleSpanBlockTest(
                 "lock(foo) { Debug.WriteLine(@\"foo } bar\"); }");
         }
 
         [Fact]
-        public void ParseBlockHasErrorsIfNamespaceImportMissingSemicolon()
+        public void HasErrorsIfNamespaceImportMissingSemicolon()
         {
             ParseBlockTest(
                 "using Foo.Bar.Baz");
         }
 
         [Fact]
-        public void ParseBlockHasErrorsIfNamespaceAliasMissingSemicolon()
+        public void HasErrorsIfNamespaceAliasMissingSemicolon()
         {
             ParseBlockTest(
                 "using Foo.Bar.Baz = FooBarBaz");
         }
 
         [Fact]
-        public void ParseBlockParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat()
+        public void ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat()
         {
             ParseBlockTest(
                 "using Foo.Bar.Baz;");
         }
 
         [Fact]
-        public void ParseBlockDoesntCaptureWhitespaceAfterUsing()
+        public void DoesntCaptureWhitespaceAfterUsing()
         {
             ParseBlockTest("using Foo   ");
         }
 
         [Fact]
-        public void ParseBlockCapturesNewlineAfterUsing()
+        public void CapturesNewlineAfterUsing()
         {
             ParseBlockTest($"using Foo{Environment.NewLine}");
         }
 
         [Fact]
-        public void ParseBlockParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat()
+        public void ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat()
         {
             ParseBlockTest(
                 "using FooBarBaz = FooBarBaz;");
         }
 
         [Fact]
-        public void ParseBlockTerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock()
+        public void TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock()
         {
             SingleSpanBlockTest("using                    ");
         }
 
         [Fact]
-        public void ParseBlockTerminatesSingleLineCommentAtEndOfFile()
+        public void TerminatesSingleLineCommentAtEndOfFile()
         {
             const string document = "foreach(var f in Foo) { // foo bar baz";
             SingleSpanBlockTest(document);
         }
 
         [Fact]
-        public void ParseBlockTerminatesBlockCommentAtEndOfFile()
+        public void TerminatesBlockCommentAtEndOfFile()
         {
             const string document = "foreach(var f in Foo) { /* foo bar baz";
             SingleSpanBlockTest(document);
         }
 
         [Fact]
-        public void ParseBlockTerminatesSingleSlashAtEndOfFile()
+        public void TerminatesSingleSlashAtEndOfFile()
         {
             const string document = "foreach(var f in Foo) { / foo bar baz";
             SingleSpanBlockTest(document);
         }
 
         [Fact]
-        public void ParseBlockSupportsBlockCommentBetweenTryAndFinallyClause()
+        public void SupportsBlockCommentBetweenTryAndFinallyClause()
         {
             SingleSpanBlockTest("try { bar(); } /* Foo */ /* Bar */ finally { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsRazorCommentBetweenTryAndFinallyClause()
+        public void SupportsRazorCommentBetweenTryAndFinallyClause()
         {
             RunRazorCommentBetweenClausesTest("try { bar(); } ", " finally { biz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsBlockCommentBetweenCatchAndFinallyClause()
+        public void SupportsBlockCommentBetweenCatchAndFinallyClause()
         {
             SingleSpanBlockTest(
                 "try { bar(); } catch(bar) { baz(); } /* Foo */ /* Bar */ finally { biz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsRazorCommentBetweenCatchAndFinallyClause()
+        public void SupportsRazorCommentBetweenCatchAndFinallyClause()
         {
             RunRazorCommentBetweenClausesTest(
                 "try { bar(); } catch(bar) { baz(); } ", " finally { biz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsBlockCommentBetweenTryAndCatchClause()
+        public void SupportsBlockCommentBetweenTryAndCatchClause()
         {
             SingleSpanBlockTest("try { bar(); } /* Foo */ /* Bar */ catch(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsRazorCommentBetweenTryAndCatchClause()
+        public void SupportsRazorCommentBetweenTryAndCatchClause()
         {
             RunRazorCommentBetweenClausesTest("try { bar(); }", " catch(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsLineCommentBetweenTryAndFinallyClause()
+        public void SupportsLineCommentBetweenTryAndFinallyClause()
         {
             SingleSpanBlockTest(@"try { bar(); }
 // Foo
@@ -448,7 +456,7 @@ finally { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsLineCommentBetweenCatchAndFinallyClause()
+        public void SupportsLineCommentBetweenCatchAndFinallyClause()
         {
             SingleSpanBlockTest(@"try { bar(); } catch(bar) { baz(); }
 // Foo
@@ -457,7 +465,7 @@ finally { biz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsLineCommentBetweenTryAndCatchClause()
+        public void SupportsLineCommentBetweenTryAndCatchClause()
         {
             SingleSpanBlockTest(@"try { bar(); }
 // Foo
@@ -466,13 +474,13 @@ catch(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsTryStatementWithNoAdditionalClauses()
+        public void SupportsTryStatementWithNoAdditionalClauses()
         {
             SingleSpanBlockTest("try { var foo = new { } }");
         }
 
         [Fact]
-        public void ParseBlockSupportsMarkupWithinTryClause()
+        public void SupportsMarkupWithinTryClause()
         {
             RunSimpleWrappedMarkupTest(
                 prefix: "try {",
@@ -481,13 +489,13 @@ catch(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsTryStatementWithOneCatchClause()
+        public void SupportsTryStatementWithOneCatchClause()
         {
             SingleSpanBlockTest("try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }");
         }
 
         [Fact]
-        public void ParseBlockSupportsMarkupWithinCatchClause()
+        public void SupportsMarkupWithinCatchClause()
         {
             RunSimpleWrappedMarkupTest(
                 prefix: "try { var foo = new { } } catch(Foo Bar Baz) {",
@@ -496,7 +504,7 @@ catch(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsTryStatementWithMultipleCatchClause()
+        public void SupportsTryStatementWithMultipleCatchClause()
         {
             SingleSpanBlockTest(
                 "try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) " +
@@ -504,13 +512,13 @@ catch(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsExceptionLessCatchClauses()
+        public void SupportsExceptionLessCatchClauses()
         {
             SingleSpanBlockTest("try { var foo = new { } } catch { var foo = new { } }");
         }
 
         [Fact]
-        public void ParseBlockSupportsMarkupWithinAdditionalCatchClauses()
+        public void SupportsMarkupWithinAdditionalCatchClauses()
         {
             RunSimpleWrappedMarkupTest(
                 prefix: "try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) " +
@@ -520,13 +528,13 @@ catch(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockSupportsTryStatementWithFinallyClause()
+        public void SupportsTryStatementWithFinallyClause()
         {
             SingleSpanBlockTest("try { var foo = new { } } finally { var foo = new { } }");
         }
 
         [Fact]
-        public void ParseBlockSupportsMarkupWithinFinallyClause()
+        public void SupportsMarkupWithinFinallyClause()
         {
             RunSimpleWrappedMarkupTest(
                 prefix: "try { var foo = new { } } finally {",
@@ -535,57 +543,58 @@ catch(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlockStopsParsingCatchClausesAfterFinallyBlock()
+        public void StopsParsingCatchClausesAfterFinallyBlock()
         {
             var content = "try { var foo = new { } } finally { var foo = new { } }";
             SingleSpanBlockTest(content + " catch(Foo Bar Baz) { }");
         }
 
         [Fact]
-        public void ParseBlockDoesNotAllowMultipleFinallyBlocks()
+        public void DoesNotAllowMultipleFinallyBlocks()
         {
             var content = "try { var foo = new { } } finally { var foo = new { } }";
             SingleSpanBlockTest(content + " finally { }");
         }
 
         [Fact]
-        public void ParseBlockAcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode()
+        public void AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode()
         {
             // Arrange
             ParseBlockTest(@"if(foo) { @foo. }");
         }
 
         [Fact]
-        public void ParseBlockParsesExpressionOnSwitchCharacterFollowedByOpenParen()
+        public void ParsesExpressionOnSwitchCharacterFollowedByOpenParen()
         {
             // Arrange
             ParseBlockTest(@"if(foo) { @(foo + bar) }");
         }
 
         [Fact]
-        public void ParseBlockParsesExpressionOnSwitchCharacterFollowedByIdentifierStart()
+        public void ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart()
         {
             // Arrange
             ParseBlockTest(@"if(foo) { @foo[4].bar() }");
         }
 
         [Fact]
-        public void ParseBlockTreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart()
+        public void TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart()
         {
             // Arrange
             ParseBlockTest(@"if(foo) { @@class.Foo() }");
         }
 
         [Fact]
-        public void ParseBlockTreatsAtSignsAfterFirstPairAsPartOfCSharpStatement()
+        public void TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement()
         {
             // Arrange
             ParseBlockTest(@"if(foo) { @@@@class.Foo() }");
         }
 
         [Fact]
-        public void ParseBlockDoesNotParseMarkupStatementOrExpressionOnSwitchCharacterNotFollowedByOpenAngleOrColon()
+        public void DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon()
         {
+            // ParseBlockDoesNotParseMarkupStatementOrExpressionOnSwitchCharacterNotFollowedByOpenAngleOrColon
             // Arrange
             ParseBlockTest("if(foo) { @\"Foo\".ToString(); }");
         }
@@ -607,62 +616,62 @@ catch(bar) { baz(); }");
         }
 
         [Fact]
-        public void ParseBlock_WithDoubleTransitionInAttributeValue_DoesNotThrow()
+        public void WithDoubleTransitionInAttributeValue_DoesNotThrow()
         {
             var input = "{<span foo='@@' />}";
             ParseBlockTest(input);
         }
 
         [Fact]
-        public void ParseBlock_WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow()
+        public void WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow()
         {
             var input = "{<span foo='abc@@' />}";
             ParseBlockTest(input);
         }
 
         [Fact]
-        public void ParseBlock_WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow()
+        public void WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow()
         {
             var input = "{<span foo='@@def' />}";
             ParseBlockTest(input);
         }
 
         [Fact]
-        public void ParseBlock_WithDoubleTransitionBetweenAttributeValue_DoesNotThrow()
+        public void WithDoubleTransitionBetweenAttributeValue_DoesNotThrow()
         {
             var input = "{<span foo='abc @@ def' />}";
             ParseBlockTest(input);
         }
 
         [Fact]
-        public void ParseBlock_WithDoubleTransitionWithExpressionBlock_DoesNotThrow()
+        public void WithDoubleTransitionWithExpressionBlock_DoesNotThrow()
         {
             var input = "{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />}";
             ParseBlockTest(input);
         }
 
         [Fact]
-        public void ParseBlock_WithDoubleTransitionInEmail_DoesNotThrow()
+        public void WithDoubleTransitionInEmail_DoesNotThrow()
         {
             var input = "{<span foo='abc@def.com abc@@def.com @@' />}";
             ParseBlockTest(input);
         }
 
         [Fact]
-        public void ParseBlock_WithDoubleTransitionInRegex_DoesNotThrow()
+        public void WithDoubleTransitionInRegex_DoesNotThrow()
         {
             var input = @"{<span foo=""/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i"" />}";
             ParseBlockTest(input);
         }
 
         [Fact]
-        public void ParseBlock_WithDoubleTransition_EndOfFile_Throws()
+        public void WithDoubleTransition_EndOfFile_Throws()
         {
             ParseBlockTest("{<span foo='@@");
         }
 
         [Fact]
-        public void ParseBlock_WithUnexpectedTransitionsInAttributeValue_Throws()
+        public void WithUnexpectedTransitionsInAttributeValue_Throws()
         {
             ParseBlockTest("{<span foo='@ @' />}");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpErrorTest.cs
index d4a31728b4..a5cf944e98 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpErrorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpErrorTest.cs
@@ -10,79 +10,83 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class CSharpErrorTest : CsHtmlCodeParserTestBase
     {
         [Fact]
-        public void ParseBlockHandlesQuotesAfterTransition()
+        public void HandlesQuotesAfterTransition()
         {
             ParseBlockTest("@\"");
         }
 
         [Fact]
-        public void ParseBlockWithHelperDirectiveProducesError()
+        public void WithHelperDirectiveProducesError()
         {
             ParseBlockTest("@helper fooHelper { }");
         }
 
         [Fact]
-        public void ParseBlockWithNestedCodeBlockProducesError()
+        public void WithNestedCodeBlockProducesError()
         {
             ParseBlockTest("@if { @{} }");
         }
 
         [Fact]
-        public void ParseBlockCapturesWhitespaceToEndOfLineInInvalidUsingStatementAndTreatsAsFileCode()
+        public void CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode()
         {
+            // ParseBlockCapturesWhitespaceToEndOfLineInInvalidUsingStatementAndTreatsAsFileCode
             ParseBlockTest("using          " + Environment.NewLine
                          + Environment.NewLine);
         }
 
         [Fact]
-        public void ParseBlockMethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace()
+        public void MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace()
         {
             ParseBlockTest("{");
         }
 
         [Fact]
-        public void ParseBlockMethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty()
+        public void MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty()
         {
             ParseBlockTest("{}");
         }
 
         [Fact]
-        public void ParseBlockMethodProducesErrorIfNewlineFollowsTransition()
+        public void MethodProducesErrorIfNewlineFollowsTransition()
         {
             ParseBlockTest("@" + Environment.NewLine);
         }
 
         [Fact]
-        public void ParseBlockMethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpression()
+        public void MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr()
         {
+            // ParseBlockMethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpression
             ParseBlockTest("{" + Environment.NewLine
                          + "    @   {}" + Environment.NewLine
                          + "}");
         }
 
         [Fact]
-        public void ParseBlockMethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression()
+        public void MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression()
         {
             ParseBlockTest("{" + Environment.NewLine
                          + "    @");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace()
+        public void MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace()
         {
             ParseBlockTest("@!!!");
         }
 
         [Fact]
-        public void ParseBlockShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExpressionUnclosed()
+        public void ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed()
         {
+            // ParseBlockShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExpressionUnclosed
             ParseBlockTest("(foo bar" + Environment.NewLine
                          + "baz");
         }
 
         [Fact]
-        public void ParseBlockShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExpressionUnclosed()
+        public void ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed()
         {
+            // ParseBlockShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExpressionUnclosed
             ParseBlockTest("(foo bar" + Environment.NewLine
                          + "<html>" + Environment.NewLine
                          + "baz" + Environment.NewLine
@@ -90,7 +94,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockCorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed()
+        public void CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed()
         {
             ParseBlockTest("Href(" + Environment.NewLine
                          + "<h1>@Html.Foo(Bar);</h1>" + Environment.NewLine);
@@ -98,8 +102,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         [Fact]
         // Test for fix to Dev10 884975 - Incorrect Error Messaging
-        public void ParseBlockShouldReportErrorAndTerminateAtEOFIfParenInImplicitExpressionUnclosed()
+        public void ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed()
         {
+            // ParseBlockShouldReportErrorAndTerminateAtEOFIfParenInImplicitExpressionUnclosed
             ParseBlockTest("Foo(Bar(Baz)" + Environment.NewLine
                             + "Biz" + Environment.NewLine
                             + "Boz");
@@ -107,8 +112,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         [Fact]
         // Test for fix to Dev10 884975 - Incorrect Error Messaging
-        public void ParseBlockShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed()
+        public void ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed()
         {
+            // ParseBlockShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed
             ParseBlockTest("Foo(Bar(Baz)" + Environment.NewLine
                             + "Biz" + Environment.NewLine
                             + "<html>" + Environment.NewLine
@@ -118,8 +124,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         [Fact]
         // Test for fix to Dev10 884975 - Incorrect Error Messaging
-        public void ParseBlockShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed()
+        public void ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed()
         {
+            // ParseBlockShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed
             ParseBlockTest("Foo[Bar[Baz]" + Environment.NewLine
                          + "Biz" + Environment.NewLine
                          + "Boz");
@@ -127,8 +134,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         [Fact]
         // Test for fix to Dev10 884975 - Incorrect Error Messaging
-        public void ParseBlockShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExpressionUnclosed()
+        public void ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed()
         {
+            // ParseBlockShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExpressionUnclosed
             ParseBlockTest("Foo[Bar[Baz]" + Environment.NewLine
                          + "Biz" + Environment.NewLine
                          + "<b>" + Environment.NewLine
@@ -138,13 +146,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         // Simple EOF handling errors:
         [Fact]
-        public void ParseBlockReportsErrorIfExplicitCodeBlockUnterminatedAtEOF()
+        public void ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF()
         {
             ParseBlockTest("{ var foo = bar; if(foo != null) { bar(); } ");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfClassBlockUnterminatedAtEOF()
+        public void ReportsErrorIfClassBlockUnterminatedAtEOF()
         {
             ParseBlockTest(
                 "functions { var foo = bar; if(foo != null) { bar(); } ",
@@ -152,138 +160,138 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfIfBlockUnterminatedAtEOF()
+        public void ReportsErrorIfIfBlockUnterminatedAtEOF()
         {
             RunUnterminatedSimpleKeywordBlock("if");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfElseBlockUnterminatedAtEOF()
+        public void ReportsErrorIfElseBlockUnterminatedAtEOF()
         {
             ParseBlockTest("if(foo) { baz(); } else { var foo = bar; if(foo != null) { bar(); } ");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfElseIfBlockUnterminatedAtEOF()
+        public void ReportsErrorIfElseIfBlockUnterminatedAtEOF()
         {
             ParseBlockTest("if(foo) { baz(); } else if { var foo = bar; if(foo != null) { bar(); } ");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfDoBlockUnterminatedAtEOF()
+        public void ReportsErrorIfDoBlockUnterminatedAtEOF()
         {
             ParseBlockTest("do { var foo = bar; if(foo != null) { bar(); } ");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfTryBlockUnterminatedAtEOF()
+        public void ReportsErrorIfTryBlockUnterminatedAtEOF()
         {
             ParseBlockTest("try { var foo = bar; if(foo != null) { bar(); } ");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfCatchBlockUnterminatedAtEOF()
+        public void ReportsErrorIfCatchBlockUnterminatedAtEOF()
         {
             ParseBlockTest("try { baz(); } catch(Foo) { var foo = bar; if(foo != null) { bar(); } ");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfFinallyBlockUnterminatedAtEOF()
+        public void ReportsErrorIfFinallyBlockUnterminatedAtEOF()
         {
             ParseBlockTest("try { baz(); } finally { var foo = bar; if(foo != null) { bar(); } ");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfForBlockUnterminatedAtEOF()
+        public void ReportsErrorIfForBlockUnterminatedAtEOF()
         {
             RunUnterminatedSimpleKeywordBlock("for");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfForeachBlockUnterminatedAtEOF()
+        public void ReportsErrorIfForeachBlockUnterminatedAtEOF()
         {
             RunUnterminatedSimpleKeywordBlock("foreach");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfWhileBlockUnterminatedAtEOF()
+        public void ReportsErrorIfWhileBlockUnterminatedAtEOF()
         {
             RunUnterminatedSimpleKeywordBlock("while");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfSwitchBlockUnterminatedAtEOF()
+        public void ReportsErrorIfSwitchBlockUnterminatedAtEOF()
         {
             RunUnterminatedSimpleKeywordBlock("switch");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfLockBlockUnterminatedAtEOF()
+        public void ReportsErrorIfLockBlockUnterminatedAtEOF()
         {
             RunUnterminatedSimpleKeywordBlock("lock");
         }
 
         [Fact]
-        public void ParseBlockReportsErrorIfUsingBlockUnterminatedAtEOF()
+        public void ReportsErrorIfUsingBlockUnterminatedAtEOF()
         {
             RunUnterminatedSimpleKeywordBlock("using");
         }
 
         [Fact]
-        public void ParseBlockRequiresControlFlowStatementsToHaveBraces()
+        public void RequiresControlFlowStatementsToHaveBraces()
         {
             ParseBlockTest("if(foo) <p>Bar</p> else if(bar) <p>Baz</p> else <p>Boz</p>");
         }
 
         [Fact]
-        public void ParseBlockIncludesUnexpectedCharacterInSingleStatementControlFlowStatementError()
+        public void IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError()
         {
             ParseBlockTest("if(foo)) { var bar = foo; }");
         }
 
         [Fact]
-        public void ParseBlockOutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart()
+        public void OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart()
         {
             ParseBlockTest("if(foo) { @<p>Bar</p> }");
         }
 
         [Fact]
-        public void ParseBlockTerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen()
+        public void TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen()
         {
             ParseBlockTest("if(foo bar" + Environment.NewLine
                          + "baz");
         }
 
         [Fact]
-        public void ParseBlockTerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen()
+        public void TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen()
         {
             ParseBlockTest("foreach(foo bar" + Environment.NewLine
                          + "baz");
         }
 
         [Fact]
-        public void ParseBlockTerminatesWhileClauseInDoStatementAtEOLWhenRecoveringFromMissingCloseParen()
+        public void TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen()
         {
             ParseBlockTest("do { } while(foo bar" + Environment.NewLine
                          + "baz");
         }
 
         [Fact]
-        public void ParseBlockTerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen()
+        public void TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen()
         {
             ParseBlockTest("using(foo bar" + Environment.NewLine
                          + "baz");
         }
 
         [Fact]
-        public void ParseBlockResumesIfStatementAfterOpenParen()
+        public void ResumesIfStatementAfterOpenParen()
         {
             ParseBlockTest("if(" + Environment.NewLine
                          + "else { <p>Foo</p> }");
         }
 
         [Fact]
-        public void ParseBlockTerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing()
+        public void TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing()
         {
             SingleSpanBlockTest("if(foo) {" + Environment.NewLine
                               + "    var p = \"foo bar baz" + Environment.NewLine
@@ -292,13 +300,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockTerminatesNormalStringAtEndOfFile()
+        public void TerminatesNormalStringAtEndOfFile()
         {
             SingleSpanBlockTest("if(foo) { var foo = \"blah blah blah blah blah");
         }
 
         [Fact]
-        public void ParseBlockTerminatesVerbatimStringAtEndOfFile()
+        public void TerminatesVerbatimStringAtEndOfFile()
         {
             SingleSpanBlockTest("if(foo) { var foo = @\"blah " + Environment.NewLine
                               + "blah; " + Environment.NewLine
@@ -308,7 +316,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockCorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement()
+        public void CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement()
         {
             ParseBlockTest("if(foo) {" + Environment.NewLine
                          + "    var foo = \"foo bar baz" + Environment.NewLine
@@ -317,13 +325,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockCorrectlyParsesAtSignInDelimitedBlock()
+        public void CorrectlyParsesAtSignInDelimitedBlock()
         {
             ParseBlockTest("(Request[\"description\"] ?? @photo.Description)");
         }
 
         [Fact]
-        public void ParseBlockCorrectlyRecoversFromMissingCloseParenInExpressionWithinCode()
+        public void CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode()
         {
             ParseBlockTest(@"{string.Format(<html></html>}");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpExplicitExpressionTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpExplicitExpressionTest.cs
index 8abae17490..9d15295d99 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpExplicitExpressionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpExplicitExpressionTest.cs
@@ -9,37 +9,38 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class CSharpExplicitExpressionTest : CsHtmlCodeParserTestBase
     {
         [Fact]
-        public void ParseBlockShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty()
+        public void ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty()
         {
             ParseBlockTest("@()");
         }
 
         [Fact]
-        public void ParseBlockShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpression()
+        public void ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr()
         {
+            // ParseBlockShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpression
             ParseBlockTest("@(");
         }
 
         [Fact]
-        public void ParseBlockShouldAcceptEscapedQuoteInNonVerbatimStrings()
+        public void ShouldAcceptEscapedQuoteInNonVerbatimStrings()
         {
             ParseBlockTest("@(\"\\\"\")");
         }
 
         [Fact]
-        public void ParseBlockShouldAcceptEscapedQuoteInVerbatimStrings()
+        public void ShouldAcceptEscapedQuoteInVerbatimStrings()
         {
             ParseBlockTest("@(@\"\"\"\")");
         }
 
         [Fact]
-        public void ParseBlockShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings()
+        public void ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings()
         {
             ParseBlockTest("@(@\"\"\"\"\"\")");
         }
 
         [Fact]
-        public void ParseBlockShouldAcceptMultiLineVerbatimStrings()
+        public void ShouldAcceptMultiLineVerbatimStrings()
         {
             ParseBlockTest(@"@(@""" + Environment.NewLine
                          + @"Foo" + Environment.NewLine
@@ -49,25 +50,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings()
+        public void ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings()
         {
             ParseBlockTest("@(\"\\\"hello, world\\\"\")");
         }
 
         [Fact]
-        public void ParseBlockShouldAcceptMultipleEscapedQuotesInVerbatimStrings()
+        public void ShouldAcceptMultipleEscapedQuotesInVerbatimStrings()
         {
             ParseBlockTest("@(@\"\"\"hello, world\"\"\")");
         }
 
         [Fact]
-        public void ParseBlockShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings()
+        public void ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings()
         {
             ParseBlockTest("@(\"\\\"\\\"\")");
         }
 
         [Fact]
-        public void ParseBlockShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings()
+        public void ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings()
         {
             ParseBlockTest("@(@\"\"\"\"\"\")");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpImplicitExpressionTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpImplicitExpressionTest.cs
index 5ab4300ef7..f46d227df9 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpImplicitExpressionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpImplicitExpressionTest.cs
@@ -8,210 +8,210 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class CSharpImplicitExpressionTest : CsHtmlCodeParserTestBase
     {
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket1()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket1()
         {
             // Act & Assert
             ImplicitExpressionTest("val??[");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket2()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket2()
         {
             // Act & Assert
             ImplicitExpressionTest("val??[0");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket3()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket3()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket4()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket4()
         {
             // Act & Assert
             ImplicitExpressionTest("val?(");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket5()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket5()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[more");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket6()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket6()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[0]");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket7()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket7()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[<p>");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket8()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket8()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[more.<p>");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket9()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket9()
         {
             // Act & Assert
             ImplicitExpressionTest("val??[more<p>");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket10()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket10()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[-1]?");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket11()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket11()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[abc]?[def");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket12()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket12()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[abc]?[2]");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket13()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket13()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[abc]?.more?[def]");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket14()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket14()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[abc]?.more?.abc");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket15()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket15()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[null ?? true]");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket16()
+        public void ParsesNullConditionalOperatorImplicitExpression_Bracket16()
         {
             // Act & Assert
             ImplicitExpressionTest("val?[abc?.gef?[-1]]");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot1()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot1()
         {
             // Act & Assert
             ImplicitExpressionTest("val?");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot2()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot2()
         {
             // Act & Assert
             ImplicitExpressionTest("val??");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot3()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot3()
         {
             // Act & Assert
             ImplicitExpressionTest("val??more");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot4()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot4()
         {
             // Act & Assert
             ImplicitExpressionTest("val?!");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot5()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot5()
         {
             // Act & Assert
             ImplicitExpressionTest("val?.");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot6()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot6()
         {
             // Act & Assert
             ImplicitExpressionTest("val??.");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot7()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot7()
         {
             // Act & Assert
             ImplicitExpressionTest("val?.(abc)");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot8()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot8()
         {
             // Act & Assert
             ImplicitExpressionTest("val?.<p>");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot9()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot9()
         {
             // Act & Assert
             ImplicitExpressionTest("val?.more");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot10()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot10()
         {
             // Act & Assert
             ImplicitExpressionTest("val?.more<p>");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot11()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot11()
         {
             // Act & Assert
             ImplicitExpressionTest("val??.more<p>");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot12()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot12()
         {
             // Act & Assert
             ImplicitExpressionTest("val?.more(false)?.<p>");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot13()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot13()
         {
             // Act & Assert
             ImplicitExpressionTest("val?.more(false)?.abc");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot14()
+        public void ParsesNullConditionalOperatorImplicitExpression_Dot14()
         {
             // Act & Assert
             ImplicitExpressionTest("val?.more(null ?? true)?.abc");
@@ -224,145 +224,149 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockAcceptsNonEnglishCharactersThatAreValidIdentifiers()
+        public void AcceptsNonEnglishCharactersThatAreValidIdentifiers()
         {
             ImplicitExpressionTest("हळूँजद॔.");
         }
 
         [Fact]
-        public void ParseBlockOutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition()
+        public void OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition()
         {
             ParseBlockTest("@/");
         }
 
         [Fact]
-        public void ParseBlockOutputsZeroLengthCodeSpanIfEOFOccursAfterTransition()
+        public void OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition()
         {
             ParseBlockTest("@");
         }
 
         [Fact]
-        public void ParseBlockSupportsSlashesWithinComplexImplicitExpressions()
+        public void SupportsSlashesWithinComplexImplicitExpressions()
         {
             ImplicitExpressionTest("DataGridColumn.Template(\"Years of Service\", e => (int)Math.Round((DateTime.Now - dt).TotalDays / 365))");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesSingleIdentifierAsImplicitExpression()
+        public void ParsesSingleIdentifierAsImplicitExpression()
         {
             ImplicitExpressionTest("foo");
         }
 
         [Fact]
-        public void ParseBlockMethodDoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace()
+        public void DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace()
         {
             ImplicitExpressionTest("foo ;");
         }
 
         [Fact]
-        public void ParseBlockMethodIgnoresSemicolonAtEndOfSimpleImplicitExpression()
+        public void IgnoresSemicolonAtEndOfSimpleImplicitExpression()
         {
             RunTrailingSemicolonTest("foo");
         }
 
         [Fact]
-        public void ParseBlockMethodParsesDottedIdentifiersAsImplicitExpression()
+        public void ParsesDottedIdentifiersAsImplicitExpression()
         {
             ImplicitExpressionTest("foo.bar.baz");
         }
 
         [Fact]
-        public void ParseBlockMethodIgnoresSemicolonAtEndOfDottedIdentifiers()
+        public void IgnoresSemicolonAtEndOfDottedIdentifiers()
         {
             RunTrailingSemicolonTest("foo.bar.baz");
         }
 
         [Fact]
-        public void ParseBlockMethodDoesNotIncludeDotAtEOFInImplicitExpression()
+        public void DoesNotIncludeDotAtEOFInImplicitExpression()
         {
             ImplicitExpressionTest("foo.bar.");
         }
 
         [Fact]
-        public void ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression1()
+        public void DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1()
         {
+            // ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression1
             ImplicitExpressionTest("foo.bar.0");
         }
 
         [Fact]
-        public void ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression2()
+        public void DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2()
         {
+            // ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression2
             ImplicitExpressionTest("foo.bar.</p>");
         }
 
         [Fact]
-        public void ParseBlockMethodDoesNotIncludeSemicolonAfterDot()
+        public void DoesNotIncludeSemicolonAfterDot()
         {
             ImplicitExpressionTest("foo.bar.;");
         }
 
         [Fact]
-        public void ParseBlockMethodTerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpression()
+        public void TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr()
         {
+            // ParseBlockMethodTerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpression
             ImplicitExpressionTest("foo.bar</p>");
         }
 
         [Fact]
-        public void ParseBlockProperlyParsesParenthesesAndBalancesThemInImplicitExpression()
+        public void ProperlyParsesParenthesesAndBalancesThemInImplicitExpression()
         {
             ImplicitExpressionTest(@"foo().bar(""bi\""z"", 4)(""chained method; call"").baz(@""bo""""z"", '\'', () => { return 4; }, (4+5+new { foo = bar[4] }))");
         }
 
         [Fact]
-        public void ParseBlockProperlyParsesBracketsAndBalancesThemInImplicitExpression()
+        public void ProperlyParsesBracketsAndBalancesThemInImplicitExpression()
         {
             ImplicitExpressionTest(@"foo.bar[4 * (8 + 7)][""fo\""o""].baz");
         }
 
         [Fact]
-        public void ParseBlockTerminatesImplicitExpressionAtHtmlEndTag()
+        public void TerminatesImplicitExpressionAtHtmlEndTag()
         {
             ImplicitExpressionTest("foo().bar.baz</p>zoop");
         }
 
         [Fact]
-        public void ParseBlockTerminatesImplicitExpressionAtHtmlStartTag()
+        public void TerminatesImplicitExpressionAtHtmlStartTag()
         {
             ImplicitExpressionTest("foo().bar.baz<p>zoop");
         }
 
         [Fact]
-        public void ParseBlockTerminatesImplicitExpressionBeforeDotIfDotNotFollowedByIdentifierStartCharacter()
+        public void TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar()
         {
+            // ParseBlockTerminatesImplicitExpressionBeforeDotIfDotNotFollowedByIdentifierStartCharacter
             ImplicitExpressionTest("foo().bar.baz.42");
         }
 
         [Fact]
-        public void ParseBlockStopsBalancingParenthesesAtEOF()
+        public void StopsBalancingParenthesesAtEOF()
         {
             ImplicitExpressionTest("foo(()");
         }
 
         [Fact]
-        public void ParseBlockTerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace()
+        public void TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace()
         {
             ImplicitExpressionTest("foo.bar() (baz)");
         }
 
         [Fact]
-        public void ParseBlockTerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace()
+        public void TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace()
         {
             ImplicitExpressionTest("foo .bar() (baz)");
         }
 
         [Fact]
-        public void ParseBlockTerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace()
+        public void TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace()
         {
             ImplicitExpressionTest("foo. bar() (baz)");
         }
 
         [Fact]
-        public void ParseBlockOutputExpressionIfModuleTokenNotFollowedByBrace()
+        public void OutputExpressionIfModuleTokenNotFollowedByBrace()
         {
             ImplicitExpressionTest("module.foo()");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSectionTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSectionTest.cs
index 2d05f57a29..52bca860e1 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSectionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSectionTest.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class CSharpSectionTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
-        public void ParseSectionBlockCapturesNewlineImmediatelyFollowing()
+        public void CapturesNewlineImmediatelyFollowing()
         {
             ParseDocumentTest(
                 "@section" + Environment.NewLine,
@@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockCapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace()
+        public void CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace()
         {
             ParseDocumentTest(
                 "@section Foo         " + Environment.NewLine + "    ",
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockCapturesWhitespaceToEndOfLineInSectionStatementMissingName()
+        public void CapturesWhitespaceToEndOfLineInSectionStatementMissingName()
         {
             ParseDocumentTest(
                 "@section         " + Environment.NewLine + "    ",
@@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockIgnoresSectionUnlessAllLowerCase()
+        public void IgnoresSectionUnlessAllLowerCase()
         {
             ParseDocumentTest(
                 "@Section foo",
@@ -42,16 +42,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartCharacter()
+        public void ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar()
         {
+            // ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartCharacter
             ParseDocumentTest(
                 "@section 9 { <p>Foo</p> }",
                 new[] { SectionDirective.Directive });
         }
 
         [Fact]
-        public void ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace()
+        public void ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace()
         {
+            // ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace
             ParseDocumentTest(
                 "@section foo-bar { <p>Foo</p> }",
                 new[] { SectionDirective.Directive });
@@ -66,7 +68,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockHandlesEOFAfterOpenBrace()
+        public void HandlesEOFAfterOpenBrace()
         {
             ParseDocumentTest(
                 "@section foo {",
@@ -74,7 +76,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockHandlesEOFAfterOpenContent1()
+        public void HandlesEOFAfterOpenContent1()
         {
             
             ParseDocumentTest(
@@ -83,7 +85,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockHandlesEOFAfterOpenContent2()
+        public void HandlesEOFAfterOpenContent2()
         {
 
             ParseDocumentTest(
@@ -92,7 +94,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockHandlesEOFAfterOpenContent3()
+        public void HandlesEOFAfterOpenContent3()
         {
 
             ParseDocumentTest(
@@ -101,7 +103,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockHandlesEOFAfterOpenContent4()
+        public void HandlesEOFAfterOpenContent4()
         {
 
             ParseDocumentTest(
@@ -110,7 +112,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockHandlesUnterminatedSection()
+        public void HandlesUnterminatedSection()
         {
             ParseDocumentTest(
                 "@section foo { <p>Foo{}</p>",
@@ -118,7 +120,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockHandlesUnterminatedSectionWithNestedIf()
+        public void HandlesUnterminatedSectionWithNestedIf()
         {
             // Arrange
             var newLine = Environment.NewLine;
@@ -134,8 +136,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockReportsErrorAndAcceptsWhitespaceToEndOfLineIfSectionNotFollowedByOpenBrace()
+        public void ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace()
         {
+            // ParseSectionBlockReportsErrorAndAcceptsWhitespaceToEndOfLineIfSectionNotFollowedByOpenBrace
             // Arrange
             var chunkGenerator = new DirectiveChunkGenerator(SectionDirective.Directive);
             chunkGenerator.Diagnostics.Add(
@@ -151,7 +154,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockAcceptsOpenBraceMultipleLinesBelowSectionName()
+        public void AcceptsOpenBraceMultipleLinesBelowSectionName()
         {
             ParseDocumentTest(
                 "@section foo      "
@@ -168,7 +171,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockParsesNamedSectionCorrectly()
+        public void ParsesNamedSectionCorrectly()
         {
             ParseDocumentTest(
                 "@section foo { <p>Foo</p> }",
@@ -176,7 +179,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockDoesNotRequireSpaceBetweenSectionNameAndOpenBrace()
+        public void DoesNotRequireSpaceBetweenSectionNameAndOpenBrace()
         {
             ParseDocumentTest(
                 "@section foo{ <p>Foo</p> }",
@@ -184,7 +187,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockBalancesBraces()
+        public void BalancesBraces()
         {
             ParseDocumentTest(
                 "@section foo { <script>(function foo() { return 1; })();</script> }",
@@ -192,7 +195,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockAllowsBracesInCSharpExpression()
+        public void AllowsBracesInCSharpExpression()
         {
             ParseDocumentTest(
                 "@section foo { I really want to render a close brace, so here I go: @(\"}\") }",
@@ -211,8 +214,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlockNoWhitespace()
+        public void SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace()
         {
+            // SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlockNoWhitespace
             ParseDocumentTest(
                 "@section Foo {" + Environment.NewLine
                 + "@if(true) {" + Environment.NewLine
@@ -221,7 +225,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockCorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup()
+        public void CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup()
         {
             ParseDocumentTest(
                 "@section foo {something}",
@@ -229,7 +233,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockParsesComment()
+        public void ParsesComment()
         {
             ParseDocumentTest(
                 "@section s {<!-- -->}",
@@ -239,7 +243,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         // This was a user reported bug (codeplex #710), the section parser wasn't handling
         // comments.
         [Fact]
-        public void ParseSectionBlockParsesCommentWithDelimiters()
+        public void ParsesCommentWithDelimiters()
         {
             ParseDocumentTest(
                 "@section s {<!-- > \" '-->}",
@@ -247,7 +251,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockCommentRecoversFromUnclosedTag()
+        public void CommentRecoversFromUnclosedTag()
         {
             ParseDocumentTest(
                 "@section s {" + Environment.NewLine + "<a" + Environment.NewLine + "<!--  > \" '-->}",
@@ -255,7 +259,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlockParsesXmlProcessingInstruction()
+        public void ParsesXmlProcessingInstruction()
         {
             ParseDocumentTest(
                 "@section s { <? xml bleh ?>}",
@@ -263,13 +267,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseSectionBlock_WithDoubleTransition1()
+        public void _WithDoubleTransition1()
         {
             ParseDocumentTest("@section s {<span foo='@@' />}", new[] { SectionDirective.Directive });
         }
 
         [Fact]
-        public void ParseSectionBlock_WithDoubleTransition2()
+        public void _WithDoubleTransition2()
         {
             ParseDocumentTest("@section s {<span foo='@DateTime.Now @@' />}", new[] { SectionDirective.Directive });
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSpecialBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSpecialBlockTest.cs
index 9506de7405..3015010516 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSpecialBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSpecialBlockTest.cs
@@ -30,14 +30,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockBalancesBracesOutsideStringsIfFirstCharacterIsBraceAndReturnsSpanOfTypeCode()
+        public void BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode()
         {
+            // ParseBlockBalancesBracesOutsideStringsIfFirstCharacterIsBraceAndReturnsSpanOfTypeCode
             ParseBlockTest("{foo\"b}ar\" if(condition) { string.Format(\"{0}\"); } }");
         }
 
         [Fact]
-        public void ParseBlockBalancesParensOutsideStringsIfFirstCharacterIsParenAndReturnsSpanOfTypeExpression()
+        public void BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr()
         {
+            // ParseBlockBalancesParensOutsideStringsIfFirstCharacterIsParenAndReturnsSpanOfTypeExpression
             ParseBlockTest("(foo\"b)ar\" if(condition) { string.Format(\"{0}\"); } )");
         }
 
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTemplateTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTemplateTest.cs
index 619292fd96..b672bcff91 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTemplateTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTemplateTest.cs
@@ -9,79 +9,82 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class CSharpTemplateTest : CsHtmlCodeParserTestBase
     {
         [Fact]
-        public void ParseBlockHandlesSingleLineTemplate()
+        public void HandlesSingleLineTemplate()
         {
             ParseBlockTest("{ var foo = @: bar" + Environment.NewLine + "; }");
         }
 
         [Fact]
-        public void ParseBlockHandlesSingleLineImmediatelyFollowingStatementChar()
+        public void HandlesSingleLineImmediatelyFollowingStatementChar()
         {
             ParseBlockTest("{i@: bar" + Environment.NewLine + "}");
         }
 
         [Fact]
-        public void ParseBlockHandlesSimpleTemplateInExplicitExpressionParens()
+        public void HandlesSimpleTemplateInExplicitExpressionParens()
         {
             ParseBlockTest("(Html.Repeat(10, @<p>Foo #@item</p>))");
         }
 
         [Fact]
-        public void ParseBlockHandlesSimpleTemplateInImplicitExpressionParens()
+        public void HandlesSimpleTemplateInImplicitExpressionParens()
         {
             ParseBlockTest("Html.Repeat(10, @<p>Foo #@item</p>)");
         }
 
         [Fact]
-        public void ParseBlockHandlesTwoTemplatesInImplicitExpressionParens()
+        public void HandlesTwoTemplatesInImplicitExpressionParens()
         {
             ParseBlockTest("Html.Repeat(10, @<p>Foo #@item</p>, @<p>Foo #@item</p>)");
         }
 
         [Fact]
-        public void ParseBlockProducesErrorButCorrectlyParsesNestedTemplateInImplicitExpressionParens()
+        public void ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens()
         {
+            // ParseBlockProducesErrorButCorrectlyParsesNestedTemplateInImplicitExpressionParens
             ParseBlockTest("Html.Repeat(10, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>)");
         }
 
         [Fact]
-        public void ParseBlockHandlesSimpleTemplateInStatementWithinCodeBlock()
+        public void HandlesSimpleTemplateInStatementWithinCodeBlock()
         {
             ParseBlockTest("foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@item</p>); }");
         }
 
         [Fact]
-        public void ParseBlockHandlesTwoTemplatesInStatementWithinCodeBlock()
+        public void HandlesTwoTemplatesInStatementWithinCodeBlock()
         {
             ParseBlockTest("foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@item</p>, @<p>Foo #@item</p>); }");
         }
 
         [Fact]
-        public void ParseBlockProducesErrorButCorrectlyParsesNestedTemplateInStatementWithinCodeBlock()
+        public void ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock()
         {
+            // ParseBlockProducesErrorButCorrectlyParsesNestedTemplateInStatementWithinCodeBlock
             ParseBlockTest("foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>); }");
         }
 
         [Fact]
-        public void ParseBlockHandlesSimpleTemplateInStatementWithinStatementBlock()
+        public void HandlesSimpleTemplateInStatementWithinStatementBlock()
         {
             ParseBlockTest("{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@item</p>); }");
         }
 
         [Fact]
-        public void ParseBlockHandlessTwoTemplatesInStatementWithinStatementBlock()
+        public void HandlessTwoTemplatesInStatementWithinStatementBlock()
         {
             ParseBlockTest("{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@item</p>, @<p>Foo #@item</p>); }");
         }
 
         [Fact]
-        public void ParseBlockProducesErrorButCorrectlyParsesNestedTemplateInStatementWithinStatementBlock()
+        public void ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock()
         {
+            // ParseBlockProducesErrorButCorrectlyParsesNestedTemplateInStatementWithinStatementBlock
             ParseBlockTest("{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>); }");
         }
 
         [Fact]
-        public void ParseBlock_WithDoubleTransition_DoesNotThrow()
+        public void _WithDoubleTransition_DoesNotThrow()
         {
             ParseBlockTest("{ var foo = bar; Html.ExecuteTemplate(foo, @<p foo='@@'>Foo #@item</p>); }");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpToMarkupSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpToMarkupSwitchTest.cs
index 128179ac25..510fb281f4 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpToMarkupSwitchTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpToMarkupSwitchTest.cs
@@ -15,13 +15,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockGivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode()
+        public void GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode()
         {
             ParseBlockTest("Foo(    @<p>Foo</p>    )", designTime: true);
         }
 
         [Fact]
-        public void ParseBlockGivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode()
+        public void GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode()
         {
             ParseBlockTest("Foo(    " + Environment.NewLine
                          + "@:<p>Foo</p>    " + Environment.NewLine
@@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockGivesSpacesToCodeOnTagTransitionInDesignTimeMode()
+        public void GivesSpacesToCodeOnTagTransitionInDesignTimeMode()
         {
             ParseBlockTest("{" + Environment.NewLine
                          + "    <p>Foo</p>    " + Environment.NewLine
@@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockGivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode()
+        public void GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode()
         {
             ParseBlockTest("{" + Environment.NewLine
                          + "    @<p>Foo</p>    " + Environment.NewLine
@@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockGivesSpacesToCodeOnAtColonTransitionInDesignTimeMode()
+        public void GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode()
         {
             ParseBlockTest("{" + Environment.NewLine
                          + "    @:<p>Foo</p>    " + Environment.NewLine
@@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockShouldSupportSingleLineMarkupContainingStatementBlock()
+        public void ShouldSupportSingleLineMarkupContainingStatementBlock()
         {
             ParseBlockTest("Repeat(10," + Environment.NewLine
                          + "    @: @{}" + Environment.NewLine
@@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockShouldSupportMarkupWithoutPreceedingWhitespace()
+        public void ShouldSupportMarkupWithoutPreceedingWhitespace()
         {
             ParseBlockTest("foreach(var file in files){" + Environment.NewLine
                          + Environment.NewLine
@@ -74,8 +74,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockGivesAllWhitespaceOnSameLineExcludingPreceedingNewlineButIncludingTrailingNewLineToMarkup()
+        public void GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline()
         {
+            // ParseBlockGivesAllWhitespaceOnSameLineExcludingPreceedingNewlineButIncludingTrailingNewLineToMarkup
             ParseBlockTest("if(foo) {" + Environment.NewLine
                          + "    var foo = \"After this statement there are 10 spaces\";          " + Environment.NewLine
                          + "    <p>" + Environment.NewLine
@@ -88,19 +89,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockAllowsMarkupInIfBodyWithBraces()
+        public void AllowsMarkupInIfBodyWithBraces()
         {
             ParseBlockTest("if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> }");
         }
 
         [Fact]
-        public void ParseBlockAllowsMarkupInIfBodyWithBracesWithinCodeBlock()
+        public void AllowsMarkupInIfBodyWithBracesWithinCodeBlock()
         {
             ParseBlockTest("{ if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> } }");
         }
 
         [Fact]
-        public void ParseBlockSupportsMarkupInCaseAndDefaultBranchesOfSwitch()
+        public void SupportsMarkupInCaseAndDefaultBranchesOfSwitch()
         {
             // Arrange
             ParseBlockTest("switch(foo) {" + Environment.NewLine
@@ -121,7 +122,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockSupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock()
+        public void SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock()
         {
             // Arrange
             ParseBlockTest("{ switch(foo) {" + Environment.NewLine
@@ -142,19 +143,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockParsesMarkupStatementOnOpenAngleBracket()
+        public void ParsesMarkupStatementOnOpenAngleBracket()
         {
             ParseBlockTest("for(int i = 0; i < 10; i++) { <p>Foo</p> }");
         }
 
         [Fact]
-        public void ParseBlockParsesMarkupStatementOnOpenAngleBracketInCodeBlock()
+        public void ParsesMarkupStatementOnOpenAngleBracketInCodeBlock()
         {
             ParseBlockTest("{ for(int i = 0; i < 10; i++) { <p>Foo</p> } }");
         }
 
         [Fact]
-        public void ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByColon()
+        public void ParsesMarkupStatementOnSwitchCharacterFollowedByColon()
         {
             // Arrange
             ParseBlockTest("if(foo) { @:Bar" + Environment.NewLine
@@ -162,7 +163,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon()
+        public void ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon()
         {
             // Arrange
             ParseBlockTest("if(foo) { @::Sometext" + Environment.NewLine
@@ -171,7 +172,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
 
         [Fact]
-        public void ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon()
+        public void ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon()
         {
             // Arrange
             ParseBlockTest("if(foo) { @:::Sometext" + Environment.NewLine
@@ -179,7 +180,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock()
+        public void ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock()
         {
             // Arrange
             ParseBlockTest("{ if(foo) { @:Bar" + Environment.NewLine
@@ -187,19 +188,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockCorrectlyReturnsFromMarkupBlockWithPseudoTag()
+        public void CorrectlyReturnsFromMarkupBlockWithPseudoTag()
         {
             ParseBlockTest("if (i > 0) { <text>;</text> }");
         }
 
         [Fact]
-        public void ParseBlockCorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock()
+        public void CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock()
         {
             ParseBlockTest("{ if (i > 0) { <text>;</text> } }");
         }
 
         [Fact]
-        public void ParseBlockSupportsAllKindsOfImplicitMarkupInCodeBlock()
+        public void SupportsAllKindsOfImplicitMarkupInCodeBlock()
         {
             ParseBlockTest("{" + Environment.NewLine
                          + "    if(true) {" + Environment.NewLine
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpVerbatimBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpVerbatimBlockTest.cs
index 7b38b1cbe1..f6e5085d91 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpVerbatimBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpVerbatimBlockTest.cs
@@ -17,31 +17,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void InnerImplicitExpressionWithOnlySingleAtOutputsZeroLengthCodeSpan()
+        public void InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan()
         {
             ParseBlockTest("{@}");
         }
 
         [Fact]
-        public void InnerImplicitExpressionDoesNotAcceptDotAfterAt()
+        public void InnerImplicitExprDoesNotAcceptDotAfterAt()
         {
             ParseBlockTest("{@.}");
         }
 
         [Fact]
-        public void InnerImplicitExpressionWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime()
+        public void InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime()
         {
             ParseBlockTest("{" + Environment.NewLine + "    @" + Environment.NewLine + "}", designTime: true);
         }
 
         [Fact]
-        public void InnerImplicitExpressionDoesNotAcceptTrailingNewlineInRunTimeMode()
+        public void InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode()
         {
             ParseBlockTest("{@foo." + Environment.NewLine + "}");
         }
 
         [Fact]
-        public void InnerImplicitExpressionAcceptsTrailingNewlineInDesignTimeMode()
+        public void InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode()
         {
             ParseBlockTest("{@foo." + Environment.NewLine + "}", designTime: true);
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpWhitespaceHandlingTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpWhitespaceHandlingTest.cs
index e9c028da7e..44a642ce8b 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpWhitespaceHandlingTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpWhitespaceHandlingTest.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class CSharpWhitespaceHandlingTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
-        public void StatementBlockDoesNotAcceptTrailingNewlineIfNewlinesAreSignificantToAncestor()
+        public void StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor()
         {
             ParseBlockTest("@: @if (true) { }" + Environment.NewLine + "}");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlBlockTest.cs
index d069d68d59..b87eb28aa3 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlBlockTest.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class HtmlBlockTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
-        public void ParseBlockHandlesUnbalancedTripleDashHTMLComments()
+        public void HandlesUnbalancedTripleDashHTMLComments()
         {
             ParseDocumentTest(
 @"@{
@@ -18,14 +18,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockHandlesOpenAngleAtEof()
+        public void HandlesOpenAngleAtEof()
         {
             ParseDocumentTest("@{" + Environment.NewLine
                             + "<");
         }
 
         [Fact]
-        public void ParseBlockHandlesOpenAngleWithProperTagFollowingIt()
+        public void HandlesOpenAngleWithProperTagFollowingIt()
         {
             ParseDocumentTest("@{" + Environment.NewLine
                             + "<" + Environment.NewLine
@@ -41,104 +41,104 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockAllowsStartAndEndTagsToDifferInCase()
+        public void AllowsStartAndEndTagsToDifferInCase()
         {
             ParseBlockTest("<li><p>Foo</P></lI>");
         }
 
         [Fact]
-        public void ParseBlockReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon()
+        public void ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon()
         {
             ParseBlockTest("@:<li>Foo Bar Baz" + Environment.NewLine
                          + "bork");
         }
 
         [Fact]
-        public void ParseBlockStopsParsingSingleLineBlockAtEOFIfNoEOLReached()
+        public void StopsParsingSingleLineBlockAtEOFIfNoEOLReached()
         {
             ParseBlockTest("@:foo bar");
         }
 
         [Fact]
-        public void ParseBlockStopsAtMatchingCloseTagToStartTag()
+        public void StopsAtMatchingCloseTagToStartTag()
         {
             ParseBlockTest("<a><b></b></a><c></c>");
         }
 
         [Fact]
-        public void ParseBlockParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag()
+        public void ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag()
         {
             ParseBlockTest("<baz><boz><biz></biz></boz></baz>");
         }
 
         [Fact]
-        public void ParseBlockAllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag()
+        public void AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag()
         {
             ParseBlockTest("<foo><bar><baz></foo>");
         }
 
         [Fact]
-        public void ParseBlockWithSelfClosingTagJustEmitsTag()
+        public void WithSelfClosingTagJustEmitsTag()
         {
             ParseBlockTest("<foo />");
         }
 
         [Fact]
-        public void ParseBlockCanHandleSelfClosingTagsWithinBlock()
+        public void CanHandleSelfClosingTagsWithinBlock()
         {
             ParseBlockTest("<foo><bar /></foo>");
         }
 
         [Fact]
-        public void ParseBlockSupportsTagsWithAttributes()
+        public void SupportsTagsWithAttributes()
         {
             ParseBlockTest("<foo bar=\"baz\"><biz><boz zoop=zork/></biz></foo>");
         }
 
         [Fact]
-        public void ParseBlockAllowsCloseAngleBracketInAttributeValueIfDoubleQuoted()
+        public void AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted()
         {
             ParseBlockTest("<foo><bar baz=\">\" /></foo>");
         }
 
         [Fact]
-        public void ParseBlockAllowsCloseAngleBracketInAttributeValueIfSingleQuoted()
+        public void AllowsCloseAngleBracketInAttributeValueIfSingleQuoted()
         {
             ParseBlockTest("<foo><bar baz=\'>\' /></foo>");
         }
 
         [Fact]
-        public void ParseBlockAllowsSlashInAttributeValueIfDoubleQuoted()
+        public void AllowsSlashInAttributeValueIfDoubleQuoted()
         {
             ParseBlockTest("<foo><bar baz=\"/\"></bar></foo>");
         }
 
         [Fact]
-        public void ParseBlockAllowsSlashInAttributeValueIfSingleQuoted()
+        public void AllowsSlashInAttributeValueIfSingleQuoted()
         {
             ParseBlockTest("<foo><bar baz=\'/\'></bar></foo>");
         }
 
         [Fact]
-        public void ParseBlockTerminatesAtEOF()
+        public void TerminatesAtEOF()
         {
             ParseBlockTest("<foo>");
         }
 
         [Fact]
-        public void ParseBlockSupportsCommentAsBlock()
+        public void SupportsCommentAsBlock()
         {
             ParseBlockTest("<!-- foo -->");
         }
 
         [Fact]
-        public void ParseBlockSupportsCommentWithExtraDashAsBlock()
+        public void SupportsCommentWithExtraDashAsBlock()
         {
             ParseBlockTest("<!-- foo --->");
         }
 
         [Fact]
-        public void ParseBlockSupportsCommentWithinBlock()
+        public void SupportsCommentWithinBlock()
         {
             ParseBlockTest("<foo>bar<!-- zoop -->baz</foo>");
         }
@@ -155,116 +155,117 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockProperlyBalancesCommentStartAndEndTags()
+        public void ProperlyBalancesCommentStartAndEndTags()
         {
             ParseBlockTest("<!--<foo></bar>-->");
         }
 
         [Fact]
-        public void ParseBlockTerminatesAtEOFWhenParsingComment()
+        public void TerminatesAtEOFWhenParsingComment()
         {
             ParseBlockTest("<!--<foo>");
         }
 
         [Fact]
-        public void ParseBlockOnlyTerminatesCommentOnFullEndSequence()
+        public void OnlyTerminatesCommentOnFullEndSequence()
         {
             ParseBlockTest("<!--<foo>--</bar>-->");
         }
 
         [Fact]
-        public void ParseBlockTerminatesCommentAtFirstOccurrenceOfEndSequence()
+        public void TerminatesCommentAtFirstOccurrenceOfEndSequence()
         {
             ParseBlockTest("<foo><!--<foo></bar-->--></foo>");
         }
 
         [Fact]
-        public void ParseBlockTreatsMalformedTagsAsContent()
+        public void TreatsMalformedTagsAsContent()
         {
             ParseBlockTest("<foo></!-- bar --></foo>");
         }
 
 
         [Fact]
-        public void ParseBlockParsesSGMLDeclarationAsEmptyTag()
+        public void ParsesSGMLDeclarationAsEmptyTag()
         {
             ParseBlockTest("<foo><!DOCTYPE foo bar baz></foo>");
         }
 
         [Fact]
-        public void ParseBlockTerminatesSGMLDeclarationAtFirstCloseAngle()
+        public void TerminatesSGMLDeclarationAtFirstCloseAngle()
         {
             ParseBlockTest("<foo><!DOCTYPE foo bar> baz></foo>");
         }
 
         [Fact]
-        public void ParseBlockParsesXMLProcessingInstructionAsEmptyTag()
+        public void ParsesXMLProcessingInstructionAsEmptyTag()
         {
             ParseBlockTest("<foo><?xml foo bar baz?></foo>");
         }
 
         [Fact]
-        public void ParseBlockTerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair()
+        public void TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair()
         {
             ParseBlockTest("<foo><?xml foo bar baz?> baz</foo>");
         }
 
         [Fact]
-        public void ParseBlockDoesNotTerminateXMLProcessingInstructionAtCloseAngleUnlessPreceededByQuestionMark()
+        public void DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark()
         {
+            // ParseBlockDoesNotTerminateXMLProcessingInstructionAtCloseAngleUnlessPreceededByQuestionMark
             ParseBlockTest("<foo><?xml foo bar> baz?></foo>");
         }
 
         [Fact]
-        public void ParseBlockSupportsScriptTagsWithLessThanSignsInThem()
+        public void SupportsScriptTagsWithLessThanSignsInThem()
         {
             ParseBlockTest(@"<script>if(foo<bar) { alert(""baz"");)</script>");
         }
 
         [Fact]
-        public void ParseBlockSupportsScriptTagsWithSpacedLessThanSignsInThem()
+        public void SupportsScriptTagsWithSpacedLessThanSignsInThem()
         {
             ParseBlockTest(@"<script>if(foo < bar) { alert(""baz"");)</script>");
         }
 
         [Fact]
-        public void ParseBlockAcceptsEmptyTextTag()
+        public void AcceptsEmptyTextTag()
         {
             ParseBlockTest("<text/>");
         }
 
         [Fact]
-        public void ParseBlockAcceptsTextTagAsOuterTagButDoesNotRender()
+        public void AcceptsTextTagAsOuterTagButDoesNotRender()
         {
             ParseBlockTest("<text>Foo Bar <foo> Baz</text> zoop");
         }
 
         [Fact]
-        public void ParseBlockRendersLiteralTextTagIfDoubled()
+        public void RendersLiteralTextTagIfDoubled()
         {
             ParseBlockTest("<text><text>Foo Bar <foo> Baz</text></text> zoop");
         }
 
         [Fact]
-        public void ParseBlockDoesNotConsiderPsuedoTagWithinMarkupBlock()
+        public void DoesNotConsiderPsuedoTagWithinMarkupBlock()
         {
             ParseBlockTest("<foo><text><bar></bar></foo>");
         }
 
         [Fact]
-        public void ParseBlockStopsParsingMidEmptyTagIfEOFReached()
+        public void StopsParsingMidEmptyTagIfEOFReached()
         {
             ParseBlockTest("<br/");
         }
 
         [Fact]
-        public void ParseBlockCorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement()
+        public void CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement()
         {
             ParseBlockTest("<div>Foo @if(true) {} Bar</div>");
         }
 
         [Fact]
-        public void ParseBlockIgnoresTagsInContentsOfScriptTag()
+        public void IgnoresTagsInContentsOfScriptTag()
         {
             ParseBlockTest(@"<script>foo<bar baz='@boz'></script>");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs
index 0863f30168..f77ee48b60 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs
@@ -13,43 +13,43 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         private static readonly TestFile Nested1000 = TestFile.Create("TestFiles/nested-1000.html", typeof(HtmlDocumentTest));
 
         [Fact]
-        public void ParseDocument_NestedCodeBlockWithMarkupSetsDotAsMarkup()
+        public void NestedCodeBlockWithMarkupSetsDotAsMarkup()
         {
             ParseDocumentTest("@if (true) { @if(false) { <div>@something.</div> } }");
         }
 
         [Fact]
-        public void ParseDocumentOutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString()
+        public void OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString()
         {
             ParseDocumentTest(string.Empty);
         }
 
         [Fact]
-        public void ParseDocumentOutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan()
+        public void OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan()
         {
             ParseDocumentTest("          ");
         }
 
         [Fact]
-        public void ParseDocumentAcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan()
+        public void AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan()
         {
             ParseDocumentTest("@");
         }
 
         [Fact]
-        public void ParseDocumentCorrectlyHandlesOddlySpacedHTMLElements()
+        public void CorrectlyHandlesOddlySpacedHTMLElements()
         {
             ParseDocumentTest("<div ><p class = 'bar'> Foo </p></div >");
         }
 
         [Fact]
-        public void ParseDocumentCorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement()
+        public void CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement()
         {
             ParseDocumentTest("<div>Foo @if(true) {} Bar</div>");
         }
 
         [Fact]
-        public void ParseDocumentWithinSectionDoesNotCreateDocumentLevelSpan()
+        public void WithinSectionDoesNotCreateDocumentLevelSpan()
         {
             ParseDocumentTest("@section Foo {" + Environment.NewLine
                             + "    <html></html>" + Environment.NewLine
@@ -58,25 +58,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseDocumentParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered()
+        public void ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered()
         {
             ParseDocumentTest("foo baz");
         }
 
         [Fact]
-        public void ParseDocumentHandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput()
+        public void HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput()
         {
             ParseDocumentTest("foo @bar baz");
         }
 
         [Fact]
-        public void ParseDocumentEmitsAtSignAsMarkupIfAtEndOfFile()
+        public void EmitsAtSignAsMarkupIfAtEndOfFile()
         {
             ParseDocumentTest("foo @");
         }
 
         [Fact]
-        public void ParseDocumentEmitsCodeBlockIfFirstCharacterIsSwapCharacter()
+        public void EmitsCodeBlockIfFirstCharacterIsSwapCharacter()
         {
             ParseDocumentTest("@bar");
         }
@@ -84,107 +84,109 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         [Fact]
         public void ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText()
         {
-            ParseDocument("example@microsoft.com");
+            ParseDocumentTest("example@microsoft.com");
         }
 
         [Fact]
-        public void ParseDocumentDoesNotSwitchToCodeOnEmailAddressInAttribute()
+        public void DoesNotSwitchToCodeOnEmailAddressInAttribute()
         {
             ParseDocumentTest("<a href=\"mailto:example@microsoft.com\">Email me</a>");
         }
 
         [Fact]
-        public void ParseDocumentDoesNotReturnErrorOnMismatchedTags()
+        public void DoesNotReturnErrorOnMismatchedTags()
         {
             ParseDocumentTest("Foo <div><p></p></p> Baz");
         }
 
         [Fact]
-        public void ParseDocumentReturnsOneMarkupSegmentIfNoCodeBlocksEncountered()
+        public void ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered()
         {
             ParseDocumentTest("Foo Baz<!--Foo-->Bar<!--F> Qux");
         }
 
         [Fact]
-        public void ParseDocumentRendersTextPseudoTagAsMarkup()
+        public void RendersTextPseudoTagAsMarkup()
         {
             ParseDocumentTest("Foo <text>Foo</text>");
         }
 
         [Fact]
-        public void ParseDocumentAcceptsEndTagWithNoMatchingStartTag()
+        public void AcceptsEndTagWithNoMatchingStartTag()
         {
             ParseDocumentTest("Foo </div> Bar");
         }
 
         [Fact]
-        public void ParseDocumentNoLongerSupportsDollarOpenBraceCombination()
+        public void NoLongerSupportsDollarOpenBraceCombination()
         {
             ParseDocumentTest("<foo>${bar}</foo>");
         }
 
         [Fact]
-        public void ParseDocumentIgnoresTagsInContentsOfScriptTag()
+        public void IgnoresTagsInContentsOfScriptTag()
         {
             ParseDocumentTest(@"<script>foo<bar baz='@boz'></script>");
         }
 
         [Fact]
-        public void ParseDocumentDoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock()
+        public void DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock()
         {
             ParseDocumentTest("@{\r\n}\r\n<html>");
         }
 
         [Fact]
-        public void ParseDocumentDoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock()
+        public void DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock()
         {
             ParseDocumentTest("@{\r\n} \t\r\n<html>");
         }
 
         [Fact]
-        public void ParseDocumentDoesNotRenderExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByCSharp()
+        public void DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp()
         {
+            // ParseDocumentDoesNotRenderExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByCSharp
             ParseDocumentTest("@{<text>Blah</text>\r\n\r\n}<html>");
         }
 
         [Fact]
-        public void ParseDocumentRendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml()
+        public void RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml()
         {
             ParseDocumentTest("@{<text>Blah</text>\r\n<input/>\r\n}<html>");
         }
 
         [Fact]
-        public void ParseDocumentRendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByMarkupTransition()
+        public void RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition()
         {
+            // ParseDocumentRendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByMarkupTransition
             ParseDocumentTest("@{<text>Blah</text>\r\n@: Bleh\r\n}<html>");
         }
 
         [Fact]
-        public void ParseDocumentDoesNotIgnoreNewLineAtTheEndOfMarkupBlock()
+        public void DoesNotIgnoreNewLineAtTheEndOfMarkupBlock()
         {
             ParseDocumentTest("@{\r\n}\r\n<html>\r\n");
         }
 
         [Fact]
-        public void ParseDocumentDoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent()
+        public void DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent()
         {
             ParseDocumentTest("@{\r\n}   \t<html>\r\n");
         }
 
         [Fact]
-        public void ParseDocumentHandlesNewLineInNestedBlock()
+        public void HandlesNewLineInNestedBlock()
         {
             ParseDocumentTest("@{\r\n@if(true){\r\n} \r\n}\r\n<html>");
         }
 
         [Fact]
-        public void ParseDocumentHandlesNewLineAndMarkupInNestedBlock()
+        public void HandlesNewLineAndMarkupInNestedBlock()
         {
             ParseDocumentTest("@{\r\n@if(true){\r\n} <input> }");
         }
 
         [Fact]
-        public void ParseDocumentHandlesExtraNewLineBeforeMarkupInNestedBlock()
+        public void HandlesExtraNewLineBeforeMarkupInNestedBlock()
         {
             ParseDocumentTest("@{\r\n@if(true){\r\n} \r\n<input> \r\n}<html>");
         }
@@ -207,56 +209,56 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseDocument_WithDoubleTransitionInAttributeValue_DoesNotThrow()
+        public void WithDoubleTransitionInAttributeValue_DoesNotThrow()
         {
             var input = "{<span foo='@@' />}";
             ParseDocumentTest(input);
         }
 
         [Fact]
-        public void ParseDocument_WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow()
+        public void WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow()
         {
             var input = "{<span foo='abc@@' />}";
             ParseDocumentTest(input);
         }
 
         [Fact]
-        public void ParseDocument_WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow()
+        public void WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow()
         {
             var input = "{<span foo='@@def' />}";
             ParseDocumentTest(input);
         }
 
         [Fact]
-        public void ParseDocument_WithDoubleTransitionBetweenAttributeValue_DoesNotThrow()
+        public void WithDoubleTransitionBetweenAttributeValue_DoesNotThrow()
         {
             var input = "{<span foo='abc @@ def' />}";
             ParseDocumentTest(input);
         }
 
         [Fact]
-        public void ParseDocument_WithDoubleTransitionWithExpressionBlock_DoesNotThrow()
+        public void WithDoubleTransitionWithExpressionBlock_DoesNotThrow()
         {
             var input = "{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />}";
             ParseDocumentTest(input);
         }
 
         [Fact]
-        public void ParseDocument_WithDoubleTransitionInEmail_DoesNotThrow()
+        public void WithDoubleTransitionInEmail_DoesNotThrow()
         {
             var input = "{<span foo='abc@def.com abc@@def.com @@' />}";
             ParseDocumentTest(input);
         }
 
         [Fact]
-        public void ParseDocument_WithDoubleTransitionInRegex_DoesNotThrow()
+        public void WithDoubleTransitionInRegex_DoesNotThrow()
         {
             var input = @"{<span foo=""/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i"" />}";
             ParseDocumentTest(input);
         }
 
         [Fact]
-        public void ParseDocument_WithUnexpectedTransitionsInAttributeValue_Throws()
+        public void WithUnexpectedTransitionsInAttributeValue_Throws()
         {
             ParseDocumentTest("<span foo='@ @' />");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlErrorTest.cs
index fdb7a91523..7a998ff0bc 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlErrorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlErrorTest.cs
@@ -8,49 +8,51 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class HtmlErrorTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
-        public void ParseBlockAllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag()
+        public void AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag()
         {
             ParseBlockTest("<1-foo+bar>foo</1-foo+bar>");
         }
 
         [Fact]
-        public void ParseBlockThrowsErrorIfStartTextTagContainsTextAfterName()
+        public void ThrowsErrorIfStartTextTagContainsTextAfterName()
         {
             ParseBlockTest("<text foo bar></text>");
         }
 
         [Fact]
-        public void ParseBlockThrowsErrorIfEndTextTagContainsTextAfterName()
+        public void ThrowsErrorIfEndTextTagContainsTextAfterName()
         {
             ParseBlockTest("<text></text foo bar>");
         }
 
         [Fact]
-        public void ParseBlockThrowsExceptionIfBlockDoesNotStartWithTag()
+        public void ThrowsExceptionIfBlockDoesNotStartWithTag()
         {
             ParseBlockTest("foo bar <baz>");
         }
 
         [Fact]
-        public void ParseBlockStartingWithEndTagProducesRazorErrorThenOutputsMarkupSegmentAndEndsBlock()
+        public void StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock()
         {
+            // ParseBlockStartingWithEndTagProducesRazorErrorThenOutputsMarkupSegmentAndEndsBlock
             ParseBlockTest("</foo> bar baz");
         }
 
         [Fact]
-        public void ParseBlockWithUnclosedTopLevelTagThrowsMissingEndTagParserExceptionOnOutermostUnclosedTag()
+        public void WithUnclosedTopLevelTagThrowsOnOutermostUnclosedTag()
         {
+            // ParseBlockWithUnclosedTopLevelTagThrowsMissingEndTagParserExceptionOnOutermostUnclosedTag
             ParseBlockTest("<p><foo></bar>");
         }
 
         [Fact]
-        public void ParseBlockWithUnclosedTagAtEOFThrowsMissingEndTagException()
+        public void WithUnclosedTagAtEOFThrowsMissingEndTagException()
         {
             ParseBlockTest("<foo>blah blah blah blah blah");
         }
 
         [Fact]
-        public void ParseBlockWithUnfinishedTagAtEOFThrowsIncompleteTagException()
+        public void WithUnfinishedTagAtEOFThrowsIncompleteTagException()
         {
             ParseBlockTest("<foo bar=baz");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlToCodeSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlToCodeSwitchTest.cs
index 66371b5d87..3676dc27ab 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlToCodeSwitchTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlToCodeSwitchTest.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Xunit;
 
@@ -11,31 +10,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class HtmlToCodeSwitchTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
-        public void ParseBlockSwitchesWhenCharacterBeforeSwapIsNonAlphanumeric()
+        public void SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric()
         {
             ParseBlockTest("<p>foo#@i</p>");
         }
 
         [Fact]
-        public void ParseBlockSwitchesToCodeWhenSwapCharacterEncounteredMidTag()
+        public void SwitchesToCodeWhenSwapCharacterEncounteredMidTag()
         {
             ParseBlockTest("<foo @bar />");
         }
 
         [Fact]
-        public void ParseBlockSwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue()
+        public void SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue()
         {
             ParseBlockTest("<foo bar=\"@baz\" />");
         }
 
         [Fact]
-        public void ParseBlockSwitchesToCodeWhenSwapCharacterEncounteredInTagContent()
+        public void SwitchesToCodeWhenSwapCharacterEncounteredInTagContent()
         {
             ParseBlockTest("<foo>@bar<baz>@boz</baz></foo>");
         }
 
         [Fact]
-        public void ParseBlockParsesCodeWithinSingleLineMarkup()
+        public void ParsesCodeWithinSingleLineMarkup()
         {
             // TODO: Fix at a later date, HTML should be a tag block: https://github.com/aspnet/Razor/issues/101
             ParseBlockTest("@:<li>Foo @Bar Baz" + Environment.NewLine
@@ -43,25 +42,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockSupportsCodeWithinComment()
+        public void SupportsCodeWithinComment()
         {
             ParseBlockTest("<foo><!-- @foo --></foo>");
         }
 
         [Fact]
-        public void ParseBlockSupportsCodeWithinSGMLDeclaration()
+        public void SupportsCodeWithinSGMLDeclaration()
         {
             ParseBlockTest("<foo><!DOCTYPE foo @bar baz></foo>");
         }
 
         [Fact]
-        public void ParseBlockSupportsCodeWithinCDataDeclaration()
+        public void SupportsCodeWithinCDataDeclaration()
         {
             ParseBlockTest("<foo><![CDATA[ foo @bar baz]]></foo>");
         }
 
         [Fact]
-        public void ParseBlockSupportsCodeWithinXMLProcessingInstruction()
+        public void SupportsCodeWithinXMLProcessingInstruction()
         {
             ParseBlockTest("<foo><?xml foo @bar baz?></foo>");
         }
@@ -73,13 +72,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void ParseBlockDoesNotSwitchToCodeOnEmailAddressInAttribute()
+        public void DoesNotSwitchToCodeOnEmailAddressInAttribute()
         {
             ParseBlockTest("<a href=\"mailto:anurse@microsoft.com\">Email me</a>");
         }
 
         [Fact]
-        public void ParseBlockGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine()
+        public void GivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine()
         {
             ParseBlockTest("   <ul>" + Environment.NewLine
                          + "    @foreach(var p in Products) {" + Environment.NewLine
@@ -125,13 +124,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         // Tests for "@@" escape sequence:
         [Fact]
-        public void ParseBlockTreatsTwoAtSignsAsEscapeSequence()
+        public void TreatsTwoAtSignsAsEscapeSequence()
         {
             ParseBlockTest("<foo>@@bar</foo>");
         }
 
         [Fact]
-        public void ParseBlockTreatsPairsOfAtSignsAsEscapeSequence()
+        public void TreatsPairsOfAtSignsAsEscapeSequence()
         {
             ParseBlockTest("<foo>@@@@@bar</foo>");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs
index 04e468c99e..09431eddde 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs
@@ -50,43 +50,43 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_CanHandleSymbolBoundAttributes1()
+        public void CanHandleSymbolBoundAttributes1()
         {
             EvaluateData(SymbolBoundAttributes_Descriptors, "<ul bound [item]='items'></ul>");
         }
 
         [Fact]
-        public void Rewrite_CanHandleSymbolBoundAttributes2()
+        public void CanHandleSymbolBoundAttributes2()
         {
             EvaluateData(SymbolBoundAttributes_Descriptors, "<ul bound [(item)]='items'></ul>");
         }
 
         [Fact]
-        public void Rewrite_CanHandleSymbolBoundAttributes3()
+        public void CanHandleSymbolBoundAttributes3()
         {
             EvaluateData(SymbolBoundAttributes_Descriptors, "<button bound (click)='doSomething()'>Click Me</button>");
         }
 
         [Fact]
-        public void Rewrite_CanHandleSymbolBoundAttributes4()
+        public void CanHandleSymbolBoundAttributes4()
         {
             EvaluateData(SymbolBoundAttributes_Descriptors, "<button bound (^click)='doSomething()'>Click Me</button>");
         }
 
         [Fact]
-        public void Rewrite_CanHandleSymbolBoundAttributes5()
+        public void CanHandleSymbolBoundAttributes5()
         {
             EvaluateData(SymbolBoundAttributes_Descriptors, "<template bound *something='value'></template>");
         }
 
         [Fact]
-        public void Rewrite_CanHandleSymbolBoundAttributes6()
+        public void CanHandleSymbolBoundAttributes6()
         {
             EvaluateData(SymbolBoundAttributes_Descriptors, "<div bound #localminimized></div>");
         }
 
         [Fact]
-        public void Rewrite_CanHandleSymbolBoundAttributes7()
+        public void CanHandleSymbolBoundAttributes7()
         {
             EvaluateData(SymbolBoundAttributes_Descriptors, "<div bound #local='value'></div>");
         }
@@ -102,31 +102,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_CanHandleWithoutEndTagTagStructure1()
+        public void CanHandleWithoutEndTagTagStructure1()
         {
             EvaluateData(WithoutEndTag_Descriptors, "<input>");
         }
 
         [Fact]
-        public void Rewrite_CanHandleWithoutEndTagTagStructure2()
+        public void CanHandleWithoutEndTagTagStructure2()
         {
             EvaluateData(WithoutEndTag_Descriptors, "<input type='text'>");
         }
 
         [Fact]
-        public void Rewrite_CanHandleWithoutEndTagTagStructure3()
+        public void CanHandleWithoutEndTagTagStructure3()
         {
             EvaluateData(WithoutEndTag_Descriptors, "<input><input>");
         }
 
         [Fact]
-        public void Rewrite_CanHandleWithoutEndTagTagStructure4()
+        public void CanHandleWithoutEndTagTagStructure4()
         {
             EvaluateData(WithoutEndTag_Descriptors, "<input type='text'><input>");
         }
 
         [Fact]
-        public void Rewrite_CanHandleWithoutEndTagTagStructure5()
+        public void CanHandleWithoutEndTagTagStructure5()
         {
             EvaluateData(WithoutEndTag_Descriptors, "<div><input><input></div>");
         }
@@ -153,7 +153,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_AllowsCompatibleTagStructures1()
+        public void AllowsCompatibleTagStructures1()
         {
             // Arrange
             var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.Unspecified, TagStructure.Unspecified);
@@ -163,7 +163,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_AllowsCompatibleTagStructures2()
+        public void AllowsCompatibleTagStructures2()
         {
             // Arrange
             var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.Unspecified, TagStructure.Unspecified);
@@ -173,7 +173,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_AllowsCompatibleTagStructures3()
+        public void AllowsCompatibleTagStructures3()
         {
             // Arrange
             var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.Unspecified, TagStructure.WithoutEndTag);
@@ -183,7 +183,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_AllowsCompatibleTagStructures4()
+        public void AllowsCompatibleTagStructures4()
         {
             // Arrange
             var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.WithoutEndTag, TagStructure.WithoutEndTag);
@@ -193,7 +193,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_AllowsCompatibleTagStructures5()
+        public void AllowsCompatibleTagStructures5()
         {
             // Arrange
             var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.Unspecified, TagStructure.NormalOrSelfClosing);
@@ -203,7 +203,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_AllowsCompatibleTagStructures6()
+        public void AllowsCompatibleTagStructures6()
         {
             // Arrange
             var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.Unspecified, TagStructure.WithoutEndTag);
@@ -213,7 +213,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_AllowsCompatibleTagStructures7()
+        public void AllowsCompatibleTagStructures7()
         {
             // Arrange
             var descriptors = GetTagStructureCompatibilityDescriptors(TagStructure.NormalOrSelfClosing, TagStructure.Unspecified);
@@ -223,163 +223,163 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes1()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes1()
         {
             RunParseTreeRewriterTest("<p class='", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes2()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes2()
         {
             RunParseTreeRewriterTest("<p bar=\"false\"\" <strong>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes3()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes3()
         {
             RunParseTreeRewriterTest("<p bar='false  <strong>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes4()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes4()
         {
             RunParseTreeRewriterTest("<p bar='false  <strong'", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes5()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes5()
         {
             RunParseTreeRewriterTest("<p bar=false'", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes6()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes6()
         {
             RunParseTreeRewriterTest("<p bar=\"false'", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes7()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes7()
         {
             RunParseTreeRewriterTest("<p bar=\"false' ></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes8()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes8()
         {
             RunParseTreeRewriterTest("<p foo bar<strong>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes9()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes9()
         {
             RunParseTreeRewriterTest("<p class=btn\" bar<strong>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes10()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes10()
         {
             RunParseTreeRewriterTest("<p class=btn\" bar=\"foo\"<strong>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes11()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes11()
         {
             RunParseTreeRewriterTest("<p class=\"btn bar=\"foo\"<strong>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes12()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes12()
         {
             RunParseTreeRewriterTest("<p class=\"btn bar=\"foo\"></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes13()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes13()
         {
             RunParseTreeRewriterTest("<p @DateTime.Now class=\"btn\"></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes14()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes14()
         {
             RunParseTreeRewriterTest("<p @DateTime.Now=\"btn\"></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes15()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes15()
         {
             RunParseTreeRewriterTest("<p class=@DateTime.Now\"></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes16()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes16()
         {
             RunParseTreeRewriterTest("<p class=\"@do {", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes17()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes17()
         {
             RunParseTreeRewriterTest("<p class=\"@do {\"></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes18()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes18()
         {
             RunParseTreeRewriterTest("<p @do { someattribute=\"btn\"></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelpersWithAttributes19()
+        public void CreatesErrorForMalformedTagHelpersWithAttributes19()
         {
             RunParseTreeRewriterTest("<p class=some=thing attr=\"@value\"></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelper1()
+        public void CreatesErrorForMalformedTagHelper1()
         {
             RunParseTreeRewriterTest("<p", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelper2()
+        public void CreatesErrorForMalformedTagHelper2()
         {
             RunParseTreeRewriterTest("<p></p", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelper3()
+        public void CreatesErrorForMalformedTagHelper3()
         {
             RunParseTreeRewriterTest("<p><strong", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelper4()
+        public void CreatesErrorForMalformedTagHelper4()
         {
             RunParseTreeRewriterTest("<strong <p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelper5()
+        public void CreatesErrorForMalformedTagHelper5()
         {
             RunParseTreeRewriterTest("<strong </strong", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelper6()
+        public void CreatesErrorForMalformedTagHelper6()
         {
             RunParseTreeRewriterTest("<<</strong> <<p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelper7()
+        public void CreatesErrorForMalformedTagHelper7()
         {
             RunParseTreeRewriterTest("<<<strong>> <<>>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForMalformedTagHelper8()
+        public void CreatesErrorForMalformedTagHelper8()
         {
             RunParseTreeRewriterTest("<str<strong></p></strong>", "strong", "p");
         }
@@ -407,67 +407,67 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes1()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes1()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"12\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes2()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes2()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person birthday=\"DateTime.Now\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes3()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes3()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"@DateTime.Now.Year\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes4()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes4()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\" @DateTime.Now.Year\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes5()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes5()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person name=\"John\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes6()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes6()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person name=\"Time: @DateTime.Now\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes7()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes7()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"1 + @value + 2\" birthday='(bool)@Bag[\"val\"] ? @@DateTime : @DateTime.Now'/>");
         }
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes8()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes8()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"12\" birthday=\"DateTime.Now\" name=\"Time: @DateTime.Now\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes9()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes9()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"12\" birthday=\"DateTime.Now\" name=\"Time: @@ @DateTime.Now\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes10()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes10()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"12\" birthday=\"DateTime.Now\" name=\"@@BoundStringAttribute\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesMarkupCodeSpansForNonStringTagHelperAttributes11()
+        public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes11()
         {
             EvaluateData(CodeTagHelperAttributes_Descriptors, "<person age=\"@@@(11+1)\" birthday=\"DateTime.Now\" name=\"Time: @DateTime.Now\" />");
         }
@@ -755,31 +755,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsEmptyAttributeTagHelpers1()
+        public void UnderstandsEmptyAttributeTagHelpers1()
         {
             RunParseTreeRewriterTest("<p class=\"\"></p>", "p");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsEmptyAttributeTagHelpers2()
+        public void UnderstandsEmptyAttributeTagHelpers2()
         {
             RunParseTreeRewriterTest("<p class=''></p>", "p");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsEmptyAttributeTagHelpers3()
+        public void UnderstandsEmptyAttributeTagHelpers3()
         {
             RunParseTreeRewriterTest("<p class=></p>", "p");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsEmptyAttributeTagHelpers4()
+        public void UnderstandsEmptyAttributeTagHelpers4()
         {
             RunParseTreeRewriterTest("<p class1='' class2= class3=\"\" />", "p");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsEmptyAttributeTagHelpers5()
+        public void UnderstandsEmptyAttributeTagHelpers5()
         {
             RunParseTreeRewriterTest("<p class1=''class2=\"\"class3= />", "p");
         }
@@ -802,85 +802,85 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes1()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes1()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='' />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes2()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes2()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='    true' />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes3()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes3()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='    ' />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes4()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes4()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound=''  bound=\"\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes5()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes5()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound=' '  bound=\"  \" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes6()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes6()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='true' bound=  />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes7()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes7()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound= name='' />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes8()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes8()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound= name='  ' />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes9()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes9()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='true' name='john' bound= name= />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes10()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes10()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth BouND='' />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes11()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes11()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth BOUND=''    bOUnd=\"\" />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes12()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes12()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth BOUND= nAMe='john'></myth>");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes13()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes13()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='    @true  ' />");
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForEmptyTagHelperBoundAttributes14()
+        public void CreatesErrorForEmptyTagHelperBoundAttributes14()
         {
             EvaluateData(EmptyTagHelperBoundAttribute_Descriptors, "<myth bound='    @(true)  ' />");
         }
@@ -1026,7 +1026,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Document1()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document1()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1037,7 +1037,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Document2()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document2()
         {
             // Arrange
             var document = "<input data-required='value' />";
@@ -1047,7 +1047,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Document3()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document3()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1058,7 +1058,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Document4()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document4()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1069,7 +1069,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Document5()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document5()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1080,7 +1080,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Document6()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document6()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1091,7 +1091,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Document7()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Document7()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1102,7 +1102,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Block1()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block1()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1116,7 +1116,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Block2()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block2()
         {
             // Arrange
             var document = "<input data-required='value' />";
@@ -1129,7 +1129,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Block3()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block3()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1143,7 +1143,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Block4()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block4()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1157,7 +1157,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Block5()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block5()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1171,7 +1171,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Block6()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block6()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1185,7 +1185,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_GeneratesExpectedOutputForUnboundDataDashAttributes_Block7()
+        public void GeneratesExpectedOutputForUnboundDataDashAttributes_Block7()
         {
             // Arrange
             var dateTimeNowString = "@DateTime.Now";
@@ -1257,7 +1257,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document1()
+        public void UnderstandsMinimizedAttributes_Document1()
         {
             // Arrange
             var document = "<input unbound-required />";
@@ -1267,7 +1267,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document2()
+        public void UnderstandsMinimizedAttributes_Document2()
         {
             // Arrange
             var document = "<p bound-string></p>";
@@ -1277,7 +1277,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document3()
+        public void UnderstandsMinimizedAttributes_Document3()
         {
             // Arrange
             var document = "<input bound-required-string />";
@@ -1287,7 +1287,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document4()
+        public void UnderstandsMinimizedAttributes_Document4()
         {
             // Arrange
             var document = "<input bound-required-int />";
@@ -1297,7 +1297,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document5()
+        public void UnderstandsMinimizedAttributes_Document5()
         {
             // Arrange
             var document = "<p bound-int></p>";
@@ -1307,7 +1307,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document6()
+        public void UnderstandsMinimizedAttributes_Document6()
         {
             // Arrange
             var document = "<input int-dictionary/>";
@@ -1317,7 +1317,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document7()
+        public void UnderstandsMinimizedAttributes_Document7()
         {
             // Arrange
             var document = "<input string-dictionary />";
@@ -1327,7 +1327,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document8()
+        public void UnderstandsMinimizedAttributes_Document8()
         {
             // Arrange
             var document = "<input int-prefix- />";
@@ -1337,7 +1337,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document9()
+        public void UnderstandsMinimizedAttributes_Document9()
         {
             // Arrange
             var document = "<input string-prefix-/>";
@@ -1347,7 +1347,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document10()
+        public void UnderstandsMinimizedAttributes_Document10()
         {
             // Arrange
             var document = "<input int-prefix-value/>";
@@ -1357,7 +1357,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document11()
+        public void UnderstandsMinimizedAttributes_Document11()
         {
             // Arrange
             var document = "<input string-prefix-value />";
@@ -1367,7 +1367,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document12()
+        public void UnderstandsMinimizedAttributes_Document12()
         {
             // Arrange
             var document = "<input int-prefix-value='' />";
@@ -1377,7 +1377,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document13()
+        public void UnderstandsMinimizedAttributes_Document13()
         {
             // Arrange
             var document = "<input string-prefix-value=''/>";
@@ -1387,7 +1387,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document14()
+        public void UnderstandsMinimizedAttributes_Document14()
         {
             // Arrange
             var document = "<input int-prefix-value='3'/>";
@@ -1397,7 +1397,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document15()
+        public void UnderstandsMinimizedAttributes_Document15()
         {
             // Arrange
             var document = "<input string-prefix-value='some string' />";
@@ -1407,7 +1407,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document16()
+        public void UnderstandsMinimizedAttributes_Document16()
         {
             // Arrange
             var document = "<input unbound-required bound-required-string />";
@@ -1417,7 +1417,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document17()
+        public void UnderstandsMinimizedAttributes_Document17()
         {
             // Arrange
             var document = "<p bound-int bound-string></p>";
@@ -1427,7 +1427,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document18()
+        public void UnderstandsMinimizedAttributes_Document18()
         {
             // Arrange
             var document = "<input bound-required-int unbound-required bound-required-string />";
@@ -1437,7 +1437,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document19()
+        public void UnderstandsMinimizedAttributes_Document19()
         {
             // Arrange
             var document = "<p bound-int bound-string bound-string></p>";
@@ -1447,7 +1447,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document20()
+        public void UnderstandsMinimizedAttributes_Document20()
         {
             // Arrange
             var document = "<input unbound-required class='btn' />";
@@ -1457,7 +1457,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document21()
+        public void UnderstandsMinimizedAttributes_Document21()
         {
             // Arrange
             var document = "<p bound-string class='btn'></p>";
@@ -1467,7 +1467,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document22()
+        public void UnderstandsMinimizedAttributes_Document22()
         {
             // Arrange
             var document = "<input class='btn' unbound-required />";
@@ -1477,7 +1477,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document23()
+        public void UnderstandsMinimizedAttributes_Document23()
         {
             // Arrange
             var document = "<p class='btn' bound-string></p>";
@@ -1487,7 +1487,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document24()
+        public void UnderstandsMinimizedAttributes_Document24()
         {
             // Arrange
             var document = "<input bound-required-string class='btn' />";
@@ -1497,7 +1497,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document25()
+        public void UnderstandsMinimizedAttributes_Document25()
         {
             // Arrange
             var document = "<input class='btn' bound-required-string />";
@@ -1507,7 +1507,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document26()
+        public void UnderstandsMinimizedAttributes_Document26()
         {
             // Arrange
             var document = "<input bound-required-int class='btn' />";
@@ -1517,7 +1517,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document27()
+        public void UnderstandsMinimizedAttributes_Document27()
         {
             // Arrange
             var document = "<p bound-int class='btn'></p>";
@@ -1527,7 +1527,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document28()
+        public void UnderstandsMinimizedAttributes_Document28()
         {
             // Arrange
             var document = "<input class='btn' bound-required-int />";
@@ -1537,7 +1537,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document29()
+        public void UnderstandsMinimizedAttributes_Document29()
         {
             // Arrange
             var document = "<p class='btn' bound-int></p>";
@@ -1547,7 +1547,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document30()
+        public void UnderstandsMinimizedAttributes_Document30()
         {
             // Arrange
             var expressionString = "@DateTime.Now + 1";
@@ -1558,7 +1558,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document31()
+        public void UnderstandsMinimizedAttributes_Document31()
         {
             // Arrange
             var expressionString = "@DateTime.Now + 1";
@@ -1569,7 +1569,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document32()
+        public void UnderstandsMinimizedAttributes_Document32()
         {
             // Arrange
             var expressionString = "@DateTime.Now + 1";
@@ -1580,7 +1580,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Document33()
+        public void UnderstandsMinimizedAttributes_Document33()
         {
             // Arrange
             var expressionString = "@DateTime.Now + 1";
@@ -1591,7 +1591,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block1()
+        public void UnderstandsMinimizedAttributes_Block1()
         {
             // Arrange
             var document = "<input unbound-required />";
@@ -1604,7 +1604,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block2()
+        public void UnderstandsMinimizedAttributes_Block2()
         {
             // Arrange
             var document = "<p bound-string></p>";
@@ -1617,7 +1617,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block3()
+        public void UnderstandsMinimizedAttributes_Block3()
         {
             // Arrange
             var document = "<input bound-required-string />";
@@ -1630,7 +1630,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block4()
+        public void UnderstandsMinimizedAttributes_Block4()
         {
             // Arrange
             var document = "<input bound-required-int />";
@@ -1643,7 +1643,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block5()
+        public void UnderstandsMinimizedAttributes_Block5()
         {
             // Arrange
             var document = "<p bound-int></p>";
@@ -1656,7 +1656,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block6()
+        public void UnderstandsMinimizedAttributes_Block6()
         {
             // Arrange
             var document = "<input int-dictionary/>";
@@ -1669,7 +1669,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block7()
+        public void UnderstandsMinimizedAttributes_Block7()
         {
             // Arrange
             var document = "<input string-dictionary />";
@@ -1682,7 +1682,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block8()
+        public void UnderstandsMinimizedAttributes_Block8()
         {
             // Arrange
             var document = "<input int-prefix- />";
@@ -1695,7 +1695,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block9()
+        public void UnderstandsMinimizedAttributes_Block9()
         {
             // Arrange
             var document = "<input string-prefix-/>";
@@ -1708,7 +1708,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block10()
+        public void UnderstandsMinimizedAttributes_Block10()
         {
             // Arrange
             var document = "<input int-prefix-value/>";
@@ -1721,7 +1721,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block11()
+        public void UnderstandsMinimizedAttributes_Block11()
         {
             // Arrange
             var document = "<input string-prefix-value />";
@@ -1734,7 +1734,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block12()
+        public void UnderstandsMinimizedAttributes_Block12()
         {
             // Arrange
             var document = "<input int-prefix-value='' />";
@@ -1747,7 +1747,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block13()
+        public void UnderstandsMinimizedAttributes_Block13()
         {
             // Arrange
             var document = "<input string-prefix-value=''/>";
@@ -1760,7 +1760,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block14()
+        public void UnderstandsMinimizedAttributes_Block14()
         {
             // Arrange
             var document = "<input int-prefix-value='3'/>";
@@ -1773,7 +1773,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block15()
+        public void UnderstandsMinimizedAttributes_Block15()
         {
             // Arrange
             var document = "<input string-prefix-value='some string' />";
@@ -1786,7 +1786,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block16()
+        public void UnderstandsMinimizedAttributes_Block16()
         {
             // Arrange
             var document = "<input unbound-required bound-required-string />";
@@ -1799,7 +1799,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block17()
+        public void UnderstandsMinimizedAttributes_Block17()
         {
             // Arrange
             var document = "<p bound-int bound-string></p>";
@@ -1812,7 +1812,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block18()
+        public void UnderstandsMinimizedAttributes_Block18()
         {
             // Arrange
             var document = "<input bound-required-int unbound-required bound-required-string />";
@@ -1825,7 +1825,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block19()
+        public void UnderstandsMinimizedAttributes_Block19()
         {
             // Arrange
             var document = "<p bound-int bound-string bound-string></p>";
@@ -1838,7 +1838,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block20()
+        public void UnderstandsMinimizedAttributes_Block20()
         {
             // Arrange
             var document = "<input unbound-required class='btn' />";
@@ -1851,7 +1851,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block21()
+        public void UnderstandsMinimizedAttributes_Block21()
         {
             // Arrange
             var document = "<p bound-string class='btn'></p>";
@@ -1864,7 +1864,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block22()
+        public void UnderstandsMinimizedAttributes_Block22()
         {
             // Arrange
             var document = "<input class='btn' unbound-required />";
@@ -1877,7 +1877,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block23()
+        public void UnderstandsMinimizedAttributes_Block23()
         {
             // Arrange
             var document = "<p class='btn' bound-string></p>";
@@ -1890,7 +1890,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block24()
+        public void UnderstandsMinimizedAttributes_Block24()
         {
             // Arrange
             var document = "<input bound-required-string class='btn' />";
@@ -1903,7 +1903,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block25()
+        public void UnderstandsMinimizedAttributes_Block25()
         {
             // Arrange
             var document = "<input class='btn' bound-required-string />";
@@ -1916,7 +1916,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block26()
+        public void UnderstandsMinimizedAttributes_Block26()
         {
             // Arrange
             var document = "<input bound-required-int class='btn' />";
@@ -1929,7 +1929,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block27()
+        public void UnderstandsMinimizedAttributes_Block27()
         {
             // Arrange
             var document = "<p bound-int class='btn'></p>";
@@ -1942,7 +1942,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block28()
+        public void UnderstandsMinimizedAttributes_Block28()
         {
             // Arrange
             var document = "<input class='btn' bound-required-int />";
@@ -1955,7 +1955,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block29()
+        public void UnderstandsMinimizedAttributes_Block29()
         {
             // Arrange
             var document = "<p class='btn' bound-int></p>";
@@ -1968,7 +1968,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block30()
+        public void UnderstandsMinimizedAttributes_Block30()
         {
             // Arrange
             var expressionString = "@DateTime.Now + 1";
@@ -1982,7 +1982,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block31()
+        public void UnderstandsMinimizedAttributes_Block31()
         {
             // Arrange
             var expressionString = "@DateTime.Now + 1";
@@ -1996,7 +1996,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block32()
+        public void UnderstandsMinimizedAttributes_Block32()
         {
             // Arrange
             var expressionString = "@DateTime.Now + 1";
@@ -2010,7 +2010,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_Block33()
+        public void UnderstandsMinimizedAttributes_Block33()
         {
             // Arrange
             var expressionString = "@DateTime.Now + 1";
@@ -2024,55 +2024,55 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_PartialTags1()
+        public void UnderstandsMinimizedAttributes_PartialTags1()
         {
             EvaluateData(MinimizedAttribute_Descriptors, "<input unbound-required");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_PartialTags2()
+        public void UnderstandsMinimizedAttributes_PartialTags2()
         {
             EvaluateData(MinimizedAttribute_Descriptors, "<input bound-required-string");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_PartialTags3()
+        public void UnderstandsMinimizedAttributes_PartialTags3()
         {
             EvaluateData(MinimizedAttribute_Descriptors, "<input bound-required-int");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_PartialTags4()
+        public void UnderstandsMinimizedAttributes_PartialTags4()
         {
             EvaluateData(MinimizedAttribute_Descriptors, "<input bound-required-int unbound-required bound-required-string");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_PartialTags5()
+        public void UnderstandsMinimizedAttributes_PartialTags5()
         {
             EvaluateData(MinimizedAttribute_Descriptors, "<p bound-string");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_PartialTags6()
+        public void UnderstandsMinimizedAttributes_PartialTags6()
         {
             EvaluateData(MinimizedAttribute_Descriptors, "<p bound-int");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_PartialTags7()
+        public void UnderstandsMinimizedAttributes_PartialTags7()
         {
             EvaluateData(MinimizedAttribute_Descriptors, "<p bound-int bound-string");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedAttributes_PartialTags8()
+        public void UnderstandsMinimizedAttributes_PartialTags8()
         {
             EvaluateData(MinimizedAttribute_Descriptors, "<input bound-required-int unbound-required bound-required-string<p bound-int bound-string");
         }
 
         [Fact]
-        public void Rewrite_UnderstandsMinimizedBooleanBoundAttributes()
+        public void UnderstandsMinimizedBooleanBoundAttributes()
         {
             // Arrange
             var document = "<input boundbool boundbooldict-key />";
@@ -2101,7 +2101,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes()
+        public void FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes()
         {
             // Arrange
             var document = "<input boundbool boundbooldict-key />";
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs
index c4454c18ef..76ef95f37a 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs
@@ -82,42 +82,42 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_UnderstandsPartialRequiredParentTags1()
+        public void UnderstandsPartialRequiredParentTags1()
         {
             var document = "<p><strong>";
             EvaluateData(PartialRequiredParentTags_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsPartialRequiredParentTags2()
+        public void UnderstandsPartialRequiredParentTags2()
         {
             var document = "<p><strong></strong>";
             EvaluateData(PartialRequiredParentTags_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsPartialRequiredParentTags3()
+        public void UnderstandsPartialRequiredParentTags3()
         {
             var document = "<p><strong></p><strong>";
             EvaluateData(PartialRequiredParentTags_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsPartialRequiredParentTags4()
+        public void UnderstandsPartialRequiredParentTags4()
         {
             var document = "<<p><<strong></</strong</strong></p>";
             EvaluateData(PartialRequiredParentTags_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsPartialRequiredParentTags5()
+        public void UnderstandsPartialRequiredParentTags5()
         {
             var document = "<<p><<strong></</strong></strong></p>";
             EvaluateData(PartialRequiredParentTags_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsPartialRequiredParentTags6()
+        public void UnderstandsPartialRequiredParentTags6()
         {
             var document = "<<p><<custom></<</custom></custom></p>";
             EvaluateData(PartialRequiredParentTags_Descriptors, document);
@@ -147,56 +147,56 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_UnderstandsNestedVoidSelfClosingRequiredParent1()
+        public void UnderstandsNestedVoidSelfClosingRequiredParent1()
         {
             var document = "<input><strong></strong>";
             EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedVoidSelfClosingRequiredParent2()
+        public void UnderstandsNestedVoidSelfClosingRequiredParent2()
         {
             var document = "<p><input><strong></strong></p>";
             EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedVoidSelfClosingRequiredParent3()
+        public void UnderstandsNestedVoidSelfClosingRequiredParent3()
         {
             var document = "<p><br><strong></strong></p>";
             EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedVoidSelfClosingRequiredParent4()
+        public void UnderstandsNestedVoidSelfClosingRequiredParent4()
         {
             var document = "<p><p><br></p><strong></strong></p>";
             EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedVoidSelfClosingRequiredParent5()
+        public void UnderstandsNestedVoidSelfClosingRequiredParent5()
         {
             var document = "<input><strong></strong>";
             EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedVoidSelfClosingRequiredParent6()
+        public void UnderstandsNestedVoidSelfClosingRequiredParent6()
         {
             var document = "<p><input /><strong /></p>";
             EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedVoidSelfClosingRequiredParent7()
+        public void UnderstandsNestedVoidSelfClosingRequiredParent7()
         {
             var document = "<p><br /><strong /></p>";
             EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedVoidSelfClosingRequiredParent8()
+        public void UnderstandsNestedVoidSelfClosingRequiredParent8()
         {
             var document = "<p><p><br /></p><strong /></p>";
             EvaluateData(NestedVoidSelfClosingRequiredParent_Descriptors, document);
@@ -220,42 +220,42 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_UnderstandsNestedRequiredParent1()
+        public void UnderstandsNestedRequiredParent1()
         {
             var document = "<strong></strong>";
             EvaluateData(NestedRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedRequiredParent2()
+        public void UnderstandsNestedRequiredParent2()
         {
             var document = "<p><strong></strong></p>";
             EvaluateData(NestedRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedRequiredParent3()
+        public void UnderstandsNestedRequiredParent3()
         {
             var document = "<div><strong></strong></div>";
             EvaluateData(NestedRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedRequiredParent4()
+        public void UnderstandsNestedRequiredParent4()
         {
             var document = "<strong><strong></strong></strong>";
             EvaluateData(NestedRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNestedRequiredParent5()
+        public void UnderstandsNestedRequiredParent5()
         {
             var document = "<p><strong><strong></strong></strong></p>";
             EvaluateData(NestedRequiredParent_Descriptors, document);
         }
 
         [Fact]
-        public void Rewrite_UnderstandsTagHelperPrefixAndAllowedChildren()
+        public void UnderstandsTagHelperPrefixAndAllowedChildren()
         {
             // Arrange
             var documentContent = "<th:p><th:strong></th:strong></th:p>";
@@ -278,7 +278,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent()
+        public void UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent()
         {
             // Arrange
             var documentContent = "<th:p><th:strong></th:strong></th:p>";
@@ -301,8 +301,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_InvalidStructure_UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent()
+        public void InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent()
         {
+            // Rewrite_InvalidStructure_UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent
             // Arrange
             var documentContent = "<th:p></th:strong></th:p>";
             var descriptors = new TagHelperDescriptor[]
@@ -324,7 +325,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren()
+        public void NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren()
         {
             // Arrange
             var documentContent = "<th:p><strong></strong></th:p>";
@@ -344,63 +345,63 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1()
+        public void DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1()
         {
             var document = "<script type><input /></script>";
             RunParseTreeRewriterTest(document, "input");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2()
+        public void DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2()
         {
             var document = "<script types='text/html'><input /></script>";
             RunParseTreeRewriterTest(document, "input");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3()
+        public void DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3()
         {
             var document = "<script type='text/html invalid'><input /></script>";
             RunParseTreeRewriterTest(document, "input");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4()
+        public void DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4()
         {
             var document = "<script type='text/ng-*' type='text/html'><input /></script>";
             RunParseTreeRewriterTest(document, "input");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_UnderstandsTagHelpersInHtmlTypedScriptTags1()
+        public void UnderstandsTagHelpersInHtmlTypedScriptTags1()
         {
             var document = "<script type='text/html'><input /></script>";
             RunParseTreeRewriterTest(document, "p", "input");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_UnderstandsTagHelpersInHtmlTypedScriptTags2()
+        public void UnderstandsTagHelpersInHtmlTypedScriptTags2()
         {
             var document = "<script id='scriptTag' type='text/html' class='something'><input /></script>";
             RunParseTreeRewriterTest(document, "p", "input");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_UnderstandsTagHelpersInHtmlTypedScriptTags3()
+        public void UnderstandsTagHelpersInHtmlTypedScriptTags3()
         {
             var document = "<script type='text/html'><p><script type='text/html'><input /></script></p></script>";
             RunParseTreeRewriterTest(document, "p", "input");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_UnderstandsTagHelpersInHtmlTypedScriptTags4()
+        public void UnderstandsTagHelpersInHtmlTypedScriptTags4()
         {
             var document = "<script type='text/html'><p><script type='text/ html'><input /></script></p></script>";
             RunParseTreeRewriterTest(document, "p", "input");
         }
 
         [Fact]
-        public void Rewrite_CanHandleInvalidChildrenWithWhitespace()
+        public void CanHandleInvalidChildrenWithWhitespace()
         {
             // Arrange
             var documentContent = $"<p>{Environment.NewLine}    <strong>{Environment.NewLine}        Hello" +
@@ -418,7 +419,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_RecoversWhenRequiredAttributeMismatchAndRestrictedChildren()
+        public void RecoversWhenRequiredAttributeMismatchAndRestrictedChildren()
         {
             // Arrange
             var documentContent = "<strong required><strong></strong></strong>";
@@ -438,7 +439,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_CanHandleMultipleTagHelpersWithAllowedChildren_OneNull()
+        public void CanHandleMultipleTagHelpersWithAllowedChildren_OneNull()
         {
             // Arrange
             var documentContent = "<p><strong>Hello World</strong><br></p>";
@@ -468,7 +469,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_CanHandleMultipleTagHelpersWithAllowedChildren()
+        public void CanHandleMultipleTagHelpersWithAllowedChildren()
         {
             // Arrange
             var documentContent = "<p><strong>Hello World</strong><br></p>";
@@ -498,7 +499,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren1()
+        public void UnderstandsAllowedChildren1()
         {
             // Arrange
             var documentContent = "<p><br /></p>";
@@ -509,7 +510,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren2()
+        public void UnderstandsAllowedChildren2()
         {
             // Arrange
             var documentContent = $"<p>{Environment.NewLine}<br />{Environment.NewLine}</p>";
@@ -520,7 +521,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren3()
+        public void UnderstandsAllowedChildren3()
         {
             // Arrange
             var documentContent = "<p><br></p>";
@@ -531,7 +532,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren4()
+        public void UnderstandsAllowedChildren4()
         {
             // Arrange
             var documentContent = "<p>Hello</p>";
@@ -542,7 +543,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren5()
+        public void UnderstandsAllowedChildren5()
         {
             // Arrange
             var documentContent = "<p><hr /></p>";
@@ -553,7 +554,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren6()
+        public void UnderstandsAllowedChildren6()
         {
             // Arrange
             var documentContent = "<p><br>Hello</p>";
@@ -564,7 +565,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren7()
+        public void UnderstandsAllowedChildren7()
         {
             // Arrange
             var documentContent = "<p><strong>Title:</strong><br />Something</p>";
@@ -575,7 +576,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren8()
+        public void UnderstandsAllowedChildren8()
         {
             // Arrange
             var documentContent = "<p><strong>Title:</strong><br />Something</p>";
@@ -586,7 +587,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren9()
+        public void UnderstandsAllowedChildren9()
         {
             // Arrange
             var documentContent = "<p>  <strong>Title:</strong>  <br />  Something</p>";
@@ -597,7 +598,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren10()
+        public void UnderstandsAllowedChildren10()
         {
             // Arrange
             var documentContent = "<p><strong>Title:<br><em>A Very Cool</em></strong><br />Something</p>";
@@ -608,7 +609,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren11()
+        public void UnderstandsAllowedChildren11()
         {
             // Arrange
             var documentContent = "<p><custom>Title:<br><em>A Very Cool</em></custom><br />Something</p>";
@@ -619,7 +620,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren12()
+        public void UnderstandsAllowedChildren12()
         {
             // Arrange
             var documentContent = "<p></</p>";
@@ -630,7 +631,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren13()
+        public void UnderstandsAllowedChildren13()
         {
             // Arrange
             var documentContent = "<p><</p>";
@@ -641,7 +642,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsAllowedChildren14()
+        public void UnderstandsAllowedChildren14()
         {
             // Arrange
             var documentContent = "<p><custom><br>:<strong><strong>Hello</strong></strong>:<input></custom></p>";
@@ -679,7 +680,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_AllowsSimpleHtmlCommentsAsChildren()
+        public void AllowsSimpleHtmlCommentsAsChildren()
         {
             // Arrange
             var allowedChildren = new List<string> { "b" };
@@ -705,7 +706,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff()
+        public void DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff()
         {
             // Arrange
             var allowedChildren = new List<string> { "b" };
@@ -733,7 +734,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_FailsForContentWithCommentsAsChildren()
+        public void FailsForContentWithCommentsAsChildren()
         {
             // Arrange
             var allowedChildren = new List<string> { "b" };
@@ -760,7 +761,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_AllowsRazorCommentsAsChildren()
+        public void AllowsRazorCommentsAsChildren()
         {
             // Arrange
             var allowedChildren = new List<string> { "b" };
@@ -786,7 +787,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_AllowsRazorMarkupInHtmlComment()
+        public void AllowsRazorMarkupInHtmlComment()
         {
             // Arrange
             var allowedChildren = new List<string> { "b" };
@@ -815,7 +816,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNullTagNameWithAllowedChildrenForCatchAll()
+        public void UnderstandsNullTagNameWithAllowedChildrenForCatchAll()
         {
             // Arrange
             var documentContent = "<p></</p>";
@@ -835,7 +836,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix()
+        public void UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix()
         {
             // Arrange
             var documentContent = "<th:p></</th:p>";
@@ -855,7 +856,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_CanHandleStartTagOnlyTagTagMode()
+        public void CanHandleStartTagOnlyTagTagMode()
         {
             // Arrange
             var documentContent = "<input>";
@@ -874,7 +875,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForWithoutEndTagTagStructureForEndTags()
+        public void CreatesErrorForWithoutEndTagTagStructureForEndTags()
         {
             // Arrange
             var documentContent = "</input>";
@@ -893,7 +894,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         [Fact]
-        public void Rewrite_CreatesErrorForInconsistentTagStructures()
+        public void CreatesErrorForInconsistentTagStructures()
         {
             // Arrange
             var documentContent = "<input>";
@@ -941,181 +942,181 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p></p>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div></div>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p class=\"btn\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p class=\"@DateTime.Now\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p class=\"btn\">words and spaces</p>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p class=\"@DateTime.Now\">words and spaces</p>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p class=\"btn\">words<strong>and</strong>spaces</p>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<strong catchAll=\"hi\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<strong catchAll=\"@DateTime.Now\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<strong catchAll=\"hi\">words and spaces</strong>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<strong catchAll=\"@DateTime.Now\">words and spaces</strong>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div class=\"btn\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div class=\"btn\"></div>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p notRequired=\"a\" class=\"btn\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p notRequired=\"@DateTime.Now\" class=\"btn\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p notRequired=\"a\" class=\"btn\">words and spaces</p>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div style=\"@DateTime.Now\" class=\"btn\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\">words and spaces</div>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div style=\"@DateTime.Now\" class=\"@DateTime.Now\">words and spaces</div>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\">words<strong>and</strong>spaces</div>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p class=\"btn\" catchAll=\"hi\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<p class=\"btn\" catchAll=\"hi\">words and spaces</p>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\" catchAll=\"hi\" />");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\" catchAll=\"hi\" >words and spaces</div>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\" catchAll=\"@@hi\" >words and spaces</div>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div style=\"@DateTime.Now\" class=\"@DateTime.Now\" catchAll=\"@DateTime.Now\" >words and spaces</div>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30()
+        public void RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30()
         {
             EvaluateData(RequiredAttribute_Descriptors, "<div style=\"\" class=\"btn\" catchAll=\"hi\" >words<strong>and</strong>spaces</div>");
         }
@@ -1137,61 +1138,61 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1()
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1()
         {
             EvaluateData(NestedRequiredAttribute_Descriptors, "<p class=\"btn\"><p></p></p>");
         }
 
         [Fact]
-        public void Rewrite_NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2()
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2()
         {
             EvaluateData(NestedRequiredAttribute_Descriptors, "<strong catchAll=\"hi\"><strong></strong></strong>");
         }
 
         [Fact]
-        public void Rewrite_NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3()
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3()
         {
             EvaluateData(NestedRequiredAttribute_Descriptors, "<p class=\"btn\"><strong><p></p></strong></p>");
         }
 
         [Fact]
-        public void Rewrite_NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4()
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4()
         {
             EvaluateData(NestedRequiredAttribute_Descriptors, "<strong catchAll=\"hi\"><p><strong></strong></p></strong>");
         }
 
         [Fact]
-        public void Rewrite_NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5()
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5()
         {
             EvaluateData(NestedRequiredAttribute_Descriptors, "<p class=\"btn\"><strong catchAll=\"hi\"><p></p></strong></p>");
         }
 
         [Fact]
-        public void Rewrite_NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6()
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6()
         {
             EvaluateData(NestedRequiredAttribute_Descriptors, "<strong catchAll=\"hi\"><p class=\"btn\"><strong></strong></p></strong>");
         }
 
         [Fact]
-        public void Rewrite_NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7()
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7()
         {
             EvaluateData(NestedRequiredAttribute_Descriptors, "<p class=\"btn\"><p class=\"btn\"><p></p></p></p>");
         }
 
         [Fact]
-        public void Rewrite_NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8()
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8()
         {
             EvaluateData(NestedRequiredAttribute_Descriptors, "<strong catchAll=\"hi\"><strong catchAll=\"hi\"><strong></strong></strong></strong>");
         }
 
         [Fact]
-        public void Rewrite_NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9()
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9()
         {
             EvaluateData(NestedRequiredAttribute_Descriptors, "<p class=\"btn\"><p><p><p class=\"btn\"><p></p></p></p></p></p>");
         }
 
         [Fact]
-        public void Rewrite_NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10()
+        public void NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10()
         {
             EvaluateData(NestedRequiredAttribute_Descriptors, "<strong catchAll=\"hi\"><strong><strong><strong catchAll=\"hi\"><strong></strong></strong></strong></strong></strong>");
         }
@@ -1207,61 +1208,61 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1()
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1()
         {
             EvaluateData(MalformedRequiredAttribute_Descriptors, "<p");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2()
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2()
         {
             EvaluateData(MalformedRequiredAttribute_Descriptors, "<p class=\"btn\"");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3()
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3()
         {
             EvaluateData(MalformedRequiredAttribute_Descriptors, "<p notRequired=\"hi\" class=\"btn\"");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4()
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4()
         {
             EvaluateData(MalformedRequiredAttribute_Descriptors, "<p></p");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5()
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5()
         {
             EvaluateData(MalformedRequiredAttribute_Descriptors, "<p class=\"btn\"></p");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6()
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6()
         {
             EvaluateData(MalformedRequiredAttribute_Descriptors, "<p notRequired=\"hi\" class=\"btn\"></p");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7()
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7()
         {
             EvaluateData(MalformedRequiredAttribute_Descriptors, "<p class=\"btn\" <p>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8()
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8()
         {
             EvaluateData(MalformedRequiredAttribute_Descriptors, "<p notRequired=\"hi\" class=\"btn\" <p>");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9()
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9()
         {
             EvaluateData(MalformedRequiredAttribute_Descriptors, "<p class=\"btn\" </p");
         }
 
         [Fact]
-        public void Rewrite_RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10()
+        public void RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10()
         {
             EvaluateData(MalformedRequiredAttribute_Descriptors, "<p notRequired=\"hi\" class=\"btn\" </p");
         }
@@ -1289,583 +1290,583 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         };
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers1()
+        public void AllowsPrefixedTagHelpers1()
         {
             EvaluateData(PrefixedTagHelperCatchAll_Descriptors, "<th: />", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers2()
+        public void AllowsPrefixedTagHelpers2()
         {
             EvaluateData(PrefixedTagHelperCatchAll_Descriptors, "<th:>words and spaces</th:>", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers3()
+        public void AllowsPrefixedTagHelpers3()
         {
             EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth />", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers4()
+        public void AllowsPrefixedTagHelpers4()
         {
             EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth></th:myth>", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers5()
+        public void AllowsPrefixedTagHelpers5()
         {
             EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth><th:my2th></th:my2th></th:myth>", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers6()
+        public void AllowsPrefixedTagHelpers6()
         {
             EvaluateData(PrefixedTagHelperColon_Descriptors, "<!th:myth />", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers7()
+        public void AllowsPrefixedTagHelpers7()
         {
             EvaluateData(PrefixedTagHelperColon_Descriptors, "<!th:myth></!th:myth>", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers8()
+        public void AllowsPrefixedTagHelpers8()
         {
             EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth class=\"btn\" />", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers9()
+        public void AllowsPrefixedTagHelpers9()
         {
             EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth2 class=\"btn\" />", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers10()
+        public void AllowsPrefixedTagHelpers10()
         {
             EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth class=\"btn\">words and spaces</th:myth>", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsPrefixedTagHelpers11()
+        public void AllowsPrefixedTagHelpers11()
         {
             EvaluateData(PrefixedTagHelperColon_Descriptors, "<th:myth2 bound=\"@DateTime.Now\" />", tagHelperPrefix: "th:");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithAttributeTextTag1()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1()
         {
             RunParseTreeRewriterTest("@{<!text class=\"btn\">}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithAttributeTextTag2()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2()
         {
             RunParseTreeRewriterTest("@{<!text class=\"btn\"></!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithAttributeTextTag3()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3()
         {
             RunParseTreeRewriterTest("@{<!text class=\"btn\">words with spaces</!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithAttributeTextTag4()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4()
         {
             RunParseTreeRewriterTest("@{<!text class='btn1 btn2' class2=btn></!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithAttributeTextTag5()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5()
         {
             RunParseTreeRewriterTest("@{<!text class='btn1 @DateTime.Now btn2'></!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1()
         {
             RunParseTreeRewriterTest("@{<!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2()
         {
             RunParseTreeRewriterTest("@{</!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3()
         {
             RunParseTreeRewriterTest("@{<!text></!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4()
         {
             RunParseTreeRewriterTest("@{<!text>words and spaces</!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5()
         {
             RunParseTreeRewriterTest("@{<!text></text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6()
         {
             RunParseTreeRewriterTest("@{<text></!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7()
         {
             RunParseTreeRewriterTest("@{<!text><text></text></!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8()
         {
             RunParseTreeRewriterTest("@{<text><!text></!text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9()
+        public void AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9()
         {
             RunParseTreeRewriterTest("@{<!text></!text></text>}", "p", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1()
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1()
         {
             RunParseTreeRewriterTest("@{<!text}", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2()
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2()
         {
             RunParseTreeRewriterTest("@{<!text /}", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3()
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3()
         {
             RunParseTreeRewriterTest("@{<!text class=}", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4()
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4()
         {
             RunParseTreeRewriterTest("@{<!text class=\"btn}", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5()
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5()
         {
             RunParseTreeRewriterTest("@{<!text class=\"btn\"}", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6()
+        public void AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6()
         {
             RunParseTreeRewriterTest("@{<!text class=\"btn\" /}", "text");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1()
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1()
         {
             RunParseTreeRewriterTest("@{<!}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2()
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2()
         {
             RunParseTreeRewriterTest("@{<!p}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3()
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3()
         {
             RunParseTreeRewriterTest("@{<!p /}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4()
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4()
         {
             RunParseTreeRewriterTest("@{<!p class=}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5()
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5()
         {
             RunParseTreeRewriterTest("@{<!p class=\"btn}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6()
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6()
         {
             RunParseTreeRewriterTest("@{<!p class=\"btn@@}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7()
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7()
         {
             RunParseTreeRewriterTest("@{<!p class=\"btn\"}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8()
+        public void AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8()
         {
             RunParseTreeRewriterTest("@{<!p class=\"btn\" /}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTML1()
+        public void AllowsTagHelperElementOptForIncompleteHTML1()
         {
             RunParseTreeRewriterTest("<!", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTML2()
+        public void AllowsTagHelperElementOptForIncompleteHTML2()
         {
             RunParseTreeRewriterTest("<!p", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTML3()
+        public void AllowsTagHelperElementOptForIncompleteHTML3()
         {
             RunParseTreeRewriterTest("<!p /", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTML4()
+        public void AllowsTagHelperElementOptForIncompleteHTML4()
         {
             RunParseTreeRewriterTest("<!p class=", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTML5()
+        public void AllowsTagHelperElementOptForIncompleteHTML5()
         {
             RunParseTreeRewriterTest("<!p class=\"btn", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTML6()
+        public void AllowsTagHelperElementOptForIncompleteHTML6()
         {
             RunParseTreeRewriterTest("<!p class=\"btn\"", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptForIncompleteHTML7()
+        public void AllowsTagHelperElementOptForIncompleteHTML7()
         {
             RunParseTreeRewriterTest("<!p class=\"btn\" /", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData1()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData1()
         {
             RunParseTreeRewriterTest("@{<!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData2()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData2()
         {
             RunParseTreeRewriterTest("@{</!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData3()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData3()
         {
             RunParseTreeRewriterTest("@{<!p></!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData4()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData4()
         {
             RunParseTreeRewriterTest("@{<!p>words and spaces</!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData5()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData5()
         {
             RunParseTreeRewriterTest("@{<!p></p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData6()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData6()
         {
             RunParseTreeRewriterTest("@{<p></!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData7()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData7()
         {
             RunParseTreeRewriterTest("@{<p><!p></!p></p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData8()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData8()
         {
             RunParseTreeRewriterTest("@{<p><!p></!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData9()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData9()
         {
             RunParseTreeRewriterTest("@{<!p></!p></p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData10()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData10()
         {
             RunParseTreeRewriterTest("@{<strong></!p></strong>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData11()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData11()
         {
             RunParseTreeRewriterTest("@{<strong></strong><!p></!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithBlockData12()
+        public void AllowsTagHelperElementOptOutCSharp_WithBlockData12()
         {
             RunParseTreeRewriterTest("@{<p><strong></!strong><!p></strong></!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithAttributeData1()
+        public void AllowsTagHelperElementOptOutCSharp_WithAttributeData1()
         {
             RunParseTreeRewriterTest("@{<!p class=\"btn\">}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithAttributeData2()
+        public void AllowsTagHelperElementOptOutCSharp_WithAttributeData2()
         {
             RunParseTreeRewriterTest("@{<!p class=\"btn\"></!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithAttributeData3()
+        public void AllowsTagHelperElementOptOutCSharp_WithAttributeData3()
         {
             RunParseTreeRewriterTest("@{<!p class=\"btn\">words with spaces</!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithAttributeData4()
+        public void AllowsTagHelperElementOptOutCSharp_WithAttributeData4()
         {
             RunParseTreeRewriterTest("@{<!p class='btn1 btn2' class2=btn></!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutCSharp_WithAttributeData5()
+        public void AllowsTagHelperElementOptOutCSharp_WithAttributeData5()
         {
             RunParseTreeRewriterTest("@{<!p class='btn1 @DateTime.Now btn2'></!p>}", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData1()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData1()
         {
             RunParseTreeRewriterTest("<!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData2()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData2()
         {
             RunParseTreeRewriterTest("</!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData3()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData3()
         {
             RunParseTreeRewriterTest("<!p></!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData4()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData4()
         {
             RunParseTreeRewriterTest("<!p>words and spaces</!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData5()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData5()
         {
             RunParseTreeRewriterTest("<!p></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData6()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData6()
         {
             RunParseTreeRewriterTest("<p></!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData7()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData7()
         {
             RunParseTreeRewriterTest("<p><!p></!p></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData8()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData8()
         {
             RunParseTreeRewriterTest("<p><!p></!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData9()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData9()
         {
             RunParseTreeRewriterTest("<!p></!p></p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData10()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData10()
         {
             RunParseTreeRewriterTest("<strong></!p></strong>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData11()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData11()
         {
             RunParseTreeRewriterTest("<strong></strong><!p></!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithBlockData12()
+        public void AllowsTagHelperElementOptOutHTML_WithBlockData12()
         {
             RunParseTreeRewriterTest("<p><strong></!strong><!p></strong></!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithAttributeData1()
+        public void AllowsTagHelperElementOptOutHTML_WithAttributeData1()
         {
             RunParseTreeRewriterTest("<!p class=\"btn\">", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithAttributeData2()
+        public void AllowsTagHelperElementOptOutHTML_WithAttributeData2()
         {
             RunParseTreeRewriterTest("<!p class=\"btn\"></!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithAttributeData3()
+        public void AllowsTagHelperElementOptOutHTML_WithAttributeData3()
         {
             RunParseTreeRewriterTest("<!p class=\"btn\">words and spaces</!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithAttributeData4()
+        public void AllowsTagHelperElementOptOutHTML_WithAttributeData4()
         {
             RunParseTreeRewriterTest("<!p class='btn1 btn2' class2=btn></!p>", "strong", "p");
         }
 
         [Fact]
-        public void Rewrite_AllowsTagHelperElementOptOutHTML_WithAttributeData5()
+        public void AllowsTagHelperElementOptOutHTML_WithAttributeData5()
         {
             RunParseTreeRewriterTest("<!p class='btn1 @DateTime.Now btn2'></!p>", "strong", "p");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteTextTagTransitionTagHelpers1()
+        public void DoesNotRewriteTextTagTransitionTagHelpers1()
         {
             RunParseTreeRewriterTest("<text>Hello World</text>", "p", "text");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteTextTagTransitionTagHelpers2()
+        public void DoesNotRewriteTextTagTransitionTagHelpers2()
         {
             RunParseTreeRewriterTest("@{<text>Hello World</text>}", "p", "text");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteTextTagTransitionTagHelpers3()
+        public void DoesNotRewriteTextTagTransitionTagHelpers3()
         {
             RunParseTreeRewriterTest("@{<text><p>Hello World</p></text>}", "p", "text");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteTextTagTransitionTagHelpers4()
+        public void DoesNotRewriteTextTagTransitionTagHelpers4()
         {
             RunParseTreeRewriterTest("@{<p><text>Hello World</text></p>}", "p", "text");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteSpecialTagTagHelpers1()
+        public void DoesNotRewriteSpecialTagTagHelpers1()
         {
             RunParseTreeRewriterTest("<foo><!-- Hello World --></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteSpecialTagTagHelpers2()
+        public void DoesNotRewriteSpecialTagTagHelpers2()
         {
             RunParseTreeRewriterTest("<foo><!-- @foo --></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteSpecialTagTagHelpers3()
+        public void DoesNotRewriteSpecialTagTagHelpers3()
         {
             RunParseTreeRewriterTest("<foo><?xml Hello World ?></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteSpecialTagTagHelpers4()
+        public void DoesNotRewriteSpecialTagTagHelpers4()
         {
             RunParseTreeRewriterTest("<foo><?xml @foo ?></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteSpecialTagTagHelpers5()
+        public void DoesNotRewriteSpecialTagTagHelpers5()
         {
             RunParseTreeRewriterTest("<foo><!DOCTYPE @foo ></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteSpecialTagTagHelpers6()
+        public void DoesNotRewriteSpecialTagTagHelpers6()
         {
             RunParseTreeRewriterTest("<foo><!DOCTYPE hello=\"world\" ></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteSpecialTagTagHelpers7()
+        public void DoesNotRewriteSpecialTagTagHelpers7()
         {
             RunParseTreeRewriterTest("<foo><![CDATA[ Hello World ]]></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_DoesNotRewriteSpecialTagTagHelpers8()
+        public void DoesNotRewriteSpecialTagTagHelpers8()
         {
             RunParseTreeRewriterTest("<foo><![CDATA[ @foo ]]></foo>", "!--", "?xml", "![CDATA[", "!DOCTYPE");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_RewritesNestedTagHelperTagBlocks1()
+        public void RewritesNestedTagHelperTagBlocks1()
         {
             RunParseTreeRewriterTest("<p><div></div></p>", "p", "div");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_RewritesNestedTagHelperTagBlocks2()
+        public void RewritesNestedTagHelperTagBlocks2()
         {
             RunParseTreeRewriterTest("<p>Hello World <div></div></p>", "p", "div");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_RewritesNestedTagHelperTagBlocks3()
+        public void RewritesNestedTagHelperTagBlocks3()
         {
             RunParseTreeRewriterTest("<p>Hel<p>lo</p></p> <p><div>World</div></p>", "p", "div");
         }
 
         [Fact]
-        public void TagHelperParseTreeRewriter_RewritesNestedTagHelperTagBlocks4()
+        public void RewritesNestedTagHelperTagBlocks4()
         {
             RunParseTreeRewriterTest("<p>Hel<strong>lo</strong></p> <p><span>World</span></p>", "p", "div");
         }
 
         [Fact]
-        public void Rewrite_HandlesMalformedNestedNonTagHelperTags_Correctly()
+        public void HandlesMalformedNestedNonTagHelperTags_Correctly()
         {
             RunParseTreeRewriterTest("<div>@{</div>}");
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/WhiteSpaceRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/WhiteSpaceRewriterTest.cs
index 975912de80..856172a104 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/WhiteSpaceRewriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/WhiteSpaceRewriterTest.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class WhiteSpaceRewriterTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
-        public void Rewrite_Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block()
+        public void Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block()
         {
             // Arrange
             var parsed = ParseDocument(
diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index ef90477160..ff140b8489 100644
--- a/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -110,10 +110,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 throw new InvalidOperationException(message);
             }
 
-            var baselineFileName = Path.ChangeExtension(FileName, ".syntaxtree.txt");
-            var baselineDiagnosticsFileName = Path.ChangeExtension(FileName, ".diagnostics.txt");
-            var baselineClassifiedSpansFileName = Path.ChangeExtension(FileName, ".classifiedspans.txt");
-            var baselineTagHelperSpansFileName = Path.ChangeExtension(FileName, ".taghelperspans.txt");
+            var baselineFileName = Path.ChangeExtension(FileName, ".stree.txt");
+            var baselineDiagnosticsFileName = Path.ChangeExtension(FileName, ".diag.txt");
+            var baselineClassifiedSpansFileName = Path.ChangeExtension(FileName, ".cspans.txt");
+            var baselineTagHelperSpansFileName = Path.ChangeExtension(FileName, ".tspans.txt");
 
             if (GenerateBaselines)
             {