Refs #438 - Fix classname / docblocks