fixed up some name clashes