diff --git a/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml b/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml
index 6aa47234d..7070c8c34 100644
--- a/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml
+++ b/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml
@@ -5,7 +5,7 @@
 }
 
 <h4>@ViewData["Title"]</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <div class="row">
     <div class="col-md-6">
         <form method="post">
diff --git a/src/WebRazorPages/Pages/Account/Manage/Index.cshtml b/src/WebRazorPages/Pages/Account/Manage/Index.cshtml
index 78a0383cd..681c9ec3c 100644
--- a/src/WebRazorPages/Pages/Account/Manage/Index.cshtml
+++ b/src/WebRazorPages/Pages/Account/Manage/Index.cshtml
@@ -5,7 +5,7 @@
 }
 
 <h4>@ViewData["Title"]</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <div class="row">
     <div class="col-md-6">
         <form method="post">
diff --git a/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml b/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml
index 3f4544caf..8b7dd7fb2 100644
--- a/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml
+++ b/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml
@@ -6,7 +6,7 @@
 }
 
 <h4>Set your password</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <p class="text-info">
     You do not have a local username/password for this site. Add a local
     account so you can log in without an external login.
@@ -31,5 +31,5 @@
 </div>
 
 @section Scripts {
-    @await  Html.PartialAsync("_ValidationScriptsPartial")
+    @await Html.PartialAsync("_ValidationScriptsPartial")
 }
diff --git a/src/WebRazorPages/Pages/Index.cshtml b/src/WebRazorPages/Pages/Index.cshtml
index 8cef0d307..a31f79cbb 100644
--- a/src/WebRazorPages/Pages/Index.cshtml
+++ b/src/WebRazorPages/Pages/Index.cshtml
@@ -27,18 +27,17 @@
 
     @if (Model.CatalogModel.CatalogItems.Any())
     {
-        @Html.Partial("_pagination", Model.CatalogModel.PaginationInfo)
+        <partial name="_pagination" for="CatalogModel.PaginationInfo" />
 
         <div class="esh-catalog-items row">
             @foreach (var catalogItem in Model.CatalogModel.CatalogItems)
             {
                 <div class="esh-catalog-item col-md-4">
-                    @Html.Partial("_product", catalogItem)
+                    <partial name="_product" for="@catalogItem" />
                 </div>
             }
         </div>
-
-        @Html.Partial("_pagination", Model.CatalogModel.PaginationInfo)
+        <partial name="_pagination" for="CatalogModel.PaginationInfo" />
     }
     else
     {