Fix name clashes.