Remove name shadowing