refs #8026 Partial fix which breaks number of tests

and some spelling errors.