Mantid naming convention changes. Refs #9122
Merge branch 'bugfix/9122_TIBCNCSfix' into develop