Refactor AddHtmlTagNames()