diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
index cc091222a3d..95ef1c5228b 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -416,7 +416,7 @@ public class ASTExtractor {
       String tostring = lexicalExtractor.mkToString(nd);
       trapwriter.addTuple("stmts", lbl, kind, c.parent, c.childIndex, tostring);
       locationManager.emitNodeLocation(nd, lbl);
-      trapwriter.addTuple("stmtContainers", lbl, contextManager.getCurrentContainerKey());
+      trapwriter.addTuple("stmt_containers", lbl, contextManager.getCurrentContainerKey());
       contextManager.setCurrentStatement(nd);
       return lbl;
     }
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap
index b1ef567503d..007ceacce1f 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap
@@ -50,7 +50,7 @@ hasLocation(#20001,#20003)
 #20016=*
 stmts(#20016,2,#20001,0,"!class {};")
 hasLocation(#20016,#20003)
-stmtContainers(#20016,#20001)
+stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,18,#20016,0,"!class {}")
 #20018=@"loc,{#10000},1,1,1,9"
@@ -91,7 +91,7 @@ isArgumentsObject(#20026)
 #20027=*
 stmts(#20027,1,#20024,-2,"{}")
 hasLocation(#20027,#20022)
-stmtContainers(#20027,#20024)
+stmt_containers(#20027,#20024)
 isMethod(#20021)
 #20028=*
 entry_cfg_node(#20028,#20001)
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap
index 1f733839500..0e0717eb44e 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap
@@ -55,7 +55,7 @@ hasLocation(#20001,#20003)
 #20018=*
 stmts(#20018,2,#20001,0,"!class A {};")
 hasLocation(#20018,#20003)
-stmtContainers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,18,#20018,0,"!class A {}")
 #20020=@"loc,{#10000},1,1,1,11"
@@ -112,7 +112,7 @@ isArgumentsObject(#20032)
 #20033=*
 stmts(#20033,1,#20030,-2,"{}")
 hasLocation(#20033,#20028)
-stmtContainers(#20033,#20030)
+stmt_containers(#20033,#20030)
 isMethod(#20027)
 #20034=*
 entry_cfg_node(#20034,#20001)
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
index 8cd5ae02844..94ec1ff77f4 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
@@ -60,7 +60,7 @@ hasLocation(#20001,#20003)
 #20020=*
 stmts(#20020,2,#20001,0,"!class extends B {};")
 hasLocation(#20020,#20003)
-stmtContainers(#20020,#20001)
+stmt_containers(#20020,#20001)
 #20021=*
 exprs(#20021,18,#20020,0,"!class extends B {}")
 #20022=@"loc,{#10000},1,1,1,19"
@@ -119,11 +119,11 @@ hasRestParameter(#20030)
 #20035=*
 stmts(#20035,1,#20030,-2,"{ super(...args); }")
 hasLocation(#20035,#20028)
-stmtContainers(#20035,#20030)
+stmt_containers(#20035,#20030)
 #20036=*
 stmts(#20036,2,#20035,0,"super(...args);")
 hasLocation(#20036,#20028)
-stmtContainers(#20036,#20030)
+stmt_containers(#20036,#20030)
 #20037=*
 exprs(#20037,13,#20036,0,"super(...args)")
 hasLocation(#20037,#20028)
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
index e45ff9a6a40..e0faf83d7c3 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
@@ -65,7 +65,7 @@ hasLocation(#20001,#20003)
 #20022=*
 stmts(#20022,2,#20001,0,"!class  ... s B {};")
 hasLocation(#20022,#20003)
-stmtContainers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
 exprs(#20023,18,#20022,0,"!class  ... ds B {}")
 #20024=@"loc,{#10000},1,1,1,21"
@@ -140,11 +140,11 @@ hasRestParameter(#20036)
 #20041=*
 stmts(#20041,1,#20036,-2,"{ super(...args); }")
 hasLocation(#20041,#20034)
-stmtContainers(#20041,#20036)
+stmt_containers(#20041,#20036)
 #20042=*
 stmts(#20042,2,#20041,0,"super(...args);")
 hasLocation(#20042,#20034)
-stmtContainers(#20042,#20036)
+stmt_containers(#20042,#20036)
 #20043=*
 exprs(#20043,13,#20042,0,"super(...args)")
 hasLocation(#20043,#20034)
diff --git a/javascript/extractor/tests/cfg/output/trap/fields.js.trap b/javascript/extractor/tests/cfg/output/trap/fields.js.trap
index 029f1b34bd9..6a78bb89428 100644
--- a/javascript/extractor/tests/cfg/output/trap/fields.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/fields.js.trap
@@ -389,7 +389,7 @@ stmts(#20139,26,#20001,0,"class A ... () {}\n}")
 #20140=@"loc,{#10000},1,1,9,1"
 locations_default(#20140,#10000,1,1,9,1)
 hasLocation(#20139,#20140)
-stmtContainers(#20139,#20001)
+stmt_containers(#20139,#20001)
 #20141=*
 exprs(#20141,78,#20139,0,"A")
 hasLocation(#20141,#20041)
@@ -432,13 +432,13 @@ stmts(#20150,1,#20146,-2,"{\n    ctor;\n  }")
 #20151=@"loc,{#10000},2,17,4,3"
 locations_default(#20151,#10000,2,17,4,3)
 hasLocation(#20150,#20151)
-stmtContainers(#20150,#20146)
+stmt_containers(#20150,#20146)
 #20152=*
 stmts(#20152,2,#20150,0,"ctor;")
 #20153=@"loc,{#10000},3,5,3,9"
 locations_default(#20153,#10000,3,5,3,9)
 hasLocation(#20152,#20153)
-stmtContainers(#20152,#20146)
+stmt_containers(#20152,#20146)
 #20154=*
 exprs(#20154,79,#20152,0,"ctor")
 hasLocation(#20154,#20053)
@@ -501,7 +501,7 @@ stmts(#20169,1,#20165,-2,"{}")
 #20170=@"loc,{#10000},7,7,7,8"
 locations_default(#20170,#10000,7,7,7,8)
 hasLocation(#20169,#20170)
-stmtContainers(#20169,#20165)
+stmt_containers(#20169,#20165)
 isMethod(#20162)
 #20171=*
 properties(#20171,#20139,6,0,"static g() {}")
@@ -533,7 +533,7 @@ stmts(#20178,1,#20174,-2,"{}")
 #20179=@"loc,{#10000},8,14,8,15"
 locations_default(#20179,#10000,8,14,8,15)
 hasLocation(#20178,#20179)
-stmtContainers(#20178,#20174)
+stmt_containers(#20178,#20174)
 isMethod(#20171)
 isStatic(#20171)
 #20180=*
@@ -541,7 +541,7 @@ stmts(#20180,26,#20001,1,"class B ... \n  z;\n}")
 #20181=@"loc,{#10000},11,1,18,1"
 locations_default(#20181,#10000,11,1,18,1)
 hasLocation(#20180,#20181)
-stmtContainers(#20180,#20001)
+stmt_containers(#20180,#20001)
 #20182=*
 exprs(#20182,78,#20180,0,"B")
 hasLocation(#20182,#20094)
@@ -591,13 +591,13 @@ stmts(#20192,1,#20188,-2,"{\n    b ... er;\n  }")
 #20193=@"loc,{#10000},12,17,16,3"
 locations_default(#20193,#10000,12,17,16,3)
 hasLocation(#20192,#20193)
-stmtContainers(#20192,#20188)
+stmt_containers(#20192,#20188)
 #20194=*
 stmts(#20194,2,#20192,0,"before;")
 #20195=@"loc,{#10000},13,5,13,11"
 locations_default(#20195,#10000,13,5,13,11)
 hasLocation(#20194,#20195)
-stmtContainers(#20194,#20188)
+stmt_containers(#20194,#20188)
 #20196=*
 exprs(#20196,79,#20194,0,"before")
 hasLocation(#20196,#20110)
@@ -612,7 +612,7 @@ stmts(#20198,2,#20192,1,"super();")
 #20199=@"loc,{#10000},14,5,14,12"
 locations_default(#20199,#10000,14,5,14,12)
 hasLocation(#20198,#20199)
-stmtContainers(#20198,#20188)
+stmt_containers(#20198,#20188)
 #20200=*
 exprs(#20200,13,#20198,0,"super()")
 #20201=@"loc,{#10000},14,5,14,11"
@@ -630,7 +630,7 @@ stmts(#20203,2,#20192,2,"after;")
 #20204=@"loc,{#10000},15,5,15,10"
 locations_default(#20204,#10000,15,5,15,10)
 hasLocation(#20203,#20204)
-stmtContainers(#20203,#20188)
+stmt_containers(#20203,#20188)
 #20205=*
 exprs(#20205,79,#20203,0,"after")
 hasLocation(#20205,#20122)
diff --git a/javascript/extractor/tests/cfg/output/trap/seq.js.trap b/javascript/extractor/tests/cfg/output/trap/seq.js.trap
index 8c5bdbdf1e1..3c416734d96 100644
--- a/javascript/extractor/tests/cfg/output/trap/seq.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/seq.js.trap
@@ -90,7 +90,7 @@ hasLocation(#20001,#20003)
 #20032=*
 stmts(#20032,3,#20001,0,"if(x,1+2,y||z);")
 hasLocation(#20032,#20003)
-stmtContainers(#20032,#20001)
+stmt_containers(#20032,#20001)
 #20033=*
 exprs(#20033,10,#20032,0,"x,1+2,y||z")
 #20034=@"loc,{#10000},1,4,1,13"
@@ -154,7 +154,7 @@ bind(#20045,#20046)
 #20047=*
 stmts(#20047,0,#20032,1,";")
 hasLocation(#20047,#20029)
-stmtContainers(#20047,#20001)
+stmt_containers(#20047,#20001)
 #20048=*
 entry_cfg_node(#20048,#20001)
 #20049=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap b/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap
index d215a1434ad..d48ef0d4e19 100644
--- a/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap
@@ -93,7 +93,7 @@ hasLocation(#20001,#20032)
 #20033=*
 stmts(#20033,2,#20001,0,"a && b && c;")
 hasLocation(#20033,#20003)
-stmtContainers(#20033,#20001)
+stmt_containers(#20033,#20001)
 #20034=*
 exprs(#20034,44,#20033,0,"a && b && c")
 #20035=@"loc,{#10000},1,1,1,11"
@@ -138,7 +138,7 @@ bind(#20042,#20043)
 #20044=*
 stmts(#20044,2,#20001,1,"x || y || z;")
 hasLocation(#20044,#20005)
-stmtContainers(#20044,#20001)
+stmt_containers(#20044,#20001)
 #20045=*
 exprs(#20045,45,#20044,0,"x || y || z")
 #20046=@"loc,{#10000},2,1,2,11"
diff --git a/javascript/extractor/tests/cfg/output/trap/ternary.js.trap b/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
index 65f9bc7288b..8a513bfb0a0 100644
--- a/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
@@ -85,7 +85,7 @@ hasLocation(#20001,#20003)
 #20030=*
 stmts(#20030,2,#20001,0,"(a ? b  ... ) || e;")
 hasLocation(#20030,#20003)
-stmtContainers(#20030,#20001)
+stmt_containers(#20030,#20001)
 #20031=*
 exprs(#20031,45,#20030,0,"(a ? b  ... d) || e")
 #20032=@"loc,{#10000},1,1,1,21"
diff --git a/javascript/extractor/tests/cfg/output/trap/tst.js.trap b/javascript/extractor/tests/cfg/output/trap/tst.js.trap
index 9d5347c23c6..69bca80a8f9 100644
--- a/javascript/extractor/tests/cfg/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/tst.js.trap
@@ -868,7 +868,7 @@ stmts(#20322,17,#20001,0,"functio ...     }\n}")
 #20323=@"loc,{#10000},1,1,10,1"
 locations_default(#20323,#10000,1,1,10,1)
 hasLocation(#20322,#20323)
-stmtContainers(#20322,#20001)
+stmt_containers(#20322,#20001)
 #20324=*
 exprs(#20324,78,#20322,-1,"outer")
 hasLocation(#20324,#20077)
@@ -889,13 +889,13 @@ stmts(#20328,1,#20322,-2,"{\n    v ...     }\n}")
 #20329=@"loc,{#10000},2,1,10,1"
 locations_default(#20329,#10000,2,1,10,1)
 hasLocation(#20328,#20329)
-stmtContainers(#20328,#20322)
+stmt_containers(#20328,#20322)
 #20330=*
 stmts(#20330,18,#20328,0,"var i = 0;")
 #20331=@"loc,{#10000},3,5,3,14"
 locations_default(#20331,#10000,3,5,3,14)
 hasLocation(#20330,#20331)
-stmtContainers(#20330,#20322)
+stmt_containers(#20330,#20322)
 #20332=*
 exprs(#20332,64,#20330,0,"i = 0")
 #20333=@"loc,{#10000},3,9,3,13"
@@ -921,7 +921,7 @@ stmts(#20336,18,#20328,1,"var i = 1;")
 #20337=@"loc,{#10000},4,5,4,14"
 locations_default(#20337,#10000,4,5,4,14)
 hasLocation(#20336,#20337)
-stmtContainers(#20336,#20322)
+stmt_containers(#20336,#20322)
 #20338=*
 exprs(#20338,64,#20336,0,"i = 1")
 #20339=@"loc,{#10000},4,9,4,13"
@@ -947,7 +947,7 @@ stmts(#20342,14,#20328,2,"for ( i ...  ++i );")
 #20343=@"loc,{#10000},5,5,5,33"
 locations_default(#20343,#10000,5,5,5,33)
 hasLocation(#20342,#20343)
-stmtContainers(#20342,#20322)
+stmt_containers(#20342,#20322)
 #20344=*
 exprs(#20344,27,#20342,1,"i < 32")
 #20345=@"loc,{#10000},5,19,5,24"
@@ -1005,13 +1005,13 @@ literals("0","0",#20354)
 #20355=*
 stmts(#20355,0,#20342,3,";")
 hasLocation(#20355,#20130)
-stmtContainers(#20355,#20322)
+stmt_containers(#20355,#20322)
 #20356=*
 stmts(#20356,8,#20328,3,"switch  ... ;\n    }")
 #20357=@"loc,{#10000},6,5,9,5"
 locations_default(#20357,#10000,6,5,9,5)
 hasLocation(#20356,#20357)
-stmtContainers(#20356,#20322)
+stmt_containers(#20356,#20322)
 #20358=*
 exprs(#20358,79,#20356,-1,"i")
 hasLocation(#20358,#20136)
@@ -1024,7 +1024,7 @@ stmts(#20359,19,#20356,0,"case 32 ... n true;")
 #20360=@"loc,{#10000},7,5,8,20"
 locations_default(#20360,#10000,7,5,8,20)
 hasLocation(#20359,#20360)
-stmtContainers(#20359,#20322)
+stmt_containers(#20359,#20322)
 #20361=*
 exprs(#20361,3,#20359,-1,"32")
 hasLocation(#20361,#20144)
@@ -1036,7 +1036,7 @@ stmts(#20362,9,#20359,0,"return true;")
 #20363=@"loc,{#10000},8,9,8,20"
 locations_default(#20363,#10000,8,9,8,20)
 hasLocation(#20362,#20363)
-stmtContainers(#20362,#20322)
+stmt_containers(#20362,#20322)
 #20364=*
 exprs(#20364,2,#20362,0,"true")
 hasLocation(#20364,#20150)
@@ -1048,7 +1048,7 @@ stmts(#20365,14,#20001,1,"for (;a ... ntinue;")
 #20366=@"loc,{#10000},12,1,13,13"
 locations_default(#20366,#10000,12,1,13,13)
 hasLocation(#20365,#20366)
-stmtContainers(#20365,#20001)
+stmt_containers(#20365,#20001)
 #20367=*
 exprs(#20367,79,#20365,1,"a")
 hasLocation(#20367,#20163)
@@ -1063,14 +1063,14 @@ stmts(#20369,6,#20365,3,"continue;")
 #20370=@"loc,{#10000},13,5,13,13"
 locations_default(#20370,#10000,13,5,13,13)
 hasLocation(#20369,#20370)
-stmtContainers(#20369,#20001)
+stmt_containers(#20369,#20001)
 jumpTargets(#20369,#20365)
 #20371=*
 stmts(#20371,17,#20001,2,"functio ...  (p);\n}")
 #20372=@"loc,{#10000},15,1,18,1"
 locations_default(#20372,#10000,15,1,18,1)
 hasLocation(#20371,#20372)
-stmtContainers(#20371,#20001)
+stmt_containers(#20371,#20001)
 #20373=*
 exprs(#20373,78,#20371,-1,"f")
 hasLocation(#20373,#20175)
@@ -1099,13 +1099,13 @@ stmts(#20379,1,#20371,-2,"{\n    f ...  (p);\n}")
 #20380=@"loc,{#10000},15,15,18,1"
 locations_default(#20380,#10000,15,15,18,1)
 hasLocation(#20379,#20380)
-stmtContainers(#20379,#20371)
+stmt_containers(#20379,#20371)
 #20381=*
 stmts(#20381,15,#20379,0,"for (va ... if (p);")
 #20382=@"loc,{#10000},16,5,17,15"
 locations_default(#20382,#10000,16,5,17,15)
 hasLocation(#20381,#20382)
-stmtContainers(#20381,#20371)
+stmt_containers(#20381,#20371)
 #20383=*
 exprs(#20383,79,#20381,1,"o")
 hasLocation(#20383,#20195)
@@ -1118,7 +1118,7 @@ stmts(#20384,18,#20381,0,"var p")
 #20385=@"loc,{#10000},16,10,16,14"
 locations_default(#20385,#10000,16,10,16,14)
 hasLocation(#20384,#20385)
-stmtContainers(#20384,#20371)
+stmt_containers(#20384,#20371)
 #20386=*
 exprs(#20386,64,#20384,0,"p")
 hasLocation(#20386,#20191)
@@ -1136,7 +1136,7 @@ stmts(#20388,3,#20381,2,"if (p);")
 #20389=@"loc,{#10000},17,9,17,15"
 locations_default(#20389,#10000,17,9,17,15)
 hasLocation(#20388,#20389)
-stmtContainers(#20388,#20371)
+stmt_containers(#20388,#20371)
 #20390=*
 exprs(#20390,79,#20388,0,"p")
 hasLocation(#20390,#20203)
@@ -1147,25 +1147,25 @@ bind(#20390,#20375)
 #20391=*
 stmts(#20391,0,#20388,1,";")
 hasLocation(#20391,#20207)
-stmtContainers(#20391,#20371)
+stmt_containers(#20391,#20371)
 #20392=*
 stmts(#20392,11,#20001,3,"try  {\n ... lly {\n}")
 #20393=@"loc,{#10000},20,1,24,1"
 locations_default(#20393,#10000,20,1,24,1)
 hasLocation(#20392,#20393)
-stmtContainers(#20392,#20001)
+stmt_containers(#20392,#20001)
 #20394=*
 stmts(#20394,1,#20392,0,"{\n}")
 #20395=@"loc,{#10000},20,6,21,1"
 locations_default(#20395,#10000,20,6,21,1)
 hasLocation(#20394,#20395)
-stmtContainers(#20394,#20001)
+stmt_containers(#20394,#20001)
 #20396=*
 stmts(#20396,20,#20392,1,"catch ( ... .m();\n}")
 #20397=@"loc,{#10000},21,3,23,1"
 locations_default(#20397,#10000,21,3,23,1)
 hasLocation(#20396,#20397)
-stmtContainers(#20396,#20001)
+stmt_containers(#20396,#20001)
 #20398=*
 scopes(#20398,2)
 scopenodes(#20396,#20398)
@@ -1184,13 +1184,13 @@ stmts(#20401,1,#20396,1,"{\n    o.m();\n}")
 #20402=@"loc,{#10000},21,13,23,1"
 locations_default(#20402,#10000,21,13,23,1)
 hasLocation(#20401,#20402)
-stmtContainers(#20401,#20001)
+stmt_containers(#20401,#20001)
 #20403=*
 stmts(#20403,2,#20401,0,"o.m();")
 #20404=@"loc,{#10000},22,5,22,10"
 locations_default(#20404,#10000,22,5,22,10)
 hasLocation(#20403,#20404)
-stmtContainers(#20403,#20001)
+stmt_containers(#20403,#20001)
 #20405=*
 exprs(#20405,13,#20403,0,"o.m()")
 #20406=@"loc,{#10000},22,5,22,9"
@@ -1225,25 +1225,25 @@ stmts(#20412,1,#20392,-1,"{\n}")
 #20413=@"loc,{#10000},23,11,24,1"
 locations_default(#20413,#10000,23,11,24,1)
 hasLocation(#20412,#20413)
-stmtContainers(#20412,#20001)
+stmt_containers(#20412,#20001)
 #20414=*
 stmts(#20414,11,#20001,4,"try {\n  ... h(_) {}")
 #20415=@"loc,{#10000},26,1,28,13"
 locations_default(#20415,#10000,26,1,28,13)
 hasLocation(#20414,#20415)
-stmtContainers(#20414,#20001)
+stmt_containers(#20414,#20001)
 #20416=*
 stmts(#20416,1,#20414,0,"{\n    f ... ers);\n}")
 #20417=@"loc,{#10000},26,5,28,1"
 locations_default(#20417,#10000,26,5,28,1)
 hasLocation(#20416,#20417)
-stmtContainers(#20416,#20001)
+stmt_containers(#20416,#20001)
 #20418=*
 stmts(#20418,15,#20416,0,"for (i in headers);")
 #20419=@"loc,{#10000},27,5,27,23"
 locations_default(#20419,#10000,27,5,27,23)
 hasLocation(#20418,#20419)
-stmtContainers(#20418,#20001)
+stmt_containers(#20418,#20001)
 #20420=*
 exprs(#20420,79,#20418,1,"headers")
 hasLocation(#20420,#20257)
@@ -1265,13 +1265,13 @@ bind(#20422,#20423)
 #20424=*
 stmts(#20424,0,#20418,2,";")
 hasLocation(#20424,#20261)
-stmtContainers(#20424,#20001)
+stmt_containers(#20424,#20001)
 #20425=*
 stmts(#20425,20,#20414,1,"catch(_) {}")
 #20426=@"loc,{#10000},28,3,28,13"
 locations_default(#20426,#10000,28,3,28,13)
 hasLocation(#20425,#20426)
-stmtContainers(#20425,#20001)
+stmt_containers(#20425,#20001)
 #20427=*
 scopes(#20427,2)
 scopenodes(#20425,#20427)
@@ -1290,31 +1290,31 @@ stmts(#20430,1,#20425,1,"{}")
 #20431=@"loc,{#10000},28,12,28,13"
 locations_default(#20431,#10000,28,12,28,13)
 hasLocation(#20430,#20431)
-stmtContainers(#20430,#20001)
+stmt_containers(#20430,#20001)
 #20432=*
 stmts(#20432,11,#20001,5,"try {\n} ...  f();\n}")
 #20433=@"loc,{#10000},30,1,33,1"
 locations_default(#20433,#10000,30,1,33,1)
 hasLocation(#20432,#20433)
-stmtContainers(#20432,#20001)
+stmt_containers(#20432,#20001)
 #20434=*
 stmts(#20434,1,#20432,0,"{\n}")
 #20435=@"loc,{#10000},30,5,31,1"
 locations_default(#20435,#10000,30,5,31,1)
 hasLocation(#20434,#20435)
-stmtContainers(#20434,#20001)
+stmt_containers(#20434,#20001)
 #20436=*
 stmts(#20436,1,#20432,-1,"{\n    f();\n}")
 #20437=@"loc,{#10000},31,11,33,1"
 locations_default(#20437,#10000,31,11,33,1)
 hasLocation(#20436,#20437)
-stmtContainers(#20436,#20001)
+stmt_containers(#20436,#20001)
 #20438=*
 stmts(#20438,2,#20436,0,"f();")
 #20439=@"loc,{#10000},32,5,32,8"
 locations_default(#20439,#10000,32,5,32,8)
 hasLocation(#20438,#20439)
-stmtContainers(#20438,#20001)
+stmt_containers(#20438,#20001)
 #20440=*
 exprs(#20440,13,#20438,0,"f()")
 #20441=@"loc,{#10000},32,5,32,7"
@@ -1334,7 +1334,7 @@ stmts(#20443,3,#20001,6,"if (!(x || y))\n  z;")
 #20444=@"loc,{#10000},35,1,36,4"
 locations_default(#20444,#10000,35,1,36,4)
 hasLocation(#20443,#20444)
-stmtContainers(#20443,#20001)
+stmt_containers(#20443,#20001)
 #20445=*
 exprs(#20445,18,#20443,0,"!(x || y)")
 #20446=@"loc,{#10000},35,5,35,13"
@@ -1379,7 +1379,7 @@ stmts(#20455,2,#20443,1,"z;")
 #20456=@"loc,{#10000},36,3,36,4"
 locations_default(#20456,#10000,36,3,36,4)
 hasLocation(#20455,#20456)
-stmtContainers(#20455,#20001)
+stmt_containers(#20455,#20001)
 #20457=*
 exprs(#20457,79,#20455,0,"z")
 hasLocation(#20457,#20314)
diff --git a/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap b/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
index 30e8a2a7a1f..5a8249cc669 100644
--- a/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
@@ -113,7 +113,7 @@ variables(#20038,"x",#20037)
 #20039=*
 stmts(#20039,2,#20001,0,"goog.de ... test');")
 hasLocation(#20039,#20003)
-stmtContainers(#20039,#20001)
+stmt_containers(#20039,#20001)
 #20040=*
 exprs(#20040,13,#20039,0,"goog.de ... 'test')")
 #20041=@"loc,{#10000},1,1,1,28"
@@ -158,13 +158,13 @@ regexpConstValue(#20048,"test")
 #20050=*
 stmts(#20050,30,#20001,1,"export let x = 5;")
 hasLocation(#20050,#20007)
-stmtContainers(#20050,#20001)
+stmt_containers(#20050,#20001)
 #20051=*
 stmts(#20051,23,#20050,-1,"let x = 5;")
 #20052=@"loc,{#10000},3,8,3,17"
 locations_default(#20052,#10000,3,8,3,17)
 hasLocation(#20051,#20052)
-stmtContainers(#20051,#20001)
+stmt_containers(#20051,#20001)
 #20053=*
 exprs(#20053,64,#20051,0,"x = 5")
 #20054=@"loc,{#10000},3,12,3,16"
diff --git a/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap b/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
index b7e99aebd67..ddcb7e02bb7 100644
--- a/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
@@ -150,7 +150,7 @@ variables(#20053,"x",#20051)
 #20054=*
 stmts(#20054,2,#20001,0,"goog.module('test');")
 hasLocation(#20054,#20003)
-stmtContainers(#20054,#20001)
+stmt_containers(#20054,#20001)
 #20055=*
 exprs(#20055,13,#20054,0,"goog.module('test')")
 #20056=@"loc,{#10000},1,1,1,19"
@@ -195,7 +195,7 @@ regexpConstValue(#20063,"test")
 #20065=*
 stmts(#20065,18,#20001,1,"var x = 5;")
 hasLocation(#20065,#20005)
-stmtContainers(#20065,#20001)
+stmt_containers(#20065,#20001)
 #20066=*
 exprs(#20066,64,#20065,0,"x = 5")
 #20067=@"loc,{#10000},2,5,2,9"
@@ -219,7 +219,7 @@ literals("5","5",#20069)
 #20070=*
 stmts(#20070,2,#20001,2,"exports = { x: x };")
 hasLocation(#20070,#20007)
-stmtContainers(#20070,#20001)
+stmt_containers(#20070,#20001)
 #20071=*
 exprs(#20071,47,#20070,0,"exports = { x: x }")
 #20072=@"loc,{#10000},3,1,3,18"
diff --git a/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap b/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
index 8ad22cff174..bcb60232e37 100644
--- a/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
@@ -105,7 +105,7 @@ hasLocation(#20001,#20036)
 #20037=*
 stmts(#20037,2,#20001,0,"goog.pr ... st.x');")
 hasLocation(#20037,#20003)
-stmtContainers(#20037,#20001)
+stmt_containers(#20037,#20001)
 #20038=*
 exprs(#20038,13,#20037,0,"goog.pr ... est.x')")
 #20039=@"loc,{#10000},1,1,1,22"
@@ -166,7 +166,7 @@ regexpConstValue(#20052,"x")
 #20054=*
 stmts(#20054,2,#20001,1,"test.x = 5;")
 hasLocation(#20054,#20007)
-stmtContainers(#20054,#20001)
+stmt_containers(#20054,#20001)
 #20055=*
 exprs(#20055,47,#20054,0,"test.x = 5")
 #20056=@"loc,{#10000},3,1,3,10"
diff --git a/javascript/extractor/tests/default-encoding/output/trap/latin1.js.trap b/javascript/extractor/tests/default-encoding/output/trap/latin1.js.trap
index 35ea7f8daad..5c62cd5dc95 100644
--- a/javascript/extractor/tests/default-encoding/output/trap/latin1.js.trap
+++ b/javascript/extractor/tests/default-encoding/output/trap/latin1.js.trap
@@ -75,7 +75,7 @@ variables(#20025,"f",#20000)
 #20026=*
 stmts(#20026,17,#20001,0,"function f(\u00e4, \u00f6) {}")
 hasLocation(#20026,#20003)
-stmtContainers(#20026,#20001)
+stmt_containers(#20026,#20001)
 #20027=*
 exprs(#20027,78,#20026,-1,"f")
 hasLocation(#20027,#20007)
@@ -110,7 +110,7 @@ stmts(#20034,1,#20026,-2,"{}")
 #20035=@"loc,{#10000},1,18,1,19"
 locations_default(#20035,#10000,1,18,1,19)
 hasLocation(#20034,#20035)
-stmtContainers(#20034,#20026)
+stmt_containers(#20034,#20026)
 #20036=*
 entry_cfg_node(#20036,#20001)
 #20037=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/e4x/output/trap/regress.js.trap b/javascript/extractor/tests/e4x/output/trap/regress.js.trap
index 39a8c3867fc..e1f3ed67407 100644
--- a/javascript/extractor/tests/e4x/output/trap/regress.js.trap
+++ b/javascript/extractor/tests/e4x/output/trap/regress.js.trap
@@ -53,7 +53,7 @@ hasLocation(#20001,#20016)
 #20017=*
 stmts(#20017,2,#20001,0,"[ x in y ]")
 hasLocation(#20017,#20003)
-stmtContainers(#20017,#20001)
+stmt_containers(#20017,#20001)
 #20018=*
 exprs(#20018,7,#20017,0,"[ x in y ]")
 hasLocation(#20018,#20003)
diff --git a/javascript/extractor/tests/e4x/output/trap/tst.js.trap b/javascript/extractor/tests/e4x/output/trap/tst.js.trap
index 2d05785b803..4b6cb23d52d 100644
--- a/javascript/extractor/tests/e4x/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/e4x/output/trap/tst.js.trap
@@ -493,7 +493,7 @@ variables(#20185,"e",#20000)
 #20186=*
 stmts(#20186,2,#20001,0,"items.@id;")
 hasLocation(#20186,#20003)
-stmtContainers(#20186,#20001)
+stmt_containers(#20186,#20001)
 #20187=*
 exprs(#20187,14,#20186,0,"items.@id")
 #20188=@"loc,{#10000},1,1,1,9"
@@ -526,7 +526,7 @@ literals("id","id",#20193)
 #20194=*
 stmts(#20194,2,#20001,1,"items.*[1];")
 hasLocation(#20194,#20005)
-stmtContainers(#20194,#20001)
+stmt_containers(#20194,#20001)
 #20195=*
 exprs(#20195,15,#20194,0,"items.*[1]")
 #20196=@"loc,{#10000},2,1,2,10"
@@ -562,7 +562,7 @@ literals("1","1",#20201)
 #20202=*
 stmts(#20202,2,#20001,2,"order.@*;")
 hasLocation(#20202,#20007)
-stmtContainers(#20202,#20001)
+stmt_containers(#20202,#20001)
 #20203=*
 exprs(#20203,14,#20202,0,"order.@*")
 #20204=@"loc,{#10000},3,1,3,8"
@@ -594,7 +594,7 @@ exprContainers(#20209,#20001)
 #20210=*
 stmts(#20210,2,#20001,3,"e..empl ...  == 1);")
 hasLocation(#20210,#20009)
-stmtContainers(#20210,#20001)
+stmt_containers(#20210,#20001)
 #20211=*
 exprs(#20211,111,#20210,0,"e..empl ... d == 1)")
 #20212=@"loc,{#10000},4,1,4,34"
@@ -684,7 +684,7 @@ literals("1","1",#20230)
 #20231=*
 stmts(#20231,2,#20001,4,"message ... gStyle;")
 hasLocation(#20231,#20011)
-stmtContainers(#20231,#20001)
+stmt_containers(#20231,#20001)
 #20232=*
 exprs(#20232,97,#20231,0,"message ... ngStyle")
 #20233=@"loc,{#10000},5,1,5,28"
@@ -733,7 +733,7 @@ bind(#20241,#20242)
 #20243=*
 stmts(#20243,2,#20001,5,"message.soap::Body;")
 hasLocation(#20243,#20013)
-stmtContainers(#20243,#20001)
+stmt_containers(#20243,#20001)
 #20244=*
 exprs(#20244,97,#20243,0,"message.soap::Body")
 #20245=@"loc,{#10000},6,1,6,18"
@@ -773,7 +773,7 @@ bind(#20250,#20251)
 #20252=*
 stmts(#20252,2,#20001,6,"items.@[f()];")
 hasLocation(#20252,#20015)
-stmtContainers(#20252,#20001)
+stmt_containers(#20252,#20001)
 #20253=*
 exprs(#20253,14,#20252,0,"items.@[f()]")
 #20254=@"loc,{#10000},7,1,7,12"
@@ -814,7 +814,7 @@ bind(#20260,#20261)
 #20262=*
 stmts(#20262,2,#20001,7,"message.soap::[g()];")
 hasLocation(#20262,#20017)
-stmtContainers(#20262,#20001)
+stmt_containers(#20262,#20001)
 #20263=*
 exprs(#20263,97,#20262,0,"message.soap::[g()]")
 #20264=@"loc,{#10000},8,1,8,19"
@@ -871,7 +871,7 @@ stmts(#20275,18,#20001,8,"var e = ... </elt>;")
 #20276=@"loc,{#10000},10,1,13,9"
 locations_default(#20276,#10000,10,1,13,9)
 hasLocation(#20275,#20276)
-stmtContainers(#20275,#20001)
+stmt_containers(#20275,#20001)
 #20277=*
 exprs(#20277,64,#20275,0,"e = <?x ...  </elt>")
 #20278=@"loc,{#10000},10,5,13,8"
diff --git a/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap b/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
index ffd627aae6a..0f92fa65401 100644
--- a/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
+++ b/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
@@ -212,7 +212,7 @@ hasLocation(#20001,#20073)
 #20074=*
 stmts(#20074,2,#20001,0,"'\ud800';")
 hasLocation(#20074,#20010)
-stmtContainers(#20074,#20001)
+stmt_containers(#20074,#20001)
 #20075=*
 exprs(#20075,4,#20074,0,"'\ud800'")
 hasLocation(#20075,#20032)
@@ -228,7 +228,7 @@ regexpConstValue(#20076,"?")
 #20078=*
 stmts(#20078,2,#20001,1,"'foo\ud800';")
 hasLocation(#20078,#20012)
-stmtContainers(#20078,#20001)
+stmt_containers(#20078,#20001)
 #20079=*
 exprs(#20079,4,#20078,0,"'foo\ud800'")
 hasLocation(#20079,#20036)
@@ -244,7 +244,7 @@ regexpConstValue(#20080,"foo?")
 #20082=*
 stmts(#20082,2,#20001,2,"'\ud800bar';")
 hasLocation(#20082,#20014)
-stmtContainers(#20082,#20001)
+stmt_containers(#20082,#20001)
 #20083=*
 exprs(#20083,4,#20082,0,"'\ud800bar'")
 hasLocation(#20083,#20040)
@@ -260,7 +260,7 @@ regexpConstValue(#20084,"?bar")
 #20086=*
 stmts(#20086,2,#20001,3,"'foo\ud800bar';")
 hasLocation(#20086,#20016)
-stmtContainers(#20086,#20001)
+stmt_containers(#20086,#20001)
 #20087=*
 exprs(#20087,4,#20086,0,"'foo\ud800bar'")
 hasLocation(#20087,#20044)
@@ -276,7 +276,7 @@ regexpConstValue(#20088,"foo?bar")
 #20090=*
 stmts(#20090,2,#20001,4,"/\uD800/;")
 hasLocation(#20090,#20018)
-stmtContainers(#20090,#20001)
+stmt_containers(#20090,#20001)
 #20091=*
 exprs(#20091,5,#20090,0,"/\uD800/")
 hasLocation(#20091,#20048)
@@ -292,7 +292,7 @@ regexpConstValue(#20092,"?")
 #20094=*
 stmts(#20094,2,#20001,5,"/foo\ud800/;")
 hasLocation(#20094,#20020)
-stmtContainers(#20094,#20001)
+stmt_containers(#20094,#20001)
 #20095=*
 exprs(#20095,5,#20094,0,"/foo\ud800/")
 hasLocation(#20095,#20052)
@@ -319,7 +319,7 @@ regexpConstValue(#20100,"?")
 #20102=*
 stmts(#20102,2,#20001,6,"/\ud800bar/;")
 hasLocation(#20102,#20022)
-stmtContainers(#20102,#20001)
+stmt_containers(#20102,#20001)
 #20103=*
 exprs(#20103,5,#20102,0,"/\ud800bar/")
 hasLocation(#20103,#20056)
@@ -346,7 +346,7 @@ regexpConstValue(#20108,"bar")
 #20110=*
 stmts(#20110,2,#20001,7,"/foo\ud800bar/;")
 hasLocation(#20110,#20024)
-stmtContainers(#20110,#20001)
+stmt_containers(#20110,#20001)
 #20111=*
 exprs(#20111,5,#20110,0,"/foo\ud800bar/")
 hasLocation(#20111,#20060)
@@ -379,7 +379,7 @@ regexpConstValue(#20118,"bar")
 #20120=*
 stmts(#20120,2,#20001,8,"'\udc00\ud800';")
 hasLocation(#20120,#20027)
-stmtContainers(#20120,#20001)
+stmt_containers(#20120,#20001)
 #20121=*
 exprs(#20121,4,#20120,0,"'\udc00\ud800'")
 hasLocation(#20121,#20064)
@@ -395,7 +395,7 @@ regexpConstValue(#20122,"??")
 #20124=*
 stmts(#20124,2,#20001,9,"'\uD834\uDF06';")
 hasLocation(#20124,#20030)
-stmtContainers(#20124,#20001)
+stmt_containers(#20124,#20001)
 #20125=*
 exprs(#20125,4,#20124,0,"'\uD834\uDF06'")
 hasLocation(#20125,#20068)
diff --git a/javascript/extractor/tests/encoding/output/trap/unicode.js.trap b/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
index 994b66d3546..46b2ad2ece7 100644
--- a/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
+++ b/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
@@ -28,7 +28,7 @@ hasLocation(#20001,#20003)
 #20007=*
 stmts(#20007,2,#20001,0,"""Semml\u00e9""")
 hasLocation(#20007,#20003)
-stmtContainers(#20007,#20001)
+stmt_containers(#20007,#20001)
 #20008=*
 exprs(#20008,4,#20007,0,"""Semml\u00e9""")
 hasLocation(#20008,#20003)
diff --git a/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap b/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap
index 858b3e94e70..9b774c927e0 100644
--- a/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap
+++ b/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap
@@ -63,7 +63,7 @@ hasLocation(#20001,#20020)
 #20021=*
 stmts(#20021,2,#20001,0,"(x = 0) = y")
 hasLocation(#20021,#20003)
-stmtContainers(#20021,#20001)
+stmt_containers(#20021,#20001)
 #20022=*
 exprs(#20022,47,#20021,0,"(x = 0) = y")
 hasLocation(#20022,#20003)
diff --git a/javascript/extractor/tests/errors/output/trap/kwident.js.trap b/javascript/extractor/tests/errors/output/trap/kwident.js.trap
index ca9a423bf0e..11e63aeba8f 100644
--- a/javascript/extractor/tests/errors/output/trap/kwident.js.trap
+++ b/javascript/extractor/tests/errors/output/trap/kwident.js.trap
@@ -55,7 +55,7 @@ variables(#20017,"class",#20000)
 #20018=*
 stmts(#20018,18,#20001,0,"var class = 23;")
 hasLocation(#20018,#20003)
-stmtContainers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,64,#20018,0,"class = 23")
 #20020=@"loc,{#10000},1,5,1,14"
diff --git a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap
index 5f5c1a81f7c..5ea9cc2184e 100644
--- a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap
@@ -70,7 +70,7 @@ hasLocation(#20001,#20003)
 #20024=*
 stmts(#20024,2,#20001,0,"[x=42] = [];")
 hasLocation(#20024,#20003)
-stmtContainers(#20024,#20001)
+stmt_containers(#20024,#20001)
 #20025=*
 exprs(#20025,47,#20024,0,"[x=42] = []")
 #20026=@"loc,{#10000},1,1,1,11"
diff --git a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap
index 55e8e2c0cdc..723b6d0c7e1 100644
--- a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap
@@ -142,7 +142,7 @@ variables(#20050,"cdr",#20000)
 #20051=*
 stmts(#20051,17,#20001,0,"functio ... n ys;\n}")
 hasLocation(#20051,#20049)
-stmtContainers(#20051,#20001)
+stmt_containers(#20051,#20001)
 #20052=*
 exprs(#20052,78,#20051,-1,"cdr")
 hasLocation(#20052,#20013)
@@ -171,13 +171,13 @@ stmts(#20058,1,#20051,-2,"{\n  var ... n ys;\n}")
 #20059=@"loc,{#10000},1,17,4,1"
 locations_default(#20059,#10000,1,17,4,1)
 hasLocation(#20058,#20059)
-stmtContainers(#20058,#20051)
+stmt_containers(#20058,#20051)
 #20060=*
 stmts(#20060,18,#20058,0,"var [, ...ys] = o;")
 #20061=@"loc,{#10000},2,3,2,20"
 locations_default(#20061,#10000,2,3,2,20)
 hasLocation(#20060,#20061)
-stmtContainers(#20060,#20051)
+stmt_containers(#20060,#20051)
 #20062=*
 exprs(#20062,64,#20060,0,"[, ...ys] = o")
 #20063=@"loc,{#10000},2,7,2,19"
@@ -212,7 +212,7 @@ stmts(#20068,9,#20058,1,"return ys;")
 #20069=@"loc,{#10000},3,3,3,12"
 locations_default(#20069,#10000,3,3,3,12)
 hasLocation(#20068,#20069)
-stmtContainers(#20068,#20051)
+stmt_containers(#20068,#20051)
 #20070=*
 exprs(#20070,79,#20068,0,"ys")
 hasLocation(#20070,#20043)
diff --git a/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap b/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
index fb32742e9a6..1ee98d565ec 100644
--- a/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
@@ -259,7 +259,7 @@ hasLocation(#20001,#20098)
 #20099=*
 stmts(#20099,2,#20001,0,"[""a"", "" ... ength);")
 hasLocation(#20099,#20003)
-stmtContainers(#20099,#20001)
+stmt_containers(#20099,#20001)
 #20100=*
 exprs(#20100,13,#20099,0,"[""a"", "" ... length)")
 #20101=@"loc,{#10000},1,1,1,37"
@@ -363,7 +363,7 @@ literals("length","length",#20124)
 #20125=*
 stmts(#20125,2,#20001,1,"setInte ...  1000);")
 hasLocation(#20125,#20005)
-stmtContainers(#20125,#20001)
+stmt_containers(#20125,#20001)
 #20126=*
 exprs(#20126,13,#20125,0,"setInte ... , 1000)")
 #20127=@"loc,{#10000},2,1,2,30"
@@ -414,7 +414,7 @@ literals("1000","1000",#20137)
 #20138=*
 stmts(#20138,2,#20001,2,"setTime ... 60000);")
 hasLocation(#20138,#20007)
-stmtContainers(#20138,#20001)
+stmt_containers(#20138,#20001)
 #20139=*
 exprs(#20139,13,#20138,0,"setTime ...  60000)")
 #20140=@"loc,{#10000},3,1,3,47"
@@ -447,13 +447,13 @@ stmts(#20146,1,#20143,-2,"{ alert ... p!""); }")
 #20147=@"loc,{#10000},3,18,3,39"
 locations_default(#20147,#10000,3,18,3,39)
 hasLocation(#20146,#20147)
-stmtContainers(#20146,#20143)
+stmt_containers(#20146,#20143)
 #20148=*
 stmts(#20148,2,#20146,0,"alert(""Wake up!"");")
 #20149=@"loc,{#10000},3,20,3,37"
 locations_default(#20149,#10000,3,20,3,37)
 hasLocation(#20148,#20149)
-stmtContainers(#20148,#20143)
+stmt_containers(#20148,#20143)
 #20150=*
 exprs(#20150,13,#20148,0,"alert(""Wake up!"")")
 #20151=@"loc,{#10000},3,20,3,36"
diff --git a/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap b/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap
index 3b690ded91c..52b8ce2e17c 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap
@@ -222,7 +222,7 @@ local_type_names(#20079,"A",#20000)
 #20080=*
 stmts(#20080,26,#20001,0,"class A ... ;\n  }\n}")
 hasLocation(#20080,#20077)
-stmtContainers(#20080,#20001)
+stmt_containers(#20080,#20001)
 #20081=*
 exprs(#20081,78,#20080,0,"A")
 hasLocation(#20081,#20021)
@@ -265,13 +265,13 @@ stmts(#20090,1,#20086,-2,"{\n    r ... _x;\n  }")
 #20091=@"loc,{#10000},2,11,4,3"
 locations_default(#20091,#10000,2,11,4,3)
 hasLocation(#20090,#20091)
-stmtContainers(#20090,#20086)
+stmt_containers(#20090,#20086)
 #20092=*
 stmts(#20092,9,#20090,0,"return this._x;")
 #20093=@"loc,{#10000},3,5,3,19"
 locations_default(#20093,#10000,3,5,3,19)
 hasLocation(#20092,#20093)
-stmtContainers(#20092,#20086)
+stmt_containers(#20092,#20086)
 #20094=*
 exprs(#20094,14,#20092,0,"this._x")
 #20095=@"loc,{#10000},3,12,3,18"
@@ -329,13 +329,13 @@ stmts(#20107,1,#20101,-2,"{\n    t ... +v;\n  }")
 #20108=@"loc,{#10000},5,12,7,3"
 locations_default(#20108,#10000,5,12,7,3)
 hasLocation(#20107,#20108)
-stmtContainers(#20107,#20101)
+stmt_containers(#20107,#20101)
 #20109=*
 stmts(#20109,2,#20107,0,"this._x = +v;")
 #20110=@"loc,{#10000},6,5,6,17"
 locations_default(#20110,#10000,6,5,6,17)
 hasLocation(#20109,#20110)
-stmtContainers(#20109,#20101)
+stmt_containers(#20109,#20101)
 #20111=*
 exprs(#20111,47,#20109,0,"this._x = +v")
 #20112=@"loc,{#10000},6,5,6,16"
@@ -402,7 +402,7 @@ isArgumentsObject(#20125)
 #20126=*
 stmts(#20126,1,#20123,-2,"{}")
 hasLocation(#20126,#20121)
-stmtContainers(#20126,#20123)
+stmt_containers(#20126,#20123)
 isMethod(#20120)
 #20127=*
 entry_cfg_node(#20127,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap b/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap
index f949b122131..6bd2d1888bf 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap
@@ -136,7 +136,7 @@ local_type_names(#20047,"A",#20000)
 #20048=*
 stmts(#20048,26,#20001,0,"class A ... ;\n  }\n}")
 hasLocation(#20048,#20045)
-stmtContainers(#20048,#20001)
+stmt_containers(#20048,#20001)
 #20049=*
 exprs(#20049,78,#20048,0,"A")
 hasLocation(#20049,#20015)
@@ -187,13 +187,13 @@ stmts(#20060,1,#20054,-2,"{\n    t ...  x;\n  }")
 #20061=@"loc,{#10000},2,18,4,3"
 locations_default(#20061,#10000,2,18,4,3)
 hasLocation(#20060,#20061)
-stmtContainers(#20060,#20054)
+stmt_containers(#20060,#20054)
 #20062=*
 stmts(#20062,2,#20060,0,"this.x = x;")
 #20063=@"loc,{#10000},3,5,3,15"
 locations_default(#20063,#10000,3,5,3,15)
 hasLocation(#20062,#20063)
-stmtContainers(#20062,#20054)
+stmt_containers(#20062,#20054)
 #20064=*
 exprs(#20064,47,#20062,0,"this.x = x")
 #20065=@"loc,{#10000},3,5,3,14"
diff --git a/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap b/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
index ac82898bc60..538b244f35d 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
@@ -59,7 +59,7 @@ local_type_names(#20019,"Point",#20000)
 #20020=*
 stmts(#20020,26,#20001,0,"class P ... ject {}")
 hasLocation(#20020,#20003)
-stmtContainers(#20020,#20001)
+stmt_containers(#20020,#20001)
 #20021=*
 exprs(#20021,78,#20020,0,"Point")
 hasLocation(#20021,#20007)
@@ -116,11 +116,11 @@ hasRestParameter(#20028)
 #20033=*
 stmts(#20033,1,#20028,-2,"{ super(...args); }")
 hasLocation(#20033,#20026)
-stmtContainers(#20033,#20028)
+stmt_containers(#20033,#20028)
 #20034=*
 stmts(#20034,2,#20033,0,"super(...args);")
 hasLocation(#20034,#20026)
-stmtContainers(#20034,#20028)
+stmt_containers(#20034,#20028)
 #20035=*
 exprs(#20035,13,#20034,0,"super(...args)")
 hasLocation(#20035,#20026)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap b/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
index d91d61f3ec9..d914b5c113d 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
@@ -109,7 +109,7 @@ local_type_names(#20039,"Point",#20000)
 #20040=*
 stmts(#20040,26,#20001,0,"class P ... ray) {}")
 hasLocation(#20040,#20003)
-stmtContainers(#20040,#20001)
+stmt_containers(#20040,#20001)
 #20041=*
 exprs(#20041,78,#20040,0,"Point")
 hasLocation(#20041,#20007)
@@ -218,11 +218,11 @@ hasRestParameter(#20061)
 #20066=*
 stmts(#20066,1,#20061,-2,"{ super(...args); }")
 hasLocation(#20066,#20059)
-stmtContainers(#20066,#20061)
+stmt_containers(#20066,#20061)
 #20067=*
 stmts(#20067,2,#20066,0,"super(...args);")
 hasLocation(#20067,#20059)
-stmtContainers(#20067,#20061)
+stmt_containers(#20067,#20061)
 #20068=*
 exprs(#20068,13,#20067,0,"super(...args)")
 hasLocation(#20068,#20059)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_method.js.trap b/javascript/extractor/tests/es2015/output/trap/class_method.js.trap
index dafa7aa739f..deb6ee2e649 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_method.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_method.js.trap
@@ -126,7 +126,7 @@ local_type_names(#20043,"A",#20000)
 #20044=*
 stmts(#20044,26,#20001,0,"class A ... ;\n  }\n}")
 hasLocation(#20044,#20041)
-stmtContainers(#20044,#20001)
+stmt_containers(#20044,#20001)
 #20045=*
 exprs(#20045,78,#20044,0,"A")
 hasLocation(#20045,#20015)
@@ -169,13 +169,13 @@ stmts(#20054,1,#20050,-2,"{\n    r ... .x;\n  }")
 #20055=@"loc,{#10000},2,10,4,3"
 locations_default(#20055,#10000,2,10,4,3)
 hasLocation(#20054,#20055)
-stmtContainers(#20054,#20050)
+stmt_containers(#20054,#20050)
 #20056=*
 stmts(#20056,9,#20054,0,"return this.x;")
 #20057=@"loc,{#10000},3,5,3,18"
 locations_default(#20057,#10000,3,5,3,18)
 hasLocation(#20056,#20057)
-stmtContainers(#20056,#20050)
+stmt_containers(#20056,#20050)
 #20058=*
 exprs(#20058,14,#20056,0,"this.x")
 #20059=@"loc,{#10000},3,12,3,17"
@@ -221,7 +221,7 @@ isArgumentsObject(#20067)
 #20068=*
 stmts(#20068,1,#20065,-2,"{}")
 hasLocation(#20068,#20063)
-stmtContainers(#20068,#20065)
+stmt_containers(#20068,#20065)
 isMethod(#20062)
 #20069=*
 entry_cfg_node(#20069,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_static.js.trap b/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
index a082e30d77d..135444f6d2e 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
@@ -121,7 +121,7 @@ local_type_names(#20041,"A",#20000)
 #20042=*
 stmts(#20042,26,#20001,0,"class A ... ;\n  }\n}")
 hasLocation(#20042,#20039)
-stmtContainers(#20042,#20001)
+stmt_containers(#20042,#20001)
 #20043=*
 exprs(#20043,78,#20042,0,"A")
 hasLocation(#20043,#20015)
@@ -164,13 +164,13 @@ stmts(#20052,1,#20048,-2,"{\n    r ... A"";\n  }")
 #20053=@"loc,{#10000},2,22,4,3"
 locations_default(#20053,#10000,2,22,4,3)
 hasLocation(#20052,#20053)
-stmtContainers(#20052,#20048)
+stmt_containers(#20052,#20048)
 #20054=*
 stmts(#20054,9,#20052,0,"return ""A"";")
 #20055=@"loc,{#10000},3,5,3,15"
 locations_default(#20055,#10000,3,5,3,15)
 hasLocation(#20054,#20055)
-stmtContainers(#20054,#20048)
+stmt_containers(#20054,#20048)
 #20056=*
 exprs(#20056,4,#20054,0,"""A""")
 hasLocation(#20056,#20031)
@@ -211,7 +211,7 @@ isArgumentsObject(#20064)
 #20065=*
 stmts(#20065,1,#20062,-2,"{}")
 hasLocation(#20065,#20060)
-stmtContainers(#20065,#20062)
+stmt_containers(#20065,#20062)
 isMethod(#20059)
 #20066=*
 entry_cfg_node(#20066,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap b/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap
index 560792fee3e..5785a0b7fee 100644
--- a/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap
@@ -49,7 +49,7 @@ local_type_names(#20015,"Point",#20000)
 #20016=*
 stmts(#20016,26,#20001,0,"class Point {}")
 hasLocation(#20016,#20003)
-stmtContainers(#20016,#20001)
+stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,78,#20016,0,"Point")
 hasLocation(#20017,#20007)
@@ -88,7 +88,7 @@ isArgumentsObject(#20024)
 #20025=*
 stmts(#20025,1,#20022,-2,"{}")
 hasLocation(#20025,#20020)
-stmtContainers(#20025,#20022)
+stmt_containers(#20025,#20022)
 isMethod(#20019)
 #20026=*
 entry_cfg_node(#20026,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap b/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
index 804e733a9f3..5ce01a05e14 100644
--- a/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
@@ -55,7 +55,7 @@ hasLocation(#20001,#20003)
 #20018=*
 stmts(#20018,2,#20001,0,"(class Point {})")
 hasLocation(#20018,#20003)
-stmtContainers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,63,#20018,0,"(class Point {})")
 hasLocation(#20019,#20003)
@@ -110,7 +110,7 @@ isArgumentsObject(#20031)
 #20032=*
 stmts(#20032,1,#20029,-2,"{}")
 hasLocation(#20032,#20027)
-stmtContainers(#20032,#20029)
+stmt_containers(#20032,#20029)
 isMethod(#20026)
 #20033=*
 entry_cfg_node(#20033,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap b/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
index c16a9b63e92..f2cfff7fdce 100644
--- a/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
@@ -50,7 +50,7 @@ hasLocation(#20001,#20003)
 #20016=*
 stmts(#20016,2,#20001,0,"(class       {})")
 hasLocation(#20016,#20003)
-stmtContainers(#20016,#20001)
+stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,63,#20016,0,"(class       {})")
 hasLocation(#20017,#20003)
@@ -89,7 +89,7 @@ isArgumentsObject(#20025)
 #20026=*
 stmts(#20026,1,#20023,-2,"{}")
 hasLocation(#20026,#20021)
-stmtContainers(#20026,#20023)
+stmt_containers(#20026,#20023)
 isMethod(#20020)
 #20027=*
 entry_cfg_node(#20027,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap b/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap
index ac27e7874c4..a3f65d9acc4 100644
--- a/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap
@@ -75,7 +75,7 @@ hasLocation(#20001,#20003)
 #20026=*
 stmts(#20026,2,#20001,0,"[o.x] = [42];")
 hasLocation(#20026,#20003)
-stmtContainers(#20026,#20001)
+stmt_containers(#20026,#20001)
 #20027=*
 exprs(#20027,47,#20026,0,"[o.x] = [42]")
 #20028=@"loc,{#10000},1,1,1,12"
diff --git a/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap b/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap
index 1468ab36add..d8c5ecc47ec 100644
--- a/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap
@@ -85,7 +85,7 @@ hasLocation(#20001,#20003)
 #20030=*
 stmts(#20030,2,#20001,0,"({ x: o.x } = q);")
 hasLocation(#20030,#20003)
-stmtContainers(#20030,#20001)
+stmt_containers(#20030,#20001)
 #20031=*
 exprs(#20031,63,#20030,0,"({ x: o.x } = q)")
 #20032=@"loc,{#10000},1,1,1,16"
diff --git a/javascript/extractor/tests/es2015/output/trap/const.js.trap b/javascript/extractor/tests/es2015/output/trap/const.js.trap
index 8666f4503d3..69de4cf05f7 100644
--- a/javascript/extractor/tests/es2015/output/trap/const.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/const.js.trap
@@ -55,7 +55,7 @@ variables(#20017,"x",#20000)
 #20018=*
 stmts(#20018,22,#20001,0,"const x = 23;")
 hasLocation(#20018,#20003)
-stmtContainers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,64,#20018,0,"x = 23")
 #20020=@"loc,{#10000},1,7,1,12"
diff --git a/javascript/extractor/tests/es2015/output/trap/defaultargs.js.trap b/javascript/extractor/tests/es2015/output/trap/defaultargs.js.trap
index d003a9ab8ac..3e23ff13535 100644
--- a/javascript/extractor/tests/es2015/output/trap/defaultargs.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/defaultargs.js.trap
@@ -92,7 +92,7 @@ variables(#20032,"f",#20000)
 #20033=*
 stmts(#20033,17,#20001,0,"functio ... +19) {}")
 hasLocation(#20033,#20003)
-stmtContainers(#20033,#20001)
+stmt_containers(#20033,#20001)
 #20034=*
 exprs(#20034,78,#20033,-1,"f")
 hasLocation(#20034,#20007)
@@ -144,7 +144,7 @@ stmts(#20045,1,#20033,-2,"{}")
 #20046=@"loc,{#10000},1,23,1,24"
 locations_default(#20046,#10000,1,23,1,24)
 hasLocation(#20045,#20046)
-stmtContainers(#20045,#20033)
+stmt_containers(#20045,#20033)
 #20047=*
 entry_cfg_node(#20047,#20001)
 #20048=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap b/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap
index 76987d8d8d7..d6760addc96 100644
--- a/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap
@@ -105,7 +105,7 @@ variables(#20036,"f",#20000)
 #20037=*
 stmts(#20037,17,#20001,0,"functio ...  g();\n}")
 hasLocation(#20037,#20035)
-stmtContainers(#20037,#20001)
+stmt_containers(#20037,#20001)
 #20038=*
 exprs(#20038,78,#20037,-1,"f")
 hasLocation(#20038,#20013)
@@ -125,13 +125,13 @@ stmts(#20041,1,#20037,-2,"{\n    yield* g();\n}")
 #20042=@"loc,{#10000},1,15,3,1"
 locations_default(#20042,#10000,1,15,3,1)
 hasLocation(#20041,#20042)
-stmtContainers(#20041,#20037)
+stmt_containers(#20041,#20037)
 #20043=*
 stmts(#20043,2,#20041,0,"yield* g();")
 #20044=@"loc,{#10000},2,5,2,15"
 locations_default(#20044,#10000,2,5,2,15)
 hasLocation(#20043,#20044)
-stmtContainers(#20043,#20037)
+stmt_containers(#20043,#20037)
 #20045=*
 exprs(#20045,69,#20043,0,"yield* g()")
 #20046=@"loc,{#10000},2,5,2,14"
diff --git a/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap b/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap
index f6ea966f107..756ae3226e2 100644
--- a/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap
@@ -474,7 +474,7 @@ stmts(#20177,17,#20001,0,"functio ... );\n\t}\n}")
 #20178=@"loc,{#10000},1,1,8,1"
 locations_default(#20178,#10000,1,1,8,1)
 hasLocation(#20177,#20178)
-stmtContainers(#20177,#20001)
+stmt_containers(#20177,#20001)
 #20179=*
 exprs(#20179,78,#20177,-1,"f")
 hasLocation(#20179,#20031)
@@ -520,13 +520,13 @@ stmts(#20190,1,#20177,-2,"{\n\tvar  ... );\n\t}\n}")
 #20191=@"loc,{#10000},1,20,8,1"
 locations_default(#20191,#10000,1,20,8,1)
 hasLocation(#20190,#20191)
-stmtContainers(#20190,#20177)
+stmt_containers(#20190,#20177)
 #20192=*
 stmts(#20192,18,#20190,0,"var [a, [, c]] = x;")
 #20193=@"loc,{#10000},2,2,2,20"
 locations_default(#20193,#10000,2,2,2,20)
 hasLocation(#20192,#20193)
-stmtContainers(#20192,#20177)
+stmt_containers(#20192,#20177)
 #20194=*
 exprs(#20194,64,#20192,0,"[a, [, c]] = x")
 #20195=@"loc,{#10000},2,6,2,19"
@@ -576,19 +576,19 @@ stmts(#20203,11,#20190,1,"try {\n\t ... (d);\n\t}")
 #20204=@"loc,{#10000},3,2,7,2"
 locations_default(#20204,#10000,3,2,7,2)
 hasLocation(#20203,#20204)
-stmtContainers(#20203,#20177)
+stmt_containers(#20203,#20177)
 #20205=*
 stmts(#20205,1,#20203,0,"{\n\t\tthrow [a, c];\n\t}")
 #20206=@"loc,{#10000},3,6,5,2"
 locations_default(#20206,#10000,3,6,5,2)
 hasLocation(#20205,#20206)
-stmtContainers(#20205,#20177)
+stmt_containers(#20205,#20177)
 #20207=*
 stmts(#20207,10,#20205,0,"throw [a, c];")
 #20208=@"loc,{#10000},4,3,4,15"
 locations_default(#20208,#10000,4,3,4,15)
 hasLocation(#20207,#20208)
-stmtContainers(#20207,#20177)
+stmt_containers(#20207,#20177)
 #20209=*
 exprs(#20209,7,#20207,0,"[a, c]")
 #20210=@"loc,{#10000},4,9,4,14"
@@ -616,7 +616,7 @@ stmts(#20213,20,#20203,1,"catch ( ... (d);\n\t}")
 #20214=@"loc,{#10000},5,4,7,2"
 locations_default(#20214,#10000,5,4,7,2)
 hasLocation(#20213,#20214)
-stmtContainers(#20213,#20177)
+stmt_containers(#20213,#20177)
 #20215=*
 scopes(#20215,2)
 scopenodes(#20213,#20215)
@@ -635,13 +635,13 @@ stmts(#20218,1,#20213,1,"{\n\t\tcon ... (d);\n\t}")
 #20219=@"loc,{#10000},5,14,7,2"
 locations_default(#20219,#10000,5,14,7,2)
 hasLocation(#20218,#20219)
-stmtContainers(#20218,#20177)
+stmt_containers(#20218,#20177)
 #20220=*
 stmts(#20220,2,#20218,0,"console.log(d);")
 #20221=@"loc,{#10000},6,3,6,17"
 locations_default(#20221,#10000,6,3,6,17)
 hasLocation(#20220,#20221)
-stmtContainers(#20220,#20177)
+stmt_containers(#20220,#20177)
 #20222=*
 exprs(#20222,13,#20220,0,"console.log(d)")
 #20223=@"loc,{#10000},6,3,6,16"
@@ -683,7 +683,7 @@ stmts(#20230,17,#20001,1,"functio ... rn w;\n}")
 #20231=@"loc,{#10000},10,1,13,1"
 locations_default(#20231,#10000,10,1,13,1)
 hasLocation(#20230,#20231)
-stmtContainers(#20230,#20001)
+stmt_containers(#20230,#20001)
 #20232=*
 exprs(#20232,78,#20230,-1,"g")
 hasLocation(#20232,#20122)
@@ -744,13 +744,13 @@ stmts(#20247,1,#20230,-2,"{\n\tvar  ... rn w;\n}")
 #20248=@"loc,{#10000},10,25,13,1"
 locations_default(#20248,#10000,10,25,13,1)
 hasLocation(#20247,#20248)
-stmtContainers(#20247,#20230)
+stmt_containers(#20247,#20230)
 #20249=*
 stmts(#20249,18,#20247,0,"var { [x]: w } = z;")
 #20250=@"loc,{#10000},11,2,11,20"
 locations_default(#20250,#10000,11,2,11,20)
 hasLocation(#20249,#20250)
-stmtContainers(#20249,#20230)
+stmt_containers(#20249,#20230)
 #20251=*
 exprs(#20251,64,#20249,0,"{ [x]: w } = z")
 #20252=@"loc,{#10000},11,6,11,19"
@@ -797,7 +797,7 @@ stmts(#20260,9,#20247,1,"return w;")
 #20261=@"loc,{#10000},12,2,12,10"
 locations_default(#20261,#10000,12,2,12,10)
 hasLocation(#20260,#20261)
-stmtContainers(#20260,#20230)
+stmt_containers(#20260,#20230)
 #20262=*
 exprs(#20262,79,#20260,0,"w")
 hasLocation(#20262,#20168)
diff --git a/javascript/extractor/tests/es2015/output/trap/export1.js.trap b/javascript/extractor/tests/es2015/output/trap/export1.js.trap
index a52f13aad25..ec6a38a8f77 100644
--- a/javascript/extractor/tests/es2015/output/trap/export1.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export1.js.trap
@@ -63,13 +63,13 @@ variables(#20019,"x",#20018)
 #20020=*
 stmts(#20020,30,#20001,0,"export var x = 23;")
 hasLocation(#20020,#20003)
-stmtContainers(#20020,#20001)
+stmt_containers(#20020,#20001)
 #20021=*
 stmts(#20021,18,#20020,-1,"var x = 23;")
 #20022=@"loc,{#10000},1,8,1,18"
 locations_default(#20022,#10000,1,8,1,18)
 hasLocation(#20021,#20022)
-stmtContainers(#20021,#20001)
+stmt_containers(#20021,#20001)
 #20023=*
 exprs(#20023,64,#20021,0,"x = 23")
 #20024=@"loc,{#10000},1,12,1,17"
diff --git a/javascript/extractor/tests/es2015/output/trap/export10.js.trap b/javascript/extractor/tests/es2015/output/trap/export10.js.trap
index f882dca1618..3148caa2995 100644
--- a/javascript/extractor/tests/es2015/output/trap/export10.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export10.js.trap
@@ -93,13 +93,13 @@ stmts(#20031,29,#20001,0,"export  ... f () {}")
 #20032=@"loc,{#10000},1,1,1,31"
 locations_default(#20032,#10000,1,1,1,31)
 hasLocation(#20031,#20032)
-stmtContainers(#20031,#20001)
+stmt_containers(#20031,#20001)
 #20033=*
 stmts(#20033,17,#20031,0,"function f () {}")
 #20034=@"loc,{#10000},1,16,1,31"
 locations_default(#20034,#10000,1,16,1,31)
 hasLocation(#20033,#20034)
-stmtContainers(#20033,#20001)
+stmt_containers(#20033,#20001)
 #20035=*
 exprs(#20035,78,#20033,-1,"f")
 hasLocation(#20035,#20011)
@@ -118,13 +118,13 @@ stmts(#20038,1,#20033,-2,"{}")
 #20039=@"loc,{#10000},1,30,1,31"
 locations_default(#20039,#10000,1,30,1,31)
 hasLocation(#20038,#20039)
-stmtContainers(#20038,#20033)
+stmt_containers(#20038,#20033)
 #20040=*
 stmts(#20040,2,#20001,1,"[,]")
 #20041=@"loc,{#10000},1,33,1,35"
 locations_default(#20041,#10000,1,33,1,35)
 hasLocation(#20040,#20041)
-stmtContainers(#20040,#20001)
+stmt_containers(#20040,#20001)
 #20042=*
 exprs(#20042,7,#20040,0,"[,]")
 hasLocation(#20042,#20041)
diff --git a/javascript/extractor/tests/es2015/output/trap/export11.js.trap b/javascript/extractor/tests/es2015/output/trap/export11.js.trap
index 498ebbd2eb7..e02b39a9242 100644
--- a/javascript/extractor/tests/es2015/output/trap/export11.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export11.js.trap
@@ -59,7 +59,7 @@ is_es2015_module(#20001)
 #20018=*
 stmts(#20018,29,#20001,0,"export  ... lass {}")
 hasLocation(#20018,#20003)
-stmtContainers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,80,#20018,0,"class {}")
 #20020=@"loc,{#10000},1,16,1,23"
@@ -93,7 +93,7 @@ isArgumentsObject(#20026)
 #20027=*
 stmts(#20027,1,#20024,-2,"{}")
 hasLocation(#20027,#20022)
-stmtContainers(#20027,#20024)
+stmt_containers(#20027,#20024)
 isMethod(#20021)
 #20028=*
 entry_cfg_node(#20028,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/export2.js.trap b/javascript/extractor/tests/es2015/output/trap/export2.js.trap
index 197bb2f4a84..5bc64f232f3 100644
--- a/javascript/extractor/tests/es2015/output/trap/export2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export2.js.trap
@@ -75,13 +75,13 @@ stmts(#20024,30,#20001,0,"export  ...  f() {}")
 #20025=@"loc,{#10000},1,1,1,22"
 locations_default(#20025,#10000,1,1,1,22)
 hasLocation(#20024,#20025)
-stmtContainers(#20024,#20001)
+stmt_containers(#20024,#20001)
 #20026=*
 stmts(#20026,17,#20024,-1,"function f() {}")
 #20027=@"loc,{#10000},1,8,1,22"
 locations_default(#20027,#10000,1,8,1,22)
 hasLocation(#20026,#20027)
-stmtContainers(#20026,#20001)
+stmt_containers(#20026,#20001)
 #20028=*
 exprs(#20028,78,#20026,-1,"f")
 hasLocation(#20028,#20009)
@@ -100,11 +100,11 @@ stmts(#20031,1,#20026,-2,"{}")
 #20032=@"loc,{#10000},1,21,1,22"
 locations_default(#20032,#10000,1,21,1,22)
 hasLocation(#20031,#20032)
-stmtContainers(#20031,#20026)
+stmt_containers(#20031,#20026)
 #20033=*
 stmts(#20033,0,#20001,1,";")
 hasLocation(#20033,#20019)
-stmtContainers(#20033,#20001)
+stmt_containers(#20033,#20001)
 #20034=*
 entry_cfg_node(#20034,#20001)
 #20035=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/es2015/output/trap/export3.js.trap b/javascript/extractor/tests/es2015/output/trap/export3.js.trap
index 28d76469059..bd977f3292c 100644
--- a/javascript/extractor/tests/es2015/output/trap/export3.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export3.js.trap
@@ -80,13 +80,13 @@ stmts(#20026,29,#20001,0,"export  ...  f() {}")
 #20027=@"loc,{#10000},1,1,1,30"
 locations_default(#20027,#10000,1,1,1,30)
 hasLocation(#20026,#20027)
-stmtContainers(#20026,#20001)
+stmt_containers(#20026,#20001)
 #20028=*
 stmts(#20028,17,#20026,0,"function f() {}")
 #20029=@"loc,{#10000},1,16,1,30"
 locations_default(#20029,#10000,1,16,1,30)
 hasLocation(#20028,#20029)
-stmtContainers(#20028,#20001)
+stmt_containers(#20028,#20001)
 #20030=*
 exprs(#20030,78,#20028,-1,"f")
 hasLocation(#20030,#20011)
@@ -105,11 +105,11 @@ stmts(#20033,1,#20028,-2,"{}")
 #20034=@"loc,{#10000},1,29,1,30"
 locations_default(#20034,#10000,1,29,1,30)
 hasLocation(#20033,#20034)
-stmtContainers(#20033,#20028)
+stmt_containers(#20033,#20028)
 #20035=*
 stmts(#20035,0,#20001,1,";")
 hasLocation(#20035,#20021)
-stmtContainers(#20035,#20001)
+stmt_containers(#20035,#20001)
 #20036=*
 entry_cfg_node(#20036,#20001)
 #20037=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/es2015/output/trap/export4.js.trap b/javascript/extractor/tests/es2015/output/trap/export4.js.trap
index 57c63571822..89588f1e4cf 100644
--- a/javascript/extractor/tests/es2015/output/trap/export4.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export4.js.trap
@@ -73,7 +73,7 @@ stmts(#20023,29,#20001,0,"export  ... n () {}")
 #20024=@"loc,{#10000},1,1,1,29"
 locations_default(#20024,#10000,1,1,1,29)
 hasLocation(#20023,#20024)
-stmtContainers(#20023,#20001)
+stmt_containers(#20023,#20001)
 #20025=*
 exprs(#20025,9,#20023,0,"function () {}")
 #20026=@"loc,{#10000},1,16,1,29"
@@ -93,11 +93,11 @@ stmts(#20029,1,#20025,-2,"{}")
 #20030=@"loc,{#10000},1,28,1,29"
 locations_default(#20030,#10000,1,28,1,29)
 hasLocation(#20029,#20030)
-stmtContainers(#20029,#20025)
+stmt_containers(#20029,#20025)
 #20031=*
 stmts(#20031,0,#20001,1,";")
 hasLocation(#20031,#20019)
-stmtContainers(#20031,#20001)
+stmt_containers(#20031,#20001)
 #20032=*
 entry_cfg_node(#20032,#20001)
 #20033=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/es2015/output/trap/export5.js.trap b/javascript/extractor/tests/es2015/output/trap/export5.js.trap
index ec9d6330ca7..7dd0be308e8 100644
--- a/javascript/extractor/tests/es2015/output/trap/export5.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export5.js.trap
@@ -133,7 +133,7 @@ variables(#20047,"y",#20045)
 #20048=*
 stmts(#20048,18,#20001,0,"var x = 23, y = 42;")
 hasLocation(#20048,#20003)
-stmtContainers(#20048,#20001)
+stmt_containers(#20048,#20001)
 #20049=*
 exprs(#20049,64,#20048,0,"x = 23")
 #20050=@"loc,{#10000},1,5,1,10"
@@ -177,7 +177,7 @@ literals("42","42",#20056)
 #20057=*
 stmts(#20057,30,#20001,1,"export  ... as z };")
 hasLocation(#20057,#20005)
-stmtContainers(#20057,#20001)
+stmt_containers(#20057,#20001)
 #20058=*
 exprs(#20058,86,#20057,0,"x")
 hasLocation(#20058,#20029)
diff --git a/javascript/extractor/tests/es2015/output/trap/export6.js.trap b/javascript/extractor/tests/es2015/output/trap/export6.js.trap
index 45a95604e3c..7e754f97020 100644
--- a/javascript/extractor/tests/es2015/output/trap/export6.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export6.js.trap
@@ -56,7 +56,7 @@ is_es2015_module(#20001)
 #20017=*
 stmts(#20017,28,#20001,0,"export * from 'foo';")
 hasLocation(#20017,#20003)
-stmtContainers(#20017,#20001)
+stmt_containers(#20017,#20001)
 #20018=*
 exprs(#20018,4,#20017,0,"'foo'")
 hasLocation(#20018,#20011)
diff --git a/javascript/extractor/tests/es2015/output/trap/export7.js.trap b/javascript/extractor/tests/es2015/output/trap/export7.js.trap
index 219205447c2..4a776e93006 100644
--- a/javascript/extractor/tests/es2015/output/trap/export7.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export7.js.trap
@@ -86,7 +86,7 @@ is_es2015_module(#20001)
 #20029=*
 stmts(#20029,30,#20001,0,"export  ...  'foo';")
 hasLocation(#20029,#20003)
-stmtContainers(#20029,#20001)
+stmt_containers(#20029,#20001)
 #20030=*
 exprs(#20030,4,#20029,-2,"'foo'")
 hasLocation(#20030,#20023)
diff --git a/javascript/extractor/tests/es2015/output/trap/export8.js.trap b/javascript/extractor/tests/es2015/output/trap/export8.js.trap
index 7d9a4e21384..0ae81680445 100644
--- a/javascript/extractor/tests/es2015/output/trap/export8.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export8.js.trap
@@ -79,7 +79,7 @@ is_es2015_module(#20001)
 #20026=*
 stmts(#20026,2,#20001,0,"foo = 42;")
 hasLocation(#20026,#20003)
-stmtContainers(#20026,#20001)
+stmt_containers(#20026,#20001)
 #20027=*
 exprs(#20027,47,#20026,0,"foo = 42")
 #20028=@"loc,{#10000},1,1,1,8"
@@ -105,7 +105,7 @@ literals("42","42",#20031)
 #20032=*
 stmts(#20032,29,#20001,1,"export default foo;")
 hasLocation(#20032,#20005)
-stmtContainers(#20032,#20001)
+stmt_containers(#20032,#20001)
 #20033=*
 exprs(#20033,103,#20032,0,"foo")
 hasLocation(#20033,#20019)
diff --git a/javascript/extractor/tests/es2015/output/trap/export9.js.trap b/javascript/extractor/tests/es2015/output/trap/export9.js.trap
index 926e01cc37e..d784e28ca48 100644
--- a/javascript/extractor/tests/es2015/output/trap/export9.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export9.js.trap
@@ -85,13 +85,13 @@ stmts(#20028,29,#20001,0,"export  ... ss C {}")
 #20029=@"loc,{#10000},1,1,1,25"
 locations_default(#20029,#10000,1,1,1,25)
 hasLocation(#20028,#20029)
-stmtContainers(#20028,#20001)
+stmt_containers(#20028,#20001)
 #20030=*
 stmts(#20030,26,#20028,0,"class C {}")
 #20031=@"loc,{#10000},1,16,1,25"
 locations_default(#20031,#10000,1,16,1,25)
 hasLocation(#20030,#20031)
-stmtContainers(#20030,#20001)
+stmt_containers(#20030,#20001)
 #20032=*
 exprs(#20032,78,#20030,0,"C")
 hasLocation(#20032,#20011)
@@ -130,14 +130,14 @@ isArgumentsObject(#20039)
 #20040=*
 stmts(#20040,1,#20037,-2,"{}")
 hasLocation(#20040,#20035)
-stmtContainers(#20040,#20037)
+stmt_containers(#20040,#20037)
 isMethod(#20034)
 #20041=*
 stmts(#20041,2,#20001,1,"[,]")
 #20042=@"loc,{#10000},1,27,1,29"
 locations_default(#20042,#10000,1,27,1,29)
 hasLocation(#20041,#20042)
-stmtContainers(#20041,#20001)
+stmt_containers(#20041,#20001)
 #20043=*
 exprs(#20043,7,#20041,0,"[,]")
 hasLocation(#20043,#20042)
diff --git a/javascript/extractor/tests/es2015/output/trap/forof.js.trap b/javascript/extractor/tests/es2015/output/trap/forof.js.trap
index f8d8c3db1fb..4acc4ff622a 100644
--- a/javascript/extractor/tests/es2015/output/trap/forof.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/forof.js.trap
@@ -251,7 +251,7 @@ stmts(#20092,21,#20001,0,"for (le ...  x+1;\n}")
 #20093=@"loc,{#10000},1,1,3,1"
 locations_default(#20093,#10000,1,1,3,1)
 hasLocation(#20092,#20093)
-stmtContainers(#20092,#20001)
+stmt_containers(#20092,#20001)
 #20094=*
 exprs(#20094,7,#20092,1,"[1,2,3]")
 #20095=@"loc,{#10000},1,15,1,21"
@@ -289,7 +289,7 @@ stmts(#20101,23,#20092,0,"let x")
 #20102=@"loc,{#10000},1,6,1,10"
 locations_default(#20102,#10000,1,6,1,10)
 hasLocation(#20101,#20102)
-stmtContainers(#20101,#20001)
+stmt_containers(#20101,#20001)
 #20103=*
 exprs(#20103,64,#20101,0,"x")
 hasLocation(#20103,#20023)
@@ -307,7 +307,7 @@ stmts(#20105,1,#20092,2,"{\n    let y = x+1;\n}")
 #20106=@"loc,{#10000},1,24,3,1"
 locations_default(#20106,#10000,1,24,3,1)
 hasLocation(#20105,#20106)
-stmtContainers(#20105,#20001)
+stmt_containers(#20105,#20001)
 #20107=*
 scopes(#20107,4)
 scopenodes(#20105,#20107)
@@ -319,7 +319,7 @@ stmts(#20109,23,#20105,0,"let y = x+1;")
 #20110=@"loc,{#10000},2,5,2,16"
 locations_default(#20110,#10000,2,5,2,16)
 hasLocation(#20109,#20110)
-stmtContainers(#20109,#20001)
+stmt_containers(#20109,#20001)
 #20111=*
 exprs(#20111,64,#20109,0,"y = x+1")
 #20112=@"loc,{#10000},2,9,2,15"
@@ -359,7 +359,7 @@ stmts(#20118,17,#20001,1,"functio ...  []);\n}")
 #20119=@"loc,{#10000},5,1,7,1"
 locations_default(#20119,#10000,5,1,7,1)
 hasLocation(#20118,#20119)
-stmtContainers(#20118,#20001)
+stmt_containers(#20118,#20001)
 #20120=*
 exprs(#20120,78,#20118,-1,"f")
 hasLocation(#20120,#20062)
@@ -380,13 +380,13 @@ stmts(#20124,1,#20118,-2,"{\n    f ...  []);\n}")
 #20125=@"loc,{#10000},5,14,7,1"
 locations_default(#20125,#10000,5,14,7,1)
 hasLocation(#20124,#20125)
-stmtContainers(#20124,#20118)
+stmt_containers(#20124,#20118)
 #20126=*
 stmts(#20126,21,#20124,0,"for (var x of []);")
 #20127=@"loc,{#10000},6,5,6,22"
 locations_default(#20127,#10000,6,5,6,22)
 hasLocation(#20126,#20127)
-stmtContainers(#20126,#20118)
+stmt_containers(#20126,#20118)
 #20128=*
 exprs(#20128,7,#20126,1,"[]")
 #20129=@"loc,{#10000},6,19,6,20"
@@ -400,7 +400,7 @@ stmts(#20130,18,#20126,0,"var x")
 #20131=@"loc,{#10000},6,10,6,14"
 locations_default(#20131,#10000,6,10,6,14)
 hasLocation(#20130,#20131)
-stmtContainers(#20130,#20118)
+stmt_containers(#20130,#20118)
 #20132=*
 exprs(#20132,64,#20130,0,"x")
 hasLocation(#20132,#20076)
@@ -416,7 +416,7 @@ decl(#20133,#20122)
 #20134=*
 stmts(#20134,0,#20126,2,";")
 hasLocation(#20134,#20086)
-stmtContainers(#20134,#20118)
+stmt_containers(#20134,#20118)
 #20135=*
 entry_cfg_node(#20135,#20001)
 #20136=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/es2015/output/trap/import1.js.trap b/javascript/extractor/tests/es2015/output/trap/import1.js.trap
index 6b8ebd76c73..db825ea3602 100644
--- a/javascript/extractor/tests/es2015/output/trap/import1.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import1.js.trap
@@ -65,7 +65,7 @@ local_namespace_names(#20019,"x",#20016)
 #20020=*
 stmts(#20020,27,#20001,0,"import x from 'foo';")
 hasLocation(#20020,#20003)
-stmtContainers(#20020,#20001)
+stmt_containers(#20020,#20001)
 #20021=*
 exprs(#20021,4,#20020,-1,"'foo'")
 hasLocation(#20021,#20011)
diff --git a/javascript/extractor/tests/es2015/output/trap/import2.js.trap b/javascript/extractor/tests/es2015/output/trap/import2.js.trap
index ab5e80801ac..0954cd45acd 100644
--- a/javascript/extractor/tests/es2015/output/trap/import2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import2.js.trap
@@ -75,7 +75,7 @@ local_namespace_names(#20023,"y",#20020)
 #20024=*
 stmts(#20024,27,#20001,0,"import  ...  'foo';")
 hasLocation(#20024,#20003)
-stmtContainers(#20024,#20001)
+stmt_containers(#20024,#20001)
 #20025=*
 exprs(#20025,4,#20024,-1,"'foo'")
 hasLocation(#20025,#20015)
diff --git a/javascript/extractor/tests/es2015/output/trap/import3.js.trap b/javascript/extractor/tests/es2015/output/trap/import3.js.trap
index 0d95e7ce0e9..e0e94edbab7 100644
--- a/javascript/extractor/tests/es2015/output/trap/import3.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import3.js.trap
@@ -85,7 +85,7 @@ local_namespace_names(#20027,"z",#20024)
 #20028=*
 stmts(#20028,27,#20001,0,"import  ...  'foo';")
 hasLocation(#20028,#20003)
-stmtContainers(#20028,#20001)
+stmt_containers(#20028,#20001)
 #20029=*
 exprs(#20029,4,#20028,-1,"'foo'")
 hasLocation(#20029,#20019)
diff --git a/javascript/extractor/tests/es2015/output/trap/import4.js.trap b/javascript/extractor/tests/es2015/output/trap/import4.js.trap
index 0d351d6707e..e3e1ef06aa8 100644
--- a/javascript/extractor/tests/es2015/output/trap/import4.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import4.js.trap
@@ -104,7 +104,7 @@ local_namespace_names(#20034,"z",#20028)
 #20035=*
 stmts(#20035,27,#20001,0,"import  ...  'foo';")
 hasLocation(#20035,#20003)
-stmtContainers(#20035,#20001)
+stmt_containers(#20035,#20001)
 #20036=*
 exprs(#20036,4,#20035,-1,"'foo'")
 hasLocation(#20036,#20023)
diff --git a/javascript/extractor/tests/es2015/output/trap/import5.js.trap b/javascript/extractor/tests/es2015/output/trap/import5.js.trap
index 6f1bceb1c08..6667cdca9d1 100644
--- a/javascript/extractor/tests/es2015/output/trap/import5.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import5.js.trap
@@ -75,7 +75,7 @@ local_namespace_names(#20023,"foo",#20020)
 #20024=*
 stmts(#20024,27,#20001,0,"import  ...  'foo';")
 hasLocation(#20024,#20003)
-stmtContainers(#20024,#20001)
+stmt_containers(#20024,#20001)
 #20025=*
 exprs(#20025,4,#20024,-1,"'foo'")
 hasLocation(#20025,#20015)
diff --git a/javascript/extractor/tests/es2015/output/trap/import6.js.trap b/javascript/extractor/tests/es2015/output/trap/import6.js.trap
index c71d30b5bea..67bc044387a 100644
--- a/javascript/extractor/tests/es2015/output/trap/import6.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import6.js.trap
@@ -46,7 +46,7 @@ is_es2015_module(#20001)
 #20013=*
 stmts(#20013,27,#20001,0,"import 'foo';")
 hasLocation(#20013,#20003)
-stmtContainers(#20013,#20001)
+stmt_containers(#20013,#20001)
 #20014=*
 exprs(#20014,4,#20013,-1,"'foo'")
 hasLocation(#20014,#20007)
diff --git a/javascript/extractor/tests/es2015/output/trap/import7.js.trap b/javascript/extractor/tests/es2015/output/trap/import7.js.trap
index 1055fb8c798..5b0fc36358a 100644
--- a/javascript/extractor/tests/es2015/output/trap/import7.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import7.js.trap
@@ -148,7 +148,7 @@ local_namespace_names(#20051,"z",#20045)
 #20052=*
 stmts(#20052,27,#20001,0,"import x from 'foo';")
 hasLocation(#20052,#20003)
-stmtContainers(#20052,#20001)
+stmt_containers(#20052,#20001)
 #20053=*
 exprs(#20053,4,#20052,-1,"'foo'")
 hasLocation(#20053,#20015)
@@ -178,7 +178,7 @@ namespacedecl(#20057,#20050)
 #20058=*
 stmts(#20058,27,#20001,1,"import 'bar';")
 hasLocation(#20058,#20005)
-stmtContainers(#20058,#20001)
+stmt_containers(#20058,#20001)
 #20059=*
 exprs(#20059,4,#20058,-1,"'bar'")
 hasLocation(#20059,#20021)
@@ -194,7 +194,7 @@ regexpConstValue(#20060,"bar")
 #20062=*
 stmts(#20062,27,#20001,2,"import  ...  'baz';")
 hasLocation(#20062,#20007)
-stmtContainers(#20062,#20001)
+stmt_containers(#20062,#20001)
 #20063=*
 exprs(#20063,4,#20062,-1,"'baz'")
 hasLocation(#20063,#20039)
diff --git a/javascript/extractor/tests/es2015/output/trap/let.js.trap b/javascript/extractor/tests/es2015/output/trap/let.js.trap
index 24e5491d9b8..44071093768 100644
--- a/javascript/extractor/tests/es2015/output/trap/let.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/let.js.trap
@@ -374,7 +374,7 @@ hasLocation(#20001,#20136)
 #20137=*
 stmts(#20137,1,#20001,0,"{\n    l ...     }\n}")
 hasLocation(#20137,#20136)
-stmtContainers(#20137,#20001)
+stmt_containers(#20137,#20001)
 #20138=*
 scopes(#20138,4)
 scopenodes(#20137,#20138)
@@ -386,7 +386,7 @@ stmts(#20140,23,#20137,0,"let x = 23;")
 #20141=@"loc,{#10000},2,5,2,15"
 locations_default(#20141,#10000,2,5,2,15)
 hasLocation(#20140,#20141)
-stmtContainers(#20140,#20001)
+stmt_containers(#20140,#20001)
 #20142=*
 exprs(#20142,64,#20140,0,"x = 23")
 #20143=@"loc,{#10000},2,9,2,14"
@@ -412,7 +412,7 @@ stmts(#20146,1,#20137,1,"{\n      ... ;\n    }")
 #20147=@"loc,{#10000},3,5,11,5"
 locations_default(#20147,#10000,3,5,11,5)
 hasLocation(#20146,#20147)
-stmtContainers(#20146,#20001)
+stmt_containers(#20146,#20001)
 #20148=*
 scopes(#20148,4)
 scopenodes(#20146,#20148)
@@ -424,7 +424,7 @@ stmts(#20150,23,#20146,0,"let x = 42;")
 #20151=@"loc,{#10000},4,9,4,19"
 locations_default(#20151,#10000,4,9,4,19)
 hasLocation(#20150,#20151)
-stmtContainers(#20150,#20001)
+stmt_containers(#20150,#20001)
 #20152=*
 exprs(#20152,64,#20150,0,"x = 42")
 #20153=@"loc,{#10000},4,13,4,18"
@@ -450,7 +450,7 @@ stmts(#20156,14,#20146,1,"for (le ...       }")
 #20157=@"loc,{#10000},5,9,8,9"
 locations_default(#20157,#10000,5,9,8,9)
 hasLocation(#20156,#20157)
-stmtContainers(#20156,#20001)
+stmt_containers(#20156,#20001)
 #20158=*
 scopes(#20158,5)
 scopenodes(#20156,#20158)
@@ -482,7 +482,7 @@ stmts(#20164,23,#20156,0,"let x = x-19")
 #20165=@"loc,{#10000},5,14,5,25"
 locations_default(#20165,#10000,5,14,5,25)
 hasLocation(#20164,#20165)
-stmtContainers(#20164,#20001)
+stmt_containers(#20164,#20001)
 #20166=*
 exprs(#20166,64,#20164,0,"x = x-19")
 #20167=@"loc,{#10000},5,18,5,25"
@@ -522,7 +522,7 @@ stmts(#20173,1,#20156,3,"{\n      ...       }")
 #20174=@"loc,{#10000},5,35,8,9"
 locations_default(#20174,#10000,5,35,8,9)
 hasLocation(#20173,#20174)
-stmtContainers(#20173,#20001)
+stmt_containers(#20173,#20001)
 #20175=*
 scopes(#20175,4)
 scopenodes(#20173,#20175)
@@ -534,7 +534,7 @@ stmts(#20177,23,#20173,0,"let x = 56;")
 #20178=@"loc,{#10000},6,13,6,23"
 locations_default(#20178,#10000,6,13,6,23)
 hasLocation(#20177,#20178)
-stmtContainers(#20177,#20001)
+stmt_containers(#20177,#20001)
 #20179=*
 exprs(#20179,64,#20177,0,"x = 56")
 #20180=@"loc,{#10000},6,17,6,22"
@@ -560,7 +560,7 @@ stmts(#20183,2,#20173,1,"console.log(x);")
 #20184=@"loc,{#10000},7,13,7,27"
 locations_default(#20184,#10000,7,13,7,27)
 hasLocation(#20183,#20184)
-stmtContainers(#20183,#20001)
+stmt_containers(#20183,#20001)
 #20185=*
 exprs(#20185,13,#20183,0,"console.log(x)")
 #20186=@"loc,{#10000},7,13,7,26"
@@ -602,7 +602,7 @@ stmts(#20193,15,#20146,2,"for (le ...      x;")
 #20194=@"loc,{#10000},9,9,10,14"
 locations_default(#20194,#10000,9,9,10,14)
 hasLocation(#20193,#20194)
-stmtContainers(#20193,#20001)
+stmt_containers(#20193,#20001)
 #20195=*
 exprs(#20195,8,#20193,1,"{ x: x }")
 #20196=@"loc,{#10000},9,23,9,30"
@@ -639,7 +639,7 @@ stmts(#20203,23,#20193,0,"let x")
 #20204=@"loc,{#10000},9,14,9,18"
 locations_default(#20204,#10000,9,14,9,18)
 hasLocation(#20203,#20204)
-stmtContainers(#20203,#20001)
+stmt_containers(#20203,#20001)
 #20205=*
 exprs(#20205,64,#20203,0,"x")
 hasLocation(#20205,#20112)
@@ -657,7 +657,7 @@ stmts(#20207,2,#20193,2,"x;")
 #20208=@"loc,{#10000},10,13,10,14"
 locations_default(#20208,#10000,10,13,10,14)
 hasLocation(#20207,#20208)
-stmtContainers(#20207,#20001)
+stmt_containers(#20207,#20001)
 #20209=*
 exprs(#20209,79,#20207,0,"x")
 hasLocation(#20209,#20128)
diff --git a/javascript/extractor/tests/es2015/output/trap/let2.js.trap b/javascript/extractor/tests/es2015/output/trap/let2.js.trap
index fbee8af2336..2fd48bc1613 100644
--- a/javascript/extractor/tests/es2015/output/trap/let2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/let2.js.trap
@@ -61,7 +61,7 @@ variables(#20019,"x",#20000)
 #20020=*
 stmts(#20020,23,#20001,0,"let /* **/ x = 42;")
 hasLocation(#20020,#20005)
-stmtContainers(#20020,#20001)
+stmt_containers(#20020,#20001)
 #20021=*
 exprs(#20021,64,#20020,0,"x = 42")
 #20022=@"loc,{#10000},1,12,1,17"
diff --git a/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap b/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
index df051bfb145..87c7bffe67e 100644
--- a/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
@@ -198,7 +198,7 @@ local_namespace_names(#20069,"x",#20064)
 #20071=*
 stmts(#20071,27,#20001,0,"import  ... om 'm';")
 hasLocation(#20071,#20003)
-stmtContainers(#20071,#20001)
+stmt_containers(#20071,#20001)
 #20072=*
 exprs(#20072,4,#20071,-1,"'m'")
 hasLocation(#20072,#20023)
@@ -236,7 +236,7 @@ stmts(#20078,3,#20001,1,"if (!x) ...  = y;\n}")
 #20079=@"loc,{#10000},2,1,5,1"
 locations_default(#20079,#10000,2,1,5,1)
 hasLocation(#20078,#20079)
-stmtContainers(#20078,#20001)
+stmt_containers(#20078,#20001)
 #20080=*
 exprs(#20080,18,#20078,0,"!x")
 #20081=@"loc,{#10000},2,5,2,6"
@@ -256,7 +256,7 @@ stmts(#20083,1,#20078,1,"{\n  imp ...  = y;\n}")
 #20084=@"loc,{#10000},2,9,5,1"
 locations_default(#20084,#10000,2,9,5,1)
 hasLocation(#20083,#20084)
-stmtContainers(#20083,#20001)
+stmt_containers(#20083,#20001)
 #20085=*
 scopes(#20085,4)
 scopenodes(#20083,#20085)
@@ -272,7 +272,7 @@ stmts(#20089,27,#20083,0,"import  ... om 'm';")
 #20090=@"loc,{#10000},3,3,3,24"
 locations_default(#20090,#10000,3,3,3,24)
 hasLocation(#20089,#20090)
-stmtContainers(#20089,#20001)
+stmt_containers(#20089,#20001)
 #20091=*
 exprs(#20091,4,#20089,-1,"'m'")
 hasLocation(#20091,#20049)
@@ -310,7 +310,7 @@ stmts(#20097,2,#20083,1,"x = y;")
 #20098=@"loc,{#10000},4,3,4,8"
 locations_default(#20098,#10000,4,3,4,8)
 hasLocation(#20097,#20098)
-stmtContainers(#20097,#20001)
+stmt_containers(#20097,#20001)
 #20099=*
 exprs(#20099,47,#20097,0,"x = y")
 #20100=@"loc,{#10000},4,3,4,7"
diff --git a/javascript/extractor/tests/es2015/output/trap/new_target.js.trap b/javascript/extractor/tests/es2015/output/trap/new_target.js.trap
index be30fe58298..8d941f5a240 100644
--- a/javascript/extractor/tests/es2015/output/trap/new_target.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/new_target.js.trap
@@ -105,7 +105,7 @@ variables(#20036,"f",#20000)
 #20037=*
 stmts(#20037,17,#20001,0,"functio ... rget;\n}")
 hasLocation(#20037,#20035)
-stmtContainers(#20037,#20001)
+stmt_containers(#20037,#20001)
 #20038=*
 exprs(#20038,78,#20037,-1,"f")
 hasLocation(#20038,#20011)
@@ -124,13 +124,13 @@ stmts(#20041,1,#20037,-2,"{\n  ret ... rget;\n}")
 #20042=@"loc,{#10000},1,14,3,1"
 locations_default(#20042,#10000,1,14,3,1)
 hasLocation(#20041,#20042)
-stmtContainers(#20041,#20037)
+stmt_containers(#20041,#20037)
 #20043=*
 stmts(#20043,9,#20041,0,"return !!new.target;")
 #20044=@"loc,{#10000},2,3,2,22"
 locations_default(#20044,#10000,2,3,2,22)
 hasLocation(#20043,#20044)
-stmtContainers(#20043,#20037)
+stmt_containers(#20043,#20037)
 #20045=*
 exprs(#20045,18,#20043,0,"!!new.target")
 #20046=@"loc,{#10000},2,10,2,21"
diff --git a/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap b/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap
index 2ccaa644c0e..30fc91120c2 100644
--- a/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap
@@ -43,7 +43,7 @@ hasLocation(#20001,#20012)
 #20013=*
 stmts(#20013,2,#20001,0,"``")
 hasLocation(#20013,#20003)
-stmtContainers(#20013,#20001)
+stmt_containers(#20013,#20001)
 #20014=*
 exprs(#20014,71,#20013,0,"``")
 hasLocation(#20014,#20003)
diff --git a/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap b/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap
index c66a150e5ad..bdf4978dd56 100644
--- a/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap
@@ -110,7 +110,7 @@ stmts(#20038,26,#20001,0,"class C ... ) { }\n}")
 #20039=@"loc,{#10000},1,1,3,1"
 locations_default(#20039,#10000,1,1,3,1)
 hasLocation(#20038,#20039)
-stmtContainers(#20038,#20001)
+stmt_containers(#20038,#20001)
 #20040=*
 exprs(#20040,78,#20038,0,"C")
 hasLocation(#20040,#20011)
@@ -161,7 +161,7 @@ stmts(#20051,1,#20045,-2,"{ }")
 #20052=@"loc,{#10000},2,17,2,19"
 locations_default(#20052,#10000,2,17,2,19)
 hasLocation(#20051,#20052)
-stmtContainers(#20051,#20045)
+stmt_containers(#20051,#20045)
 isMethod(#20042)
 isComputed(#20042)
 #20053=*
@@ -190,7 +190,7 @@ isArgumentsObject(#20058)
 #20059=*
 stmts(#20059,1,#20056,-2,"{}")
 hasLocation(#20059,#20054)
-stmtContainers(#20059,#20056)
+stmt_containers(#20059,#20056)
 isMethod(#20053)
 #20060=*
 entry_cfg_node(#20060,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap b/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap
index 85cf5204d77..ca9b191d6d1 100644
--- a/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap
@@ -112,7 +112,7 @@ variables(#20038,"test",#20000)
 #20039=*
 stmts(#20039,17,#20001,0,"functio ... nts);\n}")
 hasLocation(#20039,#20037)
-stmtContainers(#20039,#20001)
+stmt_containers(#20039,#20001)
 #20040=*
 exprs(#20040,78,#20039,-1,"test")
 hasLocation(#20040,#20013)
@@ -131,13 +131,13 @@ stmts(#20043,1,#20039,-2,"{\n    a ... nts);\n}")
 #20044=@"loc,{#10000},1,17,4,1"
 locations_default(#20044,#10000,1,17,4,1)
 hasLocation(#20043,#20044)
-stmtContainers(#20043,#20039)
+stmt_containers(#20043,#20039)
 #20045=*
 stmts(#20045,2,#20043,0,"arguments;")
 #20046=@"loc,{#10000},2,5,2,14"
 locations_default(#20046,#10000,2,5,2,14)
 hasLocation(#20045,#20046)
-stmtContainers(#20045,#20039)
+stmt_containers(#20045,#20039)
 #20047=*
 exprs(#20047,79,#20045,0,"arguments")
 hasLocation(#20047,#20021)
@@ -150,7 +150,7 @@ stmts(#20048,2,#20043,1,"let (arguments);")
 #20049=@"loc,{#10000},3,5,3,20"
 locations_default(#20049,#10000,3,5,3,20)
 hasLocation(#20048,#20049)
-stmtContainers(#20048,#20039)
+stmt_containers(#20048,#20039)
 #20050=*
 exprs(#20050,13,#20048,0,"let (arguments)")
 #20051=@"loc,{#10000},3,5,3,19"
diff --git a/javascript/extractor/tests/es2015/output/trap/properties.js.trap b/javascript/extractor/tests/es2015/output/trap/properties.js.trap
index df7b652a9d5..3ddc3a8001e 100644
--- a/javascript/extractor/tests/es2015/output/trap/properties.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/properties.js.trap
@@ -226,7 +226,7 @@ variables(#20082,"o",#20000)
 #20083=*
 stmts(#20083,18,#20001,0,"var x = ... \n    };")
 hasLocation(#20083,#20080)
-stmtContainers(#20083,#20001)
+stmt_containers(#20083,#20001)
 #20084=*
 exprs(#20084,64,#20083,0,"x = 42")
 #20085=@"loc,{#10000},1,5,1,10"
@@ -374,13 +374,13 @@ stmts(#20118,1,#20114,-2,"{ return 56; }")
 #20119=@"loc,{#10000},5,13,5,26"
 locations_default(#20119,#10000,5,13,5,26)
 hasLocation(#20118,#20119)
-stmtContainers(#20118,#20114)
+stmt_containers(#20118,#20114)
 #20120=*
 stmts(#20120,9,#20118,0,"return 56;")
 #20121=@"loc,{#10000},5,15,5,24"
 locations_default(#20121,#10000,5,15,5,24)
 hasLocation(#20120,#20121)
-stmtContainers(#20120,#20114)
+stmt_containers(#20120,#20114)
 #20122=*
 exprs(#20122,3,#20120,0,"56")
 hasLocation(#20122,#20069)
diff --git a/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap b/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
index f8911274a6d..a7a8f28ab71 100644
--- a/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
@@ -75,7 +75,7 @@ hasLocation(#20001,#20003)
 #20026=*
 stmts(#20026,2,#20001,0,"({x = 1}) => x;")
 hasLocation(#20026,#20003)
-stmtContainers(#20026,#20001)
+stmt_containers(#20026,#20001)
 #20027=*
 exprs(#20027,65,#20026,0,"({x = 1}) => x")
 #20028=@"loc,{#10000},1,1,1,14"
diff --git a/javascript/extractor/tests/es2015/output/trap/restparms.js.trap b/javascript/extractor/tests/es2015/output/trap/restparms.js.trap
index 8f60250eed9..728c058d600 100644
--- a/javascript/extractor/tests/es2015/output/trap/restparms.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/restparms.js.trap
@@ -83,7 +83,7 @@ variables(#20028,"f",#20000)
 #20029=*
 stmts(#20029,17,#20001,0,"functio ... ys) {\n}")
 hasLocation(#20029,#20027)
-stmtContainers(#20029,#20001)
+stmt_containers(#20029,#20001)
 #20030=*
 exprs(#20030,78,#20029,-1,"f")
 hasLocation(#20030,#20009)
@@ -119,7 +119,7 @@ stmts(#20037,1,#20029,-2,"{\n}")
 #20038=@"loc,{#10000},1,22,2,1"
 locations_default(#20038,#10000,1,22,2,1)
 hasLocation(#20037,#20038)
-stmtContainers(#20037,#20029)
+stmt_containers(#20037,#20029)
 #20039=*
 entry_cfg_node(#20039,#20001)
 #20040=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap b/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap
index 5f77944aae7..d45dfe28ddd 100644
--- a/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap
@@ -103,7 +103,7 @@ hasLocation(#20001,#20036)
 #20037=*
 stmts(#20037,2,#20001,0,"[a, ...as];")
 hasLocation(#20037,#20003)
-stmtContainers(#20037,#20001)
+stmt_containers(#20037,#20001)
 #20038=*
 exprs(#20038,7,#20037,0,"[a, ...as]")
 #20039=@"loc,{#10000},1,1,1,10"
@@ -140,7 +140,7 @@ arraySize(#20038,2)
 #20046=*
 stmts(#20046,2,#20001,1,"new Array(...elts);")
 hasLocation(#20046,#20005)
-stmtContainers(#20046,#20001)
+stmt_containers(#20046,#20001)
 #20047=*
 exprs(#20047,12,#20046,0,"new Array(...elts)")
 #20048=@"loc,{#10000},2,1,2,18"
diff --git a/javascript/extractor/tests/es2015/output/trap/super_call.js.trap b/javascript/extractor/tests/es2015/output/trap/super_call.js.trap
index e754a835435..37e817698a9 100644
--- a/javascript/extractor/tests/es2015/output/trap/super_call.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/super_call.js.trap
@@ -156,7 +156,7 @@ local_type_names(#20055,"A",#20000)
 #20056=*
 stmts(#20056,26,#20001,0,"class A ... ;\n  }\n}")
 hasLocation(#20056,#20053)
-stmtContainers(#20056,#20001)
+stmt_containers(#20056,#20001)
 #20057=*
 exprs(#20057,78,#20056,0,"A")
 hasLocation(#20057,#20015)
@@ -208,13 +208,13 @@ stmts(#20068,1,#20064,-2,"{\n    r ... 19;\n  }")
 #20069=@"loc,{#10000},2,7,4,3"
 locations_default(#20069,#10000,2,7,4,3)
 hasLocation(#20068,#20069)
-stmtContainers(#20068,#20064)
+stmt_containers(#20068,#20064)
 #20070=*
 stmts(#20070,9,#20068,0,"return  ... ) + 19;")
 #20071=@"loc,{#10000},3,5,3,26"
 locations_default(#20071,#10000,3,5,3,26)
 hasLocation(#20070,#20071)
-stmtContainers(#20070,#20064)
+stmt_containers(#20070,#20064)
 #20072=*
 exprs(#20072,34,#20070,0,"super.m() + 19")
 #20073=@"loc,{#10000},3,12,3,25"
@@ -289,11 +289,11 @@ hasRestParameter(#20084)
 #20089=*
 stmts(#20089,1,#20084,-2,"{ super(...args); }")
 hasLocation(#20089,#20082)
-stmtContainers(#20089,#20084)
+stmt_containers(#20089,#20084)
 #20090=*
 stmts(#20090,2,#20089,0,"super(...args);")
 hasLocation(#20090,#20082)
-stmtContainers(#20090,#20084)
+stmt_containers(#20090,#20084)
 #20091=*
 exprs(#20091,13,#20090,0,"super(...args)")
 hasLocation(#20091,#20082)
diff --git a/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap b/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap
index 771ed5ab864..f55b3b016c0 100644
--- a/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap
@@ -136,7 +136,7 @@ local_type_names(#20047,"A",#20000)
 #20048=*
 stmts(#20048,26,#20001,0,"class A ... ;\n  }\n}")
 hasLocation(#20048,#20045)
-stmtContainers(#20048,#20001)
+stmt_containers(#20048,#20001)
 #20049=*
 exprs(#20049,78,#20048,0,"A")
 hasLocation(#20049,#20015)
@@ -188,13 +188,13 @@ stmts(#20060,1,#20056,-2,"{\n    super(42);\n  }")
 #20061=@"loc,{#10000},2,17,4,3"
 locations_default(#20061,#10000,2,17,4,3)
 hasLocation(#20060,#20061)
-stmtContainers(#20060,#20056)
+stmt_containers(#20060,#20056)
 #20062=*
 stmts(#20062,2,#20060,0,"super(42);")
 #20063=@"loc,{#10000},3,5,3,14"
 locations_default(#20063,#10000,3,5,3,14)
 hasLocation(#20062,#20063)
-stmtContainers(#20062,#20056)
+stmt_containers(#20062,#20056)
 #20064=*
 exprs(#20064,13,#20062,0,"super(42)")
 #20065=@"loc,{#10000},3,5,3,13"
diff --git a/javascript/extractor/tests/es2015/output/trap/templates.js.trap b/javascript/extractor/tests/es2015/output/trap/templates.js.trap
index e35a129a9dc..2636b98843e 100644
--- a/javascript/extractor/tests/es2015/output/trap/templates.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/templates.js.trap
@@ -411,7 +411,7 @@ stmts(#20157,17,#20001,0,"functio ... , ');\n}")
 #20158=@"loc,{#10000},1,1,3,1"
 locations_default(#20158,#10000,1,1,3,1)
 hasLocation(#20157,#20158)
-stmtContainers(#20157,#20001)
+stmt_containers(#20157,#20001)
 #20159=*
 exprs(#20159,78,#20157,-1,"tag")
 hasLocation(#20159,#20021)
@@ -447,13 +447,13 @@ stmts(#20166,1,#20157,-2,"{\n  ret ... , ');\n}")
 #20167=@"loc,{#10000},1,34,3,1"
 locations_default(#20167,#10000,1,34,3,1)
 hasLocation(#20166,#20167)
-stmtContainers(#20166,#20157)
+stmt_containers(#20166,#20157)
 #20168=*
 stmts(#20168,9,#20166,0,"return  ... (', ');")
 #20169=@"loc,{#10000},2,3,2,40"
 locations_default(#20169,#10000,2,3,2,40)
 hasLocation(#20168,#20169)
-stmtContainers(#20168,#20157)
+stmt_containers(#20168,#20157)
 #20170=*
 exprs(#20170,34,#20168,0,"""values ... n(', ')")
 #20171=@"loc,{#10000},2,10,2,39"
@@ -515,7 +515,7 @@ regexpConstValue(#20182,", ")
 #20184=*
 stmts(#20184,18,#20001,1,"var x = 23;")
 hasLocation(#20184,#20011)
-stmtContainers(#20184,#20001)
+stmt_containers(#20184,#20001)
 #20185=*
 exprs(#20185,64,#20184,0,"x = 23")
 #20186=@"loc,{#10000},5,5,5,10"
@@ -539,7 +539,7 @@ literals("23","23",#20188)
 #20189=*
 stmts(#20189,18,#20001,2,"var y = 19;")
 hasLocation(#20189,#20013)
-stmtContainers(#20189,#20001)
+stmt_containers(#20189,#20001)
 #20190=*
 exprs(#20190,64,#20189,0,"y = 19")
 #20191=@"loc,{#10000},6,5,6,10"
@@ -563,7 +563,7 @@ literals("19","19",#20193)
 #20194=*
 stmts(#20194,2,#20001,3,"`${x} + ...  + y}`;")
 hasLocation(#20194,#20015)
-stmtContainers(#20194,#20001)
+stmt_containers(#20194,#20001)
 #20195=*
 exprs(#20195,71,#20194,0,"`${x} + ... x + y}`")
 #20196=@"loc,{#10000},7,1,7,24"
@@ -621,7 +621,7 @@ bind(#20204,#20156)
 #20205=*
 stmts(#20205,2,#20001,4,"tag `${ ...  + y}`;")
 hasLocation(#20205,#20017)
-stmtContainers(#20205,#20001)
+stmt_containers(#20205,#20001)
 #20206=*
 exprs(#20206,70,#20205,0,"tag `${ ... x + y}`")
 #20207=@"loc,{#10000},8,1,8,28"
diff --git a/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap b/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap
index 17e66585923..245725a6448 100644
--- a/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap
@@ -90,7 +90,7 @@ variables(#20030,"g",#20000)
 #20031=*
 stmts(#20031,17,#20001,0,"functio ... urce;\n}")
 hasLocation(#20031,#20029)
-stmtContainers(#20031,#20001)
+stmt_containers(#20031,#20001)
 #20032=*
 exprs(#20032,78,#20031,-1,"g")
 hasLocation(#20032,#20011)
@@ -109,13 +109,13 @@ stmts(#20035,1,#20031,-2,"{\n  new.source;\n}")
 #20036=@"loc,{#10000},1,14,3,1"
 locations_default(#20036,#10000,1,14,3,1)
 hasLocation(#20035,#20036)
-stmtContainers(#20035,#20031)
+stmt_containers(#20035,#20031)
 #20037=*
 stmts(#20037,2,#20035,0,"new.source;")
 #20038=@"loc,{#10000},2,3,2,13"
 locations_default(#20038,#10000,2,3,2,13)
 hasLocation(#20037,#20038)
-stmtContainers(#20037,#20031)
+stmt_containers(#20037,#20031)
 #20039=*
 exprs(#20039,82,#20037,0,"new.source")
 #20040=@"loc,{#10000},2,3,2,12"
diff --git a/javascript/extractor/tests/es2015/output/trap/yield.js.trap b/javascript/extractor/tests/es2015/output/trap/yield.js.trap
index aae98b87b16..3f3d124f4fc 100644
--- a/javascript/extractor/tests/es2015/output/trap/yield.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/yield.js.trap
@@ -170,7 +170,7 @@ variables(#20060,"foo",#20000)
 #20061=*
 stmts(#20061,17,#20001,0,"functio ... ex++;\n}")
 hasLocation(#20061,#20059)
-stmtContainers(#20061,#20001)
+stmt_containers(#20061,#20001)
 #20062=*
 exprs(#20062,78,#20061,-1,"foo")
 hasLocation(#20062,#20019)
@@ -192,13 +192,13 @@ stmts(#20066,1,#20061,-2,"{\n  var ... ex++;\n}")
 #20067=@"loc,{#10000},1,16,5,1"
 locations_default(#20067,#10000,1,16,5,1)
 hasLocation(#20066,#20067)
-stmtContainers(#20066,#20061)
+stmt_containers(#20066,#20061)
 #20068=*
 stmts(#20068,18,#20066,0,"var index = 0;")
 #20069=@"loc,{#10000},2,3,2,16"
 locations_default(#20069,#10000,2,3,2,16)
 hasLocation(#20068,#20069)
-stmtContainers(#20068,#20061)
+stmt_containers(#20068,#20061)
 #20070=*
 exprs(#20070,64,#20068,0,"index = 0")
 #20071=@"loc,{#10000},2,7,2,15"
@@ -224,7 +224,7 @@ stmts(#20074,12,#20066,1,"while(i ... ndex++;")
 #20075=@"loc,{#10000},3,3,4,18"
 locations_default(#20075,#10000,3,3,4,18)
 hasLocation(#20074,#20075)
-stmtContainers(#20074,#20061)
+stmt_containers(#20074,#20061)
 #20076=*
 exprs(#20076,28,#20074,0,"index <= 2")
 #20077=@"loc,{#10000},3,9,3,18"
@@ -250,7 +250,7 @@ stmts(#20080,2,#20074,1,"yield index++;")
 #20081=@"loc,{#10000},4,5,4,18"
 locations_default(#20081,#10000,4,5,4,18)
 hasLocation(#20080,#20081)
-stmtContainers(#20080,#20061)
+stmt_containers(#20080,#20061)
 #20082=*
 exprs(#20082,69,#20080,0,"yield index++")
 #20083=@"loc,{#10000},4,5,4,17"
diff --git a/javascript/extractor/tests/es2015/output/trap/yield2.js.trap b/javascript/extractor/tests/es2015/output/trap/yield2.js.trap
index 6d7cf1932ae..4f01dc62b1e 100644
--- a/javascript/extractor/tests/es2015/output/trap/yield2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/yield2.js.trap
@@ -88,7 +88,7 @@ stmts(#20029,17,#20001,0,"functio ... ield;\n}")
 #20030=@"loc,{#10000},1,1,3,1"
 locations_default(#20030,#10000,1,1,3,1)
 hasLocation(#20029,#20030)
-stmtContainers(#20029,#20001)
+stmt_containers(#20029,#20001)
 #20031=*
 exprs(#20031,78,#20029,-1,"f")
 hasLocation(#20031,#20013)
@@ -108,13 +108,13 @@ stmts(#20034,1,#20029,-2,"{\n    yield;\n}")
 #20035=@"loc,{#10000},1,15,3,1"
 locations_default(#20035,#10000,1,15,3,1)
 hasLocation(#20034,#20035)
-stmtContainers(#20034,#20029)
+stmt_containers(#20034,#20029)
 #20036=*
 stmts(#20036,2,#20034,0,"yield;")
 #20037=@"loc,{#10000},2,5,2,10"
 locations_default(#20037,#10000,2,5,2,10)
 hasLocation(#20036,#20037)
-stmtContainers(#20036,#20029)
+stmt_containers(#20036,#20029)
 #20038=*
 exprs(#20038,69,#20036,0,"yield")
 hasLocation(#20038,#20021)
diff --git a/javascript/extractor/tests/es2016/output/trap/exp.js.trap b/javascript/extractor/tests/es2016/output/trap/exp.js.trap
index 4b6a420648d..885815219bf 100644
--- a/javascript/extractor/tests/es2016/output/trap/exp.js.trap
+++ b/javascript/extractor/tests/es2016/output/trap/exp.js.trap
@@ -63,7 +63,7 @@ hasLocation(#20001,#20020)
 #20021=*
 stmts(#20021,2,#20001,0,"1**0")
 hasLocation(#20021,#20003)
-stmtContainers(#20021,#20001)
+stmt_containers(#20021,#20001)
 #20022=*
 exprs(#20022,87,#20021,0,"1**0")
 hasLocation(#20022,#20003)
@@ -84,7 +84,7 @@ literals("0","0",#20024)
 #20025=*
 stmts(#20025,2,#20001,1,"x**=2")
 hasLocation(#20025,#20005)
-stmtContainers(#20025,#20001)
+stmt_containers(#20025,#20001)
 #20026=*
 exprs(#20026,88,#20025,0,"x**=2")
 hasLocation(#20026,#20005)
diff --git a/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap b/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
index c2709d0963f..6baf32985f0 100644
--- a/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
+++ b/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
@@ -82,7 +82,7 @@ variables(#20028,"f",#20000)
 #20029=*
 stmts(#20029,17,#20001,0,"functio ... ict'; }")
 hasLocation(#20029,#20003)
-stmtContainers(#20029,#20001)
+stmt_containers(#20029,#20001)
 #20030=*
 exprs(#20030,78,#20029,-1,"f")
 hasLocation(#20030,#20007)
@@ -114,13 +114,13 @@ stmts(#20036,1,#20029,-2,"{ 'use strict'; }")
 #20037=@"loc,{#10000},1,17,1,33"
 locations_default(#20037,#10000,1,17,1,33)
 hasLocation(#20036,#20037)
-stmtContainers(#20036,#20029)
+stmt_containers(#20036,#20029)
 #20038=*
 stmts(#20038,2,#20036,0,"'use strict';")
 #20039=@"loc,{#10000},1,19,1,31"
 locations_default(#20039,#10000,1,19,1,31)
 hasLocation(#20038,#20039)
-stmtContainers(#20038,#20029)
+stmt_containers(#20038,#20029)
 #20040=*
 exprs(#20040,4,#20038,0,"'use strict'")
 hasLocation(#20040,#20021)
diff --git a/javascript/extractor/tests/es2017/output/trap/async-await.js.trap b/javascript/extractor/tests/es2017/output/trap/async-await.js.trap
index 6db3e30f7da..a85833a4ef3 100644
--- a/javascript/extractor/tests/es2017/output/trap/async-await.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/async-await.js.trap
@@ -204,13 +204,13 @@ stmts(#20071,30,#20001,0,"export  ... ;\n  }\n}")
 #20072=@"loc,{#10000},1,1,7,1"
 locations_default(#20072,#10000,1,1,7,1)
 hasLocation(#20071,#20072)
-stmtContainers(#20071,#20001)
+stmt_containers(#20071,#20001)
 #20073=*
 stmts(#20073,17,#20071,-1,"async f ... ;\n  }\n}")
 #20074=@"loc,{#10000},1,8,7,1"
 locations_default(#20074,#10000,1,8,7,1)
 hasLocation(#20073,#20074)
-stmtContainers(#20073,#20001)
+stmt_containers(#20073,#20001)
 #20075=*
 exprs(#20075,78,#20073,-1,"foo")
 hasLocation(#20075,#20023)
@@ -238,25 +238,25 @@ stmts(#20080,1,#20073,-2,"{\n  try ... ;\n  }\n}")
 #20081=@"loc,{#10000},1,30,7,1"
 locations_default(#20081,#10000,1,30,7,1)
 hasLocation(#20080,#20081)
-stmtContainers(#20080,#20073)
+stmt_containers(#20080,#20073)
 #20082=*
 stmts(#20082,11,#20080,0,"try {\n  ... ll;\n  }")
 #20083=@"loc,{#10000},2,3,6,3"
 locations_default(#20083,#10000,2,3,6,3)
 hasLocation(#20082,#20083)
-stmtContainers(#20082,#20073)
+stmt_containers(#20082,#20073)
 #20084=*
 stmts(#20084,1,#20082,0,"{\n    await x;\n  }")
 #20085=@"loc,{#10000},2,7,4,3"
 locations_default(#20085,#10000,2,7,4,3)
 hasLocation(#20084,#20085)
-stmtContainers(#20084,#20073)
+stmt_containers(#20084,#20073)
 #20086=*
 stmts(#20086,2,#20084,0,"await x;")
 #20087=@"loc,{#10000},3,5,3,12"
 locations_default(#20087,#10000,3,5,3,12)
 hasLocation(#20086,#20087)
-stmtContainers(#20086,#20073)
+stmt_containers(#20086,#20073)
 #20088=*
 exprs(#20088,92,#20086,0,"await x")
 #20089=@"loc,{#10000},3,5,3,11"
@@ -276,7 +276,7 @@ stmts(#20091,20,#20082,1,"catch ( ... ll;\n  }")
 #20092=@"loc,{#10000},4,5,6,3"
 locations_default(#20092,#10000,4,5,6,3)
 hasLocation(#20091,#20092)
-stmtContainers(#20091,#20073)
+stmt_containers(#20091,#20073)
 #20093=*
 scopes(#20093,2)
 scopenodes(#20091,#20093)
@@ -295,13 +295,13 @@ stmts(#20096,1,#20091,1,"{\n    r ... ll;\n  }")
 #20097=@"loc,{#10000},4,15,6,3"
 locations_default(#20097,#10000,4,15,6,3)
 hasLocation(#20096,#20097)
-stmtContainers(#20096,#20073)
+stmt_containers(#20096,#20073)
 #20098=*
 stmts(#20098,9,#20096,0,"return null;")
 #20099=@"loc,{#10000},5,5,5,16"
 locations_default(#20099,#10000,5,5,5,16)
 hasLocation(#20098,#20099)
-stmtContainers(#20098,#20073)
+stmt_containers(#20098,#20073)
 #20100=*
 exprs(#20100,1,#20098,0,"null")
 hasLocation(#20100,#20057)
@@ -311,7 +311,7 @@ literals("null","null",#20100)
 #20101=*
 stmts(#20101,0,#20001,1,";")
 hasLocation(#20101,#20065)
-stmtContainers(#20101,#20001)
+stmt_containers(#20101,#20001)
 #20102=*
 entry_cfg_node(#20102,#20001)
 #20103=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/es2017/output/trap/export-async-1.js.trap b/javascript/extractor/tests/es2017/output/trap/export-async-1.js.trap
index a9893062482..c402bee1ed2 100644
--- a/javascript/extractor/tests/es2017/output/trap/export-async-1.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/export-async-1.js.trap
@@ -88,13 +88,13 @@ stmts(#20029,29,#20001,0,"export  ...  f() {}")
 #20030=@"loc,{#10000},1,1,1,36"
 locations_default(#20030,#10000,1,1,1,36)
 hasLocation(#20029,#20030)
-stmtContainers(#20029,#20001)
+stmt_containers(#20029,#20001)
 #20031=*
 stmts(#20031,17,#20029,0,"async f ...  f() {}")
 #20032=@"loc,{#10000},1,16,1,36"
 locations_default(#20032,#10000,1,16,1,36)
 hasLocation(#20031,#20032)
-stmtContainers(#20031,#20001)
+stmt_containers(#20031,#20001)
 #20033=*
 exprs(#20033,78,#20031,-1,"f")
 hasLocation(#20033,#20013)
@@ -114,11 +114,11 @@ stmts(#20036,1,#20031,-2,"{}")
 #20037=@"loc,{#10000},1,35,1,36"
 locations_default(#20037,#10000,1,35,1,36)
 hasLocation(#20036,#20037)
-stmtContainers(#20036,#20031)
+stmt_containers(#20036,#20031)
 #20038=*
 stmts(#20038,0,#20001,1,";")
 hasLocation(#20038,#20023)
-stmtContainers(#20038,#20001)
+stmt_containers(#20038,#20001)
 #20039=*
 entry_cfg_node(#20039,#20001)
 #20040=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap b/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap
index 3ac28705ff7..a0350dbac2c 100644
--- a/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap
@@ -81,7 +81,7 @@ stmts(#20026,29,#20001,0,"export  ... n () {}")
 #20027=@"loc,{#10000},1,1,1,35"
 locations_default(#20027,#10000,1,1,1,35)
 hasLocation(#20026,#20027)
-stmtContainers(#20026,#20001)
+stmt_containers(#20026,#20001)
 #20028=*
 exprs(#20028,9,#20026,0,"async function () {}")
 #20029=@"loc,{#10000},1,16,1,35"
@@ -102,11 +102,11 @@ stmts(#20032,1,#20028,-2,"{}")
 #20033=@"loc,{#10000},1,34,1,35"
 locations_default(#20033,#10000,1,34,1,35)
 hasLocation(#20032,#20033)
-stmtContainers(#20032,#20028)
+stmt_containers(#20032,#20028)
 #20034=*
 stmts(#20034,0,#20001,1,";")
 hasLocation(#20034,#20021)
-stmtContainers(#20034,#20001)
+stmt_containers(#20034,#20001)
 #20035=*
 entry_cfg_node(#20035,#20001)
 #20036=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap b/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap
index 3287759506c..9cec3af2030 100644
--- a/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap
@@ -75,7 +75,7 @@ hasLocation(#20001,#20003)
 #20026=*
 stmts(#20026,2,#20001,0,"f = async ((x)) => x")
 hasLocation(#20026,#20003)
-stmtContainers(#20026,#20001)
+stmt_containers(#20026,#20001)
 #20027=*
 exprs(#20027,47,#20026,0,"f = async ((x)) => x")
 hasLocation(#20027,#20003)
diff --git a/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap b/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap
index 062544cfa75..7c4a17b6f94 100644
--- a/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap
@@ -58,7 +58,7 @@ hasLocation(#20001,#20018)
 #20019=*
 stmts(#20019,2,#20001,0,"({ async });")
 hasLocation(#20019,#20003)
-stmtContainers(#20019,#20001)
+stmt_containers(#20019,#20001)
 #20020=*
 exprs(#20020,63,#20019,0,"({ async })")
 #20021=@"loc,{#10000},1,1,1,11"
diff --git a/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap b/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap
index 542b9ed603c..a8bde3cff51 100644
--- a/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap
+++ b/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap
@@ -366,7 +366,7 @@ local_type_names(#20136,"C",#20000)
 #20137=*
 stmts(#20137,17,#20001,0,"async f ... Fn() {}")
 hasLocation(#20137,#20003)
-stmtContainers(#20137,#20001)
+stmt_containers(#20137,#20001)
 #20138=*
 exprs(#20138,78,#20137,-1,"asyncFn")
 hasLocation(#20138,#20031)
@@ -387,13 +387,13 @@ stmts(#20141,1,#20137,-2,"{}")
 #20142=@"loc,{#10000},1,27,1,28"
 locations_default(#20142,#10000,1,27,1,28)
 hasLocation(#20141,#20142)
-stmtContainers(#20141,#20137)
+stmt_containers(#20141,#20137)
 #20143=*
 stmts(#20143,26,#20001,1,"class C ... () {}\n}")
 #20144=@"loc,{#10000},3,1,6,1"
 locations_default(#20144,#10000,3,1,6,1)
 hasLocation(#20143,#20144)
-stmtContainers(#20143,#20001)
+stmt_containers(#20143,#20001)
 #20145=*
 exprs(#20145,78,#20143,0,"C")
 hasLocation(#20145,#20043)
@@ -438,7 +438,7 @@ stmts(#20154,1,#20150,-2,"{}")
 #20155=@"loc,{#10000},4,22,4,23"
 locations_default(#20155,#10000,4,22,4,23)
 hasLocation(#20154,#20155)
-stmtContainers(#20154,#20150)
+stmt_containers(#20154,#20150)
 isMethod(#20147)
 #20156=*
 properties(#20156,#20143,3,0,"async * ... r]() {}")
@@ -488,7 +488,7 @@ stmts(#20167,1,#20163,-2,"{}")
 #20168=@"loc,{#10000},5,35,5,36"
 locations_default(#20168,#10000,5,35,5,36)
 hasLocation(#20167,#20168)
-stmtContainers(#20167,#20163)
+stmt_containers(#20167,#20163)
 isMethod(#20156)
 isComputed(#20156)
 #20169=*
@@ -517,14 +517,14 @@ isArgumentsObject(#20174)
 #20175=*
 stmts(#20175,1,#20172,-2,"{}")
 hasLocation(#20175,#20170)
-stmtContainers(#20175,#20172)
+stmt_containers(#20175,#20172)
 isMethod(#20169)
 #20176=*
 stmts(#20176,18,#20001,2,"var o = ... () {}\n}")
 #20177=@"loc,{#10000},8,1,11,1"
 locations_default(#20177,#10000,8,1,11,1)
 hasLocation(#20176,#20177)
-stmtContainers(#20176,#20001)
+stmt_containers(#20176,#20001)
 #20178=*
 exprs(#20178,64,#20176,0,"o = {\n  ... () {}\n}")
 #20179=@"loc,{#10000},8,5,11,1"
@@ -578,7 +578,7 @@ stmts(#20190,1,#20186,-2,"{}")
 #20191=@"loc,{#10000},9,22,9,23"
 locations_default(#20191,#10000,9,22,9,23)
 hasLocation(#20190,#20191)
-stmtContainers(#20190,#20186)
+stmt_containers(#20190,#20186)
 isMethod(#20183)
 #20192=*
 properties(#20192,#20181,1,0,"async * ... r]() {}")
@@ -626,7 +626,7 @@ stmts(#20202,1,#20198,-2,"{}")
 #20203=@"loc,{#10000},10,35,10,36"
 locations_default(#20203,#10000,10,35,10,36)
 hasLocation(#20202,#20203)
-stmtContainers(#20202,#20198)
+stmt_containers(#20202,#20198)
 isComputed(#20192)
 isMethod(#20192)
 #20204=*
diff --git a/javascript/extractor/tests/es2018/output/trap/templates.js.trap b/javascript/extractor/tests/es2018/output/trap/templates.js.trap
index e2c81cb18e3..b2881fe607d 100644
--- a/javascript/extractor/tests/es2018/output/trap/templates.js.trap
+++ b/javascript/extractor/tests/es2018/output/trap/templates.js.trap
@@ -381,7 +381,7 @@ stmts(#20143,2,#20001,0,"`foo`\n` ... \u25a0`")
 #20144=@"loc,{#10000},1,1,3,17"
 locations_default(#20144,#10000,1,1,3,17)
 hasLocation(#20143,#20144)
-stmtContainers(#20143,#20001)
+stmt_containers(#20143,#20001)
 #20145=*
 exprs(#20145,70,#20143,0,"`foo`\n` ... \u25a0`")
 hasLocation(#20145,#20144)
@@ -445,7 +445,7 @@ literals("■","\u25a0",#20156)
 #20157=*
 stmts(#20157,2,#20001,1,"foo `\u25a0`")
 hasLocation(#20157,#20009)
-stmtContainers(#20157,#20001)
+stmt_containers(#20157,#20001)
 #20158=*
 exprs(#20158,70,#20157,0,"foo `\u25a0`")
 hasLocation(#20158,#20009)
@@ -476,7 +476,7 @@ literals("■","\u25a0",#20163)
 #20164=*
 stmts(#20164,2,#20001,2,"foo `fo ... \u25a0`")
 hasLocation(#20164,#20011)
-stmtContainers(#20164,#20001)
+stmt_containers(#20164,#20001)
 #20165=*
 exprs(#20165,70,#20164,0,"foo `fo ... \u25a0`")
 hasLocation(#20165,#20011)
@@ -518,7 +518,7 @@ literals("■","\u25a0",#20171)
 #20172=*
 stmts(#20172,2,#20001,3,"foo `\unicode`")
 hasLocation(#20172,#20013)
-stmtContainers(#20172,#20001)
+stmt_containers(#20172,#20001)
 #20173=*
 exprs(#20173,70,#20172,0,"foo `\unicode`")
 hasLocation(#20173,#20013)
@@ -547,7 +547,7 @@ literals("","\unicode",#20177)
 #20178=*
 stmts(#20178,2,#20001,4,"foo `fo ... nicode`")
 hasLocation(#20178,#20015)
-stmtContainers(#20178,#20001)
+stmt_containers(#20178,#20001)
 #20179=*
 exprs(#20179,70,#20178,0,"foo `fo ... nicode`")
 hasLocation(#20179,#20015)
@@ -589,7 +589,7 @@ literals("","\unicode",#20185)
 #20186=*
 stmts(#20186,2,#20001,5,"foo `\u`")
 hasLocation(#20186,#20017)
-stmtContainers(#20186,#20001)
+stmt_containers(#20186,#20001)
 #20187=*
 exprs(#20187,70,#20186,0,"foo `\u`")
 hasLocation(#20187,#20017)
@@ -618,7 +618,7 @@ literals("","\u",#20191)
 #20192=*
 stmts(#20192,2,#20001,6,"foo `\u{`")
 hasLocation(#20192,#20019)
-stmtContainers(#20192,#20001)
+stmt_containers(#20192,#20001)
 #20193=*
 exprs(#20193,70,#20192,0,"foo `\u{`")
 hasLocation(#20193,#20019)
@@ -647,7 +647,7 @@ literals("","\u{",#20197)
 #20198=*
 stmts(#20198,2,#20001,7,"foo `\u{abcdx`")
 hasLocation(#20198,#20021)
-stmtContainers(#20198,#20001)
+stmt_containers(#20198,#20001)
 #20199=*
 exprs(#20199,70,#20198,0,"foo `\u{abcdx`")
 hasLocation(#20199,#20021)
@@ -676,7 +676,7 @@ literals("","\u{abcdx",#20203)
 #20204=*
 stmts(#20204,2,#20001,8,"foo `\u{abcdx}`")
 hasLocation(#20204,#20023)
-stmtContainers(#20204,#20001)
+stmt_containers(#20204,#20001)
 #20205=*
 exprs(#20205,70,#20204,0,"foo `\u{abcdx}`")
 hasLocation(#20205,#20023)
@@ -705,7 +705,7 @@ literals("","\u{abcdx}",#20209)
 #20210=*
 stmts(#20210,2,#20001,9,"foo `\unicode\\`")
 hasLocation(#20210,#20025)
-stmtContainers(#20210,#20001)
+stmt_containers(#20210,#20001)
 #20211=*
 exprs(#20211,70,#20210,0,"foo `\unicode\\`")
 hasLocation(#20211,#20025)
diff --git a/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap b/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
index b56e7ace243..7a17373a380 100644
--- a/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
+++ b/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
@@ -98,7 +98,7 @@ stmts(#20034,18,#20001,0,"var s1 = ""ab\u2028c"";")
 #20035=@"loc,{#10000},1,1,1,16"
 locations_default(#20035,#10000,1,1,1,16)
 hasLocation(#20034,#20035)
-stmtContainers(#20034,#20001)
+stmt_containers(#20034,#20001)
 #20036=*
 exprs(#20036,64,#20034,0,"s1 = ""ab\u2028c""")
 #20037=@"loc,{#10000},1,5,1,15"
@@ -130,7 +130,7 @@ stmts(#20042,18,#20001,1,"var s2 = ""ab\u2029c"";")
 #20043=@"loc,{#10000},2,1,2,16"
 locations_default(#20043,#10000,2,1,2,16)
 hasLocation(#20042,#20043)
-stmtContainers(#20042,#20001)
+stmt_containers(#20042,#20001)
 #20044=*
 exprs(#20044,64,#20042,0,"s2 = ""ab\u2029c""")
 #20045=@"loc,{#10000},2,5,2,15"
diff --git a/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap b/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
index d84af789b77..333efbf0612 100644
--- a/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
@@ -191,7 +191,7 @@ stmts(#20069,17,#20001,0,"async f ... o() {\n}")
 #20070=@"loc,{#10000},1,1,2,1"
 locations_default(#20070,#10000,1,1,2,1)
 hasLocation(#20069,#20070)
-stmtContainers(#20069,#20001)
+stmt_containers(#20069,#20001)
 #20071=*
 exprs(#20071,78,#20069,-1,"foo")
 hasLocation(#20071,#20021)
@@ -212,13 +212,13 @@ stmts(#20074,1,#20069,-2,"{\n}")
 #20075=@"loc,{#10000},1,23,2,1"
 locations_default(#20075,#10000,1,23,2,1)
 hasLocation(#20074,#20075)
-stmtContainers(#20074,#20069)
+stmt_containers(#20074,#20069)
 #20076=*
 stmts(#20076,17,#20001,1,"async f ... o());\n}")
 #20077=@"loc,{#10000},4,1,6,1"
 locations_default(#20077,#10000,4,1,6,1)
 hasLocation(#20076,#20077)
-stmtContainers(#20076,#20001)
+stmt_containers(#20076,#20001)
 #20078=*
 exprs(#20078,78,#20076,-1,"bar")
 hasLocation(#20078,#20034)
@@ -240,13 +240,13 @@ stmts(#20082,1,#20076,-2,"{\n  for ... o());\n}")
 #20083=@"loc,{#10000},4,22,6,1"
 locations_default(#20083,#10000,4,22,6,1)
 hasLocation(#20082,#20083)
-stmtContainers(#20082,#20076)
+stmt_containers(#20082,#20076)
 #20084=*
 stmts(#20084,21,#20082,0,"for awa ... foo());")
 #20085=@"loc,{#10000},5,3,5,28"
 locations_default(#20085,#10000,5,3,5,28)
 hasLocation(#20084,#20085)
-stmtContainers(#20084,#20076)
+stmt_containers(#20084,#20076)
 #20086=*
 exprs(#20086,13,#20084,1,"foo()")
 #20087=@"loc,{#10000},5,22,5,26"
@@ -266,7 +266,7 @@ stmts(#20089,18,#20084,0,"var x")
 #20090=@"loc,{#10000},5,13,5,17"
 locations_default(#20090,#10000,5,13,5,17)
 hasLocation(#20089,#20090)
-stmtContainers(#20089,#20076)
+stmt_containers(#20089,#20076)
 #20091=*
 exprs(#20091,64,#20089,0,"x")
 hasLocation(#20091,#20050)
@@ -282,7 +282,7 @@ decl(#20092,#20080)
 #20093=*
 stmts(#20093,0,#20084,2,";")
 hasLocation(#20093,#20062)
-stmtContainers(#20093,#20076)
+stmt_containers(#20093,#20076)
 isForAwaitOf(#20084)
 #20094=*
 entry_cfg_node(#20094,#20001)
diff --git a/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap b/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
index c1c75d069e0..df2bb2aae24 100644
--- a/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
@@ -359,17 +359,17 @@ stmts(#20135,11,#20001,0,"try {}\n ... atch {}")
 #20136=@"loc,{#10000},1,1,4,8"
 locations_default(#20136,#10000,1,1,4,8)
 hasLocation(#20135,#20136)
-stmtContainers(#20135,#20001)
+stmt_containers(#20135,#20001)
 #20137=*
 stmts(#20137,1,#20135,0,"{}")
 #20138=@"loc,{#10000},1,5,1,6"
 locations_default(#20138,#10000,1,5,1,6)
 hasLocation(#20137,#20138)
-stmtContainers(#20137,#20001)
+stmt_containers(#20137,#20001)
 #20139=*
 stmts(#20139,20,#20135,1,"catch ( ... ror) {}")
 hasLocation(#20139,#20005)
-stmtContainers(#20139,#20001)
+stmt_containers(#20139,#20001)
 #20140=*
 scopes(#20140,2)
 scopenodes(#20139,#20140)
@@ -411,11 +411,11 @@ stmts(#20148,1,#20139,1,"{}")
 #20149=@"loc,{#10000},2,37,2,38"
 locations_default(#20149,#10000,2,37,2,38)
 hasLocation(#20148,#20149)
-stmtContainers(#20148,#20001)
+stmt_containers(#20148,#20001)
 #20150=*
 stmts(#20150,20,#20135,2,"catch ( ... ror) {}")
 hasLocation(#20150,#20007)
-stmtContainers(#20150,#20001)
+stmt_containers(#20150,#20001)
 #20151=*
 scopes(#20151,2)
 scopenodes(#20150,#20151)
@@ -457,11 +457,11 @@ stmts(#20159,1,#20150,1,"{}")
 #20160=@"loc,{#10000},3,33,3,34"
 locations_default(#20160,#10000,3,33,3,34)
 hasLocation(#20159,#20160)
-stmtContainers(#20159,#20001)
+stmt_containers(#20159,#20001)
 #20161=*
 stmts(#20161,20,#20135,3,"catch {}")
 hasLocation(#20161,#20009)
-stmtContainers(#20161,#20001)
+stmt_containers(#20161,#20001)
 #20162=*
 scopes(#20162,2)
 scopenodes(#20161,#20162)
@@ -471,23 +471,23 @@ stmts(#20163,1,#20161,1,"{}")
 #20164=@"loc,{#10000},4,7,4,8"
 locations_default(#20164,#10000,4,7,4,8)
 hasLocation(#20163,#20164)
-stmtContainers(#20163,#20001)
+stmt_containers(#20163,#20001)
 #20165=*
 stmts(#20165,11,#20001,1,"try {}\n ... ally {}")
 #20166=@"loc,{#10000},6,1,10,10"
 locations_default(#20166,#10000,6,1,10,10)
 hasLocation(#20165,#20166)
-stmtContainers(#20165,#20001)
+stmt_containers(#20165,#20001)
 #20167=*
 stmts(#20167,1,#20165,0,"{}")
 #20168=@"loc,{#10000},6,5,6,6"
 locations_default(#20168,#10000,6,5,6,6)
 hasLocation(#20167,#20168)
-stmtContainers(#20167,#20001)
+stmt_containers(#20167,#20001)
 #20169=*
 stmts(#20169,20,#20165,1,"catch ( ... ror) {}")
 hasLocation(#20169,#20015)
-stmtContainers(#20169,#20001)
+stmt_containers(#20169,#20001)
 #20170=*
 scopes(#20170,2)
 scopenodes(#20169,#20170)
@@ -527,11 +527,11 @@ stmts(#20177,1,#20169,1,"{}")
 #20178=@"loc,{#10000},7,37,7,38"
 locations_default(#20178,#10000,7,37,7,38)
 hasLocation(#20177,#20178)
-stmtContainers(#20177,#20001)
+stmt_containers(#20177,#20001)
 #20179=*
 stmts(#20179,20,#20165,2,"catch ( ... ror) {}")
 hasLocation(#20179,#20017)
-stmtContainers(#20179,#20001)
+stmt_containers(#20179,#20001)
 #20180=*
 scopes(#20180,2)
 scopenodes(#20179,#20180)
@@ -571,11 +571,11 @@ stmts(#20187,1,#20179,1,"{}")
 #20188=@"loc,{#10000},8,33,8,34"
 locations_default(#20188,#10000,8,33,8,34)
 hasLocation(#20187,#20188)
-stmtContainers(#20187,#20001)
+stmt_containers(#20187,#20001)
 #20189=*
 stmts(#20189,20,#20165,3,"catch {}")
 hasLocation(#20189,#20019)
-stmtContainers(#20189,#20001)
+stmt_containers(#20189,#20001)
 #20190=*
 scopes(#20190,2)
 scopenodes(#20189,#20190)
@@ -585,13 +585,13 @@ stmts(#20191,1,#20189,1,"{}")
 #20192=@"loc,{#10000},9,7,9,8"
 locations_default(#20192,#10000,9,7,9,8)
 hasLocation(#20191,#20192)
-stmtContainers(#20191,#20001)
+stmt_containers(#20191,#20001)
 #20193=*
 stmts(#20193,1,#20165,-1,"{}")
 #20194=@"loc,{#10000},10,9,10,10"
 locations_default(#20194,#10000,10,9,10,10)
 hasLocation(#20193,#20194)
-stmtContainers(#20193,#20001)
+stmt_containers(#20193,#20001)
 #20195=*
 entry_cfg_node(#20195,#20001)
 #20196=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/esnext/output/trap/catchNoBinding.js.trap b/javascript/extractor/tests/esnext/output/trap/catchNoBinding.js.trap
index 1049ef198eb..67df355b2bc 100644
--- a/javascript/extractor/tests/esnext/output/trap/catchNoBinding.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/catchNoBinding.js.trap
@@ -159,31 +159,31 @@ stmts(#20056,11,#20001,0,"try {\n\t ... ly {}\n}")
 #20057=@"loc,{#10000},1,1,5,1"
 locations_default(#20057,#10000,1,1,5,1)
 hasLocation(#20056,#20057)
-stmtContainers(#20056,#20001)
+stmt_containers(#20056,#20001)
 #20058=*
 stmts(#20058,1,#20056,0,"{\n\ttry {} catch {}\n}")
 #20059=@"loc,{#10000},1,5,3,1"
 locations_default(#20059,#10000,1,5,3,1)
 hasLocation(#20058,#20059)
-stmtContainers(#20058,#20001)
+stmt_containers(#20058,#20001)
 #20060=*
 stmts(#20060,11,#20058,0,"try {} catch {}")
 #20061=@"loc,{#10000},2,2,2,16"
 locations_default(#20061,#10000,2,2,2,16)
 hasLocation(#20060,#20061)
-stmtContainers(#20060,#20001)
+stmt_containers(#20060,#20001)
 #20062=*
 stmts(#20062,1,#20060,0,"{}")
 #20063=@"loc,{#10000},2,6,2,7"
 locations_default(#20063,#10000,2,6,2,7)
 hasLocation(#20062,#20063)
-stmtContainers(#20062,#20001)
+stmt_containers(#20062,#20001)
 #20064=*
 stmts(#20064,20,#20060,1,"catch {}")
 #20065=@"loc,{#10000},2,9,2,16"
 locations_default(#20065,#10000,2,9,2,16)
 hasLocation(#20064,#20065)
-stmtContainers(#20064,#20001)
+stmt_containers(#20064,#20001)
 #20066=*
 scopes(#20066,2)
 scopenodes(#20064,#20066)
@@ -193,13 +193,13 @@ stmts(#20067,1,#20064,1,"{}")
 #20068=@"loc,{#10000},2,15,2,16"
 locations_default(#20068,#10000,2,15,2,16)
 hasLocation(#20067,#20068)
-stmtContainers(#20067,#20001)
+stmt_containers(#20067,#20001)
 #20069=*
 stmts(#20069,20,#20056,1,"catch { ... ly {}\n}")
 #20070=@"loc,{#10000},3,3,5,1"
 locations_default(#20070,#10000,3,3,5,1)
 hasLocation(#20069,#20070)
-stmtContainers(#20069,#20001)
+stmt_containers(#20069,#20001)
 #20071=*
 scopes(#20071,2)
 scopenodes(#20069,#20071)
@@ -209,25 +209,25 @@ stmts(#20072,1,#20069,1,"{\n\ttry  ... ly {}\n}")
 #20073=@"loc,{#10000},3,9,5,1"
 locations_default(#20073,#10000,3,9,5,1)
 hasLocation(#20072,#20073)
-stmtContainers(#20072,#20001)
+stmt_containers(#20072,#20001)
 #20074=*
 stmts(#20074,11,#20072,0,"try {}  ... ally {}")
 #20075=@"loc,{#10000},4,2,4,27"
 locations_default(#20075,#10000,4,2,4,27)
 hasLocation(#20074,#20075)
-stmtContainers(#20074,#20001)
+stmt_containers(#20074,#20001)
 #20076=*
 stmts(#20076,1,#20074,0,"{}")
 #20077=@"loc,{#10000},4,6,4,7"
 locations_default(#20077,#10000,4,6,4,7)
 hasLocation(#20076,#20077)
-stmtContainers(#20076,#20001)
+stmt_containers(#20076,#20001)
 #20078=*
 stmts(#20078,20,#20074,1,"catch {}")
 #20079=@"loc,{#10000},4,9,4,16"
 locations_default(#20079,#10000,4,9,4,16)
 hasLocation(#20078,#20079)
-stmtContainers(#20078,#20001)
+stmt_containers(#20078,#20001)
 #20080=*
 scopes(#20080,2)
 scopenodes(#20078,#20080)
@@ -237,13 +237,13 @@ stmts(#20081,1,#20078,1,"{}")
 #20082=@"loc,{#10000},4,15,4,16"
 locations_default(#20082,#10000,4,15,4,16)
 hasLocation(#20081,#20082)
-stmtContainers(#20081,#20001)
+stmt_containers(#20081,#20001)
 #20083=*
 stmts(#20083,1,#20074,-1,"{}")
 #20084=@"loc,{#10000},4,26,4,27"
 locations_default(#20084,#10000,4,26,4,27)
 hasLocation(#20083,#20084)
-stmtContainers(#20083,#20001)
+stmt_containers(#20083,#20001)
 #20085=*
 entry_cfg_node(#20085,#20001)
 #20086=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap b/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
index a4455b0b2b3..ce59a1f11a1 100644
--- a/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
@@ -196,7 +196,7 @@ is_es2015_module(#20001)
 #20072=*
 stmts(#20072,2,#20001,0,"import(""m"");")
 hasLocation(#20072,#20003)
-stmtContainers(#20072,#20001)
+stmt_containers(#20072,#20001)
 #20073=*
 exprs(#20073,99,#20072,0,"import(""m"")")
 #20074=@"loc,{#10000},1,1,1,11"
@@ -219,7 +219,7 @@ regexpConstValue(#20076,"m")
 #20078=*
 stmts(#20078,2,#20001,1,"b ? imp ... ) : {};")
 hasLocation(#20078,#20005)
-stmtContainers(#20078,#20001)
+stmt_containers(#20078,#20001)
 #20079=*
 exprs(#20079,11,#20078,0,"b ? import(""n"") : {}")
 #20080=@"loc,{#10000},2,1,2,20"
@@ -265,7 +265,7 @@ exprContainers(#20088,#20001)
 #20090=*
 stmts(#20090,2,#20001,2,"import( ... => {});")
 hasLocation(#20090,#20007)
-stmtContainers(#20090,#20001)
+stmt_containers(#20090,#20001)
 #20091=*
 exprs(#20091,13,#20090,0,"import( ...  => {})")
 #20092=@"loc,{#10000},3,1,3,27"
@@ -329,7 +329,7 @@ stmts(#20106,1,#20101,-2,"{}")
 #20107=@"loc,{#10000},3,25,3,26"
 locations_default(#20107,#10000,3,25,3,26)
 hasLocation(#20106,#20107)
-stmtContainers(#20106,#20101)
+stmt_containers(#20106,#20101)
 #20108=*
 entry_cfg_node(#20108,#20001)
 #20109=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/esnext/output/trap/fields.js.trap b/javascript/extractor/tests/esnext/output/trap/fields.js.trap
index 688b597e956..6c4aa0b661e 100644
--- a/javascript/extractor/tests/esnext/output/trap/fields.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/fields.js.trap
@@ -239,7 +239,7 @@ stmts(#20086,26,#20001,0,"class A ... rget;\n}")
 #20087=@"loc,{#10000},1,1,3,1"
 locations_default(#20087,#10000,1,1,3,1)
 hasLocation(#20086,#20087)
-stmtContainers(#20086,#20001)
+stmt_containers(#20086,#20001)
 #20088=*
 exprs(#20088,78,#20086,0,"A")
 hasLocation(#20088,#20027)
@@ -294,14 +294,14 @@ isArgumentsObject(#20100)
 #20101=*
 stmts(#20101,1,#20092,-2,"{}")
 hasLocation(#20101,#20097)
-stmtContainers(#20101,#20092)
+stmt_containers(#20101,#20092)
 isMethod(#20096)
 #20102=*
 stmts(#20102,26,#20001,1,"class B ... er.x;\n}")
 #20103=@"loc,{#10000},5,1,7,1"
 locations_default(#20103,#10000,5,1,7,1)
 hasLocation(#20102,#20103)
-stmtContainers(#20102,#20001)
+stmt_containers(#20102,#20001)
 #20104=*
 exprs(#20104,78,#20102,0,"B")
 hasLocation(#20104,#20046)
@@ -381,11 +381,11 @@ hasRestParameter(#20109)
 #20122=*
 stmts(#20122,1,#20109,-2,"{ super(...args); }")
 hasLocation(#20122,#20116)
-stmtContainers(#20122,#20109)
+stmt_containers(#20122,#20109)
 #20123=*
 stmts(#20123,2,#20122,0,"super(...args);")
 hasLocation(#20123,#20116)
-stmtContainers(#20123,#20109)
+stmt_containers(#20123,#20109)
 #20124=*
 exprs(#20124,13,#20123,0,"super(...args)")
 hasLocation(#20124,#20116)
@@ -414,7 +414,7 @@ stmts(#20128,26,#20001,2,"class C {\n  async;\n}")
 #20129=@"loc,{#10000},9,1,11,1"
 locations_default(#20129,#10000,9,1,11,1)
 hasLocation(#20128,#20129)
-stmtContainers(#20128,#20001)
+stmt_containers(#20128,#20001)
 #20130=*
 exprs(#20130,78,#20128,0,"C")
 hasLocation(#20130,#20069)
@@ -463,7 +463,7 @@ isArgumentsObject(#20140)
 #20141=*
 stmts(#20141,1,#20134,-2,"{}")
 hasLocation(#20141,#20137)
-stmtContainers(#20141,#20134)
+stmt_containers(#20141,#20134)
 isMethod(#20136)
 #20142=*
 entry_cfg_node(#20142,#20001)
diff --git a/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap b/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
index 00fb9b48b7e..290287676b3 100644
--- a/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
@@ -203,7 +203,7 @@ hasLocation(#20001,#20074)
 #20075=*
 stmts(#20075,2,#20001,0,"x1 ?? y1;")
 hasLocation(#20075,#20003)
-stmtContainers(#20075,#20001)
+stmt_containers(#20075,#20001)
 #20076=*
 exprs(#20076,107,#20075,0,"x1 ?? y1")
 #20077=@"loc,{#10000},1,1,1,8"
@@ -232,7 +232,7 @@ bind(#20080,#20081)
 #20082=*
 stmts(#20082,2,#20001,1,"x2 || y2 ?? z2;")
 hasLocation(#20082,#20007)
-stmtContainers(#20082,#20001)
+stmt_containers(#20082,#20001)
 #20083=*
 exprs(#20083,107,#20082,0,"x2 || y2 ?? z2")
 #20084=@"loc,{#10000},3,1,3,14"
@@ -277,7 +277,7 @@ bind(#20091,#20092)
 #20093=*
 stmts(#20093,2,#20001,2,"x3 ?? y3 || z3;")
 hasLocation(#20093,#20009)
-stmtContainers(#20093,#20001)
+stmt_containers(#20093,#20001)
 #20094=*
 exprs(#20094,45,#20093,0,"x3 ?? y3 || z3")
 #20095=@"loc,{#10000},4,1,4,14"
@@ -322,7 +322,7 @@ bind(#20102,#20103)
 #20104=*
 stmts(#20104,2,#20001,3,"x4 && y4 ?? z4;")
 hasLocation(#20104,#20013)
-stmtContainers(#20104,#20001)
+stmt_containers(#20104,#20001)
 #20105=*
 exprs(#20105,107,#20104,0,"x4 && y4 ?? z4")
 #20106=@"loc,{#10000},6,1,6,14"
@@ -367,7 +367,7 @@ bind(#20113,#20114)
 #20115=*
 stmts(#20115,2,#20001,4,"x5 ?? y5 && z5;")
 hasLocation(#20115,#20015)
-stmtContainers(#20115,#20001)
+stmt_containers(#20115,#20001)
 #20116=*
 exprs(#20116,107,#20115,0,"x5 ?? y5 && z5")
 #20117=@"loc,{#10000},7,1,7,14"
diff --git a/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap b/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
index fb3a192bd7f..0a39749f231 100644
--- a/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
@@ -329,7 +329,7 @@ hasLocation(#20001,#20122)
 #20123=*
 stmts(#20123,2,#20001,0,"a1?.b1;")
 hasLocation(#20123,#20003)
-stmtContainers(#20123,#20001)
+stmt_containers(#20123,#20001)
 #20124=*
 exprs(#20124,14,#20123,0,"a1?.b1")
 #20125=@"loc,{#10000},1,1,1,6"
@@ -356,7 +356,7 @@ isOptionalChaining(#20124)
 #20129=*
 stmts(#20129,2,#20001,1,"a2?.[x2];")
 hasLocation(#20129,#20007)
-stmtContainers(#20129,#20001)
+stmt_containers(#20129,#20001)
 #20130=*
 exprs(#20130,15,#20129,0,"a2?.[x2]")
 #20131=@"loc,{#10000},3,1,3,8"
@@ -386,7 +386,7 @@ isOptionalChaining(#20130)
 #20136=*
 stmts(#20136,2,#20001,2,"a3?.b3();")
 hasLocation(#20136,#20011)
-stmtContainers(#20136,#20001)
+stmt_containers(#20136,#20001)
 #20137=*
 exprs(#20137,13,#20136,0,"a3?.b3()")
 #20138=@"loc,{#10000},5,1,5,8"
@@ -420,7 +420,7 @@ isOptionalChaining(#20139)
 #20144=*
 stmts(#20144,2,#20001,3,"a4?.();")
 hasLocation(#20144,#20015)
-stmtContainers(#20144,#20001)
+stmt_containers(#20144,#20001)
 #20145=*
 exprs(#20145,13,#20144,0,"a4?.()")
 #20146=@"loc,{#10000},7,1,7,6"
@@ -441,7 +441,7 @@ isOptionalChaining(#20145)
 #20149=*
 stmts(#20149,2,#20001,4,"o5?.3:2;")
 hasLocation(#20149,#20019)
-stmtContainers(#20149,#20001)
+stmt_containers(#20149,#20001)
 #20150=*
 exprs(#20150,11,#20149,0,"o5?.3:2")
 #20151=@"loc,{#10000},9,1,9,7"
@@ -473,7 +473,7 @@ literals("2","2",#20155)
 #20156=*
 stmts(#20156,2,#20001,5,"a6?.b6[ ... y6).d6;")
 hasLocation(#20156,#20023)
-stmtContainers(#20156,#20001)
+stmt_containers(#20156,#20001)
 #20157=*
 exprs(#20157,14,#20156,0,"a6?.b6[ ... (y6).d6")
 #20158=@"loc,{#10000},11,1,11,22"
@@ -559,7 +559,7 @@ literals("d6","d6",#20175)
 #20176=*
 stmts(#20176,2,#20001,6,"delete a?.b")
 hasLocation(#20176,#20027)
-stmtContainers(#20176,#20001)
+stmt_containers(#20176,#20001)
 #20177=*
 exprs(#20177,22,#20176,0,"delete a?.b")
 hasLocation(#20177,#20027)
diff --git a/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap b/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
index 43bbc927901..b439aee5624 100644
--- a/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
@@ -866,7 +866,7 @@ hasLocation(#20001,#20327)
 #20328=*
 stmts(#20328,2,#20001,0,"a?.b.c(++x).d;")
 hasLocation(#20328,#20003)
-stmtContainers(#20328,#20001)
+stmt_containers(#20328,#20001)
 #20329=*
 exprs(#20329,14,#20328,0,"a?.b.c(++x).d")
 #20330=@"loc,{#10000},1,1,1,13"
@@ -942,7 +942,7 @@ literals("d","d",#20345)
 #20346=*
 stmts(#20346,2,#20001,1,"a?.b[3].c?.(x).d;")
 hasLocation(#20346,#20007)
-stmtContainers(#20346,#20001)
+stmt_containers(#20346,#20001)
 #20347=*
 exprs(#20347,14,#20346,0,"a?.b[3].c?.(x).d")
 #20348=@"loc,{#10000},3,1,3,16"
@@ -1021,7 +1021,7 @@ literals("d","d",#20362)
 #20363=*
 stmts(#20363,2,#20001,2,"(a?.b).c;")
 hasLocation(#20363,#20011)
-stmtContainers(#20363,#20001)
+stmt_containers(#20363,#20001)
 #20364=*
 exprs(#20364,14,#20363,0,"(a?.b).c")
 #20365=@"loc,{#10000},5,1,5,8"
@@ -1066,7 +1066,7 @@ literals("c","c",#20372)
 #20373=*
 stmts(#20373,2,#20001,3,"(a?.b.c).d;")
 hasLocation(#20373,#20015)
-stmtContainers(#20373,#20001)
+stmt_containers(#20373,#20001)
 #20374=*
 exprs(#20374,14,#20373,0,"(a?.b.c).d")
 #20375=@"loc,{#10000},7,1,7,10"
@@ -1124,7 +1124,7 @@ literals("d","d",#20385)
 #20386=*
 stmts(#20386,2,#20001,4,"a?.[b?.c?.d].e?.f;")
 hasLocation(#20386,#20019)
-stmtContainers(#20386,#20001)
+stmt_containers(#20386,#20001)
 #20387=*
 exprs(#20387,14,#20386,0,"a?.[b?.c?.d].e?.f")
 #20388=@"loc,{#10000},9,1,9,17"
@@ -1207,7 +1207,7 @@ isOptionalChaining(#20387)
 #20404=*
 stmts(#20404,2,#20001,5,"a?.()[b ... ?.().f;")
 hasLocation(#20404,#20023)
-stmtContainers(#20404,#20001)
+stmt_containers(#20404,#20001)
 #20405=*
 exprs(#20405,14,#20404,0,"a?.()[b ... e?.().f")
 #20406=@"loc,{#10000},11,1,11,28"
@@ -1318,7 +1318,7 @@ stmts(#20429,3,#20001,6,"if (a?. ... alse;\n}")
 #20430=@"loc,{#10000},13,1,17,1"
 locations_default(#20430,#10000,13,1,17,1)
 hasLocation(#20429,#20430)
-stmtContainers(#20429,#20001)
+stmt_containers(#20429,#20001)
 #20431=*
 exprs(#20431,14,#20429,0,"a?.b")
 #20432=@"loc,{#10000},13,5,13,8"
@@ -1345,13 +1345,13 @@ stmts(#20435,1,#20429,1,"{\n    true;\n}")
 #20436=@"loc,{#10000},13,11,15,1"
 locations_default(#20436,#10000,13,11,15,1)
 hasLocation(#20435,#20436)
-stmtContainers(#20435,#20001)
+stmt_containers(#20435,#20001)
 #20437=*
 stmts(#20437,2,#20435,0,"true;")
 #20438=@"loc,{#10000},14,5,14,9"
 locations_default(#20438,#10000,14,5,14,9)
 hasLocation(#20437,#20438)
-stmtContainers(#20437,#20001)
+stmt_containers(#20437,#20001)
 #20439=*
 exprs(#20439,2,#20437,0,"true")
 hasLocation(#20439,#20243)
@@ -1363,13 +1363,13 @@ stmts(#20440,1,#20429,2,"{\n    false;\n}")
 #20441=@"loc,{#10000},15,8,17,1"
 locations_default(#20441,#10000,15,8,17,1)
 hasLocation(#20440,#20441)
-stmtContainers(#20440,#20001)
+stmt_containers(#20440,#20001)
 #20442=*
 stmts(#20442,2,#20440,0,"false;")
 #20443=@"loc,{#10000},16,5,16,10"
 locations_default(#20443,#10000,16,5,16,10)
 hasLocation(#20442,#20443)
-stmtContainers(#20442,#20001)
+stmt_containers(#20442,#20001)
 #20444=*
 exprs(#20444,2,#20442,0,"false")
 hasLocation(#20444,#20253)
@@ -1381,7 +1381,7 @@ stmts(#20445,3,#20001,7,"if (!a? ... alse;\n}")
 #20446=@"loc,{#10000},19,1,23,1"
 locations_default(#20446,#10000,19,1,23,1)
 hasLocation(#20445,#20446)
-stmtContainers(#20445,#20001)
+stmt_containers(#20445,#20001)
 #20447=*
 exprs(#20447,18,#20445,0,"!a?.b")
 #20448=@"loc,{#10000},19,5,19,9"
@@ -1415,13 +1415,13 @@ stmts(#20453,1,#20445,1,"{\n    true;\n}")
 #20454=@"loc,{#10000},19,12,21,1"
 locations_default(#20454,#10000,19,12,21,1)
 hasLocation(#20453,#20454)
-stmtContainers(#20453,#20001)
+stmt_containers(#20453,#20001)
 #20455=*
 stmts(#20455,2,#20453,0,"true;")
 #20456=@"loc,{#10000},20,5,20,9"
 locations_default(#20456,#10000,20,5,20,9)
 hasLocation(#20455,#20456)
-stmtContainers(#20455,#20001)
+stmt_containers(#20455,#20001)
 #20457=*
 exprs(#20457,2,#20455,0,"true")
 hasLocation(#20457,#20274)
@@ -1433,13 +1433,13 @@ stmts(#20458,1,#20445,2,"{\n    false;\n}")
 #20459=@"loc,{#10000},21,8,23,1"
 locations_default(#20459,#10000,21,8,23,1)
 hasLocation(#20458,#20459)
-stmtContainers(#20458,#20001)
+stmt_containers(#20458,#20001)
 #20460=*
 stmts(#20460,2,#20458,0,"false;")
 #20461=@"loc,{#10000},22,5,22,10"
 locations_default(#20461,#10000,22,5,22,10)
 hasLocation(#20460,#20461)
-stmtContainers(#20460,#20001)
+stmt_containers(#20460,#20001)
 #20462=*
 exprs(#20462,2,#20460,0,"false")
 hasLocation(#20462,#20284)
@@ -1451,7 +1451,7 @@ stmts(#20463,3,#20001,8,"if (a?. ... alse;\n}")
 #20464=@"loc,{#10000},25,1,29,1"
 locations_default(#20464,#10000,25,1,29,1)
 hasLocation(#20463,#20464)
-stmtContainers(#20463,#20001)
+stmt_containers(#20463,#20001)
 #20465=*
 exprs(#20465,44,#20463,0,"a?.b && c?.d")
 #20466=@"loc,{#10000},25,5,25,16"
@@ -1508,13 +1508,13 @@ stmts(#20476,1,#20463,1,"{\n    true;\n}")
 #20477=@"loc,{#10000},25,19,27,1"
 locations_default(#20477,#10000,25,19,27,1)
 hasLocation(#20476,#20477)
-stmtContainers(#20476,#20001)
+stmt_containers(#20476,#20001)
 #20478=*
 stmts(#20478,2,#20476,0,"true;")
 #20479=@"loc,{#10000},26,5,26,9"
 locations_default(#20479,#10000,26,5,26,9)
 hasLocation(#20478,#20479)
-stmtContainers(#20478,#20001)
+stmt_containers(#20478,#20001)
 #20480=*
 exprs(#20480,2,#20478,0,"true")
 hasLocation(#20480,#20311)
@@ -1526,13 +1526,13 @@ stmts(#20481,1,#20463,2,"{\n    false;\n}")
 #20482=@"loc,{#10000},27,8,29,1"
 locations_default(#20482,#10000,27,8,29,1)
 hasLocation(#20481,#20482)
-stmtContainers(#20481,#20001)
+stmt_containers(#20481,#20001)
 #20483=*
 stmts(#20483,2,#20481,0,"false;")
 #20484=@"loc,{#10000},28,5,28,10"
 locations_default(#20484,#10000,28,5,28,10)
 hasLocation(#20483,#20484)
-stmtContainers(#20483,#20001)
+stmt_containers(#20483,#20001)
 #20485=*
 exprs(#20485,2,#20483,0,"false")
 hasLocation(#20485,#20321)
diff --git a/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap b/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
index 2c94550af82..c9b2500b1b0 100644
--- a/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
@@ -161,7 +161,7 @@ local_namespace_names(#20056,"language",#20053)
 #20058=*
 stmts(#20058,27,#20001,0,"import  ... tings';")
 hasLocation(#20058,#20003)
-stmtContainers(#20058,#20001)
+stmt_containers(#20058,#20001)
 #20059=*
 exprs(#20059,4,#20058,-1,"'settings'")
 hasLocation(#20059,#20017)
@@ -197,7 +197,7 @@ namespacedecl(#20064,#20056)
 #20065=*
 stmts(#20065,22,#20001,1,"const s ... age}`);")
 hasLocation(#20065,#20005)
-stmtContainers(#20065,#20001)
+stmt_containers(#20065,#20001)
 #20066=*
 exprs(#20066,64,#20065,0,"strings ... uage}`)")
 #20067=@"loc,{#10000},2,7,2,50"
diff --git a/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap b/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
index 85ab20b8955..a4320dff1f6 100644
--- a/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
@@ -103,7 +103,7 @@ stmts(#20035,17,#20001,0,"functio ... foo"")\n}")
 #20036=@"loc,{#10000},1,1,3,1"
 locations_default(#20036,#10000,1,1,3,1)
 hasLocation(#20035,#20036)
-stmtContainers(#20035,#20001)
+stmt_containers(#20035,#20001)
 #20037=*
 exprs(#20037,78,#20035,-1,"f")
 hasLocation(#20037,#20013)
@@ -123,13 +123,13 @@ stmts(#20040,1,#20035,-2,"{\n  yie ... foo"")\n}")
 #20041=@"loc,{#10000},1,15,3,1"
 locations_default(#20041,#10000,1,15,3,1)
 hasLocation(#20040,#20041)
-stmtContainers(#20040,#20035)
+stmt_containers(#20040,#20035)
 #20042=*
 stmts(#20042,2,#20040,0,"yield import(""foo"")")
 #20043=@"loc,{#10000},2,3,2,21"
 locations_default(#20043,#10000,2,3,2,21)
 hasLocation(#20042,#20043)
-stmtContainers(#20042,#20035)
+stmt_containers(#20042,#20035)
 #20044=*
 exprs(#20044,69,#20042,0,"yield import(""foo"")")
 hasLocation(#20044,#20043)
diff --git a/javascript/extractor/tests/excludes/output/trap/a.js.trap b/javascript/extractor/tests/excludes/output/trap/a.js.trap
index 45aafe9620b..878ff9bea6d 100644
--- a/javascript/extractor/tests/excludes/output/trap/a.js.trap
+++ b/javascript/extractor/tests/excludes/output/trap/a.js.trap
@@ -28,7 +28,7 @@ hasLocation(#20001,#20003)
 #20007=*
 stmts(#20007,2,#20001,0,"42")
 hasLocation(#20007,#20003)
-stmtContainers(#20007,#20001)
+stmt_containers(#20007,#20001)
 #20008=*
 exprs(#20008,3,#20007,0,"42")
 hasLocation(#20008,#20003)
diff --git a/javascript/extractor/tests/exprs/output/trap/assignment.js.trap b/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
index 024ccacc3ca..a92fb32819e 100644
--- a/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
@@ -333,7 +333,7 @@ hasLocation(#20001,#20124)
 #20125=*
 stmts(#20125,2,#20001,0,"a = 23;")
 hasLocation(#20125,#20003)
-stmtContainers(#20125,#20001)
+stmt_containers(#20125,#20001)
 #20126=*
 exprs(#20126,47,#20125,0,"a = 23")
 #20127=@"loc,{#10000},1,1,1,6"
@@ -359,7 +359,7 @@ literals("23","23",#20130)
 #20131=*
 stmts(#20131,2,#20001,1,"a += 19;")
 hasLocation(#20131,#20005)
-stmtContainers(#20131,#20001)
+stmt_containers(#20131,#20001)
 #20132=*
 exprs(#20132,48,#20131,0,"a += 19")
 #20133=@"loc,{#10000},2,1,2,7"
@@ -383,7 +383,7 @@ literals("19","19",#20135)
 #20136=*
 stmts(#20136,2,#20001,2,"a -= 9;")
 hasLocation(#20136,#20007)
-stmtContainers(#20136,#20001)
+stmt_containers(#20136,#20001)
 #20137=*
 exprs(#20137,49,#20136,0,"a -= 9")
 #20138=@"loc,{#10000},3,1,3,6"
@@ -407,7 +407,7 @@ literals("9","9",#20140)
 #20141=*
 stmts(#20141,2,#20001,3,"a *= b;")
 hasLocation(#20141,#20009)
-stmtContainers(#20141,#20001)
+stmt_containers(#20141,#20001)
 #20142=*
 exprs(#20142,50,#20141,0,"a *= b")
 #20143=@"loc,{#10000},4,1,4,6"
@@ -434,7 +434,7 @@ bind(#20145,#20146)
 #20147=*
 stmts(#20147,2,#20001,4,"a /= 2;")
 hasLocation(#20147,#20011)
-stmtContainers(#20147,#20001)
+stmt_containers(#20147,#20001)
 #20148=*
 exprs(#20148,51,#20147,0,"a /= 2")
 #20149=@"loc,{#10000},5,1,5,6"
@@ -458,7 +458,7 @@ literals("2","2",#20151)
 #20152=*
 stmts(#20152,2,#20001,5,"a %= 2;")
 hasLocation(#20152,#20013)
-stmtContainers(#20152,#20001)
+stmt_containers(#20152,#20001)
 #20153=*
 exprs(#20153,52,#20152,0,"a %= 2")
 #20154=@"loc,{#10000},6,1,6,6"
@@ -482,7 +482,7 @@ literals("2","2",#20156)
 #20157=*
 stmts(#20157,2,#20001,6,"a <<= 8;")
 hasLocation(#20157,#20015)
-stmtContainers(#20157,#20001)
+stmt_containers(#20157,#20001)
 #20158=*
 exprs(#20158,53,#20157,0,"a <<= 8")
 #20159=@"loc,{#10000},7,1,7,7"
@@ -506,7 +506,7 @@ literals("8","8",#20161)
 #20162=*
 stmts(#20162,2,#20001,7,"a >>= 7;")
 hasLocation(#20162,#20017)
-stmtContainers(#20162,#20001)
+stmt_containers(#20162,#20001)
 #20163=*
 exprs(#20163,54,#20162,0,"a >>= 7")
 #20164=@"loc,{#10000},8,1,8,7"
@@ -530,7 +530,7 @@ literals("7","7",#20166)
 #20167=*
 stmts(#20167,2,#20001,8,"a >>>= 2;")
 hasLocation(#20167,#20019)
-stmtContainers(#20167,#20001)
+stmt_containers(#20167,#20001)
 #20168=*
 exprs(#20168,55,#20167,0,"a >>>= 2")
 #20169=@"loc,{#10000},9,1,9,8"
@@ -554,7 +554,7 @@ literals("2","2",#20171)
 #20172=*
 stmts(#20172,2,#20001,9,"a |= 2;")
 hasLocation(#20172,#20021)
-stmtContainers(#20172,#20001)
+stmt_containers(#20172,#20001)
 #20173=*
 exprs(#20173,56,#20172,0,"a |= 2")
 #20174=@"loc,{#10000},10,1,10,6"
@@ -578,7 +578,7 @@ literals("2","2",#20176)
 #20177=*
 stmts(#20177,2,#20001,10,"a ^= 1;")
 hasLocation(#20177,#20023)
-stmtContainers(#20177,#20001)
+stmt_containers(#20177,#20001)
 #20178=*
 exprs(#20178,57,#20177,0,"a ^= 1")
 #20179=@"loc,{#10000},11,1,11,6"
@@ -602,7 +602,7 @@ literals("1","1",#20181)
 #20182=*
 stmts(#20182,2,#20001,11,"a &= 3;")
 hasLocation(#20182,#20025)
-stmtContainers(#20182,#20001)
+stmt_containers(#20182,#20001)
 #20183=*
 exprs(#20183,58,#20182,0,"a &= 3")
 #20184=@"loc,{#10000},12,1,12,6"
diff --git a/javascript/extractor/tests/exprs/output/trap/binary.js.trap b/javascript/extractor/tests/exprs/output/trap/binary.js.trap
index 025506de674..9d324cdc2ae 100644
--- a/javascript/extractor/tests/exprs/output/trap/binary.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/binary.js.trap
@@ -417,7 +417,7 @@ hasLocation(#20001,#20156)
 #20157=*
 stmts(#20157,2,#20001,0,"1 << 2;")
 hasLocation(#20157,#20003)
-stmtContainers(#20157,#20001)
+stmt_containers(#20157,#20001)
 #20158=*
 exprs(#20158,31,#20157,0,"1 << 2")
 #20159=@"loc,{#10000},1,1,1,6"
@@ -440,7 +440,7 @@ literals("2","2",#20161)
 #20162=*
 stmts(#20162,2,#20001,1,"2 >> 1;")
 hasLocation(#20162,#20005)
-stmtContainers(#20162,#20001)
+stmt_containers(#20162,#20001)
 #20163=*
 exprs(#20163,32,#20162,0,"2 >> 1")
 #20164=@"loc,{#10000},2,1,2,6"
@@ -463,7 +463,7 @@ literals("1","1",#20166)
 #20167=*
 stmts(#20167,2,#20001,2,"2 >>> 1;")
 hasLocation(#20167,#20007)
-stmtContainers(#20167,#20001)
+stmt_containers(#20167,#20001)
 #20168=*
 exprs(#20168,33,#20167,0,"2 >>> 1")
 #20169=@"loc,{#10000},3,1,3,7"
@@ -486,7 +486,7 @@ literals("1","1",#20171)
 #20172=*
 stmts(#20172,2,#20001,3,"23 + 19;")
 hasLocation(#20172,#20009)
-stmtContainers(#20172,#20001)
+stmt_containers(#20172,#20001)
 #20173=*
 exprs(#20173,34,#20172,0,"23 + 19")
 #20174=@"loc,{#10000},4,1,4,7"
@@ -509,7 +509,7 @@ literals("19","19",#20176)
 #20177=*
 stmts(#20177,2,#20001,4,"42 - 19;")
 hasLocation(#20177,#20011)
-stmtContainers(#20177,#20001)
+stmt_containers(#20177,#20001)
 #20178=*
 exprs(#20178,35,#20177,0,"42 - 19")
 #20179=@"loc,{#10000},5,1,5,7"
@@ -532,7 +532,7 @@ literals("19","19",#20181)
 #20182=*
 stmts(#20182,2,#20001,5,"2 * 3;")
 hasLocation(#20182,#20013)
-stmtContainers(#20182,#20001)
+stmt_containers(#20182,#20001)
 #20183=*
 exprs(#20183,36,#20182,0,"2 * 3")
 #20184=@"loc,{#10000},6,1,6,5"
@@ -555,7 +555,7 @@ literals("3","3",#20186)
 #20187=*
 stmts(#20187,2,#20001,6,"8 / 5;")
 hasLocation(#20187,#20015)
-stmtContainers(#20187,#20001)
+stmt_containers(#20187,#20001)
 #20188=*
 exprs(#20188,37,#20187,0,"8 / 5")
 #20189=@"loc,{#10000},7,1,7,5"
@@ -578,7 +578,7 @@ literals("5","5",#20191)
 #20192=*
 stmts(#20192,2,#20001,7,"2 % 1;")
 hasLocation(#20192,#20017)
-stmtContainers(#20192,#20001)
+stmt_containers(#20192,#20001)
 #20193=*
 exprs(#20193,38,#20192,0,"2 % 1")
 #20194=@"loc,{#10000},8,1,8,5"
@@ -601,7 +601,7 @@ literals("1","1",#20196)
 #20197=*
 stmts(#20197,2,#20001,8,"2 | 3;")
 hasLocation(#20197,#20019)
-stmtContainers(#20197,#20001)
+stmt_containers(#20197,#20001)
 #20198=*
 exprs(#20198,39,#20197,0,"2 | 3")
 #20199=@"loc,{#10000},9,1,9,5"
@@ -624,7 +624,7 @@ literals("3","3",#20201)
 #20202=*
 stmts(#20202,2,#20001,9,"2 ^ 3;")
 hasLocation(#20202,#20021)
-stmtContainers(#20202,#20001)
+stmt_containers(#20202,#20001)
 #20203=*
 exprs(#20203,40,#20202,0,"2 ^ 3")
 #20204=@"loc,{#10000},10,1,10,5"
@@ -647,7 +647,7 @@ literals("3","3",#20206)
 #20207=*
 stmts(#20207,2,#20001,10,"2 & 3;")
 hasLocation(#20207,#20023)
-stmtContainers(#20207,#20001)
+stmt_containers(#20207,#20001)
 #20208=*
 exprs(#20208,41,#20207,0,"2 & 3")
 #20209=@"loc,{#10000},11,1,11,5"
@@ -670,7 +670,7 @@ literals("3","3",#20211)
 #20212=*
 stmts(#20212,2,#20001,11,"'protot ... Object;")
 hasLocation(#20212,#20025)
-stmtContainers(#20212,#20001)
+stmt_containers(#20212,#20001)
 #20213=*
 exprs(#20213,42,#20212,0,"'protot ...  Object")
 #20214=@"loc,{#10000},12,1,12,21"
@@ -702,7 +702,7 @@ bind(#20218,#20219)
 #20220=*
 stmts(#20220,2,#20001,12,"[] instanceof Array;")
 hasLocation(#20220,#20027)
-stmtContainers(#20220,#20001)
+stmt_containers(#20220,#20001)
 #20221=*
 exprs(#20221,43,#20220,0,"[] instanceof Array")
 #20222=@"loc,{#10000},13,1,13,19"
@@ -730,7 +730,7 @@ bind(#20225,#20226)
 #20227=*
 stmts(#20227,2,#20001,13,"1 && 2;")
 hasLocation(#20227,#20029)
-stmtContainers(#20227,#20001)
+stmt_containers(#20227,#20001)
 #20228=*
 exprs(#20228,44,#20227,0,"1 && 2")
 #20229=@"loc,{#10000},14,1,14,6"
@@ -753,7 +753,7 @@ literals("2","2",#20231)
 #20232=*
 stmts(#20232,2,#20001,14,"1 || 2;")
 hasLocation(#20232,#20031)
-stmtContainers(#20232,#20001)
+stmt_containers(#20232,#20001)
 #20233=*
 exprs(#20233,45,#20232,0,"1 || 2")
 #20234=@"loc,{#10000},15,1,15,6"
diff --git a/javascript/extractor/tests/exprs/output/trap/comparison.js.trap b/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
index 6eb20593145..6747b99f606 100644
--- a/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
@@ -230,7 +230,7 @@ hasLocation(#20001,#20084)
 #20085=*
 stmts(#20085,2,#20001,0,"1 == 1;")
 hasLocation(#20085,#20003)
-stmtContainers(#20085,#20001)
+stmt_containers(#20085,#20001)
 #20086=*
 exprs(#20086,23,#20085,0,"1 == 1")
 #20087=@"loc,{#10000},1,1,1,6"
@@ -253,7 +253,7 @@ literals("1","1",#20089)
 #20090=*
 stmts(#20090,2,#20001,1,"1 != 2;")
 hasLocation(#20090,#20005)
-stmtContainers(#20090,#20001)
+stmt_containers(#20090,#20001)
 #20091=*
 exprs(#20091,24,#20090,0,"1 != 2")
 #20092=@"loc,{#10000},2,1,2,6"
@@ -276,7 +276,7 @@ literals("2","2",#20094)
 #20095=*
 stmts(#20095,2,#20001,2,"1 === 1;")
 hasLocation(#20095,#20007)
-stmtContainers(#20095,#20001)
+stmt_containers(#20095,#20001)
 #20096=*
 exprs(#20096,25,#20095,0,"1 === 1")
 #20097=@"loc,{#10000},3,1,3,7"
@@ -299,7 +299,7 @@ literals("1","1",#20099)
 #20100=*
 stmts(#20100,2,#20001,3,"1 !== 2;")
 hasLocation(#20100,#20009)
-stmtContainers(#20100,#20001)
+stmt_containers(#20100,#20001)
 #20101=*
 exprs(#20101,26,#20100,0,"1 !== 2")
 #20102=@"loc,{#10000},4,1,4,7"
@@ -322,7 +322,7 @@ literals("2","2",#20104)
 #20105=*
 stmts(#20105,2,#20001,4,"1 < 2;")
 hasLocation(#20105,#20011)
-stmtContainers(#20105,#20001)
+stmt_containers(#20105,#20001)
 #20106=*
 exprs(#20106,27,#20105,0,"1 < 2")
 #20107=@"loc,{#10000},5,1,5,5"
@@ -345,7 +345,7 @@ literals("2","2",#20109)
 #20110=*
 stmts(#20110,2,#20001,5,"1 <= 2;")
 hasLocation(#20110,#20013)
-stmtContainers(#20110,#20001)
+stmt_containers(#20110,#20001)
 #20111=*
 exprs(#20111,28,#20110,0,"1 <= 2")
 #20112=@"loc,{#10000},6,1,6,6"
@@ -368,7 +368,7 @@ literals("2","2",#20114)
 #20115=*
 stmts(#20115,2,#20001,6,"2 > 1;")
 hasLocation(#20115,#20015)
-stmtContainers(#20115,#20001)
+stmt_containers(#20115,#20001)
 #20116=*
 exprs(#20116,29,#20115,0,"2 > 1")
 #20117=@"loc,{#10000},7,1,7,5"
@@ -391,7 +391,7 @@ literals("1","1",#20119)
 #20120=*
 stmts(#20120,2,#20001,7,"2 >= 1;")
 hasLocation(#20120,#20017)
-stmtContainers(#20120,#20001)
+stmt_containers(#20120,#20001)
 #20121=*
 exprs(#20121,30,#20120,0,"2 >= 1")
 #20122=@"loc,{#10000},8,1,8,6"
diff --git a/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap b/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
index 5f08bfd8314..c4eef50115a 100644
--- a/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
@@ -80,7 +80,7 @@ hasLocation(#20001,#20003)
 #20028=*
 stmts(#20028,2,#20001,0,"f(function(){}, 23);")
 hasLocation(#20028,#20003)
-stmtContainers(#20028,#20001)
+stmt_containers(#20028,#20001)
 #20029=*
 exprs(#20029,13,#20028,0,"f(function(){}, 23)")
 #20030=@"loc,{#10000},1,1,1,19"
@@ -116,7 +116,7 @@ stmts(#20037,1,#20033,-2,"{}")
 #20038=@"loc,{#10000},1,13,1,14"
 locations_default(#20038,#10000,1,13,1,14)
 hasLocation(#20037,#20038)
-stmtContainers(#20037,#20033)
+stmt_containers(#20037,#20033)
 #20039=*
 exprs(#20039,3,#20029,1,"23")
 hasLocation(#20039,#20021)
diff --git a/javascript/extractor/tests/exprs/output/trap/others.js.trap b/javascript/extractor/tests/exprs/output/trap/others.js.trap
index 281b54d3d68..86206f33878 100644
--- a/javascript/extractor/tests/exprs/output/trap/others.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/others.js.trap
@@ -120,7 +120,7 @@ hasLocation(#20001,#20042)
 #20043=*
 stmts(#20043,2,#20001,0,"23, 42;")
 hasLocation(#20043,#20003)
-stmtContainers(#20043,#20001)
+stmt_containers(#20043,#20001)
 #20044=*
 exprs(#20044,10,#20043,0,"23, 42")
 #20045=@"loc,{#10000},1,1,1,6"
@@ -143,7 +143,7 @@ literals("42","42",#20047)
 #20048=*
 stmts(#20048,2,#20001,1,"23, 42, 56;")
 hasLocation(#20048,#20005)
-stmtContainers(#20048,#20001)
+stmt_containers(#20048,#20001)
 #20049=*
 exprs(#20049,10,#20048,0,"23, 42, 56")
 #20050=@"loc,{#10000},2,1,2,10"
@@ -172,7 +172,7 @@ literals("56","56",#20053)
 #20054=*
 stmts(#20054,2,#20001,2,"true ? 0 : 1;")
 hasLocation(#20054,#20007)
-stmtContainers(#20054,#20001)
+stmt_containers(#20054,#20001)
 #20055=*
 exprs(#20055,11,#20054,0,"true ? 0 : 1")
 #20056=@"loc,{#10000},3,1,3,12"
diff --git a/javascript/extractor/tests/exprs/output/trap/parens.js.trap b/javascript/extractor/tests/exprs/output/trap/parens.js.trap
index 95a4572f13e..f747a6fe59d 100644
--- a/javascript/extractor/tests/exprs/output/trap/parens.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/parens.js.trap
@@ -50,7 +50,7 @@ hasLocation(#20001,#20003)
 #20016=*
 stmts(#20016,2,#20001,0,"--(NaN);")
 hasLocation(#20016,#20003)
-stmtContainers(#20016,#20001)
+stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,61,#20016,0,"--(NaN)")
 #20018=@"loc,{#10000},1,1,1,7"
diff --git a/javascript/extractor/tests/exprs/output/trap/primaries.js.trap b/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
index adca8a268ea..2a944216a77 100644
--- a/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
@@ -855,7 +855,7 @@ hasLocation(#20001,#20324)
 #20325=*
 stmts(#20325,2,#20001,0,"null;")
 hasLocation(#20325,#20003)
-stmtContainers(#20325,#20001)
+stmt_containers(#20325,#20001)
 #20326=*
 exprs(#20326,1,#20325,0,"null")
 hasLocation(#20326,#20063)
@@ -865,7 +865,7 @@ literals("null","null",#20326)
 #20327=*
 stmts(#20327,2,#20001,1,"true;")
 hasLocation(#20327,#20005)
-stmtContainers(#20327,#20001)
+stmt_containers(#20327,#20001)
 #20328=*
 exprs(#20328,2,#20327,0,"true")
 hasLocation(#20328,#20067)
@@ -875,7 +875,7 @@ literals("true","true",#20328)
 #20329=*
 stmts(#20329,2,#20001,2,"false;")
 hasLocation(#20329,#20007)
-stmtContainers(#20329,#20001)
+stmt_containers(#20329,#20001)
 #20330=*
 exprs(#20330,2,#20329,0,"false")
 hasLocation(#20330,#20071)
@@ -885,7 +885,7 @@ literals("false","false",#20330)
 #20331=*
 stmts(#20331,2,#20001,3,"23;")
 hasLocation(#20331,#20009)
-stmtContainers(#20331,#20001)
+stmt_containers(#20331,#20001)
 #20332=*
 exprs(#20332,3,#20331,0,"23")
 hasLocation(#20332,#20075)
@@ -895,7 +895,7 @@ literals("23","23",#20332)
 #20333=*
 stmts(#20333,2,#20001,4,"2.3;")
 hasLocation(#20333,#20011)
-stmtContainers(#20333,#20001)
+stmt_containers(#20333,#20001)
 #20334=*
 exprs(#20334,3,#20333,0,"2.3")
 hasLocation(#20334,#20079)
@@ -905,7 +905,7 @@ literals("2.3","2.3",#20334)
 #20335=*
 stmts(#20335,2,#20001,5,".42;")
 hasLocation(#20335,#20013)
-stmtContainers(#20335,#20001)
+stmt_containers(#20335,#20001)
 #20336=*
 exprs(#20336,3,#20335,0,".42")
 hasLocation(#20336,#20083)
@@ -915,7 +915,7 @@ literals("0.42",".42",#20336)
 #20337=*
 stmts(#20337,2,#20001,6,"7.6e23;")
 hasLocation(#20337,#20015)
-stmtContainers(#20337,#20001)
+stmt_containers(#20337,#20001)
 #20338=*
 exprs(#20338,3,#20337,0,"7.6e23")
 hasLocation(#20338,#20087)
@@ -925,7 +925,7 @@ literals("7.6E23","7.6e23",#20338)
 #20339=*
 stmts(#20339,2,#20001,7,"1E-42;")
 hasLocation(#20339,#20017)
-stmtContainers(#20339,#20001)
+stmt_containers(#20339,#20001)
 #20340=*
 exprs(#20340,3,#20339,0,"1E-42")
 hasLocation(#20340,#20091)
@@ -935,7 +935,7 @@ literals("1.0E-42","1E-42",#20340)
 #20341=*
 stmts(#20341,2,#20001,8,"0xdeadbeef;")
 hasLocation(#20341,#20019)
-stmtContainers(#20341,#20001)
+stmt_containers(#20341,#20001)
 #20342=*
 exprs(#20342,3,#20341,0,"0xdeadbeef")
 hasLocation(#20342,#20095)
@@ -945,7 +945,7 @@ literals("3735928559","0xdeadbeef",#20342)
 #20343=*
 stmts(#20343,2,#20001,9,"""Hello"";")
 hasLocation(#20343,#20021)
-stmtContainers(#20343,#20001)
+stmt_containers(#20343,#20001)
 #20344=*
 exprs(#20344,4,#20343,0,"""Hello""")
 hasLocation(#20344,#20099)
@@ -961,7 +961,7 @@ regexpConstValue(#20345,"Hello")
 #20347=*
 stmts(#20347,2,#20001,10,"'world';")
 hasLocation(#20347,#20023)
-stmtContainers(#20347,#20001)
+stmt_containers(#20347,#20001)
 #20348=*
 exprs(#20348,4,#20347,0,"'world'")
 hasLocation(#20348,#20103)
@@ -977,7 +977,7 @@ regexpConstValue(#20349,"world")
 #20351=*
 stmts(#20351,2,#20001,11,"""'what?'\x0a"";")
 hasLocation(#20351,#20025)
-stmtContainers(#20351,#20001)
+stmt_containers(#20351,#20001)
 #20352=*
 exprs(#20352,4,#20351,0,"""'what?'\x0a""")
 hasLocation(#20352,#20107)
@@ -1020,7 +1020,7 @@ regexpConstValue(#20361,"'
 #20363=*
 stmts(#20363,2,#20001,12,"'""why?""\n';")
 hasLocation(#20363,#20027)
-stmtContainers(#20363,#20001)
+stmt_containers(#20363,#20001)
 #20364=*
 exprs(#20364,4,#20363,0,"'""why?""\n'")
 hasLocation(#20364,#20111)
@@ -1063,7 +1063,7 @@ regexpConstValue(#20373,"""
 #20375=*
 stmts(#20375,2,#20001,13,"/^(need?le)+/gi;")
 hasLocation(#20375,#20029)
-stmtContainers(#20375,#20001)
+stmt_containers(#20375,#20001)
 #20376=*
 exprs(#20376,5,#20375,0,"/^(need?le)+/gi")
 hasLocation(#20376,#20115)
@@ -1124,7 +1124,7 @@ regexpConstValue(#20393,"le")
 #20395=*
 stmts(#20395,2,#20001,14,"(23);")
 hasLocation(#20395,#20031)
-stmtContainers(#20395,#20001)
+stmt_containers(#20395,#20001)
 #20396=*
 exprs(#20396,63,#20395,0,"(23)")
 #20397=@"loc,{#10000},15,1,15,4"
@@ -1141,7 +1141,7 @@ literals("23","23",#20398)
 #20399=*
 stmts(#20399,2,#20001,15,"[23, 42, , ""hi"" ];")
 hasLocation(#20399,#20033)
-stmtContainers(#20399,#20001)
+stmt_containers(#20399,#20001)
 #20400=*
 exprs(#20400,7,#20399,0,"[23, 42, , ""hi"" ]")
 #20401=@"loc,{#10000},16,1,16,17"
@@ -1179,7 +1179,7 @@ stmts(#20407,2,#20001,16,"({ x: 2 ... ) {}});")
 #20408=@"loc,{#10000},17,1,21,17"
 locations_default(#20408,#10000,17,1,21,17)
 hasLocation(#20407,#20408)
-stmtContainers(#20407,#20001)
+stmt_containers(#20407,#20001)
 #20409=*
 exprs(#20409,63,#20407,0,"({ x: 2 ... v) {}})")
 #20410=@"loc,{#10000},17,1,21,16"
@@ -1257,7 +1257,7 @@ stmts(#20428,1,#20424,-2,"{}")
 #20429=@"loc,{#10000},19,12,19,13"
 locations_default(#20429,#10000,19,12,19,13)
 hasLocation(#20428,#20429)
-stmtContainers(#20428,#20424)
+stmt_containers(#20428,#20424)
 #20430=*
 properties(#20430,#20411,3,1,"get p() {}")
 #20431=@"loc,{#10000},20,4,20,13"
@@ -1288,7 +1288,7 @@ stmts(#20437,1,#20433,-2,"{}")
 #20438=@"loc,{#10000},20,12,20,13"
 locations_default(#20438,#10000,20,12,20,13)
 hasLocation(#20437,#20438)
-stmtContainers(#20437,#20433)
+stmt_containers(#20437,#20433)
 #20439=*
 properties(#20439,#20411,4,2,"set p(v) {}")
 #20440=@"loc,{#10000},21,4,21,14"
@@ -1327,11 +1327,11 @@ stmts(#20448,1,#20442,-2,"{}")
 #20449=@"loc,{#10000},21,13,21,14"
 locations_default(#20449,#10000,21,13,21,14)
 hasLocation(#20448,#20449)
-stmtContainers(#20448,#20442)
+stmt_containers(#20448,#20442)
 #20450=*
 stmts(#20450,2,#20001,17,"new Array;")
 hasLocation(#20450,#20045)
-stmtContainers(#20450,#20001)
+stmt_containers(#20450,#20001)
 #20451=*
 exprs(#20451,12,#20450,0,"new Array")
 #20452=@"loc,{#10000},22,1,22,9"
@@ -1351,7 +1351,7 @@ bind(#20453,#20454)
 #20455=*
 stmts(#20455,2,#20001,18,"new Object();")
 hasLocation(#20455,#20047)
-stmtContainers(#20455,#20001)
+stmt_containers(#20455,#20001)
 #20456=*
 exprs(#20456,12,#20455,0,"new Object()")
 #20457=@"loc,{#10000},23,1,23,12"
@@ -1371,7 +1371,7 @@ bind(#20458,#20459)
 #20460=*
 stmts(#20460,2,#20001,19,"new String(""hi"");")
 hasLocation(#20460,#20049)
-stmtContainers(#20460,#20001)
+stmt_containers(#20460,#20001)
 #20461=*
 exprs(#20461,12,#20460,0,"new String(""hi"")")
 #20462=@"loc,{#10000},24,1,24,16"
@@ -1403,7 +1403,7 @@ regexpConstValue(#20466,"hi")
 #20468=*
 stmts(#20468,2,#20001,20,"String("""");")
 hasLocation(#20468,#20051)
-stmtContainers(#20468,#20001)
+stmt_containers(#20468,#20001)
 #20469=*
 exprs(#20469,13,#20468,0,"String("""")")
 #20470=@"loc,{#10000},25,1,25,10"
@@ -1432,7 +1432,7 @@ hasLocation(#20473,#20474)
 #20475=*
 stmts(#20475,2,#20001,21,"Object.create({});")
 hasLocation(#20475,#20053)
-stmtContainers(#20475,#20001)
+stmt_containers(#20475,#20001)
 #20476=*
 exprs(#20476,13,#20475,0,"Object.create({})")
 #20477=@"loc,{#10000},26,1,26,17"
@@ -1470,7 +1470,7 @@ exprContainers(#20482,#20001)
 #20484=*
 stmts(#20484,2,#20001,22,"String[ ... rse()];")
 hasLocation(#20484,#20055)
-stmtContainers(#20484,#20001)
+stmt_containers(#20484,#20001)
 #20485=*
 exprs(#20485,15,#20484,0,"String[ ... erse()]")
 #20486=@"loc,{#10000},27,1,27,29"
@@ -1520,7 +1520,7 @@ literals("reverse","reverse",#20495)
 #20496=*
 stmts(#20496,2,#20001,23,"[,,];")
 hasLocation(#20496,#20057)
-stmtContainers(#20496,#20001)
+stmt_containers(#20496,#20001)
 #20497=*
 exprs(#20497,7,#20496,0,"[,,]")
 #20498=@"loc,{#10000},28,1,28,4"
@@ -1532,7 +1532,7 @@ arraySize(#20497,2)
 #20499=*
 stmts(#20499,2,#20001,24,"[1,];")
 hasLocation(#20499,#20059)
-stmtContainers(#20499,#20001)
+stmt_containers(#20499,#20001)
 #20500=*
 exprs(#20500,7,#20499,0,"[1,]")
 #20501=@"loc,{#10000},29,1,29,4"
@@ -1550,7 +1550,7 @@ arraySize(#20500,1)
 #20503=*
 stmts(#20503,2,#20001,25,"({ z: 56, });")
 hasLocation(#20503,#20061)
-stmtContainers(#20503,#20001)
+stmt_containers(#20503,#20001)
 #20504=*
 exprs(#20504,63,#20503,0,"({ z: 56, })")
 #20505=@"loc,{#10000},30,1,30,12"
diff --git a/javascript/extractor/tests/exprs/output/trap/regexp.js.trap b/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
index 84dd57d3a17..77bc7ec0bfd 100644
--- a/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
@@ -725,7 +725,7 @@ hasLocation(#20001,#20268)
 #20269=*
 stmts(#20269,2,#20001,0,"/t/;")
 hasLocation(#20269,#20003)
-stmtContainers(#20269,#20001)
+stmt_containers(#20269,#20001)
 #20270=*
 exprs(#20270,5,#20269,0,"/t/")
 hasLocation(#20270,#20091)
@@ -741,7 +741,7 @@ regexpConstValue(#20271,"t")
 #20273=*
 stmts(#20273,2,#20001,1,"/foo|bar/;")
 hasLocation(#20273,#20005)
-stmtContainers(#20273,#20001)
+stmt_containers(#20273,#20001)
 #20274=*
 exprs(#20274,5,#20273,0,"/foo|bar/")
 hasLocation(#20274,#20095)
@@ -768,7 +768,7 @@ regexpConstValue(#20279,"bar")
 #20281=*
 stmts(#20281,2,#20001,2,"/(?:)/;")
 hasLocation(#20281,#20007)
-stmtContainers(#20281,#20001)
+stmt_containers(#20281,#20001)
 #20282=*
 exprs(#20282,5,#20281,0,"/(?:)/")
 hasLocation(#20282,#20099)
@@ -788,7 +788,7 @@ hasLocation(#20285,#20286)
 #20287=*
 stmts(#20287,2,#20001,3,"/^abc$/;")
 hasLocation(#20287,#20009)
-stmtContainers(#20287,#20001)
+stmt_containers(#20287,#20001)
 #20288=*
 exprs(#20288,5,#20287,0,"/^abc$/")
 hasLocation(#20288,#20103)
@@ -819,7 +819,7 @@ hasLocation(#20295,#20296)
 #20297=*
 stmts(#20297,2,#20001,4,"/\bx\b/;")
 hasLocation(#20297,#20011)
-stmtContainers(#20297,#20001)
+stmt_containers(#20297,#20001)
 #20298=*
 exprs(#20298,5,#20297,0,"/\bx\b/")
 hasLocation(#20298,#20107)
@@ -850,7 +850,7 @@ hasLocation(#20305,#20306)
 #20307=*
 stmts(#20307,2,#20001,5,"/\bx\B/;")
 hasLocation(#20307,#20013)
-stmtContainers(#20307,#20001)
+stmt_containers(#20307,#20001)
 #20308=*
 exprs(#20308,5,#20307,0,"/\bx\B/")
 hasLocation(#20308,#20111)
@@ -881,7 +881,7 @@ hasLocation(#20315,#20316)
 #20317=*
 stmts(#20317,2,#20001,6,"/x(?=y)/;")
 hasLocation(#20317,#20015)
-stmtContainers(#20317,#20001)
+stmt_containers(#20317,#20001)
 #20318=*
 exprs(#20318,5,#20317,0,"/x(?=y)/")
 hasLocation(#20318,#20115)
@@ -913,7 +913,7 @@ regexpConstValue(#20325,"y")
 #20327=*
 stmts(#20327,2,#20001,7,"/x(?!z)/;")
 hasLocation(#20327,#20017)
-stmtContainers(#20327,#20001)
+stmt_containers(#20327,#20001)
 #20328=*
 exprs(#20328,5,#20327,0,"/x(?!z)/")
 hasLocation(#20328,#20119)
@@ -945,7 +945,7 @@ regexpConstValue(#20335,"z")
 #20337=*
 stmts(#20337,2,#20001,8,"/a*/;")
 hasLocation(#20337,#20019)
-stmtContainers(#20337,#20001)
+stmt_containers(#20337,#20001)
 #20338=*
 exprs(#20338,5,#20337,0,"/a*/")
 hasLocation(#20338,#20123)
@@ -967,7 +967,7 @@ regexpConstValue(#20341,"a")
 #20343=*
 stmts(#20343,2,#20001,9,"/a*?/;")
 hasLocation(#20343,#20021)
-stmtContainers(#20343,#20001)
+stmt_containers(#20343,#20001)
 #20344=*
 exprs(#20344,5,#20343,0,"/a*?/")
 hasLocation(#20344,#20127)
@@ -988,7 +988,7 @@ regexpConstValue(#20347,"a")
 #20349=*
 stmts(#20349,2,#20001,10,"/a+/;")
 hasLocation(#20349,#20023)
-stmtContainers(#20349,#20001)
+stmt_containers(#20349,#20001)
 #20350=*
 exprs(#20350,5,#20349,0,"/a+/")
 hasLocation(#20350,#20131)
@@ -1010,7 +1010,7 @@ regexpConstValue(#20353,"a")
 #20355=*
 stmts(#20355,2,#20001,11,"/a+?/;")
 hasLocation(#20355,#20025)
-stmtContainers(#20355,#20001)
+stmt_containers(#20355,#20001)
 #20356=*
 exprs(#20356,5,#20355,0,"/a+?/")
 hasLocation(#20356,#20135)
@@ -1031,7 +1031,7 @@ regexpConstValue(#20359,"a")
 #20361=*
 stmts(#20361,2,#20001,12,"/a?/;")
 hasLocation(#20361,#20027)
-stmtContainers(#20361,#20001)
+stmt_containers(#20361,#20001)
 #20362=*
 exprs(#20362,5,#20361,0,"/a?/")
 hasLocation(#20362,#20139)
@@ -1053,7 +1053,7 @@ regexpConstValue(#20365,"a")
 #20367=*
 stmts(#20367,2,#20001,13,"/a??/;")
 hasLocation(#20367,#20029)
-stmtContainers(#20367,#20001)
+stmt_containers(#20367,#20001)
 #20368=*
 exprs(#20368,5,#20367,0,"/a??/")
 hasLocation(#20368,#20143)
@@ -1074,7 +1074,7 @@ regexpConstValue(#20371,"a")
 #20373=*
 stmts(#20373,2,#20001,14,"/a{1}/;")
 hasLocation(#20373,#20031)
-stmtContainers(#20373,#20001)
+stmt_containers(#20373,#20001)
 #20374=*
 exprs(#20374,5,#20373,0,"/a{1}/")
 hasLocation(#20374,#20147)
@@ -1098,7 +1098,7 @@ regexpConstValue(#20377,"a")
 #20379=*
 stmts(#20379,2,#20001,15,"/a{1,}/;")
 hasLocation(#20379,#20033)
-stmtContainers(#20379,#20001)
+stmt_containers(#20379,#20001)
 #20380=*
 exprs(#20380,5,#20379,0,"/a{1,}/")
 hasLocation(#20380,#20151)
@@ -1121,7 +1121,7 @@ regexpConstValue(#20383,"a")
 #20385=*
 stmts(#20385,2,#20001,16,"/a{1,2}/;")
 hasLocation(#20385,#20035)
-stmtContainers(#20385,#20001)
+stmt_containers(#20385,#20001)
 #20386=*
 exprs(#20386,5,#20385,0,"/a{1,2}/")
 hasLocation(#20386,#20155)
@@ -1145,7 +1145,7 @@ regexpConstValue(#20389,"a")
 #20391=*
 stmts(#20391,2,#20001,17,"/a{1}?/;")
 hasLocation(#20391,#20037)
-stmtContainers(#20391,#20001)
+stmt_containers(#20391,#20001)
 #20392=*
 exprs(#20392,5,#20391,0,"/a{1}?/")
 hasLocation(#20392,#20159)
@@ -1168,7 +1168,7 @@ regexpConstValue(#20395,"a")
 #20397=*
 stmts(#20397,2,#20001,18,"/a{1,}?/;")
 hasLocation(#20397,#20039)
-stmtContainers(#20397,#20001)
+stmt_containers(#20397,#20001)
 #20398=*
 exprs(#20398,5,#20397,0,"/a{1,}?/")
 hasLocation(#20398,#20163)
@@ -1190,7 +1190,7 @@ regexpConstValue(#20401,"a")
 #20403=*
 stmts(#20403,2,#20001,19,"/a{1,2}?/;")
 hasLocation(#20403,#20041)
-stmtContainers(#20403,#20001)
+stmt_containers(#20403,#20001)
 #20404=*
 exprs(#20404,5,#20403,0,"/a{1,2}?/")
 hasLocation(#20404,#20167)
@@ -1213,7 +1213,7 @@ regexpConstValue(#20407,"a")
 #20409=*
 stmts(#20409,2,#20001,20,"/./;")
 hasLocation(#20409,#20043)
-stmtContainers(#20409,#20001)
+stmt_containers(#20409,#20001)
 #20410=*
 exprs(#20410,5,#20409,0,"/./")
 hasLocation(#20410,#20171)
@@ -1228,7 +1228,7 @@ hasLocation(#20411,#20412)
 #20413=*
 stmts(#20413,2,#20001,21,"/(abc)/;")
 hasLocation(#20413,#20045)
-stmtContainers(#20413,#20001)
+stmt_containers(#20413,#20001)
 #20414=*
 exprs(#20414,5,#20413,0,"/(abc)/")
 hasLocation(#20414,#20175)
@@ -1250,7 +1250,7 @@ regexpConstValue(#20417,"abc")
 #20419=*
 stmts(#20419,2,#20001,22,"/(?:abc)/;")
 hasLocation(#20419,#20047)
-stmtContainers(#20419,#20001)
+stmt_containers(#20419,#20001)
 #20420=*
 exprs(#20420,5,#20419,0,"/(?:abc)/")
 hasLocation(#20420,#20179)
@@ -1271,7 +1271,7 @@ regexpConstValue(#20423,"abc")
 #20425=*
 stmts(#20425,2,#20001,23,"/\x0a/;")
 hasLocation(#20425,#20049)
-stmtContainers(#20425,#20001)
+stmt_containers(#20425,#20001)
 #20426=*
 exprs(#20426,5,#20425,0,"/\x0a/")
 hasLocation(#20426,#20183)
@@ -1288,7 +1288,7 @@ regexpConstValue(#20427,"
 #20429=*
 stmts(#20429,2,#20001,24,"/\u000a/;")
 hasLocation(#20429,#20051)
-stmtContainers(#20429,#20001)
+stmt_containers(#20429,#20001)
 #20430=*
 exprs(#20430,5,#20429,0,"/\u000a/")
 hasLocation(#20430,#20187)
@@ -1305,7 +1305,7 @@ regexpConstValue(#20431,"
 #20433=*
 stmts(#20433,2,#20001,25,"/\10/;")
 hasLocation(#20433,#20053)
-stmtContainers(#20433,#20001)
+stmt_containers(#20433,#20001)
 #20434=*
 exprs(#20434,5,#20433,0,"/\10/")
 hasLocation(#20434,#20191)
@@ -1324,7 +1324,7 @@ hasLocation(#20437,#20436)
 #20438=*
 stmts(#20438,2,#20001,26,"/\t\n\r\f\v/;")
 hasLocation(#20438,#20055)
-stmtContainers(#20438,#20001)
+stmt_containers(#20438,#20001)
 #20439=*
 exprs(#20439,5,#20438,0,"/\t\n\r\f\v/")
 hasLocation(#20439,#20195)
@@ -1370,7 +1370,7 @@ regexpConstValue(#20450,"")
 #20452=*
 stmts(#20452,2,#20001,27,"/\ca\cN/;")
 hasLocation(#20452,#20057)
-stmtContainers(#20452,#20001)
+stmt_containers(#20452,#20001)
 #20453=*
 exprs(#20453,5,#20452,0,"/\ca\cN/")
 hasLocation(#20453,#20199)
@@ -1397,7 +1397,7 @@ regexpConstValue(#20458,"")
 #20460=*
 stmts(#20460,2,#20001,28,"/\w\S/;")
 hasLocation(#20460,#20059)
-stmtContainers(#20460,#20001)
+stmt_containers(#20460,#20001)
 #20461=*
 exprs(#20461,5,#20460,0,"/\w\S/")
 hasLocation(#20461,#20203)
@@ -1424,7 +1424,7 @@ charClassEscape(#20466,"S")
 #20468=*
 stmts(#20468,2,#20001,29,"/\\/;")
 hasLocation(#20468,#20061)
-stmtContainers(#20468,#20001)
+stmt_containers(#20468,#20001)
 #20469=*
 exprs(#20469,5,#20468,0,"/\\/")
 hasLocation(#20469,#20207)
@@ -1440,7 +1440,7 @@ regexpConstValue(#20470,"\")
 #20472=*
 stmts(#20472,2,#20001,30,"/[abc]/;")
 hasLocation(#20472,#20063)
-stmtContainers(#20472,#20001)
+stmt_containers(#20472,#20001)
 #20473=*
 exprs(#20473,5,#20472,0,"/[abc]/")
 hasLocation(#20473,#20211)
@@ -1473,7 +1473,7 @@ regexpConstValue(#20480,"c")
 #20482=*
 stmts(#20482,2,#20001,31,"/[a-z]/;")
 hasLocation(#20482,#20065)
-stmtContainers(#20482,#20001)
+stmt_containers(#20482,#20001)
 #20483=*
 exprs(#20483,5,#20482,0,"/[a-z]/")
 hasLocation(#20483,#20215)
@@ -1505,7 +1505,7 @@ regexpConstValue(#20490,"z")
 #20492=*
 stmts(#20492,2,#20001,32,"/[a-zA-Z]/;")
 hasLocation(#20492,#20067)
-stmtContainers(#20492,#20001)
+stmt_containers(#20492,#20001)
 #20493=*
 exprs(#20493,5,#20492,0,"/[a-zA-Z]/")
 hasLocation(#20493,#20219)
@@ -1554,7 +1554,7 @@ regexpConstValue(#20506,"Z")
 #20508=*
 stmts(#20508,2,#20001,33,"/[-a-z]/;")
 hasLocation(#20508,#20069)
-stmtContainers(#20508,#20001)
+stmt_containers(#20508,#20001)
 #20509=*
 exprs(#20509,5,#20508,0,"/[-a-z]/")
 hasLocation(#20509,#20223)
@@ -1592,7 +1592,7 @@ regexpConstValue(#20518,"z")
 #20520=*
 stmts(#20520,2,#20001,34,"/[^a-z]/;")
 hasLocation(#20520,#20071)
-stmtContainers(#20520,#20001)
+stmt_containers(#20520,#20001)
 #20521=*
 exprs(#20521,5,#20520,0,"/[^a-z]/")
 hasLocation(#20521,#20227)
@@ -1625,7 +1625,7 @@ regexpConstValue(#20528,"z")
 #20530=*
 stmts(#20530,2,#20001,35,"/[a\b\x0c]/;")
 hasLocation(#20530,#20073)
-stmtContainers(#20530,#20001)
+stmt_containers(#20530,#20001)
 #20531=*
 exprs(#20531,5,#20530,0,"/[a\b\x0c]/")
 hasLocation(#20531,#20231)
@@ -1658,7 +1658,7 @@ regexpConstValue(#20538,"")
 #20540=*
 stmts(#20540,2,#20001,36,"/a{/;")
 hasLocation(#20540,#20075)
-stmtContainers(#20540,#20001)
+stmt_containers(#20540,#20001)
 #20541=*
 exprs(#20541,5,#20540,0,"/a{/")
 hasLocation(#20541,#20235)
@@ -1692,7 +1692,7 @@ hasLocation(#20548,#20549)
 #20550=*
 stmts(#20550,2,#20001,37,"/a{b}/;")
 hasLocation(#20550,#20077)
-stmtContainers(#20550,#20001)
+stmt_containers(#20550,#20001)
 #20551=*
 exprs(#20551,5,#20550,0,"/a{b}/")
 hasLocation(#20551,#20239)
@@ -1744,7 +1744,7 @@ hasLocation(#20565,#20561)
 #20566=*
 stmts(#20566,2,#20001,38,"/a{2/;")
 hasLocation(#20566,#20079)
-stmtContainers(#20566,#20001)
+stmt_containers(#20566,#20001)
 #20567=*
 exprs(#20567,5,#20566,0,"/a{2/")
 hasLocation(#20567,#20243)
@@ -1773,7 +1773,7 @@ hasLocation(#20572,#20573)
 #20574=*
 stmts(#20574,2,#20001,39,"/\xa/;")
 hasLocation(#20574,#20081)
-stmtContainers(#20574,#20001)
+stmt_containers(#20574,#20001)
 #20575=*
 exprs(#20575,5,#20574,0,"/\xa/")
 hasLocation(#20575,#20247)
@@ -1795,7 +1795,7 @@ hasLocation(#20578,#20579)
 #20580=*
 stmts(#20580,2,#20001,40,"/\c0/;")
 hasLocation(#20580,#20083)
-stmtContainers(#20580,#20001)
+stmt_containers(#20580,#20001)
 #20581=*
 exprs(#20581,5,#20580,0,"/\c0/")
 hasLocation(#20581,#20251)
@@ -1816,7 +1816,7 @@ hasLocation(#20584,#20585)
 #20586=*
 stmts(#20586,2,#20001,41,"/[]/;")
 hasLocation(#20586,#20085)
-stmtContainers(#20586,#20001)
+stmt_containers(#20586,#20001)
 #20587=*
 exprs(#20587,5,#20586,0,"/[]/")
 hasLocation(#20587,#20255)
@@ -1831,7 +1831,7 @@ hasLocation(#20588,#20589)
 #20590=*
 stmts(#20590,2,#20001,42,"/[^]/;")
 hasLocation(#20590,#20087)
-stmtContainers(#20590,#20001)
+stmt_containers(#20590,#20001)
 #20591=*
 exprs(#20591,5,#20590,0,"/[^]/")
 hasLocation(#20591,#20259)
@@ -1847,7 +1847,7 @@ isInverted(#20592)
 #20594=*
 stmts(#20594,2,#20001,43,"/<tpl\b ... /tpl>/;")
 hasLocation(#20594,#20089)
-stmtContainers(#20594,#20001)
+stmt_containers(#20594,#20001)
 #20595=*
 exprs(#20595,5,#20594,0,"/<tpl\b ... \/tpl>/")
 hasLocation(#20595,#20263)
diff --git a/javascript/extractor/tests/exprs/output/trap/unary.js.trap b/javascript/extractor/tests/exprs/output/trap/unary.js.trap
index 5fc8edaa134..0ff7d3d5285 100644
--- a/javascript/extractor/tests/exprs/output/trap/unary.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/unary.js.trap
@@ -188,7 +188,7 @@ hasLocation(#20001,#20068)
 #20069=*
 stmts(#20069,2,#20001,0,"-23;")
 hasLocation(#20069,#20003)
-stmtContainers(#20069,#20001)
+stmt_containers(#20069,#20001)
 #20070=*
 exprs(#20070,16,#20069,0,"-23")
 #20071=@"loc,{#10000},1,1,1,3"
@@ -205,7 +205,7 @@ literals("23","23",#20072)
 #20073=*
 stmts(#20073,2,#20001,1,"+42;")
 hasLocation(#20073,#20005)
-stmtContainers(#20073,#20001)
+stmt_containers(#20073,#20001)
 #20074=*
 exprs(#20074,17,#20073,0,"+42")
 #20075=@"loc,{#10000},2,1,2,3"
@@ -222,7 +222,7 @@ literals("42","42",#20076)
 #20077=*
 stmts(#20077,2,#20001,2,"!true;")
 hasLocation(#20077,#20007)
-stmtContainers(#20077,#20001)
+stmt_containers(#20077,#20001)
 #20078=*
 exprs(#20078,18,#20077,0,"!true")
 #20079=@"loc,{#10000},3,1,3,5"
@@ -239,7 +239,7 @@ literals("true","true",#20080)
 #20081=*
 stmts(#20081,2,#20001,3,"~2;")
 hasLocation(#20081,#20009)
-stmtContainers(#20081,#20001)
+stmt_containers(#20081,#20001)
 #20082=*
 exprs(#20082,19,#20081,0,"~2")
 #20083=@"loc,{#10000},4,1,4,2"
@@ -256,7 +256,7 @@ literals("2","2",#20084)
 #20085=*
 stmts(#20085,2,#20001,4,"typeof Object;")
 hasLocation(#20085,#20011)
-stmtContainers(#20085,#20001)
+stmt_containers(#20085,#20001)
 #20086=*
 exprs(#20086,20,#20085,0,"typeof Object")
 #20087=@"loc,{#10000},5,1,5,13"
@@ -276,7 +276,7 @@ bind(#20088,#20089)
 #20090=*
 stmts(#20090,2,#20001,5,"void(0);")
 hasLocation(#20090,#20013)
-stmtContainers(#20090,#20001)
+stmt_containers(#20090,#20001)
 #20091=*
 exprs(#20091,21,#20090,0,"void(0)")
 #20092=@"loc,{#10000},6,1,6,7"
@@ -300,7 +300,7 @@ literals("0","0",#20095)
 #20096=*
 stmts(#20096,2,#20001,6,"delete  ... totype;")
 hasLocation(#20096,#20015)
-stmtContainers(#20096,#20001)
+stmt_containers(#20096,#20001)
 #20097=*
 exprs(#20097,22,#20096,0,"delete  ... ototype")
 #20098=@"loc,{#10000},7,1,7,23"
diff --git a/javascript/extractor/tests/exprs/output/trap/update.js.trap b/javascript/extractor/tests/exprs/output/trap/update.js.trap
index 1e655b2174f..78c32ab11ca 100644
--- a/javascript/extractor/tests/exprs/output/trap/update.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/update.js.trap
@@ -106,7 +106,7 @@ hasLocation(#20001,#20036)
 #20037=*
 stmts(#20037,2,#20001,0,"++a;")
 hasLocation(#20037,#20003)
-stmtContainers(#20037,#20001)
+stmt_containers(#20037,#20001)
 #20038=*
 exprs(#20038,59,#20037,0,"++a")
 #20039=@"loc,{#10000},1,1,1,3"
@@ -126,7 +126,7 @@ bind(#20040,#20041)
 #20042=*
 stmts(#20042,2,#20001,1,"a++;")
 hasLocation(#20042,#20005)
-stmtContainers(#20042,#20001)
+stmt_containers(#20042,#20001)
 #20043=*
 exprs(#20043,60,#20042,0,"a++")
 #20044=@"loc,{#10000},2,1,2,3"
@@ -144,7 +144,7 @@ bind(#20045,#20041)
 #20046=*
 stmts(#20046,2,#20001,2,"--b;")
 hasLocation(#20046,#20007)
-stmtContainers(#20046,#20001)
+stmt_containers(#20046,#20001)
 #20047=*
 exprs(#20047,61,#20046,0,"--b")
 #20048=@"loc,{#10000},3,1,3,3"
@@ -164,7 +164,7 @@ bind(#20049,#20050)
 #20051=*
 stmts(#20051,2,#20001,3,"b--;")
 hasLocation(#20051,#20009)
-stmtContainers(#20051,#20001)
+stmt_containers(#20051,#20001)
 #20052=*
 exprs(#20052,62,#20051,0,"b--")
 #20053=@"loc,{#10000},4,1,4,3"
diff --git a/javascript/extractor/tests/extensions/output/trap/tst.es6.trap b/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
index fe781a97502..94adb82cb57 100644
--- a/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
@@ -69,7 +69,7 @@ is_es2015_module(#20001)
 #20022=*
 stmts(#20022,2,#20001,0,"console ...  ES6"");")
 hasLocation(#20022,#20003)
-stmtContainers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
 exprs(#20023,13,#20022,0,"console ... o ES6"")")
 #20024=@"loc,{#10000},1,1,1,24"
diff --git a/javascript/extractor/tests/extensions/output/trap/tst2.es.trap b/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
index 41c3aba8cf3..26166090e1a 100644
--- a/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
@@ -69,7 +69,7 @@ is_es2015_module(#20001)
 #20022=*
 stmts(#20022,2,#20001,0,"console ... o ES"");")
 hasLocation(#20022,#20003)
-stmtContainers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
 exprs(#20023,13,#20022,0,"console ... lo ES"")")
 #20024=@"loc,{#10000},1,1,1,23"
diff --git a/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap b/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
index a8c9be20399..75a03a27a03 100644
--- a/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
@@ -88,7 +88,7 @@ is_module(#20001)
 #20032=*
 stmts(#20032,2,#20001,0,"console ... onJS"");")
 hasLocation(#20032,#20003)
-stmtContainers(#20032,#20001)
+stmt_containers(#20032,#20001)
 #20033=*
 exprs(#20033,13,#20032,0,"console ... monJS"")")
 #20034=@"loc,{#10000},1,1,1,29"
diff --git a/javascript/extractor/tests/externs/output/trap/Point.js.trap b/javascript/extractor/tests/externs/output/trap/Point.js.trap
index f7934a34ad4..97888b032a4 100644
--- a/javascript/extractor/tests/externs/output/trap/Point.js.trap
+++ b/javascript/extractor/tests/externs/output/trap/Point.js.trap
@@ -486,7 +486,7 @@ variables(#20183,"MyString",#20000)
 #20184=*
 stmts(#20184,17,#20001,0,"functio ... , y) {}")
 hasLocation(#20184,#20005)
-stmtContainers(#20184,#20001)
+stmt_containers(#20184,#20001)
 #20185=*
 exprs(#20185,78,#20184,-1,"Point")
 hasLocation(#20185,#20040)
@@ -521,11 +521,11 @@ stmts(#20192,1,#20184,-2,"{}")
 #20193=@"loc,{#10000},1,22,1,23"
 locations_default(#20193,#10000,1,22,1,23)
 hasLocation(#20192,#20193)
-stmtContainers(#20192,#20184)
+stmt_containers(#20192,#20184)
 #20194=*
 stmts(#20194,2,#20001,1,"Point.p ... dy) {};")
 hasLocation(#20194,#20009)
-stmtContainers(#20194,#20001)
+stmt_containers(#20194,#20001)
 #20195=*
 exprs(#20195,47,#20194,0,"Point.p ...  dy) {}")
 #20196=@"loc,{#10000},3,1,3,42"
@@ -601,11 +601,11 @@ stmts(#20212,1,#20204,-2,"{}")
 #20213=@"loc,{#10000},3,41,3,42"
 locations_default(#20213,#10000,3,41,3,42)
 hasLocation(#20212,#20213)
-stmtContainers(#20212,#20204)
+stmt_containers(#20212,#20204)
 #20214=*
 stmts(#20214,2,#20001,2,"Point.p ... j = {};")
 hasLocation(#20214,#20011)
-stmtContainers(#20214,#20001)
+stmt_containers(#20214,#20001)
 #20215=*
 exprs(#20215,47,#20214,0,"Point.p ... bj = {}")
 #20216=@"loc,{#10000},4,1,4,24"
@@ -656,7 +656,7 @@ exprContainers(#20224,#20001)
 #20226=*
 stmts(#20226,2,#20001,3,"Point.p ... secret;")
 hasLocation(#20226,#20013)
-stmtContainers(#20226,#20001)
+stmt_containers(#20226,#20001)
 #20227=*
 exprs(#20227,14,#20226,0,"Point.p ... .secret")
 #20228=@"loc,{#10000},5,1,5,22"
@@ -693,7 +693,7 @@ literals("secret","secret",#20233)
 #20234=*
 stmts(#20234,2,#20001,4,"Point.ORIGIN;")
 hasLocation(#20234,#20017)
-stmtContainers(#20234,#20001)
+stmt_containers(#20234,#20001)
 #20235=*
 exprs(#20235,14,#20234,0,"Point.ORIGIN")
 #20236=@"loc,{#10000},7,1,7,12"
@@ -717,7 +717,7 @@ literals("ORIGIN","ORIGIN",#20238)
 #20239=*
 stmts(#20239,2,#20001,5,"Point.f ... n() {};")
 hasLocation(#20239,#20019)
-stmtContainers(#20239,#20001)
+stmt_containers(#20239,#20001)
 #20240=*
 exprs(#20240,47,#20239,0,"Point.f ... on() {}")
 #20241=@"loc,{#10000},8,1,8,25"
@@ -764,11 +764,11 @@ stmts(#20250,1,#20246,-2,"{}")
 #20251=@"loc,{#10000},8,24,8,25"
 locations_default(#20251,#10000,8,24,8,25)
 hasLocation(#20250,#20251)
-stmtContainers(#20250,#20246)
+stmt_containers(#20250,#20246)
 #20252=*
 stmts(#20252,18,#20001,6,"var someGlobal;")
 hasLocation(#20252,#20023)
-stmtContainers(#20252,#20001)
+stmt_containers(#20252,#20001)
 #20253=*
 exprs(#20253,64,#20252,0,"someGlobal")
 hasLocation(#20253,#20146)
@@ -784,7 +784,7 @@ decl(#20254,#20182)
 #20255=*
 stmts(#20255,18,#20001,7,"var MyString;")
 hasLocation(#20255,#20028)
-stmtContainers(#20255,#20001)
+stmt_containers(#20255,#20001)
 #20256=*
 exprs(#20256,64,#20255,0,"MyString")
 hasLocation(#20256,#20152)
@@ -800,7 +800,7 @@ decl(#20257,#20183)
 #20258=*
 stmts(#20258,2,#20001,8,"Point.p ... inal'];")
 hasLocation(#20258,#20032)
-stmtContainers(#20258,#20001)
+stmt_containers(#20258,#20001)
 #20259=*
 exprs(#20259,15,#20258,0,"Point.p ... final']")
 #20260=@"loc,{#10000},15,1,15,24"
@@ -843,7 +843,7 @@ regexpConstValue(#20266,"final")
 #20268=*
 stmts(#20268,2,#20001,9,"'use strict';")
 hasLocation(#20268,#20036)
-stmtContainers(#20268,#20001)
+stmt_containers(#20268,#20001)
 #20269=*
 exprs(#20269,4,#20268,0,"'use strict'")
 hasLocation(#20269,#20170)
diff --git a/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap b/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap
index ab38c54620c..6121b478f8a 100644
--- a/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap
@@ -95,7 +95,7 @@ variables(#20033,"f",#20000)
 #20034=*
 stmts(#20034,18,#20001,0,"var f = ...  => {};")
 hasLocation(#20034,#20003)
-stmtContainers(#20034,#20001)
+stmt_containers(#20034,#20001)
 #20035=*
 exprs(#20035,64,#20034,0,"f = (x?:int) => {}")
 #20036=@"loc,{#10000},1,5,1,22"
@@ -134,7 +134,7 @@ stmts(#20043,1,#20038,-2,"{}")
 #20044=@"loc,{#10000},1,21,1,22"
 locations_default(#20044,#10000,1,21,1,22)
 hasLocation(#20043,#20044)
-stmtContainers(#20043,#20038)
+stmt_containers(#20043,#20038)
 #20045=*
 entry_cfg_node(#20045,#20001)
 #20046=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap b/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap
index ef9f4a3662a..ae5fd98335c 100644
--- a/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap
@@ -102,7 +102,7 @@ variables(#20036,"f",#20000)
 #20037=*
 stmts(#20037,18,#20001,0,"var f = ...  => {};")
 hasLocation(#20037,#20003)
-stmtContainers(#20037,#20001)
+stmt_containers(#20037,#20001)
 #20038=*
 exprs(#20038,64,#20037,0,"f = (vi ... n => {}")
 #20039=@"loc,{#10000},1,5,1,47"
@@ -141,7 +141,7 @@ stmts(#20046,1,#20041,-2,"{}")
 #20047=@"loc,{#10000},1,46,1,47"
 locations_default(#20047,#10000,1,46,1,47)
 hasLocation(#20046,#20047)
-stmtContainers(#20046,#20041)
+stmt_containers(#20046,#20041)
 #20048=*
 entry_cfg_node(#20048,#20001)
 #20049=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/flow/output/trap/array-types.js.trap b/javascript/extractor/tests/flow/output/trap/array-types.js.trap
index 9b64906a86d..a574c6bb7fd 100644
--- a/javascript/extractor/tests/flow/output/trap/array-types.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/array-types.js.trap
@@ -288,7 +288,7 @@ variables(#20109,"f",#20000)
 #20110=*
 stmts(#20110,17,#20001,0,"function f(p: T) {}")
 hasLocation(#20110,#20003)
-stmtContainers(#20110,#20001)
+stmt_containers(#20110,#20001)
 #20111=*
 exprs(#20111,78,#20110,-1,"f")
 hasLocation(#20111,#20013)
@@ -317,11 +317,11 @@ stmts(#20117,1,#20110,-2,"{}")
 #20118=@"loc,{#10000},1,18,1,19"
 locations_default(#20118,#10000,1,18,1,19)
 hasLocation(#20117,#20118)
-stmtContainers(#20117,#20110)
+stmt_containers(#20117,#20110)
 #20119=*
 stmts(#20119,17,#20001,1,"functio ... T[]) {}")
 hasLocation(#20119,#20005)
-stmtContainers(#20119,#20001)
+stmt_containers(#20119,#20001)
 #20120=*
 exprs(#20120,78,#20119,-1,"f")
 hasLocation(#20120,#20031)
@@ -350,11 +350,11 @@ stmts(#20126,1,#20119,-2,"{}")
 #20127=@"loc,{#10000},2,20,2,21"
 locations_default(#20127,#10000,2,20,2,21)
 hasLocation(#20126,#20127)
-stmtContainers(#20126,#20119)
+stmt_containers(#20126,#20119)
 #20128=*
 stmts(#20128,17,#20001,2,"functio ... ][]) {}")
 hasLocation(#20128,#20007)
-stmtContainers(#20128,#20001)
+stmt_containers(#20128,#20001)
 #20129=*
 exprs(#20129,78,#20128,-1,"f")
 hasLocation(#20129,#20053)
@@ -383,11 +383,11 @@ stmts(#20135,1,#20128,-2,"{}")
 #20136=@"loc,{#10000},3,22,3,23"
 locations_default(#20136,#10000,3,22,3,23)
 hasLocation(#20135,#20136)
-stmtContainers(#20135,#20128)
+stmt_containers(#20135,#20128)
 #20137=*
 stmts(#20137,17,#20001,3,"functio ... ][]) {}")
 hasLocation(#20137,#20009)
-stmtContainers(#20137,#20001)
+stmt_containers(#20137,#20001)
 #20138=*
 exprs(#20138,78,#20137,-1,"f")
 hasLocation(#20138,#20079)
@@ -416,7 +416,7 @@ stmts(#20144,1,#20137,-2,"{}")
 #20145=@"loc,{#10000},4,24,4,25"
 locations_default(#20145,#10000,4,24,4,25)
 hasLocation(#20144,#20145)
-stmtContainers(#20144,#20137)
+stmt_containers(#20144,#20137)
 #20146=*
 entry_cfg_node(#20146,#20001)
 #20147=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/flow/output/trap/async.js.trap b/javascript/extractor/tests/flow/output/trap/async.js.trap
index 07e6c468fbd..bdf25e5fbd8 100644
--- a/javascript/extractor/tests/flow/output/trap/async.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/async.js.trap
@@ -115,7 +115,7 @@ variables(#20041,"f",#20000)
 #20042=*
 stmts(#20042,23,#20001,0,"let f = ...  foo();")
 hasLocation(#20042,#20003)
-stmtContainers(#20042,#20001)
+stmt_containers(#20042,#20001)
 #20043=*
 exprs(#20043,64,#20042,0,"f = asy ... t foo()")
 #20044=@"loc,{#10000},1,5,1,48"
diff --git a/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap b/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap
index 0d78f92806b..7b6145bdf21 100644
--- a/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap
@@ -448,7 +448,7 @@ variables(#20168,"f2",#20000)
 #20169=*
 stmts(#20169,2,#20001,0,"new K1<T1>();")
 hasLocation(#20169,#20003)
-stmtContainers(#20169,#20001)
+stmt_containers(#20169,#20001)
 #20170=*
 exprs(#20170,12,#20169,0,"new K1<T1>()")
 #20171=@"loc,{#10000},1,1,1,12"
@@ -468,7 +468,7 @@ bind(#20172,#20173)
 #20174=*
 stmts(#20174,2,#20001,1,"f1<T2>();")
 hasLocation(#20174,#20005)
-stmtContainers(#20174,#20001)
+stmt_containers(#20174,#20001)
 #20175=*
 exprs(#20175,13,#20174,0,"f1<T2>()")
 #20176=@"loc,{#10000},2,1,2,8"
@@ -490,7 +490,7 @@ stmts(#20179,22,#20001,2,"const f ... >(x);\n}")
 #20180=@"loc,{#10000},3,1,5,1"
 locations_default(#20180,#10000,3,1,5,1)
 hasLocation(#20179,#20180)
-stmtContainers(#20179,#20001)
+stmt_containers(#20179,#20001)
 #20181=*
 exprs(#20181,64,#20179,0,"f2 = fu ... >(x);\n}")
 #20182=@"loc,{#10000},3,7,5,1"
@@ -525,13 +525,13 @@ stmts(#20188,1,#20184,-2,"{\n  yie ... >(x);\n}")
 #20189=@"loc,{#10000},3,32,5,1"
 locations_default(#20189,#10000,3,32,5,1)
 hasLocation(#20188,#20189)
-stmtContainers(#20188,#20184)
+stmt_containers(#20188,#20184)
 #20190=*
 stmts(#20190,2,#20188,0,"yield* f3<T5>(x);")
 #20191=@"loc,{#10000},4,3,4,19"
 locations_default(#20191,#10000,4,3,4,19)
 hasLocation(#20190,#20191)
-stmtContainers(#20190,#20184)
+stmt_containers(#20190,#20184)
 #20192=*
 exprs(#20192,69,#20190,0,"yield* f3<T5>(x)")
 #20193=@"loc,{#10000},4,3,4,18"
@@ -568,7 +568,7 @@ isDelegating(#20192)
 #20200=*
 stmts(#20200,2,#20001,3,"f4<T6>(v1);")
 hasLocation(#20200,#20013)
-stmtContainers(#20200,#20001)
+stmt_containers(#20200,#20001)
 #20201=*
 exprs(#20201,13,#20200,0,"f4<T6>(v1)")
 #20202=@"loc,{#10000},6,1,6,10"
@@ -597,7 +597,7 @@ bind(#20205,#20206)
 #20207=*
 stmts(#20207,2,#20001,4,"f5<_,_,_>();")
 hasLocation(#20207,#20015)
-stmtContainers(#20207,#20001)
+stmt_containers(#20207,#20001)
 #20208=*
 exprs(#20208,13,#20207,0,"f5<_,_,_>()")
 #20209=@"loc,{#10000},7,1,7,11"
@@ -619,7 +619,7 @@ stmts(#20212,2,#20001,5,"f6<\n\t|T ... 9\n\t>();")
 #20213=@"loc,{#10000},8,1,12,5"
 locations_default(#20213,#10000,8,1,12,5)
 hasLocation(#20212,#20213)
-stmtContainers(#20212,#20001)
+stmt_containers(#20212,#20001)
 #20214=*
 exprs(#20214,13,#20212,0,"f6<\n\t|T ... T9\n\t>()")
 #20215=@"loc,{#10000},8,1,12,4"
diff --git a/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap b/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap
index 6015be174c7..b0562bc5c0d 100644
--- a/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap
@@ -55,7 +55,7 @@ hasLocation(#20001,#20003)
 #20018=*
 stmts(#20018,2,#20001,0,"new K1<T1>;")
 hasLocation(#20018,#20003)
-stmtContainers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,12,#20018,0,"new K1<T1>")
 #20020=@"loc,{#10000},1,1,1,10"
diff --git a/javascript/extractor/tests/flow/output/trap/export.js.trap b/javascript/extractor/tests/flow/output/trap/export.js.trap
index 6dc2b4997dc..9ff4e4cfd5f 100644
--- a/javascript/extractor/tests/flow/output/trap/export.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/export.js.trap
@@ -227,7 +227,7 @@ is_es2015_module(#20001)
 #20084=*
 stmts(#20084,30,#20001,0,"export  ... om ""m"";")
 hasLocation(#20084,#20003)
-stmtContainers(#20084,#20001)
+stmt_containers(#20084,#20001)
 #20085=*
 exprs(#20085,4,#20084,-2,"""m""")
 hasLocation(#20085,#20023)
@@ -260,7 +260,7 @@ literals("a","a",#20090)
 #20091=*
 stmts(#20091,28,#20001,1,"export * from ""m"";")
 hasLocation(#20091,#20005)
-stmtContainers(#20091,#20001)
+stmt_containers(#20091,#20001)
 #20092=*
 exprs(#20092,4,#20091,0,"""m""")
 hasLocation(#20092,#20033)
diff --git a/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap b/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap
index f57be469d52..dc8dee42d8e 100644
--- a/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap
@@ -182,7 +182,7 @@ stmts(#20066,26,#20001,0,"class C ... ) { }\n}")
 #20067=@"loc,{#10000},1,1,4,1"
 locations_default(#20067,#10000,1,1,4,1)
 hasLocation(#20066,#20067)
-stmtContainers(#20066,#20001)
+stmt_containers(#20066,#20001)
 #20068=*
 exprs(#20068,78,#20066,0,"C")
 hasLocation(#20068,#20013)
@@ -235,7 +235,7 @@ stmts(#20080,1,#20073,-2,"{ }")
 #20081=@"loc,{#10000},2,18,2,20"
 locations_default(#20081,#10000,2,18,2,20)
 hasLocation(#20080,#20081)
-stmtContainers(#20080,#20073)
+stmt_containers(#20080,#20073)
 isMethod(#20070)
 #20082=*
 properties(#20082,#20066,3,0,"set<T>(v: T) { }")
@@ -277,7 +277,7 @@ stmts(#20092,1,#20085,-2,"{ }")
 #20093=@"loc,{#10000},3,18,3,20"
 locations_default(#20093,#10000,3,18,3,20)
 hasLocation(#20092,#20093)
-stmtContainers(#20092,#20085)
+stmt_containers(#20092,#20085)
 isMethod(#20082)
 #20094=*
 properties(#20094,#20066,4,0,"constructor() {}")
@@ -305,7 +305,7 @@ isArgumentsObject(#20099)
 #20100=*
 stmts(#20100,1,#20097,-2,"{}")
 hasLocation(#20100,#20095)
-stmtContainers(#20100,#20097)
+stmt_containers(#20100,#20097)
 isMethod(#20094)
 #20101=*
 entry_cfg_node(#20101,#20001)
diff --git a/javascript/extractor/tests/flow/output/trap/importType.js.trap b/javascript/extractor/tests/flow/output/trap/importType.js.trap
index 1e197241002..2c29d624abc 100644
--- a/javascript/extractor/tests/flow/output/trap/importType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/importType.js.trap
@@ -199,7 +199,7 @@ local_namespace_names(#20072,"type",#20069)
 #20073=*
 stmts(#20073,27,#20001,0,"import  ... om 'm';")
 hasLocation(#20073,#20003)
-stmtContainers(#20073,#20001)
+stmt_containers(#20073,#20001)
 #20074=*
 exprs(#20074,4,#20073,-1,"'m'")
 hasLocation(#20074,#20031)
diff --git a/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap b/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap
index 7dca261469c..8c553bac9f4 100644
--- a/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap
@@ -149,7 +149,7 @@ variables(#20052,"o",#20000)
 #20053=*
 stmts(#20053,18,#20001,0,"var o = ... ;\n  }\n}")
 hasLocation(#20053,#20051)
-stmtContainers(#20053,#20001)
+stmt_containers(#20053,#20001)
 #20054=*
 exprs(#20054,64,#20053,0,"o = {\n  ... ;\n  }\n}")
 #20055=@"loc,{#10000},1,5,5,1"
@@ -211,13 +211,13 @@ stmts(#20069,1,#20062,-2,"{\n    return a;\n  }")
 #20070=@"loc,{#10000},2,16,4,3"
 locations_default(#20070,#10000,2,16,4,3)
 hasLocation(#20069,#20070)
-stmtContainers(#20069,#20062)
+stmt_containers(#20069,#20062)
 #20071=*
 stmts(#20071,9,#20069,0,"return a;")
 #20072=@"loc,{#10000},3,5,3,13"
 locations_default(#20072,#10000,3,5,3,13)
 hasLocation(#20071,#20072)
-stmtContainers(#20071,#20062)
+stmt_containers(#20071,#20062)
 #20073=*
 exprs(#20073,79,#20071,0,"a")
 hasLocation(#20073,#20043)
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
index 02835947076..7f7bfeb538e 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
@@ -65,7 +65,7 @@ hasLocation(#20001,#20003)
 #20022=*
 stmts(#20022,2,#20001,0,"1<2>(3);")
 hasLocation(#20022,#20003)
-stmtContainers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
 exprs(#20023,29,#20022,0,"1<2>(3)")
 #20024=@"loc,{#10000},1,1,1,7"
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
index 91993e392f0..c6c002ff118 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
@@ -85,7 +85,7 @@ hasLocation(#20001,#20003)
 #20030=*
 stmts(#20030,2,#20001,0,"f<g()>(h());")
 hasLocation(#20030,#20003)
-stmtContainers(#20030,#20001)
+stmt_containers(#20030,#20001)
 #20031=*
 exprs(#20031,29,#20030,0,"f<g()>(h())")
 #20032=@"loc,{#10000},1,1,1,11"
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
index 919eea1cae1..774aa5e4184 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
@@ -65,7 +65,7 @@ hasLocation(#20001,#20003)
 #20022=*
 stmts(#20022,2,#20001,0,"/x/<2>(3);")
 hasLocation(#20022,#20003)
-stmtContainers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
 exprs(#20023,29,#20022,0,"/x/<2>(3)")
 #20024=@"loc,{#10000},1,1,1,9"
diff --git a/javascript/extractor/tests/flow/output/trap/optParms.js.trap b/javascript/extractor/tests/flow/output/trap/optParms.js.trap
index 19bca947ec6..186d5bd40a4 100644
--- a/javascript/extractor/tests/flow/output/trap/optParms.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/optParms.js.trap
@@ -158,7 +158,7 @@ variables(#20058,"g",#20000)
 #20059=*
 stmts(#20059,23,#20001,0,"let f = (x?) => {};")
 hasLocation(#20059,#20003)
-stmtContainers(#20059,#20001)
+stmt_containers(#20059,#20001)
 #20060=*
 exprs(#20060,64,#20059,0,"f = (x?) => {}")
 #20061=@"loc,{#10000},1,5,1,18"
@@ -197,11 +197,11 @@ stmts(#20068,1,#20063,-2,"{}")
 #20069=@"loc,{#10000},1,17,1,18"
 locations_default(#20069,#10000,1,17,1,18)
 hasLocation(#20068,#20069)
-stmtContainers(#20068,#20063)
+stmt_containers(#20068,#20063)
 #20070=*
 stmts(#20070,23,#20001,1,"let g = ...  => {};")
 hasLocation(#20070,#20005)
-stmtContainers(#20070,#20001)
+stmt_containers(#20070,#20001)
 #20071=*
 exprs(#20071,64,#20070,0,"g = (x?, y) => {}")
 #20072=@"loc,{#10000},2,5,2,21"
@@ -248,7 +248,7 @@ stmts(#20081,1,#20074,-2,"{}")
 #20082=@"loc,{#10000},2,20,2,21"
 locations_default(#20082,#10000,2,20,2,21)
 hasLocation(#20081,#20082)
-stmtContainers(#20081,#20074)
+stmt_containers(#20081,#20074)
 #20083=*
 entry_cfg_node(#20083,#20001)
 #20084=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap b/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap
index 6794275f21b..9a2b5cf69fb 100644
--- a/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap
@@ -153,7 +153,7 @@ stmts(#20055,17,#20001,0,"functio ... (42);\n}")
 #20056=@"loc,{#10000},1,1,3,1"
 locations_default(#20056,#10000,1,1,3,1)
 hasLocation(#20055,#20056)
-stmtContainers(#20055,#20001)
+stmt_containers(#20055,#20001)
 #20057=*
 exprs(#20057,78,#20055,-1,"f")
 hasLocation(#20057,#20011)
@@ -182,13 +182,13 @@ stmts(#20063,1,#20055,-2,"{\n  g(42);\n}")
 #20064=@"loc,{#10000},1,35,3,1"
 locations_default(#20064,#10000,1,35,3,1)
 hasLocation(#20063,#20064)
-stmtContainers(#20063,#20055)
+stmt_containers(#20063,#20055)
 #20065=*
 stmts(#20065,2,#20063,0,"g(42);")
 #20066=@"loc,{#10000},2,3,2,8"
 locations_default(#20066,#10000,2,3,2,8)
 hasLocation(#20065,#20066)
-stmtContainers(#20065,#20055)
+stmt_containers(#20065,#20055)
 #20067=*
 exprs(#20067,13,#20065,0,"g(42)")
 #20068=@"loc,{#10000},2,3,2,7"
diff --git a/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap b/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
index 491f12173c0..64290b00293 100644
--- a/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
@@ -564,7 +564,7 @@ hasLocation(#20001,#20220)
 #20221=*
 stmts(#20221,3,#20001,0,"if(!(0< ... |0))){}")
 hasLocation(#20221,#20003)
-stmtContainers(#20221,#20001)
+stmt_containers(#20221,#20001)
 #20222=*
 exprs(#20222,18,#20221,0,"!(0<(jd|0)&0>(Wc|0))")
 #20223=@"loc,{#10000},1,4,1,23"
@@ -675,11 +675,11 @@ stmts(#20248,1,#20221,1,"{}")
 #20249=@"loc,{#10000},1,25,1,26"
 locations_default(#20249,#10000,1,25,1,26)
 hasLocation(#20248,#20249)
-stmtContainers(#20248,#20001)
+stmt_containers(#20248,#20001)
 #20250=*
 stmts(#20250,2,#20001,1,"g=(g|0) ... 0)?e:g;")
 hasLocation(#20250,#20005)
-stmtContainers(#20250,#20001)
+stmt_containers(#20250,#20001)
 #20251=*
 exprs(#20251,47,#20250,0,"g=(g|0) ... |0)?e:g")
 #20252=@"loc,{#10000},2,1,2,29"
@@ -853,7 +853,7 @@ bind(#20290,#20254)
 #20291=*
 stmts(#20291,3,#20001,2,"if((I|0 ... H|0)){}")
 hasLocation(#20291,#20007)
-stmtContainers(#20291,#20001)
+stmt_containers(#20291,#20001)
 #20292=*
 exprs(#20292,39,#20291,0,"(I|0)<( ... )>(H|0)")
 #20293=@"loc,{#10000},3,4,3,50"
@@ -1140,7 +1140,7 @@ stmts(#20362,1,#20291,1,"{}")
 #20363=@"loc,{#10000},3,52,3,53"
 locations_default(#20363,#10000,3,52,3,53)
 hasLocation(#20362,#20363)
-stmtContainers(#20362,#20001)
+stmt_containers(#20362,#20001)
 #20364=*
 entry_cfg_node(#20364,#20001)
 #20365=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap b/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap
index d96e5fb82e5..133f8537298 100644
--- a/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap
@@ -315,7 +315,7 @@ stmts(#20117,17,#20001,0,"functio ... rn a;\n}")
 #20118=@"loc,{#10000},1,1,3,1"
 locations_default(#20118,#10000,1,1,3,1)
 hasLocation(#20117,#20118)
-stmtContainers(#20117,#20001)
+stmt_containers(#20117,#20001)
 #20119=*
 exprs(#20119,78,#20117,-1,"f")
 hasLocation(#20119,#20023)
@@ -342,13 +342,13 @@ stmts(#20124,1,#20117,-2,"{\n    return a;\n}")
 #20125=@"loc,{#10000},1,32,3,1"
 locations_default(#20125,#10000,1,32,3,1)
 hasLocation(#20124,#20125)
-stmtContainers(#20124,#20117)
+stmt_containers(#20124,#20117)
 #20126=*
 stmts(#20126,9,#20124,0,"return a;")
 #20127=@"loc,{#10000},2,5,2,13"
 locations_default(#20127,#10000,2,5,2,13)
 hasLocation(#20126,#20127)
-stmtContainers(#20126,#20117)
+stmt_containers(#20126,#20117)
 #20128=*
 exprs(#20128,79,#20126,0,"a")
 hasLocation(#20128,#20043)
@@ -361,7 +361,7 @@ stmts(#20129,17,#20001,1,"functio ... ecks {}")
 #20130=@"loc,{#10000},4,1,4,24"
 locations_default(#20130,#10000,4,1,4,24)
 hasLocation(#20129,#20130)
-stmtContainers(#20129,#20001)
+stmt_containers(#20129,#20001)
 #20131=*
 exprs(#20131,78,#20129,-1,"g")
 hasLocation(#20131,#20050)
@@ -380,19 +380,19 @@ stmts(#20134,1,#20129,-2,"{}")
 #20135=@"loc,{#10000},4,23,4,24"
 locations_default(#20135,#10000,4,23,4,24)
 hasLocation(#20134,#20135)
-stmtContainers(#20134,#20129)
+stmt_containers(#20134,#20129)
 #20136=*
 stmts(#20136,1,#20001,2,"{\n    return b;\n}")
 #20137=@"loc,{#10000},4,26,6,1"
 locations_default(#20137,#10000,4,26,6,1)
 hasLocation(#20136,#20137)
-stmtContainers(#20136,#20001)
+stmt_containers(#20136,#20001)
 #20138=*
 stmts(#20138,9,#20136,0,"return b;")
 #20139=@"loc,{#10000},5,5,5,13"
 locations_default(#20139,#10000,5,5,5,13)
 hasLocation(#20138,#20139)
-stmtContainers(#20138,#20001)
+stmt_containers(#20138,#20001)
 #20140=*
 exprs(#20140,79,#20138,0,"b")
 hasLocation(#20140,#20070)
@@ -405,7 +405,7 @@ bind(#20140,#20141)
 #20142=*
 stmts(#20142,2,#20001,3,"(c): bo ... s => c;")
 hasLocation(#20142,#20017)
-stmtContainers(#20142,#20001)
+stmt_containers(#20142,#20001)
 #20143=*
 exprs(#20143,65,#20142,0,"(c): bo ... ks => c")
 #20144=@"loc,{#10000},8,1,8,25"
@@ -434,7 +434,7 @@ bind(#20148,#20146)
 #20149=*
 stmts(#20149,2,#20001,4,"(d): %checks => d;")
 hasLocation(#20149,#20019)
-stmtContainers(#20149,#20001)
+stmt_containers(#20149,#20001)
 #20150=*
 exprs(#20150,65,#20149,0,"(d): %checks => d")
 #20151=@"loc,{#10000},9,1,9,17"
diff --git a/javascript/extractor/tests/flow/output/trap/tst.js.trap b/javascript/extractor/tests/flow/output/trap/tst.js.trap
index 37db4397815..d0a38423f4a 100644
--- a/javascript/extractor/tests/flow/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/tst.js.trap
@@ -523,7 +523,7 @@ stmts(#20193,26,#20001,0,"class A ... nt {}\n}")
 #20194=@"loc,{#10000},6,1,9,1"
 locations_default(#20194,#10000,6,1,9,1)
 hasLocation(#20193,#20194)
-stmtContainers(#20193,#20001)
+stmt_containers(#20193,#20001)
 #20195=*
 exprs(#20195,78,#20193,0,"A")
 hasLocation(#20195,#20072)
@@ -577,7 +577,7 @@ stmts(#20208,1,#20204,-2,"{}")
 #20209=@"loc,{#10000},8,15,8,16"
 locations_default(#20209,#10000,8,15,8,16)
 hasLocation(#20208,#20209)
-stmtContainers(#20208,#20204)
+stmt_containers(#20208,#20204)
 isMethod(#20201)
 #20210=*
 properties(#20210,#20193,4,0,"constructor() {}")
@@ -604,14 +604,14 @@ isArgumentsObject(#20214)
 #20215=*
 stmts(#20215,1,#20199,-2,"{}")
 hasLocation(#20215,#20211)
-stmtContainers(#20215,#20199)
+stmt_containers(#20215,#20199)
 isMethod(#20210)
 #20216=*
 stmts(#20216,17,#20001,1,"functio ... :\n  }\n}")
 #20217=@"loc,{#10000},11,1,15,1"
 locations_default(#20217,#10000,11,1,15,1)
 hasLocation(#20216,#20217)
-stmtContainers(#20216,#20001)
+stmt_containers(#20216,#20001)
 #20218=*
 exprs(#20218,78,#20216,-1,"f")
 hasLocation(#20218,#20107)
@@ -630,13 +630,13 @@ stmts(#20221,1,#20216,-2,"{\n  swi ... :\n  }\n}")
 #20222=@"loc,{#10000},11,14,15,1"
 locations_default(#20222,#10000,11,14,15,1)
 hasLocation(#20221,#20222)
-stmtContainers(#20221,#20216)
+stmt_containers(#20221,#20216)
 #20223=*
 stmts(#20223,8,#20221,0,"switch( ... 2):\n  }")
 #20224=@"loc,{#10000},12,3,14,3"
 locations_default(#20224,#10000,12,3,14,3)
 hasLocation(#20223,#20224)
-stmtContainers(#20223,#20216)
+stmt_containers(#20223,#20216)
 #20225=*
 exprs(#20225,79,#20223,-1,"x")
 hasLocation(#20225,#20119)
@@ -651,7 +651,7 @@ stmts(#20227,19,#20223,0,"case (42):")
 #20228=@"loc,{#10000},13,3,13,12"
 locations_default(#20228,#10000,13,3,13,12)
 hasLocation(#20227,#20228)
-stmtContainers(#20227,#20216)
+stmt_containers(#20227,#20216)
 #20229=*
 exprs(#20229,63,#20227,-1,"(42)")
 #20230=@"loc,{#10000},13,8,13,11"
diff --git a/javascript/extractor/tests/flow/output/trap/variance.js.trap b/javascript/extractor/tests/flow/output/trap/variance.js.trap
index 7605e9668bf..f277b7863a2 100644
--- a/javascript/extractor/tests/flow/output/trap/variance.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/variance.js.trap
@@ -175,7 +175,7 @@ stmts(#20061,26,#20001,0,"class F ... : int\n}")
 #20062=@"loc,{#10000},5,1,7,1"
 locations_default(#20062,#10000,5,1,7,1)
 hasLocation(#20061,#20062)
-stmtContainers(#20061,#20001)
+stmt_containers(#20061,#20001)
 #20063=*
 exprs(#20063,78,#20061,0,"Foo")
 hasLocation(#20063,#20043)
@@ -224,7 +224,7 @@ isArgumentsObject(#20073)
 #20074=*
 stmts(#20074,1,#20067,-2,"{}")
 hasLocation(#20074,#20070)
-stmtContainers(#20074,#20067)
+stmt_containers(#20074,#20067)
 isMethod(#20069)
 #20075=*
 entry_cfg_node(#20075,#20001)
diff --git a/javascript/extractor/tests/functionbind/output/trap/tst.js.trap b/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
index 89c9a1816a7..bdffdd0d444 100644
--- a/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
@@ -240,7 +240,7 @@ variables(#20090,"obj",#20000)
 #20091=*
 stmts(#20091,2,#20001,0,"process ... e.log);")
 hasLocation(#20091,#20003)
-stmtContainers(#20091,#20001)
+stmt_containers(#20091,#20001)
 #20092=*
 exprs(#20092,13,#20091,0,"process ... le.log)")
 #20093=@"loc,{#10000},1,1,1,31"
@@ -315,7 +315,7 @@ literals("log","log",#20108)
 #20109=*
 stmts(#20109,23,#20001,1,"let has ... operty;")
 hasLocation(#20109,#20007)
-stmtContainers(#20109,#20001)
+stmt_containers(#20109,#20001)
 #20110=*
 exprs(#20110,64,#20109,0,"hasOwnP ... roperty")
 #20111=@"loc,{#10000},3,5,3,48"
@@ -368,7 +368,7 @@ literals("hasOwnProperty","hasOwnProperty",#20120)
 #20121=*
 stmts(#20121,23,#20001,2,"let obj ...  100 };")
 hasLocation(#20121,#20009)
-stmtContainers(#20121,#20001)
+stmt_containers(#20121,#20001)
 #20122=*
 exprs(#20122,64,#20121,0,"obj = { x: 100 }")
 #20123=@"loc,{#10000},4,5,4,20"
@@ -410,7 +410,7 @@ literals("100","100",#20130)
 #20131=*
 stmts(#20131,2,#20001,3,"obj::ha ... p(""x"");")
 hasLocation(#20131,#20011)
-stmtContainers(#20131,#20001)
+stmt_containers(#20131,#20001)
 #20132=*
 exprs(#20132,13,#20131,0,"obj::hasOwnProp(""x"")")
 #20133=@"loc,{#10000},5,1,5,20"
diff --git a/javascript/extractor/tests/helloworld/output/trap/hello.js.trap b/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
index dc4dee85186..0c3d6ac75d6 100644
--- a/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
+++ b/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
@@ -50,7 +50,7 @@ hasLocation(#20001,#20003)
 #20016=*
 stmts(#20016,2,#20001,0,"alert("" ... rld!"");")
 hasLocation(#20016,#20003)
-stmtContainers(#20016,#20001)
+stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,13,#20016,0,"alert("" ... orld!"")")
 #20018=@"loc,{#10000},1,1,1,22"
diff --git a/javascript/extractor/tests/html/output/trap/entities.html.trap b/javascript/extractor/tests/html/output/trap/entities.html.trap
index 0b9f7361060..8e177ae9aab 100644
--- a/javascript/extractor/tests/html/output/trap/entities.html.trap
+++ b/javascript/extractor/tests/html/output/trap/entities.html.trap
@@ -60,7 +60,7 @@ hasLocation(#20001,#20003)
 #20020=*
 stmts(#20020,2,#20001,0,"void(alert(""Nope!""))")
 hasLocation(#20020,#20003)
-stmtContainers(#20020,#20001)
+stmt_containers(#20020,#20001)
 #20021=*
 exprs(#20021,21,#20020,0,"void(alert(""Nope!""))")
 hasLocation(#20021,#20003)
diff --git a/javascript/extractor/tests/html/output/trap/module.html.trap b/javascript/extractor/tests/html/output/trap/module.html.trap
index bb523f690bc..3ed620603ac 100644
--- a/javascript/extractor/tests/html/output/trap/module.html.trap
+++ b/javascript/extractor/tests/html/output/trap/module.html.trap
@@ -119,7 +119,7 @@ stmts(#20039,27,#20001,0,"import  ...  'bar';")
 #20040=@"loc,{#10000},5,13,5,34"
 locations_default(#20040,#10000,5,13,5,34)
 hasLocation(#20039,#20040)
-stmtContainers(#20039,#20001)
+stmt_containers(#20039,#20001)
 #20041=*
 exprs(#20041,4,#20039,-1,"'bar'")
 hasLocation(#20041,#20017)
@@ -151,7 +151,7 @@ stmts(#20046,2,#20001,1,"foo.baz();")
 #20047=@"loc,{#10000},6,13,6,22"
 locations_default(#20047,#10000,6,13,6,22)
 hasLocation(#20046,#20047)
-stmtContainers(#20046,#20001)
+stmt_containers(#20046,#20001)
 #20048=*
 exprs(#20048,13,#20046,0,"foo.baz()")
 #20049=@"loc,{#10000},6,13,6,21"
diff --git a/javascript/extractor/tests/html/output/trap/tst.html.trap b/javascript/extractor/tests/html/output/trap/tst.html.trap
index e62dda334b4..c29c9f3ec55 100644
--- a/javascript/extractor/tests/html/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst.html.trap
@@ -67,7 +67,7 @@ stmts(#20021,2,#20001,0,"alert("" ... rld!"");")
 #20022=@"loc,{#10000},6,13,6,35"
 locations_default(#20022,#10000,6,13,6,35)
 hasLocation(#20021,#20022)
-stmtContainers(#20021,#20001)
+stmt_containers(#20021,#20001)
 #20023=*
 exprs(#20023,13,#20021,0,"alert("" ... orld!"")")
 #20024=@"loc,{#10000},6,13,6,34"
@@ -127,7 +127,7 @@ hasLocation(#20032,#20034)
 #20038=*
 stmts(#20038,0,#20032,0,";")
 hasLocation(#20038,#20034)
-stmtContainers(#20038,#20032)
+stmt_containers(#20038,#20032)
 #20039=*
 entry_cfg_node(#20039,#20032)
 #20040=@"loc,{#10000},8,17,8,16"
@@ -190,7 +190,7 @@ hasLocation(#20042,#20044)
 #20061=*
 stmts(#20061,2,#20042,0,"void(alert('Nope!'))")
 hasLocation(#20061,#20044)
-stmtContainers(#20061,#20042)
+stmt_containers(#20061,#20042)
 #20062=*
 exprs(#20062,21,#20061,0,"void(alert('Nope!'))")
 hasLocation(#20062,#20044)
@@ -281,7 +281,7 @@ hasLocation(#20074,#20076)
 #20087=*
 stmts(#20087,2,#20074,0,"alert(' ... lick!')")
 hasLocation(#20087,#20076)
-stmtContainers(#20087,#20074)
+stmt_containers(#20087,#20074)
 #20088=*
 exprs(#20088,13,#20087,0,"alert(' ... lick!')")
 hasLocation(#20088,#20076)
@@ -351,7 +351,7 @@ hasLocation(#20096,#20098)
 #20107=*
 stmts(#20107,9,#20096,0,"return false;")
 hasLocation(#20107,#20098)
-stmtContainers(#20107,#20096)
+stmt_containers(#20107,#20096)
 #20108=*
 exprs(#20108,2,#20107,0,"false")
 hasLocation(#20108,#20102)
diff --git a/javascript/extractor/tests/html/output/trap/tst.xhtml.trap b/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
index b948e975a4e..d3c972a6a0a 100644
--- a/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
+++ b/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
@@ -58,7 +58,7 @@ stmts(#20017,2,#20001,0,"42;")
 #20018=@"loc,{#10000},9,5,9,7"
 locations_default(#20018,#10000,9,5,9,7)
 hasLocation(#20017,#20018)
-stmtContainers(#20017,#20001)
+stmt_containers(#20017,#20001)
 #20019=*
 exprs(#20019,3,#20017,0,"42")
 hasLocation(#20019,#20011)
diff --git a/javascript/extractor/tests/html/output/trap/tst2.html.trap b/javascript/extractor/tests/html/output/trap/tst2.html.trap
index b17b8fbd8a0..1a251f89855 100644
--- a/javascript/extractor/tests/html/output/trap/tst2.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst2.html.trap
@@ -42,7 +42,7 @@ variables(#20012,"hello",#20000)
 #20013=*
 stmts(#20013,18,#20001,0,"var hello;")
 hasLocation(#20013,#20003)
-stmtContainers(#20013,#20001)
+stmt_containers(#20013,#20001)
 #20014=*
 exprs(#20014,64,#20013,0,"hello")
 hasLocation(#20014,#20007)
@@ -101,7 +101,7 @@ variables(#20030,"world",#20000)
 #20031=*
 stmts(#20031,18,#20019,0,"var world;")
 hasLocation(#20031,#20021)
-stmtContainers(#20031,#20019)
+stmt_containers(#20031,#20019)
 #20032=*
 exprs(#20032,64,#20031,0,"world")
 hasLocation(#20032,#20025)
@@ -183,7 +183,7 @@ stmts(#20055,18,#20037,0,"var inAModule;")
 #20056=@"loc,{#10000},5,7,5,20"
 locations_default(#20056,#10000,5,7,5,20)
 hasLocation(#20055,#20056)
-stmtContainers(#20055,#20037)
+stmt_containers(#20055,#20037)
 #20057=*
 exprs(#20057,64,#20055,0,"inAModule")
 hasLocation(#20057,#20047)
@@ -275,7 +275,7 @@ stmts(#20083,27,#20061,0,"import f from ""f""")
 #20084=@"loc,{#10000},8,7,8,23"
 locations_default(#20084,#10000,8,7,8,23)
 hasLocation(#20083,#20084)
-stmtContainers(#20083,#20061)
+stmt_containers(#20083,#20061)
 #20085=*
 exprs(#20085,4,#20083,-1,"""f""")
 hasLocation(#20085,#20075)
diff --git a/javascript/extractor/tests/jscript/output/trap/tst.js.trap b/javascript/extractor/tests/jscript/output/trap/tst.js.trap
index dc8bbc8765f..07ee23956f0 100644
--- a/javascript/extractor/tests/jscript/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/jscript/output/trap/tst.js.trap
@@ -80,7 +80,7 @@ hasLocation(#20001,#20003)
 #20028=*
 stmts(#20028,2,#20001,0,"functio ... es) { }")
 hasLocation(#20028,#20003)
-stmtContainers(#20028,#20001)
+stmt_containers(#20028,#20001)
 #20029=*
 exprs(#20029,47,#20028,0,"functio ... es) { }")
 hasLocation(#20029,#20003)
@@ -149,7 +149,7 @@ stmts(#20044,1,#20035,-2,"{ }")
 #20045=@"loc,{#10000},1,50,1,52"
 locations_default(#20045,#10000,1,50,1,52)
 hasLocation(#20044,#20045)
-stmtContainers(#20044,#20035)
+stmt_containers(#20044,#20035)
 #20046=*
 entry_cfg_node(#20046,#20001)
 #20047=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/jsx/output/trap/tst.js.trap b/javascript/extractor/tests/jsx/output/trap/tst.js.trap
index 62c327bece0..3eded26c7d2 100644
--- a/javascript/extractor/tests/jsx/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/jsx/output/trap/tst.js.trap
@@ -427,7 +427,7 @@ hasLocation(#20001,#20164)
 #20165=*
 stmts(#20165,2,#20001,0,"<a/>;")
 hasLocation(#20165,#20003)
-stmtContainers(#20165,#20001)
+stmt_containers(#20165,#20001)
 #20166=*
 exprs(#20166,89,#20165,0,"<a/>")
 #20167=@"loc,{#10000},1,1,1,4"
@@ -444,7 +444,7 @@ literals("a","a",#20168)
 #20169=*
 stmts(#20169,2,#20001,1,"<b:c d:e/>;")
 hasLocation(#20169,#20005)
-stmtContainers(#20169,#20001)
+stmt_containers(#20169,#20001)
 #20170=*
 exprs(#20170,89,#20169,0,"<b:c d:e/>")
 #20171=@"loc,{#10000},2,1,2,10"
@@ -496,7 +496,7 @@ literals("e","e",#20180)
 #20181=*
 stmts(#20181,2,#20001,2,"<f g:h= ... l></f>;")
 hasLocation(#20181,#20007)
-stmtContainers(#20181,#20001)
+stmt_containers(#20181,#20001)
 #20182=*
 exprs(#20182,89,#20181,0,"<f g:h= ... .l></f>")
 #20183=@"loc,{#10000},3,1,3,51"
@@ -645,7 +645,7 @@ bind(#20216,#20217)
 #20218=*
 stmts(#20218,2,#20001,3,"<n {...props}/>;")
 hasLocation(#20218,#20009)
-stmtContainers(#20218,#20001)
+stmt_containers(#20218,#20001)
 #20219=*
 exprs(#20219,89,#20218,0,"<n {...props}/>")
 #20220=@"loc,{#10000},4,1,4,15"
@@ -681,7 +681,7 @@ bind(#20225,#20226)
 #20227=*
 stmts(#20227,2,#20001,4,"<><a/><b/></>")
 hasLocation(#20227,#20011)
-stmtContainers(#20227,#20001)
+stmt_containers(#20227,#20001)
 #20228=*
 exprs(#20228,89,#20227,0,"<><a/><b/></>")
 hasLocation(#20228,#20011)
diff --git a/javascript/extractor/tests/jsx/output/trap/tst2.js.trap b/javascript/extractor/tests/jsx/output/trap/tst2.js.trap
index bd7ccdbe718..b78733bfc6b 100644
--- a/javascript/extractor/tests/jsx/output/trap/tst2.js.trap
+++ b/javascript/extractor/tests/jsx/output/trap/tst2.js.trap
@@ -65,7 +65,7 @@ hasLocation(#20001,#20003)
 #20022=*
 stmts(#20022,2,#20001,0,"<a>/b&gt;</a>")
 hasLocation(#20022,#20003)
-stmtContainers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
 exprs(#20023,89,#20022,0,"<a>/b&gt;</a>")
 hasLocation(#20023,#20003)
diff --git a/javascript/extractor/tests/keywords/output/trap/tst.js.trap b/javascript/extractor/tests/keywords/output/trap/tst.js.trap
index a1a94385f0e..8c5d98eb9d3 100644
--- a/javascript/extractor/tests/keywords/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/keywords/output/trap/tst.js.trap
@@ -134,7 +134,7 @@ stmts(#20048,14,#20001,0,"for (le ... ++) {\n}")
 #20049=@"loc,{#10000},1,1,2,1"
 locations_default(#20049,#10000,1,1,2,1)
 hasLocation(#20048,#20049)
-stmtContainers(#20048,#20001)
+stmt_containers(#20048,#20001)
 #20050=*
 scopes(#20050,5)
 scopenodes(#20048,#20050)
@@ -209,7 +209,7 @@ stmts(#20066,23,#20048,0,"let i = 0")
 #20067=@"loc,{#10000},1,6,1,14"
 locations_default(#20067,#10000,1,6,1,14)
 hasLocation(#20066,#20067)
-stmtContainers(#20066,#20001)
+stmt_containers(#20066,#20001)
 #20068=*
 exprs(#20068,64,#20066,0,"i = 0")
 #20069=@"loc,{#10000},1,10,1,14"
@@ -235,7 +235,7 @@ stmts(#20072,1,#20048,3,"{\n}")
 #20073=@"loc,{#10000},1,46,2,1"
 locations_default(#20073,#10000,1,46,2,1)
 hasLocation(#20072,#20073)
-stmtContainers(#20072,#20001)
+stmt_containers(#20072,#20001)
 #20074=*
 entry_cfg_node(#20074,#20001)
 #20075=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap b/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
index 8b4ecf7566c..c3a5626e985 100644
--- a/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
@@ -407,7 +407,7 @@ hasLocation(#20001,#20156)
 #20157=*
 stmts(#20157,2,#20001,0,"[for (y ...  year];")
 hasLocation(#20157,#20003)
-stmtContainers(#20157,#20001)
+stmt_containers(#20157,#20001)
 #20158=*
 exprs(#20158,73,#20157,0,"[for (y ... ) year]")
 #20159=@"loc,{#10000},1,1,1,43"
@@ -474,7 +474,7 @@ bind(#20171,#20163)
 #20172=*
 stmts(#20172,2,#20001,1,"year;")
 hasLocation(#20172,#20005)
-stmtContainers(#20172,#20001)
+stmt_containers(#20172,#20001)
 #20173=*
 exprs(#20173,79,#20172,0,"year")
 hasLocation(#20173,#20045)
@@ -487,7 +487,7 @@ bind(#20173,#20174)
 #20175=*
 stmts(#20175,2,#20001,2,"[for (i ... ) i+j];")
 hasLocation(#20175,#20007)
-stmtContainers(#20175,#20001)
+stmt_containers(#20175,#20001)
 #20176=*
 exprs(#20176,73,#20175,0,"[for (i ... s) i+j]")
 #20177=@"loc,{#10000},3,1,3,43"
@@ -577,7 +577,7 @@ bind(#20195,#20188)
 #20196=*
 stmts(#20196,2,#20001,3,"[for (i ... ) i+j];")
 hasLocation(#20196,#20009)
-stmtContainers(#20196,#20001)
+stmt_containers(#20196,#20001)
 #20197=*
 exprs(#20197,73,#20196,0,"[for (i ... j) i+j]")
 #20198=@"loc,{#10000},4,1,4,52"
@@ -684,7 +684,7 @@ bind(#20218,#20208)
 #20219=*
 stmts(#20219,2,#20001,4,"[for ea ... rs) i];")
 hasLocation(#20219,#20011)
-stmtContainers(#20219,#20001)
+stmt_containers(#20219,#20001)
 #20220=*
 exprs(#20220,73,#20219,0,"[for ea ... ers) i]")
 #20221=@"loc,{#10000},5,1,5,27"
diff --git a/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap b/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
index 67099a321fe..ffbe5c8732e 100644
--- a/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
@@ -207,7 +207,7 @@ variables(#20074,"f",#20000)
 #20075=*
 stmts(#20075,17,#20001,0,"functio ... esult"")")
 hasLocation(#20075,#20003)
-stmtContainers(#20075,#20001)
+stmt_containers(#20075,#20001)
 #20076=*
 exprs(#20076,78,#20075,-1,"f")
 hasLocation(#20076,#20019)
@@ -251,7 +251,7 @@ stmts(#20086,2,#20001,1,"functio ... )\n  }\n}")
 #20087=@"loc,{#10000},3,1,7,1"
 locations_default(#20087,#10000,3,1,7,1)
 hasLocation(#20086,#20087)
-stmtContainers(#20086,#20001)
+stmt_containers(#20086,#20001)
 #20088=*
 exprs(#20088,9,#20086,0,"functio ... )\n  }\n}")
 hasLocation(#20088,#20087)
@@ -279,13 +279,13 @@ stmts(#20094,1,#20088,-2,"{\n  if  ... )\n  }\n}")
 #20095=@"loc,{#10000},3,13,7,1"
 locations_default(#20095,#10000,3,13,7,1)
 hasLocation(#20094,#20095)
-stmtContainers(#20094,#20088)
+stmt_containers(#20094,#20088)
 #20096=*
 stmts(#20096,3,#20094,0,"if (b)  ... t"")\n  }")
 #20097=@"loc,{#10000},4,3,6,3"
 locations_default(#20097,#10000,4,3,6,3)
 hasLocation(#20096,#20097)
-stmtContainers(#20096,#20088)
+stmt_containers(#20096,#20088)
 #20098=*
 exprs(#20098,79,#20096,0,"b")
 hasLocation(#20098,#20047)
@@ -298,13 +298,13 @@ stmts(#20099,1,#20096,1,"{\n    f ... t"")\n  }")
 #20100=@"loc,{#10000},4,10,6,3"
 locations_default(#20100,#10000,4,10,6,3)
 hasLocation(#20099,#20100)
-stmtContainers(#20099,#20088)
+stmt_containers(#20099,#20088)
 #20101=*
 stmts(#20101,17,#20099,0,"functio ... esult"")")
 #20102=@"loc,{#10000},5,5,5,33"
 locations_default(#20102,#10000,5,5,5,33)
 hasLocation(#20101,#20102)
-stmtContainers(#20101,#20088)
+stmt_containers(#20101,#20088)
 #20103=*
 exprs(#20103,78,#20101,-1,"g")
 hasLocation(#20103,#20055)
diff --git a/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap b/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
index f278eaabd99..ddc16bb9a05 100644
--- a/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
@@ -296,7 +296,7 @@ variables(#20110,"item",#20000)
 #20111=*
 stmts(#20111,18,#20001,0,"var sum = 0;")
 hasLocation(#20111,#20005)
-stmtContainers(#20111,#20001)
+stmt_containers(#20111,#20001)
 #20112=*
 exprs(#20112,64,#20111,0,"sum = 0")
 #20113=@"loc,{#10000},1,5,1,11"
@@ -320,7 +320,7 @@ literals("0","0",#20115)
 #20116=*
 stmts(#20116,18,#20001,1,"var obj ... p3: 8};")
 hasLocation(#20116,#20007)
-stmtContainers(#20116,#20001)
+stmt_containers(#20116,#20001)
 #20117=*
 exprs(#20117,64,#20116,0,"obj = { ... op3: 8}")
 #20118=@"loc,{#10000},2,5,2,41"
@@ -398,7 +398,7 @@ stmts(#20134,25,#20001,2,"for eac ... item;\n}")
 #20135=@"loc,{#10000},4,1,6,1"
 locations_default(#20135,#10000,4,1,6,1)
 hasLocation(#20134,#20135)
-stmtContainers(#20134,#20001)
+stmt_containers(#20134,#20001)
 #20136=*
 exprs(#20136,79,#20134,1,"obj")
 hasLocation(#20136,#20077)
@@ -411,7 +411,7 @@ stmts(#20137,18,#20134,0,"var item")
 #20138=@"loc,{#10000},4,11,4,18"
 locations_default(#20138,#10000,4,11,4,18)
 hasLocation(#20137,#20138)
-stmtContainers(#20137,#20001)
+stmt_containers(#20137,#20001)
 #20139=*
 exprs(#20139,64,#20137,0,"item")
 hasLocation(#20139,#20073)
@@ -429,13 +429,13 @@ stmts(#20141,1,#20134,2,"{\n  sum += item;\n}")
 #20142=@"loc,{#10000},4,28,6,1"
 locations_default(#20142,#10000,4,28,6,1)
 hasLocation(#20141,#20142)
-stmtContainers(#20141,#20001)
+stmt_containers(#20141,#20001)
 #20143=*
 stmts(#20143,2,#20141,0,"sum += item;")
 #20144=@"loc,{#10000},5,3,5,14"
 locations_default(#20144,#10000,5,3,5,14)
 hasLocation(#20143,#20144)
-stmtContainers(#20143,#20001)
+stmt_containers(#20143,#20001)
 #20145=*
 exprs(#20145,48,#20143,0,"sum += item")
 #20146=@"loc,{#10000},5,3,5,13"
@@ -462,7 +462,7 @@ stmts(#20149,2,#20001,3,"console.log(sum);")
 #20150=@"loc,{#10000},8,1,8,17"
 locations_default(#20150,#10000,8,1,8,17)
 hasLocation(#20149,#20150)
-stmtContainers(#20149,#20001)
+stmt_containers(#20149,#20001)
 #20151=*
 exprs(#20151,13,#20149,0,"console.log(sum)")
 #20152=@"loc,{#10000},8,1,8,16"
diff --git a/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap b/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
index e03affbd24b..adeda0c1e59 100644
--- a/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
@@ -483,7 +483,7 @@ hasLocation(#20001,#20186)
 #20187=*
 stmts(#20187,2,#20001,0,"(for (y ...  year);")
 hasLocation(#20187,#20003)
-stmtContainers(#20187,#20001)
+stmt_containers(#20187,#20001)
 #20188=*
 exprs(#20188,74,#20187,0,"(for (y ... ) year)")
 #20189=@"loc,{#10000},1,1,1,43"
@@ -550,7 +550,7 @@ bind(#20201,#20193)
 #20202=*
 stmts(#20202,2,#20001,1,"year;")
 hasLocation(#20202,#20005)
-stmtContainers(#20202,#20001)
+stmt_containers(#20202,#20001)
 #20203=*
 exprs(#20203,79,#20202,0,"year")
 hasLocation(#20203,#20047)
@@ -563,7 +563,7 @@ bind(#20203,#20204)
 #20205=*
 stmts(#20205,2,#20001,2,"(for (i ... ) i+j);")
 hasLocation(#20205,#20007)
-stmtContainers(#20205,#20001)
+stmt_containers(#20205,#20001)
 #20206=*
 exprs(#20206,74,#20205,0,"(for (i ... s) i+j)")
 #20207=@"loc,{#10000},3,1,3,43"
@@ -653,7 +653,7 @@ bind(#20225,#20218)
 #20226=*
 stmts(#20226,2,#20001,3,"(for (i ... ) i+j);")
 hasLocation(#20226,#20009)
-stmtContainers(#20226,#20001)
+stmt_containers(#20226,#20001)
 #20227=*
 exprs(#20227,74,#20226,0,"(for (i ... j) i+j)")
 #20228=@"loc,{#10000},4,1,4,52"
@@ -760,7 +760,7 @@ bind(#20248,#20238)
 #20249=*
 stmts(#20249,2,#20001,4,"(x.p for (x in xs));")
 hasLocation(#20249,#20011)
-stmtContainers(#20249,#20001)
+stmt_containers(#20249,#20001)
 #20250=*
 exprs(#20250,74,#20249,0,"(x.p for (x in xs))")
 #20251=@"loc,{#10000},5,1,5,19"
@@ -820,7 +820,7 @@ literals("p","p",#20262)
 #20263=*
 stmts(#20263,2,#20001,5,"(x.p fo ... n xs));")
 hasLocation(#20263,#20013)
-stmtContainers(#20263,#20001)
+stmt_containers(#20263,#20001)
 #20264=*
 exprs(#20264,74,#20263,0,"(x.p fo ... in xs))")
 #20265=@"loc,{#10000},6,1,6,24"
diff --git a/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap b/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
index e9b4c0ea321..df1df5ddc33 100644
--- a/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
@@ -302,7 +302,7 @@ variables(#20110,"f",#20000)
 #20111=*
 stmts(#20111,17,#20001,0,"functio ... );\n\t}\n}")
 hasLocation(#20111,#20109)
-stmtContainers(#20111,#20001)
+stmt_containers(#20111,#20001)
 #20112=*
 exprs(#20112,78,#20111,-1,"f")
 hasLocation(#20112,#20023)
@@ -329,25 +329,25 @@ stmts(#20117,1,#20111,-2,"{\n\ttry  ... );\n\t}\n}")
 #20118=@"loc,{#10000},1,15,9,1"
 locations_default(#20118,#10000,1,15,9,1)
 hasLocation(#20117,#20118)
-stmtContainers(#20117,#20111)
+stmt_containers(#20117,#20111)
 #20119=*
 stmts(#20119,11,#20117,0,"try {\n\t ... !"");\n\t}")
 #20120=@"loc,{#10000},2,2,8,2"
 locations_default(#20120,#10000,2,2,8,2)
 hasLocation(#20119,#20120)
-stmtContainers(#20119,#20111)
+stmt_containers(#20119,#20111)
 #20121=*
 stmts(#20121,1,#20119,0,"{\n\t\tg();\n\t}")
 #20122=@"loc,{#10000},2,6,4,2"
 locations_default(#20122,#10000,2,6,4,2)
 hasLocation(#20121,#20122)
-stmtContainers(#20121,#20111)
+stmt_containers(#20121,#20111)
 #20123=*
 stmts(#20123,2,#20121,0,"g();")
 #20124=@"loc,{#10000},3,3,3,6"
 locations_default(#20124,#10000,3,3,3,6)
 hasLocation(#20123,#20124)
-stmtContainers(#20123,#20111)
+stmt_containers(#20123,#20111)
 #20125=*
 exprs(#20125,13,#20123,0,"g()")
 #20126=@"loc,{#10000},3,3,3,5"
@@ -367,7 +367,7 @@ stmts(#20128,20,#20119,1,"catch ( ... !"");\n\t}")
 #20129=@"loc,{#10000},4,4,6,2"
 locations_default(#20129,#10000,4,4,6,2)
 hasLocation(#20128,#20129)
-stmtContainers(#20128,#20111)
+stmt_containers(#20128,#20111)
 #20130=*
 scopes(#20130,2)
 scopenodes(#20128,#20130)
@@ -409,13 +409,13 @@ stmts(#20138,1,#20128,1,"{\n\t\tcon ... !"");\n\t}")
 #20139=@"loc,{#10000},4,36,6,2"
 locations_default(#20139,#10000,4,36,6,2)
 hasLocation(#20138,#20139)
-stmtContainers(#20138,#20111)
+stmt_containers(#20138,#20111)
 #20140=*
 stmts(#20140,2,#20138,0,"console ... ror!"");")
 #20141=@"loc,{#10000},5,3,5,24"
 locations_default(#20141,#10000,5,3,5,24)
 hasLocation(#20140,#20141)
-stmtContainers(#20140,#20111)
+stmt_containers(#20140,#20111)
 #20142=*
 exprs(#20142,13,#20140,0,"console ... rror!"")")
 #20143=@"loc,{#10000},5,3,5,23"
@@ -462,7 +462,7 @@ stmts(#20152,20,#20119,2,"catch ( ... !"");\n\t}")
 #20153=@"loc,{#10000},6,4,8,2"
 locations_default(#20153,#10000,6,4,8,2)
 hasLocation(#20152,#20153)
-stmtContainers(#20152,#20111)
+stmt_containers(#20152,#20111)
 #20154=*
 scopes(#20154,2)
 scopenodes(#20152,#20154)
@@ -481,13 +481,13 @@ stmts(#20157,1,#20152,1,"{\n\t\tcon ... !"");\n\t}")
 #20158=@"loc,{#10000},6,14,8,2"
 locations_default(#20158,#10000,6,14,8,2)
 hasLocation(#20157,#20158)
-stmtContainers(#20157,#20111)
+stmt_containers(#20157,#20111)
 #20159=*
 stmts(#20159,2,#20157,0,"console ... lse!"");")
 #20160=@"loc,{#10000},7,3,7,33"
 locations_default(#20160,#10000,7,3,7,33)
 hasLocation(#20159,#20160)
-stmtContainers(#20159,#20111)
+stmt_containers(#20159,#20111)
 #20161=*
 exprs(#20161,13,#20159,0,"console ... else!"")")
 #20162=@"loc,{#10000},7,3,7,32"
diff --git a/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap b/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
index 05603a2944d..6e6733ab1c4 100644
--- a/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
@@ -378,7 +378,7 @@ variables(#20144,"y",#20000)
 #20145=*
 stmts(#20145,18,#20001,0,"var x = 42, y = 19;")
 hasLocation(#20145,#20003)
-stmtContainers(#20145,#20001)
+stmt_containers(#20145,#20001)
 #20146=*
 exprs(#20146,64,#20145,0,"x = 42")
 #20147=@"loc,{#10000},1,5,1,10"
@@ -422,7 +422,7 @@ literals("19","19",#20153)
 #20154=*
 stmts(#20154,2,#20001,1,"console ... x + y);")
 hasLocation(#20154,#20007)
-stmtContainers(#20154,#20001)
+stmt_containers(#20154,#20001)
 #20155=*
 exprs(#20155,13,#20154,0,"console ...  x + y)")
 #20156=@"loc,{#10000},3,1,3,39"
@@ -531,7 +531,7 @@ bind(#20178,#20166)
 #20179=*
 stmts(#20179,2,#20001,2,"console.log(x - y);")
 hasLocation(#20179,#20011)
-stmtContainers(#20179,#20001)
+stmt_containers(#20179,#20001)
 #20180=*
 exprs(#20180,13,#20179,0,"console.log(x - y)")
 #20181=@"loc,{#10000},5,1,5,18"
@@ -583,7 +583,7 @@ bind(#20189,#20144)
 #20190=*
 stmts(#20190,2,#20001,3,"JSON.st ... y: y});")
 hasLocation(#20190,#20015)
-stmtContainers(#20190,#20001)
+stmt_containers(#20190,#20001)
 #20191=*
 exprs(#20191,13,#20190,0,"JSON.st ...  y: y})")
 #20192=@"loc,{#10000},7,1,7,50"
diff --git a/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap b/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
index e2dd5ef7032..5ee20363a2d 100644
--- a/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
@@ -263,7 +263,7 @@ variables(#20097,"y",#20000)
 #20098=*
 stmts(#20098,18,#20001,0,"var x = 42, y = 19;")
 hasLocation(#20098,#20003)
-stmtContainers(#20098,#20001)
+stmt_containers(#20098,#20001)
 #20099=*
 exprs(#20099,64,#20098,0,"x = 42")
 #20100=@"loc,{#10000},1,5,1,10"
@@ -309,7 +309,7 @@ stmts(#20107,24,#20001,1,"let (x  ... + y);\n}")
 #20108=@"loc,{#10000},3,1,5,1"
 locations_default(#20108,#10000,3,1,5,1)
 hasLocation(#20107,#20108)
-stmtContainers(#20107,#20001)
+stmt_containers(#20107,#20001)
 #20109=*
 scopes(#20109,4)
 scopenodes(#20107,#20109)
@@ -363,13 +363,13 @@ stmts(#20120,1,#20107,-1,"{\n  con ... + y);\n}")
 #20121=@"loc,{#10000},3,22,5,1"
 locations_default(#20121,#10000,3,22,5,1)
 hasLocation(#20120,#20121)
-stmtContainers(#20120,#20001)
+stmt_containers(#20120,#20001)
 #20122=*
 stmts(#20122,2,#20120,0,"console.log(x + y);")
 #20123=@"loc,{#10000},4,3,4,21"
 locations_default(#20123,#10000,4,3,4,21)
 hasLocation(#20122,#20123)
-stmtContainers(#20122,#20001)
+stmt_containers(#20122,#20001)
 #20124=*
 exprs(#20124,13,#20122,0,"console.log(x + y)")
 #20125=@"loc,{#10000},4,3,4,20"
@@ -423,7 +423,7 @@ bind(#20134,#20111)
 #20135=*
 stmts(#20135,2,#20001,2,"console.log(x - y);")
 hasLocation(#20135,#20015)
-stmtContainers(#20135,#20001)
+stmt_containers(#20135,#20001)
 #20136=*
 exprs(#20136,13,#20135,0,"console.log(x - y)")
 #20137=@"loc,{#10000},7,1,7,18"
diff --git a/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap b/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
index c445fbc3861..a981bbea9b4 100644
--- a/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
@@ -65,7 +65,7 @@ variables(#20021,"x",#20000)
 #20022=*
 stmts(#20022,24,#20001,0,"let (x = 0) 1")
 hasLocation(#20022,#20003)
-stmtContainers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
 scopes(#20023,4)
 scopenodes(#20022,#20023)
@@ -95,7 +95,7 @@ literals("0","0",#20028)
 #20029=*
 stmts(#20029,2,#20022,-1,"1")
 hasLocation(#20029,#20017)
-stmtContainers(#20029,#20001)
+stmt_containers(#20029,#20001)
 #20030=*
 exprs(#20030,3,#20029,0,"1")
 hasLocation(#20030,#20017)
diff --git a/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap b/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
index 7f2f03a1d8a..0f615aa631e 100644
--- a/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
@@ -140,7 +140,7 @@ hasLocation(#20001,#20048)
 #20049=*
 stmts(#20049,2,#20001,0,"new A() ... ""bar"" }")
 hasLocation(#20049,#20008)
-stmtContainers(#20049,#20001)
+stmt_containers(#20049,#20001)
 #20050=*
 exprs(#20050,12,#20049,0,"new A() ... ""bar"" }")
 hasLocation(#20050,#20008)
@@ -188,7 +188,7 @@ regexpConstValue(#20059,"bar")
 #20061=*
 stmts(#20061,2,#20001,1,"new A()")
 hasLocation(#20061,#20013)
-stmtContainers(#20061,#20001)
+stmt_containers(#20061,#20001)
 #20062=*
 exprs(#20062,12,#20061,0,"new A()")
 hasLocation(#20062,#20013)
@@ -204,7 +204,7 @@ bind(#20063,#20052)
 #20064=*
 stmts(#20064,1,#20001,2,"{}")
 hasLocation(#20064,#20015)
-stmtContainers(#20064,#20001)
+stmt_containers(#20064,#20001)
 #20065=*
 entry_cfg_node(#20065,#20001)
 #20066=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap b/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap
index c0a9e6484e8..088f3c5c52d 100644
--- a/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap
@@ -112,7 +112,7 @@ variables(#20038,"test",#20000)
 #20039=*
 stmts(#20039,17,#20001,0,"functio ... nts);\n}")
 hasLocation(#20039,#20037)
-stmtContainers(#20039,#20001)
+stmt_containers(#20039,#20001)
 #20040=*
 exprs(#20040,78,#20039,-1,"test")
 hasLocation(#20040,#20013)
@@ -131,7 +131,7 @@ stmts(#20043,1,#20039,-2,"{\n    a ... nts);\n}")
 #20044=@"loc,{#10000},1,17,4,1"
 locations_default(#20044,#10000,1,17,4,1)
 hasLocation(#20043,#20044)
-stmtContainers(#20043,#20039)
+stmt_containers(#20043,#20039)
 #20045=*
 scopes(#20045,4)
 scopenodes(#20043,#20045)
@@ -143,7 +143,7 @@ stmts(#20047,2,#20043,0,"arguments;")
 #20048=@"loc,{#10000},2,5,2,14"
 locations_default(#20048,#10000,2,5,2,14)
 hasLocation(#20047,#20048)
-stmtContainers(#20047,#20039)
+stmt_containers(#20047,#20039)
 #20049=*
 exprs(#20049,79,#20047,0,"arguments")
 hasLocation(#20049,#20021)
@@ -156,7 +156,7 @@ stmts(#20050,24,#20043,1,"let (arguments);")
 #20051=@"loc,{#10000},3,5,3,20"
 locations_default(#20051,#10000,3,5,3,20)
 hasLocation(#20050,#20051)
-stmtContainers(#20050,#20039)
+stmt_containers(#20050,#20039)
 #20052=*
 scopes(#20052,4)
 scopenodes(#20050,#20052)
@@ -178,7 +178,7 @@ decl(#20055,#20053)
 #20056=*
 stmts(#20056,0,#20050,-1,";")
 hasLocation(#20056,#20033)
-stmtContainers(#20056,#20039)
+stmt_containers(#20056,#20039)
 #20057=*
 entry_cfg_node(#20057,#20001)
 #20058=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/node/output/trap/constlet.js.trap b/javascript/extractor/tests/node/output/trap/constlet.js.trap
index dc21f33a3ba..365fcff0b10 100644
--- a/javascript/extractor/tests/node/output/trap/constlet.js.trap
+++ b/javascript/extractor/tests/node/output/trap/constlet.js.trap
@@ -112,7 +112,7 @@ variables(#20041,"y",#20033)
 #20042=*
 stmts(#20042,22,#20001,0,"const x = 23;")
 hasLocation(#20042,#20003)
-stmtContainers(#20042,#20001)
+stmt_containers(#20042,#20001)
 #20043=*
 exprs(#20043,64,#20042,0,"x = 23")
 #20044=@"loc,{#10000},1,7,1,12"
@@ -136,7 +136,7 @@ literals("23","23",#20046)
 #20047=*
 stmts(#20047,23,#20001,1,"let y = 42;")
 hasLocation(#20047,#20005)
-stmtContainers(#20047,#20001)
+stmt_containers(#20047,#20001)
 #20048=*
 exprs(#20048,64,#20047,0,"y = 42")
 #20049=@"loc,{#10000},2,5,2,10"
diff --git a/javascript/extractor/tests/node/output/trap/hello.trap b/javascript/extractor/tests/node/output/trap/hello.trap
index 9079a0c421e..921972fe719 100644
--- a/javascript/extractor/tests/node/output/trap/hello.trap
+++ b/javascript/extractor/tests/node/output/trap/hello.trap
@@ -88,7 +88,7 @@ is_module(#20001)
 #20031=*
 stmts(#20031,2,#20001,0,"console ... rld!"");")
 hasLocation(#20031,#20003)
-stmtContainers(#20031,#20001)
+stmt_containers(#20031,#20001)
 #20032=*
 exprs(#20032,13,#20031,0,"console ... orld!"")")
 #20033=@"loc,{#10000},2,1,2,28"
diff --git a/javascript/extractor/tests/node/output/trap/tst.html.trap b/javascript/extractor/tests/node/output/trap/tst.html.trap
index c8a3e3e61eb..afe59f427ec 100644
--- a/javascript/extractor/tests/node/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.html.trap
@@ -52,7 +52,7 @@ variables(#20016,"x",#20000)
 #20017=*
 stmts(#20017,18,#20001,0,"var x = 42;")
 hasLocation(#20017,#20003)
-stmtContainers(#20017,#20001)
+stmt_containers(#20017,#20001)
 #20018=*
 exprs(#20018,64,#20017,0,"x = 42")
 #20019=@"loc,{#10000},6,17,6,22"
diff --git a/javascript/extractor/tests/node/output/trap/tst.js.trap b/javascript/extractor/tests/node/output/trap/tst.js.trap
index bdc38d0a2ad..1be029fbed2 100644
--- a/javascript/extractor/tests/node/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.js.trap
@@ -197,7 +197,7 @@ variables(#20074,"fs",#20067)
 #20075=*
 stmts(#20075,18,#20001,0,"var fs  ... ('fs');")
 hasLocation(#20075,#20003)
-stmtContainers(#20075,#20001)
+stmt_containers(#20075,#20001)
 #20076=*
 exprs(#20076,64,#20075,0,"fs = require('fs')")
 #20077=@"loc,{#10000},1,5,1,22"
@@ -241,7 +241,7 @@ regexpConstValue(#20083,"fs")
 #20085=*
 stmts(#20085,2,#20001,1,"y = 42;")
 hasLocation(#20085,#20005)
-stmtContainers(#20085,#20001)
+stmt_containers(#20085,#20001)
 #20086=*
 exprs(#20086,47,#20085,0,"y = 42")
 #20087=@"loc,{#10000},2,1,2,6"
@@ -267,7 +267,7 @@ literals("42","42",#20090)
 #20091=*
 stmts(#20091,2,#20001,2,"console ... ename);")
 hasLocation(#20091,#20007)
-stmtContainers(#20091,#20001)
+stmt_containers(#20091,#20001)
 #20092=*
 exprs(#20092,13,#20091,0,"console ... lename)")
 #20093=@"loc,{#10000},3,1,3,23"
@@ -305,7 +305,7 @@ bind(#20098,#20071)
 #20099=*
 stmts(#20099,9,#20001,3,"return arguments[0];")
 hasLocation(#20099,#20009)
-stmtContainers(#20099,#20001)
+stmt_containers(#20099,#20001)
 #20100=*
 exprs(#20100,15,#20099,0,"arguments[0]")
 #20101=@"loc,{#10000},4,8,4,19"
diff --git a/javascript/extractor/tests/node/output/trap/tst.mjs.trap b/javascript/extractor/tests/node/output/trap/tst.mjs.trap
index abe3f2580e4..86a2c231c93 100644
--- a/javascript/extractor/tests/node/output/trap/tst.mjs.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.mjs.trap
@@ -56,7 +56,7 @@ variables(#20017,"x",#20016)
 #20018=*
 stmts(#20018,18,#20001,0,"var x;")
 hasLocation(#20018,#20003)
-stmtContainers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,64,#20018,0,"x")
 hasLocation(#20019,#20007)
diff --git a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
index 5fc99d8de1f..dcc39e328f8 100644
--- a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
@@ -118,7 +118,7 @@ hasLocation(#20001,#20040)
 #20041=*
 stmts(#20041,2,#20001,0,"/^(?<ws ... <ws>$/;")
 hasLocation(#20041,#20003)
-stmtContainers(#20041,#20001)
+stmt_containers(#20041,#20001)
 #20042=*
 exprs(#20042,5,#20041,0,"/^(?<ws ... k<ws>$/")
 hasLocation(#20042,#20015)
@@ -180,7 +180,7 @@ hasLocation(#20059,#20060)
 #20061=*
 stmts(#20061,2,#20001,1,"/(?<=.)/;")
 hasLocation(#20061,#20005)
-stmtContainers(#20061,#20001)
+stmt_containers(#20061,#20001)
 #20062=*
 exprs(#20062,5,#20061,0,"/(?<=.)/")
 hasLocation(#20062,#20019)
@@ -200,7 +200,7 @@ hasLocation(#20065,#20066)
 #20067=*
 stmts(#20067,2,#20001,2,"/(?<!.)/;")
 hasLocation(#20067,#20007)
-stmtContainers(#20067,#20001)
+stmt_containers(#20067,#20001)
 #20068=*
 exprs(#20068,5,#20067,0,"/(?<!.)/")
 hasLocation(#20068,#20023)
@@ -220,7 +220,7 @@ hasLocation(#20071,#20072)
 #20073=*
 stmts(#20073,2,#20001,3,"/\p{Number}/u;")
 hasLocation(#20073,#20009)
-stmtContainers(#20073,#20001)
+stmt_containers(#20073,#20001)
 #20074=*
 exprs(#20074,5,#20073,0,"/\p{Number}/u")
 hasLocation(#20074,#20027)
@@ -236,7 +236,7 @@ unicodePropertyEscapeName(#20075,"Number")
 #20077=*
 stmts(#20077,2,#20001,4,"/\P{Script=Greek}/u;")
 hasLocation(#20077,#20011)
-stmtContainers(#20077,#20001)
+stmt_containers(#20077,#20001)
 #20078=*
 exprs(#20078,5,#20077,0,"/\P{Script=Greek}/u")
 hasLocation(#20078,#20031)
@@ -253,7 +253,7 @@ unicodePropertyEscapeValue(#20079,"Greek")
 #20081=*
 stmts(#20081,2,#20001,5,"/\k</;")
 hasLocation(#20081,#20013)
-stmtContainers(#20081,#20001)
+stmt_containers(#20081,#20001)
 #20082=*
 exprs(#20082,5,#20081,0,"/\k</")
 hasLocation(#20082,#20035)
diff --git a/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap b/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
index 981f98374f1..18128d2ffdb 100644
--- a/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
@@ -35,7 +35,7 @@ hasLocation(#20001,#20003)
 #20010=*
 stmts(#20010,2,#20001,0,"/dice/y;")
 hasLocation(#20010,#20003)
-stmtContainers(#20010,#20001)
+stmt_containers(#20010,#20001)
 #20011=*
 exprs(#20011,5,#20010,0,"/dice/y")
 hasLocation(#20011,#20005)
diff --git a/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap b/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
index e7d36e4515a..dbcd8ea3b09 100644
--- a/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
@@ -198,7 +198,7 @@ variables(#20071,"r",#20000)
 #20072=*
 stmts(#20072,18,#20001,0,"var r;")
 hasLocation(#20072,#20003)
-stmtContainers(#20072,#20001)
+stmt_containers(#20072,#20001)
 #20073=*
 exprs(#20073,64,#20072,0,"r")
 hasLocation(#20073,#20019)
@@ -216,7 +216,7 @@ stmts(#20075,2,#20001,1,"reportC ... n 1""\n);")
 #20076=@"loc,{#10000},3,1,7,2"
 locations_default(#20076,#10000,3,1,7,2)
 hasLocation(#20075,#20076)
-stmtContainers(#20075,#20001)
+stmt_containers(#20075,#20001)
 #20077=*
 exprs(#20077,13,#20075,0,"reportC ... on 1""\n)")
 #20078=@"loc,{#10000},3,1,7,1"
diff --git a/javascript/extractor/tests/regexp/output/trap/tst.js.trap b/javascript/extractor/tests/regexp/output/trap/tst.js.trap
index 3304e647f27..232de4fa791 100644
Binary files a/javascript/extractor/tests/regexp/output/trap/tst.js.trap and b/javascript/extractor/tests/regexp/output/trap/tst.js.trap differ
diff --git a/javascript/extractor/tests/restprops/output/trap/tst.js.trap b/javascript/extractor/tests/restprops/output/trap/tst.js.trap
index be3beee62b7..df9ba712449 100644
--- a/javascript/extractor/tests/restprops/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/restprops/output/trap/tst.js.trap
@@ -95,7 +95,7 @@ variables(#20033,"f",#20000)
 #20034=*
 stmts(#20034,18,#20001,0,"var f = ...  => {};")
 hasLocation(#20034,#20003)
-stmtContainers(#20034,#20001)
+stmt_containers(#20034,#20001)
 #20035=*
 exprs(#20035,64,#20034,0,"f = ({...p}) => {}")
 #20036=@"loc,{#10000},1,5,1,22"
@@ -140,7 +140,7 @@ stmts(#20045,1,#20038,-2,"{}")
 #20046=@"loc,{#10000},1,21,1,22"
 locations_default(#20046,#10000,1,21,1,22)
 hasLocation(#20045,#20046)
-stmtContainers(#20045,#20038)
+stmt_containers(#20045,#20038)
 #20047=*
 entry_cfg_node(#20047,#20001)
 #20048=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/shebang/output/trap/tst.js.trap b/javascript/extractor/tests/shebang/output/trap/tst.js.trap
index a4958dd62f0..fabc408ffe4 100644
--- a/javascript/extractor/tests/shebang/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/shebang/output/trap/tst.js.trap
@@ -75,7 +75,7 @@ is_module(#20001)
 #20027=*
 stmts(#20027,2,#20001,0,"alert(""Hi!"");")
 hasLocation(#20027,#20003)
-stmtContainers(#20027,#20001)
+stmt_containers(#20027,#20001)
 #20028=*
 exprs(#20028,13,#20027,0,"alert(""Hi!"")")
 #20029=@"loc,{#10000},2,1,2,12"
diff --git a/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap b/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap
index fc61afe98f1..7b36f0f6983 100644
--- a/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap
+++ b/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap
@@ -89,7 +89,7 @@ stmts(#20029,34,#20001,0,"#!/usr/ ... mber;\n}")
 #20030=@"loc,{#10000},1,1,4,1"
 locations_default(#20030,#10000,1,1,4,1)
 hasLocation(#20029,#20030)
-stmtContainers(#20029,#20001)
+stmt_containers(#20029,#20001)
 #20031=*
 typeexprs(#20031,1,#20029,0,"Foo")
 hasLocation(#20031,#20013)
diff --git a/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap b/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap
index 57cf414a1a3..9ee33c24525 100644
--- a/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap
+++ b/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap
@@ -83,7 +83,7 @@ stmts(#20027,34,#20001,0,"interfa ... mber;\n}")
 #20028=@"loc,{#10000},1,1,3,1"
 locations_default(#20028,#10000,1,1,3,1)
 hasLocation(#20027,#20028)
-stmtContainers(#20027,#20001)
+stmt_containers(#20027,#20001)
 #20029=*
 typeexprs(#20029,1,#20027,0,"Foo")
 hasLocation(#20029,#20011)
diff --git a/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap b/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap
index 92821e8bc28..3031c8ca403 100644
--- a/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap
@@ -235,7 +235,7 @@ stmts(#20083,3,#20001,0,"if (true)\n    ;")
 #20084=@"loc,{#10000},1,1,2,5"
 locations_default(#20084,#10000,1,1,2,5)
 hasLocation(#20083,#20084)
-stmtContainers(#20083,#20001)
+stmt_containers(#20083,#20001)
 #20085=*
 exprs(#20085,2,#20083,0,"true")
 hasLocation(#20085,#20031)
@@ -245,13 +245,13 @@ literals("true","true",#20085)
 #20086=*
 stmts(#20086,0,#20083,1,";")
 hasLocation(#20086,#20035)
-stmtContainers(#20086,#20001)
+stmt_containers(#20086,#20001)
 #20087=*
 stmts(#20087,3,#20001,1,"if (b)\n ... e\n    ;")
 #20088=@"loc,{#10000},3,1,6,5"
 locations_default(#20088,#10000,3,1,6,5)
 hasLocation(#20087,#20088)
-stmtContainers(#20087,#20001)
+stmt_containers(#20087,#20001)
 #20089=*
 exprs(#20089,79,#20087,0,"b")
 hasLocation(#20089,#20041)
@@ -264,17 +264,17 @@ bind(#20089,#20090)
 #20091=*
 stmts(#20091,0,#20087,1,";")
 hasLocation(#20091,#20045)
-stmtContainers(#20091,#20001)
+stmt_containers(#20091,#20001)
 #20092=*
 stmts(#20092,0,#20087,2,";")
 hasLocation(#20092,#20048)
-stmtContainers(#20092,#20001)
+stmt_containers(#20092,#20001)
 #20093=*
 stmts(#20093,8,#20001,2,"switch  ... ault:\n}")
 #20094=@"loc,{#10000},7,1,12,1"
 locations_default(#20094,#10000,7,1,12,1)
 hasLocation(#20093,#20094)
-stmtContainers(#20093,#20001)
+stmt_containers(#20093,#20001)
 #20095=*
 exprs(#20095,79,#20093,-1,"b")
 hasLocation(#20095,#20054)
@@ -285,7 +285,7 @@ bind(#20095,#20090)
 #20096=*
 stmts(#20096,19,#20093,0,"case 23:")
 hasLocation(#20096,#20017)
-stmtContainers(#20096,#20001)
+stmt_containers(#20096,#20001)
 #20097=*
 exprs(#20097,3,#20096,-1,"23")
 hasLocation(#20097,#20062)
@@ -297,7 +297,7 @@ stmts(#20098,19,#20093,1,"case c:\n    break;")
 #20099=@"loc,{#10000},9,1,10,10"
 locations_default(#20099,#10000,9,1,10,10)
 hasLocation(#20098,#20099)
-stmtContainers(#20098,#20001)
+stmt_containers(#20098,#20001)
 #20100=*
 exprs(#20100,79,#20098,-1,"c")
 hasLocation(#20100,#20068)
@@ -312,12 +312,12 @@ stmts(#20102,5,#20098,0,"break;")
 #20103=@"loc,{#10000},10,5,10,10"
 locations_default(#20103,#10000,10,5,10,10)
 hasLocation(#20102,#20103)
-stmtContainers(#20102,#20001)
+stmt_containers(#20102,#20001)
 jumpTargets(#20102,#20093)
 #20104=*
 stmts(#20104,19,#20093,2,"default:")
 hasLocation(#20104,#20023)
-stmtContainers(#20104,#20001)
+stmt_containers(#20104,#20001)
 #20105=*
 entry_cfg_node(#20105,#20001)
 #20106=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap b/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
index 437d896cf8d..b295cfa8c3b 100644
--- a/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
@@ -159,7 +159,7 @@ hasLocation(#20001,#20058)
 #20059=*
 stmts(#20059,15,#20001,0,"for (a  ... b) f();")
 hasLocation(#20059,#20003)
-stmtContainers(#20059,#20001)
+stmt_containers(#20059,#20001)
 #20060=*
 exprs(#20060,79,#20059,1,"b")
 hasLocation(#20060,#20021)
@@ -189,7 +189,7 @@ stmts(#20065,2,#20059,2,"f();")
 #20066=@"loc,{#10000},1,18,1,21"
 locations_default(#20066,#10000,1,18,1,21)
 hasLocation(#20065,#20066)
-stmtContainers(#20065,#20001)
+stmt_containers(#20065,#20001)
 #20067=*
 exprs(#20067,13,#20065,0,"f()")
 #20068=@"loc,{#10000},1,18,1,20"
@@ -209,7 +209,7 @@ bind(#20069,#20070)
 #20071=*
 stmts(#20071,21,#20001,1,"for (c  ... d) g();")
 hasLocation(#20071,#20007)
-stmtContainers(#20071,#20001)
+stmt_containers(#20071,#20001)
 #20072=*
 exprs(#20072,79,#20071,1,"d")
 hasLocation(#20072,#20045)
@@ -239,7 +239,7 @@ stmts(#20077,2,#20071,2,"g();")
 #20078=@"loc,{#10000},3,18,3,21"
 locations_default(#20078,#10000,3,18,3,21)
 hasLocation(#20077,#20078)
-stmtContainers(#20077,#20001)
+stmt_containers(#20077,#20001)
 #20079=*
 exprs(#20079,13,#20077,0,"g()")
 #20080=@"loc,{#10000},3,18,3,20"
diff --git a/javascript/extractor/tests/stmts/output/trap/functions.js.trap b/javascript/extractor/tests/stmts/output/trap/functions.js.trap
index 478f2ccaa69..b4fa39350b2 100644
--- a/javascript/extractor/tests/stmts/output/trap/functions.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/functions.js.trap
@@ -314,7 +314,7 @@ stmts(#20115,17,#20001,0,"functio ...  x+y;\n}")
 #20116=@"loc,{#10000},1,1,3,1"
 locations_default(#20116,#10000,1,1,3,1)
 hasLocation(#20115,#20116)
-stmtContainers(#20115,#20001)
+stmt_containers(#20115,#20001)
 #20117=*
 exprs(#20117,78,#20115,-1,"g")
 hasLocation(#20117,#20031)
@@ -349,13 +349,13 @@ stmts(#20124,1,#20115,-2,"{\n    return x+y;\n}")
 #20125=@"loc,{#10000},1,18,3,1"
 locations_default(#20125,#10000,1,18,3,1)
 hasLocation(#20124,#20125)
-stmtContainers(#20124,#20115)
+stmt_containers(#20124,#20115)
 #20126=*
 stmts(#20126,9,#20124,0,"return x+y;")
 #20127=@"loc,{#10000},2,5,2,15"
 locations_default(#20127,#10000,2,5,2,15)
 hasLocation(#20126,#20127)
-stmtContainers(#20126,#20115)
+stmt_containers(#20126,#20115)
 #20128=*
 exprs(#20128,34,#20126,0,"x+y")
 #20129=@"loc,{#10000},2,12,2,14"
@@ -380,7 +380,7 @@ bind(#20131,#20121)
 #20132=*
 stmts(#20132,17,#20001,1,"function h() {}")
 hasLocation(#20132,#20011)
-stmtContainers(#20132,#20001)
+stmt_containers(#20132,#20001)
 #20133=*
 exprs(#20133,78,#20132,-1,"h")
 hasLocation(#20133,#20058)
@@ -399,13 +399,13 @@ stmts(#20136,1,#20132,-2,"{}")
 #20137=@"loc,{#10000},5,14,5,15"
 locations_default(#20137,#10000,5,14,5,15)
 hasLocation(#20136,#20137)
-stmtContainers(#20136,#20132)
+stmt_containers(#20136,#20132)
 #20138=*
 stmts(#20138,2,#20001,2,"k = fun ... turn;\n}")
 #20139=@"loc,{#10000},7,1,9,1"
 locations_default(#20139,#10000,7,1,9,1)
 hasLocation(#20138,#20139)
-stmtContainers(#20138,#20001)
+stmt_containers(#20138,#20001)
 #20140=*
 exprs(#20140,47,#20138,0,"k = fun ... turn;\n}")
 hasLocation(#20140,#20139)
@@ -439,17 +439,17 @@ stmts(#20147,1,#20143,-2,"{\n    return;\n}")
 #20148=@"loc,{#10000},7,16,9,1"
 locations_default(#20148,#10000,7,16,9,1)
 hasLocation(#20147,#20148)
-stmtContainers(#20147,#20143)
+stmt_containers(#20147,#20143)
 #20149=*
 stmts(#20149,9,#20147,0,"return;")
 #20150=@"loc,{#10000},8,5,8,11"
 locations_default(#20150,#10000,8,5,8,11)
 hasLocation(#20149,#20150)
-stmtContainers(#20149,#20143)
+stmt_containers(#20149,#20143)
 #20151=*
 stmts(#20151,2,#20001,3,"l = function f() {}")
 hasLocation(#20151,#20023)
-stmtContainers(#20151,#20001)
+stmt_containers(#20151,#20001)
 #20152=*
 exprs(#20152,47,#20151,0,"l = function f() {}")
 hasLocation(#20152,#20023)
@@ -491,11 +491,11 @@ stmts(#20161,1,#20155,-2,"{}")
 #20162=@"loc,{#10000},11,18,11,19"
 locations_default(#20162,#10000,11,18,11,19)
 hasLocation(#20161,#20162)
-stmtContainers(#20161,#20155)
+stmt_containers(#20161,#20155)
 #20163=*
 stmts(#20163,2,#20001,4,"function() {}")
 hasLocation(#20163,#20027)
-stmtContainers(#20163,#20001)
+stmt_containers(#20163,#20001)
 #20164=*
 exprs(#20164,9,#20163,0,"function() {}")
 hasLocation(#20164,#20027)
@@ -513,7 +513,7 @@ stmts(#20167,1,#20164,-2,"{}")
 #20168=@"loc,{#10000},13,12,13,13"
 locations_default(#20168,#10000,13,12,13,13)
 hasLocation(#20167,#20168)
-stmtContainers(#20167,#20164)
+stmt_containers(#20167,#20164)
 #20169=*
 entry_cfg_node(#20169,#20001)
 #20170=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/stmts/output/trap/loops.js.trap b/javascript/extractor/tests/stmts/output/trap/loops.js.trap
index b43c7f2d76a..6166d7dbeb9 100644
--- a/javascript/extractor/tests/stmts/output/trap/loops.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/loops.js.trap
@@ -623,7 +623,7 @@ stmts(#20233,12,#20001,0,"while(true)\n    ;")
 #20234=@"loc,{#10000},1,1,2,5"
 locations_default(#20234,#10000,1,1,2,5)
 hasLocation(#20233,#20234)
-stmtContainers(#20233,#20001)
+stmt_containers(#20233,#20001)
 #20235=*
 exprs(#20235,2,#20233,0,"true")
 hasLocation(#20235,#20049)
@@ -633,13 +633,13 @@ literals("true","true",#20235)
 #20236=*
 stmts(#20236,0,#20233,1,";")
 hasLocation(#20236,#20053)
-stmtContainers(#20236,#20001)
+stmt_containers(#20236,#20001)
 #20237=*
 stmts(#20237,4,#20001,1,"outer:  ... inue;\n}")
 #20238=@"loc,{#10000},3,1,11,1"
 locations_default(#20238,#10000,3,1,11,1)
 hasLocation(#20237,#20238)
-stmtContainers(#20237,#20001)
+stmt_containers(#20237,#20001)
 #20239=*
 exprs(#20239,0,#20237,0,"outer")
 hasLocation(#20239,#20055)
@@ -651,7 +651,7 @@ stmts(#20240,14,#20237,1,"for(a;  ... inue;\n}")
 #20241=@"loc,{#10000},3,8,11,1"
 locations_default(#20241,#10000,3,8,11,1)
 hasLocation(#20240,#20241)
-stmtContainers(#20240,#20001)
+stmt_containers(#20240,#20001)
 #20242=*
 exprs(#20242,79,#20240,1,"b")
 hasLocation(#20242,#20067)
@@ -684,19 +684,19 @@ stmts(#20248,1,#20240,3,"{\n    f ... inue;\n}")
 #20249=@"loc,{#10000},3,21,11,1"
 locations_default(#20249,#10000,3,21,11,1)
 hasLocation(#20248,#20249)
-stmtContainers(#20248,#20001)
+stmt_containers(#20248,#20001)
 #20250=*
 stmts(#20250,14,#20248,0,"for(;;) ... ntinue;")
 #20251=@"loc,{#10000},4,5,10,21"
 locations_default(#20251,#10000,4,5,10,21)
 hasLocation(#20250,#20251)
-stmtContainers(#20250,#20001)
+stmt_containers(#20250,#20001)
 #20252=*
 stmts(#20252,3,#20250,3,"if (d)\n ... ntinue;")
 #20253=@"loc,{#10000},5,9,10,21"
 locations_default(#20253,#10000,5,9,10,21)
 hasLocation(#20252,#20253)
-stmtContainers(#20252,#20001)
+stmt_containers(#20252,#20001)
 #20254=*
 exprs(#20254,79,#20252,0,"d")
 hasLocation(#20254,#20091)
@@ -711,7 +711,7 @@ stmts(#20256,6,#20252,1,"continue outer;")
 #20257=@"loc,{#10000},6,13,6,27"
 locations_default(#20257,#10000,6,13,6,27)
 hasLocation(#20256,#20257)
-stmtContainers(#20256,#20001)
+stmt_containers(#20256,#20001)
 #20258=*
 exprs(#20258,0,#20256,0,"outer")
 hasLocation(#20258,#20097)
@@ -724,7 +724,7 @@ stmts(#20259,3,#20252,2,"if (e)\n ... ntinue;")
 #20260=@"loc,{#10000},7,14,10,21"
 locations_default(#20260,#10000,7,14,10,21)
 hasLocation(#20259,#20260)
-stmtContainers(#20259,#20001)
+stmt_containers(#20259,#20001)
 #20261=*
 exprs(#20261,79,#20259,0,"e")
 hasLocation(#20261,#20107)
@@ -739,7 +739,7 @@ stmts(#20263,5,#20259,1,"break outer;")
 #20264=@"loc,{#10000},8,13,8,24"
 locations_default(#20264,#10000,8,13,8,24)
 hasLocation(#20263,#20264)
-stmtContainers(#20263,#20001)
+stmt_containers(#20263,#20001)
 #20265=*
 exprs(#20265,0,#20263,0,"outer")
 hasLocation(#20265,#20113)
@@ -752,14 +752,14 @@ stmts(#20266,6,#20259,2,"continue;")
 #20267=@"loc,{#10000},10,13,10,21"
 locations_default(#20267,#10000,10,13,10,21)
 hasLocation(#20266,#20267)
-stmtContainers(#20266,#20001)
+stmt_containers(#20266,#20001)
 jumpTargets(#20266,#20250)
 #20268=*
 stmts(#20268,13,#20001,2,"do {\n   ... ile(a);")
 #20269=@"loc,{#10000},13,1,15,11"
 locations_default(#20269,#10000,13,1,15,11)
 hasLocation(#20268,#20269)
-stmtContainers(#20268,#20001)
+stmt_containers(#20268,#20001)
 #20270=*
 exprs(#20270,79,#20268,1,"a")
 hasLocation(#20270,#20136)
@@ -772,15 +772,15 @@ stmts(#20271,1,#20268,0,"{\n    ;\n}")
 #20272=@"loc,{#10000},13,4,15,1"
 locations_default(#20272,#10000,13,4,15,1)
 hasLocation(#20271,#20272)
-stmtContainers(#20271,#20001)
+stmt_containers(#20271,#20001)
 #20273=*
 stmts(#20273,0,#20271,0,";")
 hasLocation(#20273,#20128)
-stmtContainers(#20273,#20001)
+stmt_containers(#20273,#20001)
 #20274=*
 stmts(#20274,14,#20001,3,"for (va ... ; ++i);")
 hasLocation(#20274,#20035)
-stmtContainers(#20274,#20001)
+stmt_containers(#20274,#20001)
 #20275=*
 exprs(#20275,27,#20274,1,"i<n")
 #20276=@"loc,{#10000},17,20,17,22"
@@ -821,7 +821,7 @@ stmts(#20282,18,#20274,0,"var i=0,n=10")
 #20283=@"loc,{#10000},17,6,17,17"
 locations_default(#20283,#10000,17,6,17,17)
 hasLocation(#20282,#20283)
-stmtContainers(#20282,#20001)
+stmt_containers(#20282,#20001)
 #20284=*
 exprs(#20284,64,#20282,0,"i=0")
 #20285=@"loc,{#10000},17,10,17,12"
@@ -865,11 +865,11 @@ literals("10","10",#20291)
 #20292=*
 stmts(#20292,0,#20274,3,";")
 hasLocation(#20292,#20178)
-stmtContainers(#20292,#20001)
+stmt_containers(#20292,#20001)
 #20293=*
 stmts(#20293,15,#20001,4,"for (var x in xs);")
 hasLocation(#20293,#20039)
-stmtContainers(#20293,#20001)
+stmt_containers(#20293,#20001)
 #20294=*
 exprs(#20294,79,#20293,1,"xs")
 hasLocation(#20294,#20190)
@@ -884,7 +884,7 @@ stmts(#20296,18,#20293,0,"var x")
 #20297=@"loc,{#10000},19,6,19,10"
 locations_default(#20297,#10000,19,6,19,10)
 hasLocation(#20296,#20297)
-stmtContainers(#20296,#20001)
+stmt_containers(#20296,#20001)
 #20298=*
 exprs(#20298,64,#20296,0,"x")
 hasLocation(#20298,#20186)
@@ -900,11 +900,11 @@ decl(#20299,#20232)
 #20300=*
 stmts(#20300,0,#20293,2,";")
 hasLocation(#20300,#20194)
-stmtContainers(#20300,#20001)
+stmt_containers(#20300,#20001)
 #20301=*
 stmts(#20301,15,#20001,5,"for (x in xs);")
 hasLocation(#20301,#20041)
-stmtContainers(#20301,#20001)
+stmt_containers(#20301,#20001)
 #20302=*
 exprs(#20302,79,#20301,1,"xs")
 hasLocation(#20302,#20204)
@@ -922,11 +922,11 @@ bind(#20303,#20232)
 #20304=*
 stmts(#20304,0,#20301,2,";")
 hasLocation(#20304,#20208)
-stmtContainers(#20304,#20001)
+stmt_containers(#20304,#20001)
 #20305=*
 stmts(#20305,15,#20001,6,"for (x.f in xs);")
 hasLocation(#20305,#20043)
-stmtContainers(#20305,#20001)
+stmt_containers(#20305,#20001)
 #20306=*
 exprs(#20306,79,#20305,1,"xs")
 hasLocation(#20306,#20222)
@@ -957,7 +957,7 @@ literals("f","f",#20310)
 #20311=*
 stmts(#20311,0,#20305,2,";")
 hasLocation(#20311,#20226)
-stmtContainers(#20311,#20001)
+stmt_containers(#20311,#20001)
 #20312=*
 entry_cfg_node(#20312,#20001)
 #20313=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/stmts/output/trap/others.js.trap b/javascript/extractor/tests/stmts/output/trap/others.js.trap
index f92a25a4c9b..f62c9b60cb6 100644
--- a/javascript/extractor/tests/stmts/output/trap/others.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/others.js.trap
@@ -124,7 +124,7 @@ stmts(#20044,7,#20001,0,"with(a) {\n}")
 #20045=@"loc,{#10000},1,1,2,1"
 locations_default(#20045,#10000,1,1,2,1)
 hasLocation(#20044,#20045)
-stmtContainers(#20044,#20001)
+stmt_containers(#20044,#20001)
 #20046=*
 exprs(#20046,79,#20044,0,"a")
 hasLocation(#20046,#20015)
@@ -139,15 +139,15 @@ stmts(#20048,1,#20044,1,"{\n}")
 #20049=@"loc,{#10000},1,9,2,1"
 locations_default(#20049,#10000,1,9,2,1)
 hasLocation(#20048,#20049)
-stmtContainers(#20048,#20001)
+stmt_containers(#20048,#20001)
 #20050=*
 stmts(#20050,16,#20001,1,"debugger;")
 hasLocation(#20050,#20007)
-stmtContainers(#20050,#20001)
+stmt_containers(#20050,#20001)
 #20051=*
 stmts(#20051,18,#20001,2,"var x = 23, y;")
 hasLocation(#20051,#20009)
-stmtContainers(#20051,#20001)
+stmt_containers(#20051,#20001)
 #20052=*
 exprs(#20052,64,#20051,0,"x = 23")
 #20053=@"loc,{#10000},4,5,4,10"
diff --git a/javascript/extractor/tests/stmts/output/trap/switch.js.trap b/javascript/extractor/tests/stmts/output/trap/switch.js.trap
index b5ade92ebd7..a99ec844650 100644
--- a/javascript/extractor/tests/stmts/output/trap/switch.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/switch.js.trap
@@ -364,7 +364,7 @@ stmts(#20130,8,#20001,0,"switch  ... = 19;\n}")
 #20131=@"loc,{#10000},1,1,6,1"
 locations_default(#20131,#10000,1,1,6,1)
 hasLocation(#20130,#20131)
-stmtContainers(#20130,#20001)
+stmt_containers(#20130,#20001)
 #20132=*
 exprs(#20132,79,#20130,-1,"x")
 hasLocation(#20132,#20041)
@@ -379,20 +379,20 @@ stmts(#20134,19,#20130,0,"default:\n    break;")
 #20135=@"loc,{#10000},2,1,3,10"
 locations_default(#20135,#10000,2,1,3,10)
 hasLocation(#20134,#20135)
-stmtContainers(#20134,#20001)
+stmt_containers(#20134,#20001)
 #20136=*
 stmts(#20136,5,#20134,0,"break;")
 #20137=@"loc,{#10000},3,5,3,10"
 locations_default(#20137,#10000,3,5,3,10)
 hasLocation(#20136,#20137)
-stmtContainers(#20136,#20001)
+stmt_containers(#20136,#20001)
 jumpTargets(#20136,#20130)
 #20138=*
 stmts(#20138,19,#20130,1,"case 23 ...  += 19;")
 #20139=@"loc,{#10000},4,1,5,12"
 locations_default(#20139,#10000,4,1,5,12)
 hasLocation(#20138,#20139)
-stmtContainers(#20138,#20001)
+stmt_containers(#20138,#20001)
 #20140=*
 exprs(#20140,3,#20138,-1,"23")
 hasLocation(#20140,#20057)
@@ -404,7 +404,7 @@ stmts(#20141,2,#20138,0,"x += 19;")
 #20142=@"loc,{#10000},5,5,5,12"
 locations_default(#20142,#10000,5,5,5,12)
 hasLocation(#20141,#20142)
-stmtContainers(#20141,#20001)
+stmt_containers(#20141,#20001)
 #20143=*
 exprs(#20143,48,#20141,0,"x += 19")
 #20144=@"loc,{#10000},5,5,5,11"
@@ -430,7 +430,7 @@ stmts(#20147,17,#20001,1,"functio ...     }\n}")
 #20148=@"loc,{#10000},8,1,17,1"
 locations_default(#20148,#10000,8,1,17,1)
 hasLocation(#20147,#20148)
-stmtContainers(#20147,#20001)
+stmt_containers(#20147,#20001)
 #20149=*
 exprs(#20149,78,#20147,-1,"f")
 hasLocation(#20149,#20072)
@@ -449,13 +449,13 @@ stmts(#20152,1,#20147,-2,"{\n    s ...     }\n}")
 #20153=@"loc,{#10000},8,14,17,1"
 locations_default(#20153,#10000,8,14,17,1)
 hasLocation(#20152,#20153)
-stmtContainers(#20152,#20147)
+stmt_containers(#20152,#20147)
 #20154=*
 stmts(#20154,8,#20152,0,"switch( ... ;\n    }")
 #20155=@"loc,{#10000},9,5,16,5"
 locations_default(#20155,#10000,9,5,16,5)
 hasLocation(#20154,#20155)
-stmtContainers(#20154,#20147)
+stmt_containers(#20154,#20147)
 #20156=*
 exprs(#20156,79,#20154,-1,"x")
 hasLocation(#20156,#20084)
@@ -468,7 +468,7 @@ stmts(#20157,19,#20154,0,"case 0: ... urn 23;")
 #20158=@"loc,{#10000},10,5,11,18"
 locations_default(#20158,#10000,10,5,11,18)
 hasLocation(#20157,#20158)
-stmtContainers(#20157,#20147)
+stmt_containers(#20157,#20147)
 #20159=*
 exprs(#20159,3,#20157,-1,"0")
 hasLocation(#20159,#20092)
@@ -480,7 +480,7 @@ stmts(#20160,9,#20157,0,"return 23;")
 #20161=@"loc,{#10000},11,9,11,18"
 locations_default(#20161,#10000,11,9,11,18)
 hasLocation(#20160,#20161)
-stmtContainers(#20160,#20147)
+stmt_containers(#20160,#20147)
 #20162=*
 exprs(#20162,3,#20160,0,"23")
 hasLocation(#20162,#20098)
@@ -492,13 +492,13 @@ stmts(#20163,19,#20154,1,"default ... urn 42;")
 #20164=@"loc,{#10000},12,5,13,18"
 locations_default(#20164,#10000,12,5,13,18)
 hasLocation(#20163,#20164)
-stmtContainers(#20163,#20147)
+stmt_containers(#20163,#20147)
 #20165=*
 stmts(#20165,9,#20163,0,"return 42;")
 #20166=@"loc,{#10000},13,9,13,18"
 locations_default(#20166,#10000,13,9,13,18)
 hasLocation(#20165,#20166)
-stmtContainers(#20165,#20147)
+stmt_containers(#20165,#20147)
 #20167=*
 exprs(#20167,3,#20165,0,"42")
 hasLocation(#20167,#20108)
@@ -510,7 +510,7 @@ stmts(#20168,19,#20154,2,"case 1: ... urn 56;")
 #20169=@"loc,{#10000},14,5,15,18"
 locations_default(#20169,#10000,14,5,15,18)
 hasLocation(#20168,#20169)
-stmtContainers(#20168,#20147)
+stmt_containers(#20168,#20147)
 #20170=*
 exprs(#20170,3,#20168,-1,"1")
 hasLocation(#20170,#20114)
@@ -522,7 +522,7 @@ stmts(#20171,9,#20168,0,"return 56;")
 #20172=@"loc,{#10000},15,9,15,18"
 locations_default(#20172,#10000,15,9,15,18)
 hasLocation(#20171,#20172)
-stmtContainers(#20171,#20147)
+stmt_containers(#20171,#20147)
 #20173=*
 exprs(#20173,3,#20171,0,"56")
 hasLocation(#20173,#20120)
diff --git a/javascript/extractor/tests/stmts/output/trap/switch2.js.trap b/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
index 137fa387474..83139933313 100644
--- a/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
@@ -215,7 +215,7 @@ stmts(#20075,17,#20001,0,"functio ...     }\n}")
 #20076=@"loc,{#10000},1,1,9,1"
 locations_default(#20076,#10000,1,1,9,1)
 hasLocation(#20075,#20076)
-stmtContainers(#20075,#20001)
+stmt_containers(#20075,#20001)
 #20077=*
 exprs(#20077,78,#20075,-1,"f")
 hasLocation(#20077,#20023)
@@ -234,13 +234,13 @@ stmts(#20080,1,#20075,-2,"{\n    s ...     }\n}")
 #20081=@"loc,{#10000},1,14,9,1"
 locations_default(#20081,#10000,1,14,9,1)
 hasLocation(#20080,#20081)
-stmtContainers(#20080,#20075)
+stmt_containers(#20080,#20075)
 #20082=*
 stmts(#20082,8,#20080,0,"switch( ... ;\n    }")
 #20083=@"loc,{#10000},2,5,8,5"
 locations_default(#20083,#10000,2,5,8,5)
 hasLocation(#20082,#20083)
-stmtContainers(#20082,#20075)
+stmt_containers(#20082,#20075)
 #20084=*
 exprs(#20084,79,#20082,-1,"x")
 hasLocation(#20084,#20035)
@@ -255,7 +255,7 @@ stmts(#20086,19,#20082,0,"case 0:")
 #20087=@"loc,{#10000},3,5,3,11"
 locations_default(#20087,#10000,3,5,3,11)
 hasLocation(#20086,#20087)
-stmtContainers(#20086,#20075)
+stmt_containers(#20086,#20075)
 #20088=*
 exprs(#20088,3,#20086,-1,"0")
 hasLocation(#20088,#20043)
@@ -267,13 +267,13 @@ stmts(#20089,19,#20082,1,"default ... urn 42;")
 #20090=@"loc,{#10000},4,5,5,18"
 locations_default(#20090,#10000,4,5,5,18)
 hasLocation(#20089,#20090)
-stmtContainers(#20089,#20075)
+stmt_containers(#20089,#20075)
 #20091=*
 stmts(#20091,9,#20089,0,"return 42;")
 #20092=@"loc,{#10000},5,9,5,18"
 locations_default(#20092,#10000,5,9,5,18)
 hasLocation(#20091,#20092)
-stmtContainers(#20091,#20075)
+stmt_containers(#20091,#20075)
 #20093=*
 exprs(#20093,3,#20091,0,"42")
 hasLocation(#20093,#20053)
@@ -285,7 +285,7 @@ stmts(#20094,19,#20082,2,"case 1: ... urn 56;")
 #20095=@"loc,{#10000},6,5,7,18"
 locations_default(#20095,#10000,6,5,7,18)
 hasLocation(#20094,#20095)
-stmtContainers(#20094,#20075)
+stmt_containers(#20094,#20075)
 #20096=*
 exprs(#20096,3,#20094,-1,"1")
 hasLocation(#20096,#20059)
@@ -297,7 +297,7 @@ stmts(#20097,9,#20094,0,"return 56;")
 #20098=@"loc,{#10000},7,9,7,18"
 locations_default(#20098,#10000,7,9,7,18)
 hasLocation(#20097,#20098)
-stmtContainers(#20097,#20075)
+stmt_containers(#20097,#20075)
 #20099=*
 exprs(#20099,3,#20097,0,"56")
 hasLocation(#20099,#20065)
diff --git a/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap b/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
index d4e68646e4a..ea92e78d2fc 100644
--- a/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
@@ -58,7 +58,7 @@ hasLocation(#20001,#20018)
 #20019=*
 stmts(#20019,8,#20001,0,"switch(x){}")
 hasLocation(#20019,#20003)
-stmtContainers(#20019,#20001)
+stmt_containers(#20019,#20001)
 #20020=*
 exprs(#20020,79,#20019,-1,"x")
 hasLocation(#20020,#20009)
diff --git a/javascript/extractor/tests/stmts/output/trap/try.js.trap b/javascript/extractor/tests/stmts/output/trap/try.js.trap
index 98215c91d34..73f57d6b227 100644
--- a/javascript/extractor/tests/stmts/output/trap/try.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/try.js.trap
@@ -214,19 +214,19 @@ stmts(#20079,11,#20001,0,"try {\n  ... ) { ; }")
 #20080=@"loc,{#10000},1,1,3,16"
 locations_default(#20080,#10000,1,1,3,16)
 hasLocation(#20079,#20080)
-stmtContainers(#20079,#20001)
+stmt_containers(#20079,#20001)
 #20081=*
 stmts(#20081,1,#20079,0,"{\n    throw ""!"";\n}")
 #20082=@"loc,{#10000},1,5,3,1"
 locations_default(#20082,#10000,1,5,3,1)
 hasLocation(#20081,#20082)
-stmtContainers(#20081,#20001)
+stmt_containers(#20081,#20001)
 #20083=*
 stmts(#20083,10,#20081,0,"throw ""!"";")
 #20084=@"loc,{#10000},2,5,2,14"
 locations_default(#20084,#10000,2,5,2,14)
 hasLocation(#20083,#20084)
-stmtContainers(#20083,#20001)
+stmt_containers(#20083,#20001)
 #20085=*
 exprs(#20085,4,#20083,0,"""!""")
 hasLocation(#20085,#20019)
@@ -244,7 +244,7 @@ stmts(#20088,20,#20079,1,"catch(x) { ; }")
 #20089=@"loc,{#10000},3,3,3,16"
 locations_default(#20089,#10000,3,3,3,16)
 hasLocation(#20088,#20089)
-stmtContainers(#20088,#20001)
+stmt_containers(#20088,#20001)
 #20090=*
 scopes(#20090,2)
 scopenodes(#20088,#20090)
@@ -263,47 +263,47 @@ stmts(#20093,1,#20088,1,"{ ; }")
 #20094=@"loc,{#10000},3,12,3,16"
 locations_default(#20094,#10000,3,12,3,16)
 hasLocation(#20093,#20094)
-stmtContainers(#20093,#20001)
+stmt_containers(#20093,#20001)
 #20095=*
 stmts(#20095,0,#20093,0,";")
 hasLocation(#20095,#20035)
-stmtContainers(#20095,#20001)
+stmt_containers(#20095,#20001)
 #20096=*
 stmts(#20096,11,#20001,1,"try {} finally { ; }")
 hasLocation(#20096,#20009)
-stmtContainers(#20096,#20001)
+stmt_containers(#20096,#20001)
 #20097=*
 stmts(#20097,1,#20096,0,"{}")
 #20098=@"loc,{#10000},4,5,4,6"
 locations_default(#20098,#10000,4,5,4,6)
 hasLocation(#20097,#20098)
-stmtContainers(#20097,#20001)
+stmt_containers(#20097,#20001)
 #20099=*
 stmts(#20099,1,#20096,-1,"{ ; }")
 #20100=@"loc,{#10000},4,16,4,20"
 locations_default(#20100,#10000,4,16,4,20)
 hasLocation(#20099,#20100)
-stmtContainers(#20099,#20001)
+stmt_containers(#20099,#20001)
 #20101=*
 stmts(#20101,0,#20099,0,";")
 hasLocation(#20101,#20049)
-stmtContainers(#20101,#20001)
+stmt_containers(#20101,#20001)
 #20102=*
 stmts(#20102,11,#20001,2,"try {}  ... ally {}")
 hasLocation(#20102,#20011)
-stmtContainers(#20102,#20001)
+stmt_containers(#20102,#20001)
 #20103=*
 stmts(#20103,1,#20102,0,"{}")
 #20104=@"loc,{#10000},5,5,5,6"
 locations_default(#20104,#10000,5,5,5,6)
 hasLocation(#20103,#20104)
-stmtContainers(#20103,#20001)
+stmt_containers(#20103,#20001)
 #20105=*
 stmts(#20105,20,#20102,1,"catch(x) {}")
 #20106=@"loc,{#10000},5,8,5,18"
 locations_default(#20106,#10000,5,8,5,18)
 hasLocation(#20105,#20106)
-stmtContainers(#20105,#20001)
+stmt_containers(#20105,#20001)
 #20107=*
 scopes(#20107,2)
 scopenodes(#20105,#20107)
@@ -322,13 +322,13 @@ stmts(#20110,1,#20105,1,"{}")
 #20111=@"loc,{#10000},5,17,5,18"
 locations_default(#20111,#10000,5,17,5,18)
 hasLocation(#20110,#20111)
-stmtContainers(#20110,#20001)
+stmt_containers(#20110,#20001)
 #20112=*
 stmts(#20112,1,#20102,-1,"{}")
 #20113=@"loc,{#10000},5,28,5,29"
 locations_default(#20113,#10000,5,28,5,29)
 hasLocation(#20112,#20113)
-stmtContainers(#20112,#20001)
+stmt_containers(#20112,#20001)
 #20114=*
 entry_cfg_node(#20114,#20001)
 #20115=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap b/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
index 77882dbb563..defcb502a44 100644
--- a/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
+++ b/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
@@ -107,7 +107,7 @@ variables(#20036,"f",#20000)
 #20037=*
 stmts(#20037,17,#20001,0,"functio ... = 42;\n}")
 hasLocation(#20037,#20035)
-stmtContainers(#20037,#20001)
+stmt_containers(#20037,#20001)
 #20038=*
 exprs(#20038,78,#20037,-1,"f")
 hasLocation(#20038,#20013)
@@ -126,13 +126,13 @@ stmts(#20041,1,#20037,-2,"{\n  'us ... = 42;\n}")
 #20042=@"loc,{#10000},1,14,4,1"
 locations_default(#20042,#10000,1,14,4,1)
 hasLocation(#20041,#20042)
-stmtContainers(#20041,#20037)
+stmt_containers(#20041,#20037)
 #20043=*
 stmts(#20043,2,#20041,0,"'use strict';")
 #20044=@"loc,{#10000},2,3,2,15"
 locations_default(#20044,#10000,2,3,2,15)
 hasLocation(#20043,#20044)
-stmtContainers(#20043,#20037)
+stmt_containers(#20043,#20037)
 #20045=*
 exprs(#20045,4,#20043,0,"'use strict'")
 hasLocation(#20045,#20021)
@@ -150,7 +150,7 @@ stmts(#20048,2,#20041,1,"arguments = 42;")
 #20049=@"loc,{#10000},3,3,3,17"
 locations_default(#20049,#10000,3,3,3,17)
 hasLocation(#20048,#20049)
-stmtContainers(#20048,#20037)
+stmt_containers(#20048,#20037)
 #20050=*
 exprs(#20050,47,#20048,0,"arguments = 42")
 #20051=@"loc,{#10000},3,3,3,16"
diff --git a/javascript/extractor/tests/strictmode/output/trap/tst.js.trap b/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
index 92e5b8b761c..6cd340c65d2 100644
--- a/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
@@ -46,7 +46,7 @@ hasLocation(#20001,#20013)
 #20014=*
 stmts(#20014,2,#20001,0,"'use strict';")
 hasLocation(#20014,#20003)
-stmtContainers(#20014,#20001)
+stmt_containers(#20014,#20001)
 #20015=*
 exprs(#20015,4,#20014,0,"'use strict'")
 hasLocation(#20015,#20007)
@@ -62,7 +62,7 @@ regexpConstValue(#20016,"use strict")
 #20018=*
 stmts(#20018,0,#20001,1,";")
 hasLocation(#20018,#20005)
-stmtContainers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
 entry_cfg_node(#20019,#20001)
 #20020=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap b/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap
index 7b3238de8ba..719cb65d800 100644
--- a/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap
@@ -92,7 +92,7 @@ variables(#20032,"y",#20000)
 #20033=*
 stmts(#20033,23,#20001,0,"let [x,y] = [1,2]")
 hasLocation(#20033,#20003)
-stmtContainers(#20033,#20001)
+stmt_containers(#20033,#20001)
 #20034=*
 exprs(#20034,64,#20033,0,"[x,y] = [1,2]")
 #20035=@"loc,{#10000},1,5,1,17"
diff --git a/javascript/extractor/tests/ts/output/trap/bindingpattern.ts.trap b/javascript/extractor/tests/ts/output/trap/bindingpattern.ts.trap
index 1be570f6f85..83ca44dae21 100644
--- a/javascript/extractor/tests/ts/output/trap/bindingpattern.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/bindingpattern.ts.trap
@@ -85,7 +85,7 @@ variables(#20029,"foo",#20000)
 #20030=*
 stmts(#20030,17,#20001,0,"functio ...  y}) {}")
 hasLocation(#20030,#20003)
-stmtContainers(#20030,#20001)
+stmt_containers(#20030,#20001)
 #20031=*
 exprs(#20031,78,#20030,-1,"foo")
 hasLocation(#20031,#20007)
@@ -142,7 +142,7 @@ stmts(#20044,1,#20030,-2,"{}")
 #20045=@"loc,{#10000},1,22,1,23"
 locations_default(#20045,#10000,1,22,1,23)
 hasLocation(#20044,#20045)
-stmtContainers(#20044,#20030)
+stmt_containers(#20044,#20030)
 #20046=*
 entry_cfg_node(#20046,#20001)
 #20047=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/ts/output/trap/bom.ts.trap b/javascript/extractor/tests/ts/output/trap/bom.ts.trap
index 5bfe8c02cc2..8207257121e 100644
--- a/javascript/extractor/tests/ts/output/trap/bom.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/bom.ts.trap
@@ -31,7 +31,7 @@ hasLocation(#20001,#20007)
 #20008=*
 stmts(#20008,2,#20001,0,"42")
 hasLocation(#20008,#20003)
-stmtContainers(#20008,#20001)
+stmt_containers(#20008,#20001)
 #20009=*
 exprs(#20009,3,#20008,0,"42")
 hasLocation(#20009,#20003)
diff --git a/javascript/extractor/tests/ts/output/trap/classes.ts.trap b/javascript/extractor/tests/ts/output/trap/classes.ts.trap
index 49cecd9ecce..011efe8d556 100644
--- a/javascript/extractor/tests/ts/output/trap/classes.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/classes.ts.trap
@@ -106,7 +106,7 @@ stmts(#20037,26,#20001,0,"abstrac ... F>\n  {}")
 #20038=@"loc,{#10000},1,1,2,4"
 locations_default(#20038,#10000,1,1,2,4)
 hasLocation(#20037,#20038)
-stmtContainers(#20037,#20001)
+stmt_containers(#20037,#20001)
 isAbstractClass(#20037)
 #20039=*
 exprs(#20039,78,#20037,0,"C")
@@ -183,11 +183,11 @@ hasRestParameter(#20050)
 #20055=*
 stmts(#20055,1,#20050,-2,"{ super(...args); }")
 hasLocation(#20055,#20048)
-stmtContainers(#20055,#20050)
+stmt_containers(#20055,#20050)
 #20056=*
 stmts(#20056,2,#20055,0,"super(...args);")
 hasLocation(#20056,#20048)
-stmtContainers(#20056,#20050)
+stmt_containers(#20056,#20050)
 #20057=*
 exprs(#20057,13,#20056,0,"super(...args)")
 hasLocation(#20057,#20048)
diff --git a/javascript/extractor/tests/ts/output/trap/comments.ts.trap b/javascript/extractor/tests/ts/output/trap/comments.ts.trap
index 52be74eb227..90164054547 100644
--- a/javascript/extractor/tests/ts/output/trap/comments.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/comments.ts.trap
@@ -86,7 +86,7 @@ stmts(#20026,2,#20001,0,"a /* b */ + c")
 #20027=@"loc,{#10000},2,1,2,13"
 locations_default(#20027,#10000,2,1,2,13)
 hasLocation(#20026,#20027)
-stmtContainers(#20026,#20001)
+stmt_containers(#20026,#20001)
 #20028=*
 exprs(#20028,34,#20026,0,"a /* b */ + c")
 hasLocation(#20028,#20027)
diff --git a/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap b/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
index cd2d3a64d1f..6620048f6f7 100644
--- a/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
@@ -5683,7 +5683,7 @@ stmts(#22183,31,#20001,0,"namespa ...  any;\n}")
 #22184=@"loc,{#10000},1,1,70,1"
 locations_default(#22184,#10000,1,1,70,1)
 hasLocation(#22183,#22184)
-stmtContainers(#22183,#20001)
+stmt_containers(#22183,#20001)
 #22185=*
 exprs(#22185,78,#22183,-1,"ConditionalTypes1")
 hasLocation(#22185,#20285)
@@ -5773,7 +5773,7 @@ stmts(#22223,35,#22183,0,"type Ty ... bject"";")
 #22224=@"loc,{#10000},2,3,8,15"
 locations_default(#22224,#10000,2,3,8,15)
 hasLocation(#22223,#22224)
-stmtContainers(#22223,#22183)
+stmt_containers(#22223,#22183)
 #22225=*
 typeexprs(#22225,1,#22223,0,"TypeName")
 hasLocation(#22225,#20291)
@@ -5940,7 +5940,7 @@ stmts(#22256,35,#22183,1,"type T0 ... tring>;")
 #22257=@"loc,{#10000},10,3,10,29"
 locations_default(#22257,#10000,10,3,10,29)
 hasLocation(#22256,#22257)
-stmtContainers(#22256,#22183)
+stmt_containers(#22256,#22183)
 #22258=*
 typeexprs(#22258,1,#22256,0,"T0")
 hasLocation(#22258,#20367)
@@ -5973,7 +5973,7 @@ stmts(#22263,35,#22183,2,"type T1 ... e<""a"">;")
 #22264=@"loc,{#10000},11,3,11,26"
 locations_default(#22264,#10000,11,3,11,26)
 hasLocation(#22263,#22264)
-stmtContainers(#22263,#22183)
+stmt_containers(#22263,#22183)
 #22265=*
 typeexprs(#22265,1,#22263,0,"T1")
 hasLocation(#22265,#20383)
@@ -6006,7 +6006,7 @@ stmts(#22270,35,#22183,3,"type T2 ... <true>;")
 #22271=@"loc,{#10000},12,3,12,27"
 locations_default(#22271,#10000,12,3,12,27)
 hasLocation(#22270,#22271)
-stmtContainers(#22270,#22183)
+stmt_containers(#22270,#22183)
 #22272=*
 typeexprs(#22272,1,#22270,0,"T2")
 hasLocation(#22272,#20399)
@@ -6039,7 +6039,7 @@ stmts(#22277,35,#22183,4,"type T3 ...  void>;")
 #22278=@"loc,{#10000},13,3,13,33"
 locations_default(#22278,#10000,13,3,13,33)
 hasLocation(#22277,#22278)
-stmtContainers(#22277,#22183)
+stmt_containers(#22277,#22183)
 #22279=*
 typeexprs(#22279,1,#22277,0,"T3")
 hasLocation(#22279,#20415)
@@ -6090,7 +6090,7 @@ stmts(#22289,35,#22183,5,"type T4 ... ing[]>;")
 #22290=@"loc,{#10000},14,3,14,31"
 locations_default(#22290,#10000,14,3,14,31)
 hasLocation(#22289,#22290)
-stmtContainers(#22289,#22183)
+stmt_containers(#22289,#22183)
 #22291=*
 typeexprs(#22291,1,#22289,0,"T4")
 hasLocation(#22291,#20437)
@@ -6130,7 +6130,7 @@ stmts(#22298,35,#22183,6,"type T1 ... void)>;")
 #22299=@"loc,{#10000},17,3,17,45"
 locations_default(#22299,#10000,17,3,17,45)
 hasLocation(#22298,#22299)
-stmtContainers(#22298,#22183)
+stmt_containers(#22298,#22183)
 #22300=*
 typeexprs(#22300,1,#22298,0,"T10")
 hasLocation(#22300,#20457)
@@ -6201,7 +6201,7 @@ stmts(#22315,35,#22183,7,"type T1 ... fined>;")
 #22316=@"loc,{#10000},18,3,18,53"
 locations_default(#22316,#10000,18,3,18,53)
 hasLocation(#22315,#22316)
-stmtContainers(#22315,#22183)
+stmt_containers(#22315,#22183)
 #22317=*
 typeexprs(#22317,1,#22315,0,"T12")
 hasLocation(#22317,#20487)
@@ -6260,7 +6260,7 @@ stmts(#22328,35,#22183,8,"type T1 ... ber[]>;")
 #22329=@"loc,{#10000},19,3,19,43"
 locations_default(#22329,#10000,19,3,19,43)
 hasLocation(#22328,#22329)
-stmtContainers(#22328,#22183)
+stmt_containers(#22328,#22183)
 #22330=*
 typeexprs(#22330,1,#22328,0,"T11")
 hasLocation(#22330,#20515)
@@ -6320,7 +6320,7 @@ stmts(#22342,35,#22183,9,"type Bo ... e: T };")
 #22343=@"loc,{#10000},21,3,21,36"
 locations_default(#22343,#10000,21,3,21,36)
 hasLocation(#22342,#22343)
-stmtContainers(#22342,#22183)
+stmt_containers(#22342,#22183)
 #22344=*
 typeexprs(#22344,1,#22342,0,"BoxedValue")
 hasLocation(#22344,#20543)
@@ -6377,7 +6377,7 @@ stmts(#22355,35,#22183,10,"type Bo ...  T[] };")
 #22356=@"loc,{#10000},22,3,22,38"
 locations_default(#22356,#10000,22,3,22,38)
 hasLocation(#22355,#22356)
-stmtContainers(#22355,#22183)
+stmt_containers(#22355,#22183)
 #22357=*
 typeexprs(#22357,1,#22355,0,"BoxedArray")
 hasLocation(#22357,#20567)
@@ -6441,7 +6441,7 @@ stmts(#22370,35,#22183,11,"type Bo ... lue<T>;")
 #22371=@"loc,{#10000},23,3,23,74"
 locations_default(#22371,#10000,23,3,23,74)
 hasLocation(#22370,#22371)
-stmtContainers(#22370,#22183)
+stmt_containers(#22370,#22183)
 #22372=*
 typeexprs(#22372,1,#22370,0,"Boxed")
 hasLocation(#22372,#20595)
@@ -6554,7 +6554,7 @@ stmts(#22394,35,#22183,12,"type T2 ... tring>;")
 #22395=@"loc,{#10000},25,3,25,27"
 locations_default(#22395,#10000,25,3,25,27)
 hasLocation(#22394,#22395)
-stmtContainers(#22394,#22183)
+stmt_containers(#22394,#22183)
 #22396=*
 typeexprs(#22396,1,#22394,0,"T20")
 hasLocation(#22396,#20645)
@@ -6587,7 +6587,7 @@ stmts(#22401,35,#22183,13,"type T2 ... ber[]>;")
 #22402=@"loc,{#10000},26,3,26,29"
 locations_default(#22402,#10000,26,3,26,29)
 hasLocation(#22401,#22402)
-stmtContainers(#22401,#22183)
+stmt_containers(#22401,#22183)
 #22403=*
 typeexprs(#22403,1,#22401,0,"T21")
 hasLocation(#22403,#20661)
@@ -6627,7 +6627,7 @@ stmts(#22410,35,#22183,14,"type T2 ... ber[]>;")
 #22411=@"loc,{#10000},27,3,27,38"
 locations_default(#22411,#10000,27,3,27,38)
 hasLocation(#22410,#22411)
-stmtContainers(#22410,#22183)
+stmt_containers(#22410,#22183)
 #22412=*
 typeexprs(#22412,1,#22410,0,"T22")
 hasLocation(#22412,#20681)
@@ -6680,7 +6680,7 @@ stmts(#22422,35,#22183,15,"type Di ... er : T;")
 #22423=@"loc,{#10000},29,3,29,44"
 locations_default(#22423,#10000,29,3,29,44)
 hasLocation(#22422,#22423)
-stmtContainers(#22422,#22183)
+stmt_containers(#22422,#22183)
 #22424=*
 typeexprs(#22424,1,#22422,0,"Diff")
 hasLocation(#22424,#20705)
@@ -6759,7 +6759,7 @@ stmts(#22438,35,#22183,16,"type Fi ...  never;")
 #22439=@"loc,{#10000},30,3,30,46"
 locations_default(#22439,#10000,30,3,30,46)
 hasLocation(#22438,#22439)
-stmtContainers(#22438,#22183)
+stmt_containers(#22438,#22183)
 #22440=*
 typeexprs(#22440,1,#22438,0,"Filter")
 hasLocation(#22440,#20737)
@@ -6838,7 +6838,7 @@ stmts(#22454,35,#22183,17,"type T3 ... | ""f"">;")
 #22455=@"loc,{#10000},32,3,32,58"
 locations_default(#22455,#10000,32,3,32,58)
 hasLocation(#22454,#22455)
-stmtContainers(#22454,#22183)
+stmt_containers(#22454,#22183)
 #22456=*
 typeexprs(#22456,1,#22454,0,"T30")
 hasLocation(#22456,#20769)
@@ -6921,7 +6921,7 @@ stmts(#22471,35,#22183,18,"type T3 ... | ""f"">;")
 #22472=@"loc,{#10000},33,3,33,60"
 locations_default(#22472,#10000,33,3,33,60)
 hasLocation(#22471,#22472)
-stmtContainers(#22471,#22183)
+stmt_containers(#22471,#22183)
 #22473=*
 typeexprs(#22473,1,#22471,0,"T31")
 hasLocation(#22473,#20809)
@@ -7004,7 +7004,7 @@ stmts(#22488,35,#22183,19,"type T3 ... ction>;")
 #22489=@"loc,{#10000},34,3,34,60"
 locations_default(#22489,#10000,34,3,34,60)
 hasLocation(#22488,#22489)
-stmtContainers(#22488,#22183)
+stmt_containers(#22488,#22183)
 #22490=*
 typeexprs(#22490,1,#22488,0,"T32")
 hasLocation(#22490,#20849)
@@ -7087,7 +7087,7 @@ stmts(#22507,35,#22183,20,"type T3 ... ction>;")
 #22508=@"loc,{#10000},35,3,35,62"
 locations_default(#22508,#10000,35,3,35,62)
 hasLocation(#22507,#22508)
-stmtContainers(#22507,#22183)
+stmt_containers(#22507,#22183)
 #22509=*
 typeexprs(#22509,1,#22507,0,"T33")
 hasLocation(#22509,#20887)
@@ -7170,7 +7170,7 @@ stmts(#22526,35,#22183,21,"type No ... fined>;")
 #22527=@"loc,{#10000},37,3,37,50"
 locations_default(#22527,#10000,37,3,37,50)
 hasLocation(#22526,#22527)
-stmtContainers(#22526,#22183)
+stmt_containers(#22526,#22183)
 #22528=*
 typeexprs(#22528,1,#22526,0,"NonNullable")
 hasLocation(#22528,#20925)
@@ -7241,7 +7241,7 @@ stmts(#22541,35,#22183,22,"type T3 ... fined>;")
 #22542=@"loc,{#10000},39,3,39,54"
 locations_default(#22542,#10000,39,3,39,54)
 hasLocation(#22541,#22542)
-stmtContainers(#22541,#22183)
+stmt_containers(#22541,#22183)
 #22543=*
 typeexprs(#22543,1,#22541,0,"T34")
 hasLocation(#22543,#20955)
@@ -7293,7 +7293,7 @@ stmts(#22552,35,#22183,23,"type T3 ... fined>;")
 #22553=@"loc,{#10000},40,3,40,63"
 locations_default(#22553,#10000,40,3,40,63)
 hasLocation(#22552,#22553)
-stmtContainers(#22552,#22183)
+stmt_containers(#22552,#22183)
 #22554=*
 typeexprs(#22554,1,#22552,0,"T35")
 hasLocation(#22554,#20979)
@@ -7358,7 +7358,7 @@ stmts(#22566,17,#22183,24,"functio ...  Ok\n  }")
 #22567=@"loc,{#10000},42,3,44,3"
 locations_default(#22567,#10000,42,3,44,3)
 hasLocation(#22566,#22567)
-stmtContainers(#22566,#22183)
+stmt_containers(#22566,#22183)
 #22568=*
 exprs(#22568,78,#22566,-1,"f1")
 hasLocation(#22568,#21011)
@@ -7429,13 +7429,13 @@ stmts(#22583,1,#22566,-2,"{\n      ...  Ok\n  }")
 #22584=@"loc,{#10000},42,43,44,3"
 locations_default(#22584,#10000,42,43,44,3)
 hasLocation(#22583,#22584)
-stmtContainers(#22583,#22566)
+stmt_containers(#22583,#22566)
 #22585=*
 stmts(#22585,2,#22583,0,"x = y;")
 #22586=@"loc,{#10000},43,7,43,12"
 locations_default(#22586,#10000,43,7,43,12)
 hasLocation(#22585,#22586)
-stmtContainers(#22585,#22566)
+stmt_containers(#22585,#22566)
 #22587=*
 exprs(#22587,47,#22585,0,"x = y")
 #22588=@"loc,{#10000},43,7,43,11"
@@ -7462,7 +7462,7 @@ stmts(#22591,17,#22183,25,"functio ...  Ok\n  }")
 #22592=@"loc,{#10000},46,3,49,3"
 locations_default(#22592,#10000,46,3,49,3)
 hasLocation(#22591,#22592)
-stmtContainers(#22591,#22183)
+stmt_containers(#22591,#22183)
 #22593=*
 exprs(#22593,78,#22591,-1,"f2")
 hasLocation(#22593,#21057)
@@ -7551,7 +7551,7 @@ stmts(#22613,1,#22591,-2,"{\n      ...  Ok\n  }")
 #22614=@"loc,{#10000},46,70,49,3"
 locations_default(#22614,#10000,46,70,49,3)
 hasLocation(#22613,#22614)
-stmtContainers(#22613,#22591)
+stmt_containers(#22613,#22591)
 #22615=*
 scopes(#22615,4)
 scopenodes(#22613,#22615)
@@ -7563,7 +7563,7 @@ stmts(#22617,2,#22613,0,"x = y;")
 #22618=@"loc,{#10000},47,7,47,12"
 locations_default(#22618,#10000,47,7,47,12)
 hasLocation(#22617,#22618)
-stmtContainers(#22617,#22591)
+stmt_containers(#22617,#22591)
 #22619=*
 exprs(#22619,47,#22617,0,"x = y")
 #22620=@"loc,{#10000},47,7,47,11"
@@ -7590,7 +7590,7 @@ stmts(#22623,23,#22613,1,"let s2: string = y;")
 #22624=@"loc,{#10000},48,7,48,25"
 locations_default(#22624,#10000,48,7,48,25)
 hasLocation(#22623,#22624)
-stmtContainers(#22623,#22591)
+stmt_containers(#22623,#22591)
 #22625=*
 exprs(#22625,64,#22623,0,"s2: string = y")
 #22626=@"loc,{#10000},48,11,48,24"
@@ -7623,7 +7623,7 @@ stmts(#22630,35,#22183,26,"type Fu ... yof T];")
 #22631=@"loc,{#10000},51,3,51,97"
 locations_default(#22631,#10000,51,3,51,97)
 hasLocation(#22630,#22631)
-stmtContainers(#22630,#22183)
+stmt_containers(#22630,#22183)
 #22632=*
 typeexprs(#22632,1,#22630,0,"Functio ... tyNames")
 hasLocation(#22632,#21125)
@@ -7763,7 +7763,7 @@ stmts(#22661,35,#22183,27,"type Fu ... es<T>>;")
 #22662=@"loc,{#10000},52,3,52,65"
 locations_default(#22662,#10000,52,3,52,65)
 hasLocation(#22661,#22662)
-stmtContainers(#22661,#22183)
+stmt_containers(#22661,#22183)
 #22663=*
 typeexprs(#22663,1,#22661,0,"FunctionProperties")
 hasLocation(#22663,#21185)
@@ -7835,7 +7835,7 @@ stmts(#22676,35,#22183,28,"type No ... yof T];")
 #22677=@"loc,{#10000},54,3,54,100"
 locations_default(#22677,#10000,54,3,54,100)
 hasLocation(#22676,#22677)
-stmtContainers(#22676,#22183)
+stmt_containers(#22676,#22183)
 #22678=*
 typeexprs(#22678,1,#22676,0,"NonFunc ... tyNames")
 hasLocation(#22678,#21217)
@@ -7975,7 +7975,7 @@ stmts(#22707,35,#22183,29,"type No ... es<T>>;")
 #22708=@"loc,{#10000},55,3,55,71"
 locations_default(#22708,#10000,55,3,55,71)
 hasLocation(#22707,#22708)
-stmtContainers(#22707,#22183)
+stmt_containers(#22707,#22183)
 #22709=*
 typeexprs(#22709,1,#22707,0,"NonFunc ... perties")
 hasLocation(#22709,#21277)
@@ -8047,7 +8047,7 @@ stmts(#22722,34,#22183,30,"interfa ... id;\n  }")
 #22723=@"loc,{#10000},57,3,62,3"
 locations_default(#22723,#10000,57,3,62,3)
 hasLocation(#22722,#22723)
-stmtContainers(#22722,#22183)
+stmt_containers(#22722,#22183)
 #22724=*
 typeexprs(#22724,1,#22722,0,"Part")
 hasLocation(#22724,#21309)
@@ -8165,7 +8165,7 @@ stmts(#22749,35,#22183,31,"type T4 ... <Part>;")
 #22750=@"loc,{#10000},64,3,64,41"
 locations_default(#22750,#10000,64,3,64,41)
 hasLocation(#22749,#22750)
-stmtContainers(#22749,#22183)
+stmt_containers(#22749,#22183)
 #22751=*
 typeexprs(#22751,1,#22749,0,"T40")
 hasLocation(#22751,#21363)
@@ -8199,7 +8199,7 @@ stmts(#22756,35,#22183,32,"type T4 ... <Part>;")
 #22757=@"loc,{#10000},65,3,65,44"
 locations_default(#22757,#10000,65,3,65,44)
 hasLocation(#22756,#22757)
-stmtContainers(#22756,#22183)
+stmt_containers(#22756,#22183)
 #22758=*
 typeexprs(#22758,1,#22756,0,"T41")
 hasLocation(#22758,#21379)
@@ -8233,7 +8233,7 @@ stmts(#22763,35,#22183,33,"type T4 ... <Part>;")
 #22764=@"loc,{#10000},66,3,66,38"
 locations_default(#22764,#10000,66,3,66,38)
 hasLocation(#22763,#22764)
-stmtContainers(#22763,#22183)
+stmt_containers(#22763,#22183)
 #22765=*
 typeexprs(#22765,1,#22763,0,"T42")
 hasLocation(#22765,#21395)
@@ -8267,7 +8267,7 @@ stmts(#22770,35,#22183,34,"type T4 ... <Part>;")
 #22771=@"loc,{#10000},67,3,67,41"
 locations_default(#22771,#10000,67,3,67,41)
 hasLocation(#22770,#22771)
-stmtContainers(#22770,#22183)
+stmt_containers(#22770,#22183)
 #22772=*
 typeexprs(#22772,1,#22770,0,"T43")
 hasLocation(#22772,#21411)
@@ -8301,7 +8301,7 @@ stmts(#22777,35,#22183,35,"type Re ...  : any;")
 #22778=@"loc,{#10000},69,3,69,71"
 locations_default(#22778,#10000,69,3,69,71)
 hasLocation(#22777,#22778)
-stmtContainers(#22777,#22183)
+stmt_containers(#22777,#22183)
 #22779=*
 typeexprs(#22779,1,#22777,0,"ReturnType")
 hasLocation(#22779,#21427)
@@ -8421,7 +8421,7 @@ stmts(#22805,31,#20001,1,"namespa ...  any;\n}")
 #22806=@"loc,{#10000},72,1,101,1"
 locations_default(#22806,#10000,72,1,101,1)
 hasLocation(#22805,#22806)
-stmtContainers(#22805,#20001)
+stmt_containers(#22805,#20001)
 #22807=*
 exprs(#22807,78,#22805,-1,"ConditionalTypes2")
 hasLocation(#22807,#21476)
@@ -8471,7 +8471,7 @@ stmts(#22825,35,#22805,0,"type Un ... \n    T;")
 #22826=@"loc,{#10000},73,3,77,6"
 locations_default(#22826,#10000,73,3,77,6)
 hasLocation(#22825,#22826)
-stmtContainers(#22825,#22805)
+stmt_containers(#22825,#22805)
 #22827=*
 typeexprs(#22827,1,#22825,0,"Unpacked")
 hasLocation(#22827,#21482)
@@ -8710,7 +8710,7 @@ stmts(#22880,35,#22805,1,"type T0 ... tring>;")
 #22881=@"loc,{#10000},79,3,79,29"
 locations_default(#22881,#10000,79,3,79,29)
 hasLocation(#22880,#22881)
-stmtContainers(#22880,#22805)
+stmt_containers(#22880,#22805)
 #22882=*
 typeexprs(#22882,1,#22880,0,"T0")
 hasLocation(#22882,#21572)
@@ -8743,7 +8743,7 @@ stmts(#22887,35,#22805,2,"type T1 ... ing[]>;")
 #22888=@"loc,{#10000},80,3,80,31"
 locations_default(#22888,#10000,80,3,80,31)
 hasLocation(#22887,#22888)
-stmtContainers(#22887,#22805)
+stmt_containers(#22887,#22805)
 #22889=*
 typeexprs(#22889,1,#22887,0,"T1")
 hasLocation(#22889,#21588)
@@ -8783,7 +8783,7 @@ stmts(#22896,35,#22805,3,"type T2 ... tring>;")
 #22897=@"loc,{#10000},81,3,81,35"
 locations_default(#22897,#10000,81,3,81,35)
 hasLocation(#22896,#22897)
-stmtContainers(#22896,#22805)
+stmt_containers(#22896,#22805)
 #22898=*
 typeexprs(#22898,1,#22896,0,"T2")
 hasLocation(#22898,#21608)
@@ -8834,7 +8834,7 @@ stmts(#22908,35,#22805,4,"type T3 ... ring>>;")
 #22909=@"loc,{#10000},82,3,82,38"
 locations_default(#22909,#10000,82,3,82,38)
 hasLocation(#22908,#22909)
-stmtContainers(#22908,#22805)
+stmt_containers(#22908,#22805)
 #22910=*
 typeexprs(#22910,1,#22908,0,"T3")
 hasLocation(#22910,#21630)
@@ -8880,7 +8880,7 @@ stmts(#22918,35,#22805,5,"type T4 ... ng>[]>;")
 #22919=@"loc,{#10000},83,3,83,40"
 locations_default(#22919,#10000,83,3,83,40)
 hasLocation(#22918,#22919)
-stmtContainers(#22918,#22805)
+stmt_containers(#22918,#22805)
 #22920=*
 typeexprs(#22920,1,#22918,0,"T4")
 hasLocation(#22920,#21652)
@@ -8933,7 +8933,7 @@ stmts(#22930,35,#22805,6,"type T5 ... g>[]>>;")
 #22931=@"loc,{#10000},84,3,84,50"
 locations_default(#22931,#10000,84,3,84,50)
 hasLocation(#22930,#22931)
-stmtContainers(#22930,#22805)
+stmt_containers(#22930,#22805)
 #22932=*
 typeexprs(#22932,1,#22930,0,"T5")
 hasLocation(#22932,#21678)
@@ -9000,7 +9000,7 @@ stmts(#22945,35,#22805,7,"type Fo ...  never;")
 #22946=@"loc,{#10000},86,3,86,65"
 locations_default(#22946,#10000,86,3,86,65)
 hasLocation(#22945,#22946)
-stmtContainers(#22945,#22805)
+stmt_containers(#22945,#22805)
 #22947=*
 typeexprs(#22947,1,#22945,0,"Foo")
 hasLocation(#22947,#21710)
@@ -9124,7 +9124,7 @@ stmts(#22973,35,#22805,8,"type T1 ... ing }>;")
 #22974=@"loc,{#10000},87,3,87,43"
 locations_default(#22974,#10000,87,3,87,43)
 hasLocation(#22973,#22974)
-stmtContainers(#22973,#22805)
+stmt_containers(#22973,#22805)
 #22975=*
 typeexprs(#22975,1,#22973,0,"T10")
 hasLocation(#22975,#21758)
@@ -9194,7 +9194,7 @@ stmts(#22989,35,#22805,9,"type T1 ... ber }>;")
 #22990=@"loc,{#10000},88,3,88,43"
 locations_default(#22990,#10000,88,3,88,43)
 hasLocation(#22989,#22990)
-stmtContainers(#22989,#22805)
+stmt_containers(#22989,#22805)
 #22991=*
 typeexprs(#22991,1,#22989,0,"T11")
 hasLocation(#22991,#21790)
@@ -9264,7 +9264,7 @@ stmts(#23005,35,#22805,10,"type Ba ...  never;")
 #23006=@"loc,{#10000},90,3,90,91"
 locations_default(#23006,#10000,90,3,90,91)
 hasLocation(#23005,#23006)
-stmtContainers(#23005,#22805)
+stmt_containers(#23005,#22805)
 #23007=*
 typeexprs(#23007,1,#23005,0,"Bar")
 hasLocation(#23007,#21822)
@@ -9446,7 +9446,7 @@ stmts(#23049,35,#22805,11,"type T2 ... oid }>;")
 #23050=@"loc,{#10000},91,3,91,69"
 locations_default(#23050,#10000,91,3,91,69)
 hasLocation(#23049,#23050)
-stmtContainers(#23049,#22805)
+stmt_containers(#23049,#22805)
 #23051=*
 typeexprs(#23051,1,#23049,0,"T20")
 hasLocation(#23051,#21894)
@@ -9578,7 +9578,7 @@ stmts(#23081,35,#22805,12,"type T2 ... oid }>;")
 #23082=@"loc,{#10000},92,3,92,69"
 locations_default(#23082,#10000,92,3,92,69)
 hasLocation(#23081,#23082)
-stmtContainers(#23081,#22805)
+stmt_containers(#23081,#22805)
 #23083=*
 typeexprs(#23083,1,#23081,0,"T21")
 hasLocation(#23083,#21950)
@@ -9710,7 +9710,7 @@ stmts(#23113,17,#22805,13,"declare ... number;")
 #23114=@"loc,{#10000},94,3,94,42"
 locations_default(#23114,#10000,94,3,94,42)
 hasLocation(#23113,#23114)
-stmtContainers(#23113,#22805)
+stmt_containers(#23113,#22805)
 hasDeclareKeyword(#23113)
 #23115=*
 exprs(#23115,78,#23113,-1,"foo")
@@ -9750,7 +9750,7 @@ stmts(#23123,17,#22805,14,"declare ... string;")
 #23124=@"loc,{#10000},95,3,95,42"
 locations_default(#23124,#10000,95,3,95,42)
 hasLocation(#23123,#23124)
-stmtContainers(#23123,#22805)
+stmt_containers(#23123,#22805)
 hasDeclareKeyword(#23123)
 #23125=*
 exprs(#23125,78,#23123,-1,"foo")
@@ -9788,7 +9788,7 @@ stmts(#23132,17,#22805,15,"declare ... number;")
 #23133=@"loc,{#10000},96,3,96,60"
 locations_default(#23133,#10000,96,3,96,60)
 hasLocation(#23132,#23133)
-stmtContainers(#23132,#22805)
+stmt_containers(#23132,#22805)
 hasDeclareKeyword(#23132)
 #23134=*
 exprs(#23134,78,#23132,-1,"foo")
@@ -9848,7 +9848,7 @@ stmts(#23147,35,#22805,16,"type T3 ... f foo>;")
 #23148=@"loc,{#10000},97,3,97,36"
 locations_default(#23148,#10000,97,3,97,36)
 hasLocation(#23147,#23148)
-stmtContainers(#23147,#22805)
+stmt_containers(#23147,#22805)
 #23149=*
 typeexprs(#23149,1,#23147,0,"T30")
 hasLocation(#23149,#22080)
@@ -9889,7 +9889,7 @@ stmts(#23156,35,#22805,17,"type An ... => any;")
 #23157=@"loc,{#10000},99,3,99,45"
 locations_default(#23157,#10000,99,3,99,45)
 hasLocation(#23156,#23157)
-stmtContainers(#23156,#22805)
+stmt_containers(#23156,#22805)
 #23158=*
 typeexprs(#23158,1,#23156,0,"AnyFunction")
 hasLocation(#23158,#22098)
@@ -9946,7 +9946,7 @@ stmts(#23170,35,#22805,18,"type Re ...  : any;")
 #23171=@"loc,{#10000},100,3,100,91"
 locations_default(#23171,#10000,100,3,100,91)
 hasLocation(#23170,#23171)
-stmtContainers(#23170,#22805)
+stmt_containers(#23170,#22805)
 #23172=*
 typeexprs(#23172,1,#23170,0,"ReturnType")
 hasLocation(#23172,#22126)
diff --git a/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap b/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
index ec8201409af..65e0a9a87b6 100644
--- a/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
@@ -171,7 +171,7 @@ local_type_names(#20061,"A",#20000)
 #20062=*
 stmts(#20062,26,#20001,0,"class A ... y) {}\n}")
 hasLocation(#20062,#20059)
-stmtContainers(#20062,#20001)
+stmt_containers(#20062,#20001)
 #20063=*
 exprs(#20063,78,#20062,0,"A")
 hasLocation(#20063,#20015)
@@ -277,7 +277,7 @@ stmts(#20087,1,#20081,-2,"{}")
 #20088=@"loc,{#10000},4,22,4,23"
 locations_default(#20088,#10000,4,22,4,23)
 hasLocation(#20087,#20088)
-stmtContainers(#20087,#20081)
+stmt_containers(#20087,#20081)
 isMethod(#20078)
 #20089=*
 entry_cfg_node(#20089,#20001)
diff --git a/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap b/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
index 8383d398484..90443b3e03e 100644
--- a/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
@@ -53,7 +53,7 @@ hasLocation(#20001,#20016)
 #20017=*
 stmts(#20017,26,#20001,0,"declare class C {}")
 hasLocation(#20017,#20003)
-stmtContainers(#20017,#20001)
+stmt_containers(#20017,#20001)
 hasDeclareKeyword(#20017)
 #20018=*
 exprs(#20018,78,#20017,0,"C")
@@ -94,7 +94,7 @@ isArgumentsObject(#20026)
 #20027=*
 stmts(#20027,1,#20024,-2,"{}")
 hasLocation(#20027,#20022)
-stmtContainers(#20027,#20024)
+stmt_containers(#20027,#20024)
 isMethod(#20021)
 #20028=*
 entry_cfg_node(#20028,#20001)
diff --git a/javascript/extractor/tests/ts/output/trap/decorators.ts.trap b/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
index d034be4986e..36d916b2905 100644
--- a/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
@@ -326,7 +326,7 @@ stmts(#20118,26,#20001,0,"class C ... mber;\n}")
 #20119=@"loc,{#10000},2,1,8,1"
 locations_default(#20119,#10000,2,1,8,1)
 hasLocation(#20118,#20119)
-stmtContainers(#20118,#20001)
+stmt_containers(#20118,#20001)
 #20120=*
 exprs(#20120,94,#20118,-2,"@classDecorator")
 hasLocation(#20120,#20003)
@@ -402,13 +402,13 @@ stmts(#20136,1,#20132,-2,"{ retur ... field }")
 #20137=@"loc,{#10000},4,20,4,40"
 locations_default(#20137,#10000,4,20,4,40)
 hasLocation(#20136,#20137)
-stmtContainers(#20136,#20132)
+stmt_containers(#20136,#20132)
 #20138=*
 stmts(#20138,9,#20136,0,"return this.field")
 #20139=@"loc,{#10000},4,22,4,38"
 locations_default(#20139,#10000,4,22,4,38)
 hasLocation(#20138,#20139)
-stmtContainers(#20138,#20132)
+stmt_containers(#20138,#20132)
 #20140=*
 exprs(#20140,14,#20138,0,"this.field")
 #20141=@"loc,{#10000},4,29,4,38"
@@ -486,14 +486,14 @@ isArgumentsObject(#20157)
 #20158=*
 stmts(#20158,1,#20150,-2,"{}")
 hasLocation(#20158,#20154)
-stmtContainers(#20158,#20150)
+stmt_containers(#20158,#20150)
 isMethod(#20153)
 #20159=*
 stmts(#20159,17,#20001,1,"@functi ... un() {}")
 #20160=@"loc,{#10000},10,1,11,17"
 locations_default(#20160,#10000,10,1,11,17)
 hasLocation(#20159,#20160)
-stmtContainers(#20159,#20001)
+stmt_containers(#20159,#20001)
 #20161=*
 exprs(#20161,78,#20159,-1,"fun")
 hasLocation(#20161,#20086)
@@ -512,17 +512,17 @@ stmts(#20164,1,#20159,-2,"{}")
 #20165=@"loc,{#10000},11,16,11,17"
 locations_default(#20165,#10000,11,16,11,17)
 hasLocation(#20164,#20165)
-stmtContainers(#20164,#20159)
+stmt_containers(#20164,#20159)
 #20166=*
 stmts(#20166,30,#20001,2,"export  ... ass2 {}")
 hasLocation(#20166,#20029)
-stmtContainers(#20166,#20001)
+stmt_containers(#20166,#20001)
 #20167=*
 stmts(#20167,26,#20166,-1,"class Class2 {}")
 #20168=@"loc,{#10000},14,8,14,22"
 locations_default(#20168,#10000,14,8,14,22)
 hasLocation(#20167,#20168)
-stmtContainers(#20167,#20001)
+stmt_containers(#20167,#20001)
 #20169=*
 exprs(#20169,94,#20167,-2,"@classDecorator2")
 hasLocation(#20169,#20027)
@@ -575,7 +575,7 @@ isArgumentsObject(#20179)
 #20180=*
 stmts(#20180,1,#20177,-2,"{}")
 hasLocation(#20180,#20175)
-stmtContainers(#20180,#20177)
+stmt_containers(#20180,#20177)
 isMethod(#20174)
 #20181=*
 entry_cfg_node(#20181,#20001)
diff --git a/javascript/extractor/tests/ts/output/trap/enum.ts.trap b/javascript/extractor/tests/ts/output/trap/enum.ts.trap
index 7aeb437663d..bb49dd3c44c 100644
--- a/javascript/extractor/tests/ts/output/trap/enum.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/enum.ts.trap
@@ -574,7 +574,7 @@ local_namespace_names(#20220,"StringLiteralEnumMember",#20000)
 #20221=*
 stmts(#20221,36,#20001,0,"enum Co ...  blue }")
 hasLocation(#20221,#20003)
-stmtContainers(#20221,#20001)
+stmt_containers(#20221,#20001)
 #20222=*
 exprs(#20222,78,#20221,0,"Color")
 hasLocation(#20222,#20041)
@@ -644,7 +644,7 @@ typedecl(#20237,#20229)
 #20238=*
 stmts(#20238,36,#20001,1,"declare ...  a, b }")
 hasLocation(#20238,#20007)
-stmtContainers(#20238,#20001)
+stmt_containers(#20238,#20001)
 #20239=*
 exprs(#20239,78,#20238,0,"DeclaredEnum")
 hasLocation(#20239,#20065)
@@ -692,7 +692,7 @@ hasDeclareKeyword(#20238)
 #20249=*
 stmts(#20249,36,#20001,2,"const e ... +2, b }")
 hasLocation(#20249,#20009)
-stmtContainers(#20249,#20001)
+stmt_containers(#20249,#20001)
 #20250=*
 exprs(#20250,78,#20249,0,"ConstEnum")
 hasLocation(#20250,#20081)
@@ -761,7 +761,7 @@ isConstEnum(#20249)
 #20265=*
 stmts(#20265,36,#20001,3,"declare ...  a, b }")
 hasLocation(#20265,#20011)
-stmtContainers(#20265,#20001)
+stmt_containers(#20265,#20001)
 #20266=*
 exprs(#20266,78,#20265,0,"DeclaredConstEnum")
 hasLocation(#20266,#20107)
@@ -810,7 +810,7 @@ hasDeclareKeyword(#20265)
 #20276=*
 stmts(#20276,17,#20001,4,"functio ... rn x; }")
 hasLocation(#20276,#20015)
-stmtContainers(#20276,#20001)
+stmt_containers(#20276,#20001)
 #20277=*
 exprs(#20277,78,#20276,-1,"foo")
 hasLocation(#20277,#20121)
@@ -837,13 +837,13 @@ stmts(#20282,1,#20276,-2,"{ return x; }")
 #20283=@"loc,{#10000},7,17,7,29"
 locations_default(#20283,#10000,7,17,7,29)
 hasLocation(#20282,#20283)
-stmtContainers(#20282,#20276)
+stmt_containers(#20282,#20276)
 #20284=*
 stmts(#20284,9,#20282,0,"return x;")
 #20285=@"loc,{#10000},7,19,7,27"
 locations_default(#20285,#10000,7,19,7,27)
 hasLocation(#20284,#20285)
-stmtContainers(#20284,#20276)
+stmt_containers(#20284,#20276)
 #20286=*
 exprs(#20286,79,#20284,0,"x")
 hasLocation(#20286,#20133)
@@ -856,7 +856,7 @@ stmts(#20287,36,#20001,5,"enum Co ...  + 2)\n}")
 #20288=@"loc,{#10000},9,1,11,1"
 locations_default(#20288,#10000,9,1,11,1)
 hasLocation(#20287,#20288)
-stmtContainers(#20287,#20001)
+stmt_containers(#20287,#20001)
 #20289=*
 exprs(#20289,78,#20287,0,"ComplexInitializer")
 hasLocation(#20289,#20141)
@@ -925,7 +925,7 @@ stmts(#20303,36,#20001,6,"enum St ... b = a\n}")
 #20304=@"loc,{#10000},13,1,16,1"
 locations_default(#20304,#10000,13,1,16,1)
 hasLocation(#20303,#20304)
-stmtContainers(#20303,#20001)
+stmt_containers(#20303,#20001)
 #20305=*
 exprs(#20305,78,#20303,0,"StringL ... mMember")
 hasLocation(#20305,#20164)
@@ -989,7 +989,7 @@ bind(#20318,#20307)
 #20319=*
 stmts(#20319,18,#20001,7,"var x : ... r.a = 2")
 hasLocation(#20319,#20037)
-stmtContainers(#20319,#20001)
+stmt_containers(#20319,#20001)
 #20320=*
 exprs(#20320,64,#20319,0,"x : Str ... r.a = 2")
 #20321=@"loc,{#10000},18,5,18,37"
diff --git a/javascript/extractor/tests/ts/output/trap/export.ts.trap b/javascript/extractor/tests/ts/output/trap/export.ts.trap
index 1ebc747a026..8ef81f3194f 100644
--- a/javascript/extractor/tests/ts/output/trap/export.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/export.ts.trap
@@ -166,13 +166,13 @@ local_type_names(#20059,"C",#20055)
 #20060=*
 stmts(#20060,30,#20001,0,"export  ... o = 42;")
 hasLocation(#20060,#20003)
-stmtContainers(#20060,#20001)
+stmt_containers(#20060,#20001)
 #20061=*
 stmts(#20061,22,#20060,-1,"const foo = 42;")
 #20062=@"loc,{#10000},1,8,1,22"
 locations_default(#20062,#10000,1,8,1,22)
 hasLocation(#20061,#20062)
-stmtContainers(#20061,#20001)
+stmt_containers(#20061,#20001)
 #20063=*
 exprs(#20063,64,#20061,0,"foo = 42")
 #20064=@"loc,{#10000},1,14,1,21"
@@ -196,13 +196,13 @@ literals("42","42",#20066)
 #20067=*
 stmts(#20067,30,#20001,1,"export class C {}")
 hasLocation(#20067,#20007)
-stmtContainers(#20067,#20001)
+stmt_containers(#20067,#20001)
 #20068=*
 stmts(#20068,26,#20067,-1,"class C {}")
 #20069=@"loc,{#10000},3,8,3,17"
 locations_default(#20069,#10000,3,8,3,17)
 hasLocation(#20068,#20069)
-stmtContainers(#20068,#20001)
+stmt_containers(#20068,#20001)
 #20070=*
 exprs(#20070,78,#20068,0,"C")
 hasLocation(#20070,#20029)
@@ -241,20 +241,20 @@ isArgumentsObject(#20077)
 #20078=*
 stmts(#20078,1,#20075,-2,"{}")
 hasLocation(#20078,#20073)
-stmtContainers(#20078,#20075)
+stmt_containers(#20078,#20075)
 isMethod(#20072)
 #20079=*
 stmts(#20079,29,#20001,2,"export  ...  f() {}")
 #20080=@"loc,{#10000},5,1,5,30"
 locations_default(#20080,#10000,5,1,5,30)
 hasLocation(#20079,#20080)
-stmtContainers(#20079,#20001)
+stmt_containers(#20079,#20001)
 #20081=*
 stmts(#20081,17,#20079,0,"function f() {}")
 #20082=@"loc,{#10000},5,16,5,30"
 locations_default(#20082,#10000,5,16,5,30)
 hasLocation(#20081,#20082)
-stmtContainers(#20081,#20001)
+stmt_containers(#20081,#20001)
 #20083=*
 exprs(#20083,78,#20081,-1,"f")
 hasLocation(#20083,#20041)
@@ -273,11 +273,11 @@ stmts(#20086,1,#20081,-2,"{}")
 #20087=@"loc,{#10000},5,29,5,30"
 locations_default(#20087,#10000,5,29,5,30)
 hasLocation(#20086,#20087)
-stmtContainers(#20086,#20081)
+stmt_containers(#20086,#20081)
 #20088=*
 stmts(#20088,0,#20001,3,";")
 hasLocation(#20088,#20051)
-stmtContainers(#20088,#20001)
+stmt_containers(#20088,#20001)
 #20089=*
 entry_cfg_node(#20089,#20001)
 #20090=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/ts/output/trap/export2.ts.trap b/javascript/extractor/tests/ts/output/trap/export2.ts.trap
index b9e98cd2e5f..b4b5337dd37 100644
--- a/javascript/extractor/tests/ts/output/trap/export2.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/export2.ts.trap
@@ -54,7 +54,7 @@ is_es2015_module(#20001)
 #20016=*
 stmts(#20016,29,#20001,0,"export default 42;")
 hasLocation(#20016,#20003)
-stmtContainers(#20016,#20001)
+stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,3,#20016,0,"42")
 hasLocation(#20017,#20009)
diff --git a/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap b/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap
index a24989d209d..fdbf7ea5164 100644
--- a/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap
@@ -100,13 +100,13 @@ is_es2015_module(#20001)
 #20034=*
 stmts(#20034,30,#20001,0,"export  ...  foo();")
 hasLocation(#20034,#20003)
-stmtContainers(#20034,#20001)
+stmt_containers(#20034,#20001)
 #20035=*
 stmts(#20035,17,#20034,-1,"declare ...  foo();")
 #20036=@"loc,{#10000},1,8,1,30"
 locations_default(#20036,#10000,1,8,1,30)
 hasLocation(#20035,#20036)
-stmtContainers(#20035,#20001)
+stmt_containers(#20035,#20001)
 hasDeclareKeyword(#20035)
 #20037=*
 exprs(#20037,78,#20035,-1,"foo")
@@ -126,7 +126,7 @@ isArgumentsObject(#20040)
 #20041=*
 stmts(#20041,38,#20001,1,"export  ... ce bar;")
 hasLocation(#20041,#20005)
-stmtContainers(#20041,#20001)
+stmt_containers(#20041,#20001)
 #20042=*
 exprs(#20042,0,#20041,0,"bar")
 hasLocation(#20042,#20027)
diff --git a/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap b/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap
index e2d2de70aae..93d9083684e 100644
--- a/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap
@@ -54,7 +54,7 @@ is_es2015_module(#20001)
 #20016=*
 stmts(#20016,33,#20001,0,"export = 42;")
 hasLocation(#20016,#20003)
-stmtContainers(#20016,#20001)
+stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,3,#20016,0,"42")
 hasLocation(#20017,#20009)
diff --git a/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap b/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap
index d62fb5ef589..2ea22247934 100644
--- a/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap
@@ -54,13 +54,13 @@ is_es2015_module(#20001)
 #20016=*
 stmts(#20016,30,#20001,0,"export class {}")
 hasLocation(#20016,#20003)
-stmtContainers(#20016,#20001)
+stmt_containers(#20016,#20001)
 #20017=*
 stmts(#20017,26,#20016,-1,"class {}")
 #20018=@"loc,{#10000},1,8,1,15"
 locations_default(#20018,#10000,1,8,1,15)
 hasLocation(#20017,#20018)
-stmtContainers(#20017,#20001)
+stmt_containers(#20017,#20001)
 #20019=*
 properties(#20019,#20017,2,0,"constructor() {}")
 #20020=@"loc,{#10000},1,6,1,5"
@@ -87,7 +87,7 @@ isArgumentsObject(#20024)
 #20025=*
 stmts(#20025,1,#20022,-2,"{}")
 hasLocation(#20025,#20020)
-stmtContainers(#20025,#20022)
+stmt_containers(#20025,#20022)
 isMethod(#20019)
 #20026=*
 entry_cfg_node(#20026,#20001)
diff --git a/javascript/extractor/tests/ts/output/trap/exprs.ts.trap b/javascript/extractor/tests/ts/output/trap/exprs.ts.trap
index 725b28cba30..00e42424646 100644
--- a/javascript/extractor/tests/ts/output/trap/exprs.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exprs.ts.trap
@@ -174,7 +174,7 @@ variables(#20062,"f",#20000)
 #20063=*
 stmts(#20063,17,#20001,0,"functio ...  = z;\n}")
 hasLocation(#20063,#20061)
-stmtContainers(#20063,#20001)
+stmt_containers(#20063,#20001)
 #20064=*
 exprs(#20064,78,#20063,-1,"f")
 hasLocation(#20064,#20015)
@@ -201,7 +201,7 @@ stmts(#20069,1,#20063,-2,"{\n  let ...  = z;\n}")
 #20070=@"loc,{#10000},1,15,5,1"
 locations_default(#20070,#10000,1,15,5,1)
 hasLocation(#20069,#20070)
-stmtContainers(#20069,#20063)
+stmt_containers(#20069,#20063)
 #20071=*
 scopes(#20071,4)
 scopenodes(#20069,#20071)
@@ -215,7 +215,7 @@ stmts(#20074,23,#20069,0,"let x, y;")
 #20075=@"loc,{#10000},2,3,2,11"
 locations_default(#20075,#10000,2,3,2,11)
 hasLocation(#20074,#20075)
-stmtContainers(#20074,#20063)
+stmt_containers(#20074,#20063)
 #20076=*
 exprs(#20076,64,#20074,0,"x")
 hasLocation(#20076,#20027)
@@ -245,7 +245,7 @@ stmts(#20080,2,#20069,1,"x, y;")
 #20081=@"loc,{#10000},3,3,3,7"
 locations_default(#20081,#10000,3,3,3,7)
 hasLocation(#20080,#20081)
-stmtContainers(#20080,#20063)
+stmt_containers(#20080,#20063)
 #20082=*
 exprs(#20082,10,#20080,0,"x, y")
 #20083=@"loc,{#10000},3,3,3,6"
@@ -272,7 +272,7 @@ stmts(#20086,2,#20069,2,"[x, y] = z;")
 #20087=@"loc,{#10000},4,3,4,13"
 locations_default(#20087,#10000,4,3,4,13)
 hasLocation(#20086,#20087)
-stmtContainers(#20086,#20063)
+stmt_containers(#20086,#20063)
 #20088=*
 exprs(#20088,47,#20086,0,"[x, y] = z")
 #20089=@"loc,{#10000},4,3,4,12"
diff --git a/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap b/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
index bd3ff66aac8..69049f7aea0 100644
--- a/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
@@ -233,7 +233,7 @@ stmts(#20082,37,#20001,0,"declare ...  = M;\n}")
 #20083=@"loc,{#10000},1,1,9,1"
 locations_default(#20083,#10000,1,1,9,1)
 hasLocation(#20082,#20083)
-stmtContainers(#20082,#20001)
+stmt_containers(#20082,#20001)
 hasDeclareKeyword(#20082)
 #20084=*
 exprs(#20084,4,#20082,-1,"""X""")
@@ -260,7 +260,7 @@ stmts(#20090,31,#20082,0,"module  ...  {}\n  }")
 #20091=@"loc,{#10000},2,3,4,3"
 locations_default(#20091,#10000,2,3,4,3)
 hasLocation(#20090,#20091)
-stmtContainers(#20090,#20082)
+stmt_containers(#20090,#20082)
 #20092=*
 exprs(#20092,78,#20090,-1,"M")
 hasLocation(#20092,#20031)
@@ -279,13 +279,13 @@ stmts(#20095,30,#20090,0,"export  ... ce I {}")
 #20096=@"loc,{#10000},3,5,3,25"
 locations_default(#20096,#10000,3,5,3,25)
 hasLocation(#20095,#20096)
-stmtContainers(#20095,#20090)
+stmt_containers(#20095,#20090)
 #20097=*
 stmts(#20097,34,#20095,-1,"interface I {}")
 #20098=@"loc,{#10000},3,12,3,25"
 locations_default(#20098,#10000,3,12,3,25)
 hasLocation(#20097,#20098)
-stmtContainers(#20097,#20090)
+stmt_containers(#20097,#20090)
 #20099=*
 typeexprs(#20099,1,#20097,0,"I")
 hasLocation(#20099,#20039)
@@ -298,7 +298,7 @@ stmts(#20100,34,#20082,1,"interfa ... .I;\n  }")
 #20101=@"loc,{#10000},5,3,7,3"
 locations_default(#20101,#10000,5,3,7,3)
 hasLocation(#20100,#20101)
-stmtContainers(#20100,#20082)
+stmt_containers(#20100,#20082)
 #20102=*
 typeexprs(#20102,1,#20100,0,"M")
 hasLocation(#20102,#20049)
@@ -353,7 +353,7 @@ stmts(#20113,33,#20082,2,"export = M;")
 #20114=@"loc,{#10000},8,3,8,13"
 locations_default(#20114,#10000,8,3,8,13)
 hasLocation(#20113,#20114)
-stmtContainers(#20113,#20082)
+stmt_containers(#20113,#20082)
 #20115=*
 exprs(#20115,103,#20113,0,"M")
 hasLocation(#20115,#20075)
diff --git a/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap b/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
index 0406d1adc60..92906de43b8 100644
--- a/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
@@ -591,7 +591,7 @@ local_type_names(#20223,"C",#20000)
 #20224=*
 stmts(#20224,18,#20001,0,"declare var A : any;")
 hasLocation(#20224,#20003)
-stmtContainers(#20224,#20001)
+stmt_containers(#20224,#20001)
 hasDeclareKeyword(#20224)
 #20225=*
 exprs(#20225,64,#20224,0,"A : any")
@@ -618,7 +618,7 @@ literals("any","any",#20229)
 #20230=*
 stmts(#20230,18,#20001,1,"declare var B : any;")
 hasLocation(#20230,#20005)
-stmtContainers(#20230,#20001)
+stmt_containers(#20230,#20001)
 hasDeclareKeyword(#20230)
 #20231=*
 exprs(#20231,64,#20230,0,"B : any")
@@ -645,7 +645,7 @@ literals("any","any",#20235)
 #20236=*
 stmts(#20236,18,#20001,2,"declare var C : any;")
 hasLocation(#20236,#20007)
-stmtContainers(#20236,#20001)
+stmt_containers(#20236,#20001)
 hasDeclareKeyword(#20236)
 #20237=*
 exprs(#20237,64,#20236,0,"C : any")
@@ -672,7 +672,7 @@ stmts(#20241,26,#20001,3,"class C ... c) {}\n}")
 #20242=@"loc,{#10000},5,1,15,1"
 locations_default(#20242,#10000,5,1,15,1)
 hasLocation(#20241,#20242)
-stmtContainers(#20241,#20001)
+stmt_containers(#20241,#20001)
 #20243=*
 exprs(#20243,78,#20241,0,"C")
 hasLocation(#20243,#20071)
@@ -721,7 +721,7 @@ stmts(#20253,1,#20248,-2,"{}")
 #20254=@"loc,{#10000},6,12,6,13"
 locations_default(#20254,#10000,6,12,6,13)
 hasLocation(#20253,#20254)
-stmtContainers(#20253,#20248)
+stmt_containers(#20253,#20248)
 isMethod(#20245)
 #20255=*
 properties(#20255,#20241,3,0,"m2(@A a) {}")
@@ -775,7 +775,7 @@ stmts(#20267,1,#20258,-2,"{}")
 #20268=@"loc,{#10000},7,12,7,13"
 locations_default(#20268,#10000,7,12,7,13)
 hasLocation(#20267,#20268)
-stmtContainers(#20267,#20258)
+stmt_containers(#20267,#20258)
 isMethod(#20255)
 #20269=*
 properties(#20269,#20241,4,0,"m3(@A @B ab) {}")
@@ -843,7 +843,7 @@ stmts(#20285,1,#20272,-2,"{}")
 #20286=@"loc,{#10000},8,16,8,17"
 locations_default(#20286,#10000,8,16,8,17)
 hasLocation(#20285,#20286)
-stmtContainers(#20285,#20272)
+stmt_containers(#20285,#20272)
 isMethod(#20269)
 #20287=*
 properties(#20287,#20241,5,0,"m4(none, @A a) {}")
@@ -905,7 +905,7 @@ stmts(#20301,1,#20290,-2,"{}")
 #20302=@"loc,{#10000},10,18,10,19"
 locations_default(#20302,#10000,10,18,10,19)
 hasLocation(#20301,#20302)
-stmtContainers(#20301,#20290)
+stmt_containers(#20301,#20290)
 isMethod(#20287)
 #20303=*
 properties(#20303,#20241,6,0,"m5(none ...  ab) {}")
@@ -981,7 +981,7 @@ stmts(#20321,1,#20306,-2,"{}")
 #20322=@"loc,{#10000},11,22,11,23"
 locations_default(#20322,#10000,11,22,11,23)
 hasLocation(#20321,#20322)
-stmtContainers(#20321,#20306)
+stmt_containers(#20321,#20306)
 isMethod(#20303)
 #20323=*
 properties(#20323,#20241,7,0,"m6(@A a, @B b) {}")
@@ -1059,7 +1059,7 @@ stmts(#20341,1,#20326,-2,"{}")
 #20342=@"loc,{#10000},13,18,13,19"
 locations_default(#20342,#10000,13,18,13,19)
 hasLocation(#20341,#20342)
-stmtContainers(#20341,#20326)
+stmt_containers(#20341,#20326)
 isMethod(#20323)
 #20343=*
 properties(#20343,#20241,8,0,"m7(@A a ...  bc) {}")
@@ -1151,7 +1151,7 @@ stmts(#20365,1,#20346,-2,"{}")
 #20366=@"loc,{#10000},14,22,14,23"
 locations_default(#20366,#10000,14,22,14,23)
 hasLocation(#20365,#20366)
-stmtContainers(#20365,#20346)
+stmt_containers(#20365,#20346)
 isMethod(#20343)
 #20367=*
 properties(#20367,#20241,9,0,"constructor() {}")
@@ -1179,7 +1179,7 @@ isArgumentsObject(#20372)
 #20373=*
 stmts(#20373,1,#20370,-2,"{}")
 hasLocation(#20373,#20368)
-stmtContainers(#20373,#20370)
+stmt_containers(#20373,#20370)
 isMethod(#20367)
 #20374=*
 entry_cfg_node(#20374,#20001)
diff --git a/javascript/extractor/tests/ts/output/trap/hello.ts.trap b/javascript/extractor/tests/ts/output/trap/hello.ts.trap
index 7051bb5ab99..ec43d8b5c8a 100644
--- a/javascript/extractor/tests/ts/output/trap/hello.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/hello.ts.trap
@@ -175,7 +175,7 @@ stmts(#20063,17,#20001,0,"functio ...  ""!"";\n}")
 #20064=@"loc,{#10000},1,1,3,1"
 locations_default(#20064,#10000,1,1,3,1)
 hasLocation(#20063,#20064)
-stmtContainers(#20063,#20001)
+stmt_containers(#20063,#20001)
 #20065=*
 exprs(#20065,78,#20063,-1,"greeter")
 hasLocation(#20065,#20015)
@@ -207,13 +207,13 @@ stmts(#20071,1,#20063,-2,"{\n    r ...  ""!"";\n}")
 #20072=@"loc,{#10000},1,34,3,1"
 locations_default(#20072,#10000,1,34,3,1)
 hasLocation(#20071,#20072)
-stmtContainers(#20071,#20063)
+stmt_containers(#20071,#20063)
 #20073=*
 stmts(#20073,9,#20071,0,"return  ...  + ""!"";")
 #20074=@"loc,{#10000},2,5,2,36"
 locations_default(#20074,#10000,2,5,2,36)
 hasLocation(#20073,#20074)
-stmtContainers(#20073,#20063)
+stmt_containers(#20073,#20063)
 #20075=*
 exprs(#20075,34,#20073,0,"""Hello, ... n + ""!""")
 #20076=@"loc,{#10000},2,12,2,35"
@@ -262,7 +262,7 @@ regexpConstValue(#20084,"!")
 #20086=*
 stmts(#20086,2,#20001,1,"alert(g ... rld""));")
 hasLocation(#20086,#20011)
-stmtContainers(#20086,#20001)
+stmt_containers(#20086,#20001)
 #20087=*
 exprs(#20087,13,#20086,0,"alert(g ... orld""))")
 #20088=@"loc,{#10000},5,1,5,23"
diff --git a/javascript/extractor/tests/ts/output/trap/importExport.ts.trap b/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
index 04b23de3221..cd71310ee3a 100644
--- a/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
@@ -139,7 +139,7 @@ local_namespace_names(#20047,"importExport",#20041)
 #20048=*
 stmts(#20048,27,#20001,0,"import  ... where';")
 hasLocation(#20048,#20003)
-stmtContainers(#20048,#20001)
+stmt_containers(#20048,#20001)
 #20049=*
 exprs(#20049,4,#20048,-1,"'somewhere'")
 hasLocation(#20049,#20019)
@@ -171,13 +171,13 @@ namespacedecl(#20054,#20046)
 #20055=*
 stmts(#20055,30,#20001,1,"export  ... thingy;")
 hasLocation(#20055,#20007)
-stmtContainers(#20055,#20001)
+stmt_containers(#20055,#20001)
 #20056=*
 stmts(#20056,32,#20055,-1,"import  ... thingy;")
 #20057=@"loc,{#10000},3,8,3,46"
 locations_default(#20057,#10000,3,8,3,46)
 hasLocation(#20056,#20057)
-stmtContainers(#20056,#20001)
+stmt_containers(#20056,#20001)
 #20058=*
 exprs(#20058,78,#20056,0,"importExport")
 hasLocation(#20058,#20027)
diff --git a/javascript/extractor/tests/ts/output/trap/importassign.ts.trap b/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
index 7569c585ca2..2dcc27f5a5f 100644
--- a/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
@@ -83,7 +83,7 @@ local_namespace_names(#20026,"x",#20023)
 #20027=*
 stmts(#20027,32,#20001,0,"import  ... sign"");")
 hasLocation(#20027,#20003)
-stmtContainers(#20027,#20001)
+stmt_containers(#20027,#20001)
 #20028=*
 exprs(#20028,78,#20027,0,"x")
 hasLocation(#20028,#20007)
diff --git a/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap b/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap
index 03f03a36101..e91435a4a40 100644
--- a/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap
@@ -266,7 +266,7 @@ stmts(#20095,34,#20001,0,"interfa ... mber;\n}")
 #20096=@"loc,{#10000},1,1,5,1"
 locations_default(#20096,#10000,1,1,5,1)
 hasLocation(#20095,#20096)
-stmtContainers(#20095,#20001)
+stmt_containers(#20095,#20001)
 #20097=*
 typeexprs(#20097,1,#20095,0,"MyInterface")
 hasLocation(#20097,#20027)
@@ -365,7 +365,7 @@ stmts(#20118,31,#20001,1,"namespa ... ;\n  }\n}")
 #20119=@"loc,{#10000},7,1,11,1"
 locations_default(#20119,#10000,7,1,11,1)
 hasLocation(#20118,#20119)
-stmtContainers(#20118,#20001)
+stmt_containers(#20118,#20001)
 #20120=*
 exprs(#20120,78,#20118,-1,"Foo")
 hasLocation(#20120,#20068)
@@ -384,13 +384,13 @@ stmts(#20123,30,#20118,0,"export  ... ();\n  }")
 #20124=@"loc,{#10000},8,3,10,3"
 locations_default(#20124,#10000,8,3,10,3)
 hasLocation(#20123,#20124)
-stmtContainers(#20123,#20118)
+stmt_containers(#20123,#20118)
 #20125=*
 stmts(#20125,34,#20123,-1,"interfa ... ();\n  }")
 #20126=@"loc,{#10000},8,10,10,3"
 locations_default(#20126,#10000,8,10,10,3)
 hasLocation(#20125,#20126)
-stmtContainers(#20125,#20118)
+stmt_containers(#20125,#20118)
 #20127=*
 typeexprs(#20127,1,#20125,0,"I")
 hasLocation(#20127,#20076)
diff --git a/javascript/extractor/tests/ts/output/trap/let.ts.trap b/javascript/extractor/tests/ts/output/trap/let.ts.trap
index dbe8b658367..1866cc57c26 100644
--- a/javascript/extractor/tests/ts/output/trap/let.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/let.ts.trap
@@ -121,7 +121,7 @@ variables(#20043,"constX",#20000)
 #20044=*
 stmts(#20044,18,#20001,0,"var varX = 5;")
 hasLocation(#20044,#20003)
-stmtContainers(#20044,#20001)
+stmt_containers(#20044,#20001)
 #20045=*
 exprs(#20045,64,#20044,0,"varX = 5")
 #20046=@"loc,{#10000},1,5,1,12"
@@ -145,7 +145,7 @@ literals("5","5",#20048)
 #20049=*
 stmts(#20049,23,#20001,1,"let letX = 6;")
 hasLocation(#20049,#20005)
-stmtContainers(#20049,#20001)
+stmt_containers(#20049,#20001)
 #20050=*
 exprs(#20050,64,#20049,0,"letX = 6")
 #20051=@"loc,{#10000},2,5,2,12"
@@ -169,7 +169,7 @@ literals("6","6",#20053)
 #20054=*
 stmts(#20054,22,#20001,2,"const constX = 7;")
 hasLocation(#20054,#20007)
-stmtContainers(#20054,#20001)
+stmt_containers(#20054,#20001)
 #20055=*
 exprs(#20055,64,#20054,0,"constX = 7")
 #20056=@"loc,{#10000},3,7,3,16"
diff --git a/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap b/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap
index d16a0aa5700..84eaa23ffff 100644
--- a/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap
@@ -175,7 +175,7 @@ stmts(#20063,17,#20001,0,"functio ... y) {}\n}")
 #20064=@"loc,{#10000},1,1,4,1"
 locations_default(#20064,#10000,1,1,4,1)
 hasLocation(#20063,#20064)
-stmtContainers(#20063,#20001)
+stmt_containers(#20063,#20001)
 #20065=*
 exprs(#20065,78,#20063,-1,"f")
 hasLocation(#20065,#20013)
@@ -210,13 +210,13 @@ stmts(#20072,1,#20063,-2,"{\n  if  ... y) {}\n}")
 #20073=@"loc,{#10000},1,17,4,1"
 locations_default(#20073,#10000,1,17,4,1)
 hasLocation(#20072,#20073)
-stmtContainers(#20072,#20063)
+stmt_containers(#20072,#20063)
 #20074=*
 stmts(#20074,3,#20072,0,"if (x || y) {}")
 #20075=@"loc,{#10000},2,3,2,16"
 locations_default(#20075,#10000,2,3,2,16)
 hasLocation(#20074,#20075)
-stmtContainers(#20074,#20063)
+stmt_containers(#20074,#20063)
 #20076=*
 exprs(#20076,45,#20074,0,"x || y")
 #20077=@"loc,{#10000},2,7,2,12"
@@ -243,13 +243,13 @@ stmts(#20080,1,#20074,1,"{}")
 #20081=@"loc,{#10000},2,15,2,16"
 locations_default(#20081,#10000,2,15,2,16)
 hasLocation(#20080,#20081)
-stmtContainers(#20080,#20063)
+stmt_containers(#20080,#20063)
 #20082=*
 stmts(#20082,3,#20072,1,"if (x && y) {}")
 #20083=@"loc,{#10000},3,3,3,16"
 locations_default(#20083,#10000,3,3,3,16)
 hasLocation(#20082,#20083)
-stmtContainers(#20082,#20063)
+stmt_containers(#20082,#20063)
 #20084=*
 exprs(#20084,44,#20082,0,"x && y")
 #20085=@"loc,{#10000},3,7,3,12"
@@ -276,7 +276,7 @@ stmts(#20088,1,#20082,1,"{}")
 #20089=@"loc,{#10000},3,15,3,16"
 locations_default(#20089,#10000,3,15,3,16)
 hasLocation(#20088,#20089)
-stmtContainers(#20088,#20063)
+stmt_containers(#20088,#20063)
 #20090=*
 entry_cfg_node(#20090,#20001)
 #20091=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap b/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap
index 7e23db10deb..6fd04072b05 100644
--- a/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap
@@ -696,7 +696,7 @@ stmts(#20265,31,#20001,0,"namespa ... ing }\n}")
 #20266=@"loc,{#10000},1,1,11,1"
 locations_default(#20266,#10000,1,1,11,1)
 hasLocation(#20265,#20266)
-stmtContainers(#20265,#20001)
+stmt_containers(#20265,#20001)
 #20267=*
 exprs(#20267,78,#20265,-1,"MappedTypeModifiers")
 hasLocation(#20267,#20037)
@@ -725,7 +725,7 @@ stmts(#20275,35,#20265,0,"type Mu ... T[P] };")
 #20276=@"loc,{#10000},2,3,2,65"
 locations_default(#20276,#10000,2,3,2,65)
 hasLocation(#20275,#20276)
-stmtContainers(#20275,#20265)
+stmt_containers(#20275,#20265)
 #20277=*
 typeexprs(#20277,1,#20275,0,"MutableRequired")
 hasLocation(#20277,#20043)
@@ -818,7 +818,7 @@ stmts(#20296,35,#20265,1,"type Re ... T[P] };")
 #20297=@"loc,{#10000},3,3,3,65"
 locations_default(#20297,#10000,3,3,3,65)
 hasLocation(#20296,#20297)
-stmtContainers(#20296,#20265)
+stmt_containers(#20296,#20265)
 #20298=*
 typeexprs(#20298,1,#20296,0,"ReadonlyPartial")
 hasLocation(#20298,#20091)
@@ -911,7 +911,7 @@ stmts(#20317,35,#20265,2,"type Re ... T[P] };")
 #20318=@"loc,{#10000},5,3,5,64"
 locations_default(#20318,#10000,5,3,5,64)
 hasLocation(#20317,#20318)
-stmtContainers(#20317,#20265)
+stmt_containers(#20317,#20265)
 #20319=*
 typeexprs(#20319,1,#20317,0,"ReadonlyPartial2")
 hasLocation(#20319,#20139)
@@ -1004,7 +1004,7 @@ stmts(#20338,35,#20265,3,"type Re ... T[P] };")
 #20339=@"loc,{#10000},7,3,7,48"
 locations_default(#20339,#10000,7,3,7,48)
 hasLocation(#20338,#20339)
-stmtContainers(#20338,#20265)
+stmt_containers(#20338,#20265)
 #20340=*
 typeexprs(#20340,1,#20338,0,"Required")
 hasLocation(#20340,#20183)
@@ -1097,7 +1097,7 @@ stmts(#20359,35,#20265,4,"type Fo ... ring };")
 #20360=@"loc,{#10000},9,3,9,28"
 locations_default(#20360,#10000,9,3,9,28)
 hasLocation(#20359,#20360)
-stmtContainers(#20359,#20265)
+stmt_containers(#20359,#20265)
 #20361=*
 typeexprs(#20361,1,#20359,0,"Foo")
 hasLocation(#20361,#20227)
@@ -1136,7 +1136,7 @@ stmts(#20368,35,#20265,5,"type Ba ... d<Foo>;")
 #20369=@"loc,{#10000},10,3,10,27"
 locations_default(#20369,#10000,10,3,10,27)
 hasLocation(#20368,#20369)
-stmtContainers(#20368,#20265)
+stmt_containers(#20368,#20265)
 #20370=*
 typeexprs(#20370,1,#20368,0,"Bar")
 hasLocation(#20370,#20247)
diff --git a/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap b/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap
index f61de014211..03925e4738f 100644
--- a/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap
@@ -200,7 +200,7 @@ stmts(#20071,31,#20001,0,"namespa ... ;\n  }\n}")
 #20072=@"loc,{#10000},1,1,5,1"
 locations_default(#20072,#10000,1,1,5,1)
 hasLocation(#20071,#20072)
-stmtContainers(#20071,#20001)
+stmt_containers(#20071,#20001)
 #20073=*
 exprs(#20073,78,#20071,-1,"M")
 hasLocation(#20073,#20019)
@@ -222,13 +222,13 @@ stmts(#20077,30,#20071,0,"export  ... 42;\n  }")
 #20078=@"loc,{#10000},2,3,4,3"
 locations_default(#20078,#10000,2,3,4,3)
 hasLocation(#20077,#20078)
-stmtContainers(#20077,#20071)
+stmt_containers(#20077,#20071)
 #20079=*
 stmts(#20079,31,#20077,-1,"namespa ... 42;\n  }")
 #20080=@"loc,{#10000},2,10,4,3"
 locations_default(#20080,#10000,2,10,4,3)
 hasLocation(#20079,#20080)
-stmtContainers(#20079,#20071)
+stmt_containers(#20079,#20071)
 #20081=*
 exprs(#20081,78,#20079,-1,"N")
 hasLocation(#20081,#20027)
@@ -248,13 +248,13 @@ stmts(#20084,30,#20079,0,"export let x = 42;")
 #20085=@"loc,{#10000},3,5,3,22"
 locations_default(#20085,#10000,3,5,3,22)
 hasLocation(#20084,#20085)
-stmtContainers(#20084,#20079)
+stmt_containers(#20084,#20079)
 #20086=*
 stmts(#20086,23,#20084,-1,"let x = 42;")
 #20087=@"loc,{#10000},3,12,3,22"
 locations_default(#20087,#10000,3,12,3,22)
 hasLocation(#20086,#20087)
-stmtContainers(#20086,#20079)
+stmt_containers(#20086,#20079)
 #20088=*
 exprs(#20088,64,#20086,0,"x = 42")
 #20089=@"loc,{#10000},3,16,3,21"
@@ -280,7 +280,7 @@ isInstantiated(#20071)
 #20092=*
 stmts(#20092,32,#20001,1,"import x = M.N.x;")
 hasLocation(#20092,#20015)
-stmtContainers(#20092,#20001)
+stmt_containers(#20092,#20001)
 #20093=*
 exprs(#20093,78,#20092,0,"x")
 hasLocation(#20093,#20048)
diff --git a/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap b/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap
index 42aaddf5b58..50f4ae9a2de 100644
--- a/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap
@@ -229,7 +229,7 @@ local_namespace_names(#20083,"X",#20000)
 #20084=*
 stmts(#20084,31,#20001,0,"namespace A.B {}")
 hasLocation(#20084,#20003)
-stmtContainers(#20084,#20001)
+stmt_containers(#20084,#20001)
 #20085=*
 exprs(#20085,78,#20084,-1,"A")
 hasLocation(#20085,#20021)
@@ -248,11 +248,11 @@ stmts(#20088,30,#20084,0,"B {}")
 #20089=@"loc,{#10000},1,13,1,16"
 locations_default(#20089,#10000,1,13,1,16)
 hasLocation(#20088,#20089)
-stmtContainers(#20088,#20084)
+stmt_containers(#20088,#20084)
 #20090=*
 stmts(#20090,31,#20088,-1,"B {}")
 hasLocation(#20090,#20089)
-stmtContainers(#20090,#20084)
+stmt_containers(#20090,#20084)
 #20091=*
 exprs(#20091,78,#20090,-1,"B")
 hasLocation(#20091,#20025)
@@ -267,7 +267,7 @@ scopenesting(#20092,#20086)
 #20093=*
 stmts(#20093,31,#20001,1,"namespace A.B.C {}")
 hasLocation(#20093,#20005)
-stmtContainers(#20093,#20001)
+stmt_containers(#20093,#20001)
 #20094=*
 exprs(#20094,78,#20093,-1,"A")
 hasLocation(#20094,#20033)
@@ -286,11 +286,11 @@ stmts(#20097,30,#20093,0,"B.C {}")
 #20098=@"loc,{#10000},2,13,2,18"
 locations_default(#20098,#10000,2,13,2,18)
 hasLocation(#20097,#20098)
-stmtContainers(#20097,#20093)
+stmt_containers(#20097,#20093)
 #20099=*
 stmts(#20099,31,#20097,-1,"B.C {}")
 hasLocation(#20099,#20098)
-stmtContainers(#20099,#20093)
+stmt_containers(#20099,#20093)
 #20100=*
 exprs(#20100,78,#20099,-1,"B")
 hasLocation(#20100,#20037)
@@ -309,11 +309,11 @@ stmts(#20103,30,#20099,0,"C {}")
 #20104=@"loc,{#10000},2,15,2,18"
 locations_default(#20104,#10000,2,15,2,18)
 hasLocation(#20103,#20104)
-stmtContainers(#20103,#20099)
+stmt_containers(#20103,#20099)
 #20105=*
 stmts(#20105,31,#20103,-1,"C {}")
 hasLocation(#20105,#20104)
-stmtContainers(#20105,#20099)
+stmt_containers(#20105,#20099)
 #20106=*
 exprs(#20106,78,#20105,-1,"C")
 hasLocation(#20106,#20041)
@@ -330,7 +330,7 @@ stmts(#20108,31,#20001,2,"namespa ... .Q {}\n}")
 #20109=@"loc,{#10000},4,1,8,1"
 locations_default(#20109,#10000,4,1,8,1)
 hasLocation(#20108,#20109)
-stmtContainers(#20108,#20001)
+stmt_containers(#20108,#20001)
 #20110=*
 exprs(#20110,78,#20108,-1,"X")
 hasLocation(#20110,#20049)
@@ -351,13 +351,13 @@ stmts(#20114,30,#20108,0,"export  ...  Y.Z {}")
 #20115=@"loc,{#10000},5,3,5,25"
 locations_default(#20115,#10000,5,3,5,25)
 hasLocation(#20114,#20115)
-stmtContainers(#20114,#20108)
+stmt_containers(#20114,#20108)
 #20116=*
 stmts(#20116,31,#20114,-1,"namespace Y.Z {}")
 #20117=@"loc,{#10000},5,10,5,25"
 locations_default(#20117,#10000,5,10,5,25)
 hasLocation(#20116,#20117)
-stmtContainers(#20116,#20108)
+stmt_containers(#20116,#20108)
 #20118=*
 exprs(#20118,78,#20116,-1,"Y")
 hasLocation(#20118,#20057)
@@ -376,11 +376,11 @@ stmts(#20121,30,#20116,0,"Z {}")
 #20122=@"loc,{#10000},5,22,5,25"
 locations_default(#20122,#10000,5,22,5,25)
 hasLocation(#20121,#20122)
-stmtContainers(#20121,#20116)
+stmt_containers(#20121,#20116)
 #20123=*
 stmts(#20123,31,#20121,-1,"Z {}")
 hasLocation(#20123,#20122)
-stmtContainers(#20123,#20116)
+stmt_containers(#20123,#20116)
 #20124=*
 exprs(#20124,78,#20123,-1,"Z")
 hasLocation(#20124,#20061)
@@ -397,7 +397,7 @@ stmts(#20126,31,#20108,1,"namespace W.Q {}")
 #20127=@"loc,{#10000},7,3,7,18"
 locations_default(#20127,#10000,7,3,7,18)
 hasLocation(#20126,#20127)
-stmtContainers(#20126,#20108)
+stmt_containers(#20126,#20108)
 #20128=*
 exprs(#20128,78,#20126,-1,"W")
 hasLocation(#20128,#20069)
@@ -416,11 +416,11 @@ stmts(#20131,30,#20126,0,"Q {}")
 #20132=@"loc,{#10000},7,15,7,18"
 locations_default(#20132,#10000,7,15,7,18)
 hasLocation(#20131,#20132)
-stmtContainers(#20131,#20126)
+stmt_containers(#20131,#20126)
 #20133=*
 stmts(#20133,31,#20131,-1,"Q {}")
 hasLocation(#20133,#20132)
-stmtContainers(#20133,#20126)
+stmt_containers(#20133,#20126)
 #20134=*
 exprs(#20134,78,#20133,-1,"Q")
 hasLocation(#20134,#20073)
diff --git a/javascript/extractor/tests/ts/output/trap/nobody.ts.trap b/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
index e8be77f71e2..ff1dc70a4d5 100644
--- a/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
@@ -701,7 +701,7 @@ local_type_names(#20254,"C",#20000)
 #20255=*
 stmts(#20255,17,#20001,0,"declare ... on f();")
 hasLocation(#20255,#20020)
-stmtContainers(#20255,#20001)
+stmt_containers(#20255,#20001)
 hasDeclareKeyword(#20255)
 #20256=*
 exprs(#20256,78,#20255,-1,"f")
@@ -723,7 +723,7 @@ stmts(#20260,26,#20001,1,"abstrac ... mber;\n}")
 #20261=@"loc,{#10000},4,1,15,1"
 locations_default(#20261,#10000,4,1,15,1)
 hasLocation(#20260,#20261)
-stmtContainers(#20260,#20001)
+stmt_containers(#20260,#20001)
 isAbstractClass(#20260)
 #20262=*
 exprs(#20262,78,#20260,0,"C")
@@ -887,7 +887,7 @@ stmts(#20299,1,#20293,-2,"{}")
 #20300=@"loc,{#10000},11,13,11,14"
 locations_default(#20300,#10000,11,13,11,14)
 hasLocation(#20299,#20300)
-stmtContainers(#20299,#20293)
+stmt_containers(#20299,#20293)
 isMethod(#20290)
 #20301=*
 properties(#20301,#20260,6,8,"abstract x: number;")
@@ -932,14 +932,14 @@ isArgumentsObject(#20310)
 #20311=*
 stmts(#20311,1,#20303,-2,"{}")
 hasLocation(#20311,#20307)
-stmtContainers(#20311,#20303)
+stmt_containers(#20311,#20303)
 isMethod(#20306)
 #20312=*
 stmts(#20312,26,#20001,2,"declare ... mber;\n}")
 #20313=@"loc,{#10000},18,1,29,1"
 locations_default(#20313,#10000,18,1,29,1)
 hasLocation(#20312,#20313)
-stmtContainers(#20312,#20001)
+stmt_containers(#20312,#20001)
 hasDeclareKeyword(#20312)
 isAbstractClass(#20312)
 #20314=*
@@ -1105,7 +1105,7 @@ stmts(#20352,1,#20346,-2,"{}")
 #20353=@"loc,{#10000},25,13,25,14"
 locations_default(#20353,#10000,25,13,25,14)
 hasLocation(#20352,#20353)
-stmtContainers(#20352,#20346)
+stmt_containers(#20352,#20346)
 isMethod(#20343)
 #20354=*
 properties(#20354,#20312,6,8,"abstract x: number;")
@@ -1150,7 +1150,7 @@ isArgumentsObject(#20363)
 #20364=*
 stmts(#20364,1,#20356,-2,"{}")
 hasLocation(#20364,#20360)
-stmtContainers(#20364,#20356)
+stmt_containers(#20364,#20356)
 isMethod(#20359)
 #20365=*
 entry_cfg_node(#20365,#20001)
diff --git a/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap b/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap
index 7fb20a36cd4..16aecabc3ec 100644
--- a/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap
@@ -155,7 +155,7 @@ stmts(#20055,18,#20001,0,"var x = ... v) {}\n}")
 #20056=@"loc,{#10000},1,1,4,1"
 locations_default(#20056,#10000,1,1,4,1)
 hasLocation(#20055,#20056)
-stmtContainers(#20055,#20001)
+stmt_containers(#20055,#20001)
 #20057=*
 exprs(#20057,64,#20055,0,"x = {\n  ... v) {}\n}")
 #20058=@"loc,{#10000},1,5,4,1"
@@ -205,13 +205,13 @@ stmts(#20068,1,#20065,-2,"{return 1}")
 #20069=@"loc,{#10000},2,13,2,22"
 locations_default(#20069,#10000,2,13,2,22)
 hasLocation(#20068,#20069)
-stmtContainers(#20068,#20065)
+stmt_containers(#20068,#20065)
 #20070=*
 stmts(#20070,9,#20068,0,"return 1")
 #20071=@"loc,{#10000},2,14,2,21"
 locations_default(#20071,#10000,2,14,2,21)
 hasLocation(#20070,#20071)
-stmtContainers(#20070,#20065)
+stmt_containers(#20070,#20065)
 #20072=*
 exprs(#20072,3,#20070,0,"1")
 hasLocation(#20072,#20031)
@@ -255,7 +255,7 @@ stmts(#20081,1,#20076,-2,"{}")
 #20082=@"loc,{#10000},3,14,3,15"
 locations_default(#20082,#10000,3,14,3,15)
 hasLocation(#20081,#20082)
-stmtContainers(#20081,#20076)
+stmt_containers(#20081,#20076)
 isMethod(#20073)
 #20083=*
 entry_cfg_node(#20083,#20001)
diff --git a/javascript/extractor/tests/ts/output/trap/omitted.ts.trap b/javascript/extractor/tests/ts/output/trap/omitted.ts.trap
index 5931a6e4cac..bf5c861b72a 100644
--- a/javascript/extractor/tests/ts/output/trap/omitted.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/omitted.ts.trap
@@ -55,7 +55,7 @@ hasLocation(#20001,#20003)
 #20018=*
 stmts(#20018,2,#20001,0,"[, ,1];")
 hasLocation(#20018,#20003)
-stmtContainers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,7,#20018,0,"[, ,1]")
 #20020=@"loc,{#10000},1,1,1,6"
diff --git a/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap b/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap
index 0a414c9da57..99e7d166a78 100644
--- a/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap
@@ -150,7 +150,7 @@ hasLocation(#20001,#20054)
 #20055=*
 stmts(#20055,2,#20001,0,"base?.x.y;")
 hasLocation(#20055,#20003)
-stmtContainers(#20055,#20001)
+stmt_containers(#20055,#20001)
 #20056=*
 exprs(#20056,14,#20055,0,"base?.x.y")
 #20057=@"loc,{#10000},1,1,1,9"
@@ -190,7 +190,7 @@ literals("y","y",#20063)
 #20064=*
 stmts(#20064,2,#20001,1,"base?.(x).y;")
 hasLocation(#20064,#20005)
-stmtContainers(#20064,#20001)
+stmt_containers(#20064,#20001)
 #20065=*
 exprs(#20065,14,#20064,0,"base?.(x).y")
 #20066=@"loc,{#10000},2,1,2,11"
@@ -231,7 +231,7 @@ literals("y","y",#20072)
 #20073=*
 stmts(#20073,2,#20001,2,"base?.[z].y;")
 hasLocation(#20073,#20007)
-stmtContainers(#20073,#20001)
+stmt_containers(#20073,#20001)
 #20074=*
 exprs(#20074,14,#20073,0,"base?.[z].y")
 #20075=@"loc,{#10000},3,1,3,11"
diff --git a/javascript/extractor/tests/ts/output/trap/privateField.ts.trap b/javascript/extractor/tests/ts/output/trap/privateField.ts.trap
index 97567d63457..719dcda296e 100644
--- a/javascript/extractor/tests/ts/output/trap/privateField.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/privateField.ts.trap
@@ -141,7 +141,7 @@ stmts(#20048,26,#20001,0,"class C ... 5;\n }\n}")
 #20049=@"loc,{#10000},1,1,6,1"
 locations_default(#20049,#10000,1,1,6,1)
 hasLocation(#20048,#20049)
-stmtContainers(#20048,#20001)
+stmt_containers(#20048,#20001)
 #20050=*
 exprs(#20050,78,#20048,0,"C")
 hasLocation(#20050,#20017)
@@ -194,13 +194,13 @@ stmts(#20062,1,#20054,-2,"{\n   th ... = 5;\n }")
 #20063=@"loc,{#10000},3,16,5,2"
 locations_default(#20063,#10000,3,16,5,2)
 hasLocation(#20062,#20063)
-stmtContainers(#20062,#20054)
+stmt_containers(#20062,#20054)
 #20064=*
 stmts(#20064,2,#20062,0,"this.#foo = 5;")
 #20065=@"loc,{#10000},4,4,4,17"
 locations_default(#20065,#10000,4,4,4,17)
 hasLocation(#20064,#20065)
-stmtContainers(#20064,#20054)
+stmt_containers(#20064,#20054)
 #20066=*
 exprs(#20066,47,#20064,0,"this.#foo = 5")
 #20067=@"loc,{#10000},4,4,4,16"
diff --git a/javascript/extractor/tests/ts/output/trap/regexp.ts.trap b/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
index 4257db409dd..a1d4da125ee 100644
--- a/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
@@ -28,7 +28,7 @@ hasLocation(#20001,#20003)
 #20007=*
 stmts(#20007,2,#20001,0,"/a/")
 hasLocation(#20007,#20003)
-stmtContainers(#20007,#20001)
+stmt_containers(#20007,#20001)
 #20008=*
 exprs(#20008,5,#20007,0,"/a/")
 hasLocation(#20008,#20003)
diff --git a/javascript/extractor/tests/ts/output/trap/templates.ts.trap b/javascript/extractor/tests/ts/output/trap/templates.ts.trap
index 79202424d36..f027173b2b6 100644
--- a/javascript/extractor/tests/ts/output/trap/templates.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/templates.ts.trap
@@ -63,7 +63,7 @@ hasLocation(#20001,#20020)
 #20021=*
 stmts(#20021,2,#20001,0,"`url(""$ ... age}"")`")
 hasLocation(#20021,#20003)
-stmtContainers(#20021,#20001)
+stmt_containers(#20021,#20001)
 #20022=*
 exprs(#20022,71,#20021,0,"`url(""$ ... age}"")`")
 hasLocation(#20022,#20003)
diff --git a/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap b/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
index 0fed22335c0..8b49717d936 100644
--- a/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
@@ -434,7 +434,7 @@ local_type_names(#20163,"I",#20000)
 #20164=*
 stmts(#20164,17,#20001,0,"functio ... ber) {}")
 hasLocation(#20164,#20003)
-stmtContainers(#20164,#20001)
+stmt_containers(#20164,#20001)
 #20165=*
 exprs(#20165,78,#20164,-1,"declaration")
 hasLocation(#20165,#20033)
@@ -471,11 +471,11 @@ stmts(#20172,1,#20164,-2,"{}")
 #20173=@"loc,{#10000},1,45,1,46"
 locations_default(#20173,#10000,1,45,1,46)
 hasLocation(#20172,#20173)
-stmtContainers(#20172,#20164)
+stmt_containers(#20172,#20164)
 #20174=*
 stmts(#20174,18,#20001,1,"var f = ... ber) {}")
 hasLocation(#20174,#20007)
-stmtContainers(#20174,#20001)
+stmt_containers(#20174,#20001)
 #20175=*
 exprs(#20175,64,#20174,0,"f = fun ... ber) {}")
 #20176=@"loc,{#10000},3,5,3,44"
@@ -527,11 +527,11 @@ stmts(#20186,1,#20178,-2,"{}")
 #20187=@"loc,{#10000},3,43,3,44"
 locations_default(#20187,#10000,3,43,3,44)
 hasLocation(#20186,#20187)
-stmtContainers(#20186,#20178)
+stmt_containers(#20186,#20178)
 #20188=*
 stmts(#20188,17,#20001,2,"declare ... umber);")
 hasLocation(#20188,#20011)
-stmtContainers(#20188,#20001)
+stmt_containers(#20188,#20001)
 hasDeclareKeyword(#20188)
 #20189=*
 exprs(#20189,78,#20188,-1,"ambient")
@@ -571,7 +571,7 @@ stmts(#20197,26,#20001,3,"class C ... C) {}\n}")
 #20198=@"loc,{#10000},7,1,9,1"
 locations_default(#20198,#10000,7,1,9,1)
 hasLocation(#20197,#20198)
-stmtContainers(#20197,#20001)
+stmt_containers(#20197,#20001)
 #20199=*
 exprs(#20199,78,#20197,0,"C")
 hasLocation(#20199,#20115)
@@ -618,7 +618,7 @@ stmts(#20208,1,#20204,-2,"{}")
 #20209=@"loc,{#10000},8,19,8,20"
 locations_default(#20209,#10000,8,19,8,20)
 hasLocation(#20208,#20209)
-stmtContainers(#20208,#20204)
+stmt_containers(#20208,#20204)
 isMethod(#20201)
 #20210=*
 properties(#20210,#20197,3,0,"constructor() {}")
@@ -646,14 +646,14 @@ isArgumentsObject(#20215)
 #20216=*
 stmts(#20216,1,#20213,-2,"{}")
 hasLocation(#20216,#20211)
-stmtContainers(#20216,#20213)
+stmt_containers(#20216,#20213)
 isMethod(#20210)
 #20217=*
 stmts(#20217,34,#20001,4,"interfa ... : I);\n}")
 #20218=@"loc,{#10000},11,1,13,1"
 locations_default(#20218,#10000,11,1,13,1)
 hasLocation(#20217,#20218)
-stmtContainers(#20217,#20001)
+stmt_containers(#20217,#20001)
 #20219=*
 typeexprs(#20219,1,#20217,0,"I")
 hasLocation(#20219,#20138)
diff --git a/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap b/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap
index bf886cb2a8a..839ef912d09 100644
--- a/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap
@@ -171,7 +171,7 @@ stmts(#20059,17,#20001,0,"functio ... ;\n  }\n}")
 #20060=@"loc,{#10000},1,1,7,1"
 locations_default(#20060,#10000,1,1,7,1)
 hasLocation(#20059,#20060)
-stmtContainers(#20059,#20001)
+stmt_containers(#20059,#20001)
 #20061=*
 exprs(#20061,78,#20059,-1,"foo")
 hasLocation(#20061,#20019)
@@ -192,13 +192,13 @@ stmts(#20065,1,#20059,-2,"{\n  var ... ;\n  }\n}")
 #20066=@"loc,{#10000},1,16,7,1"
 locations_default(#20066,#10000,1,16,7,1)
 hasLocation(#20065,#20066)
-stmtContainers(#20065,#20059)
+stmt_containers(#20065,#20059)
 #20067=*
 stmts(#20067,18,#20065,0,"var x = 5;")
 #20068=@"loc,{#10000},2,3,2,12"
 locations_default(#20068,#10000,2,3,2,12)
 hasLocation(#20067,#20068)
-stmtContainers(#20067,#20059)
+stmt_containers(#20067,#20059)
 #20069=*
 exprs(#20069,64,#20067,0,"x = 5")
 #20070=@"loc,{#10000},2,7,2,11"
@@ -224,25 +224,25 @@ stmts(#20073,11,#20065,1,"try {\n  ...  x;\n  }")
 #20074=@"loc,{#10000},3,3,6,3"
 locations_default(#20074,#10000,3,3,6,3)
 hasLocation(#20073,#20074)
-stmtContainers(#20073,#20059)
+stmt_containers(#20073,#20059)
 #20075=*
 stmts(#20075,1,#20073,0,"{\n  }")
 #20076=@"loc,{#10000},3,7,4,3"
 locations_default(#20076,#10000,3,7,4,3)
 hasLocation(#20075,#20076)
-stmtContainers(#20075,#20059)
+stmt_containers(#20075,#20059)
 #20077=*
 stmts(#20077,1,#20073,-1,"{\n    return x;\n  }")
 #20078=@"loc,{#10000},4,13,6,3"
 locations_default(#20078,#10000,4,13,6,3)
 hasLocation(#20077,#20078)
-stmtContainers(#20077,#20059)
+stmt_containers(#20077,#20059)
 #20079=*
 stmts(#20079,9,#20077,0,"return x;")
 #20080=@"loc,{#10000},5,5,5,13"
 locations_default(#20080,#10000,5,5,5,13)
 hasLocation(#20079,#20080)
-stmtContainers(#20079,#20059)
+stmt_containers(#20079,#20059)
 #20081=*
 exprs(#20081,79,#20079,0,"x")
 hasLocation(#20081,#20049)
diff --git a/javascript/extractor/tests/ts/output/trap/tsx.tsx.trap b/javascript/extractor/tests/ts/output/trap/tsx.tsx.trap
index d7070160754..2f0e4a6d576 100644
--- a/javascript/extractor/tests/ts/output/trap/tsx.tsx.trap
+++ b/javascript/extractor/tests/ts/output/trap/tsx.tsx.trap
@@ -210,7 +210,7 @@ stmts(#20077,2,#20001,0,"<div cl ... \n</div>")
 #20078=@"loc,{#10000},1,1,4,6"
 locations_default(#20078,#10000,1,1,4,6)
 hasLocation(#20077,#20078)
-stmtContainers(#20077,#20001)
+stmt_containers(#20077,#20001)
 #20079=*
 exprs(#20079,89,#20077,0,"<div cl ... \n</div>")
 hasLocation(#20079,#20078)
diff --git a/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap b/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
index a14ecc2c099..568316b3a3f 100644
--- a/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
@@ -2510,7 +2510,7 @@ local_type_names(#20980,"ThisTypes",#20000)
 #20981=*
 stmts(#20981,34,#20001,0,"interfa ... umber }")
 hasLocation(#20981,#20003)
-stmtContainers(#20981,#20001)
+stmt_containers(#20981,#20001)
 #20982=*
 typeexprs(#20982,1,#20981,0,"Point")
 hasLocation(#20982,#20135)
@@ -2559,7 +2559,7 @@ stmts(#20991,31,#20001,1,"namespa ... T> {}\n}")
 #20992=@"loc,{#10000},3,1,6,1"
 locations_default(#20992,#10000,3,1,6,1)
 hasLocation(#20991,#20992)
-stmtContainers(#20991,#20001)
+stmt_containers(#20991,#20001)
 #20993=*
 exprs(#20993,78,#20991,-1,"N")
 hasLocation(#20993,#20157)
@@ -2580,13 +2580,13 @@ stmts(#20997,30,#20991,0,"export  ... ce I {}")
 #20998=@"loc,{#10000},4,3,4,23"
 locations_default(#20998,#10000,4,3,4,23)
 hasLocation(#20997,#20998)
-stmtContainers(#20997,#20991)
+stmt_containers(#20997,#20991)
 #20999=*
 stmts(#20999,34,#20997,-1,"interface I {}")
 #21000=@"loc,{#10000},4,10,4,23"
 locations_default(#21000,#10000,4,10,4,23)
 hasLocation(#20999,#21000)
-stmtContainers(#20999,#20991)
+stmt_containers(#20999,#20991)
 #21001=*
 typeexprs(#21001,1,#20999,0,"I")
 hasLocation(#21001,#20165)
@@ -2599,13 +2599,13 @@ stmts(#21002,30,#20991,1,"export  ... J<T> {}")
 #21003=@"loc,{#10000},5,3,5,26"
 locations_default(#21003,#10000,5,3,5,26)
 hasLocation(#21002,#21003)
-stmtContainers(#21002,#20991)
+stmt_containers(#21002,#20991)
 #21004=*
 stmts(#21004,34,#21002,-1,"interface J<T> {}")
 #21005=@"loc,{#10000},5,10,5,26"
 locations_default(#21005,#10000,5,10,5,26)
 hasLocation(#21004,#21005)
-stmtContainers(#21004,#20991)
+stmt_containers(#21004,#20991)
 #21006=*
 scopes(#21006,11)
 scopenodes(#21004,#21006)
@@ -2634,7 +2634,7 @@ typedecl(#21010,#20996)
 #21011=*
 stmts(#21011,18,#20001,2,"var any ...    any;")
 hasLocation(#21011,#20017)
-stmtContainers(#21011,#20001)
+stmt_containers(#21011,#20001)
 #21012=*
 exprs(#21012,64,#21011,0,"anyVar: ...     any")
 #21013=@"loc,{#10000},8,5,8,27"
@@ -2658,7 +2658,7 @@ literals("any","any",#21015)
 #21016=*
 stmts(#21016,18,#20001,3,"var obj ... object;")
 hasLocation(#21016,#20019)
-stmtContainers(#21016,#20001)
+stmt_containers(#21016,#20001)
 #21017=*
 exprs(#21017,64,#21016,0,"objectV ...  object")
 #21018=@"loc,{#10000},9,5,9,30"
@@ -2682,7 +2682,7 @@ literals("object","object",#21020)
 #21021=*
 stmts(#21021,18,#20001,4,"var num ... number;")
 hasLocation(#21021,#20021)
-stmtContainers(#21021,#20001)
+stmt_containers(#21021,#20001)
 #21022=*
 exprs(#21022,64,#21021,0,"numberV ...  number")
 #21023=@"loc,{#10000},10,5,10,30"
@@ -2706,7 +2706,7 @@ literals("number","number",#21025)
 #21026=*
 stmts(#21026,18,#20001,5,"var str ... string;")
 hasLocation(#21026,#20023)
-stmtContainers(#21026,#20001)
+stmt_containers(#21026,#20001)
 #21027=*
 exprs(#21027,64,#21026,0,"stringV ...  string")
 #21028=@"loc,{#10000},11,5,11,30"
@@ -2730,7 +2730,7 @@ literals("string","string",#21030)
 #21031=*
 stmts(#21031,18,#20001,6,"var boo ... oolean;")
 hasLocation(#21031,#20025)
-stmtContainers(#21031,#20001)
+stmt_containers(#21031,#20001)
 #21032=*
 exprs(#21032,64,#21031,0,"boolean ... boolean")
 #21033=@"loc,{#10000},12,5,12,31"
@@ -2754,7 +2754,7 @@ literals("boolean","boolean",#21035)
 #21036=*
 stmts(#21036,18,#20001,7,"var nul ...   null;")
 hasLocation(#21036,#20027)
-stmtContainers(#21036,#20001)
+stmt_containers(#21036,#20001)
 #21037=*
 exprs(#21037,64,#21036,0,"nullVar ...    null")
 #21038=@"loc,{#10000},13,5,13,28"
@@ -2778,7 +2778,7 @@ literals("null","null",#21040)
 #21041=*
 stmts(#21041,18,#20001,8,"var und ... efined;")
 hasLocation(#21041,#20029)
-stmtContainers(#21041,#20001)
+stmt_containers(#21041,#20001)
 #21042=*
 exprs(#21042,64,#21041,0,"undefin ... defined")
 #21043=@"loc,{#10000},14,5,14,33"
@@ -2802,7 +2802,7 @@ literals("undefined","undefined",#21045)
 #21046=*
 stmts(#21046,18,#20001,9,"var voi ...   void;")
 hasLocation(#21046,#20031)
-stmtContainers(#21046,#20001)
+stmt_containers(#21046,#20001)
 #21047=*
 exprs(#21047,64,#21046,0,"voidVar ...    void")
 #21048=@"loc,{#10000},15,5,15,28"
@@ -2826,7 +2826,7 @@ literals("void","void",#21050)
 #21051=*
 stmts(#21051,18,#20001,10,"var nev ...  never;")
 hasLocation(#21051,#20033)
-stmtContainers(#21051,#20001)
+stmt_containers(#21051,#20001)
 #21052=*
 exprs(#21052,64,#21051,0,"neverVa ...   never")
 #21053=@"loc,{#10000},16,5,16,29"
@@ -2850,7 +2850,7 @@ literals("never","never",#21055)
 #21056=*
 stmts(#21056,18,#20001,11,"var sym ... symbol;")
 hasLocation(#21056,#20035)
-stmtContainers(#21056,#20001)
+stmt_containers(#21056,#20001)
 #21057=*
 exprs(#21057,64,#21056,0,"symbolV ...  symbol")
 #21058=@"loc,{#10000},17,5,17,30"
@@ -2874,7 +2874,7 @@ literals("symbol","symbol",#21060)
 #21061=*
 stmts(#21061,18,#20001,12,"var obj ... mber; }")
 hasLocation(#21061,#20037)
-stmtContainers(#21061,#20001)
+stmt_containers(#21061,#20001)
 #21062=*
 exprs(#21062,64,#21061,0,"objectV ... mber; }")
 #21063=@"loc,{#10000},18,5,18,38"
@@ -2917,7 +2917,7 @@ literals("number","number",#21070)
 #21071=*
 stmts(#21071,18,#20001,13,"var nes ... ber } }")
 hasLocation(#21071,#20039)
-stmtContainers(#21071,#20001)
+stmt_containers(#21071,#20001)
 #21072=*
 exprs(#21072,64,#21071,0,"nestedO ... ber } }")
 #21073=@"loc,{#10000},19,5,19,44"
@@ -2979,7 +2979,7 @@ literals("number","number",#21085)
 #21086=*
 stmts(#21086,18,#20001,14,"var arr ... umber[]")
 hasLocation(#21086,#20041)
-stmtContainers(#21086,#20001)
+stmt_containers(#21086,#20001)
 #21087=*
 exprs(#21087,64,#21086,0,"arrayVa ... umber[]")
 #21088=@"loc,{#10000},20,5,20,32"
@@ -3010,7 +3010,7 @@ literals("number","number",#21092)
 #21093=*
 stmts(#21093,18,#20001,15,"var str ...  String")
 hasLocation(#21093,#20043)
-stmtContainers(#21093,#20001)
+stmt_containers(#21093,#20001)
 #21094=*
 exprs(#21094,64,#21093,0,"stringO ...  String")
 #21095=@"loc,{#10000},21,5,21,30"
@@ -3034,7 +3034,7 @@ literals("String","String",#21097)
 #21098=*
 stmts(#21098,18,#20001,16,"var poi ...   Point")
 hasLocation(#21098,#20045)
-stmtContainers(#21098,#20001)
+stmt_containers(#21098,#20001)
 #21099=*
 exprs(#21099,64,#21098,0,"pointVa ...   Point")
 #21100=@"loc,{#10000},22,5,22,29"
@@ -3059,7 +3059,7 @@ typebind(#21102,#20975)
 #21103=*
 stmts(#21103,18,#20001,17,"var raw ... unction")
 hasLocation(#21103,#20047)
-stmtContainers(#21103,#20001)
+stmt_containers(#21103,#20001)
 #21104=*
 exprs(#21104,64,#21103,0,"rawFunc ... unction")
 #21105=@"loc,{#10000},23,5,23,32"
@@ -3083,7 +3083,7 @@ literals("Function","Function",#21107)
 #21108=*
 stmts(#21108,18,#20001,18,"var var ...     x11")
 hasLocation(#21108,#20049)
-stmtContainers(#21108,#20001)
+stmt_containers(#21108,#20001)
 #21109=*
 exprs(#21109,64,#21108,0,"varVar: ...     x11")
 #21110=@"loc,{#10000},24,5,24,27"
@@ -3107,7 +3107,7 @@ literals("x11","x11",#21112)
 #21113=*
 stmts(#21113,18,#20001,19,"var gen ... number>")
 hasLocation(#21113,#20051)
-stmtContainers(#21113,#20001)
+stmt_containers(#21113,#20001)
 #21114=*
 exprs(#21114,64,#21113,0,"generic ... number>")
 #21115=@"loc,{#10000},25,5,25,37"
@@ -3144,7 +3144,7 @@ literals("number","number",#21120)
 #21121=*
 stmts(#21121,18,#20001,20,"var nes ... umber>>")
 hasLocation(#21121,#20053)
-stmtContainers(#21121,#20001)
+stmt_containers(#21121,#20001)
 #21122=*
 exprs(#21122,64,#21121,0,"nestedG ... umber>>")
 #21123=@"loc,{#10000},26,5,26,40"
@@ -3194,7 +3194,7 @@ literals("number","number",#21131)
 #21132=*
 stmts(#21132,18,#20001,21,"var cal ... number;")
 hasLocation(#21132,#20055)
-stmtContainers(#21132,#20001)
+stmt_containers(#21132,#20001)
 #21133=*
 exprs(#21133,64,#21132,0,"callSig ...  number")
 #21134=@"loc,{#10000},27,5,27,36"
@@ -3236,7 +3236,7 @@ literals("number","number",#21141)
 #21142=*
 stmts(#21142,18,#20001,22,"var con ...  Point;")
 hasLocation(#21142,#20057)
-stmtContainers(#21142,#20001)
+stmt_containers(#21142,#20001)
 #21143=*
 exprs(#21143,64,#21142,0,"constru ... > Point")
 #21144=@"loc,{#10000},28,5,28,39"
@@ -3279,7 +3279,7 @@ typebind(#21151,#20975)
 #21152=*
 stmts(#21152,18,#20001,23,"var cal ... > void;")
 hasLocation(#21152,#20059)
-stmtContainers(#21152,#20001)
+stmt_containers(#21152,#20001)
 #21153=*
 exprs(#21153,64,#21152,0,"callSig ... => void")
 #21154=@"loc,{#10000},29,5,29,34"
@@ -3321,7 +3321,7 @@ literals("void","void",#21161)
 #21162=*
 stmts(#21162,18,#20001,24,"var cal ...  never;")
 hasLocation(#21162,#20061)
-stmtContainers(#21162,#20001)
+stmt_containers(#21162,#20001)
 #21163=*
 exprs(#21163,64,#21162,0,"callSig ... > never")
 #21164=@"loc,{#10000},30,5,30,35"
@@ -3363,7 +3363,7 @@ literals("never","never",#21171)
 #21172=*
 stmts(#21172,18,#20001,25,"var uni ... string;")
 hasLocation(#21172,#20063)
-stmtContainers(#21172,#20001)
+stmt_containers(#21172,#20001)
 #21173=*
 exprs(#21173,64,#21172,0,"unionVa ...  string")
 #21174=@"loc,{#10000},31,5,31,39"
@@ -3400,7 +3400,7 @@ literals("string","string",#21179)
 #21180=*
 stmts(#21180,18,#20001,26,"var str ... teral"";")
 hasLocation(#21180,#20065)
-stmtContainers(#21180,#20001)
+stmt_containers(#21180,#20001)
 #21181=*
 exprs(#21181,64,#21180,0,"stringL ... iteral""")
 #21182=@"loc,{#10000},32,5,32,33"
@@ -3424,7 +3424,7 @@ literals("literal","""literal""",#21184)
 #21185=*
 stmts(#21185,18,#20001,27,"var tru ...   true;")
 hasLocation(#21185,#20067)
-stmtContainers(#21185,#20001)
+stmt_containers(#21185,#20001)
 #21186=*
 exprs(#21186,64,#21185,0,"trueVar ...    true")
 #21187=@"loc,{#10000},33,5,33,28"
@@ -3448,7 +3448,7 @@ literals("true","true",#21189)
 #21190=*
 stmts(#21190,18,#20001,28,"var fal ...  false;")
 hasLocation(#21190,#20069)
-stmtContainers(#21190,#20001)
+stmt_containers(#21190,#20001)
 #21191=*
 exprs(#21191,64,#21190,0,"falseVa ...   false")
 #21192=@"loc,{#10000},34,5,34,29"
@@ -3472,7 +3472,7 @@ literals("false","false",#21194)
 #21195=*
 stmts(#21195,18,#20001,29,"var int ...    100;")
 hasLocation(#21195,#20071)
-stmtContainers(#21195,#20001)
+stmt_containers(#21195,#20001)
 #21196=*
 exprs(#21196,64,#21195,0,"intLite ...     100")
 #21197=@"loc,{#10000},35,5,35,27"
@@ -3496,7 +3496,7 @@ literals("100","100",#21199)
 #21200=*
 stmts(#21200,18,#20001,30,"var dou ... 100.50;")
 hasLocation(#21200,#20073)
-stmtContainers(#21200,#20001)
+stmt_containers(#21200,#20001)
 #21201=*
 exprs(#21201,64,#21200,0,"doubleL ...  100.50")
 #21202=@"loc,{#10000},36,5,36,30"
@@ -3520,7 +3520,7 @@ literals("100.5","100.50",#21204)
 #21205=*
 stmts(#21205,18,#20001,31,"var tup ... number]")
 hasLocation(#21205,#20075)
-stmtContainers(#21205,#20001)
+stmt_containers(#21205,#20001)
 #21206=*
 exprs(#21206,64,#21205,0,"tupleVa ... number]")
 #21207=@"loc,{#10000},37,5,37,40"
@@ -3557,7 +3557,7 @@ literals("number","number",#21212)
 #21213=*
 stmts(#21213,18,#20001,32,"var lon ... "" | [3]")
 hasLocation(#21213,#20077)
-stmtContainers(#21213,#20001)
+stmt_containers(#21213,#20001)
 #21214=*
 exprs(#21214,64,#21213,0,"longUni ... "" | [3]")
 #21215=@"loc,{#10000},38,5,38,46"
@@ -3613,7 +3613,7 @@ literals("3","3",#21224)
 #21225=*
 stmts(#21225,18,#20001,33,"var int ...  & Bar;")
 hasLocation(#21225,#20079)
-stmtContainers(#21225,#20001)
+stmt_containers(#21225,#20001)
 #21226=*
 exprs(#21226,64,#21225,0,"interse ... o & Bar")
 #21227=@"loc,{#10000},39,5,39,33"
@@ -3650,7 +3650,7 @@ literals("Bar","Bar",#21232)
 #21233=*
 stmts(#21233,18,#20001,34,"var gen ... ) => T;")
 hasLocation(#21233,#20081)
-stmtContainers(#21233,#20001)
+stmt_containers(#21233,#20001)
 #21234=*
 exprs(#21234,64,#21233,0,"generic ... T) => T")
 #21235=@"loc,{#10000},40,5,40,38"
@@ -3719,7 +3719,7 @@ typedecl(#21248,#21241)
 #21249=*
 stmts(#21249,18,#20001,35,"var gen ... ) => T;")
 hasLocation(#21249,#20083)
-stmtContainers(#21249,#20001)
+stmt_containers(#21249,#20001)
 #21250=*
 exprs(#21250,64,#21249,0,"generic ... T) => T")
 #21251=@"loc,{#10000},41,5,41,46"
@@ -3788,7 +3788,7 @@ typedecl(#21264,#21257)
 #21265=*
 stmts(#21265,18,#20001,36,"var key ... f Point")
 hasLocation(#21265,#20085)
-stmtContainers(#21265,#20001)
+stmt_containers(#21265,#20001)
 #21266=*
 exprs(#21266,64,#21265,0,"keyofVa ... f Point")
 #21267=@"loc,{#10000},42,5,42,35"
@@ -3820,7 +3820,7 @@ typebind(#21271,#20975)
 #21272=*
 stmts(#21272,18,#20001,37,"var ind ... nt[""x""]")
 hasLocation(#21272,#20087)
-stmtContainers(#21272,#20001)
+stmt_containers(#21272,#20001)
 #21273=*
 exprs(#21273,64,#21272,0,"indexed ... nt[""x""]")
 #21274=@"loc,{#10000},43,5,43,34"
@@ -3858,7 +3858,7 @@ literals("x","""x""",#21279)
 #21280=*
 stmts(#21280,18,#20001,38,"var typ ... eof x31")
 hasLocation(#21280,#20089)
-stmtContainers(#21280,#20001)
+stmt_containers(#21280,#20001)
 #21281=*
 exprs(#21281,64,#21280,0,"typeofV ... eof x31")
 #21282=@"loc,{#10000},44,5,44,34"
@@ -3892,7 +3892,7 @@ bind(#21286,#21287)
 #21288=*
 stmts(#21288,18,#20001,39,"var map ... : any }")
 hasLocation(#21288,#20091)
-stmtContainers(#21288,#20001)
+stmt_containers(#21288,#20001)
 #21289=*
 exprs(#21289,64,#21288,0,"mappedV ... : any }")
 #21290=@"loc,{#10000},45,5,45,51"
@@ -3957,7 +3957,7 @@ literals("any","any",#21302)
 #21303=*
 stmts(#21303,18,#20001,40,"var par ... umber);")
 hasLocation(#21303,#20093)
-stmtContainers(#21303,#20001)
+stmt_containers(#21303,#20001)
 #21304=*
 exprs(#21304,64,#21303,0,"parenth ... number)")
 #21305=@"loc,{#10000},46,5,46,32"
@@ -3988,7 +3988,7 @@ literals("number","number",#21309)
 #21310=*
 stmts(#21310,18,#20001,41,"var nam ...    N.I;")
 hasLocation(#21310,#20095)
-stmtContainers(#21310,#20001)
+stmt_containers(#21310,#20001)
 #21311=*
 exprs(#21311,64,#21310,0,"namespa ... :   N.I")
 #21312=@"loc,{#10000},47,5,47,27"
@@ -4026,7 +4026,7 @@ literals("I","I",#21317)
 #21318=*
 stmts(#21318,18,#20001,42,"var nam ... umber>;")
 hasLocation(#21318,#20097)
-stmtContainers(#21318,#20001)
+stmt_containers(#21318,#20001)
 #21319=*
 exprs(#21319,64,#21318,0,"namespa ... number>")
 #21320=@"loc,{#10000},48,5,48,40"
@@ -4079,7 +4079,7 @@ stmts(#21329,34,#20001,43,"interfa ... ): T;\n}")
 #21330=@"loc,{#10000},50,1,53,1"
 locations_default(#21330,#10000,50,1,53,1)
 hasLocation(#21329,#21330)
-stmtContainers(#21329,#20001)
+stmt_containers(#21329,#20001)
 #21331=*
 scopes(#21331,11)
 scopenodes(#21329,#21331)
@@ -4174,7 +4174,7 @@ stmts(#21350,26,#20001,44,"abstrac ... ): T;\n}")
 #21351=@"loc,{#10000},54,1,57,1"
 locations_default(#21351,#10000,54,1,57,1)
 hasLocation(#21350,#21351)
-stmtContainers(#21350,#20001)
+stmt_containers(#21350,#20001)
 isAbstractClass(#21350)
 #21352=*
 exprs(#21352,78,#21350,0,"GenericClass")
@@ -4311,12 +4311,12 @@ isArgumentsObject(#21380)
 #21381=*
 stmts(#21381,1,#21363,-2,"{}")
 hasLocation(#21381,#21377)
-stmtContainers(#21381,#21363)
+stmt_containers(#21381,#21363)
 isMethod(#21376)
 #21382=*
 stmts(#21382,26,#20001,45,"class Fish {}")
 hasLocation(#21382,#20119)
-stmtContainers(#21382,#20001)
+stmt_containers(#21382,#20001)
 #21383=*
 exprs(#21383,78,#21382,0,"Fish")
 hasLocation(#21383,#20850)
@@ -4355,12 +4355,12 @@ isArgumentsObject(#21390)
 #21391=*
 stmts(#21391,1,#21388,-2,"{}")
 hasLocation(#21391,#21386)
-stmtContainers(#21391,#21388)
+stmt_containers(#21391,#21388)
 isMethod(#21385)
 #21392=*
 stmts(#21392,26,#20001,46,"class Bird {}")
 hasLocation(#21392,#20121)
-stmtContainers(#21392,#20001)
+stmt_containers(#21392,#20001)
 #21393=*
 exprs(#21393,78,#21392,0,"Bird")
 hasLocation(#21393,#20858)
@@ -4399,12 +4399,12 @@ isArgumentsObject(#21400)
 #21401=*
 stmts(#21401,1,#21398,-2,"{}")
 hasLocation(#21401,#21396)
-stmtContainers(#21401,#21398)
+stmt_containers(#21401,#21398)
 isMethod(#21395)
 #21402=*
 stmts(#21402,17,#20001,47,"functio ... Fish {}")
 hasLocation(#21402,#20123)
-stmtContainers(#21402,#20001)
+stmt_containers(#21402,#20001)
 #21403=*
 exprs(#21403,78,#21402,-1,"isFish")
 hasLocation(#21403,#20866)
@@ -4467,13 +4467,13 @@ stmts(#21416,1,#21402,-2,"{}")
 #21417=@"loc,{#10000},61,49,61,50"
 locations_default(#21417,#10000,61,49,61,50)
 hasLocation(#21416,#21417)
-stmtContainers(#21416,#21402)
+stmt_containers(#21416,#21402)
 #21418=*
 stmts(#21418,26,#20001,48,"class T ... is; }\n}")
 #21419=@"loc,{#10000},63,1,65,1"
 locations_default(#21419,#10000,63,1,65,1)
 hasLocation(#21418,#21419)
-stmtContainers(#21418,#20001)
+stmt_containers(#21418,#20001)
 #21420=*
 exprs(#21420,78,#21418,0,"ThisTypes")
 hasLocation(#21420,#20896)
@@ -4532,13 +4532,13 @@ stmts(#21432,1,#21425,-2,"{ return this; }")
 #21433=@"loc,{#10000},64,24,64,39"
 locations_default(#21433,#10000,64,24,64,39)
 hasLocation(#21432,#21433)
-stmtContainers(#21432,#21425)
+stmt_containers(#21432,#21425)
 #21434=*
 stmts(#21434,9,#21432,0,"return this;")
 #21435=@"loc,{#10000},64,26,64,37"
 locations_default(#21435,#10000,64,26,64,37)
 hasLocation(#21434,#21435)
-stmtContainers(#21434,#21425)
+stmt_containers(#21434,#21425)
 #21436=*
 exprs(#21436,6,#21434,0,"this")
 hasLocation(#21436,#20920)
@@ -4571,7 +4571,7 @@ isArgumentsObject(#21442)
 #21443=*
 stmts(#21443,1,#21440,-2,"{}")
 hasLocation(#21443,#21438)
-stmtContainers(#21443,#21440)
+stmt_containers(#21443,#21440)
 isMethod(#21437)
 #21444=*
 entry_cfg_node(#21444,#20001)
diff --git a/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap b/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap
index 91b53c070be..7dadaaa22e3 100644
--- a/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap
@@ -55,7 +55,7 @@ variables(#20017,"才能ソЫⅨ蒤郳र्क्ड्राüışğİliيون
 #20018=*
 stmts(#20018,18,#20001,0,"var \u624d\u80fd\u30bd ... 23 = 1;")
 hasLocation(#20018,#20003)
-stmtContainers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,64,#20018,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... 123 = 1")
 #20020=@"loc,{#10000},1,5,1,81"
diff --git a/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap b/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap
index e40a2a13915..12f3bfad748 100644
--- a/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap
@@ -588,7 +588,7 @@ stmts(#20212,31,#20001,0,"namespa ... lock]\n}")
 #20213=@"loc,{#10000},1,1,25,1"
 locations_default(#20213,#10000,1,1,25,1)
 hasLocation(#20212,#20213)
-stmtContainers(#20212,#20001)
+stmt_containers(#20212,#20001)
 #20214=*
 exprs(#20214,78,#20212,-1,"Wrapper")
 hasLocation(#20214,#20059)
@@ -626,7 +626,7 @@ stmts(#20226,31,#20212,0,"namespace Empty {}")
 #20227=@"loc,{#10000},3,3,3,20"
 locations_default(#20227,#10000,3,3,3,20)
 hasLocation(#20226,#20227)
-stmtContainers(#20226,#20212)
+stmt_containers(#20226,#20212)
 #20228=*
 exprs(#20228,78,#20226,-1,"Empty")
 hasLocation(#20228,#20065)
@@ -643,7 +643,7 @@ stmts(#20230,31,#20212,1,"namespa ...  */\n  }")
 #20231=@"loc,{#10000},4,3,7,3"
 locations_default(#20231,#10000,4,3,7,3)
 hasLocation(#20230,#20231)
-stmtContainers(#20230,#20212)
+stmt_containers(#20230,#20212)
 #20232=*
 exprs(#20232,78,#20230,-1,"Comments")
 hasLocation(#20232,#20073)
@@ -660,7 +660,7 @@ stmts(#20234,31,#20212,2,"namespa ...  {}\n  }")
 #20235=@"loc,{#10000},8,3,10,3"
 locations_default(#20235,#10000,8,3,10,3)
 hasLocation(#20234,#20235)
-stmtContainers(#20234,#20212)
+stmt_containers(#20234,#20212)
 #20236=*
 exprs(#20236,78,#20234,-1,"Outer")
 hasLocation(#20236,#20081)
@@ -679,7 +679,7 @@ stmts(#20239,31,#20234,0,"namespace Inner {}")
 #20240=@"loc,{#10000},9,5,9,22"
 locations_default(#20240,#10000,9,5,9,22)
 hasLocation(#20239,#20240)
-stmtContainers(#20239,#20234)
+stmt_containers(#20239,#20234)
 #20241=*
 exprs(#20241,78,#20239,-1,"Inner")
 hasLocation(#20241,#20087)
@@ -696,7 +696,7 @@ stmts(#20243,31,#20212,3,"namespa ...  {}\n  }")
 #20244=@"loc,{#10000},11,3,13,3"
 locations_default(#20244,#10000,11,3,13,3)
 hasLocation(#20243,#20244)
-stmtContainers(#20243,#20212)
+stmt_containers(#20243,#20212)
 #20245=*
 exprs(#20245,78,#20243,-1,"Outer2")
 hasLocation(#20245,#20097)
@@ -715,13 +715,13 @@ stmts(#20248,30,#20243,0,"export  ... nner {}")
 #20249=@"loc,{#10000},12,5,12,29"
 locations_default(#20249,#10000,12,5,12,29)
 hasLocation(#20248,#20249)
-stmtContainers(#20248,#20243)
+stmt_containers(#20248,#20243)
 #20250=*
 stmts(#20250,31,#20248,-1,"namespace Inner {}")
 #20251=@"loc,{#10000},12,12,12,29"
 locations_default(#20251,#10000,12,12,12,29)
 hasLocation(#20250,#20251)
-stmtContainers(#20250,#20243)
+stmt_containers(#20250,#20243)
 #20252=*
 exprs(#20252,78,#20250,-1,"Inner")
 hasLocation(#20252,#20105)
@@ -738,7 +738,7 @@ stmts(#20254,31,#20212,4,"namespa ...   }\n  }")
 #20255=@"loc,{#10000},14,3,19,3"
 locations_default(#20255,#10000,14,3,19,3)
 hasLocation(#20254,#20255)
-stmtContainers(#20254,#20212)
+stmt_containers(#20254,#20212)
 #20256=*
 exprs(#20256,78,#20254,-1,"Interfaces")
 hasLocation(#20256,#20115)
@@ -757,7 +757,7 @@ stmts(#20259,34,#20254,0,"interfa ... ;\n    }")
 #20260=@"loc,{#10000},15,5,18,5"
 locations_default(#20260,#10000,15,5,18,5)
 hasLocation(#20259,#20260)
-stmtContainers(#20259,#20254)
+stmt_containers(#20259,#20254)
 #20261=*
 typeexprs(#20261,1,#20259,0,"I")
 hasLocation(#20261,#20121)
@@ -818,7 +818,7 @@ stmts(#20273,31,#20212,5,"namespa ... ent {;}")
 #20274=@"loc,{#10000},21,3,21,30"
 locations_default(#20274,#10000,21,3,21,30)
 hasLocation(#20273,#20274)
-stmtContainers(#20273,#20212)
+stmt_containers(#20273,#20212)
 #20275=*
 exprs(#20275,78,#20273,-1,"EmptyStatement")
 hasLocation(#20275,#20151)
@@ -834,14 +834,14 @@ scopenesting(#20276,#20215)
 #20277=*
 stmts(#20277,0,#20273,0,";")
 hasLocation(#20277,#20155)
-stmtContainers(#20277,#20273)
+stmt_containers(#20277,#20273)
 isInstantiated(#20273)
 #20278=*
 stmts(#20278,31,#20212,6,"namespa ... ck {{}}")
 #20279=@"loc,{#10000},22,3,22,27"
 locations_default(#20279,#10000,22,3,22,27)
 hasLocation(#20278,#20279)
-stmtContainers(#20278,#20212)
+stmt_containers(#20278,#20212)
 #20280=*
 exprs(#20280,78,#20278,-1,"EmptyBlock")
 hasLocation(#20280,#20161)
@@ -859,14 +859,14 @@ stmts(#20282,1,#20278,0,"{}")
 #20283=@"loc,{#10000},22,25,22,26"
 locations_default(#20283,#10000,22,25,22,26)
 hasLocation(#20282,#20283)
-stmtContainers(#20282,#20278)
+stmt_containers(#20282,#20278)
 isInstantiated(#20278)
 #20284=*
 stmts(#20284,18,#20212,7,"var x = ... yBlock]")
 #20285=@"loc,{#10000},24,3,24,82"
 locations_default(#20285,#10000,24,3,24,82)
 hasLocation(#20284,#20285)
-stmtContainers(#20284,#20212)
+stmt_containers(#20284,#20212)
 #20286=*
 exprs(#20286,64,#20284,0,"x = [Em ... yBlock]")
 #20287=@"loc,{#10000},24,7,24,82"
diff --git a/javascript/extractor/tests/v8/output/trap/tst.js.trap b/javascript/extractor/tests/v8/output/trap/tst.js.trap
index 17368a3e427..8fdd7f6a612 100644
--- a/javascript/extractor/tests/v8/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/v8/output/trap/tst.js.trap
@@ -108,7 +108,7 @@ hasLocation(#20001,#20038)
 #20039=*
 stmts(#20039,2,#20001,0,"%CheckI ... ping();")
 hasLocation(#20039,#20003)
-stmtContainers(#20039,#20001)
+stmt_containers(#20039,#20001)
 #20040=*
 exprs(#20040,13,#20039,0,"%CheckI ... pping()")
 #20041=@"loc,{#10000},1,1,1,23"
@@ -130,7 +130,7 @@ bind(#20042,#20044)
 #20045=*
 stmts(#20045,2,#20001,1,"a%%NumberAdd(1, 2);")
 hasLocation(#20045,#20005)
-stmtContainers(#20045,#20001)
+stmt_containers(#20045,#20001)
 #20046=*
 exprs(#20046,38,#20045,0,"a%%NumberAdd(1, 2)")
 #20047=@"loc,{#10000},2,1,2,18"
diff --git a/javascript/extractor/tests/variables/output/trap/const.js.trap b/javascript/extractor/tests/variables/output/trap/const.js.trap
index 3265aead854..de5960ffa8c 100644
--- a/javascript/extractor/tests/variables/output/trap/const.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/const.js.trap
@@ -52,7 +52,7 @@ variables(#20016,"answer",#20000)
 #20017=*
 stmts(#20017,22,#20001,0,"const answer = 42;")
 hasLocation(#20017,#20003)
-stmtContainers(#20017,#20001)
+stmt_containers(#20017,#20001)
 #20018=*
 exprs(#20018,64,#20017,0,"answer = 42")
 #20019=@"loc,{#10000},1,7,1,17"
diff --git a/javascript/extractor/tests/variables/output/trap/finally.js.trap b/javascript/extractor/tests/variables/output/trap/finally.js.trap
index c8152d22a65..696d568f5f0 100644
--- a/javascript/extractor/tests/variables/output/trap/finally.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/finally.js.trap
@@ -188,7 +188,7 @@ stmts(#20065,17,#20001,0,"functio ... }\n  }\n}")
 #20066=@"loc,{#10000},1,1,8,1"
 locations_default(#20066,#10000,1,1,8,1)
 hasLocation(#20065,#20066)
-stmtContainers(#20065,#20001)
+stmt_containers(#20065,#20001)
 #20067=*
 exprs(#20067,78,#20065,-1,"f")
 hasLocation(#20067,#20021)
@@ -217,13 +217,13 @@ stmts(#20073,1,#20065,-2,"{\n  fun ... }\n  }\n}")
 #20074=@"loc,{#10000},1,15,8,1"
 locations_default(#20074,#10000,1,15,8,1)
 hasLocation(#20073,#20074)
-stmtContainers(#20073,#20065)
+stmt_containers(#20073,#20065)
 #20075=*
 stmts(#20075,17,#20073,0,"functio ...   }\n  }")
 #20076=@"loc,{#10000},2,3,7,3"
 locations_default(#20076,#10000,2,3,7,3)
 hasLocation(#20075,#20076)
-stmtContainers(#20075,#20065)
+stmt_containers(#20075,#20065)
 #20077=*
 exprs(#20077,78,#20075,-1,"g")
 hasLocation(#20077,#20033)
@@ -244,31 +244,31 @@ stmts(#20081,1,#20075,-2,"{\n    t ...   }\n  }")
 #20082=@"loc,{#10000},2,16,7,3"
 locations_default(#20082,#10000,2,16,7,3)
 hasLocation(#20081,#20082)
-stmtContainers(#20081,#20075)
+stmt_containers(#20081,#20075)
 #20083=*
 stmts(#20083,11,#20081,0,"try {\n  ... ;\n    }")
 #20084=@"loc,{#10000},3,5,6,5"
 locations_default(#20084,#10000,3,5,6,5)
 hasLocation(#20083,#20084)
-stmtContainers(#20083,#20075)
+stmt_containers(#20083,#20075)
 #20085=*
 stmts(#20085,1,#20083,0,"{\n    }")
 #20086=@"loc,{#10000},3,9,4,5"
 locations_default(#20086,#10000,3,9,4,5)
 hasLocation(#20085,#20086)
-stmtContainers(#20085,#20075)
+stmt_containers(#20085,#20075)
 #20087=*
 stmts(#20087,1,#20083,-1,"{\n      var x;\n    }")
 #20088=@"loc,{#10000},4,15,6,5"
 locations_default(#20088,#10000,4,15,6,5)
 hasLocation(#20087,#20088)
-stmtContainers(#20087,#20075)
+stmt_containers(#20087,#20075)
 #20089=*
 stmts(#20089,18,#20087,0,"var x;")
 #20090=@"loc,{#10000},5,7,5,12"
 locations_default(#20090,#10000,5,7,5,12)
 hasLocation(#20089,#20090)
-stmtContainers(#20089,#20075)
+stmt_containers(#20089,#20075)
 #20091=*
 exprs(#20091,64,#20089,0,"x")
 hasLocation(#20091,#20053)
diff --git a/javascript/extractor/tests/variables/output/trap/switch.js.trap b/javascript/extractor/tests/variables/output/trap/switch.js.trap
index a2c00ff6426..4cdbf834fa9 100644
--- a/javascript/extractor/tests/variables/output/trap/switch.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/switch.js.trap
@@ -149,7 +149,7 @@ stmts(#20051,17,#20001,0,"functio ... i;\n\t}\n}")
 #20052=@"loc,{#10000},1,1,6,1"
 locations_default(#20052,#10000,1,1,6,1)
 hasLocation(#20051,#20052)
-stmtContainers(#20051,#20001)
+stmt_containers(#20051,#20001)
 #20053=*
 exprs(#20053,78,#20051,-1,"g")
 hasLocation(#20053,#20017)
@@ -170,13 +170,13 @@ stmts(#20057,1,#20051,-2,"{\n\tswit ... i;\n\t}\n}")
 #20058=@"loc,{#10000},1,14,6,1"
 locations_default(#20058,#10000,1,14,6,1)
 hasLocation(#20057,#20058)
-stmtContainers(#20057,#20051)
+stmt_containers(#20057,#20051)
 #20059=*
 stmts(#20059,8,#20057,0,"switch  ... r i;\n\t}")
 #20060=@"loc,{#10000},2,2,5,2"
 locations_default(#20060,#10000,2,2,5,2)
 hasLocation(#20059,#20060)
-stmtContainers(#20059,#20051)
+stmt_containers(#20059,#20051)
 #20061=*
 exprs(#20061,3,#20059,-1,"0")
 hasLocation(#20061,#20029)
@@ -188,13 +188,13 @@ stmts(#20062,19,#20059,0,"default:\n\t\tvar i;")
 #20063=@"loc,{#10000},3,2,4,8"
 locations_default(#20063,#10000,3,2,4,8)
 hasLocation(#20062,#20063)
-stmtContainers(#20062,#20051)
+stmt_containers(#20062,#20051)
 #20064=*
 stmts(#20064,18,#20062,0,"var i;")
 #20065=@"loc,{#10000},4,3,4,8"
 locations_default(#20065,#10000,4,3,4,8)
 hasLocation(#20064,#20065)
-stmtContainers(#20064,#20051)
+stmt_containers(#20064,#20051)
 #20066=*
 exprs(#20066,64,#20064,0,"i")
 hasLocation(#20066,#20041)
diff --git a/javascript/extractor/tests/variables/output/trap/try.js.trap b/javascript/extractor/tests/variables/output/trap/try.js.trap
index 4309208aa53..86cc5df6d77 100644
--- a/javascript/extractor/tests/variables/output/trap/try.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/try.js.trap
@@ -129,7 +129,7 @@ variables(#20044,"f",#20000)
 #20045=*
 stmts(#20045,17,#20001,0,"functio ... ly {}\n}")
 hasLocation(#20045,#20043)
-stmtContainers(#20045,#20001)
+stmt_containers(#20045,#20001)
 #20046=*
 exprs(#20046,78,#20045,-1,"f")
 hasLocation(#20046,#20015)
@@ -150,25 +150,25 @@ stmts(#20050,1,#20045,-2,"{\n\ttry  ... ly {}\n}")
 #20051=@"loc,{#10000},1,14,5,1"
 locations_default(#20051,#10000,1,14,5,1)
 hasLocation(#20050,#20051)
-stmtContainers(#20050,#20045)
+stmt_containers(#20050,#20045)
 #20052=*
 stmts(#20052,11,#20050,0,"try {\n\t ... ally {}")
 #20053=@"loc,{#10000},2,2,4,13"
 locations_default(#20053,#10000,2,2,4,13)
 hasLocation(#20052,#20053)
-stmtContainers(#20052,#20045)
+stmt_containers(#20052,#20045)
 #20054=*
 stmts(#20054,1,#20052,0,"{\n\t\tvar x;\n\t}")
 #20055=@"loc,{#10000},2,6,4,2"
 locations_default(#20055,#10000,2,6,4,2)
 hasLocation(#20054,#20055)
-stmtContainers(#20054,#20045)
+stmt_containers(#20054,#20045)
 #20056=*
 stmts(#20056,18,#20054,0,"var x;")
 #20057=@"loc,{#10000},3,3,3,8"
 locations_default(#20057,#10000,3,3,3,8)
 hasLocation(#20056,#20057)
-stmtContainers(#20056,#20045)
+stmt_containers(#20056,#20045)
 #20058=*
 exprs(#20058,64,#20056,0,"x")
 hasLocation(#20058,#20029)
@@ -186,7 +186,7 @@ stmts(#20060,1,#20052,-1,"{}")
 #20061=@"loc,{#10000},4,12,4,13"
 locations_default(#20061,#10000,4,12,4,13)
 hasLocation(#20060,#20061)
-stmtContainers(#20060,#20045)
+stmt_containers(#20060,#20045)
 #20062=*
 entry_cfg_node(#20062,#20001)
 #20063=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/variables/output/trap/variables.js.trap b/javascript/extractor/tests/variables/output/trap/variables.js.trap
index dfe092a5fef..3c431c1f004 100644
--- a/javascript/extractor/tests/variables/output/trap/variables.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/variables.js.trap
@@ -409,7 +409,7 @@ variables(#20148,"g",#20000)
 #20149=*
 stmts(#20149,18,#20001,0,"var global;")
 hasLocation(#20149,#20003)
-stmtContainers(#20149,#20001)
+stmt_containers(#20149,#20001)
 #20150=*
 exprs(#20150,64,#20149,0,"global")
 hasLocation(#20150,#20043)
@@ -425,7 +425,7 @@ decl(#20151,#20145)
 #20152=*
 stmts(#20152,2,#20001,1,"also_a_global = 23;")
 hasLocation(#20152,#20005)
-stmtContainers(#20152,#20001)
+stmt_containers(#20152,#20001)
 #20153=*
 exprs(#20153,47,#20152,0,"also_a_global = 23")
 #20154=@"loc,{#10000},2,1,2,18"
@@ -451,7 +451,7 @@ literals("23","23",#20157)
 #20158=*
 stmts(#20158,2,#20001,2,"global;")
 hasLocation(#20158,#20007)
-stmtContainers(#20158,#20001)
+stmt_containers(#20158,#20001)
 #20159=*
 exprs(#20159,79,#20158,0,"global")
 hasLocation(#20159,#20055)
@@ -462,7 +462,7 @@ bind(#20159,#20145)
 #20160=*
 stmts(#20160,2,#20001,3,"another_global;")
 hasLocation(#20160,#20009)
-stmtContainers(#20160,#20001)
+stmt_containers(#20160,#20001)
 #20161=*
 exprs(#20161,79,#20160,0,"another_global")
 hasLocation(#20161,#20059)
@@ -475,13 +475,13 @@ stmts(#20162,1,#20001,4,"{\n\tvar  ... obal;\n}")
 #20163=@"loc,{#10000},5,1,7,1"
 locations_default(#20163,#10000,5,1,7,1)
 hasLocation(#20162,#20163)
-stmtContainers(#20162,#20001)
+stmt_containers(#20162,#20001)
 #20164=*
 stmts(#20164,18,#20162,0,"var another_global;")
 #20165=@"loc,{#10000},6,2,6,20"
 locations_default(#20165,#10000,6,2,6,20)
 hasLocation(#20164,#20165)
-stmtContainers(#20164,#20001)
+stmt_containers(#20164,#20001)
 #20166=*
 exprs(#20166,64,#20164,0,"another_global")
 hasLocation(#20166,#20066)
@@ -499,7 +499,7 @@ stmts(#20168,17,#20001,5,"functio ... ;\n\tx;\n}")
 #20169=@"loc,{#10000},8,1,11,1"
 locations_default(#20169,#10000,8,1,11,1)
 hasLocation(#20168,#20169)
-stmtContainers(#20168,#20001)
+stmt_containers(#20168,#20001)
 #20170=*
 exprs(#20170,78,#20168,-1,"f")
 hasLocation(#20170,#20073)
@@ -520,13 +520,13 @@ stmts(#20174,1,#20168,-2,"{\n\tvar x;\n\tx;\n}")
 #20175=@"loc,{#10000},8,14,11,1"
 locations_default(#20175,#10000,8,14,11,1)
 hasLocation(#20174,#20175)
-stmtContainers(#20174,#20168)
+stmt_containers(#20174,#20168)
 #20176=*
 stmts(#20176,18,#20174,0,"var x;")
 #20177=@"loc,{#10000},9,2,9,7"
 locations_default(#20177,#10000,9,2,9,7)
 hasLocation(#20176,#20177)
-stmtContainers(#20176,#20168)
+stmt_containers(#20176,#20168)
 #20178=*
 exprs(#20178,64,#20176,0,"x")
 hasLocation(#20178,#20083)
@@ -544,7 +544,7 @@ stmts(#20180,2,#20174,1,"x;")
 #20181=@"loc,{#10000},10,2,10,3"
 locations_default(#20181,#10000,10,2,10,3)
 hasLocation(#20180,#20181)
-stmtContainers(#20180,#20168)
+stmt_containers(#20180,#20168)
 #20182=*
 exprs(#20182,79,#20180,0,"x")
 hasLocation(#20182,#20087)
@@ -557,7 +557,7 @@ stmts(#20183,17,#20001,6,"functio ... {}\n\t}\n}")
 #20184=@"loc,{#10000},12,1,19,1"
 locations_default(#20184,#10000,12,1,19,1)
 hasLocation(#20183,#20184)
-stmtContainers(#20183,#20001)
+stmt_containers(#20183,#20001)
 #20185=*
 exprs(#20185,78,#20183,-1,"g")
 hasLocation(#20185,#20094)
@@ -580,13 +580,13 @@ stmts(#20190,1,#20183,-2,"{\n\tx;\n\t ... {}\n\t}\n}")
 #20191=@"loc,{#10000},12,14,19,1"
 locations_default(#20191,#10000,12,14,19,1)
 hasLocation(#20190,#20191)
-stmtContainers(#20190,#20183)
+stmt_containers(#20190,#20183)
 #20192=*
 stmts(#20192,2,#20190,0,"x;")
 #20193=@"loc,{#10000},13,2,13,3"
 locations_default(#20193,#10000,13,2,13,3)
 hasLocation(#20192,#20193)
-stmtContainers(#20192,#20183)
+stmt_containers(#20192,#20183)
 #20194=*
 exprs(#20194,79,#20192,0,"x")
 hasLocation(#20194,#20102)
@@ -599,7 +599,7 @@ stmts(#20195,18,#20190,1,"var x;")
 #20196=@"loc,{#10000},14,2,14,7"
 locations_default(#20196,#10000,14,2,14,7)
 hasLocation(#20195,#20196)
-stmtContainers(#20195,#20183)
+stmt_containers(#20195,#20183)
 #20197=*
 exprs(#20197,64,#20195,0,"x")
 hasLocation(#20197,#20108)
@@ -617,13 +617,13 @@ stmts(#20199,1,#20190,2,"{\n\t\tfun ... ) {}\n\t}")
 #20200=@"loc,{#10000},15,2,18,2"
 locations_default(#20200,#10000,15,2,18,2)
 hasLocation(#20199,#20200)
-stmtContainers(#20199,#20183)
+stmt_containers(#20199,#20183)
 #20201=*
 stmts(#20201,17,#20199,0,"function h() {}")
 #20202=@"loc,{#10000},16,3,16,17"
 locations_default(#20202,#10000,16,3,16,17)
 hasLocation(#20201,#20202)
-stmtContainers(#20201,#20183)
+stmt_containers(#20201,#20183)
 #20203=*
 exprs(#20203,78,#20201,-1,"h")
 hasLocation(#20203,#20116)
@@ -642,13 +642,13 @@ stmts(#20206,1,#20201,-2,"{}")
 #20207=@"loc,{#10000},16,16,16,17"
 locations_default(#20207,#10000,16,16,16,17)
 hasLocation(#20206,#20207)
-stmtContainers(#20206,#20201)
+stmt_containers(#20206,#20201)
 #20208=*
 stmts(#20208,2,#20199,1,"!function k() {}")
 #20209=@"loc,{#10000},17,3,17,18"
 locations_default(#20209,#10000,17,3,17,18)
 hasLocation(#20208,#20209)
-stmtContainers(#20208,#20183)
+stmt_containers(#20208,#20183)
 #20210=*
 exprs(#20210,18,#20208,0,"!function k() {}")
 hasLocation(#20210,#20209)
@@ -681,7 +681,7 @@ stmts(#20217,1,#20211,-2,"{}")
 #20218=@"loc,{#10000},17,17,17,18"
 locations_default(#20218,#10000,17,17,17,18)
 hasLocation(#20217,#20218)
-stmtContainers(#20217,#20211)
+stmt_containers(#20217,#20211)
 #20219=*
 entry_cfg_node(#20219,#20001)
 #20220=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
index 17493e9e247..a251278cfd9 100644
--- a/javascript/ql/src/semmle/javascript/Aliases.qll
+++ b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -91,3 +91,8 @@ deprecated predicate isES2015Module(TopLevel toplevel) { is_es2015_module(toplev
  * Alias for the predicate `is_closure_module` defined in the .dbscheme.
  */ 
 deprecated predicate isClosureModule(TopLevel toplevel) { is_closure_module(toplevel) }
+/**
+ * Alias for the predicate `stmt_containers` defined in the .dbscheme.
+ * Use `ASTNode#getContainer()` instead.
+ */ 
+deprecated predicate stmtContainers(Stmt stmt, StmtContainer container) { stmt_containers(stmt, container) }
diff --git a/javascript/ql/src/semmle/javascript/internal/StmtContainers.qll b/javascript/ql/src/semmle/javascript/internal/StmtContainers.qll
index 873981da945..095f4797b39 100644
--- a/javascript/ql/src/semmle/javascript/internal/StmtContainers.qll
+++ b/javascript/ql/src/semmle/javascript/internal/StmtContainers.qll
@@ -11,13 +11,13 @@ cached
 private StmtContainer getStmtContainer(NodeInStmtContainer node) {
   exprContainers(node, result)
   or
-  stmtContainers(node, result)
+  stmt_containers(node, result)
   or
   // Properties
   exists(ASTNode parent | properties(node, parent, _, _, _) |
     exprContainers(parent, result)
     or
-    stmtContainers(parent, result)
+    stmt_containers(parent, result)
   )
   or
   // Synthetic CFG nodes
@@ -31,7 +31,7 @@ private StmtContainer getStmtContainer(NodeInStmtContainer node) {
   )
   or
   // JSDoc type annotations
-  stmtContainers(node.(JSDocTypeExpr).getEnclosingStmt(), result)
+  stmt_containers(node.(JSDocTypeExpr).getEnclosingStmt(), result)
 }
 
 /**
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
index 03313c9f70b..4b354d80074 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -139,7 +139,7 @@ stmts (unique int id: @stmt,
        int idx: int ref,
        varchar(900) tostring: string ref);
 
-stmtContainers (unique int stmt: @stmt ref,
+stmt_containers (unique int stmt: @stmt ref,
        int container: @stmt_container ref);
        
 jumpTargets (unique int jump: @stmt ref,
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
index c449427b610..b4bfbe53041 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -10040,7 +10040,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>stmtContainers</name>
+<name>stmt_containers</name>
 <cardinality>1096691</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
index 2f2cac06892..da80f891e12 100644
--- a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
+++ b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -10,3 +10,5 @@ is_es2015_module.rel: reorder isES2015Module.rel(int toplevel) toplevel
 isES2015Module.rel: delete
 is_closure_module.rel: reorder isClosureModule.rel(int toplevel) toplevel
 isClosureModule.rel: delete
+stmt_containers.rel: reorder stmtContainers.rel(int stmt, int container) stmt container
+stmtContainers.rel: delete