rename of variables and methods