Fixed some typos and namings