Update to node ID convention as requested by SHM team