diff --git a/11.0/BlazorSample_BlazorWebApp/Components/UsernameUniquenessValidator.razor b/11.0/BlazorSample_BlazorWebApp/Components/UsernameUniquenessValidator.razor
index 8474d855..472b795f 100644
--- a/11.0/BlazorSample_BlazorWebApp/Components/UsernameUniquenessValidator.razor
+++ b/11.0/BlazorSample_BlazorWebApp/Components/UsernameUniquenessValidator.razor
@@ -11,12 +11,12 @@
     [Parameter, EditorRequired]
     public RegistrationModel Model { get; set; } = default!;
 
-    private ValidationMessageStore? _messages;
+    private ValidationMessageStore? messages;
 
     protected override void OnInitialized()
     {
         ArgumentNullException.ThrowIfNull(CurrentEditContext);
-        _messages = new ValidationMessageStore(CurrentEditContext);
+        messages = new ValidationMessageStore(CurrentEditContext);
         CurrentEditContext.OnValidationRequested += OnValidationRequested;
         CurrentEditContext.OnFieldChanged += OnFieldChanged;
     }
@@ -46,7 +46,7 @@
 
     private async Task CheckAsync(FieldIdentifier field, CancellationToken token)
     {
-        _messages!.Clear(field);
+        messages!.Clear(field);
 
         var available = await Http.GetFromJsonAsync<bool>(
             $"api/usernames/available?value={Uri.EscapeDataString(Model.Username)}",
@@ -54,7 +54,7 @@
 
         if (!available)
         {
-            _messages.Add(field, "The username is already taken.");
+            messages.Add(field, "The username is already taken.");
         }
 
         CurrentEditContext!.NotifyValidationStateChanged();
diff --git a/11.0/BlazorWebAppRemoteValidation/BlazorWebAppRemoteValidation.Client/CustomValidation.razor b/11.0/BlazorWebAppRemoteValidation/BlazorWebAppRemoteValidation.Client/CustomValidation.razor
index c37be601..99c784d3 100644
--- a/11.0/BlazorWebAppRemoteValidation/BlazorWebAppRemoteValidation.Client/CustomValidation.razor
+++ b/11.0/BlazorWebAppRemoteValidation/BlazorWebAppRemoteValidation.Client/CustomValidation.razor
@@ -4,22 +4,22 @@
     [CascadingParameter]
     private EditContext? CurrentEditContext { get; set; }
 
-    private ValidationMessageStore _messages = default!;
+    private ValidationMessageStore messages = default!;
 
     protected override void OnInitialized()
     {
         ArgumentNullException.ThrowIfNull(CurrentEditContext);
 
-        _messages = new(CurrentEditContext);
+        messages = new(CurrentEditContext);
         CurrentEditContext.OnValidationRequested += HandleValidationRequested;
         CurrentEditContext.OnFieldChanged += HandleFieldChanged;
     }
 
     public void DisplayErrors(IDictionary<string, string[]> errors)
     {
-        foreach (var (fieldName, messages) in errors)
+        foreach (var (fieldName, fieldMessages) in errors)
         {
-            _messages.Add(CurrentEditContext!.Field(fieldName), messages);
+            messages.Add(CurrentEditContext!.Field(fieldName), fieldMessages);
         }
 
         CurrentEditContext!.NotifyValidationStateChanged();
@@ -27,7 +27,7 @@
 
     public void ClearErrors()
     {
-        _messages.Clear();
+        messages.Clear();
         CurrentEditContext!.NotifyValidationStateChanged();
     }
 
@@ -37,7 +37,7 @@
 
     private void HandleFieldChanged(object? sender, FieldChangedEventArgs e)
     {
-        _messages.Clear(e.FieldIdentifier);
+        messages.Clear(e.FieldIdentifier);
         CurrentEditContext!.NotifyValidationStateChanged();
     }
 
diff --git a/11.0/BlazorWebAppRemoteValidation/BlazorWebAppRemoteValidation.Client/Pages/Home.razor b/11.0/BlazorWebAppRemoteValidation/BlazorWebAppRemoteValidation.Client/Pages/Home.razor
index b237522c..7a3a942b 100644
--- a/11.0/BlazorWebAppRemoteValidation/BlazorWebAppRemoteValidation.Client/Pages/Home.razor
+++ b/11.0/BlazorWebAppRemoteValidation/BlazorWebAppRemoteValidation.Client/Pages/Home.razor
@@ -12,7 +12,7 @@
 
 <EditForm Model="Model" OnValidSubmit="Submit">
     <DataAnnotationsValidator />
-    <CustomValidation @ref="_remoteErrors" />
+    <CustomValidation @ref="remoteErrors" />
     <ValidationSummary />
 
     <p>
@@ -46,26 +46,26 @@
     <button id="submit" type="submit">Submit</button>
 </EditForm>
 
-@if (_accepted)
+@if (accepted)
 {
     <p id="accepted" role="status">The server accepted the form.</p>
 }
 
 @code {
     private StarshipModel Model { get; } = new();
-    private CustomValidation? _remoteErrors;
-    private bool _accepted;
+    private CustomValidation? remoteErrors;
+    private bool accepted;
 
     private async Task Submit()
     {
-        _accepted = false;
+        accepted = false;
 
         using var response = await Http.PostAsJsonAsync(
             "api/starships/validate", Model);
 
         if (response.IsSuccessStatusCode)
         {
-            _accepted = true;
+            accepted = true;
             return;
         }
 
@@ -76,7 +76,7 @@
                 ?? throw new InvalidOperationException(
                     "The validation response didn't contain a response body.");
 
-            _remoteErrors!.DisplayErrors(problem.Errors);
+            remoteErrors!.DisplayErrors(problem.Errors);
             return;
         }