-Wall: rename shadowing names