diff --git a/python/ql/lib/semmle/python/Concepts.qll b/python/ql/lib/semmle/python/Concepts.qll
index c2a1d9b6b7c..6b0467f4b41 100644
--- a/python/ql/lib/semmle/python/Concepts.qll
+++ b/python/ql/lib/semmle/python/Concepts.qll
@@ -828,7 +828,7 @@ module HTTP {
     }
 
     /** A parameter that will receive parts of the url when handling an incoming request. */
-    private class RoutedParameter extends RemoteFlowSource::Range, DataFlow::SourceParameterNode {
+    private class RoutedParameter extends RemoteFlowSource::Range, DataFlow::ParameterNode {
       RequestHandler handler;
 
       RoutedParameter() { this.getParameter() = handler.getARoutedParameter() }
diff --git a/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll b/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll
index 7686aebef73..be51b99b4c0 100644
--- a/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll
@@ -305,7 +305,7 @@ private module SensitiveDataModeling {
   }
 
   /** A parameter where the name indicates it will receive sensitive data. */
-  class SensitiveParameter extends SensitiveDataSource::Range, DataFlow::SourceParameterNode {
+  class SensitiveParameter extends SensitiveDataSource::Range, DataFlow::ParameterNode {
     SensitiveDataClassification classification;
 
     SensitiveParameter() { this.getParameter().getName() = sensitiveString(classification) }
diff --git a/python/ql/test/experimental/dataflow/TestUtil/MaximalFlowTest.qll b/python/ql/test/experimental/dataflow/TestUtil/MaximalFlowTest.qll
index 7fee23085f7..42ca12ecd48 100644
--- a/python/ql/test/experimental/dataflow/TestUtil/MaximalFlowTest.qll
+++ b/python/ql/test/experimental/dataflow/TestUtil/MaximalFlowTest.qll
@@ -25,7 +25,7 @@ class MaximalFlowsConfig extends DataFlow::Configuration {
     exists(node.getLocation().getFile().getRelativePath()) and
     not node.asCfgNode() instanceof CallNode and
     not node.asCfgNode().getNode() instanceof Return and
-    not node instanceof DataFlow::SourceParameterNode and
+    not node instanceof DataFlow::ParameterNode and
     not node instanceof DataFlow::PostUpdateNode and
     // not node.asExpr() instanceof FunctionExpr and
     // not node.asExpr() instanceof ClassExpr and
diff --git a/python/ql/test/experimental/dataflow/basic/maximalFlowsConfig.qll b/python/ql/test/experimental/dataflow/basic/maximalFlowsConfig.qll
index 92788c0db43..e3e65c92c24 100644
--- a/python/ql/test/experimental/dataflow/basic/maximalFlowsConfig.qll
+++ b/python/ql/test/experimental/dataflow/basic/maximalFlowsConfig.qll
@@ -9,7 +9,7 @@ class MaximalFlowsConfig extends DataFlow::Configuration {
   MaximalFlowsConfig() { this = "AllFlowsConfig" }
 
   override predicate isSource(DataFlow::Node node) {
-    node instanceof DataFlow::SourceParameterNode
+    node instanceof DataFlow::ParameterNode
     or
     node instanceof DataFlow::EssaNode and
     not exists(DataFlow::EssaNode pred | DataFlow::localFlowStep(pred, node))
diff --git a/python/ql/test/experimental/dataflow/callGraphConfig.qll b/python/ql/test/experimental/dataflow/callGraphConfig.qll
index 6bc196dff1d..a09b6faf156 100644
--- a/python/ql/test/experimental/dataflow/callGraphConfig.qll
+++ b/python/ql/test/experimental/dataflow/callGraphConfig.qll
@@ -17,6 +17,6 @@ class CallGraphConfig extends DataFlow::Configuration {
   override predicate isSink(DataFlow::Node node) {
     node instanceof DataFlowPrivate::OutNode
     or
-    node instanceof DataFlow::SourceParameterNode
+    node instanceof DataFlow::ParameterNode
   }
 }
diff --git a/python/ql/test/experimental/dataflow/consistency/modeling-consistency.ql b/python/ql/test/experimental/dataflow/consistency/modeling-consistency.ql
index 8307c9e26e2..a0dde59bedb 100644
--- a/python/ql/test/experimental/dataflow/consistency/modeling-consistency.ql
+++ b/python/ql/test/experimental/dataflow/consistency/modeling-consistency.ql
@@ -2,6 +2,6 @@ import python
 import semmle.python.dataflow.new.DataFlow
 
 query predicate parameterWithoutNode(Parameter p, string msg) {
-  not exists(DataFlow::SourceParameterNode node | p = node.getParameter()) and
+  not exists(DataFlow::ParameterNode node | p = node.getParameter()) and
   msg = "There is no `ParameterNode` associated with this parameter."
 }
diff --git a/python/ql/test/experimental/dataflow/coverage/classesCallGraph.ql b/python/ql/test/experimental/dataflow/coverage/classesCallGraph.ql
index 002678dfd0c..a0a0b6b12fb 100644
--- a/python/ql/test/experimental/dataflow/coverage/classesCallGraph.ql
+++ b/python/ql/test/experimental/dataflow/coverage/classesCallGraph.ql
@@ -17,7 +17,7 @@ class CallGraphConfig extends DataFlow::Configuration {
   override predicate isSink(DataFlow::Node node) {
     node instanceof DataFlowPrivate::OutNode
     or
-    node instanceof DataFlow::SourceParameterNode and
+    node instanceof DataFlow::ParameterNode and
     // exclude parameters to the SINK-functions
     not exists(DataFlowPrivate::DataFlowCallable c |
       node.(DataFlow::SourceParameterNode).isParameterOf(c, _) and
diff --git a/python/ql/test/experimental/dataflow/typetracking/tracked.ql b/python/ql/test/experimental/dataflow/typetracking/tracked.ql
index a7600c9498a..142e5b11639 100644
--- a/python/ql/test/experimental/dataflow/typetracking/tracked.ql
+++ b/python/ql/test/experimental/dataflow/typetracking/tracked.ql
@@ -89,7 +89,7 @@ private DataFlow::TypeTrackingNode tracked_self(TypeTracker t) {
   exists(Function f |
     f.isMethod() and
     f.getName() = "track_self" and
-    result.(DataFlow::SourceParameterNode).getParameter() = f.getArg(0)
+    result.(DataFlow::ParameterNode).getParameter() = f.getArg(0)
   )
   or
   exists(TypeTracker t2 | result = tracked_self(t2).track(t2, t))