Renaming of CombatStateComponent and some combat categories.