Was hoping to see answer to this as I have similar situation with a couple of circuits.
If I understand. Might you achieve what you want by identifying Circuit # in the name? Ex If Lights are on circuit #3 and #7, name them 3Lights, 7Lights.
I have made a similar suggestion. If fact done properly this could become a major marketing factor for rental units.