Misc updates of function names.