Fix name shadowing in where