updated the name of some var and methods