Fixed mistakes function names and function locations.