function name cleanup