Choosing good replacement names will be the first order of business.
"Samurai" is clearly Japanese, for example, along with their swords, the "Katana" and "Wakazashi," so they'll be needing to be changed to something more Chinese, along with many other names.
This topic intrigued me, so I did some internet research for the Chinese equivalent of "Samurai". The closest I could come was "Jiédùshǐ". One thing led to another and now I have some suggestions.
******** Chinese Names for Medieval Arms and Warriors ********
Jiédùshǐ (military governor)
Dà Dāo Huì (big sword society)
Zhuàng Shì (warrior)
Jiù Xīng (knight)
Dà Xiá (noble warrior)
Mù Shī (priest)
Wū Xí (wizard)
Wǔ Shì (literally "Samurai")
Dāo (single edged sabre)
Jiàn (double edged straight sword)
Fu Tao (dual-wielded hook swords)
Biān (chain whip)
Tonfa (baton with a handle)
Liú Xīng (meteor hammer)
Kwan Dāo (polearm)
Yan Yu Dāo (polearm)
Shuangshou Dāo (two handed sabre)
Liuye Dāo (broadsword)
Da Dāo (two handed sword)
Yanmao Dāo (goose quill sabre)
Wing Chun (dual wielded butterfly swords)
Qing Bow (horn bow)
Manchu Bow (recurved bow)
Guijia (tortoise shell armor)
******** End ********
Just some comments on the above:
Wushi does not mean samurai, it is the Chinese reading of "bushi." "Samurai" unfortunately actually uses the Chinese character for "servant"...
Hook swords should be shuanggou ("double hooks") or hushougou ("hand-protecting hooks") or even hutougou ("tiger head hooks").
Tonfa is an Okinawan word, I think - crutches are used in a similar manner in China (guai or guaizi).
Liuxing means just "meteor" - meteor hammers are called liuxingchui.
Kwan Dao should be spelled guandao (or guangongdadao ("Mr. Guan's big saber") or chunqiudadao ("spring and autumn big saber")).
Two-handed sword should be shuangshoujian ("double-handed sword") or shuangbajian ("double-grip sword").
Wing Chun is a style of kung fu, not a weapon - the butterfly swords are bazhandao ("eight slicing sabers") I think (but this may be a wing chun term).
Not sure what Yan yu dao is referring to.
Also, it may be better to use longer names for things, i.e.:
Qiang ("spear") -> Huaqiang ("flower spear," i.e. single-headed spear)
Gun ("staff") -> Qimeigun ("same-as-eyebrows staff," i.e. staff about as long as up to the eyebrows)
Ji ("halberd") -> Fangtianhuaji or fangtianji (a bit hard to translate, but the type of ji with an axe-like protrusion on one side)
Bian ("whip") -> this actually refers to whips and also hard, round things to whip with - Jiujiebian ("nine-section whip") may be better
Also - ge ("dagger axe") was a very ancient weapon (as were turtle shell armor) that were abandoned very early on (Shang, Zhou dynasties maybe?), probably because they were pretty cruddy
Anyway, just some suggestions, feel free to use/not use as you like...