fix consistant varnames