renamed some fileds