Renaming the functions correctly