Changed some JS function names