Underscorize some more names of public or overloaded fields