diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget-ContentsMetadata.DetailAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget-ContentsMetadata.DetailAdmin.cshtml
index 82f4a8fbfb1..8a889c3dcf2 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget-ContentsMetadata.DetailAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget-ContentsMetadata.DetailAdmin.cshtml
@@ -23,7 +23,7 @@
         </span>
     }
 
-    if (!String.IsNullOrEmpty(contentItem.Author))
+    if (!string.IsNullOrEmpty(contentItem.Author))
     {
         <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Author"]">
             <i class="fa-solid fa-user text-secondary me-1" aria-hidden="true"></i>@contentItem.Author
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.DetailAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.DetailAdmin.cshtml
index 25a7ab4d096..dd71a23dd97 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.DetailAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.DetailAdmin.cshtml
@@ -1,4 +1,4 @@
-<div class="card h-100 @String.Join(" ", Model.Classes.ToArray())">
+<div class="card h-100 @string.Join(" ", Model.Classes.ToArray())">
     @if (Model.Header != null || Model.Leading != null || Model.ActionsMenu != null)
     {
         <div class="card-header">
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.Summary.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.Summary.cshtml
index 2b4cbdf5c84..d2c44a40fe8 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.Summary.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.Summary.cshtml
@@ -1,4 +1,4 @@
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @if (Model.Header != null || Model.Meta != null)
     {
         <div class="widget-header">
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.cshtml
index 2b4cbdf5c84..d2c44a40fe8 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.cshtml
@@ -1,4 +1,4 @@
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @if (Model.Header != null || Model.Meta != null)
     {
         <div class="widget-header">
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Edit.cshtml
index b6282ebf19a..e50848a255c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Edit.cshtml
@@ -14,7 +14,7 @@
         <span asp-validation-for="Alias"></span>
         <span class="hint">
             @T["The alias of the content item."]
-            @if (!String.IsNullOrWhiteSpace(Model.Settings.Pattern))
+            @if (!string.IsNullOrWhiteSpace(Model.Settings.Pattern))
             {
                 @T["Leave empty to re-generate it."]
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ArchiveLater/Views/ArchiveLaterPart.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ArchiveLater/Views/ArchiveLaterPart.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ArchiveLater/Views/ArchiveLaterPart.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ArchiveLater/Views/ArchiveLaterPart.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/AuditTrailAdminListSearch.cshtml b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/AuditTrailAdminListSearch.cshtml
index c0ae3f87787..6155aed5968 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/AuditTrailAdminListSearch.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/AuditTrailAdminListSearch.cshtml
@@ -20,7 +20,7 @@
     <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" id="filter-dropdown" aria-haspopup="true" aria-expanded="false">
         <i class="fa-solid fa-filter" title="@T["Filters"]" aria-hidden="true"></i>
     </button>
-    <ul class="@String.Join(' ', dropdownClassList)" aria-labelledby="filter-dropdown">
+    <ul class="@string.Join(' ', dropdownClassList)" aria-labelledby="filter-dropdown">
         @foreach (var category in categories)
         {
             <li><a class="dropdown-item" href="?q=category:@category.Name">@category.LocalizedName(Context.RequestServices)</a></li>
@@ -136,7 +136,7 @@
                     <div class="card">
                         <div class="card-body">
                             <h4>@T["Current filter"]</h4>
-                            @if (!String.IsNullOrEmpty(Model.FilterResult.ToString()))
+                            @if (!string.IsNullOrEmpty(Model.FilterResult.ToString()))
                             {
                                 <pre>@Model.FilterResult.ToString()</pre>
                                 <pre class="d-inline">@Model.FilterResult.ToNormalizedString()</pre>
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/AuditTrailEventMeta.SummaryAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/AuditTrailEventMeta.SummaryAdmin.cshtml
index 542e365e482..5dab50c2ae0 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/AuditTrailEventMeta.SummaryAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/AuditTrailEventMeta.SummaryAdmin.cshtml
@@ -14,7 +14,7 @@
 </span>
 
 
-@if (!String.IsNullOrEmpty(Model.AuditTrailEvent.ClientIpAddress))
+@if (!string.IsNullOrEmpty(Model.AuditTrailEvent.ClientIpAddress))
 {
     <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Client IP Address"]">
         <i class="fa-solid fa-wifi text-secondary me-1" aria-hidden="true"></i>@Model.AuditTrailEvent.ClientIpAddress
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Views/AutoroutePart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Autoroute/Views/AutoroutePart.Edit.cshtml
index 1f89e7a9c6c..43eff970207 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Views/AutoroutePart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Views/AutoroutePart.Edit.cshtml
@@ -26,12 +26,12 @@
     </div>
 }
 
-<div class="autoroute-disabled" style="@(Model.Disabled ? "display: none" : String.Empty)">
+<div class="autoroute-disabled" style="@(Model.Disabled ? "display: none" : string.Empty)">
     <div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Path">
         <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
         <div class="@Orchard.GetEndCssClasses()">
             <div class="input-group">
-                @if (!String.IsNullOrWhiteSpace(site.BaseUrl))
+                @if (!string.IsNullOrWhiteSpace(site.BaseUrl))
                 {
                     <div class="input-group-text">@site.BaseUrl</div>
                 }
@@ -42,7 +42,7 @@
                 }
                 <span asp-validation-for="Path"></span>
             </div>
-            @if (!String.IsNullOrWhiteSpace(Model.Settings.Pattern) && Model.Settings.AllowCustomPath)
+            @if (!string.IsNullOrWhiteSpace(Model.Settings.Pattern) && Model.Settings.AllowCustomPath)
             {
                 <span class="hint">@T["The url of the content item. Leave empty to auto-generate it."]</span>
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Index.cshtml
index 684fb115785..089d3d87ae0 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Index.cshtml
@@ -56,7 +56,7 @@
                         </div>
                     </div>
 
-                    @if (!String.IsNullOrWhiteSpace(task.Description))
+                    @if (!string.IsNullOrWhiteSpace(task.Description))
                     {
                         <div class="row">
                             <div class="col">
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml
index b5d03315c4e..ee7a7b7bec3 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml
@@ -9,8 +9,8 @@
     <div class="@Orchard.GetEndCssClasses(true)">
         <div class="form-check form-switch">
             <input asp-for="Value" type="checkbox" class="form-check-input content-preview-select" checked="@Model.Value" />
-            <label asp-for="Value" class="form-check-label">@(String.IsNullOrEmpty(settings.Label) ? Model.PartFieldDefinition.DisplayName() : settings.Label)</label>
-            @if (!String.IsNullOrEmpty(settings.Hint))
+            <label asp-for="Value" class="form-check-label">@(string.IsNullOrEmpty(settings.Label) ? Model.PartFieldDefinition.DisplayName() : settings.Label)</label>
+            @if (!string.IsNullOrEmpty(settings.Hint))
             {
                 <span class="hint dashed">@settings.Hint</span>
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml
index 5ed974bf0ee..2ef73ee182f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml
@@ -12,7 +12,7 @@
             <input asp-for="Value" type="checkbox" class="form-check-input content-preview-select" checked="@Model.Value" />
             <label class="form-check-label" asp-for="Value">
                 @(string.IsNullOrEmpty(settings.Label) ? Model.PartFieldDefinition.DisplayName() : settings.Label)
-                @if (!String.IsNullOrEmpty(settings.Hint))
+                @if (!string.IsNullOrEmpty(settings.Hint))
                 {
                     <span class="hint dashed">@settings.Hint</span>
                 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
index f213314701c..e74ad10c996 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
@@ -51,7 +51,7 @@
                         @T["No result found"]
                     </template>
                 </vue-multiselect>
-                @if (!String.IsNullOrEmpty(settings.Hint))
+                @if (!string.IsNullOrEmpty(settings.Hint))
                 {
                     <span class="hint">@settings.Hint</span>
                 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Option.cshtml
index cd7f70a87dd..cdc07fcd087 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml
index 0c70f4ebe50..8666c816d36 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml
@@ -14,7 +14,7 @@
                 <input asp-for="Value" type="text" class="form-control content-preview-select datepicker" required="@settings.Required" />
             </div>
         </div>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml
index a55421b38e9..ed8e557107f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml
@@ -14,7 +14,7 @@
                 <input asp-for="Value" type="date" class="form-control content-preview-select" required="@settings.Required" />
             </div>
         </div>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml
index f62d7de7642..cdfe34b4495 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml
@@ -14,7 +14,7 @@
             </div>
         </div>
 
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml
index 94ea8311163..4d7dcfa3203 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml
@@ -13,7 +13,7 @@
         @await DisplayAsync(await New.ShortcodeModal())
         <div id="@Html.IdFor(x => x.Html)_editor" asp-for="Text" style="min-height: 400px;" class="form-control" dir="@culture.GetLanguageDirection()"></div>
         <textarea asp-for="Html" hidden>@Html.Raw(Model.Html)</textarea>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml
index 748c2b4eadf..3d24bbcc49a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml
@@ -11,7 +11,7 @@
     <div class="@Orchard.GetEndCssClasses()">
         @await DisplayAsync(await New.ShortcodeModal())
         <textarea asp-for="Html" rows="5" class="form-control content-preview-text shortcode-modal-input" dir="@culture.GetLanguageDirection()"></textarea>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml
index 08cb47d509d..1eb43f51cf2 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml
@@ -36,7 +36,7 @@ else
             <textarea asp-for="Html"></textarea>
         }
 
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml
index c96d4d35d05..22424a86cc8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml
@@ -28,7 +28,7 @@
             <textarea asp-for="Html"></textarea>
         }
 
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml
index 02e5665e1c7..f9f5e014705 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml
@@ -11,7 +11,7 @@
     <div class="@Orchard.GetEndCssClasses()">
         @await DisplayAsync(await New.ShortcodeModal())
         <textarea asp-for="Html" rows="5" class="form-control content-preview-text" dir="@culture.GetLanguageDirection()"></textarea>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml
index cc4060e76a6..32844ef865a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml
@@ -2,12 +2,12 @@
 @using OrchardCore.Mvc.Utilities
 @{
     var settings = Model.PartFieldDefinition.GetSettings<LinkFieldSettings>();
-    var isRequired = settings.Required && String.IsNullOrWhiteSpace(settings.DefaultUrl);
-    var isTextRequired = settings.LinkTextMode == LinkTextMode.Required && String.IsNullOrWhiteSpace(settings.DefaultText);
+    var isRequired = settings.Required && string.IsNullOrWhiteSpace(settings.DefaultUrl);
+    var isTextRequired = settings.LinkTextMode == LinkTextMode.Required && string.IsNullOrWhiteSpace(settings.DefaultText);
     var urlClass = settings.Required ? "required" : null;
     var textClass = settings.LinkTextMode == LinkTextMode.Required ? "required" : null;
     var uniqueName = $"{Model.PartFieldDefinition.PartDefinition.Name}-{Model.PartFieldDefinition.Name}";
-    var useFormFloating = String.IsNullOrWhiteSpace(settings.UrlPlaceholder) || String.IsNullOrWhiteSpace(settings.TextPlaceholder);
+    var useFormFloating = string.IsNullOrWhiteSpace(settings.UrlPlaceholder) || string.IsNullOrWhiteSpace(settings.TextPlaceholder);
 }
 
 <div class="@Orchard.GetWrapperCssClasses("field-wrapper", $"field-wrapper-{uniqueName.HtmlClassify()}")" id="@Html.IdFor(x => x.Text)_FieldWrapper">
@@ -15,7 +15,7 @@
     <div class="@Orchard.GetEndCssClasses()">
         <div class="row">
             <div class="col-md-6" asp-validation-class-for="Url">
-                <div class="@(useFormFloating ? "form-floating" : String.Empty)">
+                <div class="@(useFormFloating ? "form-floating" : string.Empty)">
                     <input asp-for="Url" class="form-control content-preview-text" placeholder="@settings.UrlPlaceholder" required="@isRequired" />
                     @if (useFormFloating)
                     {
@@ -23,7 +23,7 @@
                     }
                 </div>
 
-                @if (!String.IsNullOrWhiteSpace(settings.Hint))
+                @if (!string.IsNullOrWhiteSpace(settings.Hint))
                 {
                     <span class="hint">@settings.Hint</span>
                 }
@@ -31,7 +31,7 @@
             @if (settings.LinkTextMode == LinkTextMode.Optional || settings.LinkTextMode == LinkTextMode.Required)
             {
                 <div class="col-md-6" asp-validation-class-for="Text">
-                    <div class="@(useFormFloating ? "form-floating" : String.Empty)">
+                    <div class="@(useFormFloating ? "form-floating" : string.Empty)">
                         <input asp-for="Text" type="text" class="form-control content-preview-text" placeholder="@settings.TextPlaceholder" required="@isTextRequired" />
                         @if (useFormFloating)
                         {
@@ -39,7 +39,7 @@
                         }
                     </div>
 
-                    @if (!String.IsNullOrWhiteSpace(settings.HintLinkText))
+                    @if (!string.IsNullOrWhiteSpace(settings.HintLinkText))
                     {
                         <span class="hint">@settings.HintLinkText</span>
                     }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.cshtml
index e6610987daf..02f0dcab60f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.cshtml
@@ -12,7 +12,7 @@
     switch (settings.LinkTextMode)
     {
         case LinkTextMode.Static:
-            if (!String.IsNullOrWhiteSpace(settings.DefaultText))
+            if (!string.IsNullOrWhiteSpace(settings.DefaultText))
             {
                 text = settings.DefaultText;
             }
@@ -25,7 +25,7 @@
             text = Model.Url;
             break;
         case LinkTextMode.Optional:
-            if (String.IsNullOrWhiteSpace(text))
+            if (string.IsNullOrWhiteSpace(text))
             {
                 text = Model.Url;
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml
index b4216df3d4f..3a59e1347f7 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml
@@ -55,7 +55,7 @@
                         @T["No result found"]
                     </template>
                 </vue-multiselect>
-                @if (!String.IsNullOrEmpty(settings.Hint))
+                @if (!string.IsNullOrEmpty(settings.Hint))
                 {
                     <span class="hint">@settings.Hint</span>
                 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Option.cshtml
index cd7f70a87dd..cdc07fcd087 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml
index 36b1f9825f6..a7d96ce5004 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml
@@ -20,12 +20,12 @@
         {
             var option = options[i];
             <div class="form-check">
-                <input type="checkbox" id="@(Html.IdFor(m => m.Values) + "_" + i)" name="@(Html.NameFor(m => m.Values))" class="form-check-input" value="@option.Value" @(option.Selected ? "checked='checked'" : String.Empty) />
+                <input type="checkbox" id="@(Html.IdFor(m => m.Values) + "_" + i)" name="@(Html.NameFor(m => m.Values))" class="form-check-input" value="@option.Value" @(option.Selected ? "checked='checked'" : string.Empty) />
                 <label class="form-check-label" for="@(Html.IdFor(m => m.Values) + "_" + i)">@option.Text</label>
             </div>
         }
 
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml
index 18eed179c4b..b68cfd1389b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml
@@ -51,7 +51,7 @@
                     </template>
                 </vue-multiselect>
             </div>
-            @if (!String.IsNullOrEmpty(settings.Hint))
+            @if (!string.IsNullOrEmpty(settings.Hint))
             {
                 <span class="hint">@settings.Hint</span>
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml
index 6ea85b37918..3699ba2913e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml
@@ -17,7 +17,7 @@
     <label asp-for="Values" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses()">
         <select class="form-select content-preview-select" asp-for="Values" asp-items="options" multiple></select>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Option.cshtml
index cd7f70a87dd..cdc07fcd087 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml
index af0d6d3c7db..3210280c45e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml
@@ -32,7 +32,7 @@
                 <input id="@(id)-range" class="form-control-range" type="range" min="@min" max="@max" step="@step" oninput="numericFieldRange('@(id)', value);" onchange="numericFieldRange('@(id)', value);" />
             </div>
         </div>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml
index 6d33a2ba372..b6fc6245a1a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml
@@ -24,7 +24,7 @@
             }
         </select>
 
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml
index a696fb05ac9..b4e40c7b7ce 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml
@@ -45,7 +45,7 @@
                 <span class="ms-3 me-1">@max</span>
             }
         </div>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml
index f2362fec94e..3d191b7e6d9 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml
@@ -36,7 +36,7 @@
                 </div>
             </div>
         </div>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml
index 6f2c2e4798e..22f6623d5b8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml
@@ -26,7 +26,7 @@
                 </div>
             </div>
         </div>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Option.cshtml
index fef0ef62940..a364470b681 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Number"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml
index ae56b586baf..3332b1ea577 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml
@@ -10,7 +10,7 @@
     <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses()">
         <textarea asp-for="Text" rows="5" class="form-control content-preview-text" dir="@culture.GetLanguageDirection()"></textarea>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml
index 2ced91cb0bf..6a456a3c97b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml
@@ -9,7 +9,7 @@
     <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses("pt-lg-2")">
         <input asp-for="Text" class="form-control content-preview-text" type="color" style="min-height: 2.25rem" />
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml
index 2b8da901613..0292314dbbc 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml
@@ -12,7 +12,7 @@
             <span class="input-group-text">@@</span>
             <input asp-for="Text" class="form-control content-preview-text" type="email" />
         </div>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml
index 7733624f27d..36ddefbaf58 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml
@@ -27,7 +27,7 @@
             </div>
         </div>
 
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml
index d743761f266..51627202132 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml
@@ -12,7 +12,7 @@
     <div class="@Orchard.GetEndCssClasses()">
         <div id="@Html.IdFor(x => x.Text)_editor" asp-for="Text" style="min-height: 400px;" class="form-control" dir="@culture.GetLanguageDirection()"></div>
         <textarea asp-for="Text" hidden>@Html.Raw(Model.Text)</textarea>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml
index a33976be2a1..8dc677e3812 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml
@@ -5,12 +5,12 @@
     var listSettings = Model.PartFieldDefinition.GetSettings<TextFieldPredefinedListEditorSettings>();
 
     var options = new List<SelectListItem>();
-    var selectedValue = String.IsNullOrEmpty(Model.Text) ? listSettings.DefaultValue : Model.Text;
+    var selectedValue = string.IsNullOrEmpty(Model.Text) ? listSettings.DefaultValue : Model.Text;
 
     foreach (var option in listSettings.Options)
     {
         var isSelected = option.Value == selectedValue
-            || (String.IsNullOrEmpty(option.Value) && String.IsNullOrEmpty(selectedValue));
+            || (string.IsNullOrEmpty(option.Value) && string.IsNullOrEmpty(selectedValue));
 
         options.Add(new SelectListItem { Text = option.Name, Value = option.Value, Selected = isSelected });
     }
@@ -37,7 +37,7 @@
             <select class="form-select content-preview-select" asp-for="Text" asp-items="options"></select>
         }
 
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml
index 45651a1e60f..ee0f0efa5aa 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml
@@ -9,7 +9,7 @@
     <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses()">
         <input asp-for="Text" class="form-control content-preview-text" type="tel" />
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml
index ca4ed9e9a68..1c9d6eb4f99 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml
@@ -9,7 +9,7 @@
     <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses()">
         <input asp-for="Text" class="form-control content-preview-text" type="url" />
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml
index 66f18ba221b..1bc69b349c1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml
@@ -10,7 +10,7 @@
     <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses()">
         <input asp-for="Text" class="form-control content-preview-text" dir="@culture.GetLanguageDirection()" />
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Option.cshtml
index cd7f70a87dd..cdc07fcd087 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml
index 48e5f1eb335..a17bcbc0101 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml
@@ -13,7 +13,7 @@
                 <input asp-for="Value" type="time" class="form-control content-preview-select" step="@settings.Step" required="@settings.Required" />
             </div>
         </div>
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml
index 03cfc612c62..851a2626f22 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml
@@ -52,7 +52,7 @@
                         @T["No result found"]
                     </template>
                 </vue-multiselect>
-                @if (!String.IsNullOrEmpty(settings.Hint))
+                @if (!string.IsNullOrEmpty(settings.Hint))
                 {
                     <span class="hint">@settings.Hint</span>
                 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Option.cshtml
index cd7f70a87dd..cdc07fcd087 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml
index a8682ed5cb8..329d6596026 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml
@@ -9,7 +9,7 @@
     <label asp-for="RawAddress" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses()">
         <input asp-for="RawAddress" class="form-control content-preview-text" required="@settings.Required" />
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/AddReusablePartTo.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/AddReusablePartTo.cshtml
index 3c493a1d2f4..ab2aab81618 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/AddReusablePartTo.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/AddReusablePartTo.cshtml
@@ -35,7 +35,7 @@
                         <div class="form-check">
                             <input type="radio" class="form-check-input" asp-for="SelectedPartName" id="@Html.IdFor(m => m.PartSelections[i].PartName)" value="@Model.PartSelections[i].PartName">
                             <label class="form-check-label" asp-for="PartSelections[i].PartName">@partSelection.PartDisplayName</label>
-                            @if (!String.IsNullOrEmpty(partSelection.PartDescription))
+                            @if (!string.IsNullOrEmpty(partSelection.PartDescription))
                             {
                                 <span class="hint dashed">@partSelection.PartDescription</span>
                             }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml
index 5bf23d9e0b9..39ae97fb931 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml
@@ -7,7 +7,7 @@
 @inject OrchardCore.ContentTypes.Services.IContentDefinitionService ContentDefinitionService
 
 @{
-    var typePart = Model.TypeDefinition.Parts.FirstOrDefault(x => String.Equals(x.Name, Model.TypeDefinition.Name, StringComparison.OrdinalIgnoreCase));
+    var typePart = Model.TypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.Name, Model.TypeDefinition.Name, StringComparison.OrdinalIgnoreCase));
     var partDefinitions = Model.TypeDefinition.Parts
         .Select(part =>
         {
@@ -58,7 +58,7 @@
                     <li class="list-group-item" style="cursor: move;">
                         <div class="w-100">
                             <div class="float-end">
-                                @if (fields.Any(field => String.Equals(field.Name, fieldDefintion.FieldDefinition.Name, StringComparison.OrdinalIgnoreCase)))
+                                @if (fields.Any(field => string.Equals(field.Name, fieldDefintion.FieldDefinition.Name, StringComparison.OrdinalIgnoreCase)))
                                 {
                                     <a asp-route-action="EditField" asp-route-id="@Model.TypeDefinition.Name" asp-route-name="@fieldDefintion.Name" asp-route-returnUrl="@FullRequestPath" class="btn btn-primary btn-sm" role="button">@T["Edit"]</a>
                                 }
@@ -66,11 +66,11 @@
                             </div>
                             @fieldDefintion.DisplayName() <span class="hint dashed">@fieldDefintion.FieldDefinition.Name.CamelFriendly()</span>
 
-                            @if (!String.IsNullOrEmpty(fieldDefintion.DisplayMode()))
+                            @if (!string.IsNullOrEmpty(fieldDefintion.DisplayMode()))
                             {
                                 <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @fieldDefintion.DisplayMode()</span>
                             }
-                            @if (!String.IsNullOrEmpty(fieldDefintion.Editor()))
+                            @if (!string.IsNullOrEmpty(fieldDefintion.Editor()))
                             {
                                 <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @fieldDefintion.Editor()</span>
                             }
@@ -100,7 +100,7 @@
 
                         @if (partDefinition != typePart)
                         {
-                            @if (!String.IsNullOrEmpty(partDefinition.Description()))
+                            @if (!string.IsNullOrEmpty(partDefinition.Description()))
                             {
                                 <span class="hint dashed">@partDefinition.Description()</span>
                             }
@@ -115,11 +115,11 @@
                             <span class="hint dashed">@T["Contains the fields for the current type"]</span>
                         }
 
-                        @if (!String.IsNullOrEmpty(partDefinition.DisplayMode()))
+                        @if (!string.IsNullOrEmpty(partDefinition.DisplayMode()))
                         {
                             <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Display mode"]"><i class="fa-solid fa-tv text-info" aria-hidden="true"></i> @partDefinition.DisplayMode()</span>
                         }
-                        @if (!String.IsNullOrEmpty(partDefinition.Editor()))
+                        @if (!string.IsNullOrEmpty(partDefinition.Editor()))
                         {
                             <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Editor"]"><i class="fa-solid fa-edit text-info" aria-hidden="true"></i> @partDefinition.Editor()</span>
                         }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Shared/DisplayTemplates/EditTypeViewModel.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Shared/DisplayTemplates/EditTypeViewModel.cshtml
index 6e48c1920e6..1c72afced86 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Shared/DisplayTemplates/EditTypeViewModel.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Shared/DisplayTemplates/EditTypeViewModel.cshtml
@@ -9,7 +9,7 @@
 
         <span class="badge rounded-pill ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Technical Name"]"><i class="fa-solid fa-file-alt text-danger" aria-hidden="true"></i> @Model.Name</span>
 
-        @if (!String.IsNullOrWhiteSpace(settings.Stereotype))
+        @if (!string.IsNullOrWhiteSpace(settings.Stereotype))
         {
             <span class="badge rounded-pill ta-badge font-weight-normal" data-bs-toggle="tooltip" title="Stereotype"><i class="fa-solid fa-file text-info" aria-hidden="true"></i> @settings.Stereotype</span>
         }
@@ -24,7 +24,7 @@
     </div>
 </div>
 
-@if (!String.IsNullOrWhiteSpace(settings.Description))
+@if (!string.IsNullOrWhiteSpace(settings.Description))
 {
     <div class="row">
         <div class="col">
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.Edit.cshtml
index a7f115fa9a1..6ad3a832896 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.Edit.cshtml
@@ -30,7 +30,7 @@
                         var returnUrl = Context.Request.Query["returnUrl"];
                     }
 
-                    @if (!String.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
+                    @if (!string.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
                     {
                         <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
                     }
@@ -49,7 +49,7 @@
 
 @if (Model.Actions != null)
 {
-    @if (!String.IsNullOrWhiteSpace(Context.Request.Query["returnUrl"]))
+    @if (!string.IsNullOrWhiteSpace(Context.Request.Query["returnUrl"]))
     {
         @Html.Hidden("returnUrl", Context.Request.Query["returnUrl"])
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.PublishButton.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.PublishButton.cshtml
index 1b31f5bf94f..015b66bb015 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.PublishButton.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.PublishButton.cshtml
@@ -2,7 +2,7 @@
     var returnUrl = Context.Request.Query["returnUrl"];
 }
 
-@if (String.IsNullOrWhiteSpace(returnUrl))
+@if (string.IsNullOrWhiteSpace(returnUrl))
 {
     <button type="submit" name="submit.Publish" class="btn btn-success publish" value="submit.Publish">@T["Publish"]</button>
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.SaveDraftButton.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.SaveDraftButton.cshtml
index d5864435dc4..f5b0cdcc6b5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.SaveDraftButton.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.SaveDraftButton.cshtml
@@ -2,7 +2,7 @@
     var returnUrl = Context.Request.Query["returnUrl"];
 }
 
-@if (String.IsNullOrWhiteSpace(returnUrl))
+@if (string.IsNullOrWhiteSpace(returnUrl))
 {
     <button class="primaryAction btn btn-primary draft" type="submit" name="submit.Save" value="submit.Save">@T["Save Draft"]</button>
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.cshtml
index b19c4cc0caa..940898880eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.cshtml
@@ -8,7 +8,7 @@
     Model.Classes.Add(contentTypeClassName);
 }
 
-<article class="@String.Join(" ", Model.Classes.ToArray())">
+<article class="@string.Join(" ", Model.Classes.ToArray())">
     @if (Model.Header != null || Model.Meta != null)
     {
     <header>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml
index 363907b953b..6f53db0edda 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml
@@ -13,7 +13,7 @@
     <div class="@Orchard.GetLabelCssClasses()">
         @typePartDefinition.DisplayName()
 
-        @if (!String.IsNullOrEmpty(description))
+        @if (!string.IsNullOrEmpty(description))
         {
             <small class="form-text text-muted">@description</small>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml
index 363907b953b..6f53db0edda 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml
@@ -13,7 +13,7 @@
     <div class="@Orchard.GetLabelCssClasses()">
         @typePartDefinition.DisplayName()
 
-        @if (!String.IsNullOrEmpty(description))
+        @if (!string.IsNullOrEmpty(description))
         {
             <small class="form-text text-muted">@description</small>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml
index 363907b953b..6f53db0edda 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml
@@ -13,7 +13,7 @@
     <div class="@Orchard.GetLabelCssClasses()">
         @typePartDefinition.DisplayName()
 
-        @if (!String.IsNullOrEmpty(description))
+        @if (!string.IsNullOrEmpty(description))
         {
             <small class="form-text text-muted">@description</small>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml
index 23b68caf24c..ffe9e3bdd3d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml
@@ -17,7 +17,7 @@
         <div class="@Orchard.GetLabelCssClasses()">
             @typePartDefinition.DisplayName()
 
-            @if (!String.IsNullOrEmpty(description))
+            @if (!string.IsNullOrEmpty(description))
             {
                 <small class="form-text text-muted">@description</small>
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminListSearch.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminListSearch.cshtml
index 1ac7a2af346..b6c47163250 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminListSearch.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminListSearch.cshtml
@@ -16,7 +16,7 @@
     <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" id="filter-dropdown" aria-haspopup="true" aria-expanded="false">
         <i class="fa-solid fa-filter" title="@T["Filters"]" aria-hidden="true"></i>
     </button>
-    <ul class="@String.Join(' ', dropdownClassList)" aria-labelledby="filter-dropdown">
+    <ul class="@string.Join(' ', dropdownClassList)" aria-labelledby="filter-dropdown">
         <li><a class="dropdown-item" href="?q=status:Draft">@T["Only draft items"]</a></li>
         <li><a class="dropdown-item" href="?q=status:Published">@T["Only published items"]</a></li>
         <li><a class="dropdown-item" href="?q=status:Owner">@T["Owned by me"]</a></li>
@@ -92,7 +92,7 @@
                     <div class="card">
                         <div class="card-body">
                             <h4>@T["Current filter"]</h4>
-                            @if (!String.IsNullOrEmpty(Model.FilterResult.ToString()))
+                            @if (!string.IsNullOrEmpty(Model.FilterResult.ToString()))
                             {
                                 <pre>@Model.FilterResult.ToString()</pre>
                                 <pre class="d-inline">@Model.FilterResult.ToNormalizedString()</pre>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsMeta_SummaryAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsMeta_SummaryAdmin.cshtml
index e464e4e3eff..33a73af8576 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsMeta_SummaryAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsMeta_SummaryAdmin.cshtml
@@ -11,7 +11,7 @@
         <i class="fa-solid fa-calendar text-secondary" aria-hidden="true"></i> <time datetime="@modifiedUtc">@await DisplayAsync(await New.Timespan(Utc: contentItem.ModifiedUtc))</time>
     </span>
 }
-@if (!String.IsNullOrEmpty(contentItem.Author))
+@if (!string.IsNullOrEmpty(contentItem.Author))
 {
     <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Author"]">
         <i class="fa-solid fa-user text-secondary me-1" aria-hidden="true"></i>@contentItem.Author
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Download/Display.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Download/Display.cshtml
index 3b65db6c420..869964186b8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Download/Display.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Download/Display.cshtml
@@ -27,7 +27,7 @@
 
     <button class="btn btn-success download" type="submit">@T["Download"]</button>
 
-    @if (!String.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
+    @if (!string.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
     {
         <a class="btn btn-secondary cancel" role="button" href="@returnUrl">@T["Cancel"]</a>
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/AuditTrailContentEventContent.SummaryAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/AuditTrailContentEventContent.SummaryAdmin.cshtml
index 23f19e1eeab..7990e89b9f9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/AuditTrailContentEventContent.SummaryAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/AuditTrailContentEventContent.SummaryAdmin.cshtml
@@ -1,6 +1,6 @@
 @model AuditTrailContentEventViewModel
 
-@if (!String.IsNullOrEmpty(Model.Comment))
+@if (!string.IsNullOrEmpty(Model.Comment))
 {
 @* a pre tag respects whitespace and newlines.*@
 <pre class="audittrail-comment">
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/AuditTrailContentEventDetail.DetailAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/AuditTrailContentEventDetail.DetailAdmin.cshtml
index 64cbcde4927..d891c53404a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/AuditTrailContentEventDetail.DetailAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/AuditTrailContentEventDetail.DetailAdmin.cshtml
@@ -54,7 +54,7 @@
         <tr>
             <th>@T["Comment"]</th>
             <td>
-                @if (!String.IsNullOrEmpty(Model.Comment))
+                @if (!string.IsNullOrEmpty(Model.Comment))
                 {
                     @* a pre tag respects whitespace and newlines.*@
                     <pre class="audittrail-comment">@Model.Comment</pre>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentItemDeploymentStep.Fields.Summary.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentItemDeploymentStep.Fields.Summary.cshtml
index d9409a84ec3..b465b3a5c3d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentItemDeploymentStep.Fields.Summary.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentItemDeploymentStep.Fields.Summary.cshtml
@@ -3,7 +3,7 @@
 
 @{
     ContentItem contentItem = null;
-    if (!String.IsNullOrEmpty(Model.Value.ContentItemId))
+    if (!string.IsNullOrEmpty(Model.Value.ContentItemId))
     {
         contentItem = await ContentManager.GetAsync(Model.Value.ContentItemId);
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesAdminNode.Fields.TreeSummary.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesAdminNode.Fields.TreeSummary.cshtml
index 28e480ff9f0..351a47535d3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesAdminNode.Fields.TreeSummary.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesAdminNode.Fields.TreeSummary.cshtml
@@ -15,7 +15,7 @@
 
     bool isSelected(ContentTypeDefinition ctd, ContentTypeEntry[] selectedList)
     {
-        return selectedList.Any(selected => String.Equals(ctd.Name, selected.ContentTypeId, StringComparison.OrdinalIgnoreCase));
+        return selectedList.Any(selected => string.Equals(ctd.Name, selected.ContentTypeId, StringComparison.OrdinalIgnoreCase));
     }
 }
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesSitemapSource.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesSitemapSource.Edit.cshtml
index 34a1e91a33e..5b54fb6ed3b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesSitemapSource.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesSitemapSource.Edit.cshtml
@@ -118,7 +118,7 @@
                 <ul class="list-group">
                     @for (int i = 0; i < Model.LimitedContentTypes.Length; i++)
                     {
-                        var checkd = String.Equals(Model.LimitedContentTypes[i].ContentTypeName, Model.LimitedContentType);
+                        var checkd = string.Equals(Model.LimitedContentTypes[i].ContentTypeName, Model.LimitedContentType);
                         var notChecked = !checkd;
                         <li class="list-group-item d-flex row px-0">
                             @* Select content types *@
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/Download-Button-Actions.SummaryAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/Download-Button-Actions.SummaryAdmin.cshtml
index 0ea410b5627..d65e65851f2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/Download-Button-Actions.SummaryAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/Download-Button-Actions.SummaryAdmin.cshtml
@@ -13,7 +13,7 @@
 @if (hasDraft)
 {
     <a asp-action="Display" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-returnUrl="@FullRequestPath" asp-route-latest="true" class="dropdown-item btn btn-primary btn-sm">@T["View Draft as JSON"]</a>
-    <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@Boolean.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
+    <a id="@exportDraftId" asp-action="Download" asp-controller="Download" asp-area="OrchardCore.Contents" asp-route-contentItemId="@contentItem.ContentItemId" asp-route-latest="@bool.TrueString" class="dropdown-item btn btn-primary btn-sm" data-url-af="UnsafeUrl">@T["Download Draft as JSON"]</a>
 
     if (hasPublished)
     {
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml
index 133abd840d3..6eaf4e4dbaf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ExportContentToDeploymentTarget-Button-Actions.SummaryAdmin.cshtml
@@ -10,7 +10,7 @@
 <div class="dropdown-divider"></div>
 @if (hasDraft)
 {
-    <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@Boolean.TrueString>@T["Export Draft to Deployment Target"]</button>
+    <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId" data-latest=@bool.TrueString>@T["Export Draft to Deployment Target"]</button>
     if (hasPublished)
     {
         <button class="dropdown-item btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#modalExportContentToDeploymentTargetActionTarget" data-content-item-id="@contentItem.ContentItemId">@T["Export Published to Deployment Target"]</button>
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Views/Admin/Features.cshtml b/src/OrchardCore.Modules/OrchardCore.Features/Views/Admin/Features.cshtml
index e0485561b7f..e2eee3119e1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/Views/Admin/Features.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Features/Views/Admin/Features.cshtml
@@ -4,7 +4,7 @@
 @model FeaturesViewModel
 @{
     var title = T["Features"];
-    if (!String.IsNullOrEmpty(Model.Name))
+    if (!string.IsNullOrEmpty(Model.Name))
     {
         title = T["Features for {0} tenant", Model.Name];
     }
@@ -50,7 +50,7 @@
         foreach (var featureGroup in featureGroups)
         {
             var categoryName = featureGroup.First().Descriptor.Category ?? T["Uncategorized"].Value;
-            var categoryClassName = String.Format("category {0}", Html.Encode(categoryName.ToString()));
+            var categoryClassName = string.Format("category {0}", Html.Encode(categoryName.ToString()));
             if (featureGroup == featureGroups.First())
             {
                 categoryClassName += " first";
@@ -60,7 +60,7 @@
                 categoryClassName += " last";
             }
             var features = featureGroup.OrderBy(f => f.Descriptor.Name);
-            var categoryFeatureNames = String.Join(" ", features.Select(f => f.Descriptor.Name));
+            var categoryFeatureNames = string.Join(" ", features.Select(f => f.Descriptor.Name));
 
             <div class="feature-group">
                 <h4 class="mb-2 mt-3" data-filter-value="@categoryName @categoryFeatureNames">@categoryName</h4>
@@ -80,7 +80,7 @@
 
                             var dependencies = (from d in feature.FeatureDependencies
                                                 select (from f in Model.Features where f.Descriptor.Id == d.Id select f).SingleOrDefault()).Where(f => f != null).OrderBy(f => f.Descriptor.Name);
-                            var dependenciesNames = String.Join(" ", dependencies.Select(d => d.Descriptor.Name));
+                            var dependenciesNames = string.Join(" ", dependencies.Select(d => d.Descriptor.Name));
                             var missingDependencies = feature.FeatureDependencies
                             .Where(d => !Model.Features.Any(f => f.Descriptor.Id == d.Id));
                             var showDisable = !feature.Descriptor.EnabledByDependencyOnly && !isAlwaysEnabled && categoryName != "Core" && featureName != Application.ModuleName;
@@ -109,7 +109,7 @@
                                                 @foreach (var d in dependencies)
                                                 {
                                                     <span class="badge ta-badge">
-                                                        @(String.IsNullOrEmpty(d.Descriptor.Name) ? d.Descriptor.Id : d.Descriptor.Name)
+                                                        @(string.IsNullOrEmpty(d.Descriptor.Name) ? d.Descriptor.Id : d.Descriptor.Name)
                                                     </span>
                                                 }
                                                 @foreach (var d in missingDependencies)
@@ -154,7 +154,7 @@
                                                 var confirmationMessage = T["Are you sure you want to disable the {0} feature? Continue?", featureName];
                                                 if (feature.EnabledDependentFeatures.Any())
                                                 {
-                                                    var enabledDependentFeatures = new HtmlString($"<ul>{String.Join("", feature.EnabledDependentFeatures.Select(f => $"<li>{f.Name}</li>"))}</ul>");
+                                                    var enabledDependentFeatures = new HtmlString($"<ul>{string.Join("", feature.EnabledDependentFeatures.Select(f => $"<li>{f.Name}</li>"))}</ul>");
                                                     confirmationMessage = T["Disabling the {0} feature will also disable the following dependent features:{1}Continue?", featureName, enabledDependentFeatures];
                                                 }
                                                 <a id="btn-disable-@Html.GenerateIdFromName(featureId)" asp-action="Disable" asp-route-id="@featureId" asp-route-tenant="@Model.Name" class="btn btn-danger btn-sm" data-title="@T["Disable Feature"]" data-message="@confirmationMessage" data-ok-text="@T["Yes"]" data-cancel-text="@T["No"]" data-url-af="UnsafeUrl RemoveUrl">@T["Disable"]</a>
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Option.cshtml
index cd7f70a87dd..cdc07fcd087 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-BagPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-BagPart.Edit.cshtml
index ea35efc9b10..00bef8e6c07 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-BagPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-BagPart.Edit.cshtml
@@ -13,7 +13,7 @@
     }
 }
 
-<div class="widget widget-editor card@(collapsed ? " collapsed" : String.Empty)">
+<div class="widget widget-editor card@(collapsed ? " collapsed" : string.Empty)">
     <div class="widget-editor-header card-header text-muted py-1 ps-2 pe-1">
         @if (Model.CanMove)
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-FlowPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-FlowPart.Edit.cshtml
index e775e130070..9f99b3283e7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-FlowPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-FlowPart.Edit.cshtml
@@ -12,7 +12,7 @@
     var editorId = "contentEditor_" + Model.PrefixValue;
 }
 
-<div class="widget widget-editor card my-1@(Model.Inline ? " collapsed" : String.Empty)">
+<div class="widget widget-editor card my-1@(Model.Inline ? " collapsed" : string.Empty)">
     <div class="widget-editor-header card-header text-muted py-1 ps-2 pe-1">
         @if (Model.CanMove != false)
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Option.cshtml
index cd7f70a87dd..cdc07fcd087 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementLabelPart.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementLabelPart.cshtml
index f72a44d32ca..05714809ffd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementLabelPart.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementLabelPart.cshtml
@@ -6,7 +6,7 @@
     var formInputElementPart = Model.Value.ContentItem.As<FormInputElementPart>();
     var elementId = formElementPart.Id;
     var fieldName = formInputElementPart.Name;
-    var fieldId = !String.IsNullOrEmpty(elementId) ? elementId : !String.IsNullOrEmpty(fieldName) ? Html.GenerateIdFromName(fieldName) : default(string);
+    var fieldId = !string.IsNullOrEmpty(elementId) ? elementId : !string.IsNullOrEmpty(fieldName) ? Html.GenerateIdFromName(fieldName) : default(string);
 }
 
 @if (Model.Value.Option == LabelOptions.Standard)
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementValidationPart.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementValidationPart.cshtml
index 65ce4b6addb..7aa0954657d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementValidationPart.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementValidationPart.cshtml
@@ -6,14 +6,14 @@
     var formInputElementPart = Model.Value.ContentItem.As<FormInputElementPart>();
     var elementId = formElementPart.Id;
     var fieldName = formInputElementPart.Name;
-    var fieldId = !String.IsNullOrEmpty(elementId) ? elementId : !String.IsNullOrEmpty(fieldName) ? Html.GenerateIdFromName(fieldName) : default(string);
+    var fieldId = !string.IsNullOrEmpty(elementId) ? elementId : !string.IsNullOrEmpty(fieldName) ? Html.GenerateIdFromName(fieldName) : default(string);
 }
 
 @if (Model.Value.Option == ValidationOptions.Standard)
 {
     // HtmlFieldPrefix is the PartName i.e. ValidationPart, which is not needed in Display.
     var htmlFieldPrefix = ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix;
-    ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = String.Empty;
+    ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = string.Empty;
 
     @Html.ValidationMessage(fieldName)
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/InputPart.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/InputPart.cshtml
index 2f32ca9adfd..22618a8ff3f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/InputPart.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/InputPart.cshtml
@@ -5,7 +5,7 @@
     var formInputElementPart = Model.Value.ContentItem.As<FormInputElementPart>();
     var elementId = formElementPart.Id;
     var fieldName = formInputElementPart.Name;
-    var fieldId = !String.IsNullOrEmpty(elementId) ? elementId : !String.IsNullOrEmpty(fieldName) ? Html.GenerateIdFromName(fieldName) : default(string);
+    var fieldId = !string.IsNullOrEmpty(elementId) ? elementId : !string.IsNullOrEmpty(fieldName) ? Html.GenerateIdFromName(fieldName) : default(string);
     var fieldValue = Model.Value.DefaultValue;
     var fieldClass = "form-control";
     var isChecked = false;
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationPart.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationPart.cshtml
index 76dc0bbee43..776020b0787 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationPart.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationPart.cshtml
@@ -3,7 +3,7 @@
 @{
     // HtmlFieldPrefix is the PartName i.e. ValidationPart, which is not needed in Display.
     var htmlFieldPrefix = ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix;
-    ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = String.Empty;
+    ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = string.Empty;
 
     @Html.ValidationMessage(Model.Value.For)
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPart.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPart.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPart.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPart.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartDetailAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartDetailAdmin.cshtml
index d783039cde9..4e72e4789d5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartDetailAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartDetailAdmin.cshtml
@@ -12,7 +12,7 @@
     var enableOrdering =
         Model.EnableOrdering &&
         Model.ContentItems.Count() > 1 &&
-        Model.ListPartFilterViewModel.Status == ContentsStatus.Latest && String.IsNullOrEmpty(Model.ListPartFilterViewModel.DisplayText);
+        Model.ListPartFilterViewModel.Status == ContentsStatus.Latest && string.IsNullOrEmpty(Model.ListPartFilterViewModel.DisplayText);
 
 
     if (enableOrdering)
@@ -59,7 +59,7 @@ else
                             <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" id="filter-dropdown" aria-haspopup="true" aria-expanded="false">
                                 <i class="fa-solid fa-filter" title="@T["Filters"]" aria-hidden="true"></i>
                             </button>
-                            <div class="@String.Join(' ', dropdownClassList)" aria-labelledby="filter-dropdown">
+                            <div class="@string.Join(' ', dropdownClassList)" aria-labelledby="filter-dropdown">
                                 @* Latest not surfaced here to be consistent with the main content items list filter. *@
                                 <a class="dropdown-item" href="?Status=Draft">@T["Only draft items"]</a>
                                 <a class="dropdown-item" href="?Status=Published">@T["Only published items"]</a>
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartFeed.cshtml b/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartFeed.cshtml
index 5c6db6ddb4c..3a53541bf25 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartFeed.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartFeed.cshtml
@@ -16,7 +16,7 @@
             Rel = "alternate",
             Type = "application/rss+xml",
             Title = contentItem.DisplayText,
-            Href = String.IsNullOrWhiteSpace(feedMetadata.FeedProxyUrl)
+            Href = string.IsNullOrWhiteSpace(feedMetadata.FeedProxyUrl)
                 ? Url.Action("Index", "Feed", new { area = "OrchardCore.Feeds", ContentItemId = contentItem.ContentItemId }, Context.Request.Scheme)
                 : feedMetadata.FeedProxyUrl
         });
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml
index da034f5e429..62c52dfef02 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/Views/LocalizationSettings.Edit.cshtml
@@ -7,7 +7,7 @@
 @{
     // ['fr-FR', 'en-US']
     var supportedCultures = JsonConvert.SerializeObject(Model.Cultures.Where(x => x.Supported).Select(c => c.CultureInfo.Name).ToArray());
-    var allCultures = JsonConvert.SerializeObject(Model.Cultures.Select(c => new { Name = c.CultureInfo.Name, DisplayName = !String.IsNullOrEmpty(c.CultureInfo.DisplayName) ? c.CultureInfo.DisplayName : c.CultureInfo.NativeName, Supported = c.Supported }).ToArray());
+    var allCultures = JsonConvert.SerializeObject(Model.Cultures.Select(c => new { Name = c.CultureInfo.Name, DisplayName = !string.IsNullOrEmpty(c.CultureInfo.DisplayName) ? c.CultureInfo.DisplayName : c.CultureInfo.NativeName, Supported = c.Supported }).ToArray());
     var defaultCulture = Model.Cultures.Where(x => x.IsDefault).FirstOrDefault().CultureInfo.Name;
     var selectedCulture = Model.Cultures.Except(Model.Cultures.Where(x => x.Supported)).First().CultureInfo.Name;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml
index 726402ed9b3..14fcd2fd778 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml
@@ -16,7 +16,7 @@
     @await DisplayAsync(await New.ShortcodeModal())
     <label asp-for="Markdown">@Model.PartFieldDefinition.DisplayName()</label>
     <textarea asp-for="Markdown" rows="5" class="form-control content-preview-text"></textarea>
-    @if (!String.IsNullOrEmpty(settings.Hint))
+    @if (!string.IsNullOrEmpty(settings.Hint))
     {
         <span class="hint">@settings.Hint</span>
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml
index 1becdab537b..7fc46e495fb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml
@@ -15,7 +15,7 @@
     <div class="@Orchard.GetEndCssClasses()">
         @await DisplayAsync(await New.ShortcodeModal())
         <input asp-for="Markdown" class="form-control content-preview-text shortcode-modal-input" dir="@culture.GetLanguageDirection()" />
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <span class="hint">@settings.Hint</span>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Azure/Views/Admin/Options.cshtml b/src/OrchardCore.Modules/OrchardCore.Media.Azure/Views/Admin/Options.cshtml
index 38716542c9e..1ce8c62fa89 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media.Azure/Views/Admin/Options.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media.Azure/Views/Admin/Options.cshtml
@@ -10,7 +10,7 @@
     <label asp-for="ConnectionString" class="col-sm-2 col-form-label">@T["Connection String"]</label>
     <div class="col-sm-10">
         <code>
-            @if (!String.IsNullOrEmpty(Model.ConnectionString))
+            @if (!string.IsNullOrEmpty(Model.ConnectionString))
             {
                 @T["Configured"]
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml
index b1deb35f003..a98772242fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml
@@ -15,7 +15,7 @@
 <div class="@Orchard.GetWrapperCssClasses("field-wrapper", $"field-wrapper-{uniqueName.HtmlClassify()}")" id="@Html.IdFor(x => x.Paths)_FieldWrapper">
     <label asp-for="Paths" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses()" id="@Html.IdFor(m => m)" data-for="@Html.IdFor(m => m.Paths)">
-        @if (!String.IsNullOrWhiteSpace(settings.Hint))
+        @if (!string.IsNullOrWhiteSpace(settings.Hint))
         {
             <div class="hint mt-lg-2">@settings.Hint</div>
         }
@@ -64,7 +64,7 @@
 </div>
 
 <script at="Foot">
-    initializeMediaApplication(false, '@Url.Action("MediaApplication", "Admin", new { area = "OrchardCore.Media", extensions = String.Join(',', Model.AllowedExtensions) })', '@Context.Request.PathBase.ToString()');
+    initializeMediaApplication(false, '@Url.Action("MediaApplication", "Admin", new { area = "OrchardCore.Media", extensions = string.Join(',', Model.AllowedExtensions) })', '@Context.Request.PathBase.ToString()');
 
     initializeMediaField(
         document.getElementById('@Html.IdFor(m => m)'),
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Option.cshtml
index cd7f70a87dd..cdc07fcd087 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaFieldSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaFieldSettings.Edit.cshtml
index b36f7b0d25d..99b17af6979 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaFieldSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaFieldSettings.Edit.cshtml
@@ -42,7 +42,7 @@
         <span class="hint dashed">@T["This will allow the user to attach any accessible file from the media library."]</span>
     </div>
 </div>
-<div class="collapse@(Model.AllowAllDefaultMediaTypes ? String.Empty : " show")" id="MediaExtensionWrapper">
+<div class="collapse@(Model.AllowAllDefaultMediaTypes ? string.Empty : " show")" id="MediaExtensionWrapper">
     <div class="mb-3">
         @{
             var groups = Model.MediaTypes
@@ -58,7 +58,7 @@
                 var htmlId = $"MediaExtensionTypeId_{group.Key}";
 
                 <div class="form-check">
-                    <input type="checkbox" class="form-check-input media-extensions-selector" checked="@allSelected" id="@htmlId" value="@String.Join(';', group.Value.Select(m => m.ContentType))">
+                    <input type="checkbox" class="form-check-input media-extensions-selector" checked="@allSelected" id="@htmlId" value="@string.Join(';', group.Value.Select(m => m.ContentType))">
                     <label class="form-check-label cursor-pointer" for="@htmlId">@T["{0} types", group.Key]</label>
                     <span class="hint dashed">@T["Select all extensions with the '{0}' type.", group.Key]</span>
                 </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaProfiles/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaProfiles/Index.cshtml
index 7817472d321..dcb0971c93a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaProfiles/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaProfiles/Index.cshtml
@@ -69,7 +69,7 @@
                             <a asp-action="Delete" asp-route-name="@entry.Name" class="btn btn-danger btn-sm" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
                         </div>
                         <a asp-action="Edit" asp-route-name="@entry.Name">@entry.Name</a>
-                        @if (!String.IsNullOrWhiteSpace(entry.MediaProfile.Hint))
+                        @if (!string.IsNullOrWhiteSpace(entry.MediaProfile.Hint))
                         {
                             <span class="hint dashed">@entry.MediaProfile.Hint</span>
                         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/Shared/MediaStoreEntries.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/Shared/MediaStoreEntries.cshtml
index e968af6d9f8..c2a45364022 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/Shared/MediaStoreEntries.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/Shared/MediaStoreEntries.cshtml
@@ -12,11 +12,11 @@
                 <label class="form-check-label">
                     @if (hasChildren)
                     {
-                        <input class="form-check-input" data-parent-value="@(entry.Parent?.Path ?? String.Empty)" type="checkbox" name="@Html.NameFor(m => m.DirectoryPaths)" value="@entry.Path" checked="@checkd" />
+                        <input class="form-check-input" data-parent-value="@(entry.Parent?.Path ?? string.Empty)" type="checkbox" name="@Html.NameFor(m => m.DirectoryPaths)" value="@entry.Path" checked="@checkd" />
                     }
                     else
                     {
-                        <input class="form-check-input" data-parent-value="@(entry.Parent?.Path ?? String.Empty)" type="checkbox" name="@Html.NameFor(m => m.FilePaths)" value="@entry.Path" checked="@checkd" />
+                        <input class="form-check-input" data-parent-value="@(entry.Parent?.Path ?? string.Empty)" type="checkbox" name="@Html.NameFor(m => m.FilePaths)" value="@entry.Path" checked="@checkd" />
                     }
                     @entry.Name
                 </label>
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItem.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItem.Edit.cshtml
index 7f8e5505399..712a9c2dd9b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItem.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItem.Edit.cshtml
@@ -36,7 +36,7 @@
     }
 </div>
 
-@if (!String.IsNullOrWhiteSpace(Context.Request.Query["returnUrl"]))
+@if (!string.IsNullOrWhiteSpace(Context.Request.Query["returnUrl"]))
 {
     @Html.Hidden("returnUrl", Context.Request.Query["returnUrl"])
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Notifications/Views/Notification.SummaryAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Notifications/Views/Notification.SummaryAdmin.cshtml
index e90c2abc6c9..6550f2b1d56 100644
--- a/src/OrchardCore.Modules/OrchardCore.Notifications/Views/Notification.SummaryAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Notifications/Views/Notification.SummaryAdmin.cshtml
@@ -36,7 +36,7 @@
 
                     <h5 class="mb-0">@notification.Summary</h5>
 
-                    @if (!String.IsNullOrWhiteSpace(bodyInfo.TextBody))
+                    @if (!string.IsNullOrWhiteSpace(bodyInfo.TextBody))
                     {
                         <p class="mb-0 mt-2">
                             @bodyInfo.TextBody
diff --git a/src/OrchardCore.Modules/OrchardCore.Notifications/Views/UserNotificationCollection.cshtml b/src/OrchardCore.Modules/OrchardCore.Notifications/Views/UserNotificationCollection.cshtml
index c146f0e7231..7d77fe0a356 100644
--- a/src/OrchardCore.Modules/OrchardCore.Notifications/Views/UserNotificationCollection.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Notifications/Views/UserNotificationCollection.cshtml
@@ -32,7 +32,7 @@
                 {
                     var notification = Model.Value.Notifications[i];
 
-                    <div class="@(i == maxCount - 1 ? String.Empty : "border-bottom")">
+                    <div class="@(i == maxCount - 1 ? string.Empty : "border-bottom")">
                         @await DisplayAsync(notification)
                     </div>
                 }
diff --git a/src/OrchardCore.Modules/OrchardCore.PublishLater/Views/PublishLaterPart.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.PublishLater/Views/PublishLaterPart.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.PublishLater/Views/PublishLaterPart.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.PublishLater/Views/PublishLaterPart.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/Views/Admin/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Recipes/Views/Admin/Index.cshtml
index 6e1d4f5aeb7..049737599ce 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/Views/Admin/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Recipes/Views/Admin/Index.cshtml
@@ -31,7 +31,7 @@
 
                 <div class="recipe-group">
                     @{
-                        var groupRecipeNames = String.Join(" ", recipeGroup.Select(r => r.DisplayName));
+                        var groupRecipeNames = string.Join(" ", recipeGroup.Select(r => r.DisplayName));
                     }
                     <h4 class="mb-2 mt-2" data-filter-value="@groupName @groupRecipeNames">@groupName</h4>
                     <ul class="list-group" data-filter-value="@groupName @groupRecipeNames">
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Views/Admin/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Roles/Views/Admin/Edit.cshtml
index 515a21302e8..715e4cba7b2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Views/Admin/Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Views/Admin/Edit.cshtml
@@ -37,7 +37,7 @@
         <fieldset class="permissions-list">
             <legend>
                 <span>@group.Key.Title</span>
-                @if (!String.IsNullOrEmpty(group.Key.Source))
+                @if (!string.IsNullOrEmpty(group.Key.Source))
                 {
                     <span class="hint">(@group.Key.Source)</span>
                 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/ContentTypeCondition.Fields.Summary.cshtml b/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/ContentTypeCondition.Fields.Summary.cshtml
index 97882e15c84..cefffe203c5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/ContentTypeCondition.Fields.Summary.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/ContentTypeCondition.Fields.Summary.cshtml
@@ -2,7 +2,7 @@
 @using Microsoft.Extensions.Options
 @inject IOptions<ConditionOperatorOptions> Options
 @{
-    var displayText = String.Empty;
+    var displayText = string.Empty;
     if (Model.Value.Operation != null && Options.Value.ConditionOperatorOptionByType.TryGetValue(Model.Value.Operation.GetType(), out var option))
     {
         displayText = option.DisplayText(Context.RequestServices);
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/CultureCondition.Fields.Summary.cshtml b/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/CultureCondition.Fields.Summary.cshtml
index d9ffd279cf9..43e2ef3a386 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/CultureCondition.Fields.Summary.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/CultureCondition.Fields.Summary.cshtml
@@ -1,7 +1,7 @@
 @model ShapeViewModel<CultureCondition>
 @inject IOptions<ConditionOperatorOptions> Options
 @{
-    var displayText = String.Empty;
+    var displayText = string.Empty;
     if (Model.Value.Operation != null && Options.Value.ConditionOperatorOptionByType.TryGetValue(Model.Value.Operation.GetType(), out var option))
     {
         displayText = option.DisplayText(Context.RequestServices);
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/RoleCondition.Fields.Summary.cshtml b/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/RoleCondition.Fields.Summary.cshtml
index 51c861a05bf..09cc8f0f3c9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/RoleCondition.Fields.Summary.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/RoleCondition.Fields.Summary.cshtml
@@ -1,7 +1,7 @@
 @model ShapeViewModel<RoleCondition>
 @inject IOptions<ConditionOperatorOptions> Options
 @{
-    var displayText = String.Empty;
+    var displayText = string.Empty;
     if (Model.Value.Operation != null && Options.Value.ConditionOperatorOptionByType.TryGetValue(Model.Value.Operation.GetType(), out var option))
     {
         displayText = option.DisplayText(Context.RequestServices);
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/UrlCondition.Fields.Summary.cshtml b/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/UrlCondition.Fields.Summary.cshtml
index ba8c2b804a1..5eff13d34bb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/UrlCondition.Fields.Summary.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Views/Items/UrlCondition.Fields.Summary.cshtml
@@ -1,7 +1,7 @@
 @model ShapeViewModel<UrlCondition>
 @inject IOptions<ConditionOperatorOptions> Options
 @{
-    var displayText = String.Empty;
+    var displayText = string.Empty;
     if (Model.Value.Operation != null && Options.Value.ConditionOperatorOptionByType.TryGetValue(Model.Value.Operation.GetType(), out var option))
     {
         displayText = option.DisplayText(Context.RequestServices);
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/Admin/Query.cshtml b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/Admin/Query.cshtml
index 1646da180fc..8a9f6e7f001 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/Admin/Query.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/Admin/Query.cshtml
@@ -88,7 +88,7 @@
                         <th scope="row">@(row++)</th>
                         @foreach (var name in fieldNames)
                         {
-                            <td>@(document.GetValueOrDefault(name)?.ToString()?? String.Empty)</td>
+                            <td>@(document.GetValueOrDefault(name)?.ToString()?? string.Empty)</td>
                         }
                     </tr>
                 }
@@ -131,7 +131,7 @@
                             if (hitValues != null)
                             {
                                 var value = hitValues.First();
-                                var item = !String.IsNullOrEmpty(value) ? value : "NULL";
+                                var item = !string.IsNullOrEmpty(value) ? value : "NULL";
 
                                 <td>
                                     @item
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Views/Admin/Query.cshtml b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Views/Admin/Query.cshtml
index 403140e6993..34e577980e5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Views/Admin/Query.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Views/Admin/Query.cshtml
@@ -80,7 +80,7 @@
                         <th scope="row">@(row++)</th>
                         @foreach (var name in fieldNames)
                         {
-                            <td>@(document.GetField(name)?.GetStringValue() ?? String.Empty)</td>
+                            <td>@(document.GetField(name)?.GetStringValue() ?? string.Empty)</td>
                         }
                     </tr>
                 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Views/Search-Form.cshtml b/src/OrchardCore.Modules/OrchardCore.Search/Views/Search-Form.cshtml
index 9d23614aff5..428e231860a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/Views/Search-Form.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Search/Views/Search-Form.cshtml
@@ -2,7 +2,7 @@
 @{
     var placeholder = Model.Placeholder;
 
-    if (String.IsNullOrWhiteSpace(placeholder))
+    if (string.IsNullOrWhiteSpace(placeholder))
     {
         placeholder = T["Enter your search term(s)"].Value;
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Views/SecurityHeadersSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Security/Views/SecurityHeadersSettings.Edit.cshtml
index 3edadaca256..725011a06e8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Views/SecurityHeadersSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Views/SecurityHeadersSettings.Edit.cshtml
@@ -229,7 +229,7 @@
             {
                 var value = Model.PermissionsPolicy[key];
                 var originType = value ?? PermissionsPolicyOriginValue.None;
-                var allowedOrigins = String.Empty;
+                var allowedOrigins = string.Empty;
 
                 if (value != null)
                 {
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/Shared/DisplayTemplates/CurrentCulture.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/Shared/DisplayTemplates/CurrentCulture.cshtml
index a0416838f39..0df7c07310d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Views/Shared/DisplayTemplates/CurrentCulture.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/Shared/DisplayTemplates/CurrentCulture.cshtml
@@ -5,7 +5,7 @@
 <tr class="table-success">
     <td class="align-middle">
         <strong>
-            @if (!String.IsNullOrEmpty(culture.Name))
+            @if (!string.IsNullOrEmpty(culture.Name))
             {<text>@culture.Name</text>}
         </strong>
     </td>
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/Shared/DisplayTemplates/RemovableCulture.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/Shared/DisplayTemplates/RemovableCulture.cshtml
index c85eb04fe4a..37582450438 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Views/Shared/DisplayTemplates/RemovableCulture.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/Shared/DisplayTemplates/RemovableCulture.cshtml
@@ -6,7 +6,7 @@
     <form name="delete-culture" asp-action="DeleteCulture" asp-route-returnUrl="@Context.Request.Query["ReturnUrl"]" method="post" enctype="multipart/form-data" class="no-multisubmit">
         <td class="align-middle">@culture.Name</td>
         <td class="align-middle">
-            @if (!String.IsNullOrEmpty(culture.DisplayName))
+            @if (!string.IsNullOrEmpty(culture.DisplayName))
             {
                 <text>@culture.DisplayName</text>
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/SiteSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/SiteSettings.Edit.cshtml
index 30dc0bba466..0eacd11b919 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Views/SiteSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/SiteSettings.Edit.cshtml
@@ -24,7 +24,7 @@
     </div>
 </div>
 
-@if (!String.IsNullOrWhiteSpace(Context.Request.Query["returnUrl"]))
+@if (!string.IsNullOrWhiteSpace(Context.Request.Query["returnUrl"]))
 {
     @Html.Hidden("returnUrl", Context.Request.Query["returnUrl"])
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/SiteSettings.SaveButton.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/SiteSettings.SaveButton.cshtml
index 39f51dc4ae6..56d34eedf24 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Views/SiteSettings.SaveButton.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/SiteSettings.SaveButton.cshtml
@@ -4,7 +4,7 @@
     var returnUrl = Context.Request.Query["returnUrl"];
 }
 
-@if (!String.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
+@if (!string.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
 {
     <a href="@returnUrl" class="btn btn-secondary cancel" role="button">@T["Cancel"]</a>
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Views/Admin/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Views/Admin/Index.cshtml
index 923bea9d3d0..86bcf69cc0c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Views/Admin/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Views/Admin/Index.cshtml
@@ -69,7 +69,7 @@
                             <a asp-action="Delete" asp-route-name="@entry.Name" class="btn btn-danger btn-sm" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
                         </div>
                         <a asp-action="Edit" asp-route-name="@entry.Name">@entry.Name</a>
-                        @if (!String.IsNullOrWhiteSpace(entry.ShortcodeTemplate.Hint))
+                        @if (!string.IsNullOrWhiteSpace(entry.ShortcodeTemplate.Hint))
                         {
                             <span class="hint dashed">@entry.ShortcodeTemplate.Hint</span>
                         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Create.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Create.cshtml
index 0c908a24a66..1409e10ee7c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Create.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Create.cshtml
@@ -2,7 +2,7 @@
 
 <zone Name="Title"><h1>@RenderTitleSegments(T["Create Sitemap"])</h1></zone>
 
-@if (String.IsNullOrEmpty(Site.BaseUrl))
+@if (string.IsNullOrEmpty(Site.BaseUrl))
 {
     <p class="alert alert-warning">@T["The site settings 'Base url' property is empty, but is required to generate sitemaps."]</p>
 }
@@ -18,7 +18,7 @@
     <div class="mb-3" asp-validation-class-for="Path">
         <label asp-for="Path">@T["Permalink"]</label>
         <div class="input-group">
-            @if (!String.IsNullOrWhiteSpace(Site.BaseUrl))
+            @if (!string.IsNullOrWhiteSpace(Site.BaseUrl))
             {
                 <span class="input-group-text">@Site.BaseUrl</span>
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Display.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Display.cshtml
index e1b74115f1f..5b5ef1e6717 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Display.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Display.cshtml
@@ -2,7 +2,7 @@
 
 <zone Name="Title"><h1>@RenderTitleSegments(T["Sitemap"])</h1></zone>
 
-@if (String.IsNullOrEmpty(Site.BaseUrl))
+@if (string.IsNullOrEmpty(Site.BaseUrl))
 {
     <p class="alert alert-warning">@T["The site settings 'Base url' property is empty, but is required to generate sitemaps."]</p>
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Edit.cshtml
index 8b4dd4cc48a..2ffd6a7c6ec 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/Edit.cshtml
@@ -2,7 +2,7 @@
 
 <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Sitemap"])</h1></zone>
 
-@if (String.IsNullOrEmpty(Site.BaseUrl))
+@if (string.IsNullOrEmpty(Site.BaseUrl))
 {
     <p class="alert alert-warning">@T["The site settings 'Base url' property is empty, but is required to generate sitemaps."]</p>
 }
@@ -19,7 +19,7 @@
     <div class="mb-3" asp-validation-class-for="Path">
         <label asp-for="Path">@T["Permalink"]</label>
         <div class="input-group">
-            @if (!String.IsNullOrWhiteSpace(Site.BaseUrl))
+            @if (!string.IsNullOrWhiteSpace(Site.BaseUrl))
             {
                 <span class="input-group-text">@Site.BaseUrl</span>
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/List.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/List.cshtml
index f323fed6188..2dd018df80b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/List.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Admin/List.cshtml
@@ -6,7 +6,7 @@
 
 <zone Name="Title"><h1>@RenderTitleSegments(T["Sitemaps"])</h1></zone>
 
-@if (String.IsNullOrEmpty(Site.BaseUrl))
+@if (string.IsNullOrEmpty(Site.BaseUrl))
 {
     <p class="alert alert-warning">@T["The site settings 'Base url' property is empty, but is required to generate sitemaps."]</p>
 }
@@ -68,7 +68,7 @@
                         <label class="form-check-label" for="itemIds-@entry.SitemapId">&nbsp;</label>
                     </div>
                     <div class="w-100">
-                        <a class="@(entry.Enabled ? String.Empty: "text-muted")" asp-action="Display" asp-route-sitemapId="@entry.SitemapId">@entry.Name</a>
+                        <a class="@(entry.Enabled ? string.Empty: "text-muted")" asp-action="Display" asp-route-sitemapId="@entry.SitemapId">@entry.Name</a>
                         <div class="float-end">
                             <a class="btn btn-info btn-sm" asp-action="Display" asp-route-sitemapId="@entry.SitemapId">@T["Manage Sources"]</a>
                             @if (entry.Enabled)
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/CustomPathSitemapSource.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/CustomPathSitemapSource.Edit.cshtml
index e9d94596553..33d9a5974e3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/CustomPathSitemapSource.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/CustomPathSitemapSource.Edit.cshtml
@@ -9,7 +9,7 @@
                 <div class="mb-3" asp-validation-class-for="Path">
                     <label asp-for="Path">@T["Path"] </label>
                     <div class="input-group">
-                        @if (!String.IsNullOrWhiteSpace(Site.BaseUrl))
+                        @if (!string.IsNullOrWhiteSpace(Site.BaseUrl))
                         {
                             <span class="input-group-text">@Site.BaseUrl</span>
                         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/Create.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/Create.cshtml
index 6035b2dc10f..fabf8ffde77 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/Create.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/Create.cshtml
@@ -2,7 +2,7 @@
 
 <zone Name="Title"><h1>@RenderTitleSegments(T["Create Sitemap Index"])</h1></zone>
 
-@if (String.IsNullOrEmpty(Site.BaseUrl))
+@if (string.IsNullOrEmpty(Site.BaseUrl))
 {
     <p class="alert alert-warning">@T["The site settings 'Base url' property is empty, but is required to generate sitemaps."]</p>
 }
@@ -19,7 +19,7 @@
     <div class="mb-3" asp-validation-class-for="Path">
         <label asp-for="Path">@T["Permalink"]</label>
         <div class="input-group">
-            @if (!String.IsNullOrWhiteSpace(Site.BaseUrl))
+            @if (!string.IsNullOrWhiteSpace(Site.BaseUrl))
             {
                 <span class="input-group-text">@Site.BaseUrl</span>
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/Edit.cshtml
index 76aeb286309..ed69db2a2c1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/Edit.cshtml
@@ -2,7 +2,7 @@
 
 <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Sitemap Index"])</h1></zone>
 
-@if (String.IsNullOrEmpty(Site.BaseUrl))
+@if (string.IsNullOrEmpty(Site.BaseUrl))
 {
     <p class="alert alert-warning">@T["The site settings 'Base url' property is empty, but is required to generate sitemaps."]</p>
 }
@@ -20,7 +20,7 @@
     <div class="mb-3" asp-validation-class-for="Path">
         <label asp-for="Path">@T["Permalink"]</label>
         <div class="input-group">
-            @if (!String.IsNullOrWhiteSpace(Site.BaseUrl))
+            @if (!string.IsNullOrWhiteSpace(Site.BaseUrl))
             {
                 <span class="input-group-text">@Site.BaseUrl</span>
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/List.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/List.cshtml
index a5382baf967..04f7a5a0f9e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/List.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapIndex/List.cshtml
@@ -6,7 +6,7 @@
 
 <zone Name="Title"><h1>@RenderTitleSegments(T["Sitemap Indexes"])</h1></zone>
 
-@if (String.IsNullOrEmpty(Site.BaseUrl))
+@if (string.IsNullOrEmpty(Site.BaseUrl))
 {
     <p class="alert alert-warning">@T["The site settings 'Base url' property is empty, but is required to generate sitemaps."]</p>
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapPart.Edit.cshtml
index a48732635ce..d68a29f0248 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapPart.Edit.cshtml
@@ -9,7 +9,7 @@
         </div>
     </div>
     <div class="@Orchard.GetEndCssClasses(true)">
-        <div class="form-check sitemap-form-g mt-3" style="@(Model.OverrideSitemapConfig ? String.Empty : "display: none")">
+        <div class="form-check sitemap-form-g mt-3" style="@(Model.OverrideSitemapConfig ? string.Empty : "display: none")">
             <input asp-for="Exclude" class="form-check-input" />
             <label asp-for="Exclude" class="form-check-label">@T["Exclude"]</label>
             <span class="hint dashed">@T["Check to exclude this content item from the site map."]</span>
@@ -18,14 +18,14 @@
 </div>
 <div class="@Orchard.GetWrapperCssClasses()">
     <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
-    <div class="@Orchard.GetEndCssClasses("sitemap-form-g")" asp-validation-class-for="ChangeFrequency" style="@(Model.OverrideSitemapConfig ? String.Empty : "display: none")">
+    <div class="@Orchard.GetEndCssClasses("sitemap-form-g")" asp-validation-class-for="ChangeFrequency" style="@(Model.OverrideSitemapConfig ? string.Empty : "display: none")">
         <select asp-for="ChangeFrequency" class="form-select" asp-items="Html.GetEnumSelectList<ChangeFrequency>()"></select>
         <span class="hint">@T["The frequency this content item is likely to change."]</span>
     </div>
 </div>
 <div class="@Orchard.GetWrapperCssClasses()">
     <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
-    <div class="@Orchard.GetEndCssClasses("sitemap-form-g")" asp-validation-class-for="Priority" style="@(Model.OverrideSitemapConfig ? String.Empty : "display: none")">
+    <div class="@Orchard.GetEndCssClasses("sitemap-form-g")" asp-validation-class-for="Priority" style="@(Model.OverrideSitemapConfig ? string.Empty : "display: none")">
         <select asp-for="Priority" class="form-select">
             <option value="0">@T["0.0"]</option>
             <option value="1">@T["0.1"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Source/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Source/Edit.cshtml
index e99be37049d..a03c03bc208 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Source/Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/Source/Edit.cshtml
@@ -2,7 +2,7 @@
 
 <zone Name="Title"><h1>@RenderTitleSegments(T["Edit Sitemap Source"])</h1></zone>
 
-@if (String.IsNullOrEmpty(Site.BaseUrl))
+@if (string.IsNullOrEmpty(Site.BaseUrl))
 {
     <p class="alert alert-warning">@T["The site settings 'Base url' property is empty, but is required to generate sitemaps."]</p>
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/Views/GeoPointField.cshtml b/src/OrchardCore.Modules/OrchardCore.Spatial/Views/GeoPointField.cshtml
index 11ab6193afe..d03c3b45b71 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/Views/GeoPointField.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/Views/GeoPointField.cshtml
@@ -7,5 +7,5 @@
 }
 
 <div class="field field-type-geopointfield field-name-@name">
-    @String.Format("{0:N6}", Model.Field.Latitude), @String.Format("{0:N6}", Model.Field.Longitude)
+    @string.Format("{0:N6}", Model.Field.Latitude), @string.Format("{0:N6}", Model.Field.Longitude)
 </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml
index e127135884f..cddd3d56cd1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml
@@ -31,7 +31,7 @@
 <div class="@Orchard.GetWrapperCssClasses("field-wrapper", $"field-wrapper-{uniqueName.HtmlClassify()}")" id="@Html.IdFor(x => x.TermContentItemIds)_FieldWrapper">
     <label class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses()">
-        @if (!String.IsNullOrEmpty(taxonomySettings.Hint))
+        @if (!string.IsNullOrEmpty(taxonomySettings.Hint))
         {
             <div class="hint dashed mt-lg-2">@taxonomySettings.Hint</div>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml
index b781bb071a5..84ac611ac9f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml
@@ -13,7 +13,7 @@
 <div class="@Orchard.GetWrapperCssClasses("field-wrapper", $"field-wrapper-{uniqueName.HtmlClassify()}")" id="@Html.IdFor(x => x.TermEntries)_FieldWrapper">
     <label class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses()">
-        @if (!String.IsNullOrEmpty(settings.Hint))
+        @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <div class="hint dashed mt-lg-2">@settings.Hint</div>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Option.cshtml
index cd7f70a87dd..cdc07fcd087 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Views/Template/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Templates/Views/Template/Index.cshtml
index 73d6a173f2b..ac13c7477ea 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Views/Template/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Views/Template/Index.cshtml
@@ -77,7 +77,7 @@ else
                             <a asp-action="Delete" asp-route-name="@entry.Name" asp-route-admintemplates="@Model.Options.AdminTemplates" asp-route-returnUrl="@FullRequestPath" class="btn btn-danger btn-sm" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
                         </div>
                         <a asp-action="Edit" asp-route-name="@entry.Name" asp-route-admintemplates="@Model.Options.AdminTemplates" asp-route-returnUrl="@FullRequestPath">@entry.Name</a>
-                        @if (!String.IsNullOrWhiteSpace(entry.Template.Description))
+                        @if (!string.IsNullOrWhiteSpace(entry.Template.Description))
                         {
                             <span class="hint dashed">@entry.Template.Description</span>
                         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.DisplayOption.cshtml b/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.DisplayOption.cshtml
index 6175aa4497f..6d50d5ab3cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.DisplayOption.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.DisplayOption.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentDisplayMode = Model.DisplayMode;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentDisplayMode)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Edit.cshtml
index 75924ce4b8d..4175bdd3ece 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Edit.cshtml
@@ -14,7 +14,7 @@
         <div class="@Orchard.GetEndCssClasses()">
             <input asp-for="Title" class="form-control content-preview-text content-caption-text" disabled="@(Model.Settings?.Options == TitlePartOptions.GeneratedDisabled)" autofocus="autofocus" dir="@culture.GetLanguageDirection()" />
             <span asp-validation-for="Title"></span>
-            @if (!String.IsNullOrWhiteSpace(Model.Settings?.Pattern))
+            @if (!string.IsNullOrWhiteSpace(Model.Settings?.Pattern))
             {
                 switch (Model.Settings?.Options)
                 {
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Option.cshtml
index 83effa54557..1603a76a1bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/Account/Login.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/Account/Login.cshtml
index 14781dd7596..fd33e27fc67 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/Account/Login.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/Account/Login.cshtml
@@ -28,7 +28,7 @@
 
     @if (!disableLocalLogin)
     {
-        <div class="col-md-6 @(loginProviders.Count == 0 ? "offset-md-3" : String.Empty)">
+        <div class="col-md-6 @(loginProviders.Count == 0 ? "offset-md-3" : string.Empty)">
             <form asp-controller="Account" asp-action="Login" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="auth-form no-multisubmit">
                 <h1 class="fs-4">@T["Log in"]</h1>
                 <hr />
@@ -70,7 +70,7 @@
     }
     @if (loginProviders.Count > 0)
     {
-        <div class="col-md-6 @(disableLocalLogin ? "offset-md-3" : String.Empty)">
+        <div class="col-md-6 @(disableLocalLogin ? "offset-md-3" : string.Empty)">
             <section>
                 <h1 class="fs-4">@T["Use another service to log in"]</h1>
                 <hr />
@@ -79,7 +79,7 @@
                         <p>
                             @foreach (var provider in loginProviders)
                             {
-                                <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : String.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
+                                <button type="submit" class="btn btn-primary @(!disableLocalLogin ? "w-100" : string.Empty)" name="provider" value="@provider.Name" title="@T["Log in using your {0} account", provider.DisplayName]">@provider.DisplayName</button>
                                 @if (disableLocalLogin)
                                 {
                                     <br />
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/Account/RegisterExternalLogin.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/Account/RegisterExternalLogin.cshtml
index 7a2e7d52a5b..4abf22b1c03 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/Account/RegisterExternalLogin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/Account/RegisterExternalLogin.cshtml
@@ -13,7 +13,7 @@
     <hr />
     <div asp-validation-summary="ModelOnly"></div>
 
-    @if (!Model.NoUsername || String.IsNullOrWhiteSpace(Model.UserName) || ViewData.ModelState.GetFieldValidationState("UserName") == ModelValidationState.Invalid)
+    @if (!Model.NoUsername || string.IsNullOrWhiteSpace(Model.UserName) || ViewData.ModelState.GetFieldValidationState("UserName") == ModelValidationState.Invalid)
     {
         <div class="mb-3">
             <label asp-for="UserName" class="col-md-3 control-label">@T["Username"]</label>
@@ -24,7 +24,7 @@
         </div>
     }
 
-    @if (!Model.NoEmail || String.IsNullOrWhiteSpace(Model.Email) || ViewData.ModelState.GetFieldValidationState("Email") == ModelValidationState.Invalid)
+    @if (!Model.NoEmail || string.IsNullOrWhiteSpace(Model.Email) || ViewData.ModelState.GetFieldValidationState("Email") == ModelValidationState.Invalid)
     {
         <div class="mb-3">
             <label asp-for="Email" class="col-md-3 control-label">@T["Email"]</label>
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettingsRoles.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettingsRoles.Edit.cshtml
index 116130e8168..552fe8f98a5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettingsRoles.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettingsRoles.Edit.cshtml
@@ -8,7 +8,7 @@
     </div>
 </div>
 
-<div class="mb-3 ps-3 collapse@(Model.RequireTwoFactorAuthenticationForSpecificRoles ? " show": String.Empty)" asp-validation-class-for="Roles" id="rolesContainer">
+<div class="mb-3 ps-3 collapse@(Model.RequireTwoFactorAuthenticationForSpecificRoles ? " show": string.Empty)" asp-validation-class-for="Roles" id="rolesContainer">
     <span class="hint dashed">@T["Select the roles to require two-factor authentication for."]</span>
 
     @for (var i = 0; i < Model.Roles.Length; i++)
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/Registration/ConfirmEmailSent.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/Registration/ConfirmEmailSent.cshtml
index 010d515aedc..e9aee471a83 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/Registration/ConfirmEmailSent.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/Registration/ConfirmEmailSent.cshtml
@@ -9,7 +9,7 @@
         @T["An email has been sent to you. Please click on the link it contains in order to have access on this site."]
     </p>
     <p>
-        @if (!String.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
+        @if (!string.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
         {
             <a href="@returnUrl">@T["Previous Page"]</a>
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/Registration/RegistrationPending.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/Registration/RegistrationPending.cshtml
index c17f6fd97be..0a02f49baf9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/Registration/RegistrationPending.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/Registration/RegistrationPending.cshtml
@@ -8,7 +8,7 @@
 <div>
     <p>@T["Your user account has been created but has to be approved before it can be used."]</p>
 
-    @if (!String.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
+    @if (!string.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
     {
         <a href="@returnUrl">@T["Previous Page"]</a>
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/Index.cshtml
index 30736edbe02..52284d12aff 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/Index.cshtml
@@ -110,7 +110,7 @@
                 <div class="mb-3">
                     <label asp-for="PreferredProvider">@T["Preferred Two-Factor Method"]</label>
                     <select asp-for="PreferredProvider" asp-items="Model.ValidTwoFactorProviders" class="form-select">
-                        @if (String.IsNullOrEmpty(Model.PreferredProvider))
+                        @if (string.IsNullOrEmpty(Model.PreferredProvider))
                         {
                             <option value="">@T["Select the method"]</option>
                         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/LoginWithTwoFactorAuthentication.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/LoginWithTwoFactorAuthentication.cshtml
index e2949e9f80c..c8341dd7a58 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/LoginWithTwoFactorAuthentication.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/LoginWithTwoFactorAuthentication.cshtml
@@ -26,9 +26,9 @@
             </div>
         }
 
-        @if (!String.IsNullOrEmpty(Model.CurrentProvider))
+        @if (!string.IsNullOrEmpty(Model.CurrentProvider))
         {
-            var shape = await DisplayManager.BuildEditorAsync(new TwoFactorMethod(), UpdateModelAccessor.ModelUpdater, false, Model.CurrentProvider, String.Empty);
+            var shape = await DisplayManager.BuildEditorAsync(new TwoFactorMethod(), UpdateModelAccessor.ModelUpdater, false, Model.CurrentProvider, string.Empty);
 
             @await DisplayAsync(shape)
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/UserInfo.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/UserInfo.cshtml
index df44a0565ad..a130a87e002 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/UserInfo.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/UserInfo.cshtml
@@ -9,7 +9,7 @@
     <dt>@T["Email"]</dt>
     <dd>@Model.User.Email</dd>
 
-    @if (!String.IsNullOrWhiteSpace(Model.User.PhoneNumber))
+    @if (!string.IsNullOrWhiteSpace(Model.User.PhoneNumber))
     {
         <dt>@T["Phone Number"]</dt>
         <dd>@Model.User.PhoneNumber</dd>
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/UsersAdminListSearch.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/UsersAdminListSearch.cshtml
index 5f535ddf765..fc00d56163a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/UsersAdminListSearch.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/UsersAdminListSearch.cshtml
@@ -18,7 +18,7 @@
     <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" id="filter-dropdown" aria-haspopup="true" aria-expanded="false">
         <i class="fa-solid fa-filter" title="@T["Filters"]" aria-hidden="true"></i>
     </button>
-    <ul class="@String.Join(' ', dropdownClassList)" aria-labelledby="filter-dropdown">
+    <ul class="@string.Join(' ', dropdownClassList)" aria-labelledby="filter-dropdown">
         <li><a class="dropdown-item" href="?q=status:Enabled">@T["Only enabled users"]</a></li>
         <li><a class="dropdown-item" href="?q=status:Disabled">@T["Only disabled users"]</a></li>
         <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#modalUserIndexOptionsFilterSyntax">@T["Filter syntax"]</a></li>
@@ -94,7 +94,7 @@
                     <div class="card">
                         <div class="card-body">
                             <h4>@T["Current filter"]</h4>
-                            @if (!String.IsNullOrEmpty(Model.FilterResult.ToString()))
+                            @if (!string.IsNullOrEmpty(Model.FilterResult.ToString()))
                             {
                                 <pre>@Model.FilterResult.ToString()</pre>
                                 <pre class="d-inline">@Model.FilterResult.ToNormalizedString()</pre>
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard-WidgetsListPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard-WidgetsListPart.Edit.cshtml
index 8bc1b770857..75b356bc241 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard-WidgetsListPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard-WidgetsListPart.Edit.cshtml
@@ -8,7 +8,7 @@
     var widgetContentTypes = ContentDefinitionManager.ListTypeDefinitions().Where(t => t.GetStereotype() == "Widget");
 }
 
-<div class="widget widget-editor card@(Model.Inline ? " collapsed" : String.Empty)">
+<div class="widget widget-editor card@(Model.Inline ? " collapsed" : string.Empty)">
     <div class="widget-editor-header card-header text-muted py-1 ps-2 pe-1">
         @if (Model.CanMove != false)
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard.cshtml b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard.cshtml
index 133ea4910f4..958f38035b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard.cshtml
@@ -17,7 +17,7 @@
         if (Model.BuildEditor == true)
         {
             //Assign prefix
-            if (String.IsNullOrEmpty(Model.PrefixValue))
+            if (string.IsNullOrEmpty(Model.PrefixValue))
             {
                 Model.PrefixValue = Guid.NewGuid().ToString("n");
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/Widget.Summary.cshtml b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/Widget.Summary.cshtml
index 2b4cbdf5c84..d2c44a40fe8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/Widget.Summary.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/Widget.Summary.cshtml
@@ -1,4 +1,4 @@
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @if (Model.Header != null || Model.Meta != null)
     {
         <div class="widget-header">
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/Widget.cshtml b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/Widget.cshtml
index 2b4cbdf5c84..d2c44a40fe8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/Widget.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/Widget.cshtml
@@ -1,4 +1,4 @@
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @if (Model.Header != null || Model.Meta != null)
     {
         <div class="widget-header">
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Option.cshtml b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Option.cshtml
index cd7f70a87dd..cdc07fcd087 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Option.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Option.cshtml
@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="" selected="@String.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
+<option value="" selected="@string.IsNullOrEmpty(currentEditor)">@T["Standard"]</option>
diff --git a/src/OrchardCore.Themes/TheTheme/Views/Widget-Form.cshtml b/src/OrchardCore.Themes/TheTheme/Views/Widget-Form.cshtml
index 1d515727c37..fc9f466aa08 100644
--- a/src/OrchardCore.Themes/TheTheme/Views/Widget-Form.cshtml
+++ b/src/OrchardCore.Themes/TheTheme/Views/Widget-Form.cshtml
@@ -2,6 +2,6 @@
     Model.Classes.Add("widget-body mb-3");
 }
 
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @await DisplayAsync(Model.Content)
 </div>
diff --git a/src/OrchardCore.Themes/TheTheme/Views/Widget-Input.cshtml b/src/OrchardCore.Themes/TheTheme/Views/Widget-Input.cshtml
index 1d515727c37..fc9f466aa08 100644
--- a/src/OrchardCore.Themes/TheTheme/Views/Widget-Input.cshtml
+++ b/src/OrchardCore.Themes/TheTheme/Views/Widget-Input.cshtml
@@ -2,6 +2,6 @@
     Model.Classes.Add("widget-body mb-3");
 }
 
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @await DisplayAsync(Model.Content)
 </div>
diff --git a/src/OrchardCore.Themes/TheTheme/Views/Widget-Label.cshtml b/src/OrchardCore.Themes/TheTheme/Views/Widget-Label.cshtml
index 417c670cab5..f2fc305b75c 100644
--- a/src/OrchardCore.Themes/TheTheme/Views/Widget-Label.cshtml
+++ b/src/OrchardCore.Themes/TheTheme/Views/Widget-Label.cshtml
@@ -2,6 +2,6 @@
     Model.Classes.Add("widget-body");
 }
 
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @await DisplayAsync(Model.Content)
 </div>
diff --git a/src/OrchardCore.Themes/TheTheme/Views/Widget-Select.cshtml b/src/OrchardCore.Themes/TheTheme/Views/Widget-Select.cshtml
index 099738004e7..fab604eb897 100644
--- a/src/OrchardCore.Themes/TheTheme/Views/Widget-Select.cshtml
+++ b/src/OrchardCore.Themes/TheTheme/Views/Widget-Select.cshtml
@@ -1,6 +1,6 @@
 @{
     Model.Classes.Add("widget-body mb-3");
 }
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @await DisplayAsync(Model.Content)
 </div>
diff --git a/src/OrchardCore.Themes/TheTheme/Views/Widget-TextArea.cshtml b/src/OrchardCore.Themes/TheTheme/Views/Widget-TextArea.cshtml
index 099738004e7..fab604eb897 100644
--- a/src/OrchardCore.Themes/TheTheme/Views/Widget-TextArea.cshtml
+++ b/src/OrchardCore.Themes/TheTheme/Views/Widget-TextArea.cshtml
@@ -1,6 +1,6 @@
 @{
     Model.Classes.Add("widget-body mb-3");
 }
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @await DisplayAsync(Model.Content)
 </div>
diff --git a/src/OrchardCore.Themes/TheTheme/Views/Widget-Validation.cshtml b/src/OrchardCore.Themes/TheTheme/Views/Widget-Validation.cshtml
index 417c670cab5..f2fc305b75c 100644
--- a/src/OrchardCore.Themes/TheTheme/Views/Widget-Validation.cshtml
+++ b/src/OrchardCore.Themes/TheTheme/Views/Widget-Validation.cshtml
@@ -2,6 +2,6 @@
     Model.Classes.Add("widget-body");
 }
 
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @await DisplayAsync(Model.Content)
 </div>
diff --git a/src/OrchardCore.Themes/TheTheme/Views/Widget-ValidationSummary.cshtml b/src/OrchardCore.Themes/TheTheme/Views/Widget-ValidationSummary.cshtml
index 417c670cab5..f2fc305b75c 100644
--- a/src/OrchardCore.Themes/TheTheme/Views/Widget-ValidationSummary.cshtml
+++ b/src/OrchardCore.Themes/TheTheme/Views/Widget-ValidationSummary.cshtml
@@ -2,6 +2,6 @@
     Model.Classes.Add("widget-body");
 }
 
-<div class="@String.Join(" ", Model.Classes.ToArray())">
+<div class="@string.Join(" ", Model.Classes.ToArray())">
     @await DisplayAsync(Model.Content)
 </div>