Renaming functions to fix some things