More function renaming.