More function renames.