diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlow.qll
index 82714ed1af6..137612c52af 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlow.qll
@@ -188,9 +188,9 @@ signature module StateConfigSig {
 signature int explorationLimitSig();
 
 /**
- * The output of a data flow computation.
+ * The output of a global data flow computation.
  */
-signature module DataFlowSig {
+signature module GlobalFlowSig {
   /**
    * A `Node` augmented with a call context (except for sinks) and an access path.
    * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
@@ -224,7 +224,7 @@ signature module DataFlowSig {
 /**
  * Constructs a standard data flow computation.
  */
-module Global<ConfigSig Config> implements DataFlowSig {
+module Global<ConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import DefaultState<Config>
     import Config
@@ -234,14 +234,14 @@ module Global<ConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<ConfigSig Config> implements DataFlowSig {
+deprecated module Make<ConfigSig Config> implements GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a data flow computation using flow state.
  */
-module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
+module GlobalWithState<StateConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import Config
   }
@@ -250,7 +250,7 @@ module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<StateConfigSig Config> implements DataFlowSig {
+deprecated module MakeWithState<StateConfigSig Config> implements GlobalFlowSig {
   import GlobalWithState<Config>
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTracking.qll
index 192a52f44e3..3f8cef3698a 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTracking.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTracking.qll
@@ -35,7 +35,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
 /**
  * Constructs a standard taint tracking computation.
  */
-module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+module Global<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import DataFlowInternal::DefaultState<Config>
     import Config
@@ -49,14 +49,14 @@ module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a taint tracking computation using flow state.
  */
-module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import Config
   }
@@ -69,6 +69,6 @@ module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::Dat
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   import GlobalWithState<Config>
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlow.qll
index 82714ed1af6..137612c52af 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlow.qll
@@ -188,9 +188,9 @@ signature module StateConfigSig {
 signature int explorationLimitSig();
 
 /**
- * The output of a data flow computation.
+ * The output of a global data flow computation.
  */
-signature module DataFlowSig {
+signature module GlobalFlowSig {
   /**
    * A `Node` augmented with a call context (except for sinks) and an access path.
    * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
@@ -224,7 +224,7 @@ signature module DataFlowSig {
 /**
  * Constructs a standard data flow computation.
  */
-module Global<ConfigSig Config> implements DataFlowSig {
+module Global<ConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import DefaultState<Config>
     import Config
@@ -234,14 +234,14 @@ module Global<ConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<ConfigSig Config> implements DataFlowSig {
+deprecated module Make<ConfigSig Config> implements GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a data flow computation using flow state.
  */
-module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
+module GlobalWithState<StateConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import Config
   }
@@ -250,7 +250,7 @@ module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<StateConfigSig Config> implements DataFlowSig {
+deprecated module MakeWithState<StateConfigSig Config> implements GlobalFlowSig {
   import GlobalWithState<Config>
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTracking.qll
index 192a52f44e3..3f8cef3698a 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTracking.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTracking.qll
@@ -35,7 +35,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
 /**
  * Constructs a standard taint tracking computation.
  */
-module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+module Global<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import DataFlowInternal::DefaultState<Config>
     import Config
@@ -49,14 +49,14 @@ module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a taint tracking computation using flow state.
  */
-module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import Config
   }
@@ -69,6 +69,6 @@ module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::Dat
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   import GlobalWithState<Config>
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlow.qll
index 82714ed1af6..137612c52af 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlow.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlow.qll
@@ -188,9 +188,9 @@ signature module StateConfigSig {
 signature int explorationLimitSig();
 
 /**
- * The output of a data flow computation.
+ * The output of a global data flow computation.
  */
-signature module DataFlowSig {
+signature module GlobalFlowSig {
   /**
    * A `Node` augmented with a call context (except for sinks) and an access path.
    * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
@@ -224,7 +224,7 @@ signature module DataFlowSig {
 /**
  * Constructs a standard data flow computation.
  */
-module Global<ConfigSig Config> implements DataFlowSig {
+module Global<ConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import DefaultState<Config>
     import Config
@@ -234,14 +234,14 @@ module Global<ConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<ConfigSig Config> implements DataFlowSig {
+deprecated module Make<ConfigSig Config> implements GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a data flow computation using flow state.
  */
-module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
+module GlobalWithState<StateConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import Config
   }
@@ -250,7 +250,7 @@ module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<StateConfigSig Config> implements DataFlowSig {
+deprecated module MakeWithState<StateConfigSig Config> implements GlobalFlowSig {
   import GlobalWithState<Config>
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTracking.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTracking.qll
index 192a52f44e3..3f8cef3698a 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTracking.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTracking.qll
@@ -35,7 +35,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
 /**
  * Constructs a standard taint tracking computation.
  */
-module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+module Global<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import DataFlowInternal::DefaultState<Config>
     import Config
@@ -49,14 +49,14 @@ module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a taint tracking computation using flow state.
  */
-module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import Config
   }
@@ -69,6 +69,6 @@ module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::Dat
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   import GlobalWithState<Config>
 }
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlow.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlow.qll
index 82714ed1af6..137612c52af 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlow.qll
@@ -188,9 +188,9 @@ signature module StateConfigSig {
 signature int explorationLimitSig();
 
 /**
- * The output of a data flow computation.
+ * The output of a global data flow computation.
  */
-signature module DataFlowSig {
+signature module GlobalFlowSig {
   /**
    * A `Node` augmented with a call context (except for sinks) and an access path.
    * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
@@ -224,7 +224,7 @@ signature module DataFlowSig {
 /**
  * Constructs a standard data flow computation.
  */
-module Global<ConfigSig Config> implements DataFlowSig {
+module Global<ConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import DefaultState<Config>
     import Config
@@ -234,14 +234,14 @@ module Global<ConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<ConfigSig Config> implements DataFlowSig {
+deprecated module Make<ConfigSig Config> implements GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a data flow computation using flow state.
  */
-module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
+module GlobalWithState<StateConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import Config
   }
@@ -250,7 +250,7 @@ module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<StateConfigSig Config> implements DataFlowSig {
+deprecated module MakeWithState<StateConfigSig Config> implements GlobalFlowSig {
   import GlobalWithState<Config>
 }
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTracking.qll b/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTracking.qll
index 192a52f44e3..3f8cef3698a 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTracking.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTracking.qll
@@ -35,7 +35,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
 /**
  * Constructs a standard taint tracking computation.
  */
-module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+module Global<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import DataFlowInternal::DefaultState<Config>
     import Config
@@ -49,14 +49,14 @@ module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a taint tracking computation using flow state.
  */
-module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import Config
   }
@@ -69,6 +69,6 @@ module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::Dat
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   import GlobalWithState<Config>
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlow.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlow.qll
index 82714ed1af6..137612c52af 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlow.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlow.qll
@@ -188,9 +188,9 @@ signature module StateConfigSig {
 signature int explorationLimitSig();
 
 /**
- * The output of a data flow computation.
+ * The output of a global data flow computation.
  */
-signature module DataFlowSig {
+signature module GlobalFlowSig {
   /**
    * A `Node` augmented with a call context (except for sinks) and an access path.
    * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
@@ -224,7 +224,7 @@ signature module DataFlowSig {
 /**
  * Constructs a standard data flow computation.
  */
-module Global<ConfigSig Config> implements DataFlowSig {
+module Global<ConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import DefaultState<Config>
     import Config
@@ -234,14 +234,14 @@ module Global<ConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<ConfigSig Config> implements DataFlowSig {
+deprecated module Make<ConfigSig Config> implements GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a data flow computation using flow state.
  */
-module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
+module GlobalWithState<StateConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import Config
   }
@@ -250,7 +250,7 @@ module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<StateConfigSig Config> implements DataFlowSig {
+deprecated module MakeWithState<StateConfigSig Config> implements GlobalFlowSig {
   import GlobalWithState<Config>
 }
 
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTracking.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTracking.qll
index 192a52f44e3..3f8cef3698a 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTracking.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTracking.qll
@@ -35,7 +35,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
 /**
  * Constructs a standard taint tracking computation.
  */
-module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+module Global<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import DataFlowInternal::DefaultState<Config>
     import Config
@@ -49,14 +49,14 @@ module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a taint tracking computation using flow state.
  */
-module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import Config
   }
@@ -69,6 +69,6 @@ module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::Dat
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   import GlobalWithState<Config>
 }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlow.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlow.qll
index 82714ed1af6..137612c52af 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlow.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlow.qll
@@ -188,9 +188,9 @@ signature module StateConfigSig {
 signature int explorationLimitSig();
 
 /**
- * The output of a data flow computation.
+ * The output of a global data flow computation.
  */
-signature module DataFlowSig {
+signature module GlobalFlowSig {
   /**
    * A `Node` augmented with a call context (except for sinks) and an access path.
    * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
@@ -224,7 +224,7 @@ signature module DataFlowSig {
 /**
  * Constructs a standard data flow computation.
  */
-module Global<ConfigSig Config> implements DataFlowSig {
+module Global<ConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import DefaultState<Config>
     import Config
@@ -234,14 +234,14 @@ module Global<ConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<ConfigSig Config> implements DataFlowSig {
+deprecated module Make<ConfigSig Config> implements GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a data flow computation using flow state.
  */
-module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
+module GlobalWithState<StateConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import Config
   }
@@ -250,7 +250,7 @@ module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<StateConfigSig Config> implements DataFlowSig {
+deprecated module MakeWithState<StateConfigSig Config> implements GlobalFlowSig {
   import GlobalWithState<Config>
 }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTracking.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTracking.qll
index 192a52f44e3..3f8cef3698a 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTracking.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTracking.qll
@@ -35,7 +35,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
 /**
  * Constructs a standard taint tracking computation.
  */
-module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+module Global<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import DataFlowInternal::DefaultState<Config>
     import Config
@@ -49,14 +49,14 @@ module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a taint tracking computation using flow state.
  */
-module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import Config
   }
@@ -69,6 +69,6 @@ module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::Dat
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   import GlobalWithState<Config>
 }
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlow.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlow.qll
index 82714ed1af6..137612c52af 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlow.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlow.qll
@@ -188,9 +188,9 @@ signature module StateConfigSig {
 signature int explorationLimitSig();
 
 /**
- * The output of a data flow computation.
+ * The output of a global data flow computation.
  */
-signature module DataFlowSig {
+signature module GlobalFlowSig {
   /**
    * A `Node` augmented with a call context (except for sinks) and an access path.
    * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
@@ -224,7 +224,7 @@ signature module DataFlowSig {
 /**
  * Constructs a standard data flow computation.
  */
-module Global<ConfigSig Config> implements DataFlowSig {
+module Global<ConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import DefaultState<Config>
     import Config
@@ -234,14 +234,14 @@ module Global<ConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<ConfigSig Config> implements DataFlowSig {
+deprecated module Make<ConfigSig Config> implements GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a data flow computation using flow state.
  */
-module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
+module GlobalWithState<StateConfigSig Config> implements GlobalFlowSig {
   private module C implements FullStateConfigSig {
     import Config
   }
@@ -250,7 +250,7 @@ module GlobalWithState<StateConfigSig Config> implements DataFlowSig {
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<StateConfigSig Config> implements DataFlowSig {
+deprecated module MakeWithState<StateConfigSig Config> implements GlobalFlowSig {
   import GlobalWithState<Config>
 }
 
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTracking.qll b/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTracking.qll
index 192a52f44e3..3f8cef3698a 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTracking.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTracking.qll
@@ -35,7 +35,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
 /**
  * Constructs a standard taint tracking computation.
  */
-module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+module Global<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import DataFlowInternal::DefaultState<Config>
     import Config
@@ -49,14 +49,14 @@ module Global<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
 }
 
 /** DEPRECATED: Use `Global` instead. */
-deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module Make<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
   import Global<Config>
 }
 
 /**
  * Constructs a taint tracking computation using flow state.
  */
-module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   private module Config0 implements DataFlowInternal::FullStateConfigSig {
     import Config
   }
@@ -69,6 +69,6 @@ module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::Dat
 }
 
 /** DEPRECATED: Use `GlobalWithState` instead. */
-deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::DataFlowSig {
+deprecated module MakeWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
   import GlobalWithState<Config>
 }