Hijikata Toshizou.

[...well, that means he should probably get the confusing part out of the way too, huh.]

...there's another guy here with the same name. It's confusing, we know. I think he's infiltrating this time, so you might not run into him soon, but I'm the one with shorter hair and no metal arm.