From 7eb64aa998573eaf18725bb9db61857710abc76e Mon Sep 17 00:00:00 2001
From: Anders Schack-Mulligen <aschackmull@github.com>
Date: Mon, 2 Nov 2020 15:02:16 +0100
Subject: [PATCH] Dataflow: Code review fixes.

---
 .../code/cpp/dataflow/internal/DataFlowImpl.qll      | 12 ++++++------
 .../code/cpp/dataflow/internal/DataFlowImpl2.qll     | 12 ++++++------
 .../code/cpp/dataflow/internal/DataFlowImpl3.qll     | 12 ++++++------
 .../code/cpp/dataflow/internal/DataFlowImpl4.qll     | 12 ++++++------
 .../code/cpp/dataflow/internal/DataFlowImplLocal.qll | 12 ++++++------
 .../code/cpp/ir/dataflow/internal/DataFlowImpl.qll   | 12 ++++++------
 .../code/cpp/ir/dataflow/internal/DataFlowImpl2.qll  | 12 ++++++------
 .../code/cpp/ir/dataflow/internal/DataFlowImpl3.qll  | 12 ++++++------
 .../code/cpp/ir/dataflow/internal/DataFlowImpl4.qll  | 12 ++++++------
 .../code/csharp/dataflow/internal/DataFlowImpl.qll   | 12 ++++++------
 .../code/csharp/dataflow/internal/DataFlowImpl2.qll  | 12 ++++++------
 .../code/csharp/dataflow/internal/DataFlowImpl3.qll  | 12 ++++++------
 .../code/csharp/dataflow/internal/DataFlowImpl4.qll  | 12 ++++++------
 .../code/csharp/dataflow/internal/DataFlowImpl5.qll  | 12 ++++++------
 .../code/java/dataflow/internal/DataFlowImpl.qll     | 12 ++++++------
 .../code/java/dataflow/internal/DataFlowImpl2.qll    | 12 ++++++------
 .../code/java/dataflow/internal/DataFlowImpl3.qll    | 12 ++++++------
 .../code/java/dataflow/internal/DataFlowImpl4.qll    | 12 ++++++------
 .../code/java/dataflow/internal/DataFlowImpl5.qll    | 12 ++++++------
 .../test/library-tests/dataflow/partial/testRev.ql   |  2 +-
 .../python/dataflow/new/internal/DataFlowImpl.qll    | 12 ++++++------
 .../python/dataflow/new/internal/DataFlowImpl2.qll   | 12 ++++++------
 22 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
+++ b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
+++ b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
+++ b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
+++ b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/java/ql/test/library-tests/dataflow/partial/testRev.ql b/java/ql/test/library-tests/dataflow/partial/testRev.ql
index 90249adba30..9855b9bdcd1 100644
--- a/java/ql/test/library-tests/dataflow/partial/testRev.ql
+++ b/java/ql/test/library-tests/dataflow/partial/testRev.ql
@@ -14,5 +14,5 @@ class Conf extends Configuration {
 }
 
 from PartialPathNode n, int dist
-where any(Conf c).hasRevPartialFlow(n, _, dist)
+where any(Conf c).hasPartialFlowRev(n, _, dist)
 select dist, n
diff --git a/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl.qll b/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl.qll
+++ b/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {
diff --git a/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl2.qll b/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
index a9f6eff08c2..0e1c69a90b0 100644
--- a/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
+++ b/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
@@ -112,8 +112,8 @@ abstract class Configuration extends string {
   predicate hasFlowToExpr(DataFlowExpr sink) { hasFlowTo(exprNode(sink)) }
 
   /**
-   * Gets the exploration limit for `hasPartialFlow` measured in approximate
-   * number of interprocedural steps.
+   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
+   * measured in approximate number of interprocedural steps.
    */
   int explorationLimit() { none() }
 
@@ -123,7 +123,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards sink definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sources is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -143,7 +143,7 @@ abstract class Configuration extends string {
    * is restricted to be less than or equal to `explorationLimit()`. This
    * predicate completely disregards source definitions.
    *
-   * This predicate is intended for dataflow exploration and debugging and may
+   * This predicate is intended for data-flow exploration and debugging and may
    * perform poorly if the number of sinks is too big and/or the exploration
    * limit is set too high without using barriers.
    *
@@ -155,7 +155,7 @@ abstract class Configuration extends string {
    * Note that reverse flow has slightly lower precision than the corresponding
    * forward flow, as reverse flow disregards type pruning among other features.
    */
-  final predicate hasRevPartialFlow(PartialPathNode node, PartialPathNode sink, int dist) {
+  final predicate hasPartialFlowRev(PartialPathNode node, PartialPathNode sink, int dist) {
     revPartialFlow(node, sink, this) and
     dist = node.getSinkDistance()
   }
@@ -3211,7 +3211,7 @@ private module FlowExploration {
     }
 
     /**
-     * Gets the approximate distance to the nearest source measured in number
+     * Gets the approximate distance to the nearest sink measured in number
      * of interprocedural steps.
      */
     int getSinkDistance() {