Fixed missing function names