renamed vars
renamed vars and methods