fixed name clashes