Change function names; fix