Some more gratuitous renaming.