few more variable names changes