Update commented out code to reflect new function names