refactor varnames