Minor update of function names.