BUR #32407 has been approved by @nonamethanks.
rename heihachi_hayashida -> hayashida_heihachi
rename kambei_shimada -> shimada_kanbei
rename katsushiro_okamoto -> okamoto_katsushiro
rename gorobei_katayama -> katayama_gorobei
rename shichiroji -> shichirooji
rename kyuzo_(samurai_7) -> kyuuzou_(samurai_7)
All the names are in given name-family name order for some reason, and both Shichirooji (シチロージ) and Kyuuzou (キュウゾウ) are missing the elongated vowel sounds.