Clean up function naming