renamed some fieds and views