changed two field names