Light rename of vars.