Change some categories. Refs #9838
Merge remote-tracking branch 'origin/bugfix/9838_categories'