Clean up function names for clarity of scope functions