Improve name for nodes