Refactor: rename private members

Put underscore at the end of the name, rather than at the beginning.