Move to underscores in non-data attrib names