rename ambiguous variable names