Fix collision of variable names