Updated functions' name, removed some typos

Thanks Webster56 for his advices :)