diff --git a/schema/metaschema/metaschema-module-metaschema.xml b/schema/metaschema/metaschema-module-metaschema.xml
index 10d5b11b1..45049c829 100644
--- a/schema/metaschema/metaschema-module-metaschema.xml
+++ b/schema/metaschema/metaschema-module-metaschema.xml
@@ -793,7 +793,7 @@
         </constraint>
     </define-field>
     
-    <define-flag name="alt-name-index" as-type="nonNegativeInteger">
+    <define-flag name="alt-name-index" as-type="non-negative-integer">
         <formal-name>Numeric Index</formal-name>
         <description>Used for binary formats instead of the textual name.</description>
         <use-name>index</use-name>
diff --git a/test-suite/schema-generation/datatypes/datatypes-numeric_metaschema.xml b/test-suite/schema-generation/datatypes/datatypes-numeric_metaschema.xml
index 2299f5007..61946067e 100644
--- a/test-suite/schema-generation/datatypes/datatypes-numeric_metaschema.xml
+++ b/test-suite/schema-generation/datatypes/datatypes-numeric_metaschema.xml
@@ -17,11 +17,11 @@
             <formal-name>Integer</formal-name>
             <description>Per W3C</description>
          </define-field>
-         <define-field name="posInt" as-type="positiveInteger" min-occurs="1" max-occurs="1">
+         <define-field name="posInt" as-type="positive-integer" min-occurs="1" max-occurs="1">
             <formal-name>Positive Integer</formal-name>
             <description>1 or more</description>
          </define-field>
-         <define-field name="nonNegInt" as-type="nonNegativeInteger" min-occurs="1" max-occurs="1">
+         <define-field name="nonNegInt" as-type="non-negative-integer" min-occurs="1" max-occurs="1">
             <formal-name>Non-negative Integer</formal-name>
             <description>zero or more</description>
          </define-field>
diff --git a/test-suite/worked-examples/anthology/anthology_metaschema.xml b/test-suite/worked-examples/anthology/anthology_metaschema.xml
index bc300840e..55383e335 100644
--- a/test-suite/worked-examples/anthology/anthology_metaschema.xml
+++ b/test-suite/worked-examples/anthology/anthology_metaschema.xml
@@ -19,7 +19,7 @@
        <description>A <b>collection</b> of literary excerpts</description>
        <root-name>ANTHOLOGY</root-name>
        <flag ref="id"/>
-       <define-flag name="fans" as-type="nonNegativeInteger">
+       <define-flag name="fans" as-type="non-negative-integer">
            <formal-name>fans</formal-name>
            <description>How many fans?</description>
        </define-flag>