Mantid naming convention changes. Refs #9122