Various renaming.