diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
index 08e4a073ddb..7232326f1b3 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
@@ -104,7 +104,7 @@ private import internal.FlowSummaryImpl::Private::External
 private import internal.ExternalFlowExtensions::Extensions as Extensions
 private import codeql.mad.ModelValidation as SharedModelVal
 private import codeql.util.Unit
-private import codeql.mad.static.MaD as SharedMaD
+private import codeql.mad.static.ModelsAsData as SharedMaD
 
 /**
  * A unit class for adding additional source model rows.
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 d128feffc20..67c594e3b67 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/ExternalFlowExtensions.qll
@@ -2,7 +2,7 @@
  * This module provides extensible predicates for defining MaD models.
  */
 
-private import codeql.mad.static.MaD as SharedMaD
+private import codeql.mad.static.ModelsAsData as SharedMaD
 
 /**
  * Holds if an external source model exists for the given parameters.
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
index a36bfc06297..75d14034e00 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
@@ -101,7 +101,7 @@ private import semmle.code.csharp.dispatch.OverridableCallable
 private import semmle.code.csharp.frameworks.System
 private import codeql.dataflow.internal.AccessPathSyntax as AccessPathSyntax
 private import codeql.mad.ModelValidation as SharedModelVal
-private import codeql.mad.static.MaD as SharedMaD
+private import codeql.mad.static.ModelsAsData as SharedMaD
 
 private module MadInput implements SharedMaD::InputSig { }
 
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 acbb651bcc4..af0fdadd67f 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlowExtensions.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlowExtensions.qll
@@ -2,7 +2,7 @@
  * This module provides extensible predicates for defining MaD models.
  */
 
-private import codeql.mad.static.MaD as SharedMaD
+private import codeql.mad.static.ModelsAsData as SharedMaD
 
 /**
  * Holds if a source model exists for the given parameters.
diff --git a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
index 5d63fb1a14e..de1e3da6281 100644
--- a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
@@ -94,7 +94,7 @@ private import internal.FlowSummaryImpl::Public as Public
 private import internal.FlowSummaryImpl::Private
 private import internal.FlowSummaryImpl::Private::External
 private import codeql.mad.ModelValidation as SharedModelVal
-private import codeql.mad.static.MaD as SharedMaD
+private import codeql.mad.static.ModelsAsData as SharedMaD
 
 private module MadInput implements SharedMaD::InputSig {
   string namespaceSegmentSeparator() { result = "/" }
diff --git a/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll b/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll
index 588951944e1..c0ef008e33d 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll
@@ -2,7 +2,7 @@
  * This module provides extensible predicates for defining MaD models.
  */
 
-private import codeql.mad.static.MaD as SharedMaD
+private import codeql.mad.static.ModelsAsData as SharedMaD
 
 /**
  * Holds if a source model exists for the given parameters.
diff --git a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
index 1f8ae76ed63..4a0fc3f8546 100644
--- a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
@@ -100,7 +100,7 @@ private import internal.FlowSummaryImpl::Private
 private import internal.FlowSummaryImpl::Private::External
 private import internal.ExternalFlowExtensions::Extensions as Extensions
 private import codeql.mad.ModelValidation as SharedModelVal
-private import codeql.mad.static.MaD as SharedMaD
+private import codeql.mad.static.ModelsAsData as SharedMaD
 
 private module MadInput implements SharedMaD::InputSig {
   /** Holds if a source model exists for the given parameters. */
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 946872ab384..6d6bf236e53 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/ExternalFlowExtensions.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/ExternalFlowExtensions.qll
@@ -4,7 +4,7 @@
 overlay[local?]
 module;
 
-private import codeql.mad.static.MaD as SharedMaD
+private import codeql.mad.static.ModelsAsData as SharedMaD
 
 /**
  * Holds if a source model exists for the given parameters.
diff --git a/shared/mad/codeql/mad/static/MaD.qll b/shared/mad/codeql/mad/static/ModelsAsData.qll
similarity index 100%
rename from shared/mad/codeql/mad/static/MaD.qll
rename to shared/mad/codeql/mad/static/ModelsAsData.qll