Use more consistent naming for utility functions