diff --git a/make/jdk/src/classes/build/tools/jdwpgen/ConstantNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ConstantNode.java
index 6dcf7cc381a..064bec62a37 100644
--- a/make/jdk/src/classes/build/tools/jdwpgen/ConstantNode.java
+++ b/make/jdk/src/classes/build/tools/jdwpgen/ConstantNode.java
@@ -55,8 +55,14 @@ class ConstantNode extends AbstractCommandNode {
 
     void document(PrintWriter writer) {
         //Add anchor to each constant with format <constant table name>_<constant name>
+        if (!(parent instanceof AbstractNamedNode)) {
+            error("Parent must be ConstantSetNode, but it's " + parent.getClass().getSimpleName());
+        }
+        String tableName = ((AbstractNamedNode)parent).name;
         writer.println("<tr>"
-                        + "<th scope=\"row\">" + name
+                        + "<th scope=\"row\">"
+                            + "<span id=\"" + tableName + "_" + name + "\"></span>"
+                            + name
                         + "<td class=\"centered\">" + nameNode.value()
                         + "<td>" + comment() + "&nbsp;"
                     + "</tr>");
diff --git a/make/jdk/src/classes/build/tools/jdwpgen/ConstantSetNode.java b/make/jdk/src/classes/build/tools/jdwpgen/ConstantSetNode.java
index 2d62318fc69..39c8ae36cee 100644
--- a/make/jdk/src/classes/build/tools/jdwpgen/ConstantSetNode.java
+++ b/make/jdk/src/classes/build/tools/jdwpgen/ConstantSetNode.java
@@ -62,9 +62,7 @@ class ConstantSetNode extends AbstractNamedNode {
         writer.println("<th class=\"bold\" style=\"width: 65%\" scope=\"col\">Description");
         writer.println("</tr>");
         for (Node node : components) {
-            ConstantNode n = (ConstantNode)node;
-            writer.println("<span id=\"" + name + "_" + n.name + "\"></span>");
-            n.document(writer);
+            node.document(writer);
         }
         writer.println("</table>");
     }