diff --git a/dev/mei-CMN.rng b/dev/mei-CMN.rng
index b44e709..c4d13a5 100644
--- a/dev/mei-CMN.rng
+++ b/dev/mei-CMN.rng
@@ -5,7 +5,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.music-encoding.org/ns/mei"><!--
-Schema generated from ODD source 2024-12-18T09:26:02Z. . 
+Schema generated from ODD source 2024-12-18T09:45:07Z. . 
 TEI Edition: Development Version 
 TEI Edition Location: https://www.tei-c.org/Vault/P5// 
   
@@ -10455,15 +10455,9 @@ Suggested values include: 1] sustain; 2] soft; 3] sostenuto; 4] silent</a:docume
    <define name="mei_meterSigGrp">
       <element name="meterSigGrp">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(meter signature group) Used to capture alternating, interchanging, mixed or other non-standard meter signatures.</a:documentation>
-         <choice>
-            <ref name="mei_meterSig"/>
-            <ref name="mei_meterSigGrp"/>
-         </choice>
+         <ref name="mei_model.meterSigLike"/>
          <oneOrMore>
-            <choice>
-               <ref name="mei_meterSig"/>
-               <ref name="mei_meterSigGrp"/>
-            </choice>
+            <ref name="mei_model.meterSigLike"/>
          </oneOrMore>
          <ref name="mei_att.common.attributes"/>
          <ref name="mei_att.facsimile.attributes"/>
diff --git a/dev/mei-CMN_compiled.odd b/dev/mei-CMN_compiled.odd
index 707f722..0f23893 100644
--- a/dev/mei-CMN_compiled.odd
+++ b/dev/mei-CMN_compiled.odd
@@ -5339,8 +5339,8 @@
       <memberOf key="att.meterSigGrp.vis"/>
       <memberOf key="model.meterSigLike"/>
     </classes><content xmlns:xi="http://www.w3.org/2001/XInclude">
-      <choice xmlns="http://relaxng.org/ns/structure/1.0"><ref name="meterSig"/><ref name="meterSigGrp"/></choice>
-      <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="meterSig"/><ref name="meterSigGrp"/></choice></oneOrMore>
+      <ref xmlns="http://relaxng.org/ns/structure/1.0" name="model.meterSigLike"/>
+      <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.meterSigLike"/></oneOrMore>
     </content></elementSpec><elementSpec rend="add" ident="mNum" module="MEI.cmn"><gloss xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">measure number</gloss><desc xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Designation, name, or label for a measure, often but not always
       consisting of digits. Use this element when the <att>n</att> attribute on <gi scheme="MEI">measure</gi> does not adequately capture the appearance or placement of the measure
       number/label.</desc><classes xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/dev/mei-Mensural.rng b/dev/mei-Mensural.rng
index 69fabea..9f15aea 100644
--- a/dev/mei-Mensural.rng
+++ b/dev/mei-Mensural.rng
@@ -5,7 +5,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.music-encoding.org/ns/mei"><!--
-Schema generated from ODD source 2024-12-18T09:26:04Z. . 
+Schema generated from ODD source 2024-12-18T09:45:08Z. . 
 TEI Edition: Development Version 
 TEI Edition Location: https://www.tei-c.org/Vault/P5// 
   
diff --git a/dev/mei-Neumes.rng b/dev/mei-Neumes.rng
index d9d70fc..618ff30 100644
--- a/dev/mei-Neumes.rng
+++ b/dev/mei-Neumes.rng
@@ -5,7 +5,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.music-encoding.org/ns/mei"><!--
-Schema generated from ODD source 2024-12-18T09:26:05Z. . 
+Schema generated from ODD source 2024-12-18T09:45:09Z. . 
 TEI Edition: Development Version 
 TEI Edition Location: https://www.tei-c.org/Vault/P5// 
   
diff --git a/dev/mei-all.rng b/dev/mei-all.rng
index 832955b..5d73883 100644
--- a/dev/mei-all.rng
+++ b/dev/mei-all.rng
@@ -5,7 +5,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.music-encoding.org/ns/mei"><!--
-Schema generated from ODD source 2024-12-18T09:25:57Z. . 
+Schema generated from ODD source 2024-12-18T09:45:01Z. . 
 TEI Edition: Development Version 
 TEI Edition Location: https://www.tei-c.org/Vault/P5// 
   
@@ -10721,15 +10721,9 @@ Suggested values include: 1] sustain; 2] soft; 3] sostenuto; 4] silent</a:docume
    <define name="mei_meterSigGrp">
       <element name="meterSigGrp">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(meter signature group) Used to capture alternating, interchanging, mixed or other non-standard meter signatures.</a:documentation>
-         <choice>
-            <ref name="mei_meterSig"/>
-            <ref name="mei_meterSigGrp"/>
-         </choice>
+         <ref name="mei_model.meterSigLike"/>
          <oneOrMore>
-            <choice>
-               <ref name="mei_meterSig"/>
-               <ref name="mei_meterSigGrp"/>
-            </choice>
+            <ref name="mei_model.meterSigLike"/>
          </oneOrMore>
          <ref name="mei_att.common.attributes"/>
          <ref name="mei_att.facsimile.attributes"/>
diff --git a/dev/mei-all_anyStart.rng b/dev/mei-all_anyStart.rng
index f225318..0bf2be5 100644
--- a/dev/mei-all_anyStart.rng
+++ b/dev/mei-all_anyStart.rng
@@ -5,7 +5,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.music-encoding.org/ns/mei"><!--
-Schema generated from ODD source 2024-12-18T09:26:00Z. . 
+Schema generated from ODD source 2024-12-18T09:45:04Z. . 
 TEI Edition: Development Version 
 TEI Edition Location: https://www.tei-c.org/Vault/P5// 
   
@@ -10721,15 +10721,9 @@ Suggested values include: 1] sustain; 2] soft; 3] sostenuto; 4] silent</a:docume
    <define name="mei_meterSigGrp">
       <element name="meterSigGrp">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(meter signature group) Used to capture alternating, interchanging, mixed or other non-standard meter signatures.</a:documentation>
-         <choice>
-            <ref name="mei_meterSig"/>
-            <ref name="mei_meterSigGrp"/>
-         </choice>
+         <ref name="mei_model.meterSigLike"/>
          <oneOrMore>
-            <choice>
-               <ref name="mei_meterSig"/>
-               <ref name="mei_meterSigGrp"/>
-            </choice>
+            <ref name="mei_model.meterSigLike"/>
          </oneOrMore>
          <ref name="mei_att.common.attributes"/>
          <ref name="mei_att.facsimile.attributes"/>
diff --git a/dev/mei-all_anyStart_compiled.odd b/dev/mei-all_anyStart_compiled.odd
index f4c1a50..e22af10 100644
--- a/dev/mei-all_anyStart_compiled.odd
+++ b/dev/mei-all_anyStart_compiled.odd
@@ -5456,8 +5456,8 @@
       <memberOf key="att.meterSigGrp.vis"/>
       <memberOf key="model.meterSigLike"/>
     </classes><content xmlns:xi="http://www.w3.org/2001/XInclude">
-      <choice xmlns="http://relaxng.org/ns/structure/1.0"><ref name="meterSig"/><ref name="meterSigGrp"/></choice>
-      <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="meterSig"/><ref name="meterSigGrp"/></choice></oneOrMore>
+      <ref xmlns="http://relaxng.org/ns/structure/1.0" name="model.meterSigLike"/>
+      <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.meterSigLike"/></oneOrMore>
     </content></elementSpec><elementSpec rend="add" ident="mNum" module="MEI.cmn"><gloss xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">measure number</gloss><desc xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Designation, name, or label for a measure, often but not always
       consisting of digits. Use this element when the <att>n</att> attribute on <gi scheme="MEI">measure</gi> does not adequately capture the appearance or placement of the measure
       number/label.</desc><classes xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/dev/mei-all_compiled.odd b/dev/mei-all_compiled.odd
index 38e74bc..049cada 100644
--- a/dev/mei-all_compiled.odd
+++ b/dev/mei-all_compiled.odd
@@ -5445,8 +5445,8 @@
       <memberOf key="att.meterSigGrp.vis"/>
       <memberOf key="model.meterSigLike"/>
     </classes><content xmlns:xi="http://www.w3.org/2001/XInclude">
-      <choice xmlns="http://relaxng.org/ns/structure/1.0"><ref name="meterSig"/><ref name="meterSigGrp"/></choice>
-      <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="meterSig"/><ref name="meterSigGrp"/></choice></oneOrMore>
+      <ref xmlns="http://relaxng.org/ns/structure/1.0" name="model.meterSigLike"/>
+      <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.meterSigLike"/></oneOrMore>
     </content></elementSpec><elementSpec rend="add" ident="mNum" module="MEI.cmn"><gloss xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">measure number</gloss><desc xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Designation, name, or label for a measure, often but not always
       consisting of digits. Use this element when the <att>n</att> attribute on <gi scheme="MEI">measure</gi> does not adequately capture the appearance or placement of the measure
       number/label.</desc><classes xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/dev/mei-basic.rng b/dev/mei-basic.rng
index 49bed0c..239d024 100644
--- a/dev/mei-basic.rng
+++ b/dev/mei-basic.rng
@@ -5,7 +5,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.music-encoding.org/ns/mei"><!--
-Schema generated from ODD source 2024-12-18T09:26:01Z. . 
+Schema generated from ODD source 2024-12-18T09:45:06Z. . 
 TEI Edition: Development Version 
 TEI Edition Location: https://www.tei-c.org/Vault/P5// 
   
diff --git a/dev/mei-source_canonicalized_v5.1-dev.xml b/dev/mei-source_canonicalized_v5.1-dev.xml
index f2eb6df..626ab51 100644
--- a/dev/mei-source_canonicalized_v5.1-dev.xml
+++ b/dev/mei-source_canonicalized_v5.1-dev.xml
@@ -20,7 +20,7 @@
 <?xml-model href="../source/validation/mei_odds.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <?xml-model href="../source/validation/mei_odds.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <?xml-model href="../source/validation/mei-source.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<!--canonicalized: 2024-12-18T10:25:34.355589094+01:00-->
+<!--canonicalized: 2024-12-18T10:44:39.202907105+01:00-->
 <TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" rend="book" xml:lang="en">
    <teiHeader>
       <fileDesc>
@@ -21803,15 +21803,9 @@ or
       <memberOf key="model.meterSigLike"/>
     </classes>
     <content>
-      <rng:choice>
-        <rng:ref name="meterSig"/>
-        <rng:ref name="meterSigGrp"/>
-      </rng:choice>
+      <rng:ref name="model.meterSigLike"/>
       <rng:oneOrMore>
-        <rng:choice>
-          <rng:ref name="meterSig"/>
-          <rng:ref name="meterSigGrp"/>
-        </rng:choice>
+        <rng:ref name="model.meterSigLike"/>
       </rng:oneOrMore>
     </content>
   </elementSpec>