spellcheck and a few renames