fixed typos and naming