documentation

Just a question for other correctional health care providers.
We have recently received a missive from the powers that be, that we should not refer to the people that we care for as inmates. This is new to me, as I have been in this field for 6 years and was taught to chart this way. It was explained to us that by refering to folks as "inmates" we could be seen as having an unfair bias toward them, or that it is a negative conotation.
We were told to refer to them as "client" or "patient". This can work OK in some instances, but can be awkward in others. For example, you have a couple of "fighters", so do you say, "Client s/p assault by another client"??? It just seems awkward.
Anyone else out there not allowed to refer to their clients as inmates?