Remove ranges and fix node names