there is nothing new about having multiple classifications of perps and it has little to do with the state of war or not.
In WWII it was clearly a war. Those who were enemy soldiers were pow's but those who were spies were not pow's, those who were civilian criminals were not pow's, those who were insurgents or resistance fighters were not pow's. so what did we call a civilian who picked up a gun and went onto the battlefield? Certainly not a soldier and when caught not a pow.
In Nam it was a 'police action' and when we caught soldiers in uniform they were prisoners of war.
What they are called is more about who they are than it is about if it is a war or not.
When a member of AQ does not wear a uniform, hides among civilians, but goes out into the battlefield to kill soldiers they are not pow's and they are not non-combatants (non-coms). And if they set bombs on buses it is appropriate to call them terrorists.
So what rights do terrorists have? If they are US citizens then they have rights when tried here. If not then what rights do they have? They have no rights under the constitution, the geneva conventions, the hague conventions, their own constitutions (unless tried by their own gov), etc.
Who should decide what rights they should have when we catch them? Clearly congress should decide this as the legislative branch. So why has not congress made that determination?!!
Doc, the important thing here is to know this. That any differences in classifications in detainees back in WWII means little, when the Japanese soldiers subjected the Filipino resistance to the Japanese and also in the case of at least one member of the Doolittle Raid, was subjected to this treatment, they were tried and then executed for doing what we did until 2006.