Clean up function names