Renaming RBS20 satellite

I have a set up with CBR40 (Router with built-in cable modem) and two RBS20 satellites. I named the satellites during the initial setup. Upon accessing the setup through the Orbi App, it recommended upgrading the Firmware, which I did. Upon updating to the Firmware V2.2.1.210_1.0.8, it lost the names for the satellites and started calling both of them RBS20.

I have tried changing the satellite name both from the App as well as attached devices in admin web interface. The names that I want, revert to RBS20 in a minute or so. Not just that, if I update the name of satellite 1, the 2nd sateliiite starts disconnecting and connecting with regular frequency. The only way to resolve this cycling is to turn off the power on second satellite for some time.

Please help with the right way to rename the satellites or is it a problem with this firmware?