You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/10/04 03:04:19 UTC

(cayenne) 03/03: CAY-3041 Unify XML style across XSDs

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 810dbf8c49b1d462347ad4c6c1a294c01e9eb52f
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Oct 3 21:21:11 2026 -0400

    CAY-3041 Unify XML style across XSDs
---
 UPGRADE.md                                                   |  2 +-
 ai-plugin/references/cgen-config.md                          |  4 ++--
 ai-plugin/references/datamap-schema.md                       |  8 ++++----
 ai-plugin/references/project-layout.md                       |  2 +-
 cayenne-ant/src/test/resources/cgenTest.map.xml              |  4 ++--
 cayenne-ant/src/test/resources/embeddable.map.xml            |  4 ++--
 .../apache/cayenne/tools/build-include-table.map.xml-result  |  4 ++--
 .../org/apache/cayenne/tools/cgen-dependent.map.xml          |  4 ++--
 .../src/test/resources/org/apache/cayenne/tools/cgen.map.xml |  4 ++--
 .../tools/testExcludeRelationshipFirst.map.xml-result        |  4 ++--
 cayenne-ant/src/test/resources/testmap.map.xml               |  4 ++--
 .../src/test/resources/lifecycle-map.map.xml                 |  4 ++--
 cayenne-cgen/src/test/resources/cgenRoundTrip.map.xml        |  4 ++--
 cayenne-crypto/src/test/resources/datamap.map.xml            |  4 ++--
 .../dbsync/reverse/dbimport/DefaultDbImportActionTest.java   |  4 ++--
 .../reverse/dbimport/relationship-optimisation.map.xml       |  4 ++--
 .../test/resources/org/apache/cayenne/tools/cgenMap.map.xml  |  4 ++--
 .../org/apache/cayenne/tools/cgen_with_config.map.xml        |  4 ++--
 .../resources/org/apache/cayenne/tools/exclude_Table.map.xml |  4 ++--
 .../resources/org/apache/cayenne/tools/test_datamap.map.xml  |  4 ++--
 .../src/test/resources/cgen/output/embeddable.map.xml        |  4 ++--
 .../src/test/resources/cgen/output/testmap.map.xml           |  4 ++--
 .../src/test/resources/cgen/testAdditionalMap.map.xml        |  4 ++--
 .../src/test/resources/cgen/testCgen.map.xml                 |  4 ++--
 .../src/test/resources/cgen/testCgenMap.map.xml              |  4 ++--
 .../src/test/resources/cgen/testDomainMap.map.xml            |  4 ++--
 .../tools/dbimport/testAddedFlattenedRelationship.map.xml    |  4 ++--
 .../dbimport/testAddedFlattenedRelationship.map.xml-result   |  4 ++--
 .../cayenne/tools/dbimport/testComplexChangeOrder.map.xml    |  4 ++--
 .../tools/dbimport/testComplexChangeOrder.map.xml-result     |  4 ++--
 .../cayenne/tools/dbimport/testConfigFromDataMap.map.xml     |  4 ++--
 .../tools/dbimport/testConfigFromDataMap.map.xml-result      |  4 ++--
 .../tools/dbimport/testCustomObjectLayerSettings.map.xml     |  4 ++--
 .../dbimport/testCustomObjectLayerSettings.map.xml-result    |  4 ++--
 .../cayenne/tools/dbimport/testDbAttributeChange.map.xml     |  4 ++--
 .../tools/dbimport/testDbAttributeChange.map.xml-result      |  4 ++--
 .../cayenne/tools/dbimport/testDefaultPackage.map.xml-result |  4 ++--
 .../apache/cayenne/tools/dbimport/testDropProcedure.map.xml  |  4 ++--
 .../cayenne/tools/dbimport/testDropProcedure.map.xml-result  |  4 ++--
 .../cayenne/tools/dbimport/testExcludeRelationship.map.xml   |  4 ++--
 .../tools/dbimport/testExcludeRelationship.map.xml-result    |  4 ++--
 .../dbimport/testExcludeRelationshipFirst.map.xml-result     |  4 ++--
 .../tools/dbimport/testFilteringWithSchema.map.xml-result    |  4 ++--
 .../cayenne/tools/dbimport/testFkAttributeRename.map.xml     |  4 ++--
 .../tools/dbimport/testFkAttributeRename.map.xml-result      |  4 ++--
 .../testFlattensManyToManyWithRecursiveLink.map.xml-result   |  4 ++--
 .../cayenne/tools/dbimport/testForceDataMapSchema.map.xml    |  4 ++--
 .../tools/dbimport/testForceDataMapSchema.map.xml-result     |  4 ++--
 .../tools/dbimport/testImportAddTableAndColumn.map.xml       |  4 ++--
 .../dbimport/testImportAddTableAndColumn.map.xml-result      |  4 ++--
 .../tools/dbimport/testImportNewDataMap.map.xml-result       |  4 ++--
 .../cayenne/tools/dbimport/testImportNewRelationship.map.xml |  4 ++--
 .../tools/dbimport/testImportNewRelationship.map.xml-result  |  4 ++--
 .../cayenne/tools/dbimport/testImportProcedure.map.xml       |  4 ++--
 .../tools/dbimport/testImportProcedure.map.xml-result        |  4 ++--
 .../cayenne/tools/dbimport/testImportWithoutChanges.map.xml  |  4 ++--
 .../tools/dbimport/testImportWithoutChanges.map.xml-result   |  4 ++--
 .../apache/cayenne/tools/dbimport/testInheritance.map.xml    |  4 ++--
 .../cayenne/tools/dbimport/testInheritance.map.xml-result    |  4 ++--
 .../org/apache/cayenne/tools/dbimport/testJava7Types.map.xml |  4 ++--
 .../cayenne/tools/dbimport/testJava7Types.map.xml-result     |  4 ++--
 .../org/apache/cayenne/tools/dbimport/testJava8Types.map.xml |  4 ++--
 .../cayenne/tools/dbimport/testJava8Types.map.xml-result     |  4 ++--
 .../cayenne/tools/dbimport/testNamingStrategy.map.xml-result |  4 ++--
 .../cayenne/tools/dbimport/testOneToOne.map.xml-result       |  4 ++--
 .../tools/dbimport/testPreserveCustomObjMappings.map.xml     |  4 ++--
 .../dbimport/testPreserveCustomObjMappings.map.xml-result    |  4 ++--
 .../cayenne/tools/dbimport/testPreserveRelationships.map.xml |  4 ++--
 .../tools/dbimport/testPreserveRelationships.map.xml-result  |  4 ++--
 .../apache/cayenne/tools/dbimport/testSameProcedure.map.xml  |  4 ++--
 .../cayenne/tools/dbimport/testSameProcedure.map.xml-result  |  4 ++--
 .../tools/dbimport/testSchemasAndTableExclude.map.xml-result |  4 ++--
 .../cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml |  4 ++--
 .../tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result  |  4 ++--
 .../tools/dbimport/testSkipRelationshipsLoading.map.xml      |  4 ++--
 .../dbimport/testSkipRelationshipsLoading.map.xml-result     |  4 ++--
 .../cayenne/tools/dbimport/testTableTypes.map.xml-result     |  4 ++--
 .../apache/cayenne/tools/dbimport/testTableTypesMap.map.xml  |  4 ++--
 .../cayenne/tools/dbimport/testTableTypesMap.map.xml-result  |  4 ++--
 .../cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml  |  4 ++--
 .../tools/dbimport/testUnFlattensManyToMany.map.xml-result   |  4 ++--
 .../cayenne/tools/dbimport/testViewsExclude.map.xml-result   |  4 ++--
 .../java/org/apache/cayenne/mcp/tools/cgen/CgenRunIT.java    |  4 ++--
 .../java/org/apache/cayenne/mcp/tools/cgen/CgenRunMcpIT.java |  2 +-
 .../src/test/resources/cgen-fixtures/no-cgen/TestMap.map.xml |  4 ++--
 .../test/resources/cgen-fixtures/no-destdir/TestMap.map.xml  |  4 ++--
 .../resources/dbimport-fixtures/no-dbimport/TestMap.map.xml  |  4 ++--
 .../dbimport-fixtures/with-dbimport/TestMap.map.xml          |  4 ++--
 .../cayenne/project/upgrade/DefaultProjectUpgraderTest.java  |  2 +-
 .../org/apache/cayenne/project/testProjectMap1_1.map.xml     |  4 ++--
 .../org/apache/cayenne/project/testProjectMap1_2.map.xml     |  4 ++--
 .../org/apache/cayenne/project/testProjectMap2_1.map.xml     |  4 ++--
 .../org/apache/cayenne/project/testProjectMap2_2.map.xml     |  4 ++--
 .../cayenne/configuration/upgrade/ConfigurationUpgrader.java |  2 +-
 .../apache/cayenne/configuration/upgrade/UpgradeHandler.java |  3 ++-
 .../cayenne/configuration/upgrade/UpgradeHandler_V14.java    | 12 +++++++++++-
 cayenne/src/main/java/org/apache/cayenne/map/DataMap.java    |  4 ++--
 .../apache/cayenne/schema/14/{modelMap.xsd => dataMap.xsd}   |  4 ++--
 .../configuration/upgrade/ConfigurationUpgraderTest.java     |  2 +-
 .../configuration/upgrade/UpgradeHandler_V14Test.java        |  2 +-
 .../src/test/resources/annotation/datamapAnnotation.map.xml  |  4 ++--
 cayenne/src/test/resources/array-type.map.xml                |  4 ++--
 cayenne/src/test/resources/binary-pk.map.xml                 |  4 ++--
 cayenne/src/test/resources/cay-2032.map.xml                  |  4 ++--
 cayenne/src/test/resources/cay2641/datamapLazy.map.xml       |  4 ++--
 cayenne/src/test/resources/cay2666/datamap.map.xml           |  4 ++--
 cayenne/src/test/resources/cay743/map1.map.xml               |  4 ++--
 cayenne/src/test/resources/cay743/map2.map.xml               |  4 ++--
 cayenne/src/test/resources/compound.map.xml                  |  4 ++--
 cayenne/src/test/resources/date-time.map.xml                 |  4 ++--
 cayenne/src/test/resources/embeddable.map.xml                |  4 ++--
 cayenne/src/test/resources/empty.map.xml                     |  4 ++--
 cayenne/src/test/resources/enum.map.xml                      |  4 ++--
 cayenne/src/test/resources/extended-type.map.xml             |  4 ++--
 cayenne/src/test/resources/generated.map.xml                 |  4 ++--
 cayenne/src/test/resources/generic.map.xml                   |  4 ++--
 cayenne/src/test/resources/hybrid-data-object.map.xml        |  4 ++--
 cayenne/src/test/resources/inheritance-single-table1.map.xml |  4 ++--
 cayenne/src/test/resources/inheritance-vertical.map.xml      |  4 ++--
 cayenne/src/test/resources/inheritance-with-enum.map.xml     |  4 ++--
 cayenne/src/test/resources/inheritance.map.xml               |  4 ++--
 cayenne/src/test/resources/json.map.xml                      |  4 ++--
 cayenne/src/test/resources/lazy-attributes.map.xml           |  4 ++--
 cayenne/src/test/resources/legacy-date-time.map.xml          |  4 ++--
 cayenne/src/test/resources/lifecycle-callbacks-order.map.xml |  4 ++--
 cayenne/src/test/resources/lifecycle-map.map.xml             |  4 ++--
 cayenne/src/test/resources/lob.map.xml                       |  4 ++--
 cayenne/src/test/resources/locking.map.xml                   |  4 ++--
 cayenne/src/test/resources/map-db1.map.xml                   |  4 ++--
 cayenne/src/test/resources/map-db2.map.xml                   |  4 ++--
 cayenne/src/test/resources/map-to-many.map.xml               |  4 ++--
 cayenne/src/test/resources/meaningful-pk.map.xml             |  4 ++--
 cayenne/src/test/resources/misc-types.map.xml                |  4 ++--
 .../src/test/resources/mixed-persistence-strategy.map.xml    |  4 ++--
 cayenne/src/test/resources/multi-tier.map.xml                |  4 ++--
 cayenne/src/test/resources/no-pk.map.xml                     |  4 ++--
 cayenne/src/test/resources/numeric-types.map.xml             |  4 ++--
 cayenne/src/test/resources/oneway-rels.map.xml               |  4 ++--
 .../apache/cayenne/configuration/xml/testConfigMap2.map.xml  |  4 ++--
 .../cayenne/configuration/xml/testConfigMap3_1.map.xml       |  4 ++--
 .../cayenne/configuration/xml/testConfigMap3_2.map.xml       |  4 ++--
 .../apache/cayenne/configuration/xml/testConfigMap4.map.xml  |  4 ++--
 cayenne/src/test/resources/people.map.xml                    |  4 ++--
 cayenne/src/test/resources/primitive.map.xml                 |  4 ++--
 cayenne/src/test/resources/qualified.map.xml                 |  4 ++--
 cayenne/src/test/resources/quoted-identifiers.map.xml        |  4 ++--
 cayenne/src/test/resources/reflexive.map.xml                 |  4 ++--
 cayenne/src/test/resources/relationships-activity.map.xml    |  4 ++--
 .../src/test/resources/relationships-child-master.map.xml    |  4 ++--
 cayenne/src/test/resources/relationships-clob.map.xml        |  4 ++--
 .../test/resources/relationships-collection-to-many.map.xml  |  4 ++--
 .../src/test/resources/relationships-delete-rules.map.xml    |  4 ++--
 cayenne/src/test/resources/relationships-flattened.map.xml   |  4 ++--
 .../test/resources/relationships-many-to-many-join.map.xml   |  4 ++--
 cayenne/src/test/resources/relationships-set-to-many.map.xml |  4 ++--
 cayenne/src/test/resources/relationships-to-many-fk.map.xml  |  4 ++--
 cayenne/src/test/resources/relationships-to-one-fk.map.xml   |  4 ++--
 cayenne/src/test/resources/relationships.map.xml             |  4 ++--
 cayenne/src/test/resources/return-types.map.xml              |  4 ++--
 cayenne/src/test/resources/soft-delete.map.xml               |  4 ++--
 cayenne/src/test/resources/sus-map.map.xml                   |  4 ++--
 cayenne/src/test/resources/table-primitives.map.xml          |  4 ++--
 cayenne/src/test/resources/testmap.map.xml                   |  4 ++--
 cayenne/src/test/resources/things.map.xml                    |  4 ++--
 .../src/test/resources/unsupported-distinct-types.map.xml    |  4 ++--
 cayenne/src/test/resources/uuid.map.xml                      |  4 ++--
 cayenne/src/test/resources/weighted-sort.map.xml             |  4 ++--
 docs/cayenne-guide/src/test/resources/docs.map.xml           |  4 ++--
 .../getting-started-guide/src/main/resources/datamap.map.xml |  4 ++--
 169 files changed, 342 insertions(+), 331 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index f9532b3a0..ae9fe3748 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -402,7 +402,7 @@ List<Artist> withExpensivePaintings = ObjectSelect
   camelCase, so the hyphenated names were renamed as a part of project version 14: e.g. `data-map` is now `dataMap`,
   `db-entity` is `dbEntity` and `db-attribute-path` is `dbAttributePath`. The `project-version` attribute of the root
   tags was removed, as the version is already a part of the schema namespace (e.g.
-  `http://cayenne.apache.org/schema/14/modelMap`). The boolean attributes of
+  `http://cayenne.apache.org/schema/14/dataMap`). The boolean attributes of
   `dbAttribute` lost the "is" prefix (`isMandatory` is now `mandatory`, etc.), and the delete rules are stored in
   lowercase (`nullify`, `cascade`, `deny`). Projects are upgraded automatically. Any custom code or scripts that read
   or generate the project XML must be updated.
diff --git a/ai-plugin/references/cgen-config.md b/ai-plugin/references/cgen-config.md
index 534850c4c..450d5018b 100644
--- a/ai-plugin/references/cgen-config.md
+++ b/ai-plugin/references/cgen-config.md
@@ -23,7 +23,7 @@ Reference for the embedded `<cgen>` block inside a DataMap that drives `mcp__cay
 ## XML shape (embedded in a DataMap)
 
 ```xml
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap" ...>
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap" ...>
     ...entities, relationships, etc...
 
     <cgen xmlns="http://cayenne.apache.org/schema/14/cgen">
@@ -41,7 +41,7 @@ Reference for the embedded `<cgen>` block inside a DataMap that drives `mcp__cay
 </dataMap>
 ```
 
-Note the **different namespace** for `<cgen>` (`http://cayenne.apache.org/schema/14/cgen`) — it is a separate schema embedded in the modelMap schema.
+Note the **different namespace** for `<cgen>` (`http://cayenne.apache.org/schema/14/cgen`) — it is a separate schema embedded in the dataMap schema.
 
 ## Field reference
 
diff --git a/ai-plugin/references/datamap-schema.md b/ai-plugin/references/datamap-schema.md
index d39700fb2..2659467c6 100644
--- a/ai-plugin/references/datamap-schema.md
+++ b/ai-plugin/references/datamap-schema.md
@@ -20,8 +20,8 @@
 
 Reference for editing Cayenne DataMap files directly.
 
-- **Namespace**: `http://cayenne.apache.org/schema/14/modelMap`
-- **XSD**: `http://cayenne.apache.org/schema/14/modelMap.xsd`
+- **Namespace**: `http://cayenne.apache.org/schema/14/dataMap`
+- **XSD**: `http://cayenne.apache.org/schema/14/dataMap.xsd`
 - **Project version**: `12` (Cayenne 5.0)
 - **Working example**: `cayenne-ant/src/test/resources/testmap.map.xml`
 
@@ -29,9 +29,9 @@ Reference for editing Cayenne DataMap files directly.
 
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     ...
 </dataMap>
 ```
diff --git a/ai-plugin/references/project-layout.md b/ai-plugin/references/project-layout.md
index a797d4eb7..a7adbe039 100644
--- a/ai-plugin/references/project-layout.md
+++ b/ai-plugin/references/project-layout.md
@@ -25,7 +25,7 @@ How a Cayenne project lays out on disk and how to locate the relevant files in a
 A Cayenne project consists of two kinds of XML files:
 
 1. **Project descriptor** — one per project. File name pattern: `cayenne-*.xml` (e.g. `cayenne-mydb.xml`). Root element `<domain>` in namespace `http://cayenne.apache.org/schema/14/domain`. Lists DataMaps and DataNodes.
-2. **DataMap files** — one or more per project. File name pattern: `*.map.xml` (commonly `<name>.map.xml`, where `<name>` matches the `<map name="...">` reference in the project descriptor). Root element `<dataMap>` in namespace `http://cayenne.apache.org/schema/14/modelMap`. Contains entities, relationships, queries.
+2. **DataMap files** — one or more per project. File name pattern: `*.map.xml` (commonly `<name>.map.xml`, where `<name>` matches the `<map name="...">` reference in the project descriptor). Root element `<dataMap>` in namespace `http://cayenne.apache.org/schema/14/dataMap`. Contains entities, relationships, queries.
 
 The descriptor and its DataMaps live in the **same directory**. The descriptor references DataMaps by name only (no path), so they must be siblings on the classpath.
 
diff --git a/cayenne-ant/src/test/resources/cgenTest.map.xml b/cayenne-ant/src/test/resources/cgenTest.map.xml
index 47b185c3b..39611b329 100644
--- a/cayenne-ant/src/test/resources/cgenTest.map.xml
+++ b/cayenne-ant/src/test/resources/cgenTest.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <embeddable className="Embeddable"/>
     <objEntity name="ObjEntity" className="ObjEntity"/>
     <objEntity name="ObjEntity1" className="ObjEntity1"/>
diff --git a/cayenne-ant/src/test/resources/embeddable.map.xml b/cayenne-ant/src/test/resources/embeddable.map.xml
index 1d24ff4d3..302cf90dc 100644
--- a/cayenne-ant/src/test/resources/embeddable.map.xml
+++ b/cayenne-ant/src/test/resources/embeddable.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.embeddable"/>
 	<embeddable className="org.apache.cayenne.testdo.embeddable.Embeddable1">
 		<embeddableAttribute name="embedded10" type="java.lang.String" dbAttributeName="EMBEDDED10"/>
diff --git a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/build-include-table.map.xml-result b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/build-include-table.map.xml-result
index 300228921..0a323811f 100644
--- a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/build-include-table.map.xml-result
+++ b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/build-include-table.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <dbEntity name="PARENT" schema="APP">
         <dbAttribute name="COL2" type="CHAR" length="25"/>
         <dbAttribute name="COL3" type="DECIMAL" length="10" scale="2"/>
diff --git a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
index 6a575c0d8..cc64447f8 100644
--- a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
+++ b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.cgen2"/>
 	<dbEntity name="MYARTGROUP">
 		<dbAttribute name="MY_GROUP_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen.map.xml b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
index deb574a5a..35c6d1815 100644
--- a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
+++ b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 
 	<dbEntity name="ARTGROUP">
 		<dbAttribute name="GROUP_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/testExcludeRelationshipFirst.map.xml-result b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/testExcludeRelationshipFirst.map.xml-result
index bcff4ab49..d0ad1aebb 100644
--- a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/testExcludeRelationshipFirst.map.xml-result
+++ b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/testExcludeRelationshipFirst.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
 
     <dbEntity name="TEST1" schema="SCHEMA_01">
diff --git a/cayenne-ant/src/test/resources/testmap.map.xml b/cayenne-ant/src/test/resources/testmap.map.xml
index 31260f730..31fcfa143 100644
--- a/cayenne-ant/src/test/resources/testmap.map.xml
+++ b/cayenne-ant/src/test/resources/testmap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<procedure name="cayenne_tst_out_proc">
diff --git a/cayenne-cache-invalidation/src/test/resources/lifecycle-map.map.xml b/cayenne-cache-invalidation/src/test/resources/lifecycle-map.map.xml
index 549bfabb1..e5aec0988 100644
--- a/cayenne-cache-invalidation/src/test/resources/lifecycle-map.map.xml
+++ b/cayenne-cache-invalidation/src/test/resources/lifecycle-map.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.lifecycle.db"/>
 	<dbEntity name="E1">
 		<dbAttribute name="ID" type="BIGINT" primaryKey="true" mandatory="true"/>
diff --git a/cayenne-cgen/src/test/resources/cgenRoundTrip.map.xml b/cayenne-cgen/src/test/resources/cgenRoundTrip.map.xml
index 1c09003a8..775adc550 100644
--- a/cayenne-cgen/src/test/resources/cgenRoundTrip.map.xml
+++ b/cayenne-cgen/src/test/resources/cgenRoundTrip.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <objEntity name="Artist" className="org.example.Artist">
     </objEntity>
     <cgen xmlns="http://cayenne.apache.org/schema/14/cgen">
diff --git a/cayenne-crypto/src/test/resources/datamap.map.xml b/cayenne-crypto/src/test/resources/datamap.map.xml
index 4eb13571a..dd348712d 100644
--- a/cayenne-crypto/src/test/resources/datamap.map.xml
+++ b/cayenne-crypto/src/test/resources/datamap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.crypto.db"/>
 	<dbEntity name="TABLE1">
 		<dbAttribute name="CRYPTO_INT" type="BLOB"/>
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
index cd57a19ee..3581e92d5 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
@@ -436,9 +436,9 @@ public class DefaultDbImportActionTest {
         assertFalse(dataMapFile.exists());
 
         Files.write(dataMapFile.toPath(), ("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-                "<dataMap xmlns=\"http://cayenne.apache.org/schema/14/modelMap\"\n" +
+                "<dataMap xmlns=\"http://cayenne.apache.org/schema/14/dataMap\"\n" +
                 "\t xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-                "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd\">\n" +
+                "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd\">\n" +
                 "\t<dbEntity name=\"test\">\n" +
                 "\t\t<dbAttribute name=\"test\" type=\"INT\"/>\n" +
                 "\t</dbEntity>\n" +
diff --git a/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/relationship-optimisation.map.xml b/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/relationship-optimisation.map.xml
index 505ca9d5e..c6746249c 100644
--- a/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/relationship-optimisation.map.xml
+++ b/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/relationship-optimisation.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="com.objectstyle"/>
 	<dbEntity name="table1" catalog="many_to_many_test">
 		<dbAttribute name="id1" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/cgenMap.map.xml b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/cgenMap.map.xml
index c5767a177..be0618109 100644
--- a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/cgenMap.map.xml
+++ b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/cgenMap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <embeddable className="Embeddable"/>
     <objEntity name="ObjEntity" className="ObjEntity"/>
     <objEntity name="ObjEntity1" className="ObjEntity1"/>
diff --git a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/cgen_with_config.map.xml b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/cgen_with_config.map.xml
index 380b57af7..a4fb4bfdb 100644
--- a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/cgen_with_config.map.xml
+++ b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/cgen_with_config.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <embeddable className="Embeddable"/>
     <objEntity name="ObjEntity" className="ObjEntity"/>
     <objEntity name="ObjEntity1" className="ObjEntity1"/>
diff --git a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/exclude_Table.map.xml b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/exclude_Table.map.xml
index 0762b476b..9e584813e 100644
--- a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/exclude_Table.map.xml
+++ b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/exclude_Table.map.xml
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 
     <property name="defaultPackage" value="org.example.cayenne.persistent"/>
     <dbEntity name="City">
diff --git a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/test_datamap.map.xml b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/test_datamap.map.xml
index 0762b476b..9e584813e 100644
--- a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/test_datamap.map.xml
+++ b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/test_datamap.map.xml
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 
     <property name="defaultPackage" value="org.example.cayenne.persistent"/>
     <dbEntity name="City">
diff --git a/cayenne-maven-plugin/src/test/resources/cgen/output/embeddable.map.xml b/cayenne-maven-plugin/src/test/resources/cgen/output/embeddable.map.xml
index 1d24ff4d3..302cf90dc 100644
--- a/cayenne-maven-plugin/src/test/resources/cgen/output/embeddable.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/cgen/output/embeddable.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.embeddable"/>
 	<embeddable className="org.apache.cayenne.testdo.embeddable.Embeddable1">
 		<embeddableAttribute name="embedded10" type="java.lang.String" dbAttributeName="EMBEDDED10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/cgen/output/testmap.map.xml b/cayenne-maven-plugin/src/test/resources/cgen/output/testmap.map.xml
index 31260f730..31fcfa143 100644
--- a/cayenne-maven-plugin/src/test/resources/cgen/output/testmap.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/cgen/output/testmap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<procedure name="cayenne_tst_out_proc">
diff --git a/cayenne-maven-plugin/src/test/resources/cgen/testAdditionalMap.map.xml b/cayenne-maven-plugin/src/test/resources/cgen/testAdditionalMap.map.xml
index b4fd36342..8c1b794e8 100644
--- a/cayenne-maven-plugin/src/test/resources/cgen/testAdditionalMap.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/cgen/testAdditionalMap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="pack"/>
 	<dbEntity name="TestRelEntity">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne-maven-plugin/src/test/resources/cgen/testCgen.map.xml b/cayenne-maven-plugin/src/test/resources/cgen/testCgen.map.xml
index 621787641..e23b57498 100644
--- a/cayenne-maven-plugin/src/test/resources/cgen/testCgen.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/cgen/testCgen.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <embeddable className="Embeddable"/>
     <objEntity name="ObjEntity" className="ObjEntity"/>
     <objEntity name="ObjEntity1" className="ObjEntity1"/>
diff --git a/cayenne-maven-plugin/src/test/resources/cgen/testCgenMap.map.xml b/cayenne-maven-plugin/src/test/resources/cgen/testCgenMap.map.xml
index a804cc76b..ce979d6f9 100644
--- a/cayenne-maven-plugin/src/test/resources/cgen/testCgenMap.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/cgen/testCgenMap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <embeddable className="Embeddable"/>
     <objEntity name="ObjEntity" className="ObjEntity"/>
     <objEntity name="ObjEntity1" className="ObjEntity1"/>
diff --git a/cayenne-maven-plugin/src/test/resources/cgen/testDomainMap.map.xml b/cayenne-maven-plugin/src/test/resources/cgen/testDomainMap.map.xml
index e8226f792..4f6453b09 100644
--- a/cayenne-maven-plugin/src/test/resources/cgen/testDomainMap.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/cgen/testDomainMap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="pack"/>
 	<embeddable className="pack.Embeddable">
 		<embeddableAttribute name="embAttr" type="java.lang.String" dbAttributeName="EMB_ATTR"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml
index 1279c6966..1783d3061 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 
     <dbEntity name="A" schema="SCHEMA_01">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml-result
index 98669a5ae..fb6c0efb9 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml-result
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="A" schema="SCHEMA_01">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
 	</dbEntity>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml
index 8a8beaa60..b793fe6ca 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
 
 
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
index df9a73f92..632e6d5e4 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
 
     <dbEntity name="ADDRESS" schema="SCHEMA_01">
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml
index 76cee7f44..b82b1206e 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 
     <dbImport xmlns="http://cayenne.apache.org/schema/14/dbimport">
         <schema>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
index 42d755d61..0187e6102 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="PARENT">
 		<dbAttribute name="COL2" type="CHAR" length="20"/>
 		<dbAttribute name="COL3" type="DECIMAL" length="10" scale="2"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml
index d5803dcd2..aa3569346 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
     <dbEntity name="EXISTING_TABLE" schema="SCHEMA_01">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
index 10cb74ca3..fd4e9a082 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
     <dbEntity name="EXISTING_TABLE" schema="SCHEMA_01">
     	<dbAttribute name="COL2" type="INTEGER" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml
index 463981da6..05cf98e57 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 
     <dbEntity name="parent" schema="SCHEMA_01">
         <dbAttribute name="COL2" type="CHAR" length="25"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml-result
index 0d6fce865..4c486f9c5 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml-result
@@ -18,9 +18,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 
     <dbEntity name="CHILD" schema="SCHEMA_01">
         <dbAttribute name="COL3" type="DECIMAL" length="5" scale="1"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
index 5e88d8044..4cf1ffe11 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.example.test"/>
     <property name="defaultSchema" value="SCHEMA_01"/>
     <dbEntity name="CHILD" schema="SCHEMA_01">
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml
index 999d531ed..0f0addebe 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <procedure name="PROC" schema="SCHEMA_01"/>
     <dbEntity name="TABLE1" schema="SCHEMA_01">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml-result
index 3050c475e..ac24b6955 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml-result
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="TABLE2" schema="SCHEMA_01">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
 		<dbAttribute name="T1_NAME" type="VARCHAR" length="45"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml
index b45f1db28..39cf7bb7f 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
     <dbEntity name="TEST1" schema="SCHEMA_01">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml-result
index 02cc73f8a..24e4bca4d 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultSchema" value="SCHEMA_01"/>
 	<dbEntity name="TEST1" schema="SCHEMA_01">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
index 92991a1f0..2afd80560 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
 
     <dbEntity name="TEST1" schema="SCHEMA_01">
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
index d6b11a047..7b970a8de 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
     <dbEntity name="CHILD" schema="SCHEMA_01">
         <dbAttribute name="COL3" type="DECIMAL" length="10" scale="2"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml
index 03f054bbb..bab0eb4c4 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 
     <dbEntity name="CHILD" schema="SCHEMA_01">
         <dbAttribute name="id" type="INTEGER" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml-result
index ebcaf6502..948918c23 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml-result
@@ -18,9 +18,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="CHILD" schema="SCHEMA_01">
 		<dbAttribute name="PAR" type="INTEGER" length="10"/>
 		<dbAttribute name="id" type="INTEGER" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
index 376683e32..3ff5daad5 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.not.my.home"/>
 	<dbEntity name="A" schema="APP">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml
index 507cc91f0..0063da793 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.example.test"/>
     <property name="defaultCatalog" value="XCATALOG"/>
 </dataMap>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml-result
index 3e00f5b55..f32cb9ceb 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.example.test"/>
     <property name="defaultCatalog" value="XCATALOG"/>
     <dbEntity name="CHILD" catalog="XCATALOG">
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml
index 9d03cbdb2..af3e47929 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="testImportAddTableAndColumn" schema="APP">
 		<dbAttribute name="COL1" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
 		<dbAttribute name="COL2" type="CHAR" length="25"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
index 64e0fe6eb..ce79e97ed 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <dbEntity name="CHILD" schema="APP">
         <dbAttribute name="COL3" type="DECIMAL" length="10" scale="2"/>
         <dbAttribute name="COL4" type="VARCHAR" length="25"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
index ab70a4a98..9b795a3b9 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="TEST_TABLE" schema="APP">
 		<dbAttribute name="COL1" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
 		<dbAttribute name="COL2" type="CHAR" length="25"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml
index 5e35120cf..ad7d093f0 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
     <dbEntity name="TABLE1" schema="SCHEMA_01">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml-result
index bf8fb3f39..891e04e2a 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml-result
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultSchema" value="SCHEMA_01"/>
 	<dbEntity name="TABLE1" schema="SCHEMA_01">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml
index 0e415a99a..691699515 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <dbEntity name="TABLE1" schema="SCHEMA_01">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
         <dbAttribute name="T1_NAME" type="VARCHAR" length="45"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml-result
index d517288a8..f256e0825 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml-result
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<procedure name="PROC" schema="SCHEMA_01">
 	    <procedureParameter name="TEST" type="INTEGER" length="4" direction="in"/>
     	<procedureParameter name="TOTAL" type="DECIMAL" length="24" precision="2" direction="out"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml
index 68c97167c..5d5ba7767 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.   
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="testImportWithoutChanges" schema="APP">
 		<dbAttribute name="COL1" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
 		<dbAttribute name="COL2" type="CHAR" length="25"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
index 857a2ecf1..75fa91a3c 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="testImportWithoutChanges" schema="APP">
 		<dbAttribute name="COL1" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
 		<dbAttribute name="COL2" type="CHAR" length="25"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml
index 09417e397..38cca164a 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 
     <dbEntity name="CHILD" schema="SCHEMA_01">
         <dbAttribute name="id" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml-result
index 6e898f789..fcb693f15 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml-result
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 
     <dbEntity name="CHILD" schema="SCHEMA_01">
         <dbAttribute name="id" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml
index d2ad46aa1..1b7b7f5e1 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
 </dataMap>
 
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml-result
index 1ca6b374f..1ab098fa3 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml-result
@@ -18,9 +18,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
 
     <dbEntity name="CHILD" schema="SCHEMA_01">
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml
index d2ad46aa1..1b7b7f5e1 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
 </dataMap>
 
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml-result
index 7bfd8c298..8108c4a80 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml-result
@@ -18,9 +18,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
 
     <dbEntity name="CHILD" schema="SCHEMA_01">
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testNamingStrategy.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testNamingStrategy.map.xml-result
index 1260ec97f..30e19cde6 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testNamingStrategy.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testNamingStrategy.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="TEST_TABLE" schema="APP">
 		<dbAttribute name="COL1" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
 		<dbAttribute name="COL2" type="CHAR" length="25"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
index b02df03a7..4526099a2 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="PICK_SCHEDULE" schema="APP">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
 		<dbAttribute name="OWNER_ID" type="INTEGER" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml
index d0d1e3d03..bf9677a27 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
     <dbEntity name="PARENT" schema="SCHEMA_01">
         <dbAttribute name="COL2" type="CHAR" length="25"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result
index 4453dd5c8..d170fcf04 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
     <dbEntity name="PARENT" schema="SCHEMA_01">
         <dbAttribute name="COL2" type="CHAR" length="25"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml
index 72405b46a..9c0516cc8 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml
@@ -17,9 +17,9 @@
   specific language governing permissions and limitations
   under the License.
   -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <dbEntity name="CHILD" schema="APP">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
         <dbAttribute name="PARENT_ID" type="INTEGER" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
index 24c651292..38d71b704 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <dbEntity name="CHILD" schema="APP">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
     </dbEntity>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml
index 999d531ed..0f0addebe 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <procedure name="PROC" schema="SCHEMA_01"/>
     <dbEntity name="TABLE1" schema="SCHEMA_01">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml-result
index d517288a8..f256e0825 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml-result
@@ -17,9 +17,9 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<procedure name="PROC" schema="SCHEMA_01">
 	    <procedureParameter name="TEST" type="INTEGER" length="4" direction="in"/>
     	<procedureParameter name="TOTAL" type="DECIMAL" length="24" precision="2" direction="out"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
index f2dc2b6ae..7fa12ccfb 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultSchema" value="SCHEMA_01"/>
     <dbEntity name="PARENT" schema="SCHEMA_01">
         <dbAttribute name="COL2" type="CHAR" length="25"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml
index 2e9dcae77..ed6c77891 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml
@@ -17,9 +17,9 @@
   specific language governing permissions and limitations
   under the License.
   -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.my.home"/>
     <dbEntity name="A" schema="APP">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
index f29056f0b..d5eae719f 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
@@ -17,9 +17,9 @@
   specific language governing permissions and limitations
   under the License.
   -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="com.my.home"/>
 	<dbEntity name="A" schema="APP">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml
index dc4611eef..e2f726e1b 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml
@@ -17,9 +17,9 @@
   specific language governing permissions and limitations
   under the License.
   -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.my.home"/>
     <dbEntity name="A" schema="APP">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
index 3057ed2e6..fdcd80fc2 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
@@ -17,9 +17,9 @@
   specific language governing permissions and limitations
   under the License.
   -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.my.home"/>
     <dbEntity name="A" schema="APP">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
index 95195ccfa..23878e610 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
@@ -17,9 +17,9 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <dbEntity name="PERSON" schema="APP">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
     </dbEntity>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml
index d7fa8a382..29b3c4d75 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml
@@ -17,9 +17,9 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <dbImport xmlns="http://cayenne.apache.org/schema/14/dbimport">
         <tableTypes>
             <tableType>TABLE</tableType>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
index 00a407f27..b09c51edc 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
@@ -17,9 +17,9 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <dbEntity name="PERSON" schema="APP">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
     </dbEntity>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
index 32983e04b..79dca7627 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
@@ -17,9 +17,9 @@
   specific language governing permissions and limitations
   under the License.
   -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.my.home"/>
     <dbEntity name="A" schema="APP">
         <dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
index b1a97e2b2..bb4fbb5c2 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
@@ -17,9 +17,9 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.not.my.home"/>
 	<dbEntity name="A" schema="APP">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="10"/>
diff --git a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
index 299359cde..dbe4b4fb3 100644
--- a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
+++ b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
@@ -17,9 +17,9 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
     <dbEntity name="GIRL" schema="APP">
         <dbAttribute name="ID" type="INTEGER" mandatory="true" length="10"/>
     </dbEntity>
diff --git a/cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/cgen/CgenRunIT.java b/cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/cgen/CgenRunIT.java
index eed06b089..5651cbe4d 100644
--- a/cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/cgen/CgenRunIT.java
+++ b/cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/cgen/CgenRunIT.java
@@ -163,7 +163,7 @@ public class CgenRunIT {
                 """);
         Files.writeString(mapFile, """
                 <?xml version="1.0" encoding="utf-8"?>
-                <dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+                <dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
                           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                     <property name="defaultPackage" value="com.example"/>
                     <objEntity name="Person" className="com.example.Person"/>
@@ -201,7 +201,7 @@ public class CgenRunIT {
         // DataMap with one entity and embedded cgen config
         Files.writeString(tempDir.resolve(mapName + ".map.xml"), String.format("""
                 <?xml version="1.0" encoding="utf-8"?>
-                <dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+                <dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
                           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                     <property name="defaultPackage" value="%s"/>
                     <objEntity name="Person" className="%s.Person"/>
diff --git a/cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/cgen/CgenRunMcpIT.java b/cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/cgen/CgenRunMcpIT.java
index b62f9c6bf..86f1ef89f 100644
--- a/cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/cgen/CgenRunMcpIT.java
+++ b/cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/cgen/CgenRunMcpIT.java
@@ -176,7 +176,7 @@ public class CgenRunMcpIT {
 
         Files.writeString(tempDir.resolve(mapName + ".map.xml"), String.format("""
                 <?xml version="1.0" encoding="utf-8"?>
-                <dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+                <dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
                           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                     <property name="defaultPackage" value="%s"/>
                     <objEntity name="Person" className="%s.Person"/>
diff --git a/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-cgen/TestMap.map.xml b/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-cgen/TestMap.map.xml
index be3fb21b5..c5a45161b 100644
--- a/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-cgen/TestMap.map.xml
+++ b/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-cgen/TestMap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.example"/>
     <objEntity name="Person" className="com.example.Person"/>
 </dataMap>
diff --git a/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-destdir/TestMap.map.xml b/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-destdir/TestMap.map.xml
index 268e69a23..2aac9e741 100644
--- a/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-destdir/TestMap.map.xml
+++ b/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-destdir/TestMap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.example"/>
     <objEntity name="Person" className="com.example.Person"/>
     <cgen xmlns="http://cayenne.apache.org/schema/14/cgen">
diff --git a/cayenne-mcp-server/src/test/resources/dbimport-fixtures/no-dbimport/TestMap.map.xml b/cayenne-mcp-server/src/test/resources/dbimport-fixtures/no-dbimport/TestMap.map.xml
index 87b01e3dc..c1a181f40 100644
--- a/cayenne-mcp-server/src/test/resources/dbimport-fixtures/no-dbimport/TestMap.map.xml
+++ b/cayenne-mcp-server/src/test/resources/dbimport-fixtures/no-dbimport/TestMap.map.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.example"/>
 </dataMap>
diff --git a/cayenne-mcp-server/src/test/resources/dbimport-fixtures/with-dbimport/TestMap.map.xml b/cayenne-mcp-server/src/test/resources/dbimport-fixtures/with-dbimport/TestMap.map.xml
index 4cdef0026..6cdf95d99 100644
--- a/cayenne-mcp-server/src/test/resources/dbimport-fixtures/with-dbimport/TestMap.map.xml
+++ b/cayenne-mcp-server/src/test/resources/dbimport-fixtures/with-dbimport/TestMap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
     <property name="defaultPackage" value="com.example"/>
     <dbImport xmlns="http://cayenne.apache.org/schema/14/dbimport">
         <skipRelationshipsLoading>false</skipRelationshipsLoading>
diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultProjectUpgraderTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultProjectUpgraderTest.java
index ebd0a6d8b..0be8579a5 100644
--- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultProjectUpgraderTest.java
+++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultProjectUpgraderTest.java
@@ -122,7 +122,7 @@ public class DefaultProjectUpgraderTest {
 
         String map = Files.readString(mapFile.toPath());
         assertFalse(map.contains("project-version"), map);
-        assertTrue(map.contains("http://cayenne.apache.org/schema/14/modelMap"), map);
+        assertTrue(map.contains("http://cayenne.apache.org/schema/14/dataMap"), map);
 
         assertFalse(graphFile.exists(), "graph file must be deleted");
 
diff --git a/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap1_1.map.xml b/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap1_1.map.xml
index 622c0c959..9bf3612af 100644
--- a/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap1_1.map.xml
+++ b/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap1_1.map.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd"/>
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd"/>
diff --git a/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap1_2.map.xml b/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap1_2.map.xml
index 622c0c959..9bf3612af 100644
--- a/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap1_2.map.xml
+++ b/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap1_2.map.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd"/>
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd"/>
diff --git a/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap2_1.map.xml b/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap2_1.map.xml
index 622c0c959..9bf3612af 100644
--- a/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap2_1.map.xml
+++ b/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap2_1.map.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd"/>
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd"/>
diff --git a/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap2_2.map.xml b/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap2_2.map.xml
index 622c0c959..9bf3612af 100644
--- a/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap2_2.map.xml
+++ b/cayenne-project/src/test/resources/org/apache/cayenne/project/testProjectMap2_2.map.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd"/>
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd"/>
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/ConfigurationUpgrader.java b/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/ConfigurationUpgrader.java
index 564193acc..0ba2c4e66 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/ConfigurationUpgrader.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/ConfigurationUpgrader.java
@@ -78,7 +78,7 @@ public class ConfigurationUpgrader {
 
     /**
      * Returns the version of a project or DataMap XML based on its root tag, or null if it can't be determined. The
-     * version is a part of the root namespace, e.g. "http://cayenne.apache.org/schema/14/modelMap". The documents
+     * version is a part of the root namespace, e.g. "http://cayenne.apache.org/schema/14/dataMap". The documents
      * older than version 14 may have no namespace, or a namespace with no project version in it, in which case the
      * version is taken from their "project-version" attribute.
      *
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler.java b/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler.java
index 354891414..1b8cde661 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler.java
@@ -142,7 +142,8 @@ public sealed interface UpgradeHandler permits
     }
 
     /**
-     * Upgrade DataMap schema and version info
+     * Upgrade DataMap schema and version info. Only applies to the versions before 14, where the DataMap schema is
+     * called "modelMap".
      *
      * @param upgradeUnit for the datamap
      */
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler_V14.java b/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler_V14.java
index 04cef8aaa..317604375 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler_V14.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler_V14.java
@@ -62,7 +62,7 @@ public final class UpgradeHandler_V14 implements UpgradeHandler {
 
     @Override
     public void processDataMapDom(UpgradeContext upgradeUnit) {
-        updateDataMapSchemaAndVersion(upgradeUnit);
+        updateDataMapSchema(upgradeUnit);
         updateExtensionSchema(upgradeUnit, CGEN);
         updateExtensionSchema(upgradeUnit, DB_IMPORT);
         updateInfoSchema(upgradeUnit);
@@ -76,6 +76,16 @@ public final class UpgradeHandler_V14 implements UpgradeHandler {
         convertNamesToCamelCase(upgradeUnit);
     }
 
+    /**
+     * Switches the DataMap to the version 14 schema, that is called "dataMap" instead of "modelMap".
+     */
+    private void updateDataMapSchema(UpgradeContext upgradeUnit) {
+        Element dataMap = upgradeUnit.getDocument().getDocumentElement();
+        dataMap.setAttribute("xmlns", "http://cayenne.apache.org/schema/14/dataMap");
+        dataMap.setAttribute("xsi:schemaLocation", "http://cayenne.apache.org/schema/14/dataMap "
+                + "https://cayenne.apache.org/schema/14/dataMap.xsd");
+    }
+
     /**
      * Drops the "is" prefix of the boolean attributes of "db-attribute", e.g. "isMandatory" becomes "mandatory".
      */
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/DataMap.java b/cayenne/src/main/java/org/apache/cayenne/map/DataMap.java
index c4444ddb1..2a03ac20c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/DataMap.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/DataMap.java
@@ -90,8 +90,8 @@ public class DataMap implements ConfigurationNode, XMLSerializable, MappingNames
 	 * The namespace in which the data map XML file will be created. This is
 	 * also the URI to locate a copy of the schema document.
 	 */
-	public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/14/modelMap";
-    public static final String SCHEMA_XSD_LOCATION = "https://cayenne.apache.org/schema/14/modelMap.xsd";
+	public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/14/dataMap";
+    public static final String SCHEMA_XSD_LOCATION = "https://cayenne.apache.org/schema/14/dataMap.xsd";
 
 	protected String name;
 	protected String location;
diff --git a/cayenne/src/main/resources/org/apache/cayenne/schema/14/modelMap.xsd b/cayenne/src/main/resources/org/apache/cayenne/schema/14/dataMap.xsd
similarity index 99%
rename from cayenne/src/main/resources/org/apache/cayenne/schema/14/modelMap.xsd
rename to cayenne/src/main/resources/org/apache/cayenne/schema/14/dataMap.xsd
index de29debfb..0c48fb288 100644
--- a/cayenne/src/main/resources/org/apache/cayenne/schema/14/modelMap.xsd
+++ b/cayenne/src/main/resources/org/apache/cayenne/schema/14/dataMap.xsd
@@ -25,8 +25,8 @@
 	are usually combined in one shared namespace, so the elements of the DataMap
 	may reference objects from other DataMaps.
 -->
-<xs:schema targetNamespace="http://cayenne.apache.org/schema/14/modelMap"
-	xmlns:cay="http://cayenne.apache.org/schema/14/modelMap"
+<xs:schema targetNamespace="http://cayenne.apache.org/schema/14/dataMap"
+	xmlns:cay="http://cayenne.apache.org/schema/14/dataMap"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="14">
 	<xs:element name="dataMap">
 		<xs:complexType>
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/upgrade/ConfigurationUpgraderTest.java b/cayenne/src/test/java/org/apache/cayenne/configuration/upgrade/ConfigurationUpgraderTest.java
index b2f675f60..f4eec9610 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/upgrade/ConfigurationUpgraderTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/upgrade/ConfigurationUpgraderTest.java
@@ -125,7 +125,7 @@ public class ConfigurationUpgraderTest {
         Element root = context.getDocument().getDocumentElement();
         assertEquals("dataMap", root.getNodeName());
         assertFalse(root.hasAttribute("project-version"));
-        assertEquals("http://cayenne.apache.org/schema/14/modelMap", root.getAttribute("xmlns"));
+        assertEquals("http://cayenne.apache.org/schema/14/dataMap", root.getAttribute("xmlns"));
     }
 
     @Test
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler_V14Test.java b/cayenne/src/test/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler_V14Test.java
index 59d6e34b4..a42022409 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler_V14Test.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/upgrade/UpgradeHandler_V14Test.java
@@ -77,7 +77,7 @@ public class UpgradeHandler_V14Test extends BaseUpgradeHandlerTest {
 
         Element root = document.getDocumentElement();
         assertFalse(root.hasAttribute("project-version"));
-        assertEquals("http://cayenne.apache.org/schema/14/modelMap", root.getAttribute("xmlns"));
+        assertEquals("http://cayenne.apache.org/schema/14/dataMap", root.getAttribute("xmlns"));
 
         // all tags and attributes are renamed to camelCase
         assertEquals("dataMap", root.getNodeName());
diff --git a/cayenne/src/test/resources/annotation/datamapAnnotation.map.xml b/cayenne/src/test/resources/annotation/datamapAnnotation.map.xml
index 6afede9b7..debe96110 100644
--- a/cayenne/src/test/resources/annotation/datamapAnnotation.map.xml
+++ b/cayenne/src/test/resources/annotation/datamapAnnotation.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.annotation"/>
 	<dbEntity name="artist_annotation">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/array-type.map.xml b/cayenne/src/test/resources/array-type.map.xml
index f39aae21d..6a390c4a0 100644
--- a/cayenne/src/test/resources/array-type.map.xml
+++ b/cayenne/src/test/resources/array-type.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.array_type"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="ARRAY_TEST">
diff --git a/cayenne/src/test/resources/binary-pk.map.xml b/cayenne/src/test/resources/binary-pk.map.xml
index e8f6b4742..64c608289 100644
--- a/cayenne/src/test/resources/binary-pk.map.xml
+++ b/cayenne/src/test/resources/binary-pk.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.binary_pk"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="BINARY_PK_TEST1">
diff --git a/cayenne/src/test/resources/cay-2032.map.xml b/cayenne/src/test/resources/cay-2032.map.xml
index c4da77fe1..854013066 100644
--- a/cayenne/src/test/resources/cay-2032.map.xml
+++ b/cayenne/src/test/resources/cay-2032.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.cay_2032"/>
 	<dbEntity name="TEAM">
 		<dbAttribute name="team_id" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/cay2641/datamapLazy.map.xml b/cayenne/src/test/resources/cay2641/datamapLazy.map.xml
index 042472318..d3e9c1697 100644
--- a/cayenne/src/test/resources/cay2641/datamapLazy.map.xml
+++ b/cayenne/src/test/resources/cay2641/datamapLazy.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.cay_2641"/>
 	<dbEntity name="ArtistLazy">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true" length="5"/>
diff --git a/cayenne/src/test/resources/cay2666/datamap.map.xml b/cayenne/src/test/resources/cay2666/datamap.map.xml
index 5e4d7b5ce..e5cd68fcc 100644
--- a/cayenne/src/test/resources/cay2666/datamap.map.xml
+++ b/cayenne/src/test/resources/cay2666/datamap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="quoteSqlIdentifiers" value="true"/>
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.cay_2666"/>
 	<dbEntity name="Cay2666">
diff --git a/cayenne/src/test/resources/cay743/map1.map.xml b/cayenne/src/test/resources/cay743/map1.map.xml
index dd82f4dec..aac0ddd79 100644
--- a/cayenne/src/test/resources/cay743/map1.map.xml
+++ b/cayenne/src/test/resources/cay743/map1.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<objEntity name="Entity11">
 	</objEntity>
 	<objEntity name="Entity12" superEntityName="Entity22">
diff --git a/cayenne/src/test/resources/cay743/map2.map.xml b/cayenne/src/test/resources/cay743/map2.map.xml
index 4e3051100..3651ab334 100644
--- a/cayenne/src/test/resources/cay743/map2.map.xml
+++ b/cayenne/src/test/resources/cay743/map2.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<objEntity name="Entity21" superEntityName="Entity11">
 	</objEntity>
 	<objEntity name="Entity22">
diff --git a/cayenne/src/test/resources/compound.map.xml b/cayenne/src/test/resources/compound.map.xml
index c050f9fe0..8886c4f60 100644
--- a/cayenne/src/test/resources/compound.map.xml
+++ b/cayenne/src/test/resources/compound.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.compound"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="CHAR_FK_TEST">
diff --git a/cayenne/src/test/resources/date-time.map.xml b/cayenne/src/test/resources/date-time.map.xml
index 9986382fa..742b4b125 100644
--- a/cayenne/src/test/resources/date-time.map.xml
+++ b/cayenne/src/test/resources/date-time.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.datetime"/>
 	<dbEntity name="DURATION_TEST">
 		<dbAttribute name="DURATION_BIG_INT" type="BIGINT"/>
diff --git a/cayenne/src/test/resources/embeddable.map.xml b/cayenne/src/test/resources/embeddable.map.xml
index 2db4b1e5a..13ea6e196 100644
--- a/cayenne/src/test/resources/embeddable.map.xml
+++ b/cayenne/src/test/resources/embeddable.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.embeddable"/>
 	<embeddable className="org.apache.cayenne.testdo.embeddable.Embeddable1">
 		<embeddableAttribute name="embedded20" type="java.lang.String" dbAttributeName="EMBEDDED20"/>
diff --git a/cayenne/src/test/resources/empty.map.xml b/cayenne/src/test/resources/empty.map.xml
index 863c95197..68959fb10 100644
--- a/cayenne/src/test/resources/empty.map.xml
+++ b/cayenne/src/test/resources/empty.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="EMPTY_ENTITY">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
 	</dbEntity>
diff --git a/cayenne/src/test/resources/enum.map.xml b/cayenne/src/test/resources/enum.map.xml
index 9b0bbacd3..cb1d7ef18 100644
--- a/cayenne/src/test/resources/enum.map.xml
+++ b/cayenne/src/test/resources/enum.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.enum_test"/>
 	<dbEntity name="ENUM_ENTITY">
 		<dbAttribute name="ENUM_ATTRIBUTE" type="VARCHAR" length="250"/>
diff --git a/cayenne/src/test/resources/extended-type.map.xml b/cayenne/src/test/resources/extended-type.map.xml
index 1c1dab986..544a075e2 100644
--- a/cayenne/src/test/resources/extended-type.map.xml
+++ b/cayenne/src/test/resources/extended-type.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.extended_type"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="EXTENDED_TYPE_TEST">
diff --git a/cayenne/src/test/resources/generated.map.xml b/cayenne/src/test/resources/generated.map.xml
index 3d9939a74..de77e235c 100644
--- a/cayenne/src/test/resources/generated.map.xml
+++ b/cayenne/src/test/resources/generated.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.generated"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="GENERATED_COLUMN_COMP_KEY">
diff --git a/cayenne/src/test/resources/generic.map.xml b/cayenne/src/test/resources/generic.map.xml
index d18c4e81c..9417354e7 100644
--- a/cayenne/src/test/resources/generic.map.xml
+++ b/cayenne/src/test/resources/generic.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.generic"/>
 	<dbEntity name="GENERIC1">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/hybrid-data-object.map.xml b/cayenne/src/test/resources/hybrid-data-object.map.xml
index 7f279a2d7..aa80622a8 100644
--- a/cayenne/src/test/resources/hybrid-data-object.map.xml
+++ b/cayenne/src/test/resources/hybrid-data-object.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.hybrid"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.HybridPersistentObject"/>
 	<dbEntity name="HYBRID_ENTITY_1">
diff --git a/cayenne/src/test/resources/inheritance-single-table1.map.xml b/cayenne/src/test/resources/inheritance-single-table1.map.xml
index faa588a50..e6725bfac 100644
--- a/cayenne/src/test/resources/inheritance-single-table1.map.xml
+++ b/cayenne/src/test/resources/inheritance-single-table1.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_flat"/>
 	<dbEntity name="GROUP_MEMBERS">
 		<dbAttribute name="group_id" type="BIGINT" mandatory="true"/>
diff --git a/cayenne/src/test/resources/inheritance-vertical.map.xml b/cayenne/src/test/resources/inheritance-vertical.map.xml
index e0dec5fb2..e3e258189 100644
--- a/cayenne/src/test/resources/inheritance-vertical.map.xml
+++ b/cayenne/src/test/resources/inheritance-vertical.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_vertical"/>
 	<dbEntity name="IV1_ROOT">
 		<dbAttribute name="DISCRIMINATOR" type="VARCHAR" length="10"/>
diff --git a/cayenne/src/test/resources/inheritance-with-enum.map.xml b/cayenne/src/test/resources/inheritance-with-enum.map.xml
index 483c6c6d4..dcb413aa9 100644
--- a/cayenne/src/test/resources/inheritance-with-enum.map.xml
+++ b/cayenne/src/test/resources/inheritance-with-enum.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_with_enum"/>
 	<dbEntity name="iwe_dependent">
 		<dbAttribute name="id" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/inheritance.map.xml b/cayenne/src/test/resources/inheritance.map.xml
index 94893eec3..2eff71e63 100644
--- a/cayenne/src/test/resources/inheritance.map.xml
+++ b/cayenne/src/test/resources/inheritance.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance"/>
 	<dbEntity name="BASE_ENTITY">
 		<dbAttribute name="BASE_ENTITY_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/json.map.xml b/cayenne/src/test/resources/json.map.xml
index 8396ee47e..13be07394 100644
--- a/cayenne/src/test/resources/json.map.xml
+++ b/cayenne/src/test/resources/json.map.xml
@@ -17,9 +17,9 @@
    specific language governing permissions and limitations
    under the License.
 -->
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.json"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="JSON_OTHER">
diff --git a/cayenne/src/test/resources/lazy-attributes.map.xml b/cayenne/src/test/resources/lazy-attributes.map.xml
index 49e7c5419..4e970a129 100644
--- a/cayenne/src/test/resources/lazy-attributes.map.xml
+++ b/cayenne/src/test/resources/lazy-attributes.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.lazy"/>
 	<dbEntity name="LAZYBLOB">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/legacy-date-time.map.xml b/cayenne/src/test/resources/legacy-date-time.map.xml
index dc5eeb06a..6947df4ce 100644
--- a/cayenne/src/test/resources/legacy-date-time.map.xml
+++ b/cayenne/src/test/resources/legacy-date-time.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.legacy_datetime"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="CALENDAR_TEST">
diff --git a/cayenne/src/test/resources/lifecycle-callbacks-order.map.xml b/cayenne/src/test/resources/lifecycle-callbacks-order.map.xml
index 9048cdfac..051be763c 100644
--- a/cayenne/src/test/resources/lifecycle-callbacks-order.map.xml
+++ b/cayenne/src/test/resources/lifecycle-callbacks-order.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/>
 	<dbEntity name="LIFECYCLE">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/lifecycle-map.map.xml b/cayenne/src/test/resources/lifecycle-map.map.xml
index 8e940f9ef..b248b34b5 100644
--- a/cayenne/src/test/resources/lifecycle-map.map.xml
+++ b/cayenne/src/test/resources/lifecycle-map.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.commitlog.db"/>
 	<dbEntity name="AUDITABLE1">
 		<dbAttribute name="CHAR_PROPERTY1" type="VARCHAR" length="200"/>
diff --git a/cayenne/src/test/resources/lob.map.xml b/cayenne/src/test/resources/lob.map.xml
index 0b21b5a6c..396452a9d 100644
--- a/cayenne/src/test/resources/lob.map.xml
+++ b/cayenne/src/test/resources/lob.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.lob"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="BLOB_TEST">
diff --git a/cayenne/src/test/resources/locking.map.xml b/cayenne/src/test/resources/locking.map.xml
index 65926671e..80e8a213b 100644
--- a/cayenne/src/test/resources/locking.map.xml
+++ b/cayenne/src/test/resources/locking.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.locking"/>
 	<dbEntity name="LOCKING_HELPER">
 		<dbAttribute name="LOCKING_HELPER_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/map-db1.map.xml b/cayenne/src/test/resources/map-db1.map.xml
index 83d39cf3c..3642c2ae3 100644
--- a/cayenne/src/test/resources/map-db1.map.xml
+++ b/cayenne/src/test/resources/map-db1.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.db1"/>
 	<dbEntity name="CROSSDB_M1E1">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/map-db2.map.xml b/cayenne/src/test/resources/map-db2.map.xml
index fe50ef257..744cd8e33 100644
--- a/cayenne/src/test/resources/map-db2.map.xml
+++ b/cayenne/src/test/resources/map-db2.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.db2"/>
 	<dbEntity name="CROSSDB_M2E1">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/map-to-many.map.xml b/cayenne/src/test/resources/map-to-many.map.xml
index 4ea99d8f6..1519f768b 100644
--- a/cayenne/src/test/resources/map-to-many.map.xml
+++ b/cayenne/src/test/resources/map-to-many.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.map_to_many"/>
 	<dbEntity name="ID_MAP_TO_MANY">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/meaningful-pk.map.xml b/cayenne/src/test/resources/meaningful-pk.map.xml
index 429420f54..6f98e5747 100644
--- a/cayenne/src/test/resources/meaningful-pk.map.xml
+++ b/cayenne/src/test/resources/meaningful-pk.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.meaningful_pk"/>
 	<dbEntity name="MEANINGFUL_PK">
 		<dbAttribute name="PK" type="VARCHAR" primaryKey="true" mandatory="true" length="100"/>
diff --git a/cayenne/src/test/resources/misc-types.map.xml b/cayenne/src/test/resources/misc-types.map.xml
index 6055bcd10..54103fd6e 100644
--- a/cayenne/src/test/resources/misc-types.map.xml
+++ b/cayenne/src/test/resources/misc-types.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.misc_types"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="ARRAYS_ENTITY">
diff --git a/cayenne/src/test/resources/mixed-persistence-strategy.map.xml b/cayenne/src/test/resources/mixed-persistence-strategy.map.xml
index 851109ee6..7588dd386 100644
--- a/cayenne/src/test/resources/mixed-persistence-strategy.map.xml
+++ b/cayenne/src/test/resources/mixed-persistence-strategy.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.mixed_persistence_strategy"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="MIXED_PERSISTENCE_STRATEGY">
diff --git a/cayenne/src/test/resources/multi-tier.map.xml b/cayenne/src/test/resources/multi-tier.map.xml
index 55b0bebe9..95b31b7b4 100644
--- a/cayenne/src/test/resources/multi-tier.map.xml
+++ b/cayenne/src/test/resources/multi-tier.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.mt"/>
 	<dbEntity name="MT_JOIN45">
 		<dbAttribute name="TABLE4_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/no-pk.map.xml b/cayenne/src/test/resources/no-pk.map.xml
index 0a8c54f27..da9d3446a 100644
--- a/cayenne/src/test/resources/no-pk.map.xml
+++ b/cayenne/src/test/resources/no-pk.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.no_pk"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="NO_PK_TEST">
diff --git a/cayenne/src/test/resources/numeric-types.map.xml b/cayenne/src/test/resources/numeric-types.map.xml
index 434a5f462..98917b2be 100644
--- a/cayenne/src/test/resources/numeric-types.map.xml
+++ b/cayenne/src/test/resources/numeric-types.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.numeric_types"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="BIGDECIMAL_ENTITY">
diff --git a/cayenne/src/test/resources/oneway-rels.map.xml b/cayenne/src/test/resources/oneway-rels.map.xml
index ae990a9a1..0d2e3548a 100644
--- a/cayenne/src/test/resources/oneway-rels.map.xml
+++ b/cayenne/src/test/resources/oneway-rels.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.oneway"/>
 	<dbEntity name="oneway_table1">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap2.map.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap2.map.xml
index 69b2b5c46..96ebafc8f 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap2.map.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap2.map.xml
@@ -18,8 +18,8 @@
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 
 </dataMap>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap3_1.map.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap3_1.map.xml
index 69b2b5c46..96ebafc8f 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap3_1.map.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap3_1.map.xml
@@ -18,8 +18,8 @@
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 
 </dataMap>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap3_2.map.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap3_2.map.xml
index 69b2b5c46..96ebafc8f 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap3_2.map.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap3_2.map.xml
@@ -18,8 +18,8 @@
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 
 </dataMap>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml
index 47df57d29..8dabbe7f6 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap http://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap http://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/>
 	<property name="defaultCatalog" value="TEST_CATALOG"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
diff --git a/cayenne/src/test/resources/people.map.xml b/cayenne/src/test/resources/people.map.xml
index 4751f3034..236071413 100644
--- a/cayenne/src/test/resources/people.map.xml
+++ b/cayenne/src/test/resources/people.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_people"/>
 	<dbEntity name="ADDRESS">
 		<dbAttribute name="ADDRESS_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/primitive.map.xml b/cayenne/src/test/resources/primitive.map.xml
index 3093c4bf6..ec1bbb391 100644
--- a/cayenne/src/test/resources/primitive.map.xml
+++ b/cayenne/src/test/resources/primitive.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.primitive"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="PRIMITIVES_TEST">
diff --git a/cayenne/src/test/resources/qualified.map.xml b/cayenne/src/test/resources/qualified.map.xml
index 5a2a08a44..79f78c4fb 100644
--- a/cayenne/src/test/resources/qualified.map.xml
+++ b/cayenne/src/test/resources/qualified.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.qualified"/>
 	<property name="quoteSqlIdentifiers" value="true"/>
 	<dbEntity name="TEST_QUALIFIED1">
diff --git a/cayenne/src/test/resources/quoted-identifiers.map.xml b/cayenne/src/test/resources/quoted-identifiers.map.xml
index c19dda108..0f256e699 100644
--- a/cayenne/src/test/resources/quoted-identifiers.map.xml
+++ b/cayenne/src/test/resources/quoted-identifiers.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.quotemap"/>
 	<property name="quoteSqlIdentifiers" value="true"/>
 	<dbEntity name="QUOTED_ADDRESS">
diff --git a/cayenne/src/test/resources/reflexive.map.xml b/cayenne/src/test/resources/reflexive.map.xml
index 38b95bf57..2cbd56fea 100644
--- a/cayenne/src/test/resources/reflexive.map.xml
+++ b/cayenne/src/test/resources/reflexive.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.reflexive"/>
 	<dbEntity name="OTHER">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/relationships-activity.map.xml b/cayenne/src/test/resources/relationships-activity.map.xml
index 8cf22334c..6559b4c82 100644
--- a/cayenne/src/test/resources/relationships-activity.map.xml
+++ b/cayenne/src/test/resources/relationships-activity.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_activity"/>
 	<dbEntity name="X_ACTIVITY">
 		<dbAttribute name="ACTIVITY_ID" type="VARCHAR" primaryKey="true" mandatory="true" length="50"/>
diff --git a/cayenne/src/test/resources/relationships-child-master.map.xml b/cayenne/src/test/resources/relationships-child-master.map.xml
index 6babe2136..723c95f8f 100644
--- a/cayenne/src/test/resources/relationships-child-master.map.xml
+++ b/cayenne/src/test/resources/relationships-child-master.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_child_master"/>
 	<dbEntity name="CHILD">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/relationships-clob.map.xml b/cayenne/src/test/resources/relationships-clob.map.xml
index 2477d52b0..d0c9ad9d9 100644
--- a/cayenne/src/test/resources/relationships-clob.map.xml
+++ b/cayenne/src/test/resources/relationships-clob.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_clob"/>
 	<dbEntity name="CLOB_DETAIL">
 		<dbAttribute name="CLOB_DETAIL_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/relationships-collection-to-many.map.xml b/cayenne/src/test/resources/relationships-collection-to-many.map.xml
index e5db7a880..1869fd03e 100644
--- a/cayenne/src/test/resources/relationships-collection-to-many.map.xml
+++ b/cayenne/src/test/resources/relationships-collection-to-many.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_collection_to_many"/>
 	<dbEntity name="COLLECTION_TO_MANY">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/relationships-delete-rules.map.xml b/cayenne/src/test/resources/relationships-delete-rules.map.xml
index a4646feda..4e1f6e635 100644
--- a/cayenne/src/test/resources/relationships-delete-rules.map.xml
+++ b/cayenne/src/test/resources/relationships-delete-rules.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_delete_rules"/>
 	<dbEntity name="DELETE_RULE_FLATA">
 		<dbAttribute name="FLATA_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/relationships-flattened.map.xml b/cayenne/src/test/resources/relationships-flattened.map.xml
index 1a7803425..f02644b8c 100644
--- a/cayenne/src/test/resources/relationships-flattened.map.xml
+++ b/cayenne/src/test/resources/relationships-flattened.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_flattened"/>
 	<dbEntity name="COMPLEX_JOIN">
 		<dbAttribute name="EXTRA_COLUMN" type="VARCHAR" length="50"/>
diff --git a/cayenne/src/test/resources/relationships-many-to-many-join.map.xml b/cayenne/src/test/resources/relationships-many-to-many-join.map.xml
index a08d00d0f..a156d1624 100644
--- a/cayenne/src/test/resources/relationships-many-to-many-join.map.xml
+++ b/cayenne/src/test/resources/relationships-many-to-many-join.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_many_to_many_join"/>
 	<dbEntity name="X_AUTHOR">
 		<dbAttribute name="AUTHOR_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/relationships-set-to-many.map.xml b/cayenne/src/test/resources/relationships-set-to-many.map.xml
index 1a43157b3..e2605db3e 100644
--- a/cayenne/src/test/resources/relationships-set-to-many.map.xml
+++ b/cayenne/src/test/resources/relationships-set-to-many.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_set_to_many"/>
 	<dbEntity name="SET_TO_MANY">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/relationships-to-many-fk.map.xml b/cayenne/src/test/resources/relationships-to-many-fk.map.xml
index dfdccf35a..642c011fe 100644
--- a/cayenne/src/test/resources/relationships-to-many-fk.map.xml
+++ b/cayenne/src/test/resources/relationships-to-many-fk.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_to_many_fk"/>
 	<dbEntity name="TO_MANY_FKDEP">
 		<dbAttribute name="DEP_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/relationships-to-one-fk.map.xml b/cayenne/src/test/resources/relationships-to-one-fk.map.xml
index 9d5026718..4bd828e5b 100644
--- a/cayenne/src/test/resources/relationships-to-one-fk.map.xml
+++ b/cayenne/src/test/resources/relationships-to-one-fk.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_to_one_fk"/>
 	<dbEntity name="TO_ONE_FK1">
 		<dbAttribute name="TO_ONE_FK1_FK" type="INTEGER" mandatory="true"/>
diff --git a/cayenne/src/test/resources/relationships.map.xml b/cayenne/src/test/resources/relationships.map.xml
index 93553e387..065f38ad1 100644
--- a/cayenne/src/test/resources/relationships.map.xml
+++ b/cayenne/src/test/resources/relationships.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships"/>
 	<dbEntity name="CYCLE_E1">
 		<dbAttribute name="e2_id" type="INTEGER"/>
diff --git a/cayenne/src/test/resources/return-types.map.xml b/cayenne/src/test/resources/return-types.map.xml
index 5f422ecd0..2e9e3ec71 100644
--- a/cayenne/src/test/resources/return-types.map.xml
+++ b/cayenne/src/test/resources/return-types.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.return_types"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<dbEntity name="TYPES_MAPPING_LOBS_TEST1">
diff --git a/cayenne/src/test/resources/soft-delete.map.xml b/cayenne/src/test/resources/soft-delete.map.xml
index 9b79e2ada..30b244710 100644
--- a/cayenne/src/test/resources/soft-delete.map.xml
+++ b/cayenne/src/test/resources/soft-delete.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.soft_delete"/>
 	<dbEntity name="SOFT_DELETE">
 		<dbAttribute name="DELETED" type="BOOLEAN"/>
diff --git a/cayenne/src/test/resources/sus-map.map.xml b/cayenne/src/test/resources/sus-map.map.xml
index bf6e72f18..a29d7af4a 100644
--- a/cayenne/src/test/resources/sus-map.map.xml
+++ b/cayenne/src/test/resources/sus-map.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<dbEntity name="SUS1">
 		<dbAttribute name="id" type="INTEGER" primaryKey="true" mandatory="true"/>
 		<dbAttribute name="strNoMandatory" type="VARCHAR" length="200"/>
diff --git a/cayenne/src/test/resources/table-primitives.map.xml b/cayenne/src/test/resources/table-primitives.map.xml
index f0681ba24..f62c810e6 100644
--- a/cayenne/src/test/resources/table-primitives.map.xml
+++ b/cayenne/src/test/resources/table-primitives.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.table_primitives"/>
 	<dbEntity name="TABLE_PRIMITIVES">
 		<dbAttribute name="BOOLEAN_COLUMN" type="BOOLEAN"/>
diff --git a/cayenne/src/test/resources/testmap.map.xml b/cayenne/src/test/resources/testmap.map.xml
index 6c4c47415..c2ba0d52c 100644
--- a/cayenne/src/test/resources/testmap.map.xml
+++ b/cayenne/src/test/resources/testmap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/>
 	<property name="defaultSuperclass" value="org.apache.cayenne.GenericPersistentObject"/>
 	<procedure name="cayenne_tst_out_proc">
diff --git a/cayenne/src/test/resources/things.map.xml b/cayenne/src/test/resources/things.map.xml
index e8f342201..91d1a9607 100644
--- a/cayenne/src/test/resources/things.map.xml
+++ b/cayenne/src/test/resources/things.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.things"/>
 	<dbEntity name="BAG">
 		<dbAttribute name="ID" type="BIGINT" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/unsupported-distinct-types.map.xml b/cayenne/src/test/resources/unsupported-distinct-types.map.xml
index 8a5deb1d0..a7ab36ddf 100644
--- a/cayenne/src/test/resources/unsupported-distinct-types.map.xml
+++ b/cayenne/src/test/resources/unsupported-distinct-types.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.unsupported_distinct_types"/>
 	<dbEntity name="COMPOSITION">
 		<dbAttribute name="BASE_ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/cayenne/src/test/resources/uuid.map.xml b/cayenne/src/test/resources/uuid.map.xml
index b1a7498b8..3d05d030f 100644
--- a/cayenne/src/test/resources/uuid.map.xml
+++ b/cayenne/src/test/resources/uuid.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.uuid"/>
 	<dbEntity name="UUID_PK_ENTITY">
 		<dbAttribute name="ID" type="VARCHAR" primaryKey="true" mandatory="true" length="100"/>
diff --git a/cayenne/src/test/resources/weighted-sort.map.xml b/cayenne/src/test/resources/weighted-sort.map.xml
index 40a1b6a47..26db6c880 100644
--- a/cayenne/src/test/resources/weighted-sort.map.xml
+++ b/cayenne/src/test/resources/weighted-sort.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.weighted_sort"/>
 	<dbEntity name="SORT_DEP">
 		<dbAttribute name="ID" type="BIGINT" primaryKey="true" mandatory="true"/>
diff --git a/docs/cayenne-guide/src/test/resources/docs.map.xml b/docs/cayenne-guide/src/test/resources/docs.map.xml
index c5eb9bf20..e4d039eec 100644
--- a/docs/cayenne-guide/src/test/resources/docs.map.xml
+++ b/docs/cayenne-guide/src/test/resources/docs.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.apache.cayenne.docs.persistent"/>
 	<dbEntity name="ARTIST">
 		<dbAttribute name="ID" type="INTEGER" primaryKey="true" mandatory="true"/>
diff --git a/docs/getting-started-guide/src/main/resources/datamap.map.xml b/docs/getting-started-guide/src/main/resources/datamap.map.xml
index b052bdfde..967f6a3c2 100644
--- a/docs/getting-started-guide/src/main/resources/datamap.map.xml
+++ b/docs/getting-started-guide/src/main/resources/datamap.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataMap xmlns="http://cayenne.apache.org/schema/14/modelMap"
+<dataMap xmlns="http://cayenne.apache.org/schema/14/dataMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/modelMap https://cayenne.apache.org/schema/14/modelMap.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/dataMap https://cayenne.apache.org/schema/14/dataMap.xsd">
 	<property name="defaultPackage" value="org.example.cayenne.persistent"/>
 	<dbEntity name="artist" catalog="cayenne_demo">
 		<dbAttribute name="DATE_OF_BIRTH" type="DATE" length="10"/>