Changed a few field names to reflect conventions