Zen30 wrong end point and how to fix

I have two zen30 devices on my network (Z-Wave-JS). A zen30 has a dimmer and a relay (switch). The dimmer works on both. The relay/switch on one is failed - physically works, but status in HASS is incorrect and HASS cannot control.

The zen30 that works (node 16) has an endpoint of ‘1’ for the relay;
The zen30 that failed (node 23) has an endpoint of ‘0’ for the relay.
Can someone guide me in correcting the failed relay?

16- {"endpoint": 1, "commandClass": 37, "commandClassName": "Binary Switch", "property": "currentValue", "propertyName": "currentValue", "ccVersion": 1, "metadata": {"type": "boolean", "readable": true, "writeable": false, "label": "Current value"}, "value": false}, 
23- {"endpoint": 0, "commandClass": 37, "commandClassName": "Binary Switch", "property": "currentValue", "propertyName": "currentValue", "ccVersion": 1, "metadata": {"type": "boolean", "readable": true, "writeable": false, "label": "Current value"}, "value": false}, 
16- {"endpoint": 1, "commandClass": 37, "commandClassName": "Binary Switch", "property": "targetValue", "propertyName": "targetValue", "ccVersion": 1, "metadata": {"type": "boolean", "readable": true, "writeable": true, "label": "Target value"}, "value": false}
23- {"endpoint": 0, "commandClass": 37, "commandClassName": "Binary Switch", "property": "targetValue", "propertyName": "targetValue", "ccVersion": 1, "metadata": {"type": "boolean", "readable": true, "writeable": true, "label": "Target value"}, "value": true}, 

I also found the “ccVersion”: is given as ‘2’ in the working one, but ‘0’ in the failed in several ‘commandClass lines’ (I am not sure what you call these):

16- {"endpoint": 0, "commandClass": 114, "commandClassName": "Manufacturer Specific", "property": "manufacturerId", "propertyName": "manufacturerId", "ccVersion": 2, "metadata": {"type": "number", "readable": true, "writeable": false, "min": 0, "max": 65535, "label": "Manufacturer ID"}, "value": 634}, 
23- {"endpoint": 0, "commandClass": 114, "commandClassName": "Manufacturer Specific", "property": "manufacturerId", "propertyName": "manufacturerId", "ccVersion": 0, "metadata": {"type": "number", "readable": true, "writeable": false, "min": 0, "max": 65535, "label": "Manufacturer ID"}, "value": 634}, 

same ccVersion difference in “property”: “productId” and “property”: “productType”.

I also found the value missing in two of the CC lines. The other is in the “property”: 5, “propertyName”: “LED Indicator Brightness for Dimmer”.

16- {"endpoint": 0, "commandClass": 112, "commandClassName": "Configuration", "property": 2, "propertyName": "LED Indicator Mode for Relay", "ccVersion": 1, "metadata": {"type": "number", "readable": true, "writeable": true, "valueSize": 1, "min": 0, "max": 3, "default": 0, "format": 1, "allowManualEntry": false, "states": {"0": "LED is on when switch is off", "1": "LED is off when switch is off", "2": "LED is always off", "3": "LED is always on"}, "label": "LED Indicator Mode for Relay", "isFromConfig": true}, "value": 0}, 
23- {"endpoint": 0, "commandClass": 112, "commandClassName": "Configuration", "property": 2, "propertyName": "LED Indicator Mode for Relay", "ccVersion": 1, "metadata": {"type": "number", "readable": true, "writeable": true, "valueSize": 1, "min": 0, "max": 3, "default": 0, "format": 1, "allowManualEntry": false, "states": {"0": "LED is on when switch is off", "1": "LED is off when switch is off", "2": "LED is always off", "3": "LED is always on"}, "label": "LED Indicator Mode for Relay", "isFromConfig": true}}, 

Upon restart after a system update, I now have a second switch for this device, with an '_2" suffix, and it works. The original one now shows as unavailable.

I suspect, based on another device that had trouble joining the network, that at sometime in future, the original will be retired and the ‘_2’ will be renamed without the ‘_2’.