Updated the name of some fields.