Correct minor issues with wrong names of functions