More function name updates