minor rename of variables and methods