--- a/examples/eg-40-xml-examples-by-term/xml/ex.xsd	Fri Mar 08 13:50:50 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/ex.xsd	Fri Mar 08 13:51:49 2013 -0700
@@ -35,4 +35,10 @@
 
     <xs:element name="vizcolor" type="xs:string" />
 
+	<xs:complexType name="Workflow">
+		<xs:sequence>
+			<xs:element name="version" type="xs:string" />
+		</xs:sequence>
+	</xs:complexType>
+
 </xs:schema>

--- a/provenance/prov-o.ttl	Fri Mar 08 13:50:50 2013 -0700
+++ b/provenance/prov-o.ttl	Fri Mar 08 13:51:49 2013 -0700
@@ -39,7 +39,9 @@
    foaf:member :TimLebo, 
                :StianSoilandReyes,
 			   :DanielGarijo,
-			   :JunZhao;
+			   :JunZhao,
+			   :StephanZednik,
+			   ;
    ## and others!
 .
 

--- a/xml/releases/WD-prov-xml-20130312/Overview.html	Fri Mar 08 13:50:50 2013 -0700
+++ b/xml/releases/WD-prov-xml-20130312/Overview.html	Fri Mar 08 13:51:49 2013 -0700
@@ -257,7 +257,7 @@
 <p>
 Provenance is information about entities, activities, and people involved in producing a piece of data or thing, which can be used to form assessments about its quality, reliability or trustworthiness. PROV-DM is the conceptual data model that forms a basis for the <abbr title="World Wide Web Consortium">W3C</abbr> provenance (PROV) family of specifications. It defines a concepts for expressing provenance information enabling interchange. This document introduces an XML schema for the PROV data model (PROV-DM), allowing instances of the PROV data model to be serialized in XML.
 </p>
-<p>The  <a href="http://www.w3.org/TR/2012/WD-prov-overview-20130312/">PROV Document Overview</a> describes the overall state of PROV, and should be read before other PROV documents.</p>
+<p>The  <a href="http://www.w3.org/TR/2013/WD-prov-overview-20130312/">PROV Document Overview</a> describes the overall state of PROV, and should be read before other PROV documents.</p>
 </section><section id="sotd" class="introductory"><h2>Status of This Document</h2>
   
     
@@ -331,7 +331,7 @@
       
     
   
-</section><section id="toc"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#prov-namespace" class="tocxref"><span class="secno">1.1 </span>PROV Namespace</a></li><li class="tocline"><a href="#conventions" class="tocxref"><span class="secno">1.2 </span>Conventions</a></li></ul></li><li class="tocline"><a href="#schema-design" class="tocxref"><span class="secno">2. </span>XML Schema Design</a><ul class="toc"><li class="tocline"><a href="#schema-modularization" class="tocxref"><span class="secno">2.1 </span>Schema Modularization</a></li><li class="tocline"><a href="#design-pattern" class="tocxref"><span class="secno">2.2 </span><i>Salami Slice</i> Design Pattern</a></li><li class="tocline"><a href="#elements-vs-attributes" class="tocxref"><span class="secno">2.3 </span>Elements vs. Attributes</a></li><li class="tocline"><a href="#type-conventions" class="tocxref"><span class="secno">2.4 </span>Type Conventions</a><ul class="toc"><li class="tocline"><a href="#type-conventions-attributes" class="tocxref"><span class="secno">2.4.1 </span>PROV Type Attribute</a></li><li class="tocline"><a href="#type-conventions-extension-types" class="tocxref"><span class="secno">2.4.2 </span>Extension Types</a></li><li class="tocline"><a href="#type-conventions-xsi-type" class="tocxref"><span class="secno">2.4.3 </span>XSI Type</a></li></ul></li><li class="tocline"><a href="#naming-conventions" class="tocxref"><span class="secno">2.5 </span>Naming Conventions</a></li></ul></li><li class="tocline"><a href="#schema-components" class="tocxref"><span class="secno">3. </span>PROV XML Schema</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#term-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#term-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#term-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#term-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#term-Communication" class="tocxref"><span class="secno">3.1.5 </span>Communication</a></li><li class="tocline"><a href="#term-Start" class="tocxref"><span class="secno">3.1.6 </span>Start</a></li><li class="tocline"><a href="#term-End" class="tocxref"><span class="secno">3.1.7 </span>End</a></li><li class="tocline"><a href="#term-Invalidation" class="tocxref"><span class="secno">3.1.8 </span>Invalidation</a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Derivations</a><ul class="toc"><li class="tocline"><a href="#term-Derivation" class="tocxref"><span class="secno">3.2.1 </span>Derivation</a></li><li class="tocline"><a href="#term-Revision" class="tocxref"><span class="secno">3.2.2 </span>Revision</a></li><li class="tocline"><a href="#term-Quotation" class="tocxref"><span class="secno">3.2.3 </span>Quotation</a></li><li class="tocline"><a href="#term-Primary-Source" class="tocxref"><span class="secno">3.2.4 </span>Primary Source</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Agents, Responsibility, and Influence</a><ul class="toc"><li class="tocline"><a href="#term-Agent" class="tocxref"><span class="secno">3.3.1 </span>Agent</a><ul class="toc"><li class="tocline"><a href="#term-Person" class="tocxref"><span class="secno">3.3.1.1 </span>Person</a></li><li class="tocline"><a href="#term-Organization" class="tocxref"><span class="secno">3.3.1.2 </span>Organization</a></li><li class="tocline"><a href="#term-SoftwareAgent" class="tocxref"><span class="secno">3.3.1.3 </span>Software Agent</a></li></ul></li><li class="tocline"><a href="#term-Attribution" class="tocxref"><span class="secno">3.3.2 </span>Attribution</a></li><li class="tocline"><a href="#term-Association" class="tocxref"><span class="secno">3.3.3 </span>Association</a><ul class="toc"><li class="tocline"><a href="#term-Plan" class="tocxref"><span class="secno">3.3.3.1 </span>Plan</a></li></ul></li><li class="tocline"><a href="#term-Delegation" class="tocxref"><span class="secno">3.3.4 </span>Delegation</a></li><li class="tocline"><a href="#term-Influence" class="tocxref"><span class="secno">3.3.5 </span>Influence</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Bundles</a><ul class="toc"><li class="tocline"><a href="#term-Bundle" class="tocxref"><span class="secno">3.4.1 </span>Bundle</a></li><li class="tocline"><a href="#term-BundleConstructor" class="tocxref"><span class="secno">3.4.2 </span>Bundle Constructor</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#term-Specialization" class="tocxref"><span class="secno">3.5.1 </span>Specialization</a></li><li class="tocline"><a href="#term-Alternate" class="tocxref"><span class="secno">3.5.2 </span>Alternate</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: Collections</a><ul class="toc"><li class="tocline"><a href="#term-Collection" class="tocxref"><span class="secno">3.6.1 </span>Collection</a><ul class="toc"><li class="tocline"><a href="#term-EmptyCollection" class="tocxref"><span class="secno">3.6.1.1 </span>Empty Collection</a></li></ul></li><li class="tocline"><a href="#term-Membership" class="tocxref"><span class="secno">3.6.2 </span>Membership</a></li></ul></li><li class="tocline"><a href="#further-elements" class="tocxref"><span class="secno">3.7 </span>Further Elements of PROV</a><ul class="toc"><li class="tocline"><a href="#attribute-Identifier" class="tocxref"><span class="secno">3.7.1 </span>Identifier</a></li><li class="tocline"><a href="#attribute-Reference" class="tocxref"><span class="secno">3.7.2 </span>Reference</a></li><li class="tocline"><a href="#attributes" class="tocxref"><span class="secno">3.7.3 </span>Attributes</a><ul class="toc"><li class="tocline"><a href="#element-Label" class="tocxref"><span class="secno">3.7.3.1 </span>Label</a></li><li class="tocline"><a href="#element-Location" class="tocxref"><span class="secno">3.7.3.2 </span>Location</a></li><li class="tocline"><a href="#element-Role" class="tocxref"><span class="secno">3.7.3.3 </span>Role</a></li><li class="tocline"><a href="#element-Type" class="tocxref"><span class="secno">3.7.3.4 </span>Type</a></li><li class="tocline"><a href="#element-Value" class="tocxref"><span class="secno">3.7.3.5 </span>Value</a></li></ul></li><li class="tocline"><a href="#type-value" class="tocxref"><span class="secno">3.7.4 </span>Value</a></li></ul></li><li class="tocline"><a href="#structural-elements" class="tocxref"><span class="secno">3.8 </span>Structural Elements of PROV-XML</a><ul class="toc"><li class="tocline"><a href="#term-Document" class="tocxref"><span class="secno">3.8.1 </span>Document</a></li></ul></li></ul></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno">4. </span>Media Type</a></li><li class="tocline"><a href="#prov-xml-schema" class="tocxref"><span class="secno">A. </span>XML Schema</a><ul class="toc"><li class="tocline"><a href="#prov-schema" class="tocxref"><span class="secno">A.1 </span>prov.xsd</a></li><li class="tocline"><a href="#prov-core-schema" class="tocxref"><span class="secno">A.2 </span>prov-core.xsd</a></li><li class="tocline"><a href="#extension-schemas" class="tocxref"><span class="secno">A.3 </span>Extension Schemas</a></li></ul></li><li class="tocline"><a href="#changelog" class="tocxref"><span class="secno">B. </span>Change Log</a><ul class="toc"><li class="tocline"><a href="#changelog-last" class="tocxref"><span class="secno">B.1 </span>Changes since last version</a></li></ul></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">C. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">D. </span>References</a><ul class="toc"><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">D.1 </span>Informative references</a></li></ul></li></ul></section>  <!-- end abstract -->
+</section><section id="toc"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#prov-namespace" class="tocxref"><span class="secno">1.1 </span>PROV Namespace</a></li><li class="tocline"><a href="#conventions" class="tocxref"><span class="secno">1.2 </span>Conventions</a></li></ul></li><li class="tocline"><a href="#schema-design" class="tocxref"><span class="secno">2. </span>XML Schema Design</a><ul class="toc"><li class="tocline"><a href="#schema-modularization" class="tocxref"><span class="secno">2.1 </span>Schema Modularization</a></li><li class="tocline"><a href="#design-pattern" class="tocxref"><span class="secno">2.2 </span><i>Salami Slice</i> Design Pattern</a></li><li class="tocline"><a href="#elements-vs-attributes" class="tocxref"><span class="secno">2.3 </span>Elements vs. Attributes</a></li><li class="tocline"><a href="#type-conventions" class="tocxref"><span class="secno">2.4 </span>Type Conventions</a><ul class="toc"><li class="tocline"><a href="#type-conventions-attributes" class="tocxref"><span class="secno">2.4.1 </span>PROV Type Attribute</a></li><li class="tocline"><a href="#type-conventions-extension-types" class="tocxref"><span class="secno">2.4.2 </span>Extension Types</a></li><li class="tocline"><a href="#type-conventions-xsi-type" class="tocxref"><span class="secno">2.4.3 </span>XSI Type</a></li></ul></li><li class="tocline"><a href="#naming-conventions" class="tocxref"><span class="secno">2.5 </span>Naming Conventions</a></li></ul></li><li class="tocline"><a href="#schema-components" class="tocxref"><span class="secno">3. </span>PROV XML Schema</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#term-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#term-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#term-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#term-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#term-Communication" class="tocxref"><span class="secno">3.1.5 </span>Communication</a></li><li class="tocline"><a href="#term-Start" class="tocxref"><span class="secno">3.1.6 </span>Start</a></li><li class="tocline"><a href="#term-End" class="tocxref"><span class="secno">3.1.7 </span>End</a></li><li class="tocline"><a href="#term-Invalidation" class="tocxref"><span class="secno">3.1.8 </span>Invalidation</a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Derivations</a><ul class="toc"><li class="tocline"><a href="#term-Derivation" class="tocxref"><span class="secno">3.2.1 </span>Derivation</a></li><li class="tocline"><a href="#term-Revision" class="tocxref"><span class="secno">3.2.2 </span>Revision</a></li><li class="tocline"><a href="#term-Quotation" class="tocxref"><span class="secno">3.2.3 </span>Quotation</a></li><li class="tocline"><a href="#term-PrimarySource" class="tocxref"><span class="secno">3.2.4 </span>Primary Source</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Agents, Responsibility, and Influence</a><ul class="toc"><li class="tocline"><a href="#term-Agent" class="tocxref"><span class="secno">3.3.1 </span>Agent</a><ul class="toc"><li class="tocline"><a href="#term-Person" class="tocxref"><span class="secno">3.3.1.1 </span>Person</a></li><li class="tocline"><a href="#term-Organization" class="tocxref"><span class="secno">3.3.1.2 </span>Organization</a></li><li class="tocline"><a href="#term-SoftwareAgent" class="tocxref"><span class="secno">3.3.1.3 </span>Software Agent</a></li></ul></li><li class="tocline"><a href="#term-Attribution" class="tocxref"><span class="secno">3.3.2 </span>Attribution</a></li><li class="tocline"><a href="#term-Association" class="tocxref"><span class="secno">3.3.3 </span>Association</a><ul class="toc"><li class="tocline"><a href="#term-Plan" class="tocxref"><span class="secno">3.3.3.1 </span>Plan</a></li></ul></li><li class="tocline"><a href="#term-Delegation" class="tocxref"><span class="secno">3.3.4 </span>Delegation</a></li><li class="tocline"><a href="#term-Influence" class="tocxref"><span class="secno">3.3.5 </span>Influence</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Bundles</a><ul class="toc"><li class="tocline"><a href="#term-Bundle" class="tocxref"><span class="secno">3.4.1 </span>Bundle</a></li><li class="tocline"><a href="#term-BundleConstructor" class="tocxref"><span class="secno">3.4.2 </span>Bundle Constructor</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#term-Specialization" class="tocxref"><span class="secno">3.5.1 </span>Specialization</a></li><li class="tocline"><a href="#term-Alternate" class="tocxref"><span class="secno">3.5.2 </span>Alternate</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: Collections</a><ul class="toc"><li class="tocline"><a href="#term-Collection" class="tocxref"><span class="secno">3.6.1 </span>Collection</a><ul class="toc"><li class="tocline"><a href="#term-EmptyCollection" class="tocxref"><span class="secno">3.6.1.1 </span>Empty Collection</a></li></ul></li><li class="tocline"><a href="#term-Membership" class="tocxref"><span class="secno">3.6.2 </span>Membership</a></li></ul></li><li class="tocline"><a href="#further-elements" class="tocxref"><span class="secno">3.7 </span>Further Elements of PROV</a><ul class="toc"><li class="tocline"><a href="#attribute-Identifier" class="tocxref"><span class="secno">3.7.1 </span>Identifier</a></li><li class="tocline"><a href="#attribute-Reference" class="tocxref"><span class="secno">3.7.2 </span>Reference</a></li><li class="tocline"><a href="#attributes" class="tocxref"><span class="secno">3.7.3 </span>Attributes</a><ul class="toc"><li class="tocline"><a href="#element-Label" class="tocxref"><span class="secno">3.7.3.1 </span>Label</a></li><li class="tocline"><a href="#element-Location" class="tocxref"><span class="secno">3.7.3.2 </span>Location</a></li><li class="tocline"><a href="#element-Role" class="tocxref"><span class="secno">3.7.3.3 </span>Role</a></li><li class="tocline"><a href="#element-Type" class="tocxref"><span class="secno">3.7.3.4 </span>Type</a></li><li class="tocline"><a href="#element-Value" class="tocxref"><span class="secno">3.7.3.5 </span>Value</a></li></ul></li><li class="tocline"><a href="#type-value" class="tocxref"><span class="secno">3.7.4 </span>Value</a></li></ul></li><li class="tocline"><a href="#structural-elements" class="tocxref"><span class="secno">3.8 </span>Structural Elements of PROV-XML</a><ul class="toc"><li class="tocline"><a href="#term-Document" class="tocxref"><span class="secno">3.8.1 </span>Document</a></li></ul></li></ul></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno">4. </span>Media Type</a></li><li class="tocline"><a href="#prov-xml-schema" class="tocxref"><span class="secno">A. </span>XML Schema</a><ul class="toc"><li class="tocline"><a href="#prov-schema" class="tocxref"><span class="secno">A.1 </span>prov.xsd</a></li><li class="tocline"><a href="#prov-core-schema" class="tocxref"><span class="secno">A.2 </span>prov-core.xsd</a></li><li class="tocline"><a href="#extension-schemas" class="tocxref"><span class="secno">A.3 </span>Extension Schemas</a></li></ul></li><li class="tocline"><a href="#changelog" class="tocxref"><span class="secno">B. </span>Change Log</a><ul class="toc"><li class="tocline"><a href="#changelog-last" class="tocxref"><span class="secno">B.1 </span>Changes since last version</a></li></ul></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">C. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">D. </span>References</a><ul class="toc"><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">D.1 </span>Informative references</a></li></ul></li></ul></section>  <!-- end abstract -->
 
  <!-- end sotd -->
 
@@ -400,8 +400,8 @@
            attributeFormDefault="unqualified"&gt;
 
 	&lt;xs:include schemaLocation="prov-core.xsd"/&gt;
-	&lt;xs:include schemaLocation="extensions/prov-dictionary.xsd"/&gt;
-	&lt;xs:include schemaLocation="extensions/prov-links.xsd"/&gt;
+	&lt;xs:include schemaLocation="prov-dictionary.xsd"/&gt;
+	&lt;xs:include schemaLocation="prov-links.xsd"/&gt;
 
 &lt;/xs:schema&gt;
 </pre>
@@ -412,7 +412,7 @@
 	targetNamespace="http://www.w3.org/ns/prov#" xmlns:prov="http://www.w3.org/ns/prov#"
 	elementFormDefault="qualified"&gt;
 	
-	&lt;xs:include schemaLocation="../prov-core.xsd" /&gt;
+	&lt;xs:include schemaLocation="prov-core.xsd" /&gt;
 	
 	&lt;xs:complexType name="Mention"&gt;
 		&lt;xs:sequence&gt;
@@ -431,7 +431,7 @@
 
 <section id="design-pattern">
 <h3><span class="secno">2.2 </span><i>Salami Slice</i> Design Pattern</h3>
-<p>The general design pattern for the XML schema has been called <i>Salami Slice Design</i> (cite?).  With this design, the individual components are each defined at the top level as separate elements with distinct types.  This allows the types to be easily reusable for domain specific extensions.</p>
+<p>The general design pattern for the XML schema has been called <i>Salami Slice Design</i>.  With this design, the individual components are each defined at the top level as separate elements with distinct types.  This allows the types to be easily reusable for domain specific extensions.</p>
 <p>The <code>prov:document</code> element has been defined to act as a convenient root element for a PROV-XML document, but it's use as the root element is not required.  The schema follows the Salami Slice pattern to ensure PROV XML elements can be integrated with mixed-schema XML documents which require a different document root.</p>
 </section> <!-- end design-pattern -->
 
@@ -610,43 +610,43 @@
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 <tr class="component1-color">
-	<td><a class="essential internalDFN" href="#concept-entity">Entity</a></td>
+	<td><a href="#term-Entity">Entity</a></td>
 	<td>prov:Entity</td>
 	<td>prov:entity</td>
 	<td rowspan="8"><a href="#component1">Component 1: Entities/Activities</a></td>
 </tr>
 <tr class="component1-color">
-	<td><a class="essential internalDFN" href="#concept-activity">Activity</a></td>
+	<td><a href="#term-Activity">Activity</a></td>
 	<td>prov:Activity</td>
 	<td>prov:activity</td>
 </tr>
 <tr class="component1-color">
-	<td><a class="essential internalDFN" href="#concept-generation">Generation</a></td>
+	<td><a href="#term-Generation">Generation</a></td>
 	<td>prov:Generation</td>
 	<td>prov:wasGeneratedBy</td>
 </tr>
 <tr class="component1-color">
-	<td><a class="essential internalDFN" href="#concept-usage">Usage</a></td>
+	<td><a href="#term-Usage">Usage</a></td>
 	<td>prov:Usage</td>
 	<td>prov:used</td>
 </tr>
 <tr class="component1-color">
-	<td><a class="essential internalDFN" href="#concept-communication">Communication</a></td>
+	<td><a href="#term-Communication">Communication</a></td>
 	<td>prov:Communication</td>
 	<td>prov:wasInformedBy</td>
 </tr>
 <tr class="component1-color">
-	<td><a class="essential internalDFN" href="#concept-start">Start</a></td>
+	<td><a href="#term-Start">Start</a></td>
 	<td>prov:Start</td>
 	<td>prov:wasStartedBy</td>
 </tr>
 <tr class="component1-color">
-	<td><a class="essential internalDFN" href="#concept-end">End</a></td>
+	<td><a href="#term-End">End</a></td>
 	<td>prov:End</td>
 	<td>prov:wasEndedBy</td>
 </tr>
 <tr class="component1-color">
-	<td><a class="essential internalDFN" href="#concept-invalidation">Invalidation</a></td>
+	<td><a href="#term-Invalidation">Invalidation</a></td>
 	<td>prov:Invalidation</td>
 	<td>prov:wasInvalidatedBy</td>
 </tr>
@@ -654,23 +654,23 @@
 	<td colspan="3" style="border-width: 0px; "></td>
 </tr>
 <tr class="component2-color">
-	<td><a class="essential internalDFN" href="#concept-derivation">Derivation</a></td>
+	<td><a href="#term-Derivation">Derivation</a></td>
 	<td>prov:Derivation</td>
 	<td>prov:wasDerivedFrom</td>
 	<td rowspan="4"><a href="#component2">Component 2: Derivations</a></td>
 </tr>
 <tr class="component2-color">
-	<td><a class="essential internalDFN" href="#concept-revision">Revision</a></td>
+	<td><a href="#term-Revision">Revision</a></td>
 	<td>prov:Revision</td>
 	<td>prov:wasRevisionOf</td>
 </tr>
 <tr class="component2-color">
-	<td><a class="essential internalDFN" href="#concept-quotation">Quotation</a></td>
+	<td><a href="#term-Quotation">Quotation</a></td>
 	<td>prov:Quotation</td>
 	<td>prov:wasQuotedFrom</td>
 </tr>
 <tr class="component2-color">
-	<td><a class="essential internalDFN" href="#concept-primary-source">Primary Source</a></td>
+	<td><a href="#term-PrimarySource">Primary Source</a></td>
 	<td>prov:PrimarySource</td>
 	<td>prov:hadPrimarySource</td>
 </tr>
@@ -678,48 +678,48 @@
 	<td colspan="3" style="border-width: 0px; "></td>
 </tr>
 <tr class="component3-color" style="border-collapse: collapse; ">
-	<td><a class="essential internalDFN" href="#concept-agent">Agent</a></td>
+	<td><a href="#term-Agent">Agent</a></td>
 	<td>prov:Agent</td>
 	<td>prov:agent</td>
 	<td rowspan="9"><a href="#component3">Component 3: Agents, Responsibility, Influence</a></td>
 </tr>
 <tr class="component3-color">
-	<td><a class="essential internalDFN" href="#concept-attribution">Attribution</a></td>
+	<td><a href="#term-Attribution">Attribution</a></td>
 	<td>prov:Attribution</td>
 	<td>prov:wasAttributedTo</td>
 </tr>
 <tr class="component3-color">
-	<td><a class="essential internalDFN" href="#concept-association">Association</a></td>
+	<td><a href="#term-Association">Association</a></td>
 	<td>prov:Association</td>
 	<td>prov:wasAssociatedWith</td>
 </tr>
 <tr class="component3-color">
-	<td><a class="essential internalDFN" href="#concept-delegation">Delegation</a></td>
+	<td><a href="#term-Delegation">Delegation</a></td>
 	<td>prov:Delegation</td>
 	<td>prov:actedOnBehalfOf</td>
 </tr>
 <tr class="component3-color">
-	<td><a class="essential internalDFN" href="#concept-plan">Plan</a></td>
+	<td><a href="#term-Plan">Plan</a></td>
 	<td>prov:Plan</td>
 	<td>prov:plan</td>
 </tr>
 <tr class="component3-color">
-	<td><a class="essential internalDFN" href="#concept-person">Person</a></td>
+	<td><a href="#term-Person">Person</a></td>
 	<td>prov:Person</td>
 	<td>prov:person</td>
 </tr>
 <tr class="component3-color">
-	<td><a class="essential internalDFN" href="#concept-organization">Organization</a></td>
+	<td><a href="#term-Organzation">Organization</a></td>
 	<td>prov:Organization</td>
 	<td>prov:organization</td>
 </tr>
 <tr class="component3-color">
-	<td><a class="essential">Software Agent</a></td>
+	<td><a href="#term-SoftwareAgent">Software Agent</a></td>
 	<td>prov:SoftwareAgent</td>
 	<td>prov:softwareAgent</td>
 </tr>
 <tr class="component3-color">
-	<td><a class="essential internalDFN" href="#concept-influence">Influence</a></td>
+	<td><a href="#term-Influence">Influence</a></td>
 	<td>prov:Influence</td>
 	<td>prov:wasInfluencedBy</td>
 </tr>
@@ -727,13 +727,13 @@
 	<td colspan="3" style="border-width: 0px; "></td>
 </tr>
 <tr class="component4-color">
-	<td><a class="essential internalDFN" href="#concept-bundle">Bundle</a></td>
+	<td><a href="#term-Bundle">Bundle</a></td>
 	<td>prov:Bundle</td>
 	<td>prov:bundle</td>
-	<td rowspan="2"><a href="#component5">Component 4: Bundles</a></td>
+	<td rowspan="2"><a href="#component4">Component 4: Bundles</a></td>
 </tr>
 <tr class="component4-color">
-	<td><a class="essential">Bundle Constructor</a></td>
+	<td><a href="#term-BundleConstructor">Bundle Constructor</a></td>
 	<td>prov:BundleConstructor</td>
 	<td>prov:bundleContent</td>
 </tr>
@@ -741,13 +741,13 @@
 	<td colspan="3" style="border-width: 0px; "></td>
 </tr>
 <tr class="component5-color">
-	<td><a class="essential internalDFN" href="#concept-alternate">Alternate</a></td>
+	<td><a href="#term-Alternate">Alternate</a></td>
 	<td>prov:Alternate</td>
 	<td>prov:alternateOf</td>
-	<td rowspan="3"><a href="#component4">Component 5: Alternate</a></td>
+	<td rowspan="3"><a href="#component5">Component 5: Alternate</a></td>
 </tr>
 <tr class="component5-color">
-	<td><a class="essential internalDFN" href="#concept-specialization">Specialization</a></td>
+	<td><a href="#term-Specialization">Specialization</a></td>
 	<td>prov:Specialization</td>
 	<td>prov:specializationOf</td>
 </tr>
@@ -755,18 +755,18 @@
 	<td colspan="3" style="border-width: 0px; "></td>
 </tr>
 <tr class="component6-color">
-	<td><a class="essential internalDFN" href="#concept-collection">Collection</a></td>
+	<td><a href="#term-Collection">Collection</a></td>
 	<td>prov:Collection</td>
 	<td>prov:collection</td>
 	<td rowspan="3"><a href="#component6">Component 6: Collections</a></td>
 </tr>
 <tr class="component6-color">
-	<td><a class="essential internalDFN" href="#concept-empty-collection">Empty Collection</a></td>
+	<td><a href="#term-EmptyCollection">Empty Collection</a></td>
 	<td>prov:EmptyCollection</td>
 	<td>prov:emptyCollection</td>
 </tr>
 <tr class="component6-color">
-	<td><a class="essential internalDFN" href="#concept-membership">Membership</a></td>
+	<td><a href="#term-Membership">Membership</a></td>
 	<td>prov:Membership</td>
 	<td>prov:hadMember</td>
 </tr>
@@ -1269,7 +1269,7 @@
 &lt;/prov:document&gt;</pre></div>
 </section>  <!-- end term-Quotation -->
 
-<section id="term-Primary-Source">
+<section id="term-PrimarySource">
 <h4><span class="secno">3.2.4 </span>Primary Source</h4>
 <span class="glossary-ref">   A <span class="dfn">primary source</span>  for a topic refers to something produced by some agent with direct experience and knowledge about the topic, at the time of the topic's study, without benefit from hindsight. </span>
 <p>Type definition in XML Schema:</p><pre class="schema-type">&lt;xs:complexType name="PrimarySource"&gt;
@@ -1301,7 +1301,7 @@
   &lt;/prov:hadPrimarySource&gt;</b>
 
 &lt;/prov:document&gt;</pre></div>
-</section>  <!-- end term-Primary-Source -->
+</section>  <!-- end term-PrimarySource -->
 
 </section>  <!-- end component2 -->
 
@@ -2277,8 +2277,8 @@
            attributeFormDefault="unqualified"&gt;
 
 	&lt;xs:include schemaLocation="prov-core.xsd"/&gt;
-	&lt;xs:include schemaLocation="extensions/prov-dictionary.xsd"/&gt;
-	&lt;xs:include schemaLocation="extensions/prov-links.xsd"/&gt;
+	&lt;xs:include schemaLocation="prov-dictionary.xsd"/&gt;
+	&lt;xs:include schemaLocation="prov-links.xsd"/&gt;
 
 &lt;/xs:schema&gt;
 </pre>
@@ -2744,7 +2744,7 @@
 	targetNamespace="http://www.w3.org/ns/prov#" xmlns:prov="http://www.w3.org/ns/prov#"
 	elementFormDefault="qualified"&gt;
 	
-	&lt;xs:include schemaLocation="../prov-core.xsd" /&gt;
+	&lt;xs:include schemaLocation="prov-core.xsd" /&gt;
 	
 	&lt;xs:complexType name="Mention"&gt;
 		&lt;xs:sequence&gt;