Use node-name if sname isn't set in args

This fixes a bug where node shell wouldn't have node-name set