fix some function names