Updated the names of the functions