Z-Wave entities are attributed to the wrong nodes - How do I fix this?

I recently had an SD meltdown and had to start from scratch. I’m mostly back up but my Z-Wave nodes are acting strange. I have entities that are on the wrong nodes. The screenshots will explain better than I can.

I use the Aeotec Zstick via a Pi.

I have tried manually editing them in the core.entity_registry file (suggested by other posts here) but they just reverted back to what you see. My next step is to remove them completely and add them back one at a time, but I figured I’d post here in the mean time, maybe someone has an easier fix.

Screenshots

Thanks

The node number is determined by your z-wave controller based on the order they joined the network.

What about the entity names? See the _2 in the screenshots? the binary_sensors are swapped.

You should be able to change them in the entity registry.

1 Like

This was the fix. Thanks for that. I forgot about the Entity Registry.