Change a few more data member names.