Fixing the function names.