Clean up Node names and argument orderings