Rename functions to be more consistent