rename ambiguous vars