Correct names and order of the arguments on the functions.