fixes local name shadowing/mangling