diff --git a/dmlex-v1.0/specification/core/objectTypes/definition.xml b/dmlex-v1.0/specification/core/objectTypes/definition.xml
index 27c9145..79d082d 100644
--- a/dmlex-v1.0/specification/core/objectTypes/definition.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/definition.xml
@@ -14,14 +14,14 @@
   <para>Represents one of possibly several definitions of a sense.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_sense">sense</olink></literal></para>
     </listitem>
   </itemizedlist>
   
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>text</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. A statement, in the same
diff --git a/dmlex-v1.0/specification/core/objectTypes/entry.xml b/dmlex-v1.0/specification/core/objectTypes/entry.xml
index e69c6f0..fc5dec7 100644
--- a/dmlex-v1.0/specification/core/objectTypes/entry.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/entry.xml
@@ -13,7 +13,7 @@
   <para>Represents a dictionary entry. An entry contains information about one headword.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_lexicographicResource"
           >lexicographicResource</olink></literal></para>
@@ -21,7 +21,7 @@
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>id</literal>
         <glossterm>optional</glossterm> (zero or one). An unique identifier of the entry. Entries
@@ -79,8 +79,8 @@
   </note>
   
   <note>
-    <para> DMLex allows only one headword per entry. Things like variant headwords do not exist in
-      DMLex. However, the <olink targetptr="linking">DMLex Linking Module</olink> does make it
+    <para> DMLex allows only one headword per entry. Things such as  variant headwords do not exist
+      in DMLex. However, the <olink targetptr="linking">DMLex Linking Module</olink> does make it
       possible to represent the existence of variants by treating them as separate headwords of
       separate entries, and linking the entries using a type of link which will cause the entries to
       be placed together when shown to human users. See <xref linkend="ex15"/> for an example using
@@ -89,7 +89,7 @@
 
   <note>
     <para>Entries in DMLex do not have an explicit listing order. An application can imply a listing
-      order from a combination of the headword and the homograph number such that the headword is
+      order from a combination of the headword and the homograph number, such that the headword is
       the primary sorting key and the homograph number (for entries that have one) is the secondary
       sorting key.</para>
   </note>
diff --git a/dmlex-v1.0/specification/core/objectTypes/example.xml b/dmlex-v1.0/specification/core/objectTypes/example.xml
index a80cb98..796fe28 100644
--- a/dmlex-v1.0/specification/core/objectTypes/example.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/example.xml
@@ -15,14 +15,14 @@
     used.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_sense">sense</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>text</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. The example itself.</para>
diff --git a/dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml b/dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml
index 990be07..84c3f7c 100644
--- a/dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/inflectedForm.xml
@@ -15,14 +15,14 @@
       linkend="ex01"/>.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_entry">entry</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
         <glossterm>optional</glossterm> (zero or one). Non-empty string. An abbreviation, a code or
@@ -97,10 +97,11 @@
   <itemizedlist>
     <title>Comments</title>
     <listitem>
-      <para>The <code>inflectedForm</code> object is intended to model the <emphasis role="strong"
-          >inflectional morphology</emphasis> of a headword. To model derivational morphology, for
-        example feminine forms of maculine nouns, the recommended way to do that in DMLex is to
-        create separate entries for the two words, and link them using the <olink targetptr="linking">Linking Module</olink>.</para>
+      <para>The <code>inflectedForm</code> object type is intended to model the <emphasis
+          role="strong">inflectional morphology</emphasis> of a headword. To model derivational
+        morphology, for example feminine forms of maculine nouns, the recommended way to do that in
+        DMLex is to create separate entries for the two words, and link them using the <olink
+          targetptr="linking">Linking Module</olink>.</para>
     </listitem>
   </itemizedlist>
 
diff --git a/dmlex-v1.0/specification/core/objectTypes/label.xml b/dmlex-v1.0/specification/core/objectTypes/label.xml
index 59b8320..ee4bda0 100644
--- a/dmlex-v1.0/specification/core/objectTypes/label.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/label.xml
@@ -16,7 +16,7 @@
     (singular-only).</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_entry">entry</olink></literal></para>
     </listitem>
@@ -35,7 +35,7 @@
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. An abbreviation, a code or
diff --git a/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml b/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml
index 3d60a59..b0d801b 100644
--- a/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/lexicographicResource.xml
@@ -12,7 +12,7 @@
   </title>
   <para>Represents a dictionary. A lexicographic resource is a dataset which can be used, viewed and
     read by humans as a dictionary and – simultaneously – ingested, processed and understood by
-    software agents as a machine-readable database.</para>
+    software agents as a machine-readable dataset.</para>
   
   <note>
     <para>The correct name of this data type in
@@ -20,7 +20,7 @@
   </note>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>title</literal>
         <glossterm>optional</glossterm> (zero or one). Non-empty string. A human-readable title of
@@ -28,7 +28,7 @@
     </listitem>
     <listitem>
       <para><literal>uri</literal>
-        <glossterm>optional</glossterm> (zero or one). The URI of the lexicographic resource,
+        <glossterm>required</glossterm> (zero or one). The URI of the lexicographic resource,
         identifying it on the Web.</para>
     </listitem>
     <listitem>
@@ -50,26 +50,21 @@
         <code>language</code> identifies the language of headwords, definitions and examples in this
         dictionary. DMLex is based on the assumption that all headwords in a lexicographic resource
         are in the same language, and that definitions and examples, if any are included in the
-        lexicographic resource, are in that language too. The <code>language</code> child object of
+        lexicographic resource, are in that language too. The <code>language</code> property of
           <code>lexicographicResource</code> informs potential users of the lexicographic resource
         which language that is.</para>
     </listitem>
-    <listitem>
-      <para>The main role of a lexicographic resource is to contain entries (<code>entry</code>
-        objects). The other object type that can optionally occur inside a
-          <code>lexicographicResource</code>, <code>tag</code>, is for lists of look-up values such
-        as part-of-speech labels.</para>
-    </listitem>
     <listitem>
       <para>Ideally, a lexicographic resouce should include at least one entry. However, DMLex
         specifies that <code>entry</code> is optional in <code>lexicographicResouce</code> to allow
         for the existence of lexicographic resources which are not yet complete. </para>
     </listitem>
     <listitem>
-      <para>The <code>lexicographicResource</code> data type does not contain fields for detailed metadata
-      about the lexicographic resource, such as author, editor, publisher, copyright status or publication year.
-      Describing these properties of lexicographic resources is outside the scope of DMLex. DMLex is a formalism
-      for modelling the internal structure of a lexicographic resource, not its metadata.</para>
+      <para>The <code>lexicographicResource</code> data type does not contain properties for
+        detailed metadata about the lexicographic resource, such as author, editor, publisher,
+        copyright status or publication year. Describing these properties of lexicographic resources
+        is outside the scope of DMLex. DMLex is a formalism for modelling the internal structure of
+        a lexicographic resource, not its metadata.</para>
     </listitem>
   </itemizedlist>
 
diff --git a/dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml b/dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml
index 229f866..ae238ee 100644
--- a/dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml
@@ -14,14 +14,14 @@
   <para>Represents a part-of-speech label.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_entry">entry</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. An abbreviation, a code or
@@ -45,7 +45,7 @@
     <listitem>
       <para>The way to model other grammatical properties of the headword besides part of speech,
         such as gender (of nouns) or aspect (of verbs) in DMLex is to combine them with the part of
-        speech into a single part-of-speech label, for example <code>noun-masc</code> and
+        speech into a single part-of-speech tag, for example <code>noun-masc</code> and
           <code>noun-fem</code>, or <code>v-perf</code> and <code>v-imperf</code>.</para>
     </listitem>
   </itemizedlist>
diff --git a/dmlex-v1.0/specification/core/objectTypes/pronunciation.xml b/dmlex-v1.0/specification/core/objectTypes/pronunciation.xml
index 0c8f3c3..35ac427 100644
--- a/dmlex-v1.0/specification/core/objectTypes/pronunciation.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/pronunciation.xml
@@ -14,7 +14,7 @@
   <para>Represents the pronunciation of its parent. Examples: <xref linkend="ex02"/>, <xref linkend="ex03"/>, <xref linkend="ex04"/>.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_entry">entry</olink></literal></para>
     </listitem>
@@ -24,7 +24,7 @@
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para>At least one of:</para>
       <itemizedlist>
diff --git a/dmlex-v1.0/specification/core/objectTypes/sense.xml b/dmlex-v1.0/specification/core/objectTypes/sense.xml
index 3dd260e..9fb8efc 100644
--- a/dmlex-v1.0/specification/core/objectTypes/sense.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/sense.xml
@@ -14,14 +14,14 @@
   <para>Represents one of possibly many meanings (or meaning potentials) of the headword.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_entry">entry</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>id</literal>
         <glossterm>optional</glossterm> (zero or one). A unique identifier of the sense. Senses
@@ -57,13 +57,13 @@
   <itemizedlist>
     <title>Comments</title>
     <listitem>
-      <para>The contents of <emphasis role="strong">entry</emphasis> are, apart from
+      <para>The properties of <emphasis role="strong">entry</emphasis> are, apart from
           <code>sense</code>, formal properties of the headword such as orthography, morphology,
         syntax and pronunciation. A <emphasis role="strong">sense</emphasis> is a container for
         statements about the headword's semantics. DMLex deliberately makes it impossible to include
-        morphological information at sense level. It is impossible inm DMLex to model an entry where
+        morphological information at sense level. It is impossible in DMLex to model an entry where
         each sense has slightly different morphological properties (eg. a noun has a weak plural in
-        one sense and a strong plural in another). Such phenomena need to be treatedas two entries
+        one sense and a strong plural in another). Such phenomena need to be treated as two entries
         (homographs) and can be linked using the Linking Module to make sure they are always shown
         together to human users.</para>
     </listitem>
diff --git a/dmlex-v1.0/specification/core/objectTypes/transcription.xml b/dmlex-v1.0/specification/core/objectTypes/transcription.xml
index 21b4a20..8a870f0 100644
--- a/dmlex-v1.0/specification/core/objectTypes/transcription.xml
+++ b/dmlex-v1.0/specification/core/objectTypes/transcription.xml
@@ -14,14 +14,14 @@
   <para>Represents the transcription of a pronunciation in some notation such as IPA.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_pronunciation">pronunciation</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>text</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. The actual
diff --git a/dmlex-v1.0/specification/dmlex.xml b/dmlex-v1.0/specification/dmlex.xml
index 4373aeb..3ff027d 100644
--- a/dmlex-v1.0/specification/dmlex.xml
+++ b/dmlex-v1.0/specification/dmlex.xml
@@ -28,7 +28,8 @@
       >&latest-loc;/&name;.html</releaseinfo>
     <releaseinfo role="OASIS-specification-latest">&latest-loc;/&name;.pdf</releaseinfo>
     <releaseinfo role="OASIS-specification-latest">&latest-loc;/&name;.xml</releaseinfo>
-    <releaseinfo role="committee"><ulink url="http://www.oasis-open.org/committees/lexidma/">OASIS Lexicographic Infrastructure Data Model and API (LEXIDMA) TC</ulink></releaseinfo>
+    <releaseinfo role="committee"><ulink url="http://www.oasis-open.org/committees/lexidma/">OASIS
+        Lexicographic Infrastructure Data Model and API (LEXIDMA) TC</ulink></releaseinfo>
     <authorgroup>
       <othercredit role="chair">
         <firstname>Tomaž</firstname>
@@ -217,8 +218,8 @@
       <title>Citation format</title>
       <para>When referencing this specification the following citation format should be used:</para>
       <para><citation>DMLex-&version;</citation></para>
-      <para><emphasis>Data Model for Lexicography Version &version;</emphasis>. Edited by Michal Měchura, David
-        Filip and Simon Krek. &pubdate;. OASIS &standard;. <ulink
+      <para><emphasis>Data Model for Lexicography Version &version;</emphasis>. Edited by Michal
+        Měchura, David Filip and Simon Krek. &pubdate;. OASIS &standard;. <ulink
           url="&this-loc;/&name;-&stage;.html">&this-loc;/&name;-&stage;.html</ulink>. Latest
         version: <ulink url="&latest-loc;/&name;.html">&latest-loc;/&name;.html</ulink>. </para>
       <!--
@@ -285,8 +286,12 @@
 
   <section id="Introduction">
     <title>Introduction</title>
-    <para>DMLex is a data model for modelling dictionaries (here called <emphasis>lexicographic resources</emphasis>) in computer applications such as dictionary writing systems.</para>
-    <para>DMLex is a data model, not an encoding format. DMLex is abstract, independent of any markup language or formalism. At the same time, DMLex has been designed to be easily and straightforwardly implementable in XML, JSON, NVH, as a relational database, and as a Semantic Web triplestore.</para>
+    <para>DMLex is a data model for modelling dictionaries (here called <emphasis>lexicographic
+        resources</emphasis>) in computer applications such as dictionary writing systems.</para>
+    <para>DMLex is a data model, not an encoding format. DMLex is abstract, independent of any
+      markup language or formalism. At the same time, DMLex has been designed to be easily and
+      straightforwardly implementable in XML, JSON, NVH, as a relational database, and as a Semantic
+      Web triplestore.</para>
     <section>
       <title>Modular structure of DMLex</title>
       <para>The DMLex specification is divided into a core with several optional modules.</para>
@@ -298,23 +303,33 @@
         </listitem>
         <listitem>
           <para>
-            <olink targetptr="xlingual">DMLex Crosslingual Module</olink> extends DMLex Core to model bilingual and multilingual lexicographic resources.</para>
+            <olink targetptr="xlingual">DMLex Crosslingual Module</olink> extends DMLex Core to
+            model bilingual and multilingual lexicographic resources.</para>
         </listitem>
         <listitem>
           <para>
-            <olink targetptr="values">DMLex Controlled Values Module</olink> extends DMLex Core to represent inventories of look-up values to be used as part-of-speech tags, usage label tags and others.</para>
+            <olink targetptr="values">DMLex Controlled Values Module</olink> extends DMLex Core to
+            represent inventories of look-up values to be used as part-of-speech tags, usage label
+            tags and others.</para>
         </listitem>
         <listitem>
           <para>
-            <olink targetptr="linking">DMLex Linking Module</olink> extends DMLex Core and allows you to model various kinds of relations between entries, senses and other objects, including semantic relations such as synonymy and antonymy and presentational relations such as subentries and subsenses, both within a single lexicographic resource and across multiple lexicographic resources.</para>
+            <olink targetptr="linking">DMLex Linking Module</olink> extends DMLex Core and allows
+            you to model various kinds of relations between entries, senses and other objects,
+            including semantic relations such as synonymy and antonymy and presentational relations
+            such as subentries and subsenses, both within a single lexicographic resource and across
+            multiple lexicographic resources.</para>
         </listitem>
         <listitem>
           <para>
-            <olink targetptr="annotation">DMLex Annotation Module</olink> extends DMLex Core to allow the modelling of inline markup on various objects such as example sentences, including the modelling of collocations and corpus patterns.</para>
+            <olink targetptr="annotation">DMLex Annotation Module</olink> extends DMLex Core to
+            allow the modelling of inline markup on various objects such as example sentences,
+            including the modelling of collocations and corpus patterns.</para>
         </listitem>
         <listitem>
           <para>
-            <olink targetptr="etymology">DMLex Etymology Module</olink> extends DMLex Core to allow the modelling of etymological information in dictionaries.</para>
+            <olink targetptr="etymology">DMLex Etymology Module</olink> extends DMLex Core to allow
+            the modelling of etymological information in dictionaries.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -328,65 +343,128 @@
           <member><olink targetptr="RDF_implementation">RDF</olink>,</member>
           <member><olink targetptr="NVH_implementation">NVH</olink>,</member>
           <member>and <olink targetptr="RDB_implementation">relational databases</olink>.</member>
-        </simplelist> We also provide an informative serialization as NVH [to link appendix when
-        available]. </para>
-         
-        
-      
-      <itemizedlist>
-        <listitem>
-          <para>
-            The XML and JSON implementations are intended as serializations for <emphasis>data exchange</emphasis>:
-            for encoding lexicographic data while the data is in transit out of one software system into another.
-            Examples of what the two serializations look like with real-world data are given in <xref linkend="examples"/>.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-   		    The NVH implementation is intended for <emphasis>human and machine viewing and editing</emphasis>:
-            it makes it easy for humans to understand or change the content as well as quickly develop programs that read or modify it.
-            Examples of what the serialization looks like with real-world data are given in <xref linkend="examples"/>.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The relational database implementation is intended as a representation for lexicographic data
-            while the data is being edited and maintained inside a software system, such as a Dictionary Writing System (DWS).
-          </para>
-        </listitem>
-      </itemizedlist>
+        </simplelist></para>
+    </section>
+    <section>
+      <title>The metamodel behind DMLex</title>
+      <para>The DMLex data model is defined in this document through the following concepts.</para>
+      <section>
+        <title>Object types</title>
+        <para>DMLex defines the existence of certain <emphasis>object types</emphasis> such as
+            <code>entry</code> and <code>definition</code>. In every DMLex-conformant data set, each
+          “object” (for example each XML element or each database table) must be an instance of one
+          of these object types.</para>
+        <para>The names of object types are unique within the scope of the entire data model,
+          including all the modules. An object type defined in one module is guaranteed not to
+          name-conflict with another object type in another module.</para>
+      </section>
+      <section>
+        <title>Properties</title>
+        <para>For every object type, DMLex defines which properties it can have, whether the properties
+          are required or optional, what their arities are (for example “zero or more”), and what
+          kinds of values it can contains.</para>
+        <para>There are two kinds of properties: those can contain literal values and those that
+          contain objects.</para>
+        <para>Some properties are defined to contain literal values such as strings and numbers. The
+          following types of literal values are used in DMLex: <simplelist>
+            <member>non-empty string,</member>
+            <member>number,</member>
+            <member>unique identifier</member>
+            <member>and reference to a unique identifier</member>
+          </simplelist>
+        </para>
+        <para>Some properties are defined to contain objects (of types defined in DMLex), for
+          example an object of type <code>entry</code> can contain objects of type
+            <code>sense</code>. In such cases, the name of the property is the same as the name of
+          the object type. For example, the <code>entry</code> object type has a property called
+            <code>sense</code> which (with an arity of “zero or more”) contains <code>sense</code>
+          objects.</para>
+        <para>The names of properties are unique within the scope of the object type they belong to
+          but not necessarily outside it.</para>
+      </section>
+      <section>
+        <title>Tree structures</title>
+        <para>The mechanics of objects which (through their properties) contain other objects mimics
+          the tree-like structure commonly used in lexicography to represent dictionary entries,
+          typicaly using XML.</para>
+        <para>Because of this, this document sometimes refers to objects being the “children”,
+          “parents”, “descendants” or “ancestors” of other objects, or objects “belonging to” other
+          objects. This is to be understood as follows.</para>
+        <itemizedlist>
+          <listitem>
+            <para>“Object A is the parent of object B” and “object B is a child of object A” both
+              mean that object A has a property whose value is object B.</para>
+          </listitem>
+          <listitem>
+            <para>“Object A is an ancestor of object B” and “object B is a descendant of object A”
+              means that there is a chain of parent-child links between object A and object
+              B.</para>
+          </listitem>
+          <listitem>
+            <para>“Object B belongs to object A” is the same as “object B is a descendant of object
+              A” and “object A is an ancestor of object B”.</para>
+          </listitem>
+        </itemizedlist>
+        <para>The tree structures created by DMLex are guaranteed to have similar properties as in
+          XML and many other tree-structured formalisms, including importantly the constraint that
+          every object has no more than one parent.</para>
+        <para>Additionally, tree structures created by DMLex are guaranteed to be non-recursive: an
+          object can never be an ancestor of another object of the same type.</para>
+      </section>
+      <section>
+        <title>Relational structures</title>
+        <para>In addition to tree structures, which are used in DMLex to model the basic
+          entries-and-senses skeleton of a lexicographic resource, DMLex also allows (through the
+          <code>relation</code> object type defined in the Linking Module) the modelling of non-tree relations
+          between objects, that is, relations connecting objects which belong to different
+          parents.</para>
+        <para>Non-tree relations are used in DMLex to model cross-references betwen entries and
+          senses, both within a single lexicographic resource and across multiple lexicographic
+          resources. Non-tree relations are also used in DMLex to model certain things which have
+          traditionally been modelled with tree structures in lexicography, such as the hierarchical
+          arrangement of entries and subentries, or senses and subsenses. In DMLex, these phenomena
+          are modelled as non-tree relations in order in order to avoid recusion in the tree
+          structures and to minimize the number of object types in the data model.</para>
+      </section>
     </section>
   </section>
-  
+
   <!--Conformance section should go last, but it seems to make better sense here -->
   <xi:include href="conformance/conformance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  
+
   <!-- core and modules -->
   <xi:include href="core/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <section id="modules" role="normative">
     <title>DMLex Optional Modules</title>
-  
-  <xi:include href="modules/xlingual/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="modules/values/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="modules/linking/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="modules/annotation/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="modules/etymology/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+    <xi:include href="modules/xlingual/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="modules/values/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="modules/linking/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="modules/annotation/specification.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="modules/etymology/specification.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"/>
   </section>
-  
+
   <section id="serializations" role="normative">
     <title>DMLEX Recommended Serializations</title>
- 
-  <!-- serialisations -->
-  <xi:include href="serializations/XML/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="serializations/JSON/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="serializations/RDF/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="serializations/RDB/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="serializations/NVH/specification.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</section>
+
+    <!-- serialisations -->
+    <xi:include href="serializations/XML/specification.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="serializations/JSON/specification.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="serializations/RDF/specification.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="serializations/RDB/specification.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="serializations/NVH/specification.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  </section>
   <appendix role="informative">
     <!-- examples -->
     <xi:include href="examples/examples.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    
+
   </appendix>
   <appendix role="normative" id="references">
     <title>References</title>
@@ -420,7 +498,8 @@
             Languages</title>, <citetitle>
             <ulink url="http://tools.ietf.org/html/bcp47">http://tools.ietf.org/html/bcp47</ulink>
           </citetitle> IETF (Internet Engineering Task Force).</bibliomixed>
-        <bibliomixed id="rfc3552"><abbrev>RFC 3552</abbrev> R. Escrola, B. Korver, <title>Guidelines for Writing RFC Text on Security Considerations</title>, <citetitle>
+        <bibliomixed id="rfc3552"><abbrev>RFC 3552</abbrev> R. Escrola, B. Korver, <title>Guidelines
+            for Writing RFC Text on Security Considerations</title>, <citetitle>
             <ulink url="https://www.tools.ietf.org/rfc/rfc3552.txt"
               >https://www.tools.ietf.org/rfc/rfc3552.txt</ulink>
           </citetitle> IETF (Internet Engineering Task Force) RFC 3552, July 2003.</bibliomixed>
diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml b/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml
index f63a4a1..73cb524 100644
--- a/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml
+++ b/dmlex-v1.0/specification/modules/annotation/extensions/definition.xml
@@ -14,7 +14,7 @@
   </para>
   
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="annotation_headwordMarker">headwordMarker</olink></literal>
         <glossterm>optional</glossterm> (zero, one or more)</para>
diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/entry.xml b/dmlex-v1.0/specification/modules/annotation/extensions/entry.xml
index c8a145e..aeb0077 100644
--- a/dmlex-v1.0/specification/modules/annotation/extensions/entry.xml
+++ b/dmlex-v1.0/specification/modules/annotation/extensions/entry.xml
@@ -14,7 +14,7 @@
   </para>
 
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="annotation_placeholderMarker">placeholderMarker</olink></literal>
         <glossterm>optional</glossterm> (zero, one or more)</para>
diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/example.xml b/dmlex-v1.0/specification/modules/annotation/extensions/example.xml
index 577317e..bbeb4b2 100644
--- a/dmlex-v1.0/specification/modules/annotation/extensions/example.xml
+++ b/dmlex-v1.0/specification/modules/annotation/extensions/example.xml
@@ -14,7 +14,7 @@
   </para>
 
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="annotation_headwordMarker">headwordMarker</olink></literal>
         <glossterm>optional</glossterm> (zero, one or more)</para>
diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/exampleTranslation.xml b/dmlex-v1.0/specification/modules/annotation/extensions/exampleTranslation.xml
index 7f6967f..e0f6a5a 100644
--- a/dmlex-v1.0/specification/modules/annotation/extensions/exampleTranslation.xml
+++ b/dmlex-v1.0/specification/modules/annotation/extensions/exampleTranslation.xml
@@ -14,7 +14,7 @@
   </para>
   
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="annotation_headwordMarker">headwordMarker</olink></literal>
         <glossterm>optional</glossterm> (zero, one or more)</para>
diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/headwordTranslation.xml b/dmlex-v1.0/specification/modules/annotation/extensions/headwordTranslation.xml
index 3bd3289..e1b4ddf 100644
--- a/dmlex-v1.0/specification/modules/annotation/extensions/headwordTranslation.xml
+++ b/dmlex-v1.0/specification/modules/annotation/extensions/headwordTranslation.xml
@@ -14,7 +14,7 @@
     </para>
 
     <itemizedlist>
-        <title>Additional contents</title>
+        <title>Additional properties</title>
         <listitem>
             <para><literal><olink targetptr="annotation_placeholderMarker">placeholderMarker</olink></literal>
                 <glossterm>optional</glossterm> (zero, one or more)</para>
diff --git a/dmlex-v1.0/specification/modules/annotation/extensions/label.xml b/dmlex-v1.0/specification/modules/annotation/extensions/label.xml
index 1f84c8d..fcd673a 100644
--- a/dmlex-v1.0/specification/modules/annotation/extensions/label.xml
+++ b/dmlex-v1.0/specification/modules/annotation/extensions/label.xml
@@ -14,7 +14,7 @@
   </para>
 
   <itemizedlist>
-    <title>Can additionally be a child of</title>
+    <title>Can additionally be a property of</title>
     <listitem>
       <para><literal><olink targetptr="annotation_collocateMarker">collocateMarker</olink></literal></para>
     </listitem>
diff --git a/dmlex-v1.0/specification/modules/annotation/objectTypes/collocateMarker.xml b/dmlex-v1.0/specification/modules/annotation/objectTypes/collocateMarker.xml
index 900aae8..6d1488b 100644
--- a/dmlex-v1.0/specification/modules/annotation/objectTypes/collocateMarker.xml
+++ b/dmlex-v1.0/specification/modules/annotation/objectTypes/collocateMarker.xml
@@ -13,7 +13,7 @@
     collocates or constituents. Example: <xref linkend="ex22"/>.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="annotation_definition">definition</olink></literal></para>
     </listitem>
@@ -27,7 +27,7 @@
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>id</literal>
         <glossterm>optional</glossterm> (zero or one). A unique identifier of the marker.
diff --git a/dmlex-v1.0/specification/modules/annotation/objectTypes/headwordMarker.xml b/dmlex-v1.0/specification/modules/annotation/objectTypes/headwordMarker.xml
index 03e0fc1..5c3e226 100644
--- a/dmlex-v1.0/specification/modules/annotation/objectTypes/headwordMarker.xml
+++ b/dmlex-v1.0/specification/modules/annotation/objectTypes/headwordMarker.xml
@@ -14,7 +14,7 @@
     formatting. Example: <xref linkend="ex21"/>.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="annotation_definition">definition</olink></literal></para>
     </listitem>
diff --git a/dmlex-v1.0/specification/modules/annotation/objectTypes/placeholderMarker.xml b/dmlex-v1.0/specification/modules/annotation/objectTypes/placeholderMarker.xml
index e058b5e..9b9fd34 100644
--- a/dmlex-v1.0/specification/modules/annotation/objectTypes/placeholderMarker.xml
+++ b/dmlex-v1.0/specification/modules/annotation/objectTypes/placeholderMarker.xml
@@ -15,7 +15,7 @@
       linkend="ex20"/>.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="annotation_entry">entry</olink></literal></para>
     </listitem>
diff --git a/dmlex-v1.0/specification/modules/etymology/extensions/entry.xml b/dmlex-v1.0/specification/modules/etymology/extensions/entry.xml
index d5e3553..dd8c783 100644
--- a/dmlex-v1.0/specification/modules/etymology/extensions/entry.xml
+++ b/dmlex-v1.0/specification/modules/etymology/extensions/entry.xml
@@ -14,7 +14,7 @@
   </para>
 
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="etymology_etymology">etymology</olink></literal>
         <glossterm>optional</glossterm> (zero, one or more)
diff --git a/dmlex-v1.0/specification/modules/etymology/extensions/lexicographicResource.xml b/dmlex-v1.0/specification/modules/etymology/extensions/lexicographicResource.xml
index 33f0034..0dcee5f 100644
--- a/dmlex-v1.0/specification/modules/etymology/extensions/lexicographicResource.xml
+++ b/dmlex-v1.0/specification/modules/etymology/extensions/lexicographicResource.xml
@@ -14,7 +14,7 @@
   </para>
   
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="etymology_etymonLanguage">etymonLanguage</olink></literal>
         <glossterm>optional</glossterm> (zero, one or more)</para>
diff --git a/dmlex-v1.0/specification/modules/etymology/extensions/partOfSpeech.xml b/dmlex-v1.0/specification/modules/etymology/extensions/partOfSpeech.xml
index de9b96b..08718eb 100644
--- a/dmlex-v1.0/specification/modules/etymology/extensions/partOfSpeech.xml
+++ b/dmlex-v1.0/specification/modules/etymology/extensions/partOfSpeech.xml
@@ -14,7 +14,7 @@
   </para>
   
   <itemizedlist>
-    <title>Can additionally be a child of</title>
+    <title>Can additionally be a property of</title>
     <listitem>
       <para><literal><olink targetptr="etymology_etymonUnit">etymonUnit</olink></literal></para>
     </listitem>
diff --git a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymology.xml b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymology.xml
index da34b83..e279e8b 100644
--- a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymology.xml
+++ b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymology.xml
@@ -11,14 +11,14 @@
   <para> Represents a chain of historical derivations of a word. </para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="etymoloogy_entry">entry</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>description</literal>
         <glossterm>optional</glossterm> (zero or one). A plain-text form of the etymology, which may
diff --git a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymon.xml b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymon.xml
index d7df5ff..718c648 100644
--- a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymon.xml
+++ b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymon.xml
@@ -13,14 +13,14 @@
         headword.</para>
 
     <itemizedlist>
-        <title>Child of</title>
+        <title>Property of</title>
         <listitem>
             <para><literal><olink targetptr="etymology_etymology">etymology</olink></literal></para>
         </listitem>
     </itemizedlist>
 
     <itemizedlist>
-        <title>Contents</title>
+        <title>Properties</title>
         <listitem>
             <para><literal>when</literal>
                 <glossterm>optional</glossterm> (zero or one). Indicates the time period during which this etymological origin is valid.
diff --git a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonLanguage.xml b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonLanguage.xml
index 15892ee..56a0f1d 100644
--- a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonLanguage.xml
+++ b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonLanguage.xml
@@ -13,7 +13,7 @@
   <literal>etymonUnit</literal> objects.</para>
   
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="etymology_lexicographicResource"
         >lexicographicResource</olink></literal></para>
@@ -21,7 +21,7 @@
   </itemizedlist>
   
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>langCode</literal>
         <glossterm>required</glossterm> (exactly one). The IETF language code of the
diff --git a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonType.xml b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonType.xml
index b10cb86..5ea81d9 100644
--- a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonType.xml
+++ b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonType.xml
@@ -12,7 +12,7 @@
         targetptr="etymology_etymon">etymon</olink></code>.</para>
     
     <itemizedlist>
-        <title>Child of</title>
+        <title>Property of</title>
         <listitem>
             <para><literal><olink targetptr="etymology_lexicographicResource"
                 >lexicographicResource</olink></literal></para>
@@ -20,7 +20,7 @@
     </itemizedlist>
     
     <itemizedlist>
-        <title>Contents</title>
+        <title>Properties</title>
         <listitem>
             <para><literal>type</literal>
                 <glossterm>required</glossterm> (exactly one). Non-empty string.</para>
diff --git a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonUnit.xml b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonUnit.xml
index 98f86ba..f4ebeb9 100644
--- a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonUnit.xml
+++ b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonUnit.xml
@@ -13,14 +13,14 @@
         another etymologically related form.</para>
 
     <itemizedlist>
-        <title>Child of</title>
+        <title>Property of</title>
         <listitem>
             <para><literal><olink targetptr="etymology_etymon">etymon</olink></literal></para>
         </listitem>
     </itemizedlist>
 
     <itemizedlist>
-        <title>Contents</title>
+        <title>Properties</title>
         <listitem>
             <para><literal>language</literal>
                 <glossterm>required</glossterm> (exactly one). An IETF tag. The tags can be
diff --git a/dmlex-v1.0/specification/modules/linking/extensions/lexicographicResource.xml b/dmlex-v1.0/specification/modules/linking/extensions/lexicographicResource.xml
index c77645e..339d037 100644
--- a/dmlex-v1.0/specification/modules/linking/extensions/lexicographicResource.xml
+++ b/dmlex-v1.0/specification/modules/linking/extensions/lexicographicResource.xml
@@ -14,7 +14,7 @@
   </para>
   
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="linking_relation">relation</olink></literal>
         <glossterm>optional</glossterm> (zero, one or more)</para>
diff --git a/dmlex-v1.0/specification/modules/linking/extensions/sameAs.xml b/dmlex-v1.0/specification/modules/linking/extensions/sameAs.xml
index f65a78e..2e8d148 100644
--- a/dmlex-v1.0/specification/modules/linking/extensions/sameAs.xml
+++ b/dmlex-v1.0/specification/modules/linking/extensions/sameAs.xml
@@ -14,7 +14,7 @@
   </para>
   
   <itemizedlist>
-    <title>Can additionally be a child of</title>
+    <title>Can additionally be a property of</title>
     <listitem>
       <para><literal><olink targetptr="linking_relationTypeTag">relationTypeTag</olink></literal></para>
     </listitem>
diff --git a/dmlex-v1.0/specification/modules/linking/objectTypes/member.xml b/dmlex-v1.0/specification/modules/linking/objectTypes/member.xml
index 930ca3c..afb5b68 100644
--- a/dmlex-v1.0/specification/modules/linking/objectTypes/member.xml
+++ b/dmlex-v1.0/specification/modules/linking/objectTypes/member.xml
@@ -12,14 +12,14 @@
     relation.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="linking_relation">relation</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>memberID</literal>
         <glossterm>required</glossterm> (exactly one). The ID of an object, such as an entry or a
diff --git a/dmlex-v1.0/specification/modules/linking/objectTypes/memberType.xml b/dmlex-v1.0/specification/modules/linking/objectTypes/memberType.xml
index c220a9b..e8b850d 100644
--- a/dmlex-v1.0/specification/modules/linking/objectTypes/memberType.xml
+++ b/dmlex-v1.0/specification/modules/linking/objectTypes/memberType.xml
@@ -13,14 +13,14 @@
     members having this role.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="linking_relationType">relationType</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>role</literal>
         <glossterm>required</glossterm> (exactly one). String. If the value is empty, then members
diff --git a/dmlex-v1.0/specification/modules/linking/objectTypes/relation.xml b/dmlex-v1.0/specification/modules/linking/objectTypes/relation.xml
index f1a92f4..1a14c81 100644
--- a/dmlex-v1.0/specification/modules/linking/objectTypes/relation.xml
+++ b/dmlex-v1.0/specification/modules/linking/objectTypes/relation.xml
@@ -11,7 +11,7 @@
   <para>Represents the fact that a relation exists between two or more objects.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="linking_lexicographicResource"
           >lexicographicResource</olink></literal></para>
@@ -19,7 +19,7 @@
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>type</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. Specifies what type of
diff --git a/dmlex-v1.0/specification/modules/linking/objectTypes/relationType.xml b/dmlex-v1.0/specification/modules/linking/objectTypes/relationType.xml
index 6ec68a5..60f5cf2 100644
--- a/dmlex-v1.0/specification/modules/linking/objectTypes/relationType.xml
+++ b/dmlex-v1.0/specification/modules/linking/objectTypes/relationType.xml
@@ -12,7 +12,7 @@
         targetptr="linking_relation">relation</olink></code>.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="linking_lexicographicResource"
           >lexicographicResource</olink></literal></para>
@@ -20,7 +20,7 @@
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>type</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string.</para>
diff --git a/dmlex-v1.0/specification/modules/values/extensions/lexicographicResource.xml b/dmlex-v1.0/specification/modules/values/extensions/lexicographicResource.xml
index 4ee153c..9459884 100644
--- a/dmlex-v1.0/specification/modules/values/extensions/lexicographicResource.xml
+++ b/dmlex-v1.0/specification/modules/values/extensions/lexicographicResource.xml
@@ -14,7 +14,7 @@
   </para>
   
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="values_definitionTypeTag">definitionTypeTag</olink></literal>
         <glossterm>optional</glossterm> (zero or more)</para>
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/definitionTypeTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/definitionTypeTag.xml
index e911f87..205abc4 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/definitionTypeTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/definitionTypeTag.xml
@@ -16,14 +16,14 @@
   </para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_lexicographicResource">lexicographicResource</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. An abbreviation, a code or
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml
index 0530b65..f291d5a 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml
@@ -17,14 +17,14 @@
   </para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_lexicographicResource">lexicographicResource</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. An abbreviation, a code or
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml
index 57ab8b5..0a1b9ac 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml
@@ -16,14 +16,14 @@
   </para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_lexicographicResource">lexicographicResource</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. An abbreviation, a code or
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/labelTypeTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/labelTypeTag.xml
index a6cf0a2..b6f3dd5 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/labelTypeTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/labelTypeTag.xml
@@ -16,14 +16,14 @@
   </para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_lexicographicResource">lexicographicResource</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. An abbreviation, a code or
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml
index 60d4ac8..f8c5d15 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml
@@ -17,14 +17,14 @@
   </para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_lexicographicResource">lexicographicResource</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. An abbreviation, a code or
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/sameAs.xml b/dmlex-v1.0/specification/modules/values/objectTypes/sameAs.xml
index bfa1e09..c8c527f 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/sameAs.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/sameAs.xml
@@ -14,7 +14,7 @@
   <para>Represents the fact that the parent object is equivalent to an item available from an external authority. Example: <xref linkend="ex06"/>.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="values_definitionTypeTag">definitionTypeTag</olink></literal></para>
     </listitem>
@@ -33,7 +33,7 @@
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>uri</literal>
         <glossterm>required</glossterm> (exactly one). The URI of an item in an external inventory.</para>
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/sourceIdentityTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/sourceIdentityTag.xml
index d6b014f..d902ee4 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/sourceIdentityTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/sourceIdentityTag.xml
@@ -16,14 +16,14 @@
   </para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_lexicographicResource">lexicographicResource</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string. An abbreviation, a code or
diff --git a/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml b/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml
index 0b780b6..f907923 100644
--- a/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml
+++ b/dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml
@@ -16,14 +16,14 @@
   </para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="core_lexicographicResource">lexicographicResource</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>tag</literal>
         <glossterm>required</glossterm> (exactly one). An IETF language tag.</para>
diff --git a/dmlex-v1.0/specification/modules/xlingual/extensions/example.xml b/dmlex-v1.0/specification/modules/xlingual/extensions/example.xml
index 9011a07..57183d9 100644
--- a/dmlex-v1.0/specification/modules/xlingual/extensions/example.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/extensions/example.xml
@@ -14,7 +14,7 @@
   </para>
   
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="xlingual_exampleTranslation">exampleTranslation</olink></literal>
         <glossterm>optional</glossterm> (zero, one or more)</para>
diff --git a/dmlex-v1.0/specification/modules/xlingual/extensions/inflectedForm.xml b/dmlex-v1.0/specification/modules/xlingual/extensions/inflectedForm.xml
index 28d02f4..90a0402 100644
--- a/dmlex-v1.0/specification/modules/xlingual/extensions/inflectedForm.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/extensions/inflectedForm.xml
@@ -14,7 +14,7 @@
   </para>
 
   <itemizedlist>
-    <title>Can additionally be a child of</title>
+    <title>Can additionally be a property of</title>
     <listitem>
       <para><literal><olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink></literal></para>
     </listitem>
diff --git a/dmlex-v1.0/specification/modules/xlingual/extensions/label.xml b/dmlex-v1.0/specification/modules/xlingual/extensions/label.xml
index 13d9de4..bd3795f 100644
--- a/dmlex-v1.0/specification/modules/xlingual/extensions/label.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/extensions/label.xml
@@ -14,7 +14,7 @@
   </para>
 
   <itemizedlist>
-    <title>Can additionally be a child of</title>
+    <title>Can additionally be a property of</title>
     <listitem>
       <para><literal><olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink></literal></para>
     </listitem>
diff --git a/dmlex-v1.0/specification/modules/xlingual/extensions/lexicographicResource.xml b/dmlex-v1.0/specification/modules/xlingual/extensions/lexicographicResource.xml
index 6d08480..aba5e36 100644
--- a/dmlex-v1.0/specification/modules/xlingual/extensions/lexicographicResource.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/extensions/lexicographicResource.xml
@@ -14,7 +14,7 @@
   </para>
   
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="xlingual_translationLanguage">translationLanguage</olink></literal>
         <glossterm>required</glossterm> (one or more)</para>
diff --git a/dmlex-v1.0/specification/modules/xlingual/extensions/partOfSpeech.xml b/dmlex-v1.0/specification/modules/xlingual/extensions/partOfSpeech.xml
index cdfabaf..8886f93 100644
--- a/dmlex-v1.0/specification/modules/xlingual/extensions/partOfSpeech.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/extensions/partOfSpeech.xml
@@ -14,7 +14,7 @@
   </para>
 
   <itemizedlist>
-    <title>Can additionally be a child of</title>
+    <title>Can additionally be a property of</title>
     <listitem>
       <para><literal><olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink></literal></para>
     </listitem>
diff --git a/dmlex-v1.0/specification/modules/xlingual/extensions/pronunciation.xml b/dmlex-v1.0/specification/modules/xlingual/extensions/pronunciation.xml
index 7b90a0d..4f4a18f 100644
--- a/dmlex-v1.0/specification/modules/xlingual/extensions/pronunciation.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/extensions/pronunciation.xml
@@ -14,7 +14,7 @@
   </para>
 
   <itemizedlist>
-    <title>Can additionally be a child of</title>
+    <title>Can additionally be a property of</title>
     <listitem>
       <para><literal><olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink></literal></para>
     </listitem>
diff --git a/dmlex-v1.0/specification/modules/xlingual/extensions/sense.xml b/dmlex-v1.0/specification/modules/xlingual/extensions/sense.xml
index d73154d..d1cba14 100644
--- a/dmlex-v1.0/specification/modules/xlingual/extensions/sense.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/extensions/sense.xml
@@ -14,7 +14,7 @@
   </para>
   
   <itemizedlist>
-    <title>Additional contents</title>
+    <title>Additional properties</title>
     <listitem>
       <para><literal><olink targetptr="xlingual_headwordExplanation">headwordExplanation</olink></literal>
         <glossterm>optional</glossterm> (zero, one or more)</para>
diff --git a/dmlex-v1.0/specification/modules/xlingual/objectTypes/exampleTranslation.xml b/dmlex-v1.0/specification/modules/xlingual/objectTypes/exampleTranslation.xml
index 159e1f6..4ac8d22 100644
--- a/dmlex-v1.0/specification/modules/xlingual/objectTypes/exampleTranslation.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/objectTypes/exampleTranslation.xml
@@ -13,14 +13,14 @@
     <para>Represents the translation of an example.</para>
 
     <itemizedlist>
-        <title>Child of</title>
+        <title>Property of</title>
         <listitem>
             <para><literal><olink targetptr="xlingual_example">example</olink></literal></para>
         </listitem>
     </itemizedlist>
 
     <itemizedlist>
-        <title>Contents</title>
+        <title>Properties</title>
         <listitem>
             <para><literal>text</literal>
                 <glossterm>required</glossterm> (exactly one). Non-empty string.</para>
diff --git a/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordExplanation.xml b/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordExplanation.xml
index 9193956..029cc65 100644
--- a/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordExplanation.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordExplanation.xml
@@ -14,14 +14,14 @@
         the meaning of the headword. Example: <xref linkend="ex09"/>.</para>
 
     <itemizedlist>
-        <title>Child of</title>
+        <title>Property of</title>
         <listitem>
             <para><literal><olink targetptr="xlingual_sense">sense</olink></literal></para>
         </listitem>
     </itemizedlist>
 
     <itemizedlist>
-        <title>Contents</title>
+        <title>Properties</title>
         <listitem>
             <para><literal>text</literal>
                 <glossterm>required</glossterm> (exactly one). Non-empty string.</para>
diff --git a/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordTranslation.xml b/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordTranslation.xml
index beb6251..455371b 100644
--- a/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordTranslation.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/objectTypes/headwordTranslation.xml
@@ -14,14 +14,14 @@
       linkend="ex08"/>, <xref linkend="ex11"/>.</para>
 
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="xlingual_sense">sense</olink></literal></para>
     </listitem>
   </itemizedlist>
 
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>text</literal>
         <glossterm>required</glossterm> (exactly one). Non-empty string.</para>
diff --git a/dmlex-v1.0/specification/modules/xlingual/objectTypes/translationLanguage.xml b/dmlex-v1.0/specification/modules/xlingual/objectTypes/translationLanguage.xml
index 1db69e7..9836e7b 100644
--- a/dmlex-v1.0/specification/modules/xlingual/objectTypes/translationLanguage.xml
+++ b/dmlex-v1.0/specification/modules/xlingual/objectTypes/translationLanguage.xml
@@ -13,14 +13,14 @@
   <para>Represents one of the languages in which translations are given in this lexicographic
     resource. Examples: <xref linkend="ex07"/>, <xref linkend="ex10"/>.</para>
   <itemizedlist>
-    <title>Child of</title>
+    <title>Property of</title>
     <listitem>
       <para><literal><olink targetptr="xlingual_lexicographicResource"
           >lexicographicResource</olink></literal></para>
     </listitem>
   </itemizedlist>
   <itemizedlist>
-    <title>Contents</title>
+    <title>Properties</title>
     <listitem>
       <para><literal>langCode</literal>
         <glossterm>required</glossterm> (exactly one). The IETF language code of the
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/collocateMarker.xml b/dmlex-v1.0/specification/serializations/JSON/objects/collocateMarker.xml
similarity index 95%
rename from dmlex-v1.0/specification/serializations/JSON/classes/collocateMarker.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/collocateMarker.xml
index ef61c9b..a733e11 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/collocateMarker.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/collocateMarker.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_collocateMarker">
-    <title>Class: <literal>collocateMarker</literal></title>
+    <title>JSON object: <literal>collocateMarker</literal></title>
     <para>Implements the <olink targetptr="annotation_collocateMarker">collocateMarker</olink>
         object type from the Annotation Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/definition.xml b/dmlex-v1.0/specification/serializations/JSON/objects/definition.xml
similarity index 96%
rename from dmlex-v1.0/specification/serializations/JSON/classes/definition.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/definition.xml
index a23b01a..f2ba28c 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/definition.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/definition.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_definition">
-    <title>Class: <literal>definition</literal></title>
+    <title>JSON object: <literal>definition</literal></title>
     <para>Implements the <olink targetptr="core_definition">definition</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/definitionTypeTag.xml b/dmlex-v1.0/specification/serializations/JSON/objects/definitionTypeTag.xml
similarity index 94%
rename from dmlex-v1.0/specification/serializations/JSON/classes/definitionTypeTag.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/definitionTypeTag.xml
index eba6a0f..e1241a9 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/definitionTypeTag.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/definitionTypeTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_definitionTypeTag">
-    <title>Class: <literal>definitionTypeTag</literal></title>
+    <title>JSON object: <literal>definitionTypeTag</literal></title>
     <para>Implements the <olink targetptr="values_definitionTypeTag">definitionTypeTag</olink>
         object type from the Controlled Values Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/entry.xml b/dmlex-v1.0/specification/serializations/JSON/objects/entry.xml
similarity index 98%
rename from dmlex-v1.0/specification/serializations/JSON/classes/entry.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/entry.xml
index e5d6ea5..175c29c 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/entry.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/entry.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_entry">
-    <title>Class: <literal>entry</literal></title>
+    <title>JSON object: <literal>entry</literal></title>
     <para>Implements the <olink targetptr="core_entry">entry</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/etymology.xml b/dmlex-v1.0/specification/serializations/JSON/objects/etymology.xml
similarity index 94%
rename from dmlex-v1.0/specification/serializations/JSON/classes/etymology.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/etymology.xml
index bfede57..c3cefdc 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/etymology.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/etymology.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_etymology">
-    <title>Class: <literal>etymology</literal></title>
+    <title>JSON object: <literal>etymology</literal></title>
     <para>Implements the <olink targetptr="etymology_etymology">etymology</olink> object type
         from the Etymology Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/etymon.xml b/dmlex-v1.0/specification/serializations/JSON/objects/etymon.xml
similarity index 96%
rename from dmlex-v1.0/specification/serializations/JSON/classes/etymon.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/etymon.xml
index 513c2b1..c059034 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/etymon.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/etymon.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_etymon">
-    <title>Class: <literal>etymon</literal></title>
+    <title>JSON object: <literal>etymon</literal></title>
     <para>Implements the <olink targetptr="etymology_etymon">etymon</olink> object type
         from the Etymology Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/etymonLanguage.xml b/dmlex-v1.0/specification/serializations/JSON/objects/etymonLanguage.xml
similarity index 93%
rename from dmlex-v1.0/specification/serializations/JSON/classes/etymonLanguage.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/etymonLanguage.xml
index debc609..4b3df78 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/etymonLanguage.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/etymonLanguage.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_etymonLanguage">
-    <title>Class: <literal>etymonLanguage</literal></title>
+    <title>JSON object: <literal>etymonLanguage</literal></title>
     <para>Implements the <olink targetptr="etymology_etymonLanguage">etymonLanguage</olink> object type
         from the Etymology Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/etymonType.xml b/dmlex-v1.0/specification/serializations/JSON/objects/etymonType.xml
similarity index 94%
rename from dmlex-v1.0/specification/serializations/JSON/classes/etymonType.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/etymonType.xml
index 348f44b..8bcca2f 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/etymonType.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/etymonType.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_etymonType">
-    <title>Class: <literal>etymonType</literal></title>
+    <title>JSON object: <literal>etymonType</literal></title>
     <para>Implements the <olink targetptr="etymology_etymonType">etymonType</olink> object type
         from the Etymology Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/etymonUnit.xml b/dmlex-v1.0/specification/serializations/JSON/objects/etymonUnit.xml
similarity index 96%
rename from dmlex-v1.0/specification/serializations/JSON/classes/etymonUnit.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/etymonUnit.xml
index 8181456..4d6a24f 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/etymonUnit.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/etymonUnit.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_etymonUnit">
-    <title>Class: <literal>etymonUnit</literal></title>
+    <title>JSON object: <literal>etymonUnit</literal></title>
     <para>Implements the <olink targetptr="etymology_etymonUnit">etymonUnit</olink> object type
         from the Etymology Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/example.xml b/dmlex-v1.0/specification/serializations/JSON/objects/example.xml
similarity index 97%
rename from dmlex-v1.0/specification/serializations/JSON/classes/example.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/example.xml
index f0df314..9736c23 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/example.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/example.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_example">
-    <title>Class: <literal>example</literal></title>
+    <title>JSON object: <literal>example</literal></title>
     <para>Implements the <olink targetptr="core_example">example</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/exampleTranslation.xml b/dmlex-v1.0/specification/serializations/JSON/objects/exampleTranslation.xml
similarity index 96%
rename from dmlex-v1.0/specification/serializations/JSON/classes/exampleTranslation.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/exampleTranslation.xml
index 93274f2..f9c6e03 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/exampleTranslation.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/exampleTranslation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_exampleTranslation">
-    <title>Class: <literal>exampleTranslation</literal></title>
+    <title>JSON object: <literal>exampleTranslation</literal></title>
     <para>Implements the <olink targetptr="xlingual_exampleTranslation">exampleTranslation</olink>
         object type from the Crosslingual Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/headwordExplanation.xml b/dmlex-v1.0/specification/serializations/JSON/objects/headwordExplanation.xml
similarity index 94%
rename from dmlex-v1.0/specification/serializations/JSON/classes/headwordExplanation.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/headwordExplanation.xml
index e0d61e5..bd75ab4 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/headwordExplanation.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/headwordExplanation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_headwordExplanation">
-    <title>Class: <literal>headwordExplanation</literal></title>
+    <title>JSON object: <literal>headwordExplanation</literal></title>
     <para>Implements the <olink targetptr="xlingual_headwordExplanation">headwordExplanation</olink>
         object type from the Crosslingual Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/headwordMarker.xml b/dmlex-v1.0/specification/serializations/JSON/objects/headwordMarker.xml
similarity index 93%
rename from dmlex-v1.0/specification/serializations/JSON/classes/headwordMarker.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/headwordMarker.xml
index 4517ce0..4717ce1 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/headwordMarker.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/headwordMarker.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_headwordMarker">
-    <title>Class: <literal>headwordMarker</literal></title>
+    <title>JSON object: <literal>headwordMarker</literal></title>
     <para>Implements the <olink targetptr="annotation_headwordMarker">headwordMarker</olink>
         object type from the Annotation Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/headwordTranslation.xml b/dmlex-v1.0/specification/serializations/JSON/objects/headwordTranslation.xml
similarity index 97%
rename from dmlex-v1.0/specification/serializations/JSON/classes/headwordTranslation.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/headwordTranslation.xml
index bf3061a..93ecb2f 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/headwordTranslation.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/headwordTranslation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_headwordTranslation">
-    <title>Class: <literal>headwordTranslation</literal></title>
+    <title>JSON object: <literal>headwordTranslation</literal></title>
     <para>Implements the <olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink>
         object type from the Crosslingual Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/inflectedForm.xml b/dmlex-v1.0/specification/serializations/JSON/objects/inflectedForm.xml
similarity index 95%
rename from dmlex-v1.0/specification/serializations/JSON/classes/inflectedForm.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/inflectedForm.xml
index 4b74765..83f92bf 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/inflectedForm.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/inflectedForm.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_inflectedForm">
-    <title>Class: <literal>inflectedForm</literal></title>
+    <title>JSON object: <literal>inflectedForm</literal></title>
     <para>Implements the <olink targetptr="core_inflectedForm">inflectedForm</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/inflectedFormTag.xml b/dmlex-v1.0/specification/serializations/JSON/objects/inflectedFormTag.xml
similarity index 96%
rename from dmlex-v1.0/specification/serializations/JSON/classes/inflectedFormTag.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/inflectedFormTag.xml
index 07e680e..a1fefa2 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/inflectedFormTag.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/inflectedFormTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_inflectedFormTag">
-    <title>Class: <literal>inflectedFormTag</literal></title>
+    <title>JSON object: <literal>inflectedFormTag</literal></title>
     <para>Implements the <olink targetptr="values_inflectedFormTag">inflectedFormTag</olink>
         object type from the Controlled Values Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/labelTag.xml b/dmlex-v1.0/specification/serializations/JSON/objects/labelTag.xml
similarity index 97%
rename from dmlex-v1.0/specification/serializations/JSON/classes/labelTag.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/labelTag.xml
index 93d9c98..d18f07e 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/labelTag.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/labelTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_labelTag">
-    <title>Class: <literal>labelTag</literal></title>
+    <title>JSON object: <literal>labelTag</literal></title>
     <para>Implements the <olink targetptr="values_labelTag">labelTag</olink>
         object type from the Controlled Values Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/labelTypeTag.xml b/dmlex-v1.0/specification/serializations/JSON/objects/labelTypeTag.xml
similarity index 93%
rename from dmlex-v1.0/specification/serializations/JSON/classes/labelTypeTag.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/labelTypeTag.xml
index 4f62cfc..6014d70 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/labelTypeTag.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/labelTypeTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_labelTypeTag">
-    <title>Class: <literal>labelTypeTag</literal></title>
+    <title>JSON object: <literal>labelTypeTag</literal></title>
     <para>Implements the <olink targetptr="values_labelTypeTag">labelTypeTag</olink>
         object type from the Controlled Values Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/lexicographicResource.xml b/dmlex-v1.0/specification/serializations/JSON/objects/lexicographicResource.xml
similarity index 97%
rename from dmlex-v1.0/specification/serializations/JSON/classes/lexicographicResource.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/lexicographicResource.xml
index 13ad129..4ba9e21 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/lexicographicResource.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/lexicographicResource.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_lexicographicResource">
-    <title>Class: <literal>lexicographicResource</literal></title>
+    <title>JSON object: <literal>lexicographicResource</literal></title>
     <para>Implements the <olink targetptr="core_lexicographicResource">lexicographicResource</olink>
         object type.</para>
 
@@ -18,7 +18,7 @@
         </listitem>
         <listitem>
             <para><literal>"uri"</literal>
-                <glossterm>optional</glossterm>, string</para>
+                <glossterm>required</glossterm>, string</para>
         </listitem>
         <listitem>
             <para><literal>"language"</literal>
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/member.xml b/dmlex-v1.0/specification/serializations/JSON/objects/member.xml
similarity index 95%
rename from dmlex-v1.0/specification/serializations/JSON/classes/member.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/member.xml
index c6b7217..5107cc8 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/member.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/member.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_member">
-    <title>Class: <literal>member</literal></title>
+    <title>JSON object: <literal>member</literal></title>
     <para>Implements the <olink targetptr="linking_member">member</olink>
         object type from the Linking Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/memberType.xml b/dmlex-v1.0/specification/serializations/JSON/objects/memberType.xml
similarity index 96%
rename from dmlex-v1.0/specification/serializations/JSON/classes/memberType.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/memberType.xml
index 664492f..ff1eeb9 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/memberType.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/memberType.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_memberType">
-    <title>Class: <literal>memberType</literal></title>
+    <title>JSON object: <literal>memberType</literal></title>
     <para>Implements the <olink targetptr="linking_memberType">memberType</olink>
         object type from the Linking Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/partOfSpeechTag.xml b/dmlex-v1.0/specification/serializations/JSON/objects/partOfSpeechTag.xml
similarity index 96%
rename from dmlex-v1.0/specification/serializations/JSON/classes/partOfSpeechTag.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/partOfSpeechTag.xml
index 202ee58..785e7a6 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/partOfSpeechTag.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/partOfSpeechTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_partOfSpeechTag">
-    <title>Class: <literal>partOfSpeechTag</literal></title>
+    <title>JSON object: <literal>partOfSpeechTag</literal></title>
     <para>Implements the <olink targetptr="values_partOfSpeechTag">partOfSpeechTag</olink>
         object type from the Controlled Values Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/placeholderMarker.xml b/dmlex-v1.0/specification/serializations/JSON/objects/placeholderMarker.xml
similarity index 93%
rename from dmlex-v1.0/specification/serializations/JSON/classes/placeholderMarker.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/placeholderMarker.xml
index 7a53d7e..c92f77f 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/placeholderMarker.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/placeholderMarker.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_placeholderMarker">
-    <title>Class: <literal>placeholderMarker</literal></title>
+    <title>JSON object: <literal>placeholderMarker</literal></title>
     <para>Implements the <olink targetptr="annotation_placeholderMarker">placeholderMarker</olink>
         object type from the Annotation Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/pronunciation.xml b/dmlex-v1.0/specification/serializations/JSON/objects/pronunciation.xml
similarity index 96%
rename from dmlex-v1.0/specification/serializations/JSON/classes/pronunciation.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/pronunciation.xml
index 795f17c..12354ec 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/pronunciation.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/pronunciation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_pronunciation">
-    <title>Class: <literal>pronunciation</literal></title>
+    <title>JSON object: <literal>pronunciation</literal></title>
     <para>Implements the <olink targetptr="core_pronunciation">pronunciation</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/relation.xml b/dmlex-v1.0/specification/serializations/JSON/objects/relation.xml
similarity index 95%
rename from dmlex-v1.0/specification/serializations/JSON/classes/relation.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/relation.xml
index 318e28d..54cd6ce 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/relation.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/relation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_relation">
-    <title>Class: <literal>relation</literal></title>
+    <title>JSON object: <literal>relation</literal></title>
     <para>Implements the <olink targetptr="linking_relation">relation</olink>
         object type from the Linking Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/relationType.xml b/dmlex-v1.0/specification/serializations/JSON/objects/relationType.xml
similarity index 96%
rename from dmlex-v1.0/specification/serializations/JSON/classes/relationType.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/relationType.xml
index a347d9a..3afbf74 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/relationType.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/relationType.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_relationType">
-    <title>Class: <literal>relationType</literal></title>
+    <title>JSON object: <literal>relationType</literal></title>
     <para>Implements the <olink targetptr="linking_relationType">relationType</olink>
         object type from the Linking Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/sense.xml b/dmlex-v1.0/specification/serializations/JSON/objects/sense.xml
similarity index 97%
rename from dmlex-v1.0/specification/serializations/JSON/classes/sense.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/sense.xml
index e0137ec..af3f68b 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/sense.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/sense.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_sense">
-    <title>Class: <literal>sense</literal></title>
+    <title>JSON object: <literal>sense</literal></title>
     <para>Implements the <olink targetptr="core_sense">sense</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/sourceIdentityTag.xml b/dmlex-v1.0/specification/serializations/JSON/objects/sourceIdentityTag.xml
similarity index 94%
rename from dmlex-v1.0/specification/serializations/JSON/classes/sourceIdentityTag.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/sourceIdentityTag.xml
index d2a6e9e..b04e19c 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/sourceIdentityTag.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/sourceIdentityTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_sourceIdentityTag">
-    <title>Class: <literal>sourceIdentityTag</literal></title>
+    <title>JSON object: <literal>sourceIdentityTag</literal></title>
     <para>Implements the <olink targetptr="values_sourceIdentityTag">sourceIdentityTag</olink>
         object type from the Controlled Values Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/transcription.xml b/dmlex-v1.0/specification/serializations/JSON/objects/transcription.xml
similarity index 93%
rename from dmlex-v1.0/specification/serializations/JSON/classes/transcription.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/transcription.xml
index 7e88798..a42c4aa 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/transcription.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/transcription.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_transcription">
-    <title>Class: <literal>transcription</literal></title>
+    <title>JSON object: <literal>transcription</literal></title>
     <para>Implements the <olink targetptr="core_transcription">transcription</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/JSON/classes/transcriptionSchemeTag.xml b/dmlex-v1.0/specification/serializations/JSON/objects/transcriptionSchemeTag.xml
similarity index 95%
rename from dmlex-v1.0/specification/serializations/JSON/classes/transcriptionSchemeTag.xml
rename to dmlex-v1.0/specification/serializations/JSON/objects/transcriptionSchemeTag.xml
index 82f4ed9..63464c4 100644
--- a/dmlex-v1.0/specification/serializations/JSON/classes/transcriptionSchemeTag.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/objects/transcriptionSchemeTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="json_transcriptionSchemeTag">
-    <title>Class: <literal>transcriptionSchemeTag</literal></title>
+    <title>JSON object: <literal>transcriptionSchemeTag</literal></title>
     <para>Implements the <olink targetptr="values_transcriptionSchemeTag">transcriptionSchemeTag</olink>
         object type from the Controlled Values Module.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/JSON/specification.xml b/dmlex-v1.0/specification/serializations/JSON/specification.xml
index 822afd6..4797dbb 100644
--- a/dmlex-v1.0/specification/serializations/JSON/specification.xml
+++ b/dmlex-v1.0/specification/serializations/JSON/specification.xml
@@ -50,43 +50,43 @@
   </section>
   
   <section id="JSONClasses" role="normative">
-    <title>DMLex JSON Serialization Classes</title>
+    <title>DMLex JSON serialization objects</title>
     
-    <xi:include href="classes/lexicographicResource.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/entry.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/inflectedForm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/sense.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/definition.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/pronunciation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/transcription.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/example.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/lexicographicResource.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/entry.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/inflectedForm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/sense.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/definition.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/pronunciation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/transcription.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/example.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-    <xi:include href="classes/headwordTranslation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/headwordExplanation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/exampleTranslation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/headwordTranslation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/headwordExplanation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/exampleTranslation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
     
-    <xi:include href="classes/partOfSpeechTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/inflectedFormTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/definitionTypeTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/labelTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/labelTypeTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/sourceIdentityTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/transcriptionSchemeTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/partOfSpeechTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/inflectedFormTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/definitionTypeTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/labelTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/labelTypeTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/sourceIdentityTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/transcriptionSchemeTag.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
     
-    <xi:include href="classes/relation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/member.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/relationType.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/memberType.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/relation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/member.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/relationType.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/memberType.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-    <xi:include href="classes/placeholderMarker.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/headwordMarker.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/collocateMarker.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/placeholderMarker.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/headwordMarker.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/collocateMarker.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-    <xi:include href="classes/etymology.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/etymon.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/etymonUnit.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/etymonType.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="classes/etymonLanguage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/etymology.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/etymon.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/etymonUnit.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/etymonType.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="objects/etymonLanguage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
     
   </section>
 
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/collocateMarker.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/collocateMarker.xml
index 0ff10b5..71bf1f2 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/collocateMarker.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/collocateMarker.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_collocateMarker">
-    <title>Node: <literal>collocateMarker</literal></title>
+    <title>NVH node: <literal>collocateMarker</literal></title>
     <para>Implements the <olink targetptr="annotation_collocateMarker">collocateMarker</olink> object type from the Annotation module.
         Contains the text which it marks up and optional child nodes.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/definition.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/definition.xml
index 4354752..ee3d664 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/definition.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/definition.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_definition">
-    <title>Node: <literal>definition</literal></title>
+    <title>NVH node: <literal>definition</literal></title>
     <para>Implements the <olink targetptr="core_definition">definition</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/definitionTypeTag.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/definitionTypeTag.xml
index 8ec36a3..fc27e45 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/definitionTypeTag.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/definitionTypeTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_definitionTypeTag">
-    <title>Node: <literal>definitionTypeTag</literal></title>
+    <title>NVH node: <literal>definitionTypeTag</literal></title>
     <para>Implements the <olink targetptr="values_definitionTypeTag">definitionTypeTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/entry.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/entry.xml
index 9de9f2a..708be44 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/entry.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/entry.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_entry">
-    <title>Node: <literal>entry</literal></title>
+    <title>NVH node: <literal>entry</literal></title>
     <para>Implements the <olink targetptr="core_entry">entry</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/etymology.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/etymology.xml
index c0d9821..5ebfeaf 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/etymology.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/etymology.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_etymology">
-    <title>Node: <literal>etymology</literal></title>
+    <title>NVH node: <literal>etymology</literal></title>
     <para>Implements the <olink targetptr="etymology_etymology">etymology</olink> object type from the Etymology Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml
index b05ed44..4c00c71 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_etymon">
-    <title>Node: <literal>etymon</literal></title>
+    <title>NVH node: <literal>etymon</literal></title>
     <para>Implements the <olink targetptr="etymology_etymon">etymon</olink> object type from the Etymology Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonLanguage.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonLanguage.xml
index 946efc5..317c1c7 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonLanguage.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonLanguage.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_etymonLanguage">
-    <title>Node: <literal>etymonLanguage</literal></title>
+    <title>NVH node: <literal>etymonLanguage</literal></title>
     <para>Implements the <olink targetptr="etymology_etymonLanguage">etymonLanguage</olink> object type from the Etymology Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonType.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonType.xml
index 76f2f83..25bac7c 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonType.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonType.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_etymonType">
-    <title>Node: <literal>etymonType</literal></title>
+    <title>NVH node: <literal>etymonType</literal></title>
     <para>Implements the <olink targetptr="etymology_etymonType">etymonType</olink> object type from the Etymology Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonUnit.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonUnit.xml
index 43e6fae..7f23aae 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonUnit.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonUnit.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_etymonUnit">
-    <title>Node: <literal>etymonUnit</literal></title>
+    <title>NVH node: <literal>etymonUnit</literal></title>
     <para>Implements the <olink targetptr="etymology_etymonUnit">etymonUnit</olink> object type from the Etymology Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/example.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/example.xml
index 16574a3..0561419 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/example.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/example.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_example">
-    <title>Node: <literal>example</literal></title>
+    <title>NVH node: <literal>example</literal></title>
     <para>Implements the <olink targetptr="core_example">example</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/exampleTranslation.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/exampleTranslation.xml
index ffaa163..ec84cee 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/exampleTranslation.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/exampleTranslation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_exampleTranslation">
-    <title>Node: <literal>exampleTranslation</literal></title>
+    <title>NVH node: <literal>exampleTranslation</literal></title>
     <para>Implements the <olink targetptr="xlingual_exampleTranslation">exampleTranslation</olink> object type from the Crosslingual Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/forLanguage.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/forLanguage.xml
index e524190..d71ed7c 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/forLanguage.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/forLanguage.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_forLanguage">
-    <title>Node: <literal>forLanguage</literal></title>
+    <title>NVH node: <literal>forLanguage</literal></title>
     <para>Implements the <literal>forLanguage</literal> property of the
         <olink targetptr="values_partOfSpeechTag">partOfSpeechTag</olink>,
         <olink targetptr="values_inflectedFormTag">inflectedFormTag</olink>,
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/forPartOfSpeech.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/forPartOfSpeech.xml
index fbd4ed8..0adb33c 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/forPartOfSpeech.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/forPartOfSpeech.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_forPartOfSpeech">
-    <title>Node: <literal>forPartOfSpeech</literal></title>
+    <title>NVH node: <literal>forPartOfSpeech</literal></title>
     <para>Implements the <literal>forPartOfSpeech</literal> property of the
         <olink targetptr="values_inflectedFormTag">inflectedFormTag</olink>
         and and <olink targetptr="values_labelTag">labelTag</olink>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordExplanation.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordExplanation.xml
index 9f0a7fc..9db3a58 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordExplanation.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordExplanation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_headwordExplanation">
-    <title>Node: <literal>headwordExplanation</literal></title>
+    <title>NVH node: <literal>headwordExplanation</literal></title>
     <para>Implements the <olink targetptr="xlingual_headwordExplanation">headwordExplanation</olink> object type from the Crosslingual Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordMarker.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordMarker.xml
index 177b718..4aa79b5 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordMarker.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordMarker.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_headwordMarker">
-    <title>Node: <literal>headwordMarker</literal></title>
+    <title>NVH node: <literal>headwordMarker</literal></title>
     <para>Implements the <olink targetptr="annotation_headwordMarker">headwordMarker</olink> object type from the Annotation module.
 	Contains the text which it marks up.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordTranslation.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordTranslation.xml
index c675134..5b1b8fe 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/headwordTranslation.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/headwordTranslation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_headwordTranslation">
-    <title>Node: <literal>headwordTranslation</literal></title>
+    <title>NVH node: <literal>headwordTranslation</literal></title>
     <para>Implements the <olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink> object type from the Crosslingual Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedForm.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedForm.xml
index 35222a5..3168fc8 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedForm.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedForm.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_inflectedForm">
-    <title>Node: <literal>inflectedForm</literal></title>
+    <title>NVH node: <literal>inflectedForm</literal></title>
     <para>Implements the <olink targetptr="core_inflectedForm">inflectedForm</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedFormTag.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedFormTag.xml
index a817a67..27207f4 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedFormTag.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/inflectedFormTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_inflectedFormTag">
-    <title>Node: <literal>inflectedFormTag</literal></title>
+    <title>NVH node: <literal>inflectedFormTag</literal></title>
     <para>Implements the <olink targetptr="values_inflectedFormTag">inflectedFormTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/label.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/label.xml
index e29f93c..aa3d864 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/label.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/label.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_label">
-    <title>Node: <literal>label</literal></title>
+    <title>NVH node: <literal>label</literal></title>
     <para>Implements the <olink targetptr="core_label">label</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/labelTag.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/labelTag.xml
index a2dc7a1..e4388f2 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/labelTag.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/labelTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_labelTag">
-    <title>Node: <literal>labelTag</literal></title>
+    <title>NVH node: <literal>labelTag</literal></title>
     <para>Implements the <olink targetptr="values_labelTag">labelTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/labelTypeTag.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/labelTypeTag.xml
index aa37d54..d440914 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/labelTypeTag.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/labelTypeTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_labelTypeTag">
-    <title>Node: <literal>labelTypeTag</literal></title>
+    <title>NVH node: <literal>labelTypeTag</literal></title>
     <para>Implements the <olink targetptr="values_labelTypeTag">labelTypeTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/lexicographicResource.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/lexicographicResource.xml
index a260fa8..362da6c 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/lexicographicResource.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/lexicographicResource.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_lexicographicResource">
-    <title>Node: <literal>lexicographicResource</literal></title>
+    <title>NVH node: <literal>lexicographicResource</literal></title>
     <para>Implements the <olink targetptr="core_lexicographicResource">lexicographicResource</olink> object type.</para>
 
 	<itemizedlist>
@@ -22,7 +22,7 @@
             <para><literal><olink targetptr="nvh_entry">entry</olink></literal> <glossterm>optional</glossterm> (exactly one)</para>
         </listitem>
         <listitem>
-            <para><literal>uri</literal> <glossterm>optional</glossterm> (exactly one)</para>
+            <para><literal>uri</literal> <glossterm>required</glossterm> (exactly one)</para>
         </listitem>
         <listitem>
             <para><literal>language</literal> <glossterm>required</glossterm> (exactly one)</para>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/member.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/member.xml
index 7148e82..e3f724f 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/member.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/member.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_member">
-    <title>Node: <literal>member</literal></title>
+    <title>NVH node: <literal>member</literal></title>
     <para>Implements the <olink targetptr="linking_member">member</olink> object type from the Linking Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/memberType.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/memberType.xml
index 10a24ea..57d3bfc 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/memberType.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/memberType.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_memberType">
-    <title>Node: <literal>memberType</literal></title>
+    <title>NVH node: <literal>memberType</literal></title>
     <para>Implements the <olink targetptr="linking_memberType">memberType</olink> object type from the Linking Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeech.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeech.xml
index d94439e..4f279b4 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeech.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeech.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_partOfSpeech">
-    <title>Node: <literal>partOfSpeech</literal></title>
+    <title>NVH node: <literal>partOfSpeech</literal></title>
     <para>Implements the <olink targetptr="core_partOfSpeech">partOfSpeech</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeechTag.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeechTag.xml
index d6ad276..1b86484 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeechTag.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/partOfSpeechTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_partOfSpeechTag">
-    <title>Node: <literal>partOfSpeechTag</literal></title>
+    <title>NVH node: <literal>partOfSpeechTag</literal></title>
     <para>Implements the <olink targetptr="values_partOfSpeechTag">partOfSpeechTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/placeholderMarker.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/placeholderMarker.xml
index a7e4760..92eea87 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/placeholderMarker.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/placeholderMarker.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_placeholderMarker">
-    <title>Node: <literal>placeholderMarker</literal></title>
+    <title>NVH node: <literal>placeholderMarker</literal></title>
     <para>Implements the <olink targetptr="annotation_placeholderMarker">placeholderMarker</olink> object type from the Annotation module.
         Contains the text which it marks up.</para>
     
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/pronunciation.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/pronunciation.xml
index a252289..1ce765e 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/pronunciation.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/pronunciation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_pronunciation">
-    <title>Node: <literal>pronunciation</literal></title>
+    <title>NVH node: <literal>pronunciation</literal></title>
     <para>Implements the <olink targetptr="core_pronunciation">pronunciation</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/relation.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/relation.xml
index 48242a8..3759a4e 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/relation.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/relation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_relation">
-    <title>Node: <literal>relation</literal></title>
+    <title>NVH node: <literal>relation</literal></title>
     <para>Implements the <olink targetptr="linking_relation">relation</olink> object type from the Linking Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/relationType.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/relationType.xml
index 39e7715..98ca240 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/relationType.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/relationType.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_relationType">
-    <title>Node: <literal>relationType</literal></title>
+    <title>NVH node: <literal>relationType</literal></title>
     <para>Implements the <olink targetptr="linking_relationType">relationType</olink> object type from the Linking Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/sameAs.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/sameAs.xml
index 907a1b3..fdbe06f 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/sameAs.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/sameAs.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_sameAs">
-    <title>Node: <literal>sameAs</literal></title>
+    <title>NVH node: <literal>sameAs</literal></title>
     <para>Implements the <olink targetptr="values_sameAs">sameAs</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/sense.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/sense.xml
index aef991a..9bd84df 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/sense.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/sense.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_sense">
-    <title>Node: <literal>sense</literal></title>
+    <title>NVH node: <literal>sense</literal></title>
     <para>Implements the <olink targetptr="core_sense">sense</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/sourceIdentityTag.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/sourceIdentityTag.xml
index 34064da..44dc885 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/sourceIdentityTag.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/sourceIdentityTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_sourceIdentityTag">
-    <title>Node: <literal>sourceIdentityTag</literal></title>
+    <title>NVH node: <literal>sourceIdentityTag</literal></title>
     <para>Implements the <olink targetptr="values_sourceIdentityTag">sourceIdentityTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/transcription.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/transcription.xml
index f1b1461..841d4b4 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/transcription.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/transcription.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_transcription">
-    <title>Node: <literal>transcription</literal></title>
+    <title>NVH node: <literal>transcription</literal></title>
     <para>Implements the <olink targetptr="core_transcription">transcription</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/transcriptionSchemeTag.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/transcriptionSchemeTag.xml
index 62e05cb..0527984 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/transcriptionSchemeTag.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/transcriptionSchemeTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_transcriptionSchemeTag">
-    <title>Node: <literal>transcriptionSchemeTag</literal></title>
+    <title>NVH node: <literal>transcriptionSchemeTag</literal></title>
     <para>Implements the <olink targetptr="values_transcriptionSchemeTag">transcriptionSchemeTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/translationLanguage.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/translationLanguage.xml
index a084c4a..a29ebbb 100644
--- a/dmlex-v1.0/specification/serializations/NVH/nodes/translationLanguage.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/nodes/translationLanguage.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="nvh_translationLanguage">
-    <title>Node: <literal>translationLanguage</literal></title>
+    <title>NVH node: <literal>translationLanguage</literal></title>
     <para>Implements the <olink targetptr="xlingual_translationLanguage">translationLanguage</olink> object type from the Crosslingual Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/NVH/specification.xml b/dmlex-v1.0/specification/serializations/NVH/specification.xml
index 0e22419..994b370 100644
--- a/dmlex-v1.0/specification/serializations/NVH/specification.xml
+++ b/dmlex-v1.0/specification/serializations/NVH/specification.xml
@@ -23,7 +23,7 @@
 	<para>See <ulink url="https://namevaluehierarchy.org">namevaluehierarchy.org</ulink> for details about the NVH file format and processing libraries.</para>
   </section>
   <section id="NVHNodes" role="normative">
-    <title>DMLex NVH Serialization Nodes</title>
+    <title>DMLex NVH serialization nodes</title>
   
   <xi:include href="nodes/lexicographicResource.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="nodes/entry.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git a/dmlex-v1.0/specification/serializations/RDB/specification.xml b/dmlex-v1.0/specification/serializations/RDB/specification.xml
index d7b352b..4e3eb5f 100644
--- a/dmlex-v1.0/specification/serializations/RDB/specification.xml
+++ b/dmlex-v1.0/specification/serializations/RDB/specification.xml
@@ -6,10 +6,10 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >
 <!--the document properties were transferred to "dockbook/dbgenent.mod"-->
                          ]>
-<section id="rdb" role="normative | informative">
+<section id="rdb" role="normative">
   <title>DMLex relational database serialization</title>
   
-  <section>
+  <section role="informative">
     <title>Design principles</title>
     <para>The relational database serialization of DMLex shown in this document follows these priciples:</para>
     <itemizedlist>
@@ -27,9 +27,13 @@
       </listitem>
     </itemizedlist>
   </section>
-
-  <xi:include href="tables/lexicographicResources.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="tables/entries.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   
+  <section id="RDBTables" role="normative">
+    <title>DMLex relational database serialization tables</title>
+    <xi:include href="tables/lexicographicResources.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="tables/entries.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  </section>
+  
+
 
 </section>
diff --git a/dmlex-v1.0/specification/serializations/RDB/tables/entries.xml b/dmlex-v1.0/specification/serializations/RDB/tables/entries.xml
index b09cc90..d6743bb 100644
--- a/dmlex-v1.0/specification/serializations/RDB/tables/entries.xml
+++ b/dmlex-v1.0/specification/serializations/RDB/tables/entries.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="rdb_entriez">
-    <title>Table: <literal>entries</literal></title>
+    <title>Database table: <literal>entries</literal></title>
     <para>Implements the <olink targetptr="core_entry">entry</olink> data type.</para>
 
     <bridgehead>Columns</bridgehead>
diff --git a/dmlex-v1.0/specification/serializations/RDB/tables/lexicographicResources.xml b/dmlex-v1.0/specification/serializations/RDB/tables/lexicographicResources.xml
index a2d3874..9a23d65 100644
--- a/dmlex-v1.0/specification/serializations/RDB/tables/lexicographicResources.xml
+++ b/dmlex-v1.0/specification/serializations/RDB/tables/lexicographicResources.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="rdb_lexicographicResources">
-    <title>Table: <literal>lexicographicResources</literal></title>
+    <title>Database table: <literal>lexicographicResources</literal></title>
     <para>Implements the <olink targetptr="core_lexicographicResource">lexicographicResource</olink>
         data type.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/collocateMarker.xml b/dmlex-v1.0/specification/serializations/XML/elements/collocateMarker.xml
index c6241a1..0953eac 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/collocateMarker.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/collocateMarker.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_collocateMarker">
-    <title>Element: <literal>&lt;collocateMarker&gt;</literal></title>
+    <title>XML element: <literal>&lt;collocateMarker&gt;</literal></title>
     <para>Implements the <olink targetptr="annotation_collocateMarker">collocateMarker</olink> object type from the Annotation module.
         Contains the text which it marks up, optionally followed by one or more <literal><olink targetptr="xml_label">&lt;label&gt;</olink></literal> elements.</para>
     
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/definition.xml b/dmlex-v1.0/specification/serializations/XML/elements/definition.xml
index f36130e..a119973 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/definition.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/definition.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_definition">
-    <title>Element: <literal>&lt;definition&gt;</literal></title>
+    <title>XML element: <literal>&lt;definition&gt;</literal></title>
     <para>Implements the <olink targetptr="core_definition">definition</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/definitionTypeTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/definitionTypeTag.xml
index f27776a..35037cb 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/definitionTypeTag.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/definitionTypeTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_definitionTypeTag">
-    <title>Element: <literal>&lt;definitionTypeTag&gt;</literal></title>
+    <title>XML element: <literal>&lt;definitionTypeTag&gt;</literal></title>
     <para>Implements the <olink targetptr="values_definitionTypeTag">definitionTypeTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/entry.xml b/dmlex-v1.0/specification/serializations/XML/elements/entry.xml
index 1a93aba..91aa65d 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/entry.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/entry.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_entry">
-    <title>Element: <literal>&lt;entry&gt;</literal></title>
+    <title>XML element: <literal>&lt;entry&gt;</literal></title>
     <para>Implements the <olink targetptr="core_entry">entry</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/etymology.xml b/dmlex-v1.0/specification/serializations/XML/elements/etymology.xml
index 1a3509f..799257d 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/etymology.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/etymology.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_etymology">
-    <title>Element: <literal>&lt;etymology&gt;</literal></title>
+    <title>XML element: <literal>&lt;etymology&gt;</literal></title>
     <para>Implements the <olink targetptr="etymology_etymology">etymology</olink> object type from the Etymology Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/etymon.xml b/dmlex-v1.0/specification/serializations/XML/elements/etymon.xml
index 97ed9ec..edbf323 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/etymon.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/etymon.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_etymon">
-    <title>Element: <literal>&lt;etymon&gt;</literal></title>
+    <title>XML element: <literal>&lt;etymon&gt;</literal></title>
     <para>Implements the <olink targetptr="etymology_etymon">etymon</olink> object type from the Etymology Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/etymonLanguage.xml b/dmlex-v1.0/specification/serializations/XML/elements/etymonLanguage.xml
index 5ed5e73..425a9f1 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/etymonLanguage.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/etymonLanguage.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_etymonLanguage">
-    <title>Element: <literal>&lt;etymonLanguage&gt;</literal></title>
+    <title>XML element: <literal>&lt;etymonLanguage&gt;</literal></title>
     <para>Implements the <olink targetptr="etymology_etymonLanguage">etymonLanguage</olink> object type from the Etymology Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/etymonType.xml b/dmlex-v1.0/specification/serializations/XML/elements/etymonType.xml
index 3562898..e279fe3 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/etymonType.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/etymonType.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_etymonType">
-    <title>Element: <literal>&lt;etymonType&gt;</literal></title>
+    <title>XML element: <literal>&lt;etymonType&gt;</literal></title>
     <para>Implements the <olink targetptr="etymology_etymonType">etymonType</olink> object type from the Etymology Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/etymonUnit.xml b/dmlex-v1.0/specification/serializations/XML/elements/etymonUnit.xml
index 21a9f1b..3b06286 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/etymonUnit.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/etymonUnit.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_etymonUnit">
-    <title>Element: <literal>&lt;etymonUnit&gt;</literal></title>
+    <title>XML element: <literal>&lt;etymonUnit&gt;</literal></title>
     <para>Implements the <olink targetptr="etymology_etymonUnit">etymonUnit</olink> object type from the Etymology Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/example.xml b/dmlex-v1.0/specification/serializations/XML/elements/example.xml
index 0297f1c..26833ee 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/example.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/example.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_example">
-    <title>Element: <literal>&lt;example&gt;</literal></title>
+    <title>XML element: <literal>&lt;example&gt;</literal></title>
     <para>Implements the <olink targetptr="core_example">example</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/exampleTranslation.xml b/dmlex-v1.0/specification/serializations/XML/elements/exampleTranslation.xml
index 79f9b57..4f9e6c2 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/exampleTranslation.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/exampleTranslation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_exampleTranslation">
-    <title>Element: <literal>&lt;exampleTranslation&gt;</literal></title>
+    <title>XML element: <literal>&lt;exampleTranslation&gt;</literal></title>
     <para>Implements the <olink targetptr="xlingual_exampleTranslation">exampleTranslation</olink> object type from the Crosslingual Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/forLanguage.xml b/dmlex-v1.0/specification/serializations/XML/elements/forLanguage.xml
index 05bcb01..395878f 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/forLanguage.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/forLanguage.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_forLanguage">
-    <title>Element: <literal>&lt;forLanguage&gt;</literal></title>
+    <title>XML element: <literal>&lt;forLanguage&gt;</literal></title>
     <para>Implements the <literal>forLanguage</literal> property of the
         <olink targetptr="values_partOfSpeechTag">partOfSpeechTag</olink>,
         <olink targetptr="values_inflectedFormTag">inflectedFormTag</olink>,
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/forPartOfSpeech.xml b/dmlex-v1.0/specification/serializations/XML/elements/forPartOfSpeech.xml
index 76f3171..7aa1d8e 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/forPartOfSpeech.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/forPartOfSpeech.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_forPartOfSpeech">
-    <title>Element: <literal>&lt;forPartOfSpeech&gt;</literal></title>
+    <title>XML element: <literal>&lt;forPartOfSpeech&gt;</literal></title>
     <para>Implements the <literal>forPartOfSpeech</literal> property of the
         <olink targetptr="values_inflectedFormTag">inflectedFormTag</olink>
         and and <olink targetptr="values_labelTag">labelTag</olink>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/headwordExplanation.xml b/dmlex-v1.0/specification/serializations/XML/elements/headwordExplanation.xml
index c173bd8..5a94e6e 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/headwordExplanation.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/headwordExplanation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_headwordExplanation">
-    <title>Element: <literal>&lt;headwordExplanation&gt;</literal></title>
+    <title>XML element: <literal>&lt;headwordExplanation&gt;</literal></title>
     <para>Implements the <olink targetptr="xlingual_headwordExplanation">headwordExplanation</olink> object type from the Crosslingual Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/headwordMarker.xml b/dmlex-v1.0/specification/serializations/XML/elements/headwordMarker.xml
index 55444a4..ec912c8 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/headwordMarker.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/headwordMarker.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_headwordMarker">
-    <title>Element: <literal>&lt;headwordMarker&gt;</literal></title>
+    <title>XML element: <literal>&lt;headwordMarker&gt;</literal></title>
     <para>Implements the <olink targetptr="annotation_headwordMarker">headwordMarker</olink> object type from the Annotation module.
         Contains the text which it marks up.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/headwordTranslation.xml b/dmlex-v1.0/specification/serializations/XML/elements/headwordTranslation.xml
index 301874c..c5449a8 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/headwordTranslation.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/headwordTranslation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_headwordTranslation">
-    <title>Element: <literal>&lt;headwordTranslation&gt;</literal></title>
+    <title>XML element: <literal>&lt;headwordTranslation&gt;</literal></title>
     <para>Implements the <olink targetptr="xlingual_headwordTranslation">headwordTranslation</olink> object type from the Crosslingual Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/inflectedForm.xml b/dmlex-v1.0/specification/serializations/XML/elements/inflectedForm.xml
index 4b3c465..a77bdbc 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/inflectedForm.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/inflectedForm.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_inflectedForm">
-    <title>Element: <literal>&lt;inflectedForm&gt;</literal></title>
+    <title>XML element: <literal>&lt;inflectedForm&gt;</literal></title>
     <para>Implements the <olink targetptr="core_inflectedForm">inflectedForm</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/inflectedFormTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/inflectedFormTag.xml
index b901910..df134ed 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/inflectedFormTag.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/inflectedFormTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_inflectedFormTag">
-    <title>Element: <literal>&lt;inflectedFormTag&gt;</literal></title>
+    <title>XML element: <literal>&lt;inflectedFormTag&gt;</literal></title>
     <para>Implements the <olink targetptr="values_inflectedFormTag">inflectedFormTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/label.xml b/dmlex-v1.0/specification/serializations/XML/elements/label.xml
index 81a2d51..a58cc15 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/label.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/label.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_label">
-    <title>Element: <literal>&lt;label&gt;</literal></title>
+    <title>XML element: <literal>&lt;label&gt;</literal></title>
     <para>Implements the <olink targetptr="core_label">label</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/labelTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/labelTag.xml
index ebb7250..a6fc8f0 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/labelTag.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/labelTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_labelTag">
-    <title>Element: <literal>&lt;labelTag&gt;</literal></title>
+    <title>XML element: <literal>&lt;labelTag&gt;</literal></title>
     <para>Implements the <olink targetptr="values_labelTag">labelTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/labelTypeTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/labelTypeTag.xml
index 7f4d99c..ad10635 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/labelTypeTag.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/labelTypeTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_labelTypeTag">
-    <title>Element: <literal>&lt;labelTypeTag&gt;</literal></title>
+    <title>XML element: <literal>&lt;labelTypeTag&gt;</literal></title>
     <para>Implements the <olink targetptr="values_labelTypeTag">labelTypeTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/lexicographicResource.xml b/dmlex-v1.0/specification/serializations/XML/elements/lexicographicResource.xml
index 194c34c..e32a424 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/lexicographicResource.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/lexicographicResource.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_lexicographicResource">
-    <title>Element: <literal>&lt;lexicographicResource&gt;</literal></title>
+    <title>XML element: <literal>&lt;lexicographicResource&gt;</literal></title>
     <para>Implements the <olink targetptr="core_lexicographicResource">lexicographicResource</olink> object type.</para>
 
     <itemizedlist>
@@ -15,7 +15,7 @@
             <para><literal>@title</literal> <glossterm>optional</glossterm></para>
         </listitem>
         <listitem>
-            <para><literal>@uri</literal> <glossterm>optional</glossterm></para>
+            <para><literal>@uri</literal> <glossterm>required</glossterm></para>
         </listitem>
         <listitem>
             <para><literal>@language</literal> <glossterm>required</glossterm></para>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/member.xml b/dmlex-v1.0/specification/serializations/XML/elements/member.xml
index d94b5ad..7b12f1e 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/member.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/member.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_member">
-    <title>Element: <literal>&lt;member&gt;</literal></title>
+    <title>XML element: <literal>&lt;member&gt;</literal></title>
     <para>Implements the <olink targetptr="linking_member">member</olink> object type from the Linking Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/memberType.xml b/dmlex-v1.0/specification/serializations/XML/elements/memberType.xml
index da9daf7..6ae487f 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/memberType.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/memberType.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_memberType">
-    <title>Element: <literal>&lt;memberType&gt;</literal></title>
+    <title>XML element: <literal>&lt;memberType&gt;</literal></title>
     <para>Implements the <olink targetptr="linking_memberType">memberType</olink> object type from the Linking Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeech.xml b/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeech.xml
index 4e2286c..4b619bf 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeech.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeech.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_partOfSpeech">
-    <title>Element: <literal>&lt;partOfSpeech&gt;</literal></title>
+    <title>XML element: <literal>&lt;partOfSpeech&gt;</literal></title>
     <para>Implements the <olink targetptr="core_partOfSpeech">partOfSpeech</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechTag.xml
index 497876d..da4b428 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechTag.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/partOfSpeechTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_partOfSpeechTag">
-    <title>Element: <literal>&lt;partOfSpeechTag&gt;</literal></title>
+    <title>XML element: <literal>&lt;partOfSpeechTag&gt;</literal></title>
     <para>Implements the <olink targetptr="values_partOfSpeechTag">partOfSpeechTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/placeholderMarker.xml b/dmlex-v1.0/specification/serializations/XML/elements/placeholderMarker.xml
index f263129..f60748a 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/placeholderMarker.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/placeholderMarker.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_placeholderMarker">
-    <title>Element: <literal>&lt;placeholderMarker&gt;</literal></title>
+    <title>XML element: <literal>&lt;placeholderMarker&gt;</literal></title>
     <para>Implements the <olink targetptr="annotation_placeholderMarker">placeholderMarker</olink> object type from the Annotation module.
         Contains the text which it marks up.</para>
     
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/pronunciation.xml b/dmlex-v1.0/specification/serializations/XML/elements/pronunciation.xml
index 6dd1e4f..d5d641c 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/pronunciation.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/pronunciation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_pronunciation">
-    <title>Element: <literal>&lt;pronunciation&gt;</literal></title>
+    <title>XML element: <literal>&lt;pronunciation&gt;</literal></title>
     <para>Implements the <olink targetptr="core_pronunciation">pronunciation</olink> object
         type.</para>
 
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/relation.xml b/dmlex-v1.0/specification/serializations/XML/elements/relation.xml
index 5ce56b5..be545ab 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/relation.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/relation.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_relation">
-    <title>Element: <literal>&lt;relation&gt;</literal></title>
+    <title>XML element: <literal>&lt;relation&gt;</literal></title>
     <para>Implements the <olink targetptr="linking_relation">relation</olink> object type from the Linking Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/relationType.xml b/dmlex-v1.0/specification/serializations/XML/elements/relationType.xml
index 9b85aa8..f4ca495 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/relationType.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/relationType.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_relationType">
-    <title>Element: <literal>&lt;relationType&gt;</literal></title>
+    <title>XML element: <literal>&lt;relationType&gt;</literal></title>
     <para>Implements the <olink targetptr="linking_relationType">relationType</olink> object type from the Linking Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/sameAs.xml b/dmlex-v1.0/specification/serializations/XML/elements/sameAs.xml
index 862e232..3cb22e9 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/sameAs.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/sameAs.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_sameAs">
-    <title>Element: <literal>&lt;sameAs&gt;</literal></title>
+    <title>XML element: <literal>&lt;sameAs&gt;</literal></title>
     <para>Implements the <olink targetptr="values_sameAs">sameAs</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/sense.xml b/dmlex-v1.0/specification/serializations/XML/elements/sense.xml
index daf88f3..68a0cac 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/sense.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/sense.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_sense">
-    <title>Element: <literal>&lt;sense&gt;</literal></title>
+    <title>XML element: <literal>&lt;sense&gt;</literal></title>
     <para>Implements the <olink targetptr="core_sense">sense</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/sourceIdentityTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/sourceIdentityTag.xml
index f415f4d..5e4b654 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/sourceIdentityTag.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/sourceIdentityTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_sourceIdentityTag">
-    <title>Element: <literal>&lt;sourceIdentityTag&gt;</literal></title>
+    <title>XML element: <literal>&lt;sourceIdentityTag&gt;</literal></title>
     <para>Implements the <olink targetptr="values_sourceIdentityTag">sourceIdentityTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/transcription.xml b/dmlex-v1.0/specification/serializations/XML/elements/transcription.xml
index 791a01d..2db0ad1 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/transcription.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/transcription.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_transcription">
-    <title>Element: <literal>&lt;transcription&gt;</literal></title>
+    <title>XML element: <literal>&lt;transcription&gt;</literal></title>
     <para>Implements the <olink targetptr="core_transcription">transcription</olink> object type.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/transcriptionSchemeTag.xml b/dmlex-v1.0/specification/serializations/XML/elements/transcriptionSchemeTag.xml
index d2c82f9..14d1c31 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/transcriptionSchemeTag.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/transcriptionSchemeTag.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_transcriptionSchemeTag">
-    <title>Element: <literal>&lt;transcriptionSchemeTag&gt;</literal></title>
+    <title>XML element: <literal>&lt;transcriptionSchemeTag&gt;</literal></title>
     <para>Implements the <olink targetptr="values_transcriptionSchemeTag">transcriptionSchemeTag</olink> object type from the Controlled Values Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/elements/translationLanguage.xml b/dmlex-v1.0/specification/serializations/XML/elements/translationLanguage.xml
index 25433e5..3a548e3 100644
--- a/dmlex-v1.0/specification/serializations/XML/elements/translationLanguage.xml
+++ b/dmlex-v1.0/specification/serializations/XML/elements/translationLanguage.xml
@@ -6,7 +6,7 @@
                          <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >                         
                          ]>
 <section id="xml_translationLanguage">
-    <title>Element: <literal>&lt;translationLanguage&gt;</literal></title>
+    <title>XML element: <literal>&lt;translationLanguage&gt;</literal></title>
     <para>Implements the <olink targetptr="xlingual_translationLanguage">translationLanguage</olink> object type from the Crosslingual Module.</para>
 
     <itemizedlist>
diff --git a/dmlex-v1.0/specification/serializations/XML/specification.xml b/dmlex-v1.0/specification/serializations/XML/specification.xml
index bc66f73..d3673ee 100644
--- a/dmlex-v1.0/specification/serializations/XML/specification.xml
+++ b/dmlex-v1.0/specification/serializations/XML/specification.xml
@@ -35,7 +35,7 @@
     </itemizedlist>
   </section>
   <section id="XMLElements" role="normative">
-    <title>DMLex XML Serialization Elements</title>
+    <title>DMLex XML serialization elements</title>
   
   <xi:include href="elements/lexicographicResource.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="elements/entry.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>