Accounting for @jehiah 's HTML tastes
Name changes