I am White Mage with my white mage staff and the NPC refers to me as a Samurai with a sword.

I assume this is a bug with looking at what class you are and Samurai is merely the default option.

Hopefully you can fix this, although it is too late for me as long as it's fixed for other people doing the quest.