resolving minor name clashes