spellcheck and styleguide naming tweaks