Japanese word for swordsman

Stretching concepts a little, a Feudal warrior of a private band was known as a Samurai which is both singular and plural, like Kamikaze. The noun Samurai also refers to his special type of sWord, but does not mean ( SWord). I guess Samurai would come the closest to the Western concept of Knight or Miltary adventurer of a somewhat clandestine nature- as the Samurai were.