didn't we trim the name for a reason? I think it would be better to leave this but then add a data attribute with the full name, then use that to fix the related issue.