Updated some function names