Changed some function names