fix problems with name clashes
fix remaining problems