Removed the 'Field' subfix for all fields.