fixed some field name inconsistencies
finally, some green :)