added suffix "Node" to node class names