Fix for problems with name clashes.