fixed some mistakes in table/field names