diff --git a/common/web/types/build.sh b/common/web/types/build.sh
index 74b200e6d6..f0c73b0e07 100755
--- a/common/web/types/build.sh
+++ b/common/web/types/build.sh
@@ -29,8 +29,8 @@ builder_parse "$@"
 function compile_schemas() {
   # We need the schema files at runtime and bundled, so always copy it for all actions except `clean`
   local schemas=(
-    "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard.schema.json"
-    "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest.schema.json"
+    "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard3.schema.json"
+    "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest3.schema.json"
     "$KEYMAN_ROOT/common/schemas/kvks/kvks.schema.json"
     "$KEYMAN_ROOT/common/schemas/kpj/kpj.schema.json"
     "$KEYMAN_ROOT/common/schemas/kpj-9.0/kpj-9.0.schema.json"
diff --git a/common/web/types/src/ldml-keyboard/ldml-keyboard-testdata-xml.ts b/common/web/types/src/ldml-keyboard/ldml-keyboard-testdata-xml.ts
index c0a5e9dd6d..86a05e3893 100644
--- a/common/web/types/src/ldml-keyboard/ldml-keyboard-testdata-xml.ts
+++ b/common/web/types/src/ldml-keyboard/ldml-keyboard-testdata-xml.ts
@@ -11,7 +11,7 @@ export interface LDMLKeyboardTestDataXMLSourceFile {
   /**
    * <keyboardTest> -- the root element.
    */
-  keyboardTest: LKTKeyboardTest;
+  keyboardTest3: LKTKeyboardTest;
 }
 
 export interface LKTKeyboardTest {
diff --git a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts b/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts
index 3e7bda502e..3fdd9a7402 100644
--- a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts
+++ b/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts
@@ -39,27 +39,27 @@ export class LDMLKeyboardXMLSourceFileReader {
    * @returns true on success, false on failure
    */
   private boxArrays(source: any) : boolean {
-    if (source?.keyboard) {
-      if (!source.keyboard.keys) {
-        source.keyboard.keys = {
+    if (source?.keyboard3) {
+      if (!source.keyboard3.keys) {
+        source.keyboard3.keys = {
           key: [],
           flicks: [],
         };
       }
-      if (!source.keyboard.keys.import) {
-        source.keyboard.keys.import = [];
+      if (!source.keyboard3.keys.import) {
+        source.keyboard3.keys.import = [];
       }
     }
-    boxXmlArray(source?.keyboard, 'layers');
-    boxXmlArray(source?.keyboard?.displays, 'display');
-    boxXmlArray(source?.keyboard?.names, 'name');
-    boxXmlArray(source?.keyboard?.vkeys, 'vkey');
-    boxXmlArray(source?.keyboard?.keys, 'key');
-    boxXmlArray(source?.keyboard?.keys, 'flicks');
-    boxXmlArray(source?.keyboard?.locales, 'locale');
-    boxXmlArray(source?.keyboard, 'transforms');
-    if(source?.keyboard?.layers) {
-      for(let layers of source?.keyboard?.layers) {
+    boxXmlArray(source?.keyboard3, 'layers');
+    boxXmlArray(source?.keyboard3?.displays, 'display');
+    boxXmlArray(source?.keyboard3?.names, 'name');
+    boxXmlArray(source?.keyboard3?.vkeys, 'vkey');
+    boxXmlArray(source?.keyboard3?.keys, 'key');
+    boxXmlArray(source?.keyboard3?.keys, 'flicks');
+    boxXmlArray(source?.keyboard3?.locales, 'locale');
+    boxXmlArray(source?.keyboard3, 'transforms');
+    if(source?.keyboard3?.layers) {
+      for(let layers of source?.keyboard3?.layers) {
         boxXmlArray(layers, 'layer');
         if(layers?.layer) {
           for(let layer of layers?.layer) {
@@ -68,18 +68,18 @@ export class LDMLKeyboardXMLSourceFileReader {
         }
       }
     }
-    if(source?.keyboard?.keys?.flicks) {
-      for(let flicks of source?.keyboard?.keys?.flicks) {
+    if(source?.keyboard3?.keys?.flicks) {
+      for(let flicks of source?.keyboard3?.keys?.flicks) {
         boxXmlArray(flicks, 'flick');
       }
     }
-    if(source?.keyboard?.variables) {
-      boxXmlArray(source?.keyboard?.variables, 'set');
-      boxXmlArray(source?.keyboard?.variables, 'string');
-      boxXmlArray(source?.keyboard?.variables, 'unicodeSet');
+    if(source?.keyboard3?.variables) {
+      boxXmlArray(source?.keyboard3?.variables, 'set');
+      boxXmlArray(source?.keyboard3?.variables, 'string');
+      boxXmlArray(source?.keyboard3?.variables, 'unicodeSet');
     }
-    if(source?.keyboard?.transforms) {
-      for(let transforms of source.keyboard.transforms)  {
+    if(source?.keyboard3?.transforms) {
+      for(let transforms of source.keyboard3.transforms)  {
         boxXmlArray(transforms, 'transformGroup');
         for (let transformGroup of transforms.transformGroup) {
           boxXmlArray(transformGroup, 'transform');
@@ -208,7 +208,7 @@ export class LDMLKeyboardXMLSourceFileReader {
    */
   public validate(source: LDMLKeyboardXMLSourceFile | LDMLKeyboardTestDataXMLSourceFile): boolean {
     const ajv = new Ajv();
-    if(!ajv.validate(Schemas.ldmlKeyboard, source)) {
+    if(!ajv.validate(Schemas.ldmlKeyboard3, source)) {
       for (let err of ajv.errors) {
         this.callbacks.reportMessage(CommonTypesMessages.Error_SchemaValidationError({
           instancePath: err.instancePath,
@@ -345,16 +345,16 @@ export class LDMLKeyboardXMLSourceFileReader {
   boxTestDataArrays(raw: any) : LDMLKeyboardTestDataXMLSourceFile | null {
     if (!raw) return null;
     const a : LDMLKeyboardTestDataXMLSourceFile = {
-      keyboardTest: {
-        conformsTo: raw?.keyboardTest?.$?.conformsTo,
+      keyboardTest3: {
+        conformsTo: raw?.keyboardTest3?.$?.conformsTo,
       }
     };
 
-    const $$ : NameAndProps[] = raw?.keyboardTest?.$$;
+    const $$ : NameAndProps[] = raw?.keyboardTest3?.$$;
 
-    this.stuffBoxes(a.keyboardTest, $$, 'info');
-    this.stuffBoxes(a.keyboardTest, $$, 'repertoire', true);
-    this.stuffBoxes(a.keyboardTest, $$, 'tests', true, (o, r) => {
+    this.stuffBoxes(a.keyboardTest3, $$, 'info');
+    this.stuffBoxes(a.keyboardTest3, $$, 'repertoire', true);
+    this.stuffBoxes(a.keyboardTest3, $$, 'tests', true, (o, r) => {
       // start with basic unpack
       const tests : LKTTests = LDMLKeyboardXMLSourceFileReader.defaultMapper(o, r);
       // add ingredients
diff --git a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts b/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts
index 396f3589a0..629b8e8aa2 100644
--- a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts
+++ b/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts
@@ -11,7 +11,7 @@ export interface LDMLKeyboardXMLSourceFile {
   /**
    * <keyboard> -- the root element.
    */
-  keyboard: LKKeyboard;
+  keyboard3: LKKeyboard;
 }
 
 export interface LKKeyboard {
diff --git a/common/web/types/src/schemas.ts b/common/web/types/src/schemas.ts
index 451afc416b..3d1ce0cbf1 100644
--- a/common/web/types/src/schemas.ts
+++ b/common/web/types/src/schemas.ts
@@ -2,8 +2,8 @@
 import kpj from './schemas/kpj.schema.js';
 import kpj90 from './schemas/kpj-9.0.schema.js';
 import kvks from './schemas/kvks.schema.js';
-import ldmlKeyboard from './schemas/ldml-keyboard.schema.js';
-import ldmlKeyboardTest from './schemas/ldml-keyboardtest.schema.js';
+import ldmlKeyboard3 from './schemas/ldml-keyboard3.schema.js';
+import ldmlKeyboardTest3 from './schemas/ldml-keyboardtest3.schema.js';
 import displayMap from './schemas/displaymap.schema.js';
 import touchLayoutClean from './schemas/keyman-touch-layout.clean.spec.js';
 import touchLayout from './schemas/keyman-touch-layout.spec.js';
@@ -12,11 +12,11 @@ const Schemas = {
   kpj,
   kpj90,
   kvks,
-  ldmlKeyboard,
-  ldmlKeyboardTest,
+  ldmlKeyboard3,
+  ldmlKeyboardTest3,
   displayMap,
   touchLayoutClean,
   touchLayout,
 };
 
-export default Schemas;
\ No newline at end of file
+export default Schemas;
diff --git a/common/web/types/test/fixtures/import-minimal.xml b/common/web/types/test/fixtures/import-minimal.xml
index 500367699d..f23bc5c325 100644
--- a/common/web/types/test/fixtures/import-minimal.xml
+++ b/common/web/types/test/fixtures/import-minimal.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="und" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="und" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
   <names>
     <name value="Test Minimal Keyboard" />
   </names>
-</keyboard>
+</keyboard3>
diff --git a/common/web/types/test/fixtures/import-minimal1.xml b/common/web/types/test/fixtures/import-minimal1.xml
index 439741d041..ce2140893e 100644
--- a/common/web/types/test/fixtures/import-minimal1.xml
+++ b/common/web/types/test/fixtures/import-minimal1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="und" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="und" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
   <names>
     <name value="Test Minimal Keyboard" />
@@ -8,4 +8,4 @@
   <keys>
 
   </keys>
-</keyboard>
+</keyboard3>
diff --git a/common/web/types/test/fixtures/import-minimal2.xml b/common/web/types/test/fixtures/import-minimal2.xml
index f04e32d673..66a836057d 100644
--- a/common/web/types/test/fixtures/import-minimal2.xml
+++ b/common/web/types/test/fixtures/import-minimal2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="und" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="und" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
   <names>
     <name value="Test Minimal Keyboard" />
@@ -8,4 +8,4 @@
   <keys>
     <key id="a" to="å"/> <!-- override -->
   </keys>
-</keyboard>
+</keyboard3>
diff --git a/common/web/types/test/fixtures/import-symbols.xml b/common/web/types/test/fixtures/import-symbols.xml
index 9ca4638204..e3421c8ff3 100644
--- a/common/web/types/test/fixtures/import-symbols.xml
+++ b/common/web/types/test/fixtures/import-symbols.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="und" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="und" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
   <names>
     <name value="Test Minimal Keyboard" />
@@ -10,4 +10,4 @@
     <key id="zz" to="zz"/>
     <key id="hash" to="##"/> <!-- override -->
   </keys>
-</keyboard>
+</keyboard3>
diff --git a/common/web/types/test/fixtures/invalid-conforms-to.xml b/common/web/types/test/fixtures/invalid-conforms-to.xml
index e2fdf8e422..e5cca5ebac 100644
--- a/common/web/types/test/fixtures/invalid-conforms-to.xml
+++ b/common/web/types/test/fixtures/invalid-conforms-to.xml
@@ -4,7 +4,7 @@
   DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd"
   Disabling doctype for this invalid file, not used by compiler, and avoids complaints in IDEs etc.
 -->
-<keyboard locale="mt" conformsTo="nothing-anyone-ever-heard-of"> <!-- invalid -->
+<keyboard3 locale="mt" conformsTo="nothing-anyone-ever-heard-of"> <!-- invalid -->
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -16,4 +16,4 @@
     <key id="that" to="ថា" />
   </keys>
 
-</keyboard>
+</keyboard3>
diff --git a/common/web/types/test/fixtures/invalid-import-base.xml b/common/web/types/test/fixtures/invalid-import-base.xml
index 3b56f1feeb..f52a13031e 100644
--- a/common/web/types/test/fixtures/invalid-import-base.xml
+++ b/common/web/types/test/fixtures/invalid-import-base.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -13,4 +13,4 @@
     <key id="that" to="ថា" />
   </keys>
 
-</keyboard>
+</keyboard3>
diff --git a/common/web/types/test/fixtures/invalid-import-path.xml b/common/web/types/test/fixtures/invalid-import-path.xml
index a9e670f882..c52b18ff56 100644
--- a/common/web/types/test/fixtures/invalid-import-path.xml
+++ b/common/web/types/test/fixtures/invalid-import-path.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -13,4 +13,4 @@
     <key id="that" to="ថា" />
   </keys>
 
-</keyboard>
+</keyboard3>
diff --git a/common/web/types/test/fixtures/invalid-import-readfail.xml b/common/web/types/test/fixtures/invalid-import-readfail.xml
index e254b55350..d66288ecda 100644
--- a/common/web/types/test/fixtures/invalid-import-readfail.xml
+++ b/common/web/types/test/fixtures/invalid-import-readfail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -13,4 +13,4 @@
     <key id="that" to="ថា" />
   </keys>
 
-</keyboard>
+</keyboard3>
diff --git a/common/web/types/test/fixtures/invalid-import-wrongroot.xml b/common/web/types/test/fixtures/invalid-import-wrongroot.xml
index 522e106e86..45d6b3b713 100644
--- a/common/web/types/test/fixtures/invalid-import-wrongroot.xml
+++ b/common/web/types/test/fixtures/invalid-import-wrongroot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -13,4 +13,4 @@
     <key id="that" to="ថា" />
   </keys>
 
-</keyboard>
+</keyboard3>
diff --git a/common/web/types/test/fixtures/invalid-structure-per-dtd.xml b/common/web/types/test/fixtures/invalid-structure-per-dtd.xml
index be504fdbf9..961e6033fa 100644
--- a/common/web/types/test/fixtures/invalid-structure-per-dtd.xml
+++ b/common/web/types/test/fixtures/invalid-structure-per-dtd.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd"
+  DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd"
   Disabling doctype for this invalid file, not used by compiler, and avoids complaints in IDEs etc.
 -->
-<keyboard locale="mt" conformsTo="techpreview">
-</keyboard>
+<keyboard3 locale="mt" conformsTo="techpreview">
+</keyboard3>
diff --git a/common/web/types/test/fixtures/test-fr.xml b/common/web/types/test/fixtures/test-fr.xml
index c97825385a..e138a1b5d1 100644
--- a/common/web/types/test/fixtures/test-fr.xml
+++ b/common/web/types/test/fixtures/test-fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
-<keyboardTest conformsTo="techpreview">
+<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
     <info keyboard="fr-t-k0-azerty.xml" author="Team Keyboard" name="fr-test" />
     <repertoire name="simple-repertoire" chars="[a b c d e \u{22}]" type="simple" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->
     <repertoire name="chars-repertoire" chars="[á é ó]" type="gesture" /> <!-- verify that these outputs are all available from simple or gesture keys on any layer, for touch -->
@@ -19,4 +19,4 @@
             <check result="abc\u0022...stuv" />
         </test>
     </tests>
-</keyboardTest>
+</keyboardTest3>
diff --git a/common/web/types/test/helpers/reader-callback-test.ts b/common/web/types/test/helpers/reader-callback-test.ts
index 4515aa15ea..86758ad413 100644
--- a/common/web/types/test/helpers/reader-callback-test.ts
+++ b/common/web/types/test/helpers/reader-callback-test.ts
@@ -105,7 +105,7 @@ export function testReaderCases(cases : CompilationCase[]) {
           assert.includeDeepMembers(callbacks.messages, testcase.warnings, 'expected warnings to be included');
         } else if (!expectFailure) {
           // no warnings, so expect zero messages
-          assert.strictEqual(callbacks.messages.length, 0, 'expected zero messages');
+          assert.deepEqual(callbacks.messages, [], 'expected zero messages');
         }
 
         // run the user-supplied callback if any
diff --git a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts b/common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts
index 6a789c7493..80a78a1187 100644
--- a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts
+++ b/common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts
@@ -11,16 +11,16 @@ describe('ldml keyboard xml reader tests', function () {
       subpath: 'test-fr.xml',
       callback: (data, source) => {
         assert.ok(source);
-        assert.ok(source.keyboardTest);
-        assert.equal(source.keyboardTest.conformsTo, constants.cldr_version_latest);
+        assert.ok(source.keyboardTest3);
+        assert.equal(source.keyboardTest3.conformsTo, constants.cldr_version_latest);
 
-        assert.deepEqual(source.keyboardTest.info, {
+        assert.deepEqual(source.keyboardTest3.info, {
           keyboard: 'fr-t-k0-azerty.xml',
           author: 'Team Keyboard',
           name: 'fr-test'
         });
 
-        assert.sameDeepMembers(source.keyboardTest.repertoire, [
+        assert.sameDeepMembers(source.keyboardTest3.repertoire, [
           {
             name: 'simple-repertoire',
             chars: '[a b c d e \\u{22}]',
@@ -29,10 +29,10 @@ describe('ldml keyboard xml reader tests', function () {
           { name: 'chars-repertoire', chars: '[á é ó]', type: 'gesture' }
         ]);
 
-        assert.equal(1, source.keyboardTest.tests?.length);
-        assert.equal('key-tests', source.keyboardTest.tests[0].name);
-        assert.equal(1, source.keyboardTest.tests[0].test?.length);
-        const test0 = source.keyboardTest.tests[0].test[0];
+        assert.equal(1, source.keyboardTest3.tests?.length);
+        assert.equal('key-tests', source.keyboardTest3.tests[0].name);
+        assert.equal(1, source.keyboardTest3.tests[0].test?.length);
+        const test0 = source.keyboardTest3.tests[0].test[0];
         assert.equal('key-test', test0.name);
         assert.equal('abc\\u0022...', test0.startContext?.to);
         assert.sameDeepOrderedMembers([
diff --git a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts b/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts
index ac791dac33..4da7a00663 100644
--- a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts
+++ b/common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts
@@ -15,7 +15,7 @@ describe('ldml keyboard xml reader tests', function () {
     {
       subpath: 'invalid-structure-per-dtd.xml',
       errors: [CommonTypesMessages.Error_SchemaValidationError({
-        instancePath: '/keyboard',
+        instancePath: '/keyboard3',
         keyword: 'required',
         message: `must have required property 'names'`,
         params: 'missingProperty="names"',
@@ -24,7 +24,7 @@ describe('ldml keyboard xml reader tests', function () {
     {
       subpath: 'invalid-conforms-to.xml',
       errors: [CommonTypesMessages.Error_SchemaValidationError({
-        instancePath: '/keyboard/conformsTo',
+        instancePath: '/keyboard3/conformsTo',
         keyword: 'enum',
         message: `must be equal to one of the allowed values`,
         params: 'allowedValues="techpreview"',
@@ -33,8 +33,8 @@ describe('ldml keyboard xml reader tests', function () {
     {
       subpath: 'import-minimal.xml',
       callback: (data, source, subpath, callbacks) => {
-        assert.ok(source?.keyboard?.keys);
-        const k = pluckKeysFromKeybag(source?.keyboard?.keys.key, ['a', 'b', 'c']);
+        assert.ok(source?.keyboard3?.keys);
+        const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c']);
         assert.sameDeepOrderedMembers(k, [
           {id: 'a', to: 'a'},
           {id: 'b', to: 'b'},
@@ -45,8 +45,8 @@ describe('ldml keyboard xml reader tests', function () {
     {
       subpath: 'import-minimal1.xml',
       callback: (data, source, subpath, callbacks) => {
-        assert.ok(source?.keyboard?.keys);
-        const k = pluckKeysFromKeybag(source?.keyboard?.keys.key, ['a', 'b', 'c']);
+        assert.ok(source?.keyboard3?.keys);
+        const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c']);
         assert.sameDeepOrderedMembers(k, [
           {id: 'a', to: 'a'},
           {id: 'b', to: 'b'},
@@ -57,8 +57,8 @@ describe('ldml keyboard xml reader tests', function () {
     {
       subpath: 'import-minimal2.xml',
       callback: (data, source, subpath, callbacks) => {
-        assert.ok(source?.keyboard?.keys);
-        const k = pluckKeysFromKeybag(source?.keyboard?.keys.key, ['a', 'b', 'c']);
+        assert.ok(source?.keyboard3?.keys);
+        const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c']);
         assert.sameDeepOrderedMembers(k, [
           {id: 'a', to: 'a'},
           {id: 'b', to: 'b'},
@@ -70,8 +70,8 @@ describe('ldml keyboard xml reader tests', function () {
     {
       subpath: 'import-symbols.xml',
       callback: (data, source, subpath, callbacks) => {
-        assert.ok(source?.keyboard?.keys);
-        const k = pluckKeysFromKeybag(source?.keyboard?.keys.key, ['a', 'b', 'c', 'zz', 'hash', 'hyphen']);
+        assert.ok(source?.keyboard3?.keys);
+        const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c', 'zz', 'hash', 'hyphen']);
         assert.sameDeepOrderedMembers(k, [
           {id: 'a', to: 'a'},       // implied
           {id: 'b', to: 'b'},
diff --git a/core/tests/unit/ldml/invalid-keyboards/ik_000_null_invalid.xml b/core/tests/unit/ldml/invalid-keyboards/ik_000_null_invalid.xml
index 85b7023d5a..a16eb61346 100644
--- a/core/tests/unit/ldml/invalid-keyboards/ik_000_null_invalid.xml
+++ b/core/tests/unit/ldml/invalid-keyboards/ik_000_null_invalid.xml
@@ -7,4 +7,4 @@
 @@expect-error: This keyboard is invalid, so it will fail to load
 
 -->
-<keyboard />
+<keyboard3 />
diff --git a/core/tests/unit/ldml/keyboards/k_000_null_keyboard.xml b/core/tests/unit/ldml/keyboards/k_000_null_keyboard.xml
index 516c336b24..73dfce5dd9 100644
--- a/core/tests/unit/ldml/keyboards/k_000_null_keyboard.xml
+++ b/core/tests/unit/ldml/keyboards/k_000_null_keyboard.xml
@@ -7,4 +7,4 @@
 @@expect:
 
 -->
-<keyboard />
+<keyboard3 />
diff --git a/core/tests/unit/ldml/keyboards/k_001_tiny-test.xml b/core/tests/unit/ldml/keyboards/k_001_tiny-test.xml
index 63fba5778a..231523458c 100644
--- a/core/tests/unit/ldml/keyboards/k_001_tiny-test.xml
+++ b/core/tests/unit/ldml/keyboards/k_001_tiny-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
-<keyboardTest conformsTo="techpreview">
+<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
   <info keyboard="k_001_tiny.xml" author="srl295" name="k_001_tiny" />
   <!-- <repertoire chars="[ħ ថា]" type="simple" name="our-little-language" /> TODO-LDML: not working yet -->
   <repertoire chars="[ħ]" type="simple" name="minus-khmer" />
@@ -13,4 +13,4 @@
       <check result="ħថាħ"/>
     </test>
   </tests>
-</keyboardTest>
+</keyboardTest3>
diff --git a/core/tests/unit/ldml/keyboards/k_001_tiny.xml b/core/tests/unit/ldml/keyboards/k_001_tiny.xml
index 65bf21ea51..e17284025d 100644
--- a/core/tests/unit/ldml/keyboards/k_001_tiny.xml
+++ b/core/tests/unit/ldml/keyboards/k_001_tiny.xml
@@ -8,8 +8,8 @@
 @@expected: \u0127\u1790\u17B6\u0127
 
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -26,4 +26,4 @@
       <row keys="hmaqtugha that" /> <!-- number row -->
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_002_tinyu32.xml b/core/tests/unit/ldml/keyboards/k_002_tinyu32.xml
index 85d5f7d943..7ef6c0b379 100644
--- a/core/tests/unit/ldml/keyboards/k_002_tinyu32.xml
+++ b/core/tests/unit/ldml/keyboards/k_002_tinyu32.xml
@@ -6,8 +6,8 @@
 @@expected: \u0127\u1790\u17B6\u0127\uD83D\uDE40\u0127
 
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -25,4 +25,4 @@
       <row keys="hmaqtugha that screamcat" /> <!-- number row -->
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_003_transform.xml b/core/tests/unit/ldml/keyboards/k_003_transform.xml
index 565378400a..814b6829d8 100644
--- a/core/tests/unit/ldml/keyboards/k_003_transform.xml
+++ b/core/tests/unit/ldml/keyboards/k_003_transform.xml
@@ -7,8 +7,8 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
 @@expected: qu\u00ea
 
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="en" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="en" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -58,4 +58,4 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
       <transform from="ab" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_004_tinyshift.xml b/core/tests/unit/ldml/keyboards/k_004_tinyshift.xml
index 212e41d8fe..fa7df96878 100644
--- a/core/tests/unit/ldml/keyboards/k_004_tinyshift.xml
+++ b/core/tests/unit/ldml/keyboards/k_004_tinyshift.xml
@@ -6,8 +6,8 @@
 @@expected: \u0037\u1790\u17B6\u0127
 
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -29,4 +29,4 @@
       <row keys="seven eee" /> <!-- number row -->
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_005_modbittest.xml b/core/tests/unit/ldml/keyboards/k_005_modbittest.xml
index 8d1a934016..a739728092 100644
--- a/core/tests/unit/ldml/keyboards/k_005_modbittest.xml
+++ b/core/tests/unit/ldml/keyboards/k_005_modbittest.xml
@@ -6,8 +6,8 @@
 @@expected: \u0061\u0041\u0062\u0063\u0064\u0064\u0065\u0066\u0067\u0067
 
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -42,4 +42,4 @@
       <row keys="g" /> <!-- K_BKQUOTE -->
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_006_backspace.xml b/core/tests/unit/ldml/keyboards/k_006_backspace.xml
index f1ab58c695..b3f126eeab 100644
--- a/core/tests/unit/ldml/keyboards/k_006_backspace.xml
+++ b/core/tests/unit/ldml/keyboards/k_006_backspace.xml
@@ -7,8 +7,8 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
 @@expected: t
 
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="en" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="en" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -58,4 +58,4 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
       <transform from="ab" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_007_transform_rgx-test.xml b/core/tests/unit/ldml/keyboards/k_007_transform_rgx-test.xml
index d79f4f92b4..e6cc5ce387 100644
--- a/core/tests/unit/ldml/keyboards/k_007_transform_rgx-test.xml
+++ b/core/tests/unit/ldml/keyboards/k_007_transform_rgx-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
-<keyboardTest conformsTo="techpreview">
+<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
   <info keyboard="k_007_transform_rgx.xml" author="Team Keyboard" name="marker" />
   <tests name="regex-tests">
     <test name="regex-test-basic">
@@ -21,4 +21,4 @@
       <check result="ayy" />
     </test>
   </tests>
-</keyboardTest>
+</keyboardTest3>
diff --git a/core/tests/unit/ldml/keyboards/k_007_transform_rgx.xml b/core/tests/unit/ldml/keyboards/k_007_transform_rgx.xml
index 32c690b76d..c2addf9dc1 100644
--- a/core/tests/unit/ldml/keyboards/k_007_transform_rgx.xml
+++ b/core/tests/unit/ldml/keyboards/k_007_transform_rgx.xml
@@ -4,8 +4,8 @@
 from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-keyboards.md#element-transform
 
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="en" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="en" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -45,4 +45,4 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
       <transform from="($[upper])`" to="$[1:lower]"/> <!-- Lowercase (and drop grave): A` » a -->
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_010_mt.xml b/core/tests/unit/ldml/keyboards/k_010_mt.xml
index c0734ac180..3253c1f095 100644
--- a/core/tests/unit/ldml/keyboards/k_010_mt.xml
+++ b/core/tests/unit/ldml/keyboards/k_010_mt.xml
@@ -10,9 +10,9 @@ Gets part of the way,
     Based on mt.xml from CLDR.  'TODO-LDML' denotes modifications.
     Note this is the 47-key version.
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
 <!-- remainder entirely from resources/standards-data/ldml-keyboards/techpreview/3.0/mt-t-k0-47key.xml -->
-<keyboard locale="mt-t-k0-47key" conformsTo="techpreview">
+<keyboard3 locale="mt-t-k0-47key" conformsTo="techpreview">
     <locales>
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
@@ -93,4 +93,4 @@ Gets part of the way,
         </layer>
     </layers>
 
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_011_mt_iso.xml b/core/tests/unit/ldml/keyboards/k_011_mt_iso.xml
index f572bac9ec..30378708cf 100644
--- a/core/tests/unit/ldml/keyboards/k_011_mt_iso.xml
+++ b/core/tests/unit/ldml/keyboards/k_011_mt_iso.xml
@@ -11,8 +11,8 @@ Exact copy of mt.xml from CLDR, but with:
   - an updated DTD path
   - test case
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
     <locales>
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
@@ -90,4 +90,4 @@ Exact copy of mt.xml from CLDR, but with:
         </layer>
     </layers>
 
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_020_fr-test.xml b/core/tests/unit/ldml/keyboards/k_020_fr-test.xml
index 04066ae220..99cbe4bd6f 100644
--- a/core/tests/unit/ldml/keyboards/k_020_fr-test.xml
+++ b/core/tests/unit/ldml/keyboards/k_020_fr-test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Note: similar to, but slightly ahead of, fr-t-k0-azerty -->
-<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
-<keyboardTest conformsTo="techpreview">
+<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
     <info keyboard="k_020_fr.xml" author="Team Keyboard" name="fr-test-updated" />
     <repertoire name="simple-repertoire" chars="[a b c d e \u0022]" type="simple" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->
     <repertoire name="chars-repertoire" chars="[á é ó]" type="gesture" /> <!-- verify that these outputs are all available from simple or gesture keys on any layer, for touch -->
@@ -20,4 +20,4 @@
             <check result="abc\u0022...stuv" />
         </test>
     </tests>
-</keyboardTest>
+</keyboardTest3>
diff --git a/core/tests/unit/ldml/keyboards/k_020_fr.xml b/core/tests/unit/ldml/keyboards/k_020_fr.xml
index 1f6fc2c32f..843ad80ede 100644
--- a/core/tests/unit/ldml/keyboards/k_020_fr.xml
+++ b/core/tests/unit/ldml/keyboards/k_020_fr.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Note: similar to, but slightly ahead of, fr-t-k0-azerty -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="fr-t-k0-azerty" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="fr-t-k0-azerty" conformsTo="techpreview">
 	<locales>
 		<locale id="br" /> <!-- example of including Breton -->
 	</locales>
@@ -195,4 +195,4 @@
     </transformGroup>
 	</transforms>
 
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_100_keytest.xml b/core/tests/unit/ldml/keyboards/k_100_keytest.xml
index 8076620494..0078ed9c26 100644
--- a/core/tests/unit/ldml/keyboards/k_100_keytest.xml
+++ b/core/tests/unit/ldml/keyboards/k_100_keytest.xml
@@ -5,8 +5,8 @@
 @@expected: \u0061
 -->
 
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="en" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="en" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -23,4 +23,4 @@
       <row keys="a gap"/>
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_101_keytest.xml b/core/tests/unit/ldml/keyboards/k_101_keytest.xml
index f3ef3fbdce..827fe9cd9d 100644
--- a/core/tests/unit/ldml/keyboards/k_101_keytest.xml
+++ b/core/tests/unit/ldml/keyboards/k_101_keytest.xml
@@ -4,8 +4,8 @@
 @@keys: [K_BKQUOTE]
 @@expected: \u0061
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="en" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="en" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -26,4 +26,4 @@
       <row keys="a" /> <!-- number row -->
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_102_keytest.xml b/core/tests/unit/ldml/keyboards/k_102_keytest.xml
index f541fbfd7b..3f379fd76b 100644
--- a/core/tests/unit/ldml/keyboards/k_102_keytest.xml
+++ b/core/tests/unit/ldml/keyboards/k_102_keytest.xml
@@ -5,8 +5,8 @@
 @@expected: \u0061
 -->
 
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="en" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="en" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
 
   <names>
@@ -19,4 +19,4 @@
     </layer>
   </layers>
 
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana-test.xml b/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana-test.xml
index d23862ca2b..d8fc776ac9 100644
--- a/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana-test.xml
+++ b/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
-<keyboardTest conformsTo="techpreview">
+<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
   <info keyboard="k_200_reorder_nod_Lana.xml" author="Team Keyboard" name="nod-Lana" />
   <tests name="reorder-tests">
     <test name="roast00-orig-emit">
@@ -54,4 +54,4 @@
       <check result="\u1A21\u1A60\u1A45\u1A6B\u1A76" />
     </test>
   </tests>
-</keyboardTest>
+</keyboardTest3>
diff --git a/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana.xml b/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana.xml
index 8df0d5ffd7..061b40c882 100644
--- a/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana.xml
+++ b/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana.xml
@@ -5,8 +5,8 @@
   see https://keyman.com/keyboards/sil_boonkit
 -->
 
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="nod" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="nod" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
   <names>
     <name value="nod-Lana Test" />
@@ -46,4 +46,4 @@
       <reorder before="\u1A6B" from="\u1A60[\u1A75-\u1A79]\u1A45" order="10 55 10" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_210_marker-test.xml b/core/tests/unit/ldml/keyboards/k_210_marker-test.xml
index 9853a3dca6..5d7fdb51bd 100644
--- a/core/tests/unit/ldml/keyboards/k_210_marker-test.xml
+++ b/core/tests/unit/ldml/keyboards/k_210_marker-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
-<keyboardTest conformsTo="techpreview">
+<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
   <info keyboard="k_210_marker.xml" author="Team Keyboard" name="marker" />
   <tests name="marker-tests">
     <test name="marker-test-basic-grave">
@@ -43,4 +43,4 @@
       <check result="é" />
     </test>
   </tests>
-</keyboardTest>
+</keyboardTest3>
diff --git a/core/tests/unit/ldml/keyboards/k_210_marker.xml b/core/tests/unit/ldml/keyboards/k_210_marker.xml
index 80f4559a27..1635ce0a2a 100644
--- a/core/tests/unit/ldml/keyboards/k_210_marker.xml
+++ b/core/tests/unit/ldml/keyboards/k_210_marker.xml
@@ -4,8 +4,8 @@
   Test Keyboard
 -->
 
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="en" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="en" conformsTo="techpreview">
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
   <names>
     <name value="Marker Test" />
@@ -50,4 +50,4 @@
       <!-- no cleanup for trailing acute -->
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/inst/download.in.mak b/developer/src/inst/download.in.mak
index bed37b413f..eeadd67ac0 100644
--- a/developer/src/inst/download.in.mak
+++ b/developer/src/inst/download.in.mak
@@ -127,7 +127,7 @@ make-kmcomp-install-zip: copy-schemas
 
 # TODO: are these required?
 # kpj.schema.json kvks.schema.json \
-# ldml-keyboard.schema.json ldml-keyboardtest.schema.json \
+# ldml-keyboard3.schema.json ldml-keyboardtest3.schema.json \
 
 copy-schemas:
     copy $(KEYMAN_ROOT)\common\schemas\keyboard_info\keyboard_info.source.json $(DEVELOPER_ROOT)\bin
diff --git a/developer/src/kmc-ldml/src/compiler/disp.ts b/developer/src/kmc-ldml/src/compiler/disp.ts
index 8f6d65d79b..77c9609876 100644
--- a/developer/src/kmc-ldml/src/compiler/disp.ts
+++ b/developer/src/kmc-ldml/src/compiler/disp.ts
@@ -27,8 +27,8 @@ export class DispCompiler extends SectionCompiler {
     const tos = new Set();
     const ids = new Set();
 
-    if (this.keyboard.displays?.display) {
-      for (const { to, id } of this.keyboard.displays?.display) {
+    if (this.keyboard3.displays?.display) {
+      for (const { to, id } of this.keyboard3.displays?.display) {
         if ((to && id) || (!to && !id)) {
           this.callbacks.reportMessage(CompilerMessages.Error_DisplayNeedsToOrId({ to, id }));
           return false;
@@ -57,12 +57,12 @@ export class DispCompiler extends SectionCompiler {
     let result = new Disp();
 
     // displayOptions
-    result.baseCharacter = sections.strs.allocAndUnescapeString(this.keyboard.displays?.displayOptions?.baseCharacter);
+    result.baseCharacter = sections.strs.allocAndUnescapeString(this.keyboard3.displays?.displayOptions?.baseCharacter);
 
     // TODO-LDML: substitute variables!
 
     // displays
-    result.disps = this.keyboard.displays?.display.map(display => ({
+    result.disps = this.keyboard3.displays?.display.map(display => ({
       to: sections.strs.allocAndUnescapeString(sections.vars.substituteMarkerString(display.to)),
       id: sections.strs.allocString(display.id), // not escaped, not substituted
       display: sections.strs.allocAndUnescapeString(display.display),
diff --git a/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts b/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts
index 0087e1356d..542cbc7d8f 100644
--- a/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts
+++ b/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts
@@ -73,13 +73,13 @@ export class LdmlKeyboardKeymanWebCompiler {
       // `${tab}${this.setupDebug()}${nl}` + ? we may use this for modifierBitmask in future
       // `${tab}this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;${nl}` + ? we probably don't need this, it's for back-compat
       `${tab}this.KI="${sName}";${nl}` +
-      `${tab}this.KN=${JSON.stringify(source.keyboard.names.name[0])};${nl}` +
+      `${tab}this.KN=${JSON.stringify(source.keyboard3.names.name[0])};${nl}` +
       `${tab}this.KMINVER=${JSON.stringify(MINIMUM_KMW_VERSION)};${nl}` +
       `${tab}this.KV=${this.compileVisualKeyboard(source)};${nl}` +
       `${tab}this.KDU=${displayUnderlying ? '1' : '0'};${nl}` +
       `${tab}this.KH="";${nl}` +  // TODO-LDML: help text not supported
       `${tab}this.KM=0;${nl}` +  // TODO-LDML: mnemonic layout not supported for LDML keyboards
-      `${tab}this.KBVER=${JSON.stringify(source.keyboard.version?.number || '0.0')};${nl}` +
+      `${tab}this.KBVER=${JSON.stringify(source.keyboard3.version?.number || '0.0')};${nl}` +
       `${tab}this.KMBM=${modifierBitmask};${nl}`;
 
     if(isRTL) {
@@ -111,4 +111,4 @@ export class LdmlKeyboardKeymanWebCompiler {
     result += `}${nl}`;
     return result;
   }
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-ldml/src/compiler/keys.ts b/developer/src/kmc-ldml/src/compiler/keys.ts
index 5301c93bee..652b584d0f 100644
--- a/developer/src/kmc-ldml/src/compiler/keys.ts
+++ b/developer/src/kmc-ldml/src/compiler/keys.ts
@@ -30,15 +30,15 @@ export class KeysCompiler extends SectionCompiler {
    * @returns just the non-touch layers.
    */
   public hardwareLayers() {
-    return this.keyboard.layers?.filter(({ form }) => form !== "touch");
+    return this.keyboard3.layers?.filter(({ form }) => form !== "touch");
   }
 
   public validate() {
     let valid = true;
 
     // general key-level validation here, only of used keys
-    const usedKeys = allUsedKeyIdsInLayers(this.keyboard?.layers);
-    const uniqueKeys = calculateUniqueKeys([...this.keyboard.keys?.key]);
+    const usedKeys = allUsedKeyIdsInLayers(this.keyboard3?.layers);
+    const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
     for (let key of uniqueKeys) {
       const { id, flicks } = key;
       if (!usedKeys.has(id)) {
@@ -48,7 +48,7 @@ export class KeysCompiler extends SectionCompiler {
       if (!flicks) {
         continue; // no flicks
       }
-      const flickEntry = this.keyboard.keys?.flicks?.find(
+      const flickEntry = this.keyboard3.keys?.flicks?.find(
         (x) => x.id === flicks
       );
       if (!flickEntry) {
@@ -80,7 +80,7 @@ export class KeysCompiler extends SectionCompiler {
 
   public compile(sections: DependencySections): Keys {
     /* c8 ignore next 4 */
-    if (!this.keyboard?.keys?.key && !this.keyboard?.keys?.flicks) {
+    if (!this.keyboard3?.keys?.key && !this.keyboard3?.keys?.flicks) {
       // short-circuit if no keys or flicks. Doesn't happen in practice due to implied import.
       return null;
     }
@@ -114,7 +114,7 @@ export class KeysCompiler extends SectionCompiler {
   }
 
   public loadFlicks(sections: DependencySections, sect: Keys) {
-    for (let lkflicks of this.keyboard.keys.flicks) {
+    for (let lkflicks of this.keyboard3.keys.flicks) {
       let flicks: KeysFlicks = new KeysFlicks(
         sections.strs.allocString(lkflicks.id)
       );
@@ -142,8 +142,8 @@ export class KeysCompiler extends SectionCompiler {
   }
 
   public loadKeys(sections: DependencySections, sect: Keys) {
-    const usedKeys = allUsedKeyIdsInLayers(this.keyboard?.layers);
-    const uniqueKeys = calculateUniqueKeys([...this.keyboard.keys?.key]);
+    const usedKeys = allUsedKeyIdsInLayers(this.keyboard3?.layers);
+    const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
 
     for (let key of uniqueKeys) {
       if (!usedKeys.has(key.id)) {
@@ -227,7 +227,7 @@ export class KeysCompiler extends SectionCompiler {
       valid = false;
     }
 
-    const uniqueKeys = calculateUniqueKeys([...this.keyboard.keys?.key]);
+    const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
     if (layer.row.length > keymap.length) {
       this.callbacks.reportMessage(
         CompilerMessages.Error_HardwareLayerHasTooManyRows()
@@ -300,7 +300,7 @@ export class KeysCompiler extends SectionCompiler {
 
         // TODO-LDML: we already validated that the key exists, above.
         // So here we only need the ID?
-        // let keydef = this.keyboard.keys?.key?.find(x => x.id == key);
+        // let keydef = this.keyboard3.keys?.key?.find(x => x.id == key);
 
         sect.kmap.push({
           vkey: keymap[y][x],
diff --git a/developer/src/kmc-ldml/src/compiler/layr.ts b/developer/src/kmc-ldml/src/compiler/layr.ts
index e0be7a6f5e..281ca8d5db 100644
--- a/developer/src/kmc-ldml/src/compiler/layr.ts
+++ b/developer/src/kmc-ldml/src/compiler/layr.ts
@@ -22,7 +22,7 @@ export class LayrCompiler extends SectionCompiler {
     let totalLayerCount = 0;
     let hardwareLayers = 0;
     // let touchLayers = 0;
-    this.keyboard.layers?.forEach((layers) => {
+    this.keyboard3.layers?.forEach((layers) => {
       const { form } = layers;
       if (form === 'touch') {
         // touchLayers++;
@@ -62,7 +62,7 @@ export class LayrCompiler extends SectionCompiler {
   public compile(sections: DependencySections): Layr {
     const sect = new Layr();
 
-    sect.lists = this.keyboard.layers.map((layers) => {
+    sect.lists = this.keyboard3.layers.map((layers) => {
       const hardware = constants.layr_list_hardware_map.get(layers.form);
       // Already validated in validate
       const list: LayrList = {
diff --git a/developer/src/kmc-ldml/src/compiler/loca.ts b/developer/src/kmc-ldml/src/compiler/loca.ts
index a57a8224ae..84be9e0bbf 100644
--- a/developer/src/kmc-ldml/src/compiler/loca.ts
+++ b/developer/src/kmc-ldml/src/compiler/loca.ts
@@ -24,7 +24,7 @@ export class LocaCompiler extends SectionCompiler {
 
   public validate(): boolean {
     let valid = true;
-    const locales = this.getLocales(this.keyboard);
+    const locales = this.getLocales(this.keyboard3);
     for(let tag of locales) {
       try {
         new Intl.Locale(tag);
@@ -46,7 +46,7 @@ export class LocaCompiler extends SectionCompiler {
 
     // This also minimizes locales according to Remove Likely Subtags algorithm:
     // https://www.unicode.org/reports/tr35/#Likely_Subtags
-    const sourceLocales = this.getLocales(this.keyboard);
+    const sourceLocales = this.getLocales(this.keyboard3);
     const locales = sourceLocales.map((sourceLocale: string) => {
       const locale = new Intl.Locale(sourceLocale).minimize().toString();
       if(locale != sourceLocale) {
diff --git a/developer/src/kmc-ldml/src/compiler/meta.ts b/developer/src/kmc-ldml/src/compiler/meta.ts
index 2606692d99..187a2ca951 100644
--- a/developer/src/kmc-ldml/src/compiler/meta.ts
+++ b/developer/src/kmc-ldml/src/compiler/meta.ts
@@ -20,8 +20,8 @@ export class MetaCompiler extends SectionCompiler {
   public validate(): boolean {
     let valid = true;
 
-    valid &&= this.validateNormalization(this.keyboard.info?.normalization);
-    valid &&= this.validateVersion(this.keyboard.version?.number);
+    valid &&= this.validateNormalization(this.keyboard3.info?.normalization);
+    valid &&= this.validateVersion(this.keyboard3.version?.number);
 
     return valid;
   }
@@ -53,16 +53,16 @@ export class MetaCompiler extends SectionCompiler {
 
   public compile(sections: DependencySections): Meta {
     let result = new Meta();
-    result.author        = sections.strs.allocString(this.keyboard.info?.author);
-    result.conform       = sections.strs.allocString(this.keyboard.conformsTo);
-    result.layout        = sections.strs.allocString(this.keyboard.info?.layout);
-    result.normalization = sections.strs.allocString(this.keyboard.info?.normalization);
-    result.indicator     = sections.strs.allocString(this.keyboard.info?.indicator);
-    result.version       = sections.strs.allocString(this.keyboard.version?.number ?? "0.0.0");
+    result.author        = sections.strs.allocString(this.keyboard3.info?.author);
+    result.conform       = sections.strs.allocString(this.keyboard3.conformsTo);
+    result.layout        = sections.strs.allocString(this.keyboard3.info?.layout);
+    result.normalization = sections.strs.allocString(this.keyboard3.info?.normalization);
+    result.indicator     = sections.strs.allocString(this.keyboard3.info?.indicator);
+    result.version       = sections.strs.allocString(this.keyboard3.version?.number ?? "0.0.0");
     result.settings =
-      (this.keyboard.settings?.fallback == "omit" ? KeyboardSettings.fallback : 0) |
-      (this.keyboard.settings?.transformFailure == "omit" ? KeyboardSettings.transformFailure : 0) |
-      (this.keyboard.settings?.transformPartial == "hide" ? KeyboardSettings.transformPartial : 0);
+      (this.keyboard3.settings?.fallback == "omit" ? KeyboardSettings.fallback : 0) |
+      (this.keyboard3.settings?.transformFailure == "omit" ? KeyboardSettings.transformFailure : 0) |
+      (this.keyboard3.settings?.transformPartial == "hide" ? KeyboardSettings.transformPartial : 0);
     return result;
   }
 }
diff --git a/developer/src/kmc-ldml/src/compiler/name.ts b/developer/src/kmc-ldml/src/compiler/name.ts
index 21307cbc00..138732ae30 100644
--- a/developer/src/kmc-ldml/src/compiler/name.ts
+++ b/developer/src/kmc-ldml/src/compiler/name.ts
@@ -13,13 +13,13 @@ export class NameCompiler extends SectionCompiler {
 
   public validate(): boolean {
     let valid = true;
-    valid = (this.keyboard.names?.name?.length ?? 0) > 0;
+    valid = (this.keyboard3.names?.name?.length ?? 0) > 0;
     return valid;
   }
 
   public compile(sections: DependencySections): Name {
     let result = new Name();
-    result.names = this.keyboard.names?.name?.map(v => sections.strs.allocString(v.value)) ?? [];
+    result.names = this.keyboard3.names?.name?.map(v => sections.strs.allocString(v.value)) ?? [];
     return result;
   }
 }
diff --git a/developer/src/kmc-ldml/src/compiler/section-compiler.ts b/developer/src/kmc-ldml/src/compiler/section-compiler.ts
index 9e187fafe6..8744059f7b 100644
--- a/developer/src/kmc-ldml/src/compiler/section-compiler.ts
+++ b/developer/src/kmc-ldml/src/compiler/section-compiler.ts
@@ -3,11 +3,11 @@ import { SectionIdent, constants } from '@keymanapp/ldml-keyboard-constants';
 
 /* istanbul ignore next */
 export class SectionCompiler {
-  protected readonly keyboard: LDMLKeyboard.LKKeyboard;
+  protected readonly keyboard3: LDMLKeyboard.LKKeyboard;
   protected readonly callbacks: CompilerCallbacks;
 
   constructor(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks) {
-    this.keyboard = source.keyboard;
+    this.keyboard3 = source.keyboard3;
     this.callbacks = callbacks;
   }
 
diff --git a/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts b/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts
index 311f213749..19ac78f13c 100644
--- a/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts
+++ b/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts
@@ -10,7 +10,7 @@ export class TouchLayoutCompiler {
       layer: []
     };
 
-    for(let layers of source.keyboard.layers) {
+    for(let layers of source.keyboard3.layers) {
       for(let layer of layers.layer) {
         const resultLayer = this.compileHardwareLayer(source, result, layer);
         result.desktop.layer.push(resultLayer);
@@ -41,7 +41,7 @@ export class TouchLayoutCompiler {
 
       const keys = row.keys.split(' ');
       for(let key of keys) {
-        const keydef = source.keyboard.keys?.key?.find(x => x.id == key);
+        const keydef = source.keyboard3.keys?.key?.find(x => x.id == key);
         if(keydef) {
           const fileKey: TouchLayout.TouchLayoutKey = {
             id: this.translateKeyIdentifierToTouch(keydef.id) as TouchLayout.TouchLayoutKeyId,
@@ -106,4 +106,4 @@ export class TouchLayoutCompiler {
     // Not a standard key
     return 'T_'+id;
   }
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-ldml/src/compiler/tran.ts b/developer/src/kmc-ldml/src/compiler/tran.ts
index fa1f828622..9f39e302ef 100644
--- a/developer/src/kmc-ldml/src/compiler/tran.ts
+++ b/developer/src/kmc-ldml/src/compiler/tran.ts
@@ -41,7 +41,7 @@ export class TransformCompiler<T extends TransformCompilerType, TranBase extends
     const reportMessage = this.callbacks.reportMessage.bind(this.callbacks);
 
     let valid = true;
-    const transforms = this?.keyboard?.transforms;
+    const transforms = this?.keyboard3?.transforms;
     if (transforms) {
       const types : string[] = transforms.map(({type}) => type);
       if (!verifyValidAndUnique(types,
@@ -167,7 +167,7 @@ export class TransformCompiler<T extends TransformCompilerType, TranBase extends
   }
 
   public compile(sections: DependencySections): TranBase {
-    for(let t of this.keyboard.transforms) {
+    for(let t of this.keyboard3.transforms) {
       if(t.type == this.type) {
         // compile only the transforms of the correct type
         return this.compileTransforms(sections, t);
diff --git a/developer/src/kmc-ldml/src/compiler/vars.ts b/developer/src/kmc-ldml/src/compiler/vars.ts
index 8ef0ffb312..3056667069 100644
--- a/developer/src/kmc-ldml/src/compiler/vars.ts
+++ b/developer/src/kmc-ldml/src/compiler/vars.ts
@@ -43,7 +43,7 @@ export class VarsCompiler extends SectionCompiler {
 
   private validateVars(): boolean {
     let valid = true;
-    const variables = this.keyboard?.variables;
+    const variables = this.keyboard3?.variables;
 
     if (!variables) {
       return true; // nothing to check
@@ -152,10 +152,10 @@ export class VarsCompiler extends SectionCompiler {
     let valid = true;
 
     // call our friends to validate
-    valid = this.validateVarsMarkers(this.keyboard, mt) && valid; // accumulate validity
-    valid = KeysCompiler.validateMarkers(this.keyboard, mt) && valid; // accumulate validity
-    valid = TransformCompiler.validateMarkers(this.keyboard, mt) && valid; // accumulate validity
-    valid = DispCompiler.validateMarkers(this.keyboard, mt) && valid; // accumulate validity
+    valid = this.validateVarsMarkers(this.keyboard3, mt) && valid; // accumulate validity
+    valid = KeysCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
+    valid = TransformCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
+    valid = DispCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
 
     return valid;
   }
@@ -195,7 +195,7 @@ export class VarsCompiler extends SectionCompiler {
   public compile(sections: DependencySections): Vars {
     const result =  new Vars();
 
-    const variables = this.keyboard?.variables;
+    const variables = this.keyboard3?.variables;
     // we always have vars, it's depended on by other sections
     // we already know the variables do not conflict with each other
     // need to add these one by one, because they depend on each other.
diff --git a/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts b/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts
index d328f8c336..c45326ff98 100644
--- a/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts
+++ b/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts
@@ -13,7 +13,7 @@ export class LdmlKeyboardVisualKeyboardCompiler {
     result.header.ansiFont = {...VisualKeyboard.DEFAULT_KVK_FONT};
     result.header.unicodeFont = {...VisualKeyboard.DEFAULT_KVK_FONT};
 
-    for(let layers of source.keyboard.layers) {
+    for(let layers of source.keyboard3.layers) {
       for(let layer of layers.layer) {
         this.compileHardwareLayer(source, result, layer);
       }
@@ -38,7 +38,7 @@ export class LdmlKeyboardVisualKeyboardCompiler {
       for(let key of keys) {
         x++;
 
-        let keydef = source.keyboard.keys?.key?.find(x => x.id == key);
+        let keydef = source.keyboard3.keys?.key?.find(x => x.id == key);
 
         if (!keydef) {
           throw Error(`Internal Error: could not find key id="${key}" in layer "${layer.id || '<none>'}", row "${y}"`);
diff --git a/developer/src/kmc-ldml/src/compiler/vkey.ts b/developer/src/kmc-ldml/src/compiler/vkey.ts
index 2d6d44d9d0..1c4c69403b 100644
--- a/developer/src/kmc-ldml/src/compiler/vkey.ts
+++ b/developer/src/kmc-ldml/src/compiler/vkey.ts
@@ -14,10 +14,10 @@ export class VkeyCompiler extends SectionCompiler {
 
   public validate(): boolean {
     let valid = true;
-    if(this.keyboard.vkeys) {
+    if(this.keyboard3.vkeys) {
       let from: string[] = [], to: string[] = [];
 
-      this.keyboard.vkeys.vkey.forEach(vk => {
+      this.keyboard3.vkeys.vkey.forEach(vk => {
         if(LdmlVkeyNames[vk.from] === undefined) {
           // TODO-LDML: When we do #7135 this may need to change back to an error.
           this.callbacks.reportMessage(CompilerMessages.Hint_VkeyIsNotValid({vkey: vk.from}));
@@ -51,12 +51,12 @@ export class VkeyCompiler extends SectionCompiler {
 
   public compile(): Vkey {
     let result = new Vkey();
-    if(!this.keyboard.vkeys) {
+    if(!this.keyboard3.vkeys) {
       /* c8 ignore next 2 */
       return result; // not hit due to boxing
     }
 
-    result.vkeys = this.keyboard.vkeys?.vkey.map(vk => {
+    result.vkeys = this.keyboard3.vkeys?.vkey.map(vk => {
       return {
         vkey: LdmlVkeyNames[vk.from],
         target: LdmlVkeyNames[vk.to]
diff --git a/developer/src/kmc-ldml/test/fixtures/basic.xml b/developer/src/kmc-ldml/test/fixtures/basic.xml
index 15266ceb66..9c45f5e07f 100644
--- a/developer/src/kmc-ldml/test/fixtures/basic.xml
+++ b/developer/src/kmc-ldml/test/fixtures/basic.xml
@@ -4,8 +4,8 @@
 @@keys: [K_Q][K_W][K_Q]
 @@expected: \u0127\u1790\u17B6\u0127
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <version number="1.0.0" />
 
   <info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
@@ -65,4 +65,4 @@
       <transform from="^e" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml
index 6de012b33a..cdff4b37fa 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="bksp-minimal" />
   </names>
@@ -13,4 +13,4 @@
       <transform from="្ម" to="" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml
index 56508009fd..d934eb8399 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="disp-escaped" />
   </names>
@@ -11,4 +11,4 @@
     <display to="\u{65}" display="(e)"/>
     <displayOptions baseCharacter="\u{78}" />
   </displays>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml
index 9554fcd9b6..4c2be92e49 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="disp-invalid" />
   </names>
@@ -10,4 +10,4 @@
     <display to="e" id="e" display="(e)"/> <!-- both to and id -->
     <displayOptions baseCharacter="x" />
   </displays>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml
index 8766cbd6c6..20cda7475f 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="disp-invalid" />
   </names>
@@ -12,4 +12,4 @@
     <display id="e" display="(e)"/> <!-- duplicate -->
     <displayOptions baseCharacter="x" />
   </displays>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml
index 3f4c264cec..0018f0a5d9 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="disp-invalid" />
   </names>
@@ -12,4 +12,4 @@
     <display to="e" display="(e)"/> <!-- duplicate -->
     <displayOptions baseCharacter="x" />
   </displays>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml
index ce5cd689e7..fd05facbaa 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="disp-invalid" />
   </names>
@@ -10,4 +10,4 @@
     <display display="(f)"/> <!-- Neither to nor id -->
     <displayOptions baseCharacter="x" />
   </displays>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml
index 22fb293a69..1a698edddb 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="disp-maximal" />
   </names>
@@ -12,4 +12,4 @@
     <display to="e" display="(e)"/>
     <displayOptions baseCharacter="x" />
   </displays>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml
index feb599c825..23ff75e29b 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="disp-minimal" />
   </names>
 
   <displays />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml
index c030909cc9..e2b9869521 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="disp-maximal" />
   </names>
@@ -9,4 +9,4 @@
   <displays>
     <displayOptions baseCharacter="x" />
   </displays>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml
index 935225e214..78ab408dec 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="disp-typical" />
   </names>
@@ -9,4 +9,4 @@
   <displays>
     <display to="\u{0300}" display="`" />
   </displays>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml
index b9d5176bc1..6ed9631029 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="finl-minimal" />
   </names>
@@ -13,4 +13,4 @@
       <transform from="xx" to="x" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml
index d0a968927b..6caeda0dfd 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="hardware-escaped" /> <!-- see maximal.xml -->
   </names>
@@ -34,4 +34,4 @@
       <row keys="q w" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml
index fee8847897..63a4384260 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="keys-escaped2" />
   </names>
@@ -16,4 +16,4 @@
     </layer>
   </layers>
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml
index 4cba4320e4..9734a7cf82 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="hardware-gap-switch" />
   </names>
@@ -23,4 +23,4 @@
       <row keys="q w" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml
index fc282c7a6c..2c23b582c3 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="hardware-minimal" />
   </names>
@@ -23,4 +23,4 @@
       <row keys="QQQ WWW" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml
index 84afa0dddb..6c9e5e4708 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="hardware-minimal" />
   </names>
@@ -19,4 +19,4 @@
       <row keys="space" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml
index 8182e8c3f0..35be4e6ee3 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="hardware-minimal" />
   </names>
@@ -19,4 +19,4 @@
       <row keys="space" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml
index 77f2ff39d1..8bb9f69513 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="keys-minimal" />
   </names>
@@ -14,4 +14,4 @@
     </layer>
   </layers>
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml
index 6c2f01a085..59abe6c9bf 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="keys-minimal" />
   </names>
@@ -30,4 +30,4 @@
       <row keys="grave one two three four five six seven eight nine ten eleven minus equal" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml
index f868fb3db3..5c6cc4ae4f 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="keys-minimal" />
   </names>
@@ -22,4 +22,4 @@
       <row keys="Q W" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml
index 98e2131b5d..53af177744 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="hardware-missing-attrs" />
   </names>
@@ -16,4 +16,4 @@
       <row keys="Q" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml
index 4bce8aa31d..0ccd239239 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="hardware-missing-flick" />
   </names>
@@ -20,4 +20,4 @@
       <row keys="Q W" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml
index 65a86838ee..5d030c2929 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="keys-minimal" />
   </names>
@@ -15,4 +15,4 @@
       <row keys="foo" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml
index b911be9760..42b7013bd8 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="keys-markers" />
   </names>
@@ -24,6 +24,6 @@
       <transform from="\m{w}" to="W" /> <!-- to quell marker err -->
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
 
 <!-- you can have any output you want, as long as it's an W ! -->
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml
index 61554e8dd9..6c9b983fbd 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="hardware-gap-switch" />
   </names>
@@ -34,4 +34,4 @@
       <row keys="q w" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml
index d8f9a64bff..801524e65f 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="keys-minimal" />
   </names>
@@ -17,4 +17,4 @@
     </layer>
   </layers>
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml
index 064a59df80..9758cf8bbd 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="und" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="und" conformsTo="techpreview">
   <names>
     <name value="layr-invalid-form" />
   </names>
@@ -17,4 +17,4 @@
       <row keys="grave one" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml
index 8d1c63e801..4be11f2604 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="und" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="und" conformsTo="techpreview">
   <names>
     <name value="layr-invalid-form" />
   </names>
@@ -17,4 +17,4 @@
       <row keys="grave one " />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
index 0a2cdf0610..f0ca747ae7 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="en" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="en" conformsTo="techpreview">
   <names>
     <name value="layr-invalid-form" />
   </names>
@@ -14,4 +14,4 @@
   <layers form="touch">
     <!-- INVALID: need at least one layer. -->
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml
index dd08e40e58..062e745dd1 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="layr-invalid-missing-layer2" />
   </names>
 
   <keys />
   <!-- invalid: need a layer! -->
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml
index dadef48404..644b8d452f 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="und" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="und" conformsTo="techpreview">
   <names>
     <name value="layr-invalid-form" />
   </names>
@@ -24,4 +24,4 @@
       <row keys="one grave" />
     </layer>
   </layers>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml
index 1644742c73..0661d9a021 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="en-*" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="en-*" conformsTo="techpreview">
   <names>
     <name value="invalid-loca" />
   </names>
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml
index 7ca838be6f..4fe10cba2a 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="loca-minimal" />
   </names>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml
index 30d00bea2e..a6363c3533 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <locales>
     <locale id="fr-FR" />
     <locale id="km-khmr-kh" />
@@ -15,4 +15,4 @@
   </names>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-normalization.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-normalization.xml
index 13723cbb2e..ffb1befffe 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-normalization.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-normalization.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <info normalization="NFQ" />
 
   <names>
@@ -9,4 +9,4 @@
   </names>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml
index f7246e40cb..9e2536ba75 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <version number="1.0" /> <!-- invalid because it's not "1.0.0" as required by semver -->
 
   <names>
@@ -9,4 +9,4 @@
   </names>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml
index dd6e292345..04ecb5a656 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <version number="v1.0.3" />
 
   <names>
@@ -9,4 +9,4 @@
   </names>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml
index f42d892e91..06f56ebbb0 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <version number="1.2.3" />
 
   <info author="The Keyman Team" indicator="QW" layout="QWIRKY" normalization="NFC" />
@@ -13,4 +13,4 @@
   <settings fallback="omit" />
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml
index 9de105e868..e523031e53 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="meta-minimal" />
   </names>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/name/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/name/minimal.xml
index 7181aa65f3..f1e4914e99 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/name/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/name/minimal.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="My First Keyboard" />
   </names>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/name/multiple.xml b/developer/src/kmc-ldml/test/fixtures/sections/name/multiple.xml
index 8838c4b4a6..8f4fd6d72f 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/name/multiple.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/name/multiple.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="My Second Keyboard" />
     <name value="My 2nd Keyboard" />
@@ -12,4 +12,4 @@
   </names>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml
index c29f6621cb..e019298c24 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="ordr-minimal" />
   </names>
@@ -14,4 +14,4 @@
       <reorder from="ខែ្ម" order="1 3 4 2" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml b/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml
index 754d8fc003..6d27dc48e3 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="nod-Lana" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="nod-Lana" conformsTo="techpreview">
   <names>
     <name value="nod-Lana Test2" />
   </names>
@@ -12,4 +12,4 @@
       <reorder from="\u{1A60 1A45}" order="10" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml b/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml
index be2da52469..1053655c9d 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="nod-Lana" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="nod-Lana" conformsTo="techpreview">
   <names>
     <name value="nod-Lana Test" />
   </names>
@@ -18,4 +18,4 @@
       <reorder before="\u1A6B" from="\u1A60[\u1A75-\u1A79]\u1A45" order="10 55 10" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml
index ac26d5b175..ec268acfe3 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="tran-minimal" />
   </names>
@@ -18,4 +18,4 @@
       <transform from="yy" to="y"/>
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml
index ec295a4261..61d3ab896a 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="tran-mixed" />
   </names>
@@ -19,4 +19,4 @@
       <!-- but this one is empty -->
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml
index 3cf5de1982..15d3b5dcb0 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="tran-minimal" />
   </names>
@@ -18,4 +18,4 @@
       <transform from="yy" to="y"/>
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml
index e881965f66..9fc7f7c3f5 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="tran-minimal" />
   </names>
@@ -13,4 +13,4 @@
       <transform from="xx" to="x"/>
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml
index 56f962e52d..d16e55fd4e 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="tran-mixed" />
   </names>
@@ -14,4 +14,4 @@
       <reorder from="ខែ្ម" order="1 3 4 2" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml
index d93ef22dd5..a5392f596e 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="tran-minimal" />
   </names>
@@ -16,4 +16,4 @@
       <reorder from="ខែ្ម" order="1 3 4 2" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml
index 383ecd4386..676d281f97 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="tran-vars" />
   </names>
@@ -26,4 +26,4 @@
       <transform from="($[upper])" to="$[1:lower]"/> <!-- g0t3 -->
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml
index 6cd9fdf987..12c2706730 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-minimal" />
   </names>
@@ -17,4 +17,4 @@
   </variables>
 
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml
index e5d53b507b..a5bef8196f 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-minimal" />
   </names>
@@ -18,4 +18,4 @@
     <unicodeSet id="y" value="[y e s]" />  <!-- ERROR: duplicate -->
   </variables>
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml
index af37a292da..be94255504 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-fail" />
   </names>
@@ -14,4 +14,4 @@
   </variables>
 
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml
index ec687e7bf0..45b7670a80 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-fail" />
   </names>
@@ -14,4 +14,4 @@
   </variables>
 
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml
index dc4e143a8f..656faf0cd0 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-fail" />
   </names>
@@ -14,4 +14,4 @@
   </variables>
 
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml
index c0a100ceb2..628148a821 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-fail" />
   </names>
@@ -14,4 +14,4 @@
   </variables>
 
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml
index 6fcca4d0e0..c05a8ec653 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-fail" />
   </names>
@@ -16,4 +16,4 @@
   </variables>
 
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml
index 161c69154a..82721d834b 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-fail" />
   </names>
@@ -14,4 +14,4 @@
     <unicodeSet id="consonants" value="[$[nonUnicodeSet]]" /> <!-- fail: bad back reference to a set instead of a uset-->
   </variables>
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml
index 2b24b4c71e..dbe9deb07c 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-fail" />
   </names>
@@ -13,4 +13,4 @@
     <set id="consonants" value="[ZXCV${missingStringInSet}]" /> <!-- fail: bad back reference to a string inside a set -->
   </variables>
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml
index fd63c36b02..cdfaf3f324 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml
@@ -4,8 +4,8 @@
 This will fail because the two markers given don't exist anywhere.
 
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-markers-badref-0" />
   </names>
@@ -40,4 +40,4 @@ This will fail because the two markers given don't exist anywhere.
       <transform from="\m{.}" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml
index c7930181d3..110af57940 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-err" />
   </names>
@@ -14,4 +14,4 @@
   </variables>
 
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml
index 761c2251c3..5c03b0d682 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-err" />
   </names>
@@ -13,4 +13,4 @@
     <unicodeSet id="fail_props" value="[[\p{Mn}]&amp;[A-z]]" />
   </variables>
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml
index a207df13f1..5d691f3d4b 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-err" />
   </names>
@@ -13,4 +13,4 @@
     <unicodeSet id="fail_strings" value="[abc{def}]" />
   </variables>
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml
index 0fd29f5bab..9ed1b08c9a 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-err" />
   </names>
@@ -13,4 +13,4 @@
     <unicodeSet id="fail_syntax" value="[[]" />
   </variables>
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml
index cbe36d4db1..345e70d8f4 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml
@@ -8,8 +8,8 @@
   into something testable for implementation.
 
 -->
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-markers-maximal" />
   </names>
@@ -41,4 +41,4 @@
       <transform from="A\m{.}B" />
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml
index 1747026a76..89d32d89db 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-maximal" />
   </names>
@@ -18,4 +18,4 @@
     <unicodeSet id="consonants" value="[कसतनमह]" />
     <unicodeSet id="mixture" value="[[abc]$[consonants]]" />
   </variables>
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml
index 1113008dc6..6e6a3ab02e 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="vars-minimal" />
   </names>
@@ -16,4 +16,4 @@
   </variables>
 
 
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-from-vkey.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-from-vkey.xml
index d28c9f09d0..9ed1d1b63f 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-from-vkey.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-from-vkey.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="Invalid" />
   </names>
@@ -15,4 +15,4 @@
   </vkeys>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-repeated-vkey.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-repeated-vkey.xml
index 15641e6855..36deceb4d8 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-repeated-vkey.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-repeated-vkey.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="Invalid" />
   </names>
@@ -13,4 +13,4 @@
   </vkeys>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-to-vkey.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-to-vkey.xml
index ff47597000..58b573adc2 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-to-vkey.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vkey/invalid-to-vkey.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="Invalid" />
   </names>
@@ -12,4 +12,4 @@
   </vkeys>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vkey/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/minimal.xml
index 3223d31189..4af6dd3032 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vkey/minimal.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vkey/minimal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="My First Keyboard" />
   </names>
@@ -14,4 +14,4 @@
   </vkeys>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vkey/redundant.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/redundant.xml
index 8d5d1caf61..612d12c014 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vkey/redundant.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vkey/redundant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="Invalid" />
   </names>
@@ -12,4 +12,4 @@
   </vkeys>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vkey/same-target.xml b/developer/src/kmc-ldml/test/fixtures/sections/vkey/same-target.xml
index 65aa1fa2a5..9dd34420eb 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/vkey/same-target.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/vkey/same-target.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
-<keyboard locale="mt" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="mt" conformsTo="techpreview">
   <names>
     <name value="Invalid" />
   </names>
@@ -13,4 +13,4 @@
   </vkeys>
 
   <keys />
-</keyboard>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/fixtures/test-fr.json b/developer/src/kmc-ldml/test/fixtures/test-fr.json
index 9e3341f824..895360dd85 100644
--- a/developer/src/kmc-ldml/test/fixtures/test-fr.json
+++ b/developer/src/kmc-ldml/test/fixtures/test-fr.json
@@ -1,5 +1,5 @@
 {
-  "keyboardTest": {
+  "keyboardTest3": {
     "conformsTo": "techpreview",
     "info": {
       "keyboard": "fr-t-k0-azerty.xml",
diff --git a/developer/src/kmc-ldml/test/fixtures/test-fr.xml b/developer/src/kmc-ldml/test/fixtures/test-fr.xml
index c97825385a..e138a1b5d1 100644
--- a/developer/src/kmc-ldml/test/fixtures/test-fr.xml
+++ b/developer/src/kmc-ldml/test/fixtures/test-fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
-<keyboardTest conformsTo="techpreview">
+<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
     <info keyboard="fr-t-k0-azerty.xml" author="Team Keyboard" name="fr-test" />
     <repertoire name="simple-repertoire" chars="[a b c d e \u{22}]" type="simple" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->
     <repertoire name="chars-repertoire" chars="[á é ó]" type="gesture" /> <!-- verify that these outputs are all available from simple or gesture keys on any layer, for touch -->
@@ -19,4 +19,4 @@
             <check result="abc\u0022...stuv" />
         </test>
     </tests>
-</keyboardTest>
+</keyboardTest3>
diff --git a/developer/src/kmc-ldml/test/test-dependencies.ts b/developer/src/kmc-ldml/test/test-dependencies.ts
index e58fd36c55..5171648c4a 100644
--- a/developer/src/kmc-ldml/test/test-dependencies.ts
+++ b/developer/src/kmc-ldml/test/test-dependencies.ts
@@ -7,7 +7,7 @@ describe('test of section compiler dependencies', () => {
     const sects : Set<SectionIdent> = new Set();
     for (const sect of SECTION_COMPILERS) {
       // construct the compiler
-      const c = new sect({ keyboard: null }, null); // For now, this is OK for the inspection
+      const c = new sect({ keyboard3: null }, null); // For now, this is OK for the inspection
       const id = c.id;
       assert.ok(id);
       assert.isFalse(sects.has(id), `Duplicate compiler ${id} in SECTION_COMPILERS`);
diff --git a/resources/standards-data/ldml-keyboards/readme.md b/resources/standards-data/ldml-keyboards/readme.md
index 188c80ec76..66f54789c0 100644
--- a/resources/standards-data/ldml-keyboards/readme.md
+++ b/resources/standards-data/ldml-keyboards/readme.md
@@ -12,7 +12,7 @@ Each directory contains:
 - `ldmlKeyboard.dtd` - the DTD file
 - `ldmlKeyboard.xsd` - the XSD file, automatically converted from the DTD using
   Visual Studio, hand tweaked as necessary
-- `ldml-keyboard.schema.json` - the JSON schema file, automatically converted
+- `ldml-keyboard3.schema.json` - the JSON schema file, automatically converted
   from the XSD using xsd2json (https://github.com/Mermade/jgeXml), hand tweaked
   as necessary:
     - change toplevel "id" to "$id"
diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/pcm.xml b/resources/standards-data/ldml-keyboards/techpreview/3.0/pcm.xml
index 5796575ee8..f175fbd039 100644
--- a/resources/standards-data/ldml-keyboards/techpreview/3.0/pcm.xml
+++ b/resources/standards-data/ldml-keyboards/techpreview/3.0/pcm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard SYSTEM '../dtd/ldmlKeyboard.dtd'>
-<keyboard locale="pcm" conformsTo="techpreview">
+<!DOCTYPE keyboard3 SYSTEM '../dtd/ldmlKeyboard3.dtd'>
+<keyboard3 locale="pcm" conformsTo="techpreview">
   <version number="1.0.0" />
   <names>
     <name value="Nigerian Pidgin" />
@@ -55,4 +55,4 @@
       <transform from="''" to="\u{323}" /> <!-- Quick way to add dot below -->
     </transformGroup>
   </transforms>
-</keyboard>
+</keyboard3>
diff --git a/resources/standards-data/ldml-keyboards/techpreview/test/pcm-test.xml b/resources/standards-data/ldml-keyboards/techpreview/test/pcm-test.xml
index 88fc500091..8f85126acc 100644
--- a/resources/standards-data/ldml-keyboards/techpreview/test/pcm-test.xml
+++ b/resources/standards-data/ldml-keyboards/techpreview/test/pcm-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest SYSTEM "../dtd/ldmlKeyboardTest.dtd">
-<keyboardTest conformsTo="techpreview">
+<!DOCTYPE keyboardTest3 SYSTEM "../dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
   <info keyboard="pcm.xml" author="Team Keyboard" name="pcm-test" />
   <repertoire name="simple-repertoire" chars="[a b c d e ọ Ọ ẹ Ẹ ₦]" type="simple" />
   <tests name="key-tests">
@@ -18,4 +18,4 @@
       <check result="e\u{323}" />
     </test>
   </tests>
-</keyboardTest>
+</keyboardTest3>