Adjusting node naming