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 16:42:44 UTC

(cayenne) 01/03: CAY-3043 Rename "domain" to "project" in the Modeler and XSD

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 e7cdae509193411a68c1afcb782d4d5f75090c08
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sun Oct 4 11:36:28 2026 -0400

    CAY-3043 Rename "domain" to "project" in the Modeler and XSD
    
    XSD change
---
 ai-plugin/references/project-layout.md             |  2 +-
 .../src/test/resources/cayenne-lifecycle.xml       |  4 ++--
 .../src/test/resources/cayenne-crypto.xml          |  6 +++---
 .../dbimport/DefaultDbImportActionTest.java        | 12 ++++++------
 .../dbimport/cayenne-relationship-optimisation.xml |  4 ++--
 .../src/test/resources/cgen/cayenne-testDomain.xml |  4 ++--
 .../apache/cayenne/mcp/tools/cgen/CgenRunIT.java   |  8 ++++----
 .../cayenne/mcp/tools/cgen/CgenRunMcpIT.java       |  4 ++--
 .../cgen-fixtures/no-cgen/cayenne-project.xml      |  4 ++--
 .../cgen-fixtures/no-destdir/cayenne-project.xml   |  4 ++--
 .../no-dbimport/cayenne-project.xml                |  4 ++--
 .../with-dbimport/cayenne-project.xml              |  4 ++--
 .../modeler/cayenne-configured-validation.xml      |  6 +++---
 .../project/upgrade/DefaultProjectUpgrader.java    |  2 +-
 .../cayenne/project/FileProjectSaverTest.java      |  4 ++--
 .../upgrade/DefaultProjectUpgraderTest.java        |  4 ++--
 .../apache/cayenne/project/cayenne-PROJECT1.xml    |  4 ++--
 .../apache/cayenne/project/cayenne-PROJECT2.xml    |  4 ++--
 .../configuration/DataChannelDescriptor.java       |  6 +++---
 .../configuration/upgrade/UpgradeHandler.java      |  3 ++-
 .../configuration/upgrade/UpgradeHandler_V14.java  | 22 +++++++++++++++++++++-
 .../xml/DataChannelChildrenHandler.java            |  4 ++--
 .../configuration/xml/DataChannelHandler.java      | 18 ++++++++++++++----
 .../cayenne/schema/14/{domain.xsd => project.xsd}  |  6 +++---
 .../upgrade/ConfigurationUpgraderTest.java         |  2 +-
 .../upgrade/UpgradeHandler_V14Test.java            |  5 +++--
 .../test/resources/annotation/cayenne-project.xml  |  6 +++---
 .../test/resources/cay2641/cayenne-cay-2641.xml    |  6 +++---
 .../test/resources/cay2666/cayenne-cay-2666.xml    |  6 +++---
 .../src/test/resources/cay743/cayenne-domain.xml   |  4 ++--
 cayenne/src/test/resources/cayenne-ALL.xml         |  6 +++---
 cayenne/src/test/resources/cayenne-array-type.xml  |  6 +++---
 cayenne/src/test/resources/cayenne-binary-pk.xml   |  6 +++---
 cayenne/src/test/resources/cayenne-cay-2032.xml    |  6 +++---
 cayenne/src/test/resources/cayenne-compound.xml    |  6 +++---
 cayenne/src/test/resources/cayenne-date-time.xml   |  6 +++---
 .../src/test/resources/cayenne-dedicated-cache.xml |  6 +++---
 .../src/test/resources/cayenne-domain-provider.xml |  6 +++---
 cayenne/src/test/resources/cayenne-embeddable.xml  |  6 +++---
 cayenne/src/test/resources/cayenne-empty.xml       |  6 +++---
 cayenne/src/test/resources/cayenne-enum.xml        |  6 +++---
 .../src/test/resources/cayenne-extended-type.xml   |  6 +++---
 cayenne/src/test/resources/cayenne-generated.xml   |  6 +++---
 cayenne/src/test/resources/cayenne-generic.xml     |  6 +++---
 .../test/resources/cayenne-hybrid-data-object.xml  |  6 +++---
 .../cayenne-inheritance-single-table1.xml          |  6 +++---
 .../resources/cayenne-inheritance-vertical.xml     |  6 +++---
 .../resources/cayenne-inheritance-with-enum.xml    |  6 +++---
 cayenne/src/test/resources/cayenne-inheritance.xml |  6 +++---
 cayenne/src/test/resources/cayenne-json.xml        |  6 +++---
 .../src/test/resources/cayenne-lazy-attributes.xml |  6 +++---
 .../test/resources/cayenne-legacy-date-time.xml    |  6 +++---
 .../cayenne-lifecycle-callbacks-order.xml          |  6 +++---
 cayenne/src/test/resources/cayenne-lifecycle.xml   |  6 +++---
 cayenne/src/test/resources/cayenne-lob.xml         |  6 +++---
 cayenne/src/test/resources/cayenne-locking.xml     |  6 +++---
 cayenne/src/test/resources/cayenne-map-to-many.xml |  6 +++---
 .../src/test/resources/cayenne-meaningful-pk.xml   |  6 +++---
 cayenne/src/test/resources/cayenne-misc-types.xml  |  6 +++---
 .../cayenne-mixed-persistence-strategy.xml         |  6 +++---
 cayenne/src/test/resources/cayenne-multi-tier.xml  |  6 +++---
 cayenne/src/test/resources/cayenne-multinode.xml   |  6 +++---
 cayenne/src/test/resources/cayenne-no-pk.xml       |  6 +++---
 .../src/test/resources/cayenne-no-validation.xml   |  6 +++---
 .../src/test/resources/cayenne-numeric-types.xml   |  6 +++---
 cayenne/src/test/resources/cayenne-oneway-rels.xml |  6 +++---
 ...ayenne.configuration.rop.server.test-config.xml |  4 ++--
 cayenne/src/test/resources/cayenne-people.xml      |  6 +++---
 cayenne/src/test/resources/cayenne-primitive.xml   |  6 +++---
 cayenne/src/test/resources/cayenne-qualified.xml   |  6 +++---
 .../test/resources/cayenne-quoted-identifiers.xml  |  6 +++---
 cayenne/src/test/resources/cayenne-reflexive.xml   |  6 +++---
 .../resources/cayenne-relationships-activity.xml   |  6 +++---
 .../cayenne-relationships-child-master.xml         |  6 +++---
 .../test/resources/cayenne-relationships-clob.xml  |  6 +++---
 .../cayenne-relationships-collection-to-many.xml   |  6 +++---
 .../cayenne-relationships-delete-rules.xml         |  6 +++---
 .../resources/cayenne-relationships-flattened.xml  |  6 +++---
 .../cayenne-relationships-many-to-many-join.xml    |  6 +++---
 .../cayenne-relationships-set-to-many.xml          |  6 +++---
 .../resources/cayenne-relationships-to-many-fk.xml |  6 +++---
 .../resources/cayenne-relationships-to-one-fk.xml  |  6 +++---
 .../src/test/resources/cayenne-relationships.xml   |  6 +++---
 .../src/test/resources/cayenne-return-types.xml    |  6 +++---
 cayenne/src/test/resources/cayenne-soft-delete.xml |  6 +++---
 cayenne/src/test/resources/cayenne-sus.xml         |  6 +++---
 .../test/resources/cayenne-table-primitives.xml    |  6 +++---
 cayenne/src/test/resources/cayenne-testmap.xml     |  6 +++---
 cayenne/src/test/resources/cayenne-things.xml      |  6 +++---
 .../cayenne-unsupported-distinct-types.xml         |  6 +++---
 cayenne/src/test/resources/cayenne-uuid.xml        |  6 +++---
 .../src/test/resources/cayenne-weighted-sort.xml   |  6 +++---
 cayenne/src/test/resources/custom-name-file.xml    |  4 ++--
 .../configuration/upgrade/cayenne-project-v14.xml  |  2 +-
 .../configuration/upgrade/cayenne-project-v15.xml  |  2 +-
 .../configuration/xml/cayenne-testConfig1.xml      |  4 ++--
 .../configuration/xml/cayenne-testConfig2.xml      |  4 ++--
 .../configuration/xml/cayenne-testConfig3.xml      |  4 ++--
 .../configuration/xml/cayenne-testConfig5.xml      |  4 ++--
 .../configuration/xml/cayenne-testConfig6.xml      |  2 +-
 .../src/test/resources/cayenne-project.xml         |  6 +++---
 .../resources/com/example/cayenne-mydomain.xml     |  6 +++---
 .../test/resources/com/example/cayenne-project.xml |  6 +++---
 .../test/resources/org/foo/cayenne-library1.xml    |  6 +++---
 .../test/resources/org/foo/cayenne-library2.xml    |  6 +++---
 .../src/main/resources/cayenne-project.xml         |  6 +++---
 106 files changed, 318 insertions(+), 286 deletions(-)

diff --git a/ai-plugin/references/project-layout.md b/ai-plugin/references/project-layout.md
index a7adbe039..d9d07b8ce 100644
--- a/ai-plugin/references/project-layout.md
+++ b/ai-plugin/references/project-layout.md
@@ -24,7 +24,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.
+1. **Project descriptor** — one per project. File name pattern: `cayenne-*.xml` (e.g. `cayenne-mydb.xml`). Root element `<project>` in namespace `http://cayenne.apache.org/schema/14/project`. 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/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-cache-invalidation/src/test/resources/cayenne-lifecycle.xml b/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml
index cb4b7ce5b..58de37c91 100644
--- a/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml
+++ b/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
 	<map name="lifecycle-map"/>
-</domain>
+</project>
diff --git a/cayenne-crypto/src/test/resources/cayenne-crypto.xml b/cayenne-crypto/src/test/resources/cayenne-crypto.xml
index 70d9b9f83..8d1df8569 100644
--- a/cayenne-crypto/src/test/resources/cayenne-crypto.xml
+++ b/cayenne-crypto/src/test/resources/cayenne-crypto.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="datamap"/>
-</domain>
+</project>
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 3581e92d5..53c447b32 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
@@ -374,10 +374,10 @@ public class DefaultDbImportActionTest {
         assertFalse(projectFile.exists());
 
         Files.write(projectFile.toPath(), ("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-                "<domain xmlns=\"http://cayenne.apache.org/schema/14/domain\"\n" +
+                "<project xmlns=\"http://cayenne.apache.org/schema/14/project\"\n" +
                 "\t xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-                "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd\">\n" +
-                "</domain>").getBytes(StandardCharsets.UTF_8));
+                "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd\">\n" +
+                "</project>").getBytes(StandardCharsets.UTF_8));
         assertTrue(projectFile.isFile());
 
         when(params.getCayenneProject()).thenReturn(projectFile);
@@ -418,11 +418,11 @@ public class DefaultDbImportActionTest {
         assertFalse(projectFile.exists());
 
         Files.write(projectFile.toPath(), ("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-                "<domain xmlns=\"http://cayenne.apache.org/schema/14/domain\"\n" +
+                "<project xmlns=\"http://cayenne.apache.org/schema/14/project\"\n" +
                 "\t xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-                "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd\">\n" +
+                "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd\">\n" +
                 "\t<map name=\"testSaveLoaded4\"/>\n" +
-                "</domain>").getBytes(StandardCharsets.UTF_8));
+                "</project>").getBytes(StandardCharsets.UTF_8));
         assertTrue(projectFile.isFile());
 
         when(params.getCayenneProject()).thenReturn(projectFile);
diff --git a/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/cayenne-relationship-optimisation.xml b/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/cayenne-relationship-optimisation.xml
index 5815212f1..70d6ac452 100644
--- a/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/cayenne-relationship-optimisation.xml
+++ b/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/cayenne-relationship-optimisation.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
 	<map name="relationship-optimisation"/>
-</domain>
+</project>
diff --git a/cayenne-maven-plugin/src/test/resources/cgen/cayenne-testDomain.xml b/cayenne-maven-plugin/src/test/resources/cgen/cayenne-testDomain.xml
index a32d80b08..89c8d7e31 100644
--- a/cayenne-maven-plugin/src/test/resources/cgen/cayenne-testDomain.xml
+++ b/cayenne-maven-plugin/src/test/resources/cgen/cayenne-testDomain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
 	<map name="testAdditionalMap"/>
 	<map name="testDomainMap"/>
-</domain>
+</project>
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 5651cbe4d..b1e8da081 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
@@ -157,9 +157,9 @@ public class CgenRunIT {
         Files.createDirectories(resources);
         Files.writeString(resources.resolve("cayenne-project.xml"), """
                 <?xml version="1.0" encoding="utf-8"?>
-                <domain xmlns="http://cayenne.apache.org/schema/14/domain">
+                <project xmlns="http://cayenne.apache.org/schema/14/project">
                     <map name="DefaultMap"/>
-                </domain>
+                </project>
                 """);
         Files.writeString(mapFile, """
                 <?xml version="1.0" encoding="utf-8"?>
@@ -193,9 +193,9 @@ public class CgenRunIT {
         Path projectDescriptor = tempDir.resolve("cayenne-project.xml");
         Files.writeString(projectDescriptor, String.format("""
                 <?xml version="1.0" encoding="utf-8"?>
-                <domain xmlns="http://cayenne.apache.org/schema/14/domain">
+                <project xmlns="http://cayenne.apache.org/schema/14/project">
                     <map name="%s"/>
-                </domain>
+                </project>
                 """, mapName));
 
         // DataMap with one entity and embedded cgen config
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 86f1ef89f..3f7d65453 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
@@ -169,9 +169,9 @@ public class CgenRunMcpIT {
     private void writeFixture(String mapName, String pkg, Path destDir, boolean makePairs) throws IOException {
         Files.writeString(tempDir.resolve("cayenne-project.xml"), String.format("""
                 <?xml version="1.0" encoding="utf-8"?>
-                <domain xmlns="http://cayenne.apache.org/schema/14/domain">
+                <project xmlns="http://cayenne.apache.org/schema/14/project">
                     <map name="%s"/>
-                </domain>
+                </project>
                 """, mapName));
 
         Files.writeString(tempDir.resolve(mapName + ".map.xml"), String.format("""
diff --git a/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-cgen/cayenne-project.xml b/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-cgen/cayenne-project.xml
index 35335ecd7..b89813fa3 100644
--- a/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-cgen/cayenne-project.xml
+++ b/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-cgen/cayenne-project.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
     <map name="TestMap"/>
-</domain>
+</project>
diff --git a/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-destdir/cayenne-project.xml b/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-destdir/cayenne-project.xml
index 35335ecd7..b89813fa3 100644
--- a/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-destdir/cayenne-project.xml
+++ b/cayenne-mcp-server/src/test/resources/cgen-fixtures/no-destdir/cayenne-project.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
     <map name="TestMap"/>
-</domain>
+</project>
diff --git a/cayenne-mcp-server/src/test/resources/dbimport-fixtures/no-dbimport/cayenne-project.xml b/cayenne-mcp-server/src/test/resources/dbimport-fixtures/no-dbimport/cayenne-project.xml
index 35335ecd7..b89813fa3 100644
--- a/cayenne-mcp-server/src/test/resources/dbimport-fixtures/no-dbimport/cayenne-project.xml
+++ b/cayenne-mcp-server/src/test/resources/dbimport-fixtures/no-dbimport/cayenne-project.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
     <map name="TestMap"/>
-</domain>
+</project>
diff --git a/cayenne-mcp-server/src/test/resources/dbimport-fixtures/with-dbimport/cayenne-project.xml b/cayenne-mcp-server/src/test/resources/dbimport-fixtures/with-dbimport/cayenne-project.xml
index 35335ecd7..b89813fa3 100644
--- a/cayenne-mcp-server/src/test/resources/dbimport-fixtures/with-dbimport/cayenne-project.xml
+++ b/cayenne-mcp-server/src/test/resources/dbimport-fixtures/with-dbimport/cayenne-project.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
     <map name="TestMap"/>
-</domain>
+</project>
diff --git a/cayenne-modeler/src/test/resources/org/apache/cayenne/modeler/cayenne-configured-validation.xml b/cayenne-modeler/src/test/resources/org/apache/cayenne/modeler/cayenne-configured-validation.xml
index f1ca181a9..8365a89ba 100644
--- a/cayenne-modeler/src/test/resources/org/apache/cayenne/modeler/cayenne-configured-validation.xml
+++ b/cayenne-modeler/src/test/resources/org/apache/cayenne/modeler/cayenne-configured-validation.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+        xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
     <validation xmlns="http://cayenne.apache.org/schema/14/validation">
         <exclude>DATA_CHANNEL_NO_NAME</exclude>
         <exclude>DATA_MAP_NO_NAME</exclude>
         <exclude>DATA_MAP_NAME_DUPLICATE</exclude>
     </validation>
-</domain>
+</project>
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/DefaultProjectUpgrader.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/DefaultProjectUpgrader.java
index 05460c99f..31bcc4112 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/DefaultProjectUpgrader.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/DefaultProjectUpgrader.java
@@ -137,7 +137,7 @@ public class DefaultProjectUpgrader implements ProjectUpgrader {
         List<Resource> resources = new ArrayList<>();
         try {
             XPath xpath = XPathFactory.newInstance().newXPath();
-            NodeList nodes = (NodeList) xpath.evaluate("/domain/map/@name", projectContext.getDocument(),
+            NodeList nodes = (NodeList) xpath.evaluate("/*/map/@name", projectContext.getDocument(),
                     XPathConstants.NODESET);
             for (int i = 0; i < nodes.getLength(); i++) {
                 Node mapNode = nodes.item(i);
diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/FileProjectSaverTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/FileProjectSaverTest.java
index 524e12f5f..d029b7d9c 100644
--- a/cayenne-project/src/test/java/org/apache/cayenne/project/FileProjectSaverTest.java
+++ b/cayenne-project/src/test/java/org/apache/cayenne/project/FileProjectSaverTest.java
@@ -94,10 +94,10 @@ public class FileProjectSaverTest {
                 .parse(file);
 
         XPath xpath = XPathFactory.newInstance().newXPath();
-        assertEquals("", xpath.evaluate("/domain/@name", document));
+        assertEquals("", xpath.evaluate("/project/@name", document));
 
         NodeList maps = (NodeList) xpath.evaluate(
-                "/domain/map",
+                "/project/map",
                 document,
                 XPathConstants.NODESET);
         assertEquals(3, maps.getLength());
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 0be8579a5..b72262ca0 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
@@ -116,7 +116,7 @@ public class DefaultProjectUpgraderTest {
         // files are rewritten in the current version, the obsolete graph file is deleted
         String project = Files.readString(projectFile.toPath());
         assertFalse(project.contains("project-version"), project);
-        assertTrue(project.contains("http://cayenne.apache.org/schema/14/domain"), project);
+        assertTrue(project.contains("http://cayenne.apache.org/schema/14/project"), project);
         assertFalse(project.contains("<node"), project);
         assertFalse(project.contains("include"), project);
 
@@ -139,7 +139,7 @@ public class DefaultProjectUpgraderTest {
         // the version is a part of the namespace starting with version 14, and an attribute before that
         String root = Integer.parseInt(version) < 14
                 ? "<domain project-version=\"" + version + "\"/>"
-                : "<domain xmlns=\"http://cayenne.apache.org/schema/" + version + "/domain\"/>";
+                : "<project xmlns=\"http://cayenne.apache.org/schema/" + version + "/project\"/>";
         Files.writeString(file.toPath(), root);
         return new URLResource(file.toURI().toURL());
     }
diff --git a/cayenne-project/src/test/resources/org/apache/cayenne/project/cayenne-PROJECT1.xml b/cayenne-project/src/test/resources/org/apache/cayenne/project/cayenne-PROJECT1.xml
index fb3f66006..568f7c2ad 100644
--- a/cayenne-project/src/test/resources/org/apache/cayenne/project/cayenne-PROJECT1.xml
+++ b/cayenne-project/src/test/resources/org/apache/cayenne/project/cayenne-PROJECT1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
 	<map name="testProjectMap1_1"/>
 	<map name="testProjectMap1_2"/>
-</domain>
+</project>
diff --git a/cayenne-project/src/test/resources/org/apache/cayenne/project/cayenne-PROJECT2.xml b/cayenne-project/src/test/resources/org/apache/cayenne/project/cayenne-PROJECT2.xml
index cac7548e4..aa30d7392 100644
--- a/cayenne-project/src/test/resources/org/apache/cayenne/project/cayenne-PROJECT2.xml
+++ b/cayenne-project/src/test/resources/org/apache/cayenne/project/cayenne-PROJECT2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
 	<map name="testProjectMap2_1"/>
 	<map name="testProjectMap2_2"/>
-</domain>
+</project>
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java
index cab13b478..d417df2e6 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java
@@ -40,8 +40,8 @@ public class DataChannelDescriptor implements ConfigurationNode, XMLSerializable
 	/**
 	 * The namespace in which the data map XML file will be created.
 	 */
-	public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/14/domain";
-	public static final String SCHEMA_XSD_LOCATION = "https://cayenne.apache.org/schema/14/domain.xsd";
+	public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/14/project";
+	public static final String SCHEMA_XSD_LOCATION = "https://cayenne.apache.org/schema/14/project.xsd";
 
 	protected String name;
 	protected Map<String, String> properties;
@@ -56,7 +56,7 @@ public class DataChannelDescriptor implements ConfigurationNode, XMLSerializable
 	@Override
 	public void encodeAsXML(XMLEncoder encoder, ConfigurationNodeVisitor<?> delegate) {
 
-		encoder.start("domain")
+		encoder.start("project")
 				.attribute("xmlns", SCHEMA_XSD)
 				.attribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance", true)
 				.attribute("xsi:schemaLocation", SCHEMA_XSD + " " + SCHEMA_XSD_LOCATION, true);
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 1b8cde661..48c4d9f2a 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
@@ -126,7 +126,8 @@ public sealed interface UpgradeHandler permits
     }
 
     /**
-     * Upgrade Domain schema and version info
+     * Upgrade Domain schema and version info. Only applies to the versions before 14, where the project schema is
+     * called "domain".
      *
      * @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 317604375..6b3325e58 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
@@ -53,11 +53,12 @@ public final class UpgradeHandler_V14 implements UpgradeHandler {
 
     @Override
     public void processProjectDom(UpgradeContext upgradeUnit) {
-        updateDomainSchemaAndVersion(upgradeUnit);
+        updateProjectSchema(upgradeUnit);
         updateDomainExtensionSchema(upgradeUnit, VALIDATION);
         removeEjbqlInspection(upgradeUnit);
         removeVersionAttribute(upgradeUnit);
         convertNamesToCamelCase(upgradeUnit);
+        renameProjectRoot(upgradeUnit);
     }
 
     @Override
@@ -76,6 +77,25 @@ public final class UpgradeHandler_V14 implements UpgradeHandler {
         convertNamesToCamelCase(upgradeUnit);
     }
 
+    /**
+     * Switches the project to the version 14 schema, that is called "project" instead of "domain".
+     */
+    private void updateProjectSchema(UpgradeContext upgradeUnit) {
+        Element project = upgradeUnit.getDocument().getDocumentElement();
+        project.setAttribute("xmlns", "http://cayenne.apache.org/schema/14/project");
+        project.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+        project.setAttribute("xsi:schemaLocation", "http://cayenne.apache.org/schema/14/project "
+                + "https://cayenne.apache.org/schema/14/project.xsd");
+    }
+
+    /**
+     * Renames the root tag of the project from "domain" to "project".
+     */
+    private void renameProjectRoot(UpgradeContext upgradeUnit) {
+        Element root = upgradeUnit.getDocument().getDocumentElement();
+        upgradeUnit.getDocument().renameNode(root, root.getNamespaceURI(), "project");
+    }
+
     /**
      * Switches the DataMap to the version 14 schema, that is called "dataMap" instead of "modelMap".
      */
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
index 9184b6597..e6d139311 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
@@ -37,7 +37,7 @@ final class DataChannelChildrenHandler extends NamespaceAwareNestedTagHandler {
     static final String OLD_MAP_TAG = "map";
     static final String PROPERTY_TAG = "property";
     static final String DATA_MAP_TAG = "dataMap";
-    static final String DOMAIN_TAG = "domain";
+    static final String PROJECT_TAG = "project";
 
 
     private XMLDataChannelDescriptorLoader xmlDataChannelDescriptorLoader;
@@ -60,7 +60,7 @@ final class DataChannelChildrenHandler extends NamespaceAwareNestedTagHandler {
                 addMap(attributes);
                 return true;
 
-            case DOMAIN_TAG:
+            case PROJECT_TAG:
                 return true;
         }
 
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java
index d2db4ec3a..74aad195d 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
 
 /**
  * @since 4.1
@@ -32,27 +33,36 @@ public final class DataChannelHandler extends VersionAwareHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class);
 
-    static final String DOMAIN_TAG = "domain";
+    static final String PROJECT_TAG = "project";
 
     private XMLDataChannelDescriptorLoader xmlDataChannelDescriptorLoader;
     DataChannelDescriptor descriptor;
 
     public DataChannelHandler(XMLDataChannelDescriptorLoader xmlDataChannelDescriptorLoader, DataChannelDescriptor dataChannelDescriptor, LoaderContext loaderContext) {
-        super(loaderContext, DOMAIN_TAG);
+        super(loaderContext, PROJECT_TAG);
         this.xmlDataChannelDescriptorLoader = xmlDataChannelDescriptorLoader;
         this.descriptor = dataChannelDescriptor;
         setTargetNamespace(DataChannelDescriptor.SCHEMA_XSD);
     }
 
+    @Override
+    protected boolean processElement(String namespaceURI, String localName, Attributes attributes) throws SAXException {
+        // the name of the root tag before version 14
+        if ("domain".equals(localName)) {
+            validateVersion(namespaceURI, attributes);
+        }
+        return super.processElement(namespaceURI, localName, attributes);
+    }
+
     @Override
     protected ContentHandler createChildTagHandler(String namespaceURI, String localName,
                                                    String name, Attributes attributes) {
 
-        if (localName.equals(DOMAIN_TAG)) {
+        if (localName.equals(PROJECT_TAG)) {
             return new DataChannelChildrenHandler(xmlDataChannelDescriptorLoader, this);
         }
 
-        LOGGER.info(unexpectedTagMessage(localName, DOMAIN_TAG));
+        LOGGER.info(unexpectedTagMessage(localName, PROJECT_TAG));
         return super.createChildTagHandler(namespaceURI, localName, name, attributes);
     }
 }
diff --git a/cayenne/src/main/resources/org/apache/cayenne/schema/14/domain.xsd b/cayenne/src/main/resources/org/apache/cayenne/schema/14/project.xsd
similarity index 95%
rename from cayenne/src/main/resources/org/apache/cayenne/schema/14/domain.xsd
rename to cayenne/src/main/resources/org/apache/cayenne/schema/14/project.xsd
index 447274b64..716da8d9d 100644
--- a/cayenne/src/main/resources/org/apache/cayenne/schema/14/domain.xsd
+++ b/cayenne/src/main/resources/org/apache/cayenne/schema/14/project.xsd
@@ -18,12 +18,12 @@
   ~  under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<xs:schema targetNamespace="http://cayenne.apache.org/schema/14/domain"
+<xs:schema targetNamespace="http://cayenne.apache.org/schema/14/project"
            elementFormDefault="qualified" version="14"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:cay="http://cayenne.apache.org/schema/14/domain">
+           xmlns:cay="http://cayenne.apache.org/schema/14/project">
 
-    <xs:element name="domain">
+    <xs:element name="project">
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:property"/>
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 f4eec9610..23b2a72ff 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
@@ -109,7 +109,7 @@ public class ConfigurationUpgraderTest {
 
         Element root = context.getDocument().getDocumentElement();
         assertFalse(root.hasAttribute("project-version"));
-        assertEquals("http://cayenne.apache.org/schema/14/domain", root.getAttribute("xmlns"));
+        assertEquals("http://cayenne.apache.org/schema/14/project", root.getAttribute("xmlns"));
         assertEquals(2, root.getElementsByTagName("map").getLength());
 
         // the version 9 fixture has a DataNode, which version 13 removes without a replacement
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 a42022409..5eb4ad61b 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
@@ -54,10 +54,11 @@ public class UpgradeHandler_V14Test extends BaseUpgradeHandlerTest {
 
         Element root = document.getDocumentElement();
         assertFalse(root.hasAttribute("project-version"));
-        assertEquals("http://cayenne.apache.org/schema/14/domain", root.getAttribute("xmlns"));
+        assertEquals("project", root.getNodeName());
+        assertEquals("http://cayenne.apache.org/schema/14/project", root.getAttribute("xmlns"));
         assertNoHyphenatedNames(document);
 
-        List<Element> validation = elements(document, "/domain/*[local-name()='validation']");
+        List<Element> validation = elements(document, "/project/*[local-name()='validation']");
         assertEquals(1, validation.size());
         assertEquals("http://cayenne.apache.org/schema/14/validation", validation.get(0).getAttribute("xmlns"));
 
diff --git a/cayenne/src/test/resources/annotation/cayenne-project.xml b/cayenne/src/test/resources/annotation/cayenne-project.xml
index f8c56d69a..c296401a7 100644
--- a/cayenne/src/test/resources/annotation/cayenne-project.xml
+++ b/cayenne/src/test/resources/annotation/cayenne-project.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="datamapAnnotation"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cay2641/cayenne-cay-2641.xml b/cayenne/src/test/resources/cay2641/cayenne-cay-2641.xml
index 290438de3..48f0a6a0e 100644
--- a/cayenne/src/test/resources/cay2641/cayenne-cay-2641.xml
+++ b/cayenne/src/test/resources/cay2641/cayenne-cay-2641.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="datamapLazy"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cay2666/cayenne-cay-2666.xml b/cayenne/src/test/resources/cay2666/cayenne-cay-2666.xml
index 70d9b9f83..8d1df8569 100644
--- a/cayenne/src/test/resources/cay2666/cayenne-cay-2666.xml
+++ b/cayenne/src/test/resources/cay2666/cayenne-cay-2666.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="datamap"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cay743/cayenne-domain.xml b/cayenne/src/test/resources/cay743/cayenne-domain.xml
index fd3bce693..b28ee7ef4 100644
--- a/cayenne/src/test/resources/cay743/cayenne-domain.xml
+++ b/cayenne/src/test/resources/cay743/cayenne-domain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
 	<map name="map1"/>
 	<map name="map2"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-ALL.xml b/cayenne/src/test/resources/cayenne-ALL.xml
index 7f8eb07fd..655e8d405 100644
--- a/cayenne/src/test/resources/cayenne-ALL.xml
+++ b/cayenne/src/test/resources/cayenne-ALL.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="testmap"/>
 	<map name="compound"/>
 	<map name="misc-types"/>
@@ -61,4 +61,4 @@
 	<map name="cay2666/datamap"/>
 	<map name="cay2641/datamapLazy"/>
 	<map name="annotation/datamapAnnotation"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-array-type.xml b/cayenne/src/test/resources/cayenne-array-type.xml
index d3517cb6d..1add2e154 100644
--- a/cayenne/src/test/resources/cayenne-array-type.xml
+++ b/cayenne/src/test/resources/cayenne-array-type.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="array-type"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-binary-pk.xml b/cayenne/src/test/resources/cayenne-binary-pk.xml
index d83eb65cb..1adedaed2 100644
--- a/cayenne/src/test/resources/cayenne-binary-pk.xml
+++ b/cayenne/src/test/resources/cayenne-binary-pk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="binary-pk"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-cay-2032.xml b/cayenne/src/test/resources/cayenne-cay-2032.xml
index ccd028952..8f002f516 100644
--- a/cayenne/src/test/resources/cayenne-cay-2032.xml
+++ b/cayenne/src/test/resources/cayenne-cay-2032.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="cay-2032"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-compound.xml b/cayenne/src/test/resources/cayenne-compound.xml
index b45f9c4d6..62f53ae5c 100644
--- a/cayenne/src/test/resources/cayenne-compound.xml
+++ b/cayenne/src/test/resources/cayenne-compound.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="compound"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-date-time.xml b/cayenne/src/test/resources/cayenne-date-time.xml
index 642f6b0b2..1af8b1a0f 100644
--- a/cayenne/src/test/resources/cayenne-date-time.xml
+++ b/cayenne/src/test/resources/cayenne-date-time.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="date-time"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-dedicated-cache.xml b/cayenne/src/test/resources/cayenne-dedicated-cache.xml
index 114e93ef7..a34ada245 100644
--- a/cayenne/src/test/resources/cayenne-dedicated-cache.xml
+++ b/cayenne/src/test/resources/cayenne-dedicated-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<property name="cayenne.DataDomain.sharedCache" value="false"/>
 	<map name="multi-tier"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-domain-provider.xml b/cayenne/src/test/resources/cayenne-domain-provider.xml
index 6cabe2039..ca013d12b 100644
--- a/cayenne/src/test/resources/cayenne-domain-provider.xml
+++ b/cayenne/src/test/resources/cayenne-domain-provider.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<property name="cayenne.DataDomain.validatingObjectsOnCommit" value="false"/>
 	<map name="map-db1"/>
 	<map name="map-db2"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-embeddable.xml b/cayenne/src/test/resources/cayenne-embeddable.xml
index ef40b9240..f3cbdcc4b 100644
--- a/cayenne/src/test/resources/cayenne-embeddable.xml
+++ b/cayenne/src/test/resources/cayenne-embeddable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="embeddable"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-empty.xml b/cayenne/src/test/resources/cayenne-empty.xml
index c10df93b7..7571450b6 100644
--- a/cayenne/src/test/resources/cayenne-empty.xml
+++ b/cayenne/src/test/resources/cayenne-empty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="empty"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-enum.xml b/cayenne/src/test/resources/cayenne-enum.xml
index 703091803..3693ece04 100644
--- a/cayenne/src/test/resources/cayenne-enum.xml
+++ b/cayenne/src/test/resources/cayenne-enum.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="enum"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-extended-type.xml b/cayenne/src/test/resources/cayenne-extended-type.xml
index bfd3ed641..72677fcf2 100644
--- a/cayenne/src/test/resources/cayenne-extended-type.xml
+++ b/cayenne/src/test/resources/cayenne-extended-type.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="extended-type"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-generated.xml b/cayenne/src/test/resources/cayenne-generated.xml
index 3c06d75bd..fbcccc36f 100644
--- a/cayenne/src/test/resources/cayenne-generated.xml
+++ b/cayenne/src/test/resources/cayenne-generated.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="generated"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-generic.xml b/cayenne/src/test/resources/cayenne-generic.xml
index fce6fdf29..81a153108 100644
--- a/cayenne/src/test/resources/cayenne-generic.xml
+++ b/cayenne/src/test/resources/cayenne-generic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="generic"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-hybrid-data-object.xml b/cayenne/src/test/resources/cayenne-hybrid-data-object.xml
index f31cad727..846128bef 100644
--- a/cayenne/src/test/resources/cayenne-hybrid-data-object.xml
+++ b/cayenne/src/test/resources/cayenne-hybrid-data-object.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<property name="cayenne.DataDomain.sharedCache" value="false"/>
 	<map name="hybrid-data-object"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-inheritance-single-table1.xml b/cayenne/src/test/resources/cayenne-inheritance-single-table1.xml
index f124ba381..a33a9b393 100644
--- a/cayenne/src/test/resources/cayenne-inheritance-single-table1.xml
+++ b/cayenne/src/test/resources/cayenne-inheritance-single-table1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="inheritance-single-table1"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-inheritance-vertical.xml b/cayenne/src/test/resources/cayenne-inheritance-vertical.xml
index 558319f49..254df5456 100644
--- a/cayenne/src/test/resources/cayenne-inheritance-vertical.xml
+++ b/cayenne/src/test/resources/cayenne-inheritance-vertical.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="inheritance-vertical"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-inheritance-with-enum.xml b/cayenne/src/test/resources/cayenne-inheritance-with-enum.xml
index 554b14535..803bf06a1 100644
--- a/cayenne/src/test/resources/cayenne-inheritance-with-enum.xml
+++ b/cayenne/src/test/resources/cayenne-inheritance-with-enum.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="inheritance-with-enum"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-inheritance.xml b/cayenne/src/test/resources/cayenne-inheritance.xml
index 604b0c069..fa677e556 100644
--- a/cayenne/src/test/resources/cayenne-inheritance.xml
+++ b/cayenne/src/test/resources/cayenne-inheritance.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="inheritance"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-json.xml b/cayenne/src/test/resources/cayenne-json.xml
index 5fed6c371..496398ddf 100644
--- a/cayenne/src/test/resources/cayenne-json.xml
+++ b/cayenne/src/test/resources/cayenne-json.xml
@@ -17,8 +17,8 @@
    specific language governing permissions and limitations
    under the License.
 -->
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="json"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-lazy-attributes.xml b/cayenne/src/test/resources/cayenne-lazy-attributes.xml
index 57a935284..a769883b9 100644
--- a/cayenne/src/test/resources/cayenne-lazy-attributes.xml
+++ b/cayenne/src/test/resources/cayenne-lazy-attributes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="lazy-attributes"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-legacy-date-time.xml b/cayenne/src/test/resources/cayenne-legacy-date-time.xml
index c7c160002..a30202a7d 100644
--- a/cayenne/src/test/resources/cayenne-legacy-date-time.xml
+++ b/cayenne/src/test/resources/cayenne-legacy-date-time.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="legacy-date-time"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-lifecycle-callbacks-order.xml b/cayenne/src/test/resources/cayenne-lifecycle-callbacks-order.xml
index 6f355699a..89af85023 100644
--- a/cayenne/src/test/resources/cayenne-lifecycle-callbacks-order.xml
+++ b/cayenne/src/test/resources/cayenne-lifecycle-callbacks-order.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="lifecycle-callbacks-order"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-lifecycle.xml b/cayenne/src/test/resources/cayenne-lifecycle.xml
index 0b89c9e49..4ccd9d295 100644
--- a/cayenne/src/test/resources/cayenne-lifecycle.xml
+++ b/cayenne/src/test/resources/cayenne-lifecycle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="lifecycle-map"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-lob.xml b/cayenne/src/test/resources/cayenne-lob.xml
index aab95c189..dd0535273 100644
--- a/cayenne/src/test/resources/cayenne-lob.xml
+++ b/cayenne/src/test/resources/cayenne-lob.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="lob"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-locking.xml b/cayenne/src/test/resources/cayenne-locking.xml
index b2db2bd05..47382e608 100644
--- a/cayenne/src/test/resources/cayenne-locking.xml
+++ b/cayenne/src/test/resources/cayenne-locking.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="locking"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-map-to-many.xml b/cayenne/src/test/resources/cayenne-map-to-many.xml
index 2def9ab26..f2a8cfdf6 100644
--- a/cayenne/src/test/resources/cayenne-map-to-many.xml
+++ b/cayenne/src/test/resources/cayenne-map-to-many.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="map-to-many"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-meaningful-pk.xml b/cayenne/src/test/resources/cayenne-meaningful-pk.xml
index d1c62ce14..f175356ad 100644
--- a/cayenne/src/test/resources/cayenne-meaningful-pk.xml
+++ b/cayenne/src/test/resources/cayenne-meaningful-pk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="meaningful-pk"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-misc-types.xml b/cayenne/src/test/resources/cayenne-misc-types.xml
index 87b64e638..f4ee22f01 100644
--- a/cayenne/src/test/resources/cayenne-misc-types.xml
+++ b/cayenne/src/test/resources/cayenne-misc-types.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="misc-types"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-mixed-persistence-strategy.xml b/cayenne/src/test/resources/cayenne-mixed-persistence-strategy.xml
index 073c52d93..137929e0b 100644
--- a/cayenne/src/test/resources/cayenne-mixed-persistence-strategy.xml
+++ b/cayenne/src/test/resources/cayenne-mixed-persistence-strategy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="mixed-persistence-strategy"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-multi-tier.xml b/cayenne/src/test/resources/cayenne-multi-tier.xml
index 97762ea1d..7849c78ab 100644
--- a/cayenne/src/test/resources/cayenne-multi-tier.xml
+++ b/cayenne/src/test/resources/cayenne-multi-tier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="multi-tier"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-multinode.xml b/cayenne/src/test/resources/cayenne-multinode.xml
index 9822e65fd..c842ba66e 100644
--- a/cayenne/src/test/resources/cayenne-multinode.xml
+++ b/cayenne/src/test/resources/cayenne-multinode.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="map-db1"/>
 	<map name="map-db2"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-no-pk.xml b/cayenne/src/test/resources/cayenne-no-pk.xml
index f9b76fc6a..cfdc0413a 100644
--- a/cayenne/src/test/resources/cayenne-no-pk.xml
+++ b/cayenne/src/test/resources/cayenne-no-pk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="no-pk"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-no-validation.xml b/cayenne/src/test/resources/cayenne-no-validation.xml
index e514cfbd7..1511c9389 100644
--- a/cayenne/src/test/resources/cayenne-no-validation.xml
+++ b/cayenne/src/test/resources/cayenne-no-validation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<property name="cayenne.DataDomain.validatingObjectsOnCommit" value="false"/>
 	<map name="multi-tier"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-numeric-types.xml b/cayenne/src/test/resources/cayenne-numeric-types.xml
index 3cdd535b5..6352a3c15 100644
--- a/cayenne/src/test/resources/cayenne-numeric-types.xml
+++ b/cayenne/src/test/resources/cayenne-numeric-types.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="numeric-types"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-oneway-rels.xml b/cayenne/src/test/resources/cayenne-oneway-rels.xml
index 0e680aff2..9ab57ea61 100644
--- a/cayenne/src/test/resources/cayenne-oneway-rels.xml
+++ b/cayenne/src/test/resources/cayenne-oneway-rels.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="oneway-rels"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml b/cayenne/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
index 31d75f056..fc7bc387e 100644
--- a/cayenne/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
+++ b/cayenne/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd"/>
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd"/>
diff --git a/cayenne/src/test/resources/cayenne-people.xml b/cayenne/src/test/resources/cayenne-people.xml
index 1ef097fa7..b3cc5372f 100644
--- a/cayenne/src/test/resources/cayenne-people.xml
+++ b/cayenne/src/test/resources/cayenne-people.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="people"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-primitive.xml b/cayenne/src/test/resources/cayenne-primitive.xml
index ea62c6b99..25f76735c 100644
--- a/cayenne/src/test/resources/cayenne-primitive.xml
+++ b/cayenne/src/test/resources/cayenne-primitive.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="primitive"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-qualified.xml b/cayenne/src/test/resources/cayenne-qualified.xml
index 13bb0f802..21e6348bd 100644
--- a/cayenne/src/test/resources/cayenne-qualified.xml
+++ b/cayenne/src/test/resources/cayenne-qualified.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="qualified"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-quoted-identifiers.xml b/cayenne/src/test/resources/cayenne-quoted-identifiers.xml
index 99f3cc993..65ba188c7 100644
--- a/cayenne/src/test/resources/cayenne-quoted-identifiers.xml
+++ b/cayenne/src/test/resources/cayenne-quoted-identifiers.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="quoted-identifiers"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-reflexive.xml b/cayenne/src/test/resources/cayenne-reflexive.xml
index 692921a2d..2b8e6edbc 100644
--- a/cayenne/src/test/resources/cayenne-reflexive.xml
+++ b/cayenne/src/test/resources/cayenne-reflexive.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="reflexive"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships-activity.xml b/cayenne/src/test/resources/cayenne-relationships-activity.xml
index cb5f65683..cfd93f230 100644
--- a/cayenne/src/test/resources/cayenne-relationships-activity.xml
+++ b/cayenne/src/test/resources/cayenne-relationships-activity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships-activity"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships-child-master.xml b/cayenne/src/test/resources/cayenne-relationships-child-master.xml
index a2471d20f..087215f32 100644
--- a/cayenne/src/test/resources/cayenne-relationships-child-master.xml
+++ b/cayenne/src/test/resources/cayenne-relationships-child-master.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships-child-master"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships-clob.xml b/cayenne/src/test/resources/cayenne-relationships-clob.xml
index c4f26263b..cacfb1c4e 100644
--- a/cayenne/src/test/resources/cayenne-relationships-clob.xml
+++ b/cayenne/src/test/resources/cayenne-relationships-clob.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships-clob"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships-collection-to-many.xml b/cayenne/src/test/resources/cayenne-relationships-collection-to-many.xml
index 0a00139f7..e55cd2c52 100644
--- a/cayenne/src/test/resources/cayenne-relationships-collection-to-many.xml
+++ b/cayenne/src/test/resources/cayenne-relationships-collection-to-many.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships-collection-to-many"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships-delete-rules.xml b/cayenne/src/test/resources/cayenne-relationships-delete-rules.xml
index cbdea818c..b4fc082d6 100644
--- a/cayenne/src/test/resources/cayenne-relationships-delete-rules.xml
+++ b/cayenne/src/test/resources/cayenne-relationships-delete-rules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships-delete-rules"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships-flattened.xml b/cayenne/src/test/resources/cayenne-relationships-flattened.xml
index ed9d2ef29..cddbfabfa 100644
--- a/cayenne/src/test/resources/cayenne-relationships-flattened.xml
+++ b/cayenne/src/test/resources/cayenne-relationships-flattened.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships-flattened"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships-many-to-many-join.xml b/cayenne/src/test/resources/cayenne-relationships-many-to-many-join.xml
index 8f93fb295..4d4fdc2f9 100644
--- a/cayenne/src/test/resources/cayenne-relationships-many-to-many-join.xml
+++ b/cayenne/src/test/resources/cayenne-relationships-many-to-many-join.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships-many-to-many-join"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships-set-to-many.xml b/cayenne/src/test/resources/cayenne-relationships-set-to-many.xml
index 969ffa9f3..d07066b4a 100644
--- a/cayenne/src/test/resources/cayenne-relationships-set-to-many.xml
+++ b/cayenne/src/test/resources/cayenne-relationships-set-to-many.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships-set-to-many"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships-to-many-fk.xml b/cayenne/src/test/resources/cayenne-relationships-to-many-fk.xml
index f92fceed0..7937d8ade 100644
--- a/cayenne/src/test/resources/cayenne-relationships-to-many-fk.xml
+++ b/cayenne/src/test/resources/cayenne-relationships-to-many-fk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships-to-many-fk"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships-to-one-fk.xml b/cayenne/src/test/resources/cayenne-relationships-to-one-fk.xml
index 68c869a28..2424b9954 100644
--- a/cayenne/src/test/resources/cayenne-relationships-to-one-fk.xml
+++ b/cayenne/src/test/resources/cayenne-relationships-to-one-fk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships-to-one-fk"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-relationships.xml b/cayenne/src/test/resources/cayenne-relationships.xml
index 915a462ce..a10e8789a 100644
--- a/cayenne/src/test/resources/cayenne-relationships.xml
+++ b/cayenne/src/test/resources/cayenne-relationships.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="relationships"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-return-types.xml b/cayenne/src/test/resources/cayenne-return-types.xml
index 115829aab..082738930 100644
--- a/cayenne/src/test/resources/cayenne-return-types.xml
+++ b/cayenne/src/test/resources/cayenne-return-types.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="return-types"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-soft-delete.xml b/cayenne/src/test/resources/cayenne-soft-delete.xml
index 0326d842f..ee13fcefb 100644
--- a/cayenne/src/test/resources/cayenne-soft-delete.xml
+++ b/cayenne/src/test/resources/cayenne-soft-delete.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="soft-delete"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-sus.xml b/cayenne/src/test/resources/cayenne-sus.xml
index 8648b9be3..339b594b8 100644
--- a/cayenne/src/test/resources/cayenne-sus.xml
+++ b/cayenne/src/test/resources/cayenne-sus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="sus-map"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-table-primitives.xml b/cayenne/src/test/resources/cayenne-table-primitives.xml
index 020cab266..24440fbae 100644
--- a/cayenne/src/test/resources/cayenne-table-primitives.xml
+++ b/cayenne/src/test/resources/cayenne-table-primitives.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="table-primitives"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-testmap.xml b/cayenne/src/test/resources/cayenne-testmap.xml
index e13fbc304..fbe200e16 100644
--- a/cayenne/src/test/resources/cayenne-testmap.xml
+++ b/cayenne/src/test/resources/cayenne-testmap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="testmap"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-things.xml b/cayenne/src/test/resources/cayenne-things.xml
index 8cdaac87b..ab82ec4ec 100644
--- a/cayenne/src/test/resources/cayenne-things.xml
+++ b/cayenne/src/test/resources/cayenne-things.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="things"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-unsupported-distinct-types.xml b/cayenne/src/test/resources/cayenne-unsupported-distinct-types.xml
index 2dac86515..4e8800f8e 100644
--- a/cayenne/src/test/resources/cayenne-unsupported-distinct-types.xml
+++ b/cayenne/src/test/resources/cayenne-unsupported-distinct-types.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="unsupported-distinct-types"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-uuid.xml b/cayenne/src/test/resources/cayenne-uuid.xml
index 3c53c1bd0..16cde2a19 100644
--- a/cayenne/src/test/resources/cayenne-uuid.xml
+++ b/cayenne/src/test/resources/cayenne-uuid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="uuid"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/cayenne-weighted-sort.xml b/cayenne/src/test/resources/cayenne-weighted-sort.xml
index 00400e6e8..e29cfac70 100644
--- a/cayenne/src/test/resources/cayenne-weighted-sort.xml
+++ b/cayenne/src/test/resources/cayenne-weighted-sort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="weighted-sort"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/custom-name-file.xml b/cayenne/src/test/resources/custom-name-file.xml
index da94e71eb..4fb324908 100644
--- a/cayenne/src/test/resources/custom-name-file.xml
+++ b/cayenne/src/test/resources/custom-name-file.xml
@@ -17,6 +17,6 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
 	<map name="testmap"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/upgrade/cayenne-project-v14.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/upgrade/cayenne-project-v14.xml
index 8fc7944c5..d1c397cbb 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/upgrade/cayenne-project-v14.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/upgrade/cayenne-project-v14.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Fake version to test DefaultUpgradeService -->
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"/>
+<project xmlns="http://cayenne.apache.org/schema/14/project"/>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/upgrade/cayenne-project-v15.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/upgrade/cayenne-project-v15.xml
index ac0b38dea..fdace2f83 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/upgrade/cayenne-project-v15.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/upgrade/cayenne-project-v15.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Fake version to test DefaultUpgradeService -->
-<domain xmlns="http://cayenne.apache.org/schema/15/domain"/>
+<project xmlns="http://cayenne.apache.org/schema/15/project"/>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig1.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig1.xml
index 421fc43ef..cbe67ef4a 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig1.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig1.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
 	
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig2.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig2.xml
index 0de86927a..f214e07c8 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig2.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig2.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
 	<map name="testConfigMap2"/>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig3.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig3.xml
index ea0bf479f..3ae753887 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig3.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain">
+<project xmlns="http://cayenne.apache.org/schema/14/project">
 	<map name="testConfigMap3_1"/>
 	<map name="testConfigMap3_2"/>
 
@@ -11,4 +11,4 @@
 			<login />
 		</data-source>
 	</node>
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig5.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig5.xml
index 5fb307248..81b03c093 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig5.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig5.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domains">
+<project xmlns="http://cayenne.apache.org/schema/14/projects">
 
-</domain>
+</project>
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig6.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig6.xml
index 5ee24b842..b92375630 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig6.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig6.xml
@@ -17,4 +17,4 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-<domain xmlns="http://cayenne.apache.org/schema/15/domain"/>
+<project xmlns="http://cayenne.apache.org/schema/15/project"/>
diff --git a/docs/cayenne-guide/src/test/resources/cayenne-project.xml b/docs/cayenne-guide/src/test/resources/cayenne-project.xml
index d19c37f3c..a7b06c10e 100644
--- a/docs/cayenne-guide/src/test/resources/cayenne-project.xml
+++ b/docs/cayenne-guide/src/test/resources/cayenne-project.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="docs"/>
-</domain>
+</project>
diff --git a/docs/cayenne-guide/src/test/resources/com/example/cayenne-mydomain.xml b/docs/cayenne-guide/src/test/resources/com/example/cayenne-mydomain.xml
index f155c1cb5..49ca84838 100644
--- a/docs/cayenne-guide/src/test/resources/com/example/cayenne-mydomain.xml
+++ b/docs/cayenne-guide/src/test/resources/com/example/cayenne-mydomain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
-</domain>
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
+</project>
diff --git a/docs/cayenne-guide/src/test/resources/com/example/cayenne-project.xml b/docs/cayenne-guide/src/test/resources/com/example/cayenne-project.xml
index f155c1cb5..49ca84838 100644
--- a/docs/cayenne-guide/src/test/resources/com/example/cayenne-project.xml
+++ b/docs/cayenne-guide/src/test/resources/com/example/cayenne-project.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
-</domain>
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
+</project>
diff --git a/docs/cayenne-guide/src/test/resources/org/foo/cayenne-library1.xml b/docs/cayenne-guide/src/test/resources/org/foo/cayenne-library1.xml
index f155c1cb5..49ca84838 100644
--- a/docs/cayenne-guide/src/test/resources/org/foo/cayenne-library1.xml
+++ b/docs/cayenne-guide/src/test/resources/org/foo/cayenne-library1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
-</domain>
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
+</project>
diff --git a/docs/cayenne-guide/src/test/resources/org/foo/cayenne-library2.xml b/docs/cayenne-guide/src/test/resources/org/foo/cayenne-library2.xml
index f155c1cb5..49ca84838 100644
--- a/docs/cayenne-guide/src/test/resources/org/foo/cayenne-library2.xml
+++ b/docs/cayenne-guide/src/test/resources/org/foo/cayenne-library2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
-</domain>
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
+</project>
diff --git a/docs/getting-started-guide/src/main/resources/cayenne-project.xml b/docs/getting-started-guide/src/main/resources/cayenne-project.xml
index 70d9b9f83..8d1df8569 100644
--- a/docs/getting-started-guide/src/main/resources/cayenne-project.xml
+++ b/docs/getting-started-guide/src/main/resources/cayenne-project.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/14/domain"
+<project xmlns="http://cayenne.apache.org/schema/14/project"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/domain https://cayenne.apache.org/schema/14/domain.xsd">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/14/project https://cayenne.apache.org/schema/14/project.xsd">
 	<map name="datamap"/>
-</domain>
+</project>