Make field names to have some sort of consistency.