Fixed typos, renamed fields.