Regarding the name, the problem is most of the synonyms for warrior or fighter have subtextual meaning that makes their use more problematic (see "warlord"). That said, given that the subclass has more tactical options, I'm surprised they didn't go with "Tactician." It's not perfect, but it's a little less corny.
Perhaps "Fighter" and "Expert Fighter". Or "Professional"
That's what I'll use...