Etymology of samurai
The word samurai has its origins in the pre-Heian period Japan when it was pronounced saburai, meaning servant or attendant. It was not until the early modern period, namely the Azuchi-Momoyama period and early Edo period of the late 16th and early 17th centuries that the word saburai became substituted with samurai. However, by then, the meaning had already long before changed.During the era of the rule of the samurai, the earlier term yumitori (弓取り) was also used as an honorary title of an accomplished warrior even when swordsmanship had become more important.Kyujutsu (弓術)/ Japanese Archer, is still strongly associated with the war god Hachiman (八万).
Samurai Picture

Samurai
Picture above of Japanese samurai in armour, 1860s. Photograph by Felice
Beato.