Minor changes

Fix typos and naming