Renaming more functions to how they are supposed to be