Fix shadowed names