Twelvepack,
"enemy-soldier"
I understand that you are in trouble to get a profound information/insight in these international regulatories-and it seems, that wikipedia as a source is not sufficient (for you) in this case. Please keep official terms and prevent inventing some new ones resp., don't reuse the irritating terms of the Bush administration, because they have proved to be unsuitable.
I would (does not mean anything, of course) even consider the people in Guantanamo as combatants, because they represent/-ed the armed force of their government which was built by the Taliban-like it or not (a Taliban minister of cultural[?]) affairs visited once the state of Texas-there was a consense, I think, that this person was somewhat like a lawful representative of his state (Afghanistan), and not something like the son of ploppy the slopper, meaning ploppy himself-the jailor.
But this is all history, and the states would like to keep their good Uyghur people now (to prevent evil new axis of evil China evil to chop their evil heads of for being not so chinese but rather evil panislamic)-the rest of the evil innocent (but obviously unuyghuric) will be shipped to us-the evil EU.
Greetings from the former evil etc.