diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll
index 67c594e3b67..1a572c221d9 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll
@@ -54,5 +54,5 @@ extensible predicate neutralModel(
 module Extensions implements SharedMaD::ExtensionsSig {
   import ExternalFlowExtensions
 
-  predicate packageGrouping(string group, string package) { none() }
+  predicate namespaceGrouping(string group, string namespace) { none() }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlowExtensions.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlowExtensions.qll
index af0fdadd67f..3461f0a5186 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlowExtensions.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlowExtensions.qll
@@ -54,5 +54,5 @@ extensible predicate neutralModel(
 module Extensions implements SharedMaD::ExtensionsSig {
   import ExternalFlowExtensions
 
-  predicate packageGrouping(string group, string package) { none() }
+  predicate namespaceGrouping(string group, string namespace) { none() }
 }
diff --git a/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll b/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll
index c0ef008e33d..2e962299f3e 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll
@@ -58,4 +58,6 @@ extensible predicate packageGrouping(string group, string package);
 
 module Extensions implements SharedMaD::ExtensionsSig {
   import ExternalFlowExtensions
+
+  predicate namespaceGrouping = packageGrouping/2;
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/ExternalFlowExtensions.qll b/java/ql/lib/semmle/code/java/dataflow/internal/ExternalFlowExtensions.qll
index 6d6bf236e53..be474ad4535 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/ExternalFlowExtensions.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/ExternalFlowExtensions.qll
@@ -99,5 +99,5 @@ extensible predicate experimentalSummaryModel(
 module Extensions implements SharedMaD::ExtensionsSig {
   import ExternalFlowExtensions
 
-  predicate packageGrouping(string group, string package) { none() }
+  predicate namespaceGrouping(string group, string namespace) { none() }
 }
diff --git a/shared/mad/codeql/mad/static/ModelsAsData.qll b/shared/mad/codeql/mad/static/ModelsAsData.qll
index dc1b9b77130..84daaa9b6c8 100644
--- a/shared/mad/codeql/mad/static/ModelsAsData.qll
+++ b/shared/mad/codeql/mad/static/ModelsAsData.qll
@@ -51,9 +51,9 @@ signature module ExtensionsSig {
   );
 
   /**
-   * Holds if the package `package` is part of the group `group`.
+   * Holds if the namespace `namespace` is part of the group `group`.
    */
-  predicate packageGrouping(string group, string package);
+  predicate namespaceGrouping(string group, string namespace);
 }
 
 signature module InputSig {
@@ -166,14 +166,14 @@ module ModelsAsData<ExtensionsSig Extensions, InputSig Input> {
     )
   }
 
-  /** Gets the prefix for a group of packages/namespaces. */
+  /** Gets the prefix for a group of namespaces. */
   private string groupPrefix() { result = "group:" }
 
   /**
-   * Gets a package/namespace represented by `namespaceOrGroup`.
+   * Gets a namespace represented by `namespaceOrGroup`.
    *
    * If `namespaceOrGroup` is of the form `group:<groupname>` then `result` is a
-   * package/namespace in the group `<groupname>`, as determined by `packageGrouping`.
+   * namespace in the group `<groupname>`, as determined by `namespaceGrouping`.
    * Otherwise, `result` is `namespaceOrGroup`.
    */
   bindingset[namespaceOrGroup]
@@ -182,7 +182,7 @@ module ModelsAsData<ExtensionsSig Extensions, InputSig Input> {
     result = namespaceOrGroup
     or
     exists(string group |
-      Extensions::packageGrouping(group, result) and
+      Extensions::namespaceGrouping(group, result) and
       namespaceOrGroup = groupPrefix() + group
     )
   }