diff --git a/java/ql/lib/semmle/code/java/dataflow/SSA.qll b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
index 3f47689fd97..962f38e80ea 100644
--- a/java/ql/lib/semmle/code/java/dataflow/SSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
@@ -253,11 +253,11 @@ class SsaImplicitUpdate extends SsaUpdate {
     or
     if this.hasImplicitQualifierUpdate()
     then
-      if isNonNonLocal(this)
+      if isNonLocal(this)
       then result = "nonlocal + nonlocal qualifier"
       else result = "nonlocal qualifier"
     else (
-      isNonNonLocal(this) and result = "nonlocal"
+      isNonLocal(this) and result = "nonlocal"
     )
   }
 
@@ -289,9 +289,9 @@ class SsaImplicitUpdate extends SsaUpdate {
 }
 
 overlay[global]
-private predicate isNonNonLocalImpl(SsaImplicitUpdate su) { exists(su.getANonLocalUpdate()) }
+private predicate isNonLocalImpl(SsaImplicitUpdate su) { exists(su.getANonLocalUpdate()) }
 
-private predicate isNonNonLocal(SsaImplicitUpdate su) = forceLocal(isNonNonLocalImpl/1)(su)
+private predicate isNonLocal(SsaImplicitUpdate su) = forceLocal(isNonLocalImpl/1)(su)
 
 /**
  * An SSA variable that represents an uncertain implicit update of the value.
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
index 13e1aee6ad8..275a0afafc0 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
@@ -555,7 +555,6 @@ private module Cached {
     Impl::phiHasInputFromBlock(phi, inp, bb)
   }
 
-  overlay[global]
   cached
   module DataFlowIntegration {
     import DataFlowIntegrationImpl