Fixed problems in function names.