Changed a bunch of function names