Minor renaming of things.