Fixed some function names