--- a/js/src/builtin/ReflectParse.cpp
+++ b/js/src/builtin/ReflectParse.cpp
@@ -1814,18 +1814,18 @@ NodeBuilder::classDefinition(bool expr, 
                              TokenPos* pos, MutableHandleValue dst)
 {
     ASTType type = expr ? AST_CLASS_EXPR : AST_CLASS_STMT;
     RootedValue cb(cx, callbacks[type]);
     if (!cb.isNull())
         return callback(cb, name, heritage, block, pos, dst);
 
     return newNode(type, pos,
-                   "name", name,
-                   "heritage", heritage,
+                   "id", name,
+                   "superClass", heritage,
                    "body", block,
                    dst);
 }
 
 bool
 NodeBuilder::newTargetExpression(TokenPos* pos, MutableHandleValue dst)
 {
     RootedValue cb(cx, callbacks[AST_NEWTARGET_EXPR]);

--- a/js/src/jit-test/tests/modules/export-declaration.js
+++ b/js/src/jit-test/tests/modules/export-declaration.js
@@ -33,17 +33,17 @@ functionDeclaration = (id, params, body)
     params: params,
     defaults: [],
     body: body,
     rest: null,
     generator: false
 });
 classDeclaration = (name) => Pattern({
     type: "ClassStatement",
-    name: name
+    id: name
 });
 variableDeclaration = (decls) => Pattern({
     type: "VariableDeclaration",
     kind: "var",
     declarations: decls
 });
 constDeclaration = (decls) => Pattern({
     type: "VariableDeclaration",

--- a/js/src/tests/js1_8_5/reflect-parse/PatternBuilders.js
+++ b/js/src/tests/js1_8_5/reflect-parse/PatternBuilders.js
@@ -127,24 +127,24 @@ function superProp(id) {
     return dotExpr(ident("super"), id);
 }
 function superElem(id) {
     return memExpr(ident("super"), id);
 }
 
 function classStmt(id, heritage, body) {
     return Pattern({ type: "ClassStatement",
-                     name: id,
-                     heritage: heritage,
+                     id: id,
+                     superClass: heritage,
                      body: body});
 }
 function classExpr(id, heritage, body) {
     return Pattern({ type: "ClassExpression",
-                     name: id,
-                     heritage: heritage,
+                     id: id,
+                     superClass: heritage,
                      body: body});
 }
 function classMethod(id, body, kind, static) {
     return Pattern({ type: "ClassMethod",
                      name: id,
                      body: body,
                      kind: kind,
                      static: static });