Drafting - Room Name Label Defaults

Regarding the labels that the drafting team uses to name rooms: I am hoping this suggestion can be considered for future floor plans. Is it possible to have the Toilet Room or Shower Room labelled as such when contained within the Ensuite? I keep receiving our floorplans where the full room is actually a 5PC ENSUITE, however it is being labelled as a 4PC ENSUITE, and the smaller room with the toilet or shower in it is being labelled as 1PC ENSUITE and is listed on the report as such, which is confusing to our clients. My photographers take panos in these rooms and disable them so that drafting can see what the room contains for proper room labeling.