Go to every Z-wave device and edit the DNI, add _OLD to the end
This is CRITICAL to avoid DNI collisions when adding new devices
Add something to device name like "OLD" for example
This is needed to tell devices apart in Swap Apps Menu
You will know it is all done because on Z-Wave details, all nodes will be blank for the device
Reset Radio, reboot, confirm z-wave details is clear.
Exclude or factory reset devices (all now or as you go, does not matter).
Pair devices one by one and follow next steps.
Go to Settings >> Swap Apps
Swap from Old to New paired device.
Find old device entry (confirm by DNI having _OLD, not by device name!)
Also confirm "In Use By" list should be blank since we just swapped to new device.
Remove the old device. It should just remove quickly after clicking the button, if it starts exclusion mode you are on a new device entry, STOP, do not force remove!