Rename and update to follow Node.java conventions