Changed member names to conform to project style