What about taking both the Fighter and the Barbarian, and transmuting them to Soldier and Warrior?
Soldier has more connotations of formal training, fighting in a group, and fighting defensively. While Warrior has connotations of individualism, more offense, which is fitting for the current...