Update to remove name clashes.