Fix name shadowing issue in bindings