diff --git a/scripts/extract_headers.rb b/scripts/extract_headers.rb
index 77d78e07..3c353482 100755
--- a/scripts/extract_headers.rb
+++ b/scripts/extract_headers.rb
@@ -36,8 +36,8 @@ def generate_nodetypes!
     lines = File.read(File.join(@pgdir, '/src/include/nodes/nodes.h'))
     lines.each_line do |line|
       if inside
-        if line[/([A-z_]+)(\s+=\s+\d+)?,/]
-          @nodetypes << $1[2..-1] # Without T_ prefix
+        if line[/T_([A-z_]+)(\s+=\s+\d+)?,/]
+          @nodetypes << $1
         elsif line == "} NodeTag;\n"
           inside = false
         end
diff --git a/srcdata/nodetypes.json b/srcdata/nodetypes.json
index ea3d4eea..4060969b 100644
--- a/srcdata/nodetypes.json
+++ b/srcdata/nodetypes.json
@@ -153,9 +153,6 @@
   "FromExpr",
   "OnConflictExpr",
   "IntoClause",
-  "de",
-  "ecutor",
-  "grefExprState",
   "ExprState",
   "AggrefExprState",
   "WindowFuncExprState",
@@ -407,7 +404,6 @@
   "StartReplicationCmd",
   "TimeLineHistoryCmd",
   "SQLCmd",
-  "ructures",
   "TriggerData",
   "EventTriggerData",
   "ReturnSetInfo",
diff --git a/srcdata/struct_defs.json b/srcdata/struct_defs.json
index d4cb080b..51b9a254 100644
--- a/srcdata/struct_defs.json
+++ b/srcdata/struct_defs.json
@@ -1069,6 +1069,11 @@
           "name": "options",
           "c_type": "bits32",
           "comment": "/* OR of TableLikeOption flags */"
+        },
+        {
+          "name": "relationOid",
+          "c_type": "Oid",
+          "comment": "/* If table has been looked up, its OID */"
         }
       ],
       "comment": "/*\n * TableLikeClause - CREATE TABLE ( ... LIKE ... ) clause\n */\n"