Fixed typos and naming