Fixed some function names.