Inconsistent device names

A few devices are showing inconsistent names in both the VRM/GUIv2. These devices have been renamed a few times over the past year. It does not matter if my CerboGX is running beta or released firmware. I am looking for assistanct to set the device names correctly.

Image 1 is the VRM Dashboard. The SmartSolar listed is actually a Victron SmartShunt, as you can see in the third image, when drilled down to the shunt details. Also, “Battery 1” is actually named “00 Battery 1”, again as it is shown the the device details.