I think the problem with the name Samurai itself is that, a Samurai in good ol' wartimes might have been trained in the sword, spear, bow, and/or unarmed combat (amongst possible other objects). And as time went on, it's something you're just born into (or forged with a family history scroll), it's usually not something you earned.

...

On the Job / Class note: With Paladin being incorporated, I suppose it might be appropriate to have a katana/tachi-wielding class (i.e. fencer) with the ability to employ the Samurai job.