Remove some name clashes.