Correct NodeEncoder and Node name