FIX: Refactoring errors with Classes -> CombatType

Fixed the refactor