update function names, if statements