Core: More Function name updates