Changing function names to be more consistent with convention