Fixed Node Name restriction issue