diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/NosqlInjection.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/NosqlInjection.ql
index 9cb452c675e..716702c27f1 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/NosqlInjection.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/NosqlInjection.ql
@@ -5,7 +5,8 @@
  * evaluation pipeline.
  */
 
-import semmle.javascript.security.dataflow.NosqlInjection
+import javascript
+import semmle.javascript.security.dataflow.NosqlInjectionQuery as NosqlInjection
 import EndToEndEvaluation as EndToEndEvaluation
 
 from
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/SqlInjection.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/SqlInjection.ql
index d50bbb71208..b0aab6dde4b 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/SqlInjection.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/SqlInjection.ql
@@ -5,7 +5,8 @@
  * evaluation pipeline.
  */
 
-import semmle.javascript.security.dataflow.SqlInjection
+import javascript
+import semmle.javascript.security.dataflow.SqlInjectionQuery as SqlInjection
 import EndToEndEvaluation as EndToEndEvaluation
 
 from
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/TaintedPath.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/TaintedPath.ql
index 3289d743352..ecf3238e980 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/TaintedPath.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/TaintedPath.ql
@@ -5,7 +5,8 @@
  * evaluation pipeline.
  */
 
-import semmle.javascript.security.dataflow.TaintedPath
+import javascript
+import semmle.javascript.security.dataflow.TaintedPathQuery as TaintedPath
 import EndToEndEvaluation as EndToEndEvaluation
 
 from
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/Xss.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/Xss.ql
index fb5849c201f..4047fabdbec 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/Xss.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/evaluation/Xss.ql
@@ -5,7 +5,8 @@
  * pipeline.
  */
 
-import semmle.javascript.security.dataflow.DomBasedXss
+import javascript
+import semmle.javascript.security.dataflow.DomBasedXssQuery as DomBasedXss
 import EndToEndEvaluation as EndToEndEvaluation
 
 from