Partial commit for renaming things.