Updated function names to be more sensible and consistent