Fix the clash of variable names