Cleanup function names.