Remove cruft.
Renaming.