--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/GraphPrintVisitor.java	Sun Jun 23 15:49:09 2013 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/GraphPrintVisitor.java	Sun Jun 23 20:50:18 2013 +0200
@@ -209,13 +209,15 @@
 
             setNodeProperty(node, "name", node.getClass().getSimpleName().replaceFirst("Node$", ""));
             NodeInfo nodeInfo = node.getClass().getAnnotation(NodeInfo.class);
-            if (nodeInfo != null && !nodeInfo.shortName().isEmpty()) {
-                setNodeProperty(node, "shortName", nodeInfo.shortName());
+            if (nodeInfo != null) {
+                setNodeProperty(node, "kind", nodeInfo.kind());
+                if (!nodeInfo.shortName().isEmpty()) {
+                    setNodeProperty(node, "shortName", nodeInfo.shortName());
+                }
             }
-            setNodeProperty(node, "nodeType", (Node.class.isAssignableFrom(node.getClass()) ? Node.class.getSimpleName() : "other"));
-            setNodeProperty(node, "nodeClass", node.getClass().getSimpleName());
-            copyDebugProperties(node); // TODO: may overwrite property "name"? (currently allowed)
+            setNodeProperty(node, "class", node.getClass().getSimpleName());
             readNodeProperties((Node) node);
+            copyDebugProperties(node);
         }
     }