Repeaterman --> Swadian Guard ?

[Winter]

OLD - | 1h | Shield/Armor | "Xbow" | "Xbow" |

NEW - | 1h | Shield | Armor | Xbow | 

This is entirely arbitrary and only works if you decide to classify two kinds of something as the same thing.  We can do the same in classifying shields and armor with sword as melee or shields with armor as defense.
OLD - | melee | melee | ranged | ranged |

NEW - | melee | melee | melee | ranged |
(less diverse)

or

OLD - | attack | defense | attack | attack

NEW - | attack | defense | defense | attack
(more diverse)

or

OLD - sword | shield | repeater crossbow | crossbow

NEW - sword | shield | armor | crossbow
(equally diverse)