Changing function names to be a bit more consistent