renamed struct fields