Minor varname changes