Fixing more errors. Spelling and naming mostly