Function name cleanup