Trying to fix some name clashes