Fixed the function names