Change the names of member variables per Chris' instructions, and document