name clashes

following the amalgamation