Fixed wrong field names