Change to some function names.