Renaming functions to be have clearer names