Cleaning up function names

Just one function but making it easier to know what it does