Yeah, that's kind of ironic that any of his men captured (except the janitor) would be extended Geneva Convention courtesies befitting Officers of an enemy nation.
Which is to say, that many of the charges they might be facing would have to be dropped because they are uniformed combatants.
The janitor is now in uniform, too. One of the first guys who came through the opening in the brick wall handed him a uniform, and he started putting it on.