Spelling & consistency fixes