Rename functions to be clearer