Fix wrong field names