refactor: member names