diff --git a/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
index 88799baeb6..1e07df80cf 100644
--- a/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
@@ -40,7 +40,7 @@ namespace Test
 
             var component = CompileToComponent(@"
 <MyComponent bind-Value=""ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -77,7 +77,7 @@ namespace Test
 
             var component = CompileToComponent(@"
 <MyComponent bind-Value=""ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -114,7 +114,7 @@ namespace Test
 
             var component = CompileToComponent(@"
 <MyComponent bind-Value=""ParentValue"" bind-Value:event=""OnChanged"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -151,7 +151,7 @@ namespace Test
 
             var component = CompileToComponent(@"
 <MyComponent bind-Value=""ParentValue"" bind-Value:event=""OnChanged"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -184,7 +184,7 @@ namespace Test
 
             var component = CompileToComponent(@"
 <div bind=""@ParentValue"" />
-@functions {
+@code {
     public string ParentValue { get; set; } = ""hi"";
 }");
 
@@ -217,7 +217,7 @@ namespace Test
 
             var component = CompileToComponent(@"
 <div bind-value=""@ParentValue"" />
-@functions {
+@code {
     public string ParentValue { get; set; } = ""hi"";
 }");
 
@@ -252,7 +252,7 @@ namespace Test
             // Act
             var result = CompileToCSharp(@"
 <div bind-value=""@ParentValue"" />
-@functions {
+@code {
     public string ParentValue { get; set; } = ""hi"";
 }");
 
@@ -272,7 +272,7 @@ namespace Test
             // Arrange
             var component = CompileToComponent(@"
 <input bind=""@ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -293,7 +293,7 @@ namespace Test
             // Arrange
             var component = CompileToComponent(@"
 <input type=""text"" bind=""@CurrentDate"" bind:format=""MM/dd/yyyy""/>
-@functions {
+@code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 }");
 
@@ -315,7 +315,7 @@ namespace Test
             // Arrange
             var component = CompileToComponent(@"
 <input type=""text"" bind=""@CurrentDate"" bind:format=""@Format""/>
-@functions {
+@code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 
     public string Format { get; set; } = ""MM/dd/yyyy"";
@@ -339,7 +339,7 @@ namespace Test
             // Arrange
             var component = CompileToComponent(@"
 <input type=""text"" bind=""@ParentValue"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -361,7 +361,7 @@ namespace Test
             // Arrange
             var component = CompileToComponent(@"
 <input type=""checkbox"" bind=""@Enabled"" />
-@functions {
+@code {
     public bool Enabled { get; set; }
 }");
 
@@ -382,7 +382,7 @@ namespace Test
             // Arrange
             var component = CompileToComponent(@"
 <input type=""text"" bind-value=""@ParentValue"" bind-value:event=""onchange"" />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -404,7 +404,7 @@ namespace Test
             // Arrange
             var component = CompileToComponent(@"
 <input type=""text"" bind-value=""@CurrentDate"" bind-value:event=""onchange"" bind-value:format=""MM/dd"" />
-@functions {
+@code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
 }");
 
@@ -426,7 +426,7 @@ namespace Test
             // Arrange
             var component = CompileToComponent(@"
 <input type=""@(""text"")"" bind-value=""@ParentValue"" bind-value:event=""onchange"" visible />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -449,7 +449,7 @@ namespace Test
             // Arrange
             var component = CompileToComponent(@"
 <input bind-value=""@ParentValue"" bind-value:event=""onchange"" type=""text"" visible />
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -477,7 +477,7 @@ namespace Test
 <div bind-value=""@ParentValue"" bind-value:event=""onchange"">
   <span>@(42.ToString())</span>
 </div>
-@functions {
+@code {
     public int ParentValue { get; set; } = 42;
 }");
 
@@ -502,7 +502,7 @@ namespace Test
             // Arrange & Act
             var generated = CompileToCSharp(@"
 <input type=""text"" bind-first-second-third=""Text"" />
-@functions {
+@code {
     public string Text { get; set; } = ""text"";
 }");
 
@@ -517,7 +517,7 @@ namespace Test
             // Arrange & Act
             var generated = CompileToCSharp(@"
 <input type=""text"" bind-first-=""Text"" />
-@functions {
+@code {
     public string Text { get; set; } = ""text"";
 }");
 
diff --git a/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs
index ae8bb7b26d..fde8fa9d7a 100644
--- a/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs
@@ -216,7 +216,7 @@ namespace Test
             var component = CompileToComponent($@"
 <MyComponent OnClick=""{expression}""/>
 
-@functions {{
+@code {{
     private int counter;
     private void Increment(UIMouseEventArgs e) {{
         counter++;
@@ -261,7 +261,7 @@ namespace Test
             var component = CompileToComponent(@"
 <MyComponent OnClick=""@Increment""/>
 
-@functions {
+@code {
     private int counter;
     private void Increment(UIEventArgs e) {
         counter++;
@@ -446,7 +446,7 @@ namespace Test
             // Act
             var component = CompileToComponent(@"
 <p onmouseover=""@OnComponentHover"" style=""background: @ParentBgColor;"" />
-@functions {
+@code {
     public string ParentBgColor { get; set; } = ""#FFFFFF"";
 
     public void OnComponentHover(UIMouseEventArgs e)
diff --git a/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs
index 66073c06d7..62f2b134cb 100644
--- a/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs
@@ -123,7 +123,7 @@ namespace Test
             var component = CompileToComponent(@"
 <GenericContext TItem=int Items=""@(new List<int>() { 1, 2, })"" ref=""_my"" />
 
-@functions {
+@code {
     GenericContext<int> _my;
     void Foo() { GC.KeepAlive(_my); }
 }");
@@ -190,7 +190,7 @@ namespace Test
             var component = CompileToComponent(@"
 <GenericContext Items=""@(new List<int>() { 1, 2, })"" ref=""_my"" />
 
-@functions {
+@code {
     GenericContext<int> _my;
     void Foo() { GC.KeepAlive(_my); }
 }");
@@ -223,7 +223,7 @@ namespace Test
 @typeparam TItem
 <GenericContext Items=""@MyItems"" ref=""_my"" />
 
-@functions {
+@code {
     [Parameter] List<TItem> MyItems { get; set; }
     GenericContext<TItem> _my;
     void Foo() { GC.KeepAlive(_my); }
diff --git a/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs
index a4d8eefc59..0e5e308434 100644
--- a/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs
@@ -64,7 +64,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
                 @foreach(var item in items) {
                     @item
                 }
-                @functions {
+                @code {
                     string[] items = new[] { ""First"", ""Second"", ""Third"" };
                 }
             ");
@@ -296,7 +296,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             // Arrange/Act
             var component = CompileToComponent(
                 @"<elem attr=@MyHandleEvent />
-                @functions {
+                @code {
                     public bool HandlerWasCalled { get; set; } = false;
 
                     void MyHandleEvent(Microsoft.AspNetCore.Components.UIEventArgs eventArgs)
@@ -341,7 +341,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             // Arrange/Act
             var component = CompileToComponent(
                 @"<input bind=""MyValue"" />
-                @functions {
+                @code {
                     public string MyValue { get; set; } = ""Initial value"";
                 }");
             var myValueProperty = component.GetType().GetProperty("MyValue");
@@ -376,7 +376,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             // Arrange/Act
             var component = CompileToComponent(
                 @"<textarea bind=""MyValue"" ></textarea>
-                @functions {
+                @code {
                     public string MyValue { get; set; } = ""Initial value"";
                 }");
             var myValueProperty = component.GetType().GetProperty("MyValue");
@@ -411,7 +411,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             // Arrange/Act
             var component = CompileToComponent(
                 @"<input bind=""MyDate"" />
-                @functions {
+                @code {
                     public DateTime MyDate { get; set; } = new DateTime(2018, 3, 4, 1, 2, 3);
                 }");
             var myDateProperty = component.GetType().GetProperty("MyDate");
@@ -449,7 +449,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             var testDateFormat = "ddd yyyy-MM-dd";
             var component = CompileToComponent(
                 $@"<input bind=""@MyDate"" bind:format=""{testDateFormat}"" />
-                @functions {{
+                @code {{
                     public DateTime MyDate {{ get; set; }} = new DateTime(2018, 3, 4);
                 }}");
             var myDateProperty = component.GetType().GetProperty("MyDate");
@@ -500,7 +500,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             // Arrange
             var component = CompileToComponent(@"
 <button onclick=""@(x => Clicked = true)"" />
-@functions {
+@code {
     public bool Clicked { get; set; }
 }");
 
@@ -532,7 +532,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             // Arrange
             var component = CompileToComponent(@"
 <button onclick=""@OnClick"" />
-@functions {
+@code {
     public void OnClick(UIMouseEventArgs e) { Clicked = true; }
     public bool Clicked { get; set; }
 }");
@@ -569,7 +569,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             // Arrange/Act
             var component = CompileToComponent(
                 @"<input bind=""MyValue"" />
-                @functions {
+                @code {
                     public bool MyValue { get; set; } = true;
                 }");
             var myValueProperty = component.GetType().GetProperty("MyValue");
@@ -605,7 +605,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             var myEnumType = FullTypeName<MyEnum>();
             var component = CompileToComponent(
                 $@"<input bind=""MyValue"" />
-                @functions {{
+                @code {{
                     public {myEnumType} MyValue {{ get; set; }} = {myEnumType}.{nameof(MyEnum.FirstValue)};
                 }}");
             var myValueProperty = component.GetType().GetProperty("MyValue");
@@ -695,7 +695,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             var component = CompileToComponent(@"
 @(Repeat(@<div>@(""Hello, World!"".ToLower())</div>, 3))
 
-@functions {
+@code {
     RenderFragment Repeat(RenderFragment template, int count)
     {
         return (b) =>
@@ -733,7 +733,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             var component = CompileToComponent(@"
 @(Repeat((context) => @<div>@context.ToLower()</div>, ""Hello, World!"", 3))
 
-@functions {
+@code {
     RenderFragment Repeat<T>(RenderFragment<T> template, T value, int count)
     {
         return (b) =>
diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/Counter.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/Counter.razor
index 973af92354..572f9c88dc 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/Counter.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/Counter.razor
@@ -6,7 +6,7 @@
 
 <button class="btn btn-primary" onclick="@IncrementCount">Click me</button>
 
-@functions {
+@code {
     int currentCount = 0;
 
     void IncrementCount()
diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor
index 2f8e580529..553979536a 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor
@@ -35,7 +35,7 @@ else
     </table>
 }
 
-@functions {
+@code {
     WeatherForecast[] forecasts;
 
     protected override async Task OnInitAsync()
diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.razor
index 6fd8763b01..7a344f7508 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.razor
@@ -25,7 +25,7 @@
     </ul>
 </div>
 
-@functions {
+@code {
     bool collapseNavMenu = true;
 
     string NavMenuCssClass => collapseNavMenu ? "collapse" : null;
diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.razor
index 1db3c13c90..27306aa0d0 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.razor
@@ -9,7 +9,7 @@
     and tell us what you think.
 </div>
 
-@functions {
+@code {
     // Demonstrates how a parent component can supply parameters
     [Parameter] string Title { get; set; }
 }
diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/Counter.razor b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/Counter.razor
index 973af92354..572f9c88dc 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/Counter.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/Counter.razor
@@ -6,7 +6,7 @@
 
 <button class="btn btn-primary" onclick="@IncrementCount">Click me</button>
 
-@functions {
+@code {
     int currentCount = 0;
 
     void IncrementCount()
diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor
index 3f5b9a9e49..a7dc14ae5c 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor
@@ -34,7 +34,7 @@ else
     </table>
 }
 
-@functions {
+@code {
     WeatherForecast[] forecasts;
 
     protected override async Task OnInitAsync()
diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.razor b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.razor
index c5904d3bd6..4e9b63b2a2 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.razor
@@ -25,7 +25,7 @@
     </ul>
 </div>
 
-@functions {
+@code {
     bool collapseNavMenu = true;
 
     string NavMenuCssClass => collapseNavMenu ? "collapse" : null;
diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.razor b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.razor
index 1db3c13c90..27306aa0d0 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.razor
@@ -9,7 +9,7 @@
     and tell us what you think.
 </div>
 
-@functions {
+@code {
     // Demonstrates how a parent component can supply parameters
     [Parameter] string Title { get; set; }
 }
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.razor b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.razor
index 870c79b1a4..7509137e37 100644
--- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.razor
+++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.razor
@@ -3,7 +3,7 @@
 
 Hello, world!
 
-@functions {
+@code {
     protected override void OnAfterRender()
     {
         BenchmarkEvent.Send(JSRuntime, "Rendered index.cshtml");
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor
index 9deb601126..db8b38e5a3 100644
--- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor
+++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor
@@ -22,7 +22,7 @@
     <p>Deserialized <strong id="deserialized-count">@numPeopleDeserialized</strong> people</p>
 }
 
-@functions {
+@code {
     static string[] Clearances = new[] { "Alpha", "Beta", "Gamma", "Delta", "Epsilon" };
     Person smallOrgChart = GenerateOrgChart(1, 4);
     Person largeOrgChart = GenerateOrgChart(5, 4);
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.razor b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.razor
index 0a9ad97997..0d9feb6fec 100644
--- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.razor
+++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.razor
@@ -32,7 +32,7 @@ Number of items: <input id="num-items" type="number" bind=@numItems />
     </table>
 }
 
-@functions {
+@code {
     int numItems = 10;
     bool show = false;
 
diff --git a/src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.razor b/src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.razor
index 973af92354..572f9c88dc 100644
--- a/src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.razor
+++ b/src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.razor
@@ -6,7 +6,7 @@
 
 <button class="btn btn-primary" onclick="@IncrementCount">Click me</button>
 
-@functions {
+@code {
     int currentCount = 0;
 
     void IncrementCount()
diff --git a/src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.razor b/src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.razor
index 0ecea85876..9024a800a7 100644
--- a/src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.razor
+++ b/src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.razor
@@ -43,7 +43,7 @@ else
     </p>
 }
 
-@functions {
+@code {
     [Parameter] DateTime StartDate { get; set; }
 
     WeatherForecast[] forecasts;
diff --git a/src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.razor b/src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.razor
index c2824be334..3218b3a351 100644
--- a/src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.razor
+++ b/src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.razor
@@ -25,7 +25,7 @@
     </ul>
 </div>
 
-@functions {
+@code {
     bool collapseNavMenu = true;
 
     void ToggleNavMenu()
diff --git a/src/Components/Components/src/Auth/CascadingAuthenticationState.razor b/src/Components/Components/src/Auth/CascadingAuthenticationState.razor
index f3bf0bd327..2910fc5fba 100644
--- a/src/Components/Components/src/Auth/CascadingAuthenticationState.razor
+++ b/src/Components/Components/src/Auth/CascadingAuthenticationState.razor
@@ -4,7 +4,7 @@
 
 <CascadingValue T="Task<AuthenticationState>" Value="@_currentAuthenticationStateTask" ChildContent="@ChildContent" />
 
-@functions {
+@code {
     private Task<AuthenticationState> _currentAuthenticationStateTask;
 
     /// <summary>
diff --git a/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor b/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor
index 3603cbb45f..2780b58a4d 100644
--- a/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor
+++ b/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor
@@ -8,7 +8,7 @@ Child components follow.
     <p><MessageComponent Message=@message /></p>
 }
 
-@functions {
+@code {
     int numAdded = 0;
     List<string> currentChildrenMessages = new List<string>();
 
diff --git a/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor b/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor
index c0a8cb4bca..eac65dec0d 100644
--- a/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor
@@ -3,7 +3,7 @@
 
 <input ref="myInput" value="Value set during render" />
 
-@functions {
+@code {
     ElementRef myInput;
 
     protected override void OnAfterRender()
diff --git a/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor b/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
index b35b775cd7..a12701dadb 100644
--- a/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
@@ -6,7 +6,7 @@
     <button id="tock" onclick="@Tock">Tock</button>
 </div>
 
-@functions
+@code
 {
     TaskCompletionSource<object> _tcs;
     string state = "Stopped";
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor
index 22951925af..34be56726f 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor
@@ -22,7 +22,7 @@
 <hr />
 <Links />
 
-@functions {
+@code {
     protected override void OnInit()
     {
         // Start at AuthHome, not at any other component in the same app that happens to
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor
index 8113e1080f..9c61665fc7 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor
@@ -32,7 +32,7 @@ else
     </p>
 }
 
-@functions
+@code
 {
     static Predicate<Claim> TestClaimPredicate = c => c.Type == "test-claim";
 
diff --git a/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor b/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
index 707ed9124a..45ef3a6e38 100644
--- a/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
@@ -137,7 +137,7 @@
     <button id="select-box-add-option" onclick="@AddAndSelectNewSelectOption">Add and select new item</button>
 </p>
 
-@functions {
+@code {
     string textboxInitiallyBlankValue = null;
     string textboxInitiallyPopulatedValue = "Hello";
 
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor
index a0d14e571a..ce912c78f8 100644
--- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor
+++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor
@@ -10,7 +10,7 @@
     Flag 2: <strong id="flag-2">@MyFlag2</strong>
 </p>
 
-@functions {
+@code {
     [CascadingParameter(Name = "TestFlag1")] bool MyFlag1 { get; set; }
     [CascadingParameter(Name = "TestFlag2")] bool MyFlag2 { get; set; }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor
index a1731d14d5..e51cfd66cd 100644
--- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor
+++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor
@@ -3,6 +3,6 @@
     <strong id="current-count">@CurrentCounter.NumClicks</strong>
 </p>
 
-@functions {
+@code {
     [CascadingParameter] CounterDTO CurrentCounter { get; set; }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor
index cf6b9abc90..89b92db3ef 100644
--- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor
+++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor
@@ -16,7 +16,7 @@
     <button id="decrement-count" onclick=@Ancestor.DecrementCount>Decrement</button>
 </p>
 
-@functions {
+@code {
     int numRenders = 0;
 
     [CascadingParameter] ICanDecrement Ancestor { get; set; }
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor
index f1f70cfba0..a2a30d4f7f 100644
--- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor
+++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor
@@ -20,7 +20,7 @@
 <p><label><input type="checkbox" id="toggle-flag-1" bind=currentFlagValue1 /> Flag 1</label></p>
 <p><label><input type="checkbox" id="toggle-flag-2" bind=currentFlagValue2 /> Flag 2</label></p>
 
-@functions {
+@code {
     CounterDTO counterState = new CounterDTO { NumClicks = 100 };
     bool currentFlagValue1;
     bool currentFlagValue2;
diff --git a/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor b/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor
index ded245d99b..394dae74a5 100644
--- a/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor
@@ -24,7 +24,7 @@
     </label>
 </fieldset>
 
-@functions {
+@code {
     bool _toggleCapturedComponentPresence = true;
     CounterComponent _myChildCounter;
 
diff --git a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor
index 817f31bbdd..c843e11a91 100644
--- a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor
+++ b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor
@@ -1,5 +1,5 @@
 <span>@(isAfterDelay ? "😊" :"WAITING")</span>
-@functions
+@code
 {
     protected bool isAfterDelay;
 
diff --git a/src/Components/test/testassets/BasicTestApp/CounterComponent.razor b/src/Components/test/testassets/BasicTestApp/CounterComponent.razor
index ed58054b8f..9a635e7ad0 100644
--- a/src/Components/test/testassets/BasicTestApp/CounterComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/CounterComponent.razor
@@ -12,7 +12,7 @@
     <p id="listening-message">Listening</p>
 }
 
-@functions {
+@code {
     int currentCount = 0;
     bool handleClicks = true;
 
diff --git a/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor b/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor
index 08e55d6027..efd3ec575c 100644
--- a/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor
+++ b/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor
@@ -5,7 +5,7 @@
 
 <button onclick="@IncrementCount">Click me</button>
 
-@functions {
+@code {
     int currentCount = 0;
 
     void IncrementCount()
diff --git a/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor b/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor
index ae00ab1bc9..435ef0fc04 100644
--- a/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor
@@ -1,5 +1,5 @@
 <div id="cool_beans" data-tab="@TabId">@TabId</div>
 
-@functions {
+@code {
     string TabId = "17";
 }
diff --git a/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor b/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor
index f59d58bb33..e55cc33965 100644
--- a/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor
@@ -15,7 +15,7 @@
 <button id="run-with-double-dispatch" onclick=@RunWithDoubleDispatch>Run with double dispatch</button>
 <button id="run-async-with-dispatch" onclick=@RunAsyncWorkWithDispatch>Run async work with dispatch</button>
 
-@functions {
+@code {
     string result;
 
     async Task RunWithoutDispatch()
diff --git a/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor b/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor
index a8a0a85aa5..17010b9d6e 100644
--- a/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor
@@ -25,7 +25,7 @@
     Toggle input
 </label>
 
-@functions {
+@code {
     int _count = 0;
     bool _toggleCapturedElementPresence = true;
     ElementRef _myInput;
diff --git a/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor b/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor
index f5fcfac319..5afc89a4fa 100644
--- a/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor
@@ -24,7 +24,7 @@
 
 <textarea readonly bind="@logValue"></textarea>
 
-@functions {
+@code {
     string logValue = string.Empty;
 
     void LogEvent(string message)
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
index 13d814bbe3..08ffee0422 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
@@ -1,7 +1,7 @@
 
 <button onclick="@OnClick">@Text</button>
 
-@functions {
+@code {
     [Parameter] int Count { get; set; }
     [Parameter] EventCallback<int> CountChanged { get; set; }
     [Parameter] string Text { get; set; }
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor
index 945e89a290..b3859bfb0e 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor
@@ -35,7 +35,7 @@
     <ButtonComponent bind-Count="buttonComponentCount" Text="Unbound Lambda Bind-To-Component" />
 </div>
 
-@functions {
+@code {
     int renderCount;
 
     int buttonComponentCount  = 1; // Avoid CS0649
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor
index 32a59dbeed..70eb5f662a 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor
@@ -1,7 +1,7 @@
 
 <button onclick="@OnClick">@Text</button>
 
-@functions {
+@code {
     [Parameter] EventCallback OnClick { get; set; }
     [Parameter] string Text { get; set; }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor
index 642b201430..33294d11b7 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor
@@ -1,7 +1,7 @@
 
 <InnerButton OnClick="@OnClick" Text="@Text"/>
 
-@functions {
+@code {
     [Parameter] EventCallback OnClick { get; set; }
     [Parameter] string Text { get; set; }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
index 727aaa5e33..b9520414e2 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
@@ -1,7 +1,7 @@
 
 <button onclick="@OnClick">@Text</button>
 
-@functions {
+@code {
     [Parameter] EventCallback<UIMouseEventArgs> OnClick { get; set; }
     [Parameter] string Text { get; set; }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor
index f5a1bfbf1b..c200183f3f 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor
@@ -3,6 +3,6 @@
     @ChildContent
 </div>
 
-@functions {
+@code {
     [Parameter] RenderFragment ChildContent { get; set; }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor b/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor
index 3681b170f8..5a1c7c0b07 100644
--- a/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor
@@ -28,7 +28,7 @@
     <p id="event-handled">Event was handled</p>
 }
 
-@functions {
+@code {
     bool didHandleEvent;
 
     async Task HandleClick()
diff --git a/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor b/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor
index ef02e9f256..0f4ef9e5f3 100644
--- a/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor
+++ b/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor
@@ -29,7 +29,7 @@
 
 <ComponentFromPackage />
 
-@functions
+@code
 {
     string result;
 
diff --git a/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor b/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
index b6ca0f7141..7eb958bbf5 100644
--- a/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
@@ -16,7 +16,7 @@
     Another input (to distract you) <input id="other" />
 </p>
 
-@functions {
+@code {
 
     string message;
 
@@ -48,4 +48,4 @@
     {
         message = string.Empty;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
index e921bc58aa..e094ce6ecd 100644
--- a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
@@ -12,7 +12,7 @@
 </p>
 <p>
     This example also shows that you don't strictly have to use EditForm. You can manually
-    cascade an EditContext to the components that integrate with it. 
+    cascade an EditContext to the components that integrate with it.
 </p>
 
 <form onsubmit="@HandleSubmit">
@@ -34,7 +34,7 @@
 
 <div id="submission-status">@submissionStatus</div>
 
-@functions {
+@code {
     MyModel person = new MyModel();
     EditContext editContext;
     string submissionStatus;
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor
index bc9a267403..f2cee1b6c4 100644
--- a/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor
@@ -28,7 +28,7 @@
     <span id="last-callback">@lastCallback</span>
 }
 
-@functions {
+@code {
     string lastCallback;
 
     [Required(ErrorMessage = "Please choose a username")]
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor
index d4285e92e2..ad2aa89550 100644
--- a/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor
@@ -50,7 +50,7 @@
 
 <ul>@foreach (var entry in submissionLog) { <li>@entry</li> }</ul>
 
-@functions {
+@code {
     Person person = new Person();
 
     // Usually this would be in a different file
diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor b/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor
index 3ffbd88850..58107214d8 100644
--- a/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor
@@ -20,7 +20,7 @@
 
 <span id="test-outcome">@testOutcome</span>
 
-@functions {
+@code {
     string uri = "";
     HttpStatusCode? responseStatusCode;
     string responseStatusText;
diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor b/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor
index 7570dc9915..b2e9ec6101 100644
--- a/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor
@@ -11,7 +11,7 @@
     <p id="response-text">@responseText</p>
 }
 
-@functions
+@code
 {
     bool requestInProgress = false;
     string testServerBaseUrl;
diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor b/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor
index 81594508de..6352a7e7b1 100644
--- a/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor
@@ -60,7 +60,7 @@
     }
 </style>
 
-@functions {
+@code {
     string uri = "http://api.icndb.com/jokes/random";
     string method = "GET";
     string requestBody = "";
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index c3f4468cde..6a1d2886c9 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -70,7 +70,7 @@
     @((RenderFragment)RenderSelectedComponent)
 </app>
 
-@functions {
+@code {
     string SelectedComponentTypeName { get; set; } = "none";
 
     Type SelectedComponentType
diff --git a/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor b/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor
index d5e58566be..eb469715db 100644
--- a/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor
@@ -4,6 +4,6 @@
 
 <p id="test-result">@inputText</p>
 
-@functions {
+@code {
     string inputText { get; set; }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
index 1a1b26535d..2ae6ccd0ae 100644
--- a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
@@ -51,7 +51,7 @@
     <p id="done-with-interop">Done with interop.</p>
 }
 
-@functions {
+@code {
 
     public IDictionary<string, string> ReturnValues { get; set; } = new Dictionary<string, string>();
     public IDictionary<string, string> Invocations { get; set; } = new Dictionary<string, string>();
diff --git a/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor
index 8ac0815070..e3cafe0d65 100644
--- a/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor
@@ -22,7 +22,7 @@
     <input id="val-set-by-interop" ref="@myElem" />
 </p>
 
-@functions {
+@code {
     string infoFromJs;
     ElementRef myElem;
 
diff --git a/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor b/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor
index 9ef1a5bffa..ab5271118d 100644
--- a/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor
@@ -25,7 +25,7 @@
     .key-cases .node .node .children { margin-left: 1.1rem; }
 </style>
 
-@functions {
+@code {
     string modelJson = @"{
   ""label"": ""root"",
   ""children"": [
diff --git a/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor b/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor
index 16ed8de0eb..7634bb95f0 100644
--- a/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor
+++ b/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor
@@ -32,7 +32,7 @@
     }
 </div>
 
-@functions {
+@code {
     public class Node
     {
         public object Key { get; set; }
diff --git a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
index 4281b7d297..bc8f8b95ea 100644
--- a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
@@ -8,7 +8,7 @@ Type here: <input onkeypress=@OnKeyPressed />
     }
 </ul>
 
-@functions {
+@code {
     List<string> keysPressed = new List<string>();
 
     void OnKeyPressed(UIKeyboardEventArgs eventArgs)
diff --git a/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor b/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor
index 175091fc0b..186eeec72e 100644
--- a/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor
@@ -24,7 +24,7 @@
 
 @((MarkupString)myMarkup)
 
-@functions {
+@code {
     bool changeOutput;
 
     string myMarkup = "<p class='markup-string-value'>This is a <em>markup string</em>.</p>";
diff --git a/src/Components/test/testassets/BasicTestApp/MessageComponent.razor b/src/Components/test/testassets/BasicTestApp/MessageComponent.razor
index 75b3ecc823..889c938517 100644
--- a/src/Components/test/testassets/BasicTestApp/MessageComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/MessageComponent.razor
@@ -1,4 +1,4 @@
 <span style="color: red" class="message">@Message</span>
-@functions {
+@code {
     [Parameter] string Message { get; set; }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
index 9576fdc848..2bba6f2b62 100644
--- a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
@@ -24,7 +24,7 @@
     </p>
 </div>
 
-@functions {
+@code {
 
     string message;
 
@@ -72,4 +72,4 @@
     {
         message = string.Empty;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor b/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor
index cc0338c7d3..c6a5e9f624 100644
--- a/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor
+++ b/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor
@@ -13,7 +13,7 @@
 
 Toggle: <input type="checkbox" bind="ShowFooter" id="toggle"/>
 
-@functions {
+@code {
     List<Item> Items { get; } = new List<Item>()
     {
         new Item(){ Col1 = "a0", Col2 = "b0", Col3 = "c0", },
@@ -29,4 +29,4 @@ Toggle: <input type="checkbox" bind="ShowFooter" id="toggle"/>
         public string Col2 { get; set; }
         public string Col3 { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Components/test/testassets/BasicTestApp/OrderedList.razor b/src/Components/test/testassets/BasicTestApp/OrderedList.razor
index 3e9dafb1b3..c212f194d6 100644
--- a/src/Components/test/testassets/BasicTestApp/OrderedList.razor
+++ b/src/Components/test/testassets/BasicTestApp/OrderedList.razor
@@ -10,7 +10,7 @@
     }
 </ol>
 
-@functions{
+@code{
     [Parameter] IEnumerable<TItem> Items { get; set; }
 
     [Parameter] RenderFragment<Context> Template { get; set; }
@@ -21,4 +21,4 @@
 
         public TItem Item { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.razor b/src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.razor
index 6e9c3d941b..8ab805ed1b 100644
--- a/src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.razor
@@ -1,5 +1,5 @@
 @ChildContent
-@functions {
+@code {
     // Note: The lack of any whitespace or other output besides @ChildContent is important for
     // what scenarios this component is used for in E2E tests.
 
diff --git a/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor b/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor
index 05be9c65e1..27bb0041cf 100644
--- a/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor
+++ b/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor
@@ -15,7 +15,7 @@
     <button id="increment-count" onclick="@(() => count++)">Click me</button>
 </p>
 
-@functions {
+@code {
     int count;
     bool firstRender = false;
     protected override Task OnAfterRenderAsync()
diff --git a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.razor b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.razor
index 28ec61b45c..f359d6c326 100644
--- a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.razor
+++ b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.razor
@@ -1,7 +1,7 @@
 <div class="supplied">You supplied: @SuppliedValue</div>
 <div class="computed">I computed: @computedValue</div>
 
-@functions {
+@code {
     [Parameter]
     int SuppliedValue { get; set; }
 
diff --git a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor
index 4fbdada071..b201311876 100644
--- a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor
+++ b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor
@@ -1,6 +1,6 @@
 <PropertiesChangedHandlerChild SuppliedValue=@valueToSupply />
 <button onclick=@(x => valueToSupply++)>Increment</button>
 
-@functions {
+@code {
     private int valueToSupply = 100;
 }
diff --git a/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor b/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor
index 6ce52d14b1..fb6b98aba6 100644
--- a/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor
+++ b/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor
@@ -10,7 +10,7 @@
     <p>The end</p>
 </div>
 
-@functions {
+@code {
     bool showFragment;
 
     static RenderFragment ExampleFragment = builder =>
diff --git a/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor b/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor
index acede2b465..594555a689 100644
--- a/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor
@@ -30,7 +30,7 @@
     }
 </ul>
 
-@functions {
+@code {
     Random rng = new Random();
     TodoItem[] todoItems = new[]
     {
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor
index 27268d73fe..c27f827a6d 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor
@@ -5,7 +5,7 @@
 
 <span id="test-info">@UrlLocation</span>
 
-@functions{
+@code{
     string UrlLocation;
 
     protected override void OnInit()
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor
index 634e2d40c5..67ffca8770 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor
@@ -1,7 +1,7 @@
 @page "/WithNumberParameters/{TestInt:int}/{TestLong:long}/{TestDouble:double}/{TestFloat:float}/{TestDec:decimal}"
 <div id="test-info">Test parameters: @TestInt @TestLong @TestDouble @TestFloat @TestDec</div>
 
-@functions
+@code
 {
     [Parameter] int TestInt { get; set; }
     [Parameter] long TestLong { get; set; }
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor
index 2caf8c67bb..e13b253ff1 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor
@@ -3,7 +3,7 @@
 <div id="test-info">Your full name is @FirstName @LastName.</div>
 <Links />
 
-@functions
+@code
 {
     [Parameter] string FirstName { get; set; }
 
diff --git a/src/Components/test/testassets/BasicTestApp/SvgComponent.razor b/src/Components/test/testassets/BasicTestApp/SvgComponent.razor
index 342e6fcb8c..4c538e6c2d 100644
--- a/src/Components/test/testassets/BasicTestApp/SvgComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/SvgComponent.razor
@@ -4,6 +4,6 @@
 
 <button onclick=@(() => { radius *= 2; })>Click me</button>
 
-@functions {
+@code {
     int radius = 10;
 }
diff --git a/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor b/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor
index 57fb0a3fa1..18ea949f31 100644
--- a/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor
+++ b/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor
@@ -20,7 +20,7 @@
     }
 </table>
 
-@functions {
+@code {
     [Parameter]
     RenderFragment Header { get; set; }
 
@@ -32,4 +32,4 @@
 
     [Parameter]
     IReadOnlyList<TItem> Items { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
index 425abfcd87..0a7fe9e462 100644
--- a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
@@ -21,7 +21,7 @@
     </p>
 </div>
 
-@functions {
+@code {
 
     string message;
 
@@ -36,4 +36,4 @@
     {
         message = string.Empty;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Components/test/testassets/ComponentsApp.App/App.razor b/src/Components/test/testassets/ComponentsApp.App/App.razor
index 03ebda9b0f..a6a7873965 100644
--- a/src/Components/test/testassets/ComponentsApp.App/App.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/App.razor
@@ -7,6 +7,6 @@
     <Router AppAssembly=typeof(ComponentsApp.App.App).Assembly />
 </CascadingValue>
 
-@functions{
+@code{
     [Parameter] public string Name { get; set; }
 }
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor
index 973af92354..572f9c88dc 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor
@@ -6,7 +6,7 @@
 
 <button class="btn btn-primary" onclick="@IncrementCount">Click me</button>
 
-@functions {
+@code {
     int currentCount = 0;
 
     void IncrementCount()
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor
index 35f83bf20d..cb1be064f1 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor
@@ -3,13 +3,13 @@
 <h1>Error</h1>
 @if(ShouldCauseError)
 {
-    throw new InvalidOperationException("Exception while rendering");    
+    throw new InvalidOperationException("Exception while rendering");
 }
 else
 {
     <button id="cause-error" onclick="@CauseError">Cause error</button>
 }
-@functions {
+@code {
     public bool ShouldCauseError { get; set; }
 
     void CauseError()
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor
index af9cc8b037..cdc696a7ce 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor
@@ -43,7 +43,7 @@ else
     </p>
 }
 
-@functions {
+@code {
     [Parameter] DateTime StartDate { get; set; }
 
     WeatherForecast[] forecasts;
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor
index cb7f5bc192..fd39012d86 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor
@@ -3,6 +3,6 @@
 <h1>Greeter</h1>
 <p class="greeting">Hello @Name</p>
 
-@functions {
+@code {
     [CascadingParameter(Name=nameof(Name))] public string Name { get; set; }
 }
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor
index 249dfc51e3..2ff15a18ba 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor
@@ -5,7 +5,7 @@
 <h1>Ticker</h1>
 <p class="tick-value">@tick</p>
 
-@functions {
+@code {
     int tick;
     private bool _isDisposed;
 
diff --git a/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor b/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor
index 87ee39f518..38e23a6b6d 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor
@@ -45,7 +45,7 @@
     </ul>
 </div>
 
-@functions {
+@code {
     bool collapseNavMenu = true;
 
     void ToggleNavMenu()
diff --git a/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor b/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor
index 5e4ca29480..93a353b95a 100644
--- a/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor
+++ b/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor
@@ -4,7 +4,7 @@
     <button onclick="@ChangeLabel">@buttonLabel </button>
 </div>
 
-@functions {
+@code {
     string buttonLabel = "Click me";
 
     void ChangeLabel()
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor
index 79f6d6937c..3ed6d5d979 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor
+++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor
@@ -35,7 +35,7 @@ else
     </table>
 }
 
-@functions {
+@code {
     [Parameter] DateTime StartDate { get; set; }
 
     WeatherForecast[] forecasts;
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor
index 3291fba732..2bfe1d7c4d 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor
+++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor
@@ -1,7 +1,7 @@
 @page "/components/throws"
-    
+
 @* This is expected to throw and result in a 500 *@
-@functions { 
+@code {
     protected override async Task OnInitAsync()
     {
         await base.OnInitAsync();
diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/Component1.razor b/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/Component1.razor
index 68d4749c0d..bc0a14eec4 100644
--- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/Component1.razor
+++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/Component1.razor
@@ -1,5 +1,5 @@
 <h3>Component1</h3>
 
-@functions {
+@code {
 
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/Counter.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/Counter.razor
index e7244066a2..def057f5c4 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/Counter.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/Counter.razor
@@ -6,7 +6,7 @@
 
 <button class="btn btn-primary" onclick="@IncrementCount">Click me</button>
 
-@functions {
+@code {
     int currentCount = 0;
 
     void IncrementCount()
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor
index 3b24942890..25e30159f4 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor
@@ -35,7 +35,7 @@ else
     </table>
 }
 
-@functions {
+@code {
     WeatherForecast[] forecasts;
 
     protected override async Task OnInitAsync()
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.razor
index 6ccbbd20ae..daa24cbb86 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.razor
@@ -31,7 +31,7 @@
     </NotAuthorized>
 </AuthorizeView>
 
-@functions {
+@code {
     bool canEditProfile;
 
     protected override void OnInit()
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor
index 34fc7d3f7c..511e17b455 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor
@@ -25,7 +25,7 @@
     </ul>
 </div>
 
-@functions {
+@code {
     bool collapseNavMenu = true;
 
     string NavMenuCssClass => collapseNavMenu ? "collapse" : null;