Changed member names and fix a typo