Name root node refactored