Cleaned up function naming even more