fixed names of some fields