diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowReachability.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowReachability.qll
index 8885dd45fe83..9d9e3f8d458b 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowReachability.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowReachability.qll
@@ -3,7 +3,7 @@
  */
 
 import csharp
-private import codeql.controlflow.ControlFlow
+private import codeql.controlflow.ControlFlowReachability
 private import semmle.code.csharp.controlflow.BasicBlocks
 private import semmle.code.csharp.controlflow.Guards as Guards
 private import semmle.code.csharp.ExprOrStmtParent
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
index 0ea274be2042..6e36008ab2eb 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
@@ -25,7 +25,7 @@ private import semmle.code.csharp.controlflow.Guards::AbstractValues
 private import semmle.code.csharp.dataflow.internal.SsaImpl as SsaImpl
 private import semmle.code.csharp.frameworks.System
 private import semmle.code.csharp.frameworks.Test
-private import semmle.code.csharp.controlflow.ControlFlowReachability as Cf
+private import semmle.code.csharp.controlflow.ControlFlowReachability
 
 private Expr maybeNullExpr(Expr reason) {
   G::Internal::nullValue(result) and reason = result
@@ -260,7 +260,7 @@ private predicate defReaches(Ssa::Definition def, ControlFlow::Node cfn) {
   )
 }
 
-private module NullnessConfig implements Cf::ControlFlowReachability::ConfigSig {
+private module NullnessConfig implements ControlFlowReachability::ConfigSig {
   predicate source(ControlFlow::Node node, Ssa::Definition def) { defMaybeNull(def, node, _, _) }
 
   predicate sink(ControlFlow::Node node, Ssa::Definition def) {
@@ -275,7 +275,7 @@ private module NullnessConfig implements Cf::ControlFlowReachability::ConfigSig
   predicate uncertainFlow() { none() }
 }
 
-private module NullnessFlow = Cf::ControlFlowReachability::Flow<NullnessConfig>;
+private module NullnessFlow = ControlFlowReachability::Flow<NullnessConfig>;
 
 predicate maybeNullDeref(Dereference d, Ssa::SourceVariable v, string msg, Element reason) {
   exists(
diff --git a/java/ql/lib/semmle/code/java/controlflow/ControlFlow.qll b/java/ql/lib/semmle/code/java/controlflow/ControlFlowReachability.qll
similarity index 92%
rename from java/ql/lib/semmle/code/java/controlflow/ControlFlow.qll
rename to java/ql/lib/semmle/code/java/controlflow/ControlFlowReachability.qll
index 3d2a8d7fdd1f..fbb384e2b0ed 100644
--- a/java/ql/lib/semmle/code/java/controlflow/ControlFlow.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/ControlFlowReachability.qll
@@ -5,7 +5,7 @@ overlay[local?]
 module;
 
 import java
-private import codeql.controlflow.ControlFlow
+private import codeql.controlflow.ControlFlowReachability
 private import semmle.code.java.dataflow.SSA as SSA
 private import semmle.code.java.controlflow.Guards as Guards
 
@@ -57,4 +57,4 @@ private module ControlFlowInput implements InputSig<Location, ControlFlowNode, B
   import Guards::Guards_v3::InternalUtil
 }
 
-module ControlFlow = Make<Location, Cfg, ControlFlowInput>;
+module ControlFlowReachability = Make<Location, Cfg, ControlFlowInput>;
diff --git a/java/ql/lib/semmle/code/java/dataflow/Nullness.qll b/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
index 8728af2c0db2..c9f5ad4f7812 100644
--- a/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
@@ -16,7 +16,7 @@ private import IntegerGuards
 private import NullGuards
 private import semmle.code.java.Collections
 private import semmle.code.java.controlflow.internal.Preconditions
-private import semmle.code.java.controlflow.ControlFlow as Cf
+private import semmle.code.java.controlflow.ControlFlowReachability
 
 /** Gets an expression that may be `null`. */
 Expr nullExpr() { result = nullExpr(_) }
@@ -248,7 +248,7 @@ private predicate impossibleEdge(BasicBlock bb1, BasicBlock bb2) {
   )
 }
 
-private module NullnessConfig implements Cf::ControlFlow::ConfigSig {
+private module NullnessConfig implements ControlFlowReachability::ConfigSig {
   predicate source(ControlFlowNode node, SsaVariable def) { varMaybeNull(def, node, _, _) }
 
   predicate sink(ControlFlowNode node, SsaVariable def) { varDereference(def, _) = node }
@@ -260,7 +260,7 @@ private module NullnessConfig implements Cf::ControlFlow::ConfigSig {
   predicate uncertainFlow() { none() }
 }
 
-private module NullnessFlow = Cf::ControlFlow::Flow<NullnessConfig>;
+private module NullnessFlow = ControlFlowReachability::Flow<NullnessConfig>;
 
 /**
  * Holds if the dereference of `v` at `va` might be `null`.
diff --git a/shared/controlflow/codeql/controlflow/ControlFlow.qll b/shared/controlflow/codeql/controlflow/ControlFlowReachability.qll
similarity index 100%
rename from shared/controlflow/codeql/controlflow/ControlFlow.qll
rename to shared/controlflow/codeql/controlflow/ControlFlowReachability.qll