Rename functions to be more acurate