Remove ambiguities in variable names