minor fixes related field renaming