More cleanup.
Correct some name collisions.