Changed some default field names.