Multi Home Support in Notifications

Currently I have three different locations setup. I pay the three yearly fees. Each location has their own unique name. Example “City House” “Cabin” and “Vacation home”. (Just examples). In each of these cases I have a camera over the garage door called “Garage Camera”. The problem is I get notifications for “Garage Camera” it doesn’t specify what location. I would like to see it changed in notifications to have the locations name followed by camera name. Such as “City House - Garage Camera”. Currently the work around is to make every item start with “City House - “. Which is OK except they all have alarm systems and every single sensor has to be setup that way. (In fact the sensors should have the room name also attached to it “City House - Kitchen - Sink Window”). Ideally, the location name should be optional by location.