Accessory Name Reverting after plug-in restart (Multiple Zone)

[PelonVela]

Hi, first I want to thank for this awesome plugin. It works great!

The only issue I have is that my two accessories (Main Zone and Zone 4) have the same name: Yamaha AVR, which is the name of the plug-in. If I rename them from the Home App, the change persist until I restart the plug-in. I have tried deleting everything and reinstalling the plug-in, and giving the appropriate names to both accessories when adding them manually (Zone 1, Zone 4). However, when I restart the plug-in the names revert back to Yamaha AVR.

Having two different names would help me identify each zone. Not sure if this is the normal behavior.

Thank you for your help.