Function name improvements.