renamed some fields and views