How do I switch to Zwave JS?

No, that’s why you have to rename them :wink:

Run my template in the template editor and it will organize everything for you based on the node id.