Updated field names to be more generic and fixed a typo