repair name clashes