rename member variables and methods.  fix missing import