refactor
modify node naming