Refs #3254 - fix a lot a typos and obsolete classes