renamed a few more fields