Fixed typos and namings