Change some function names