Some minor renaming.