diff --git a/build/build_extension.py b/build/build_extension.py
index f4ab04e..dbc2516 100644
--- a/build/build_extension.py
+++ b/build/build_extension.py
@@ -16,7 +16,7 @@
 __author__ = "John Wieczorek"
 __copyright__ = "Copyright 2021 Rauthiflor LLC"
 __filename__ = 'build_extension.py'
-__version__ = f'{__filename__} 2021-08-16T17:29-03:00'
+__version__ = f'{__filename__} 2021-08-17T20:40-03:00'
 
 import io
 import os
@@ -513,7 +513,7 @@ def main():
         s += f'python {__filename__}'
         s += ' -x ./occurrence_core.tmpl'
         s += ' -i ./occurrence_core_list.csv'
-        s += ' -o ../ext/dwc_occurrence_2021-08_16.xml'
+        s += ' -o ../ext/dwc_occurrence_2021-08-16.xml'
         s += ' -t ../vocabulary/term_versions.csv'
         print(s)
         return
diff --git a/build/event_core.tmpl b/build/event_core.tmpl
index 6ee75bf..890ab8a 100644
--- a/build/event_core.tmpl
+++ b/build/event_core.tmpl
@@ -8,5 +8,6 @@
     name='Event' namespace='http://rs.tdwg.org/dwc/terms/'
     rowType='http://rs.tdwg.org/dwc/terms/Event'
     dc:issued='2021-07-15'
-    dc:relation='https://dwc.tdwg.org/terms/#event'
+    dc:subject=''
+    dc:relation='http://rs.tdwg.org/dwc/terms/Event'
     dc:description='The category of information pertaining to an action that occurs at some location during some time.'>
diff --git a/build/extended_mof.tmpl b/build/extended_mof.tmpl
index 0c29b86..ce53250 100644
--- a/build/extended_mof.tmpl
+++ b/build/extended_mof.tmpl
@@ -4,10 +4,10 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
     xmlns:dc='http://purl.org/dc/terms/'
     xsi:schemaLocation='http://rs.gbif.org/extension/ http://rs.gbif.org/schema/extension.xsd'
-    dc:title='Darwin Core Occurrence'
-    name='ExtendedMeasurementOrFact' namespace='http://rs.tdwg.org/dwc/terms/'
+    dc:title='Extended Measurement or Facts'
+    name='ExtendedMeasurementOrFacts' namespace='http://rs.tdwg.org/dwc/terms/'
     rowType='http://rs.tdwg.org/dwc/terms/MeasurementOrFact'
     dc:issued='2021-07-15'
-    dc:subject='dwc:Taxon dwc:Event'
-    dc:relation='https://dwc.tdwg.org/terms/#measurementorfact'
+    dc:subject='dwc:Occurrence dwc:Event dwc:Taxon'
+    dc:relation='http://rs.tdwg.org/dwc/terms/MeasurementOrFact'
     dc:description='Extended support for measurements or facts, allowing links to any Core plus to records in an Occurrence Extension. For example, when used with an Event Core, this extension can be used to store measurements or facts related to a biological occurrence (through the built-in occurrenceID), to environmental measurements or facts, and to sampling method attributes. This extension includes dwciri terms that can be used for IRI-based identifiers to values in controlled vocabularies for measurementType, measurementValue, and measurementUnit.'>
diff --git a/build/identification_history.tmpl b/build/identification_history.tmpl
index 51d6110..be4ae71 100644
--- a/build/identification_history.tmpl
+++ b/build/identification_history.tmpl
@@ -8,5 +8,6 @@
     name='Identification' namespace='http://rs.tdwg.org/dwc/terms/'
     rowType='http://rs.tdwg.org/dwc/terms/Identification'
     dc:issued='2021-07-15'
-    dc:relation='https://dwc.tdwg.org/terms/#identification'
+    dc:subject='dwc:Occurrence'
+    dc:relation='http://rs.tdwg.org/dwc/terms/Identification'
     dc:description='Support for multiple identifications (determinations) of species Occurrences. All identifications including the most current one should be listed, while the current one should also be repeated in the Occurrence Core.'>
diff --git a/build/measurements_or_facts.tmpl b/build/measurements_or_facts.tmpl
index 64a2b9c..ffacda0 100644
--- a/build/measurements_or_facts.tmpl
+++ b/build/measurements_or_facts.tmpl
@@ -4,10 +4,10 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
     xmlns:dc='http://purl.org/dc/terms/'
     xsi:schemaLocation='http://rs.gbif.org/extension/ http://rs.gbif.org/schema/extension.xsd'
-    dc:title='Darwin Core Measurement Or Facts'
-    name='MeasurementOrFact' namespace='http://rs.tdwg.org/dwc/terms/'
+    dc:title='Darwin Core Measurement or Facts'
+    name='MeasurementOrFacts' namespace='http://rs.tdwg.org/dwc/terms/'
     rowType='http://rs.tdwg.org/dwc/terms/MeasurementOrFact'
     dc:issued='2021-07-15'
     dc:subject='dwc:Occurrence dwc:Event dwc:Taxon'
-    dc:relation='https://dwc.tdwg.org/terms/#measurementorfact'
+    dc:relation='http://rs.tdwg.org/dwc/terms/MeasurementOrFact'
     dc:description='Support for measurements or facts, allowing links to any type of Core.'>
diff --git a/build/occurrence_core.tmpl b/build/occurrence_core.tmpl
index 4beeac5..1884460 100644
--- a/build/occurrence_core.tmpl
+++ b/build/occurrence_core.tmpl
@@ -8,6 +8,6 @@
     name='Occurrence' namespace='http://rs.tdwg.org/dwc/terms/'
     rowType='http://rs.tdwg.org/dwc/terms/Occurrence'
     dc:issued='2021-07-15'
-    dc:subject='dwc:Taxon dwc:Event'
-    dc:relation='https://dwc.tdwg.org/terms/#occurrence'
+    dc:subject='dwc:Event dwc:Taxon'
+    dc:relation='http://rs.tdwg.org/dwc/terms/Occurrence'
     dc:description='The category of information pertaining to the existence of an Organism (sensu http://rs.tdwg.org/dwc/terms/Organism) at a particular place at a particular time.'>
diff --git a/build/occurrence_iri.tmpl b/build/occurrence_iri.tmpl
index df58e69..1375782 100644
--- a/build/occurrence_iri.tmpl
+++ b/build/occurrence_iri.tmpl
@@ -8,6 +8,6 @@
     name='Occurrence' namespace='http://rs.tdwg.org/dwc/iri/'
     rowType='http://rs.tdwg.org/dwc/terms/Occurrence'
     dc:issued='2021-07-15'
-    dc:subject='dwc:Taxon dwc:Event'
-    dc:relation='https://dwc.tdwg.org/terms/#occurrence'
+    dc:subject='dwc:Occurrence dwc:Event dwc:Taxon'
+    dc:relation='http://rs.tdwg.org/dwc/terms/Occurrence'
     dc:description='Additional IRI terms for the category of information pertaining to the existence of an Organism (sensu http://rs.tdwg.org/dwc/terms/Organism) at a particular place at a particular time.'>
diff --git a/build/resource_relationship.tmpl b/build/resource_relationship.tmpl
index b1e5ac1..bf5ccc0 100644
--- a/build/resource_relationship.tmpl
+++ b/build/resource_relationship.tmpl
@@ -9,5 +9,5 @@
     rowType='http://rs.tdwg.org/dwc/terms/ResourceRelationship'
     dc:issued='2021-07-15'
     dc:subject='dwc:Occurrence dwc:Event dwc:Taxon'
-    dc:relation='https://dwc.tdwg.org/terms/#resourcerelationship'
+    dc:relation='http://rs.tdwg.org/dwc/terms/ResourceRelationship'
     dc:description='Support for relationships between resources in the Core, in an extension, or external to the data set. The identifiers for subject (resourceID) and object (relatedResourceID) may exist in the dataset or be accessible via an externally resolvable identifier'>