Refactor of member names.