Made changes to some function names