diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs
index 6a8e5facd5..c4536b1328 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
             {
                 selectTag.InnerHtml.AppendHtml(DefaultHtmlGenerator.GenerateOption(item, item.Text));
             }
-            
+
             return selectTag;
         }
 
@@ -259,7 +259,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
 
                     var valueDivTag = new TagBuilder("div");
                     valueDivTag.AddCssClass("display-field");
-                    valueDivTag.InnerHtml.SetContent(templateBuilderResult);
+                    valueDivTag.InnerHtml.SetHtmlContent(templateBuilderResult);
                     content.AppendLine(valueDivTag);
                 }
                 else
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs
index ce2d454b01..5b7181d013 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs
@@ -276,7 +276,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
                     {
                         var labelTag = new TagBuilder("div");
                         labelTag.AddCssClass("editor-label");
-                        labelTag.InnerHtml.SetContent(label);
+                        labelTag.InnerHtml.SetHtmlContent(label);
                         content.AppendLine(labelTag);
                     }
 
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
index c104384b09..b3d9ebfee3 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
@@ -565,7 +565,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
             var listItemBuilder = GenerateGroupsAndOptions(optionLabel, selectList);
 
             var tagBuilder = new TagBuilder("select");
-            tagBuilder.InnerHtml.SetContent(listItemBuilder);
+            tagBuilder.InnerHtml.SetHtmlContent(listItemBuilder);
             tagBuilder.MergeAttributes(GetHtmlAttributeDictionaryOrNull(htmlAttributes));
             tagBuilder.MergeAttribute("name", fullName, true /* replaceExisting */);
             tagBuilder.GenerateId(fullName, IdAttributeDotReplacement);