Change some categories. Refs #9838
Merge branch 'bugfix/9838_categories' into develop