Clean up function names.