Update function names; fix