Perform some more sensible renaming.