Index: inputs/ARIZ/Specimen/VegBIEN.csv
===================================================================
--- inputs/ARIZ/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/ARIZ/Specimen/VegBIEN.csv	(revision 5242)
@@ -40,16 +40,16 @@
 Class,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=class]/taxonname",
 Phylum,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=phylum]/taxonname",
 Kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
-ScientificNameAuthor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/1",Contains the binomial in addition to the authority
-ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
+ScientificNameAuthor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/1",Contains the binomial in addition to the authority
+ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
 Class,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/class,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 Kingdom,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/kingdom,
Index: inputs/GBIF/Specimen/test.xml.ref
===================================================================
--- inputs/GBIF/Specimen/test.xml.ref	(revision 5241)
+++ inputs/GBIF/Specimen/test.xml.ref	(revision 5242)
@@ -57,12 +57,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>
@@ -86,7 +86,7 @@
                                     <author>$AuthorOfScientificName</author>
                                     <creator_id>
                                         <_simplifyPath>
-                                            <next>datasource_id</next>
+                                            <next>creator_id</next>
                                             <path>
                                                 <party>
                                                     <givenname><_namePart><first>$IdentifiedBy</first></_namePart></givenname>
@@ -110,12 +110,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_alt>
                                                     <1>$ScientificNameOriginal</1>
Index: inputs/SpeciesLink/Specimen/VegBIEN.csv
===================================================================
--- inputs/SpeciesLink/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/SpeciesLink/Specimen/VegBIEN.csv	(revision 5242)
@@ -131,26 +131,26 @@
 conceptual_darwin_2003_1_0_Kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
 dwc_dwcore_Kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
 dwc_terms_kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
-conceptual_darwin_2003_1_0_ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-dwc_dwcore_ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-dwc_terms_scientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-conceptual_darwin_2003_1_0_Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-dwc_dwcore_Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-dwc_terms_family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-conceptual_darwin_2003_1_0_Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-dwc_dwcore_Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-dwc_terms_genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-conceptual_darwin_2003_1_0_Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-dwc_dwcore_SpecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-dwc_terms_specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-conceptual_darwin_2003_1_0_Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
-dwc_dwcore_InfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-dwc_terms_infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-dwc_dwcore_InfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
-dwc_terms_infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
-dwc_terms_scientificNameAuthorship,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2/_alt/1",
-conceptual_darwin_2003_1_0_ScientificNameAuthor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2/_alt/2",
-dwc_dwcore_AuthorYearOfScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2/_alt/3",
+conceptual_darwin_2003_1_0_ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+dwc_dwcore_ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+dwc_terms_scientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+conceptual_darwin_2003_1_0_Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+dwc_dwcore_Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+dwc_terms_family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+conceptual_darwin_2003_1_0_Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+dwc_dwcore_Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+dwc_terms_genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+conceptual_darwin_2003_1_0_Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+dwc_dwcore_SpecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+dwc_terms_specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+conceptual_darwin_2003_1_0_Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
+dwc_dwcore_InfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+dwc_terms_infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+dwc_dwcore_InfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
+dwc_terms_infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
+dwc_terms_scientificNameAuthorship,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2/_alt/1",
+conceptual_darwin_2003_1_0_ScientificNameAuthor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2/_alt/2",
+dwc_dwcore_AuthorYearOfScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2/_alt/3",
 dwc_terms_scientificNameAuthorship,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author/_alt/1,
 conceptual_darwin_2003_1_0_ScientificNameAuthor,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author/_alt/2,
 dwc_dwcore_AuthorYearOfScientificName,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author/_alt/3,
@@ -157,15 +157,15 @@
 conceptual_darwin_2003_1_0_Class,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/class,
 dwc_dwcore_Class,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/class,
 dwc_terms_class,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/class,
-conceptual_darwin_2003_1_0_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-dwc_curatorial_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-dwc_terms_identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-conceptual_darwin_2003_1_0_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-dwc_curatorial_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-dwc_terms_identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-conceptual_darwin_2003_1_0_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
-dwc_curatorial_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
-dwc_terms_identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+conceptual_darwin_2003_1_0_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+dwc_curatorial_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+dwc_terms_identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+conceptual_darwin_2003_1_0_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+dwc_curatorial_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+dwc_terms_identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+conceptual_darwin_2003_1_0_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
+dwc_curatorial_IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
+dwc_terms_identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 conceptual_darwin_2003_1_0_Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 dwc_dwcore_Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 dwc_terms_family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
Index: inputs/VegBank/taxonobservation_/VegBIEN.csv
===================================================================
--- inputs/VegBank/taxonobservation_/VegBIEN.csv	(revision 5241)
+++ inputs/VegBank/taxonobservation_/VegBIEN.csv	(revision 5242)
@@ -19,12 +19,12 @@
 Order,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=order]/taxonname",
 Class,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=class]/taxonname",
 Kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
-Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
-Variety,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/6/_join_words:[1=""var. ""]/2",
-Forma,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/7/_join_words:[1=""fm. ""]/2",
+Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
+Variety,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/6/_join_words:[1=""var. ""]/2",
+Forma,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/7/_join_words:[1=""fm. ""]/2",
 Class,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/class,
 Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Forma,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/forma,
@@ -36,7 +36,7 @@
 Variety,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/variety,
 interpretationdate,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/determinationdate/_alt/1/_*/date/_dateRangeStart/value,
 taxonfit,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/taxonfit,
-authorplantname,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1,
+authorplantname,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1,
 authorplantname,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/taxonomicname,
 museumaccessionnumber,"/location/locationevent/taxonoccurrence/voucher/*_id/specimenreplicate/catalognumber_dwc/_if[@name=""if indirect voucher""]/then",
 Division,,** No join mapping for *Division ** 
Index: inputs/MO/Specimen/test.xml.ref
===================================================================
--- inputs/MO/Specimen/test.xml.ref	(revision 5241)
+++ inputs/MO/Specimen/test.xml.ref	(revision 5242)
@@ -89,12 +89,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>
@@ -118,7 +118,7 @@
                                     <author>$ScientificNameAuthor</author>
                                     <creator_id>
                                         <_simplifyPath>
-                                            <next>datasource_id</next>
+                                            <next>creator_id</next>
                                             <path>
                                                 <party>
                                                     <givenname><_namePart><first>$IdentifiedBy</first></_namePart></givenname>
Index: inputs/CTFS/TaxonOccurrence/VegBIEN.csv
===================================================================
--- inputs/CTFS/TaxonOccurrence/VegBIEN.csv	(revision 5241)
+++ inputs/CTFS/TaxonOccurrence/VegBIEN.csv	(revision 5242)
@@ -13,10 +13,10 @@
 SpeciesName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-SpeciesName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-SubSpeciesName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
+Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+SpeciesName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+SubSpeciesName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
 Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 SpeciesName,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/species,
Index: inputs/FIA/Organism/VegBIEN.csv
===================================================================
--- inputs/FIA/Organism/VegBIEN.csv	(revision 5241)
+++ inputs/FIA/Organism/VegBIEN.csv	(revision 5242)
@@ -16,8 +16,8 @@
 TreeTag,"/location/locationevent/taxonoccurrence/authortaxoncode/_if[@name=""if in plot""]/then/_first/1/_first/2",
 SpecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-SpecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+SpecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
 Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 SpecificEpithet,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/species,
 County,/location/locationplace/*_id/placepath/county,
Index: inputs/SALVIAS/plotObservations/VegBIEN.csv
===================================================================
--- inputs/SALVIAS/plotObservations/VegBIEN.csv	(revision 5241)
+++ inputs/SALVIAS/plotObservations/VegBIEN.csv	(revision 5242)
@@ -64,13 +64,13 @@
 Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-infra_ep_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-infra_rank_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
-infra_ep_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
-auth,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",Brad: This is the author of the scientificName.
+Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+infra_ep_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+infra_rank_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
+infra_ep_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
+auth,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",Brad: This is the author of the scientificName.
 auth,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,Brad: This is the author of the scientificName.
 Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
@@ -79,9 +79,9 @@
 infra_rank_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/subspecies/_alt/2/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
 infra_ep_1,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/subspecies/_alt/2/_join_words/2,
 cfaff,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/taxonfit,"Brad: Not sure where this goes. Indicator of identification uncertainty. 'cf.'=similar to the species listed, 'aff.'=related to the species list, but not the same. You'll need to check with Bob and with Nick where these go in VegX and VegBank."
-OrigFamily,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1,Brad: OMIT
-OrigGenus,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2,
-OrigSpecies,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3,Brad: OMIT
+OrigFamily,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1,Brad: OMIT
+OrigGenus,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2,
+OrigSpecies,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3,Brad: OMIT
 OrigFamily,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/family,Brad: OMIT
 OrigGenus,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/genus,
 OrigSpecies,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/species,Brad: OMIT
Index: inputs/.TNRS/tnrs/VegBIEN.csv
===================================================================
--- inputs/.TNRS/tnrs/VegBIEN.csv	(revision 5241)
+++ inputs/.TNRS/tnrs/VegBIEN.csv	(revision 5242)
@@ -9,16 +9,16 @@
 Specific_epithet_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 Genus_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 Name_matched_accepted_family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",Contains family based on matched name
-Name_submitted,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/1",
-Name_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-Name_matched_accepted_family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",Contains family based on matched name
-Genus_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-Specific_epithet_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-Unmatched_terms,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/2",
-Infraspecific_epithet_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-Name_matched_rank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
-Infraspecific_epithet_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
-Name_matched_author,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",Contains author based on matched name
+Name_submitted,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/1",
+Name_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+Name_matched_accepted_family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",Contains family based on matched name
+Genus_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+Specific_epithet_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+Unmatched_terms,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/2",
+Infraspecific_epithet_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+Name_matched_rank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
+Infraspecific_epithet_matched,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
+Name_matched_author,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",Contains author based on matched name
 Accepted_name_author,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_set_canon_taxonconcept/canon_taxonconcept_id/taxonconcept/author,
 Accepted_name_family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_set_canon_taxonconcept/canon_taxonconcept_id/taxonconcept/family,
 Accepted_name,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_set_canon_taxonconcept/canon_taxonconcept_id/taxonconcept/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1,
Index: inputs/U/Specimen/test.xml.ref
===================================================================
--- inputs/U/Specimen/test.xml.ref	(revision 5241)
+++ inputs/U/Specimen/test.xml.ref	(revision 5242)
@@ -76,12 +76,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>$Family</1>
@@ -92,7 +92,7 @@
                                     </canon_taxonconcept_id>
                                     <creator_id>
                                         <_simplifyPath>
-                                            <next>datasource_id</next>
+                                            <next>creator_id</next>
                                             <path>
                                                 <party>
                                                     <givenname><_namePart><first>$Detby</first></_namePart></givenname>
Index: inputs/GBIF/Specimen/VegBIEN.csv
===================================================================
--- inputs/GBIF/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/GBIF/Specimen/VegBIEN.csv	(revision 5242)
@@ -22,17 +22,17 @@
 SpecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-SpecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-InfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-InfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
-AuthorOfScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
+ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+SpecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+InfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+InfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
+AuthorOfScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
 AuthorOfScientificName,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 SpecificEpithet,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/species,
@@ -39,9 +39,9 @@
 InfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/subspecies/_alt/2/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
 InfraspecificEpithet,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/subspecies/_alt/2/_join_words/2,
 ScientificName,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/taxonomicname,
-ScientificNameOriginal,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1,
-GBIFFamilyOriginal,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1,
-GBIFGenusOriginal,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2,
+ScientificNameOriginal,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1,
+GBIFFamilyOriginal,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1,
+GBIFGenusOriginal,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2,
 GBIFFamilyOriginal,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/family,
 GBIFGenusOriginal,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/genus,
 ScientificNameOriginal,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/taxonomicname,
Index: inputs/NCU-NCSC/Specimen/test.xml.ref
===================================================================
--- inputs/NCU-NCSC/Specimen/test.xml.ref	(revision 5241)
+++ inputs/NCU-NCSC/Specimen/test.xml.ref	(revision 5242)
@@ -68,12 +68,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>$Full Taxon Name</identifyingtaxonomicname>
                                         </taxonconcept>
                                     </canon_taxonconcept_id>
Index: inputs/MO/Specimen/VegBIEN.csv
===================================================================
--- inputs/MO/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/MO/Specimen/VegBIEN.csv	(revision 5242)
@@ -28,16 +28,16 @@
 genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
 Kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
-ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
-ScientificNameAuthor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
+ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
+ScientificNameAuthor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
 ScientificNameAuthor,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 Kingdom,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/kingdom,
Index: inputs/MT/Specimen/VegBIEN.csv
===================================================================
--- inputs/MT/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/MT/Specimen/VegBIEN.csv	(revision 5242)
@@ -13,8 +13,8 @@
 id,/location/locationevent/taxonoccurrence/sourceaccessioncode/_first/3,
 genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
 family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 locality,/location/locationnarrative/_merge/1,
Index: inputs/MT/Specimen/test.xml.ref
===================================================================
--- inputs/MT/Specimen/test.xml.ref	(revision 5241)
+++ inputs/MT/Specimen/test.xml.ref	(revision 5242)
@@ -44,12 +44,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>$family</1>
Index: inputs/test_taxonomic_names/Taxon/VegBIEN.csv
===================================================================
--- inputs/test_taxonomic_names/Taxon/VegBIEN.csv	(revision 5241)
+++ inputs/test_taxonomic_names/Taxon/VegBIEN.csv	(revision 5242)
@@ -1,5 +1,5 @@
 test_taxonomic_names,VegBIEN:/_simplifyPath:[next=parent_id]/path,Comments
 scientificName,"/location/locationevent/taxonoccurrence/authortaxoncode/_if[@name=""if in plot""]/then/_first/2/_first/3",
-scientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+scientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
 scientificName,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/taxonomicname,
 scientificNameID,,** No join mapping for scientificNameID ** 
Index: inputs/test_taxonomic_names/Taxon/test.xml.ref
===================================================================
--- inputs/test_taxonomic_names/Taxon/test.xml.ref	(revision 5241)
+++ inputs/test_taxonomic_names/Taxon/test.xml.ref	(revision 5242)
@@ -11,12 +11,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>$scientificName</identifyingtaxonomicname>
                                         </taxonconcept>
                                     </canon_taxonconcept_id>
Index: inputs/XAL/Specimen/VegBIEN.csv
===================================================================
--- inputs/XAL/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/XAL/Specimen/VegBIEN.csv	(revision 5242)
@@ -32,17 +32,17 @@
 darwin:Class,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=class]/taxonname",
 darwin:Phylum,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=phylum]/taxonname",
 darwin:Kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
-darwin:ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-darwin:Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-darwin:Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-darwin:Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-darwin:Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
-darwin:ScientificNameAuthor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
+darwin:ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+darwin:Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+darwin:Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+darwin:Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+darwin:Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
+darwin:ScientificNameAuthor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
 darwin:ScientificNameAuthor,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,
 darwin:Class,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/class,
-darwin:IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-darwin:IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-darwin:IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+darwin:IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+darwin:IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+darwin:IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 darwin:Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 darwin:Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 darwin:Kingdom,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/kingdom,
Index: inputs/TEAM/VL/VegBIEN.csv
===================================================================
--- inputs/TEAM/VL/VegBIEN.csv	(revision 5241)
+++ inputs/TEAM/VL/VegBIEN.csv	(revision 5242)
@@ -23,9 +23,9 @@
 Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
 Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 Species,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/species,
Index: inputs/TEAM/VL/test.xml.ref
===================================================================
--- inputs/TEAM/VL/test.xml.ref	(revision 5241)
+++ inputs/TEAM/VL/test.xml.ref	(revision 5242)
@@ -46,12 +46,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>$Family</1>
Index: inputs/TEAM/VT/VegBIEN.csv
===================================================================
--- inputs/TEAM/VT/VegBIEN.csv	(revision 5241)
+++ inputs/TEAM/VT/VegBIEN.csv	(revision 5242)
@@ -23,9 +23,9 @@
 Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
 Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 Species,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/species,
Index: inputs/TEAM/VT/test.xml.ref
===================================================================
--- inputs/TEAM/VT/test.xml.ref	(revision 5241)
+++ inputs/TEAM/VT/test.xml.ref	(revision 5242)
@@ -46,12 +46,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>$Family</1>
Index: inputs/NY/Specimen/VegBIEN.csv
===================================================================
--- inputs/NY/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/NY/Specimen/VegBIEN.csv	(revision 5242)
@@ -37,17 +37,17 @@
 Class,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=class]/taxonname",
 Phylum,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=phylum]/taxonname",
 Kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
-ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
-ScientificNameAuthor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
+ScientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+Species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+Subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
+ScientificNameAuthor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
 ScientificNameAuthor,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,
 Class,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/class,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+IdentifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 Kingdom,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/kingdom,
Index: inputs/NY/Specimen/test.xml.ref
===================================================================
--- inputs/NY/Specimen/test.xml.ref	(revision 5241)
+++ inputs/NY/Specimen/test.xml.ref	(revision 5242)
@@ -117,12 +117,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>
@@ -147,7 +147,7 @@
                                     <class>$Class</class>
                                     <creator_id>
                                         <_simplifyPath>
-                                            <next>datasource_id</next>
+                                            <next>creator_id</next>
                                             <path>
                                                 <party>
                                                     <givenname><_namePart><first>$IdentifiedBy</first></_namePart></givenname>
Index: inputs/Madidi/Organism/VegBIEN.csv
===================================================================
--- inputs/Madidi/Organism/VegBIEN.csv	(revision 5241)
+++ inputs/Madidi/Organism/VegBIEN.csv	(revision 5242)
@@ -36,16 +36,16 @@
 Specific epithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 Genera,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 Family (revised),"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-Specie+autor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/1",
-Species and morphotypes,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1","Contains less than ""Specie+autor"""
-Family (revised),"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genera,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-Specific epithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-Autor (revised),"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
+Specie+autor,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/1",
+Species and morphotypes,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1","Contains less than ""Specie+autor"""
+Family (revised),"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genera,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+Specific epithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+Autor (revised),"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
 Autor (revised),/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,
-Determined by,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-Determined by,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-Determined by,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+Determined by,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+Determined by,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+Determined by,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 Family (revised),/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Genera,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 Specific epithet,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/species,
@@ -52,8 +52,8 @@
 Species and morphotypes,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/taxonomicname,"Contains less than ""Specie+autor"""
 Specie+autor,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/taxonomicnamewithauthor,
 Qualifier,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/taxonfit,
-Field family,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1,
-Field name,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2,Often = Genera
+Field family,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1,
+Field name,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2,Often = Genera
 Field family,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/family,
 Field name,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/genus,Often = Genera
 Index collector,/location/locationevent/taxonoccurrence/verbatimcollectorname,
Index: inputs/Madidi/Organism/test.xml.ref
===================================================================
--- inputs/Madidi/Organism/test.xml.ref	(revision 5241)
+++ inputs/Madidi/Organism/test.xml.ref	(revision 5242)
@@ -72,12 +72,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_alt>
                                                     <1>$Specie+autor</1>
@@ -105,7 +105,7 @@
                                     <author>$Autor (revised)</author>
                                     <creator_id>
                                         <_simplifyPath>
-                                            <next>datasource_id</next>
+                                            <next>creator_id</next>
                                             <path>
                                                 <party>
                                                     <givenname><_namePart><first>$Determined by</first></_namePart></givenname>
@@ -130,12 +130,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>$Field family</1>
Index: inputs/UNCC/Specimen/VegBIEN.csv
===================================================================
--- inputs/UNCC/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/UNCC/Specimen/VegBIEN.csv	(revision 5242)
@@ -50,15 +50,15 @@
 species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-SciName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-infraname,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-usdaRank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then/_alt/1",
-infrarank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then/_alt/2",
-infraname,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
-authors,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
+SciName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+species,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+infraname,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+usdaRank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then/_alt/1",
+infrarank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then/_alt/2",
+infraname,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
+authors,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
 authors,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,
 family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
Index: inputs/UNCC/Specimen/test.xml.ref
===================================================================
--- inputs/UNCC/Specimen/test.xml.ref	(revision 5241)
+++ inputs/UNCC/Specimen/test.xml.ref	(revision 5242)
@@ -74,12 +74,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>
Index: inputs/ACAD/Specimen/VegBIEN.csv
===================================================================
--- inputs/ACAD/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/ACAD/Specimen/VegBIEN.csv	(revision 5242)
@@ -33,19 +33,19 @@
 class,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=class]/taxonname",
 phylum,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=phylum]/taxonname",
 kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
-scientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/1",
-family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-taxonRank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
-infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
-scientificNameAuthorship,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
+scientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/1",
+family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+taxonRank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
+infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
+scientificNameAuthorship,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
 scientificNameAuthorship,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,
 class,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/class,
-identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 kingdom,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/kingdom,
Index: inputs/ACAD/Specimen/test.xml.ref
===================================================================
--- inputs/ACAD/Specimen/test.xml.ref	(revision 5241)
+++ inputs/ACAD/Specimen/test.xml.ref	(revision 5242)
@@ -77,12 +77,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_alt>
                                                     <1>$scientificName</1>
@@ -117,7 +117,7 @@
                                     <class>$class</class>
                                     <creator_id>
                                         <_simplifyPath>
-                                            <next>datasource_id</next>
+                                            <next>creator_id</next>
                                             <path>
                                                 <party>
                                                     <givenname><_namePart><first>$identifiedBy</first></_namePart></givenname>
Index: inputs/SALVIAS-CSV/Organism/VegBIEN.csv
===================================================================
--- inputs/SALVIAS-CSV/Organism/VegBIEN.csv	(revision 5241)
+++ inputs/SALVIAS-CSV/Organism/VegBIEN.csv	(revision 5242)
@@ -71,13 +71,13 @@
 specific_epithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-specific_epithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-infra_ep_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-infra_rank_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
-infra_ep_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
-specific_authority,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",Brad: This is the author of the scientificName.
+family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+specific_epithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+infra_ep_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+infra_rank_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
+infra_ep_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
+specific_authority,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",Brad: This is the author of the scientificName.
 specific_authority,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,Brad: This is the author of the scientificName.
 family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
@@ -86,8 +86,8 @@
 infra_rank_1,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/subspecies/_alt/2/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
 infra_ep_1,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/subspecies/_alt/2/_join_words/2,
 cf_aff,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/taxonfit,"Brad: Not sure where this goes. Indicator of identification uncertainty. 'cf.'=similar to the species listed, 'aff.'=related to the species list, but not the same. You'll need to check with Bob and with Nick where these go in VegX and VegBank."
-orig_family,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1,Brad: OMIT
-orig_species,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3,Brad: OMIT
+orig_family,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1,Brad: OMIT
+orig_species,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3,Brad: OMIT
 orig_family,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/family,Brad: OMIT
 orig_species,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/species,Brad: OMIT
 coll_firstname,/location/locationevent/taxonoccurrence/verbatimcollectorname/_join_words/1,Brad: See comment above
Index: inputs/SALVIAS-CSV/Organism/test.xml.ref
===================================================================
--- inputs/SALVIAS-CSV/Organism/test.xml.ref	(revision 5241)
+++ inputs/SALVIAS-CSV/Organism/test.xml.ref	(revision 5242)
@@ -149,12 +149,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>
@@ -205,12 +205,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>$orig_family</1>
Index: inputs/CVS/Organism/VegBIEN.csv
===================================================================
--- inputs/CVS/Organism/VegBIEN.csv	(revision 5241)
+++ inputs/CVS/Organism/VegBIEN.csv	(revision 5242)
@@ -10,7 +10,7 @@
 %cover,/location/locationevent/taxonoccurrence/aggregateoccurrence/cover_fraction/_percent_to_fraction/value,
 authorObsCode,"/location/locationevent/taxonoccurrence/authortaxoncode/_if[@name=""if in plot""]/cond/_exists",
 currentTaxonName sec Weakley 2006,"/location/locationevent/taxonoccurrence/authortaxoncode/_if[@name=""if in plot""]/then/_first/2/_first/3",
-currentTaxonName sec Weakley 2006,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+currentTaxonName sec Weakley 2006,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
 currentTaxonName sec Weakley 2006,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/taxonomicname,
 county,/location/locationplace/*_id/placepath/county,
 state,/location/locationplace/*_id/placepath/stateprovince,
Index: inputs/CVS/Organism/test.xml.ref
===================================================================
--- inputs/CVS/Organism/test.xml.ref	(revision 5241)
+++ inputs/CVS/Organism/test.xml.ref	(revision 5242)
@@ -33,12 +33,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>$currentTaxonName sec Weakley 2006</identifyingtaxonomicname>
                                         </taxonconcept>
                                     </canon_taxonconcept_id>
Index: inputs/REMIB/Specimen/VegBIEN.csv
===================================================================
--- inputs/REMIB/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/REMIB/Specimen/VegBIEN.csv	(revision 5242)
@@ -36,9 +36,9 @@
 specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
 family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 specificEpithet,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/species,
Index: inputs/REMIB/Specimen/test.xml.ref
===================================================================
--- inputs/REMIB/Specimen/test.xml.ref	(revision 5241)
+++ inputs/REMIB/Specimen/test.xml.ref	(revision 5242)
@@ -66,12 +66,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>$family</1>
Index: inputs/CTFS/StemObservation/VegBIEN.csv
===================================================================
--- inputs/CTFS/StemObservation/VegBIEN.csv	(revision 5241)
+++ inputs/CTFS/StemObservation/VegBIEN.csv	(revision 5242)
@@ -26,11 +26,11 @@
 SpeciesName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=species]/taxonname",
 Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-SpeciesName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-SubSpeciesName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
-SpeciesAuthority,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
+Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+SpeciesName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+SubSpeciesName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
+SpeciesAuthority,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
 SpeciesAuthority,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,
 Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
Index: inputs/CTFS/StemObservation/test.xml.ref
===================================================================
--- inputs/CTFS/StemObservation/test.xml.ref	(revision 5241)
+++ inputs/CTFS/StemObservation/test.xml.ref	(revision 5242)
@@ -43,12 +43,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>
Index: inputs/CTFS/TaxonOccurrence/test.xml.ref
===================================================================
--- inputs/CTFS/TaxonOccurrence/test.xml.ref	(revision 5241)
+++ inputs/CTFS/TaxonOccurrence/test.xml.ref	(revision 5242)
@@ -14,12 +14,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>$Family</1>
Index: inputs/FIA/Organism/test.xml.ref
===================================================================
--- inputs/FIA/Organism/test.xml.ref	(revision 5241)
+++ inputs/FIA/Organism/test.xml.ref	(revision 5242)
@@ -64,12 +64,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <2>$Genus</2>
Index: inputs/SALVIAS/plotObservations/test.xml.ref
===================================================================
--- inputs/SALVIAS/plotObservations/test.xml.ref	(revision 5241)
+++ inputs/SALVIAS/plotObservations/test.xml.ref	(revision 5242)
@@ -120,12 +120,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>
@@ -176,12 +176,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>$OrigFamily</1>
Index: inputs/U/Specimen/VegBIEN.csv
===================================================================
--- inputs/U/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/U/Specimen/VegBIEN.csv	(revision 5242)
@@ -18,11 +18,11 @@
 Detby,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/party/surname/_namePart/last,
 Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=genus]/taxonname",
 Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=family]/taxonname",
-Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-Detby,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-Detby,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-Detby,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+Family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+Genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+Detby,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+Detby,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+Detby,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 Family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 Genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 Detyy,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/determinationdate/_alt/2/_date/year/_nullIf:[null=0,type=float]/value",
Index: inputs/ARIZ/Specimen/test.xml.ref
===================================================================
--- inputs/ARIZ/Specimen/test.xml.ref	(revision 5241)
+++ inputs/ARIZ/Specimen/test.xml.ref	(revision 5242)
@@ -117,12 +117,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_alt>
                                                     <1>$ScientificNameAuthor</1>
@@ -146,7 +146,7 @@
                                     <class>$Class</class>
                                     <creator_id>
                                         <_simplifyPath>
-                                            <next>datasource_id</next>
+                                            <next>creator_id</next>
                                             <path>
                                                 <party>
                                                     <givenname><_namePart><first>$IdentifiedBy</first></_namePart></givenname>
Index: inputs/NCU-NCSC/Specimen/VegBIEN.csv
===================================================================
--- inputs/NCU-NCSC/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/NCU-NCSC/Specimen/VegBIEN.csv	(revision 5242)
@@ -14,7 +14,7 @@
 Full Taxon Name,"/location/locationevent/taxonoccurrence/authortaxoncode/_if[@name=""if in plot""]/then/_first/2/_first/3",
 Cultivated?,/location/locationevent/taxonoccurrence/iscultivated/_alt/1,
 Accession Number,/location/locationevent/taxonoccurrence/sourceaccessioncode/_first/3,
-Full Taxon Name,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+Full Taxon Name,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
 Full Taxon Name,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/taxonomicname,
 Barcode,"/location/locationevent/taxonoccurrence/voucher/*_id/specimenreplicate/catalognumber_dwc/_if[@name=""if indirect voucher""]/then",
 Country,/location/locationplace/*_id/placepath/country,
Index: inputs/SpeciesLink/Specimen/test.xml.ref
===================================================================
--- inputs/SpeciesLink/Specimen/test.xml.ref	(revision 5241)
+++ inputs/SpeciesLink/Specimen/test.xml.ref	(revision 5242)
@@ -256,12 +256,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>
@@ -334,7 +334,7 @@
                                     </class>
                                     <creator_id>
                                         <_simplifyPath>
-                                            <next>datasource_id</next>
+                                            <next>creator_id</next>
                                             <path>
                                                 <party>
                                                     <givenname>
Index: inputs/QMOR/Specimen/test.xml.ref
===================================================================
--- inputs/QMOR/Specimen/test.xml.ref	(revision 5241)
+++ inputs/QMOR/Specimen/test.xml.ref	(revision 5242)
@@ -101,12 +101,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>
@@ -141,7 +141,7 @@
                                     <class>$class</class>
                                     <creator_id>
                                         <_simplifyPath>
-                                            <next>datasource_id</next>
+                                            <next>creator_id</next>
                                             <path>
                                                 <party>
                                                     <givenname><_namePart><first>$identifiedBy</first></_namePart></givenname>
Index: bin/map
===================================================================
--- bin/map	(revision 5241)
+++ bin/map	(revision 5242)
@@ -177,8 +177,8 @@
     def update_in_label():
         if in_label_ref[0] != None and out_is_db:
             # TODO: Move this to the mappings as some kind of metadata
-            col_defaults['datasource_id'] = db_xml.put(out_db, xpath.path2xml(
-                'party:[datasource_id=0]/organizationname="'+in_label_ref[0]+'"'
+            col_defaults['creator_id'] = db_xml.put(out_db, xpath.path2xml(
+                'party:[creator_id=0]/organizationname="'+in_label_ref[0]+'"'
                 ), row_ins_ct_ref)
     
     def prep_root():
Index: inputs/QMOR/Specimen/VegBIEN.csv
===================================================================
--- inputs/QMOR/Specimen/VegBIEN.csv	(revision 5241)
+++ inputs/QMOR/Specimen/VegBIEN.csv	(revision 5242)
@@ -40,19 +40,19 @@
 class,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=class]/taxonname",
 phylum,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=phylum]/taxonname",
 kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
-scientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-taxonRank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
-infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
-scientificNameAuthorship,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
+scientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+taxonRank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
+infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
+scientificNameAuthorship,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
 scientificNameAuthorship,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,
 class,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/class,
-identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 genus,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/genus,
 kingdom,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/kingdom,
Index: schemas/vegbien.sql
===================================================================
--- schemas/vegbien.sql	(revision 5241)
+++ schemas/vegbien.sql	(revision 5242)
@@ -270,10 +270,10 @@
 
 
 --
--- Name: party_datasource_id_self_ref(); Type: FUNCTION; Schema: public; Owner: -
+-- Name: party_creator_id_self_ref(); Type: FUNCTION; Schema: public; Owner: -
 --
 
-CREATE FUNCTION party_datasource_id_self_ref() RETURNS trigger
+CREATE FUNCTION party_creator_id_self_ref() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -280,8 +280,8 @@
     IF new.party_id IS NULL THEN -- prepopulate party_id
         new.party_id = nextval('party_party_id_seq'::regclass);
     END IF;
-    IF new.datasource_id = 0 THEN -- make self-reference
-        new.datasource_id = new.party_id;
+    IF new.creator_id = 0 THEN -- make self-reference
+        new.creator_id = new.party_id;
     END IF;
     RETURN new;
 END;
@@ -505,7 +505,7 @@
 
 CREATE TABLE aggregateoccurrence (
     aggregateoccurrence_id integer NOT NULL,
-    datasource_id integer NOT NULL,
+    creator_id integer NOT NULL,
     sourceaccessioncode text,
     taxonoccurrence_id integer NOT NULL,
     collectiondate timestamp with time zone,
@@ -570,7 +570,7 @@
 
 CREATE TABLE location (
     location_id integer NOT NULL,
-    datasource_id integer NOT NULL,
+    creator_id integer NOT NULL,
     sourceaccessioncode text,
     parent_id integer,
     authorlocationcode text,
@@ -665,7 +665,7 @@
 
 CREATE TABLE locationevent (
     locationevent_id integer NOT NULL,
-    datasource_id integer NOT NULL,
+    creator_id integer NOT NULL,
     sourceaccessioncode text,
     parent_id integer,
     location_id integer,
@@ -965,7 +965,7 @@
 
 CREATE TABLE party (
     party_id integer NOT NULL,
-    datasource_id integer NOT NULL,
+    creator_id integer NOT NULL,
     salutation text,
     givenname text,
     middlename text,
@@ -983,10 +983,10 @@
 
 
 --
--- Name: COLUMN party.datasource_id; Type: COMMENT; Schema: public; Owner: -
+-- Name: COLUMN party.creator_id; Type: COMMENT; Schema: public; Owner: -
 --
 
-COMMENT ON COLUMN party.datasource_id IS 'A datasource should point to itself in this field. This will happen automatically by setting it to the special value 0.';
+COMMENT ON COLUMN party.creator_id IS 'A datasource should point to itself in this field. This will happen automatically by setting it to the special value 0.';
 
 
 --
@@ -995,7 +995,7 @@
 
 CREATE TABLE placepath (
     placepath_id integer NOT NULL,
-    datasource_id integer NOT NULL,
+    creator_id integer NOT NULL,
     placecode text,
     canon_placepath_id integer,
     place_id integer,
@@ -1041,7 +1041,7 @@
 
 CREATE TABLE plantobservation (
     plantobservation_id integer NOT NULL,
-    datasource_id integer NOT NULL,
+    creator_id integer NOT NULL,
     sourceaccessioncode text,
     aggregateoccurrence_id integer NOT NULL,
     overallheight_m double precision,
@@ -1073,7 +1073,7 @@
 
 CREATE TABLE specimenreplicate (
     specimenreplicate_id integer NOT NULL,
-    datasource_id integer NOT NULL,
+    creator_id integer NOT NULL,
     sourceaccessioncode text,
     plantobservation_id integer,
     institution_id integer,
@@ -1113,8 +1113,7 @@
 
 CREATE TABLE taxonconcept (
     taxonconcept_id integer NOT NULL,
-    datasource_id integer NOT NULL,
-    creator_id integer,
+    creator_id integer NOT NULL,
     identifyingtaxonomicname text,
     canon_taxonconcept_id integer,
     taxon_id integer,
@@ -1346,7 +1345,7 @@
 
 CREATE TABLE taxonoccurrence (
     taxonoccurrence_id integer NOT NULL,
-    datasource_id integer NOT NULL,
+    creator_id integer NOT NULL,
     sourceaccessioncode text,
     locationevent_id integer,
     authortaxoncode text,
@@ -1392,7 +1391,7 @@
 --
 
 CREATE VIEW analytical_db_view AS
-    SELECT datasource.organizationname AS "dataSourceName", taxonconcept.family, taxonconcept.genus, taxonconcept.species, COALESCE(taxonconcept.taxonomicnamewithauthor, taxonconcept.taxonomicname) AS taxon, taxonconcept.author AS "taxonAuthor", taxonconcept.variety AS "taxonMorphospecies", placepath.country, placepath.stateprovince AS "stateProvince", placepath.county AS "countyParish", taxonoccurrence.verbatimcollectorname AS collector, plantobservation.collectionnumber AS "collectionNumber", array_to_string(ARRAY[identifiedby.givenname, identifiedby.middlename, identifiedby.surname], ' '::text) AS "identifiedBy", aggregateoccurrence.collectiondate AS "observationDate", location.authorlocationcode AS "plotCode", functions._m2_to_ha(location.area_m2) AS "plotAreaHa", method.name AS "plotMethod", locationcoords.latitude_deg AS latitude, locationcoords.longitude_deg AS longitude, location.elevation_m, taxonoccurrence.iscultivated AS "isCultivated", taxonoccurrence.cultivatedbasis AS "isCultivatedReason", functions._fraction_to_percent(aggregateoccurrence.cover_fraction) AS "pctCover" FROM (((((((((((((location JOIN party datasource ON (((datasource.party_id = location.datasource_id) AND (datasource.organizationname IS NOT NULL)))) LEFT JOIN locationcoords USING (location_id)) LEFT JOIN locationplace USING (location_id)) LEFT JOIN placepath USING (placepath_id)) JOIN locationevent USING (location_id)) LEFT JOIN method USING (method_id)) JOIN taxonoccurrence USING (locationevent_id)) JOIN taxondetermination USING (taxonoccurrence_id)) LEFT JOIN party identifiedby ON ((identifiedby.party_id = taxondetermination.party_id))) JOIN taxonconcept USING (taxonconcept_id)) LEFT JOIN aggregateoccurrence USING (taxonoccurrence_id)) LEFT JOIN plantobservation USING (aggregateoccurrence_id)) LEFT JOIN specimenreplicate USING (plantobservation_id));
+    SELECT datasource.organizationname AS "dataSourceName", taxonconcept.family, taxonconcept.genus, taxonconcept.species, COALESCE(taxonconcept.taxonomicnamewithauthor, taxonconcept.taxonomicname) AS taxon, taxonconcept.author AS "taxonAuthor", taxonconcept.variety AS "taxonMorphospecies", placepath.country, placepath.stateprovince AS "stateProvince", placepath.county AS "countyParish", taxonoccurrence.verbatimcollectorname AS collector, plantobservation.collectionnumber AS "collectionNumber", array_to_string(ARRAY[identifiedby.givenname, identifiedby.middlename, identifiedby.surname], ' '::text) AS "identifiedBy", aggregateoccurrence.collectiondate AS "observationDate", location.authorlocationcode AS "plotCode", functions._m2_to_ha(location.area_m2) AS "plotAreaHa", method.name AS "plotMethod", locationcoords.latitude_deg AS latitude, locationcoords.longitude_deg AS longitude, location.elevation_m, taxonoccurrence.iscultivated AS "isCultivated", taxonoccurrence.cultivatedbasis AS "isCultivatedReason", functions._fraction_to_percent(aggregateoccurrence.cover_fraction) AS "pctCover" FROM (((((((((((((location JOIN party datasource ON (((datasource.party_id = location.creator_id) AND (datasource.organizationname IS NOT NULL)))) LEFT JOIN locationcoords USING (location_id)) LEFT JOIN locationplace USING (location_id)) LEFT JOIN placepath USING (placepath_id)) JOIN locationevent USING (location_id)) LEFT JOIN method USING (method_id)) JOIN taxonoccurrence USING (locationevent_id)) JOIN taxondetermination USING (taxonoccurrence_id)) LEFT JOIN party identifiedby ON ((identifiedby.party_id = taxondetermination.party_id))) JOIN taxonconcept USING (taxonconcept_id)) LEFT JOIN aggregateoccurrence USING (taxonoccurrence_id)) LEFT JOIN plantobservation USING (aggregateoccurrence_id)) LEFT JOIN specimenreplicate USING (plantobservation_id));
 
 
 --
@@ -2518,7 +2517,7 @@
 
 CREATE TABLE project (
     project_id integer NOT NULL,
-    datasource_id integer NOT NULL,
+    creator_id integer NOT NULL,
     sourceaccessioncode text,
     projectname text,
     projectdescription text,
@@ -2950,7 +2949,7 @@
 
 CREATE TABLE stemobservation (
     stemobservation_id integer NOT NULL,
-    datasource_id integer NOT NULL,
+    creator_id integer NOT NULL,
     sourceaccessioncode text,
     plantobservation_id integer NOT NULL,
     authorstemcode text,
@@ -4152,7 +4151,7 @@
 --
 
 ALTER TABLE ONLY project
-    ADD CONSTRAINT project_unique UNIQUE (datasource_id, projectname);
+    ADD CONSTRAINT project_unique UNIQUE (creator_id, projectname);
 
 
 --
@@ -4378,10 +4377,10 @@
 
 
 --
--- Name: aggregateoccurrence_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: aggregateoccurrence_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX aggregateoccurrence_unique_within_datasource ON aggregateoccurrence USING btree (datasource_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
+CREATE UNIQUE INDEX aggregateoccurrence_unique_within_creator ON aggregateoccurrence USING btree (creator_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
 
 
 --
@@ -4434,17 +4433,17 @@
 
 
 --
--- Name: location_unique_within_datasource_by_authorlocationcode; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: location_unique_within_creator_by_authorlocationcode; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX location_unique_within_datasource_by_authorlocationcode ON location USING btree (datasource_id, (COALESCE(authorlocationcode, '\\N'::text))) WHERE (((authorlocationcode IS NOT NULL) AND (parent_id IS NULL)) AND (sourceaccessioncode IS NULL));
+CREATE UNIQUE INDEX location_unique_within_creator_by_authorlocationcode ON location USING btree (creator_id, (COALESCE(authorlocationcode, '\\N'::text))) WHERE (((authorlocationcode IS NOT NULL) AND (parent_id IS NULL)) AND (sourceaccessioncode IS NULL));
 
 
 --
--- Name: location_unique_within_datasource_by_sourceaccessioncode; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: location_unique_within_creator_by_sourceaccessioncode; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX location_unique_within_datasource_by_sourceaccessioncode ON location USING btree (datasource_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
+CREATE UNIQUE INDEX location_unique_within_creator_by_sourceaccessioncode ON location USING btree (creator_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
 
 
 --
@@ -4476,10 +4475,10 @@
 
 
 --
--- Name: locationevent_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: locationevent_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX locationevent_unique_within_datasource ON locationevent USING btree (datasource_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
+CREATE UNIQUE INDEX locationevent_unique_within_creator ON locationevent USING btree (creator_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
 
 
 --
@@ -4556,14 +4555,14 @@
 -- Name: party_unique_root; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX party_unique_root ON party USING btree ((COALESCE(organizationname, '\\N'::text))) WHERE (datasource_id = party_id);
+CREATE UNIQUE INDEX party_unique_root ON party USING btree ((COALESCE(organizationname, '\\N'::text))) WHERE (creator_id = party_id);
 
 
 --
--- Name: party_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: party_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX party_unique_within_datasource ON party USING btree (datasource_id, (COALESCE(organizationname, '\\N'::text)), (COALESCE(surname, '\\N'::text)), (COALESCE(givenname, '\\N'::text)), (COALESCE(middlename, '\\N'::text)));
+CREATE UNIQUE INDEX party_unique_within_creator ON party USING btree (creator_id, (COALESCE(organizationname, '\\N'::text)), (COALESCE(surname, '\\N'::text)), (COALESCE(givenname, '\\N'::text)), (COALESCE(middlename, '\\N'::text)));
 
 
 --
@@ -4581,17 +4580,17 @@
 
 
 --
--- Name: placepath_unique_within_datasource_by_code; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: placepath_unique_within_creator_by_code; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX placepath_unique_within_datasource_by_code ON placepath USING btree (datasource_id, (COALESCE(placecode, '\\N'::text))) WHERE (placecode IS NOT NULL);
+CREATE UNIQUE INDEX placepath_unique_within_creator_by_code ON placepath USING btree (creator_id, (COALESCE(placecode, '\\N'::text))) WHERE (placecode IS NOT NULL);
 
 
 --
--- Name: placepath_unique_within_datasource_by_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: placepath_unique_within_creator_by_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX placepath_unique_within_datasource_by_name ON placepath USING btree (datasource_id, (COALESCE(continent, '\\N'::text)), (COALESCE(country, '\\N'::text)), (COALESCE(stateprovince, '\\N'::text)), (COALESCE(county, '\\N'::text)), (COALESCE(municipality, '\\N'::text)), (COALESCE(site, '\\N'::text)), (COALESCE(otherranks, ARRAY[]::rankedplacename[]))) WHERE (placecode IS NULL);
+CREATE UNIQUE INDEX placepath_unique_within_creator_by_name ON placepath USING btree (creator_id, (COALESCE(continent, '\\N'::text)), (COALESCE(country, '\\N'::text)), (COALESCE(stateprovince, '\\N'::text)), (COALESCE(county, '\\N'::text)), (COALESCE(municipality, '\\N'::text)), (COALESCE(site, '\\N'::text)), (COALESCE(otherranks, ARRAY[]::rankedplacename[]))) WHERE (placecode IS NULL);
 
 
 --
@@ -4602,10 +4601,10 @@
 
 
 --
--- Name: plantobservation_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: plantobservation_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX plantobservation_unique_within_datasource ON plantobservation USING btree (datasource_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
+CREATE UNIQUE INDEX plantobservation_unique_within_creator ON plantobservation USING btree (creator_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
 
 
 --
@@ -4626,14 +4625,14 @@
 -- Name: project_unique_name_date; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX project_unique_name_date ON project USING btree (datasource_id, (COALESCE(projectname, '\\N'::text)), (COALESCE(startdate, 'infinity'::timestamp with time zone))) WHERE (sourceaccessioncode IS NULL);
+CREATE UNIQUE INDEX project_unique_name_date ON project USING btree (creator_id, (COALESCE(projectname, '\\N'::text)), (COALESCE(startdate, 'infinity'::timestamp with time zone))) WHERE (sourceaccessioncode IS NULL);
 
 
 --
--- Name: project_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: project_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX project_unique_within_datasource ON project USING btree (datasource_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
+CREATE UNIQUE INDEX project_unique_within_creator ON project USING btree (creator_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
 
 
 --
@@ -4682,14 +4681,14 @@
 -- Name: specimenreplicate_unique_catalognumber; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX specimenreplicate_unique_catalognumber ON specimenreplicate USING btree (datasource_id, (COALESCE(institution_id, 2147483647)), (COALESCE(collectioncode_dwc, '\\N'::text)), (COALESCE(catalognumber_dwc, '\\N'::text)), (COALESCE(plantobservation_id, 2147483647))) WHERE ((catalognumber_dwc IS NOT NULL) AND (sourceaccessioncode IS NULL));
+CREATE UNIQUE INDEX specimenreplicate_unique_catalognumber ON specimenreplicate USING btree (creator_id, (COALESCE(institution_id, 2147483647)), (COALESCE(collectioncode_dwc, '\\N'::text)), (COALESCE(catalognumber_dwc, '\\N'::text)), (COALESCE(plantobservation_id, 2147483647))) WHERE ((catalognumber_dwc IS NOT NULL) AND (sourceaccessioncode IS NULL));
 
 
 --
--- Name: specimenreplicate_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: specimenreplicate_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX specimenreplicate_unique_within_datasource ON specimenreplicate USING btree (datasource_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
+CREATE UNIQUE INDEX specimenreplicate_unique_within_creator ON specimenreplicate USING btree (creator_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
 
 
 --
@@ -4700,10 +4699,10 @@
 
 
 --
--- Name: stemobservation_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: stemobservation_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX stemobservation_unique_within_datasource ON stemobservation USING btree (datasource_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
+CREATE UNIQUE INDEX stemobservation_unique_within_creator ON stemobservation USING btree (creator_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
 
 
 --
@@ -4728,17 +4727,17 @@
 
 
 --
--- Name: taxonconcept_unique_within_datasource_by_identifying_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: taxonconcept_unique_within_creator_by_identifying_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX taxonconcept_unique_within_datasource_by_identifying_name ON taxonconcept USING btree (datasource_id, (COALESCE(identifyingtaxonomicname, '\\N'::text))) WHERE (identifyingtaxonomicname IS NOT NULL);
+CREATE UNIQUE INDEX taxonconcept_unique_within_creator_by_identifying_name ON taxonconcept USING btree (creator_id, (COALESCE(identifyingtaxonomicname, '\\N'::text))) WHERE (identifyingtaxonomicname IS NOT NULL);
 
 
 --
--- Name: taxonconcept_unique_within_datasource_by_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: taxonconcept_unique_within_creator_by_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX taxonconcept_unique_within_datasource_by_name ON taxonconcept USING btree (datasource_id, (COALESCE(creator_id, 2147483647)), (COALESCE(taxonomicname, '\\N'::text)), (COALESCE(author, '\\N'::text)), (COALESCE(taxonomicnamewithauthor, '\\N'::text)), (COALESCE(domain, '\\N'::text)), (COALESCE(kingdom, '\\N'::text)), (COALESCE(phylum, '\\N'::text)), (COALESCE(class, '\\N'::text)), (COALESCE("order", '\\N'::text)), (COALESCE(family, '\\N'::text)), (COALESCE(genus, '\\N'::text)), (COALESCE(species, '\\N'::text)), (COALESCE(subspecies, '\\N'::text)), (COALESCE(variety, '\\N'::text)), (COALESCE(forma, '\\N'::text)), (COALESCE(cultivar, '\\N'::text)), (COALESCE(morphospecies, '\\N'::text)), (COALESCE(otherranks, ARRAY[]::rankedtaxonname[]))) WHERE (identifyingtaxonomicname IS NULL);
+CREATE UNIQUE INDEX taxonconcept_unique_within_creator_by_name ON taxonconcept USING btree (creator_id, (COALESCE(creator_id, 2147483647)), (COALESCE(taxonomicname, '\\N'::text)), (COALESCE(author, '\\N'::text)), (COALESCE(taxonomicnamewithauthor, '\\N'::text)), (COALESCE(domain, '\\N'::text)), (COALESCE(kingdom, '\\N'::text)), (COALESCE(phylum, '\\N'::text)), (COALESCE(class, '\\N'::text)), (COALESCE("order", '\\N'::text)), (COALESCE(family, '\\N'::text)), (COALESCE(genus, '\\N'::text)), (COALESCE(species, '\\N'::text)), (COALESCE(subspecies, '\\N'::text)), (COALESCE(variety, '\\N'::text)), (COALESCE(forma, '\\N'::text)), (COALESCE(cultivar, '\\N'::text)), (COALESCE(morphospecies, '\\N'::text)), (COALESCE(otherranks, ARRAY[]::rankedtaxonname[]))) WHERE (identifyingtaxonomicname IS NULL);
 
 
 --
@@ -4770,10 +4769,10 @@
 
 
 --
--- Name: taxonoccurrence_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: taxonoccurrence_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE UNIQUE INDEX taxonoccurrence_unique_within_datasource ON taxonoccurrence USING btree (datasource_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
+CREATE UNIQUE INDEX taxonoccurrence_unique_within_creator ON taxonoccurrence USING btree (creator_id, (COALESCE(sourceaccessioncode, '\\N'::text))) WHERE (sourceaccessioncode IS NOT NULL);
 
 
 --
@@ -4791,10 +4790,10 @@
 
 
 --
--- Name: party_datasource_id_self_ref; Type: TRIGGER; Schema: public; Owner: -
+-- Name: party_creator_id_self_ref; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER party_datasource_id_self_ref BEFORE INSERT OR UPDATE ON party FOR EACH ROW EXECUTE PROCEDURE party_datasource_id_self_ref();
+CREATE TRIGGER party_creator_id_self_ref BEFORE INSERT OR UPDATE ON party FOR EACH ROW EXECUTE PROCEDURE party_creator_id_self_ref();
 
 
 --
@@ -4857,11 +4856,11 @@
 
 
 --
--- Name: aggregateoccurrence_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: aggregateoccurrence_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY aggregateoccurrence
-    ADD CONSTRAINT aggregateoccurrence_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT aggregateoccurrence_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
@@ -5105,11 +5104,11 @@
 
 
 --
--- Name: location_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: location_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY location
-    ADD CONSTRAINT location_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT location_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
@@ -5137,11 +5136,11 @@
 
 
 --
--- Name: locationevent_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: locationevent_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY locationevent
-    ADD CONSTRAINT locationevent_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT locationevent_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
@@ -5321,19 +5320,19 @@
 
 
 --
--- Name: party_currentname_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: party_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY party
-    ADD CONSTRAINT party_currentname_id_fkey FOREIGN KEY (currentname_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT party_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
--- Name: party_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: party_currentname_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY party
-    ADD CONSTRAINT party_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT party_currentname_id_fkey FOREIGN KEY (currentname_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
@@ -5401,11 +5400,11 @@
 
 
 --
--- Name: placepath_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: placepath_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY placepath
-    ADD CONSTRAINT placepath_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT placepath_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
@@ -5457,11 +5456,11 @@
 
 
 --
--- Name: plantobservation_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: plantobservation_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY plantobservation
-    ADD CONSTRAINT plantobservation_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT plantobservation_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
@@ -5529,11 +5528,11 @@
 
 
 --
--- Name: project_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: project_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY project
-    ADD CONSTRAINT project_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT project_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
@@ -5617,11 +5616,11 @@
 
 
 --
--- Name: specimenreplicate_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: specimenreplicate_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY specimenreplicate
-    ADD CONSTRAINT specimenreplicate_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT specimenreplicate_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
@@ -5649,11 +5648,11 @@
 
 
 --
--- Name: stemobservation_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: stemobservation_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY stemobservation
-    ADD CONSTRAINT stemobservation_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT stemobservation_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
@@ -5753,14 +5752,6 @@
 
 
 --
--- Name: taxonconcept_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY taxonconcept
-    ADD CONSTRAINT taxonconcept_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-
---
 -- Name: taxonconcept_taxon_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -5801,11 +5792,11 @@
 
 
 --
--- Name: taxonoccurrence_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: taxonoccurrence_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE ONLY taxonoccurrence
-    ADD CONSTRAINT taxonoccurrence_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT taxonoccurrence_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
Index: inputs/VegBank/taxonobservation_/test.xml.ref
===================================================================
--- inputs/VegBank/taxonobservation_/test.xml.ref	(revision 5241)
+++ inputs/VegBank/taxonobservation_/test.xml.ref	(revision 5242)
@@ -20,12 +20,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>
                                                 <_join_words>
                                                     <1>$Family</1>
@@ -68,12 +68,12 @@
                                 <taxonconcept>
                                     <canon_taxonconcept_id>
                                         <taxonconcept>
-                                            <datasource_id>
+                                            <creator_id>
                                                 <party>
-                                                    <datasource_id>0</datasource_id>
+                                                    <creator_id>0</creator_id>
                                                     <organizationname>TNRS</organizationname>
                                                 </party>
-                                            </datasource_id>
+                                            </creator_id>
                                             <identifyingtaxonomicname>$authorplantname</identifyingtaxonomicname>
                                         </taxonconcept>
                                     </canon_taxonconcept_id>
Index: schemas/vegbien.my.sql
===================================================================
--- schemas/vegbien.my.sql	(revision 5241)
+++ schemas/vegbien.my.sql	(revision 5242)
@@ -117,7 +117,7 @@
 
 
 --
--- Name: party_datasource_id_self_ref(); Type: FUNCTION; Schema: public; Owner: -
+-- Name: party_creator_id_self_ref(); Type: FUNCTION; Schema: public; Owner: -
 --
 
 
@@ -209,7 +209,7 @@
 
 CREATE TABLE aggregateoccurrence (
     aggregateoccurrence_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
+    creator_id int(11) NOT NULL,
     sourceaccessioncode text,
     taxonoccurrence_id int(11) NOT NULL,
     collectiondate timestamp NULL,
@@ -269,7 +269,7 @@
 
 CREATE TABLE location (
     location_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
+    creator_id int(11) NOT NULL,
     sourceaccessioncode text,
     parent_id int(11),
     authorlocationcode text,
@@ -363,7 +363,7 @@
 
 CREATE TABLE locationevent (
     locationevent_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
+    creator_id int(11) NOT NULL,
     sourceaccessioncode text,
     parent_id int(11),
     location_id int(11),
@@ -639,7 +639,7 @@
 
 CREATE TABLE party (
     party_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
+    creator_id int(11) NOT NULL,
     salutation text,
     givenname text,
     middlename text,
@@ -656,7 +656,7 @@
 
 
 --
--- Name: COLUMN party.datasource_id; Type: COMMENT; Schema: public; Owner: -
+-- Name: COLUMN party.creator_id; Type: COMMENT; Schema: public; Owner: -
 --
 
 
@@ -668,7 +668,7 @@
 
 CREATE TABLE placepath (
     placepath_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
+    creator_id int(11) NOT NULL,
     placecode text,
     canon_placepath_id int(11),
     place_id int(11),
@@ -709,7 +709,7 @@
 
 CREATE TABLE plantobservation (
     plantobservation_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
+    creator_id int(11) NOT NULL,
     sourceaccessioncode text,
     aggregateoccurrence_id int(11) NOT NULL,
     overallheight_m double precision,
@@ -741,7 +741,7 @@
 
 CREATE TABLE specimenreplicate (
     specimenreplicate_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
+    creator_id int(11) NOT NULL,
     sourceaccessioncode text,
     plantobservation_id int(11),
     institution_id int(11),
@@ -780,8 +780,7 @@
 
 CREATE TABLE taxonconcept (
     taxonconcept_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
-    creator_id int(11),
+    creator_id int(11) NOT NULL,
     identifyingtaxonomicname text,
     canon_taxonconcept_id int(11),
     taxon_id int(11),
@@ -999,7 +998,7 @@
 
 CREATE TABLE taxonoccurrence (
     taxonoccurrence_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
+    creator_id int(11) NOT NULL,
     sourceaccessioncode text,
     locationevent_id int(11),
     authortaxoncode text,
@@ -1045,7 +1044,7 @@
 --
 
 CREATE VIEW analytical_db_view AS
-    SELECT datasource.organizationname AS `dataSourceName`, taxonconcept.family, taxonconcept.genus, taxonconcept.species, COALESCE(taxonconcept.taxonomicnamewithauthor, taxonconcept.taxonomicname) AS taxon, taxonconcept.author AS `taxonAuthor`, taxonconcept.variety AS `taxonMorphospecies`, placepath.country, placepath.stateprovince AS `stateProvince`, placepath.county AS `countyParish`, taxonoccurrence.verbatimcollectorname AS collector, plantobservation.collectionnumber AS `collectionNumber`, array_to_string(ARRAY[identifiedby.givenname, identifiedby.middlename, identifiedby.surname], CAST(' ' AS text)) AS `identifiedBy`, aggregateoccurrence.collectiondate AS `observationDate`, location.authorlocationcode AS `plotCode`, functions._m2_to_ha(location.area_m2) AS `plotAreaHa`, method.name AS `plotMethod`, locationcoords.latitude_deg AS latitude, locationcoords.longitude_deg AS longitude, location.elevation_m, taxonoccurrence.iscultivated AS `isCultivated`, taxonoccurrence.cultivatedbasis AS `isCultivatedReason`, functions._fraction_to_percent(aggregateoccurrence.cover_fraction) AS `pctCover` FROM (((((((((((((location JOIN party datasource ON (((datasource.party_id = location.datasource_id) AND (datasource.organizationname IS NOT NULL)))) LEFT JOIN locationcoords USING (location_id)) LEFT JOIN locationplace USING (location_id)) LEFT JOIN placepath USING (placepath_id)) JOIN locationevent USING (location_id)) LEFT JOIN method USING (method_id)) JOIN taxonoccurrence USING (locationevent_id)) JOIN taxondetermination USING (taxonoccurrence_id)) LEFT JOIN party identifiedby ON ((identifiedby.party_id = taxondetermination.party_id))) JOIN taxonconcept USING (taxonconcept_id)) LEFT JOIN aggregateoccurrence USING (taxonoccurrence_id)) LEFT JOIN plantobservation USING (aggregateoccurrence_id)) LEFT JOIN specimenreplicate USING (plantobservation_id));
+    SELECT datasource.organizationname AS `dataSourceName`, taxonconcept.family, taxonconcept.genus, taxonconcept.species, COALESCE(taxonconcept.taxonomicnamewithauthor, taxonconcept.taxonomicname) AS taxon, taxonconcept.author AS `taxonAuthor`, taxonconcept.variety AS `taxonMorphospecies`, placepath.country, placepath.stateprovince AS `stateProvince`, placepath.county AS `countyParish`, taxonoccurrence.verbatimcollectorname AS collector, plantobservation.collectionnumber AS `collectionNumber`, array_to_string(ARRAY[identifiedby.givenname, identifiedby.middlename, identifiedby.surname], CAST(' ' AS text)) AS `identifiedBy`, aggregateoccurrence.collectiondate AS `observationDate`, location.authorlocationcode AS `plotCode`, functions._m2_to_ha(location.area_m2) AS `plotAreaHa`, method.name AS `plotMethod`, locationcoords.latitude_deg AS latitude, locationcoords.longitude_deg AS longitude, location.elevation_m, taxonoccurrence.iscultivated AS `isCultivated`, taxonoccurrence.cultivatedbasis AS `isCultivatedReason`, functions._fraction_to_percent(aggregateoccurrence.cover_fraction) AS `pctCover` FROM (((((((((((((location JOIN party datasource ON (((datasource.party_id = location.creator_id) AND (datasource.organizationname IS NOT NULL)))) LEFT JOIN locationcoords USING (location_id)) LEFT JOIN locationplace USING (location_id)) LEFT JOIN placepath USING (placepath_id)) JOIN locationevent USING (location_id)) LEFT JOIN method USING (method_id)) JOIN taxonoccurrence USING (locationevent_id)) JOIN taxondetermination USING (taxonoccurrence_id)) LEFT JOIN party identifiedby ON ((identifiedby.party_id = taxondetermination.party_id))) JOIN taxonconcept USING (taxonconcept_id)) LEFT JOIN aggregateoccurrence USING (taxonoccurrence_id)) LEFT JOIN plantobservation USING (aggregateoccurrence_id)) LEFT JOIN specimenreplicate USING (plantobservation_id));
 
 
 --
@@ -1988,7 +1987,7 @@
 
 CREATE TABLE project (
     project_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
+    creator_id int(11) NOT NULL,
     sourceaccessioncode text,
     projectname text,
     projectdescription text,
@@ -2359,7 +2358,7 @@
 
 CREATE TABLE stemobservation (
     stemobservation_id int(11) NOT NULL,
-    datasource_id int(11) NOT NULL,
+    creator_id int(11) NOT NULL,
     sourceaccessioncode text,
     plantobservation_id int(11) NOT NULL,
     authorstemcode text,
@@ -3503,7 +3502,7 @@
 --
 
 ALTER TABLE project
-    ADD CONSTRAINT project_unique UNIQUE (datasource_id, projectname);
+    ADD CONSTRAINT project_unique UNIQUE (creator_id, projectname);
 
 
 --
@@ -3729,7 +3728,7 @@
 
 
 --
--- Name: aggregateoccurrence_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: aggregateoccurrence_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -3785,7 +3784,7 @@
 
 
 --
--- Name: location_unique_within_datasource_by_authorlocationcode; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: location_unique_within_creator_by_authorlocationcode; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -3792,7 +3791,7 @@
 
 
 --
--- Name: location_unique_within_datasource_by_sourceaccessioncode; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: location_unique_within_creator_by_sourceaccessioncode; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -3827,7 +3826,7 @@
 
 
 --
--- Name: locationevent_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: locationevent_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -3911,7 +3910,7 @@
 
 
 --
--- Name: party_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: party_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -3932,7 +3931,7 @@
 
 
 --
--- Name: placepath_unique_within_datasource_by_code; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: placepath_unique_within_creator_by_code; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -3939,7 +3938,7 @@
 
 
 --
--- Name: placepath_unique_within_datasource_by_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: placepath_unique_within_creator_by_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -3953,7 +3952,7 @@
 
 
 --
--- Name: plantobservation_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: plantobservation_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -3981,7 +3980,7 @@
 
 
 --
--- Name: project_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: project_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -4037,7 +4036,7 @@
 
 
 --
--- Name: specimenreplicate_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: specimenreplicate_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -4051,7 +4050,7 @@
 
 
 --
--- Name: stemobservation_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: stemobservation_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -4079,7 +4078,7 @@
 
 
 --
--- Name: taxonconcept_unique_within_datasource_by_identifying_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: taxonconcept_unique_within_creator_by_identifying_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -4086,7 +4085,7 @@
 
 
 --
--- Name: taxonconcept_unique_within_datasource_by_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: taxonconcept_unique_within_creator_by_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -4121,7 +4120,7 @@
 
 
 --
--- Name: taxonoccurrence_unique_within_datasource; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: taxonoccurrence_unique_within_creator; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
 
@@ -4142,7 +4141,7 @@
 
 
 --
--- Name: party_datasource_id_self_ref; Type: TRIGGER; Schema: public; Owner: -
+-- Name: party_creator_id_self_ref; Type: TRIGGER; Schema: public; Owner: -
 --
 
 
@@ -4207,7 +4206,7 @@
 
 
 --
--- Name: aggregateoccurrence_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: aggregateoccurrence_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 
@@ -4443,7 +4442,7 @@
 
 
 --
--- Name: location_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: location_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 
@@ -4473,7 +4472,7 @@
 
 
 --
--- Name: locationevent_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: locationevent_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 
@@ -4650,19 +4649,19 @@
 
 
 --
--- Name: party_currentname_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: party_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE party
-    ADD CONSTRAINT party_currentname_id_fkey FOREIGN KEY (currentname_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT party_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
--- Name: party_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: party_currentname_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 ALTER TABLE party
-    ADD CONSTRAINT party_datasource_id_fkey FOREIGN KEY (datasource_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT party_currentname_id_fkey FOREIGN KEY (currentname_id) REFERENCES party(party_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
 --
@@ -4730,7 +4729,7 @@
 
 
 --
--- Name: placepath_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: placepath_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 
@@ -4784,7 +4783,7 @@
 
 
 --
--- Name: plantobservation_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: plantobservation_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 
@@ -4850,7 +4849,7 @@
 
 
 --
--- Name: project_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: project_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 
@@ -4936,7 +4935,7 @@
 
 
 --
--- Name: specimenreplicate_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: specimenreplicate_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 
@@ -4966,7 +4965,7 @@
 
 
 --
--- Name: stemobservation_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: stemobservation_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 
@@ -5065,13 +5064,6 @@
 
 
 --
--- Name: taxonconcept_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-
-
-
---
 -- Name: taxonconcept_taxon_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -5110,7 +5102,7 @@
 
 
 --
--- Name: taxonoccurrence_datasource_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+-- Name: taxonoccurrence_creator_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 
 
Index: mappings/VegCore-VegBIEN.csv
===================================================================
--- mappings/VegCore-VegBIEN.csv	(revision 5241)
+++ mappings/VegCore-VegBIEN.csv	(revision 5242)
@@ -147,20 +147,20 @@
 class,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=class]/taxonname",
 phylum,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=phylum]/taxonname",
 kingdom,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/then/taxon_id/_forEach:[in:[cultivar,forma,variety,infraspecies,subspecies,species,genus,family,order,class,phylum,],do=""taxon[rank=_val]/parent_id""]/taxon[rank=kingdom]/taxonname",
-scientificNameWithAuthorship,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/1",
-scientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
-family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
-genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
-specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
-morphospecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/2",
-subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
-infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-taxonRank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
-infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
-variety,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/6/_join_words:[1=""var. ""]/2",
-forma,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/7/_join_words:[1=""fm. ""]/2",
-cultivar,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/8/_join_words:[1=""cult. ""]/2",
-scientificNameAuthorship,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
+scientificNameWithAuthorship,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/1",
+scientificName,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1",
+family,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1",
+genus,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2",
+specificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/1",
+morphospecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3/_join_words/2",
+subspecies,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4",
+infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+taxonRank,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
+infraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2",
+variety,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/6/_join_words:[1=""var. ""]/2",
+forma,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/7/_join_words:[1=""fm. ""]/2",
+cultivar,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/8/_join_words:[1=""cult. ""]/2",
+scientificNameAuthorship,"/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_if[@name=""if has accepted name""]/{then/.,else/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]}/identifyingtaxonomicname/_alt/2/_join_words/2",
 acceptedScientificNameAuthorship,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_set_canon_taxonconcept/canon_taxonconcept_id/taxonconcept/author,
 acceptedClass,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_set_canon_taxonconcept/canon_taxonconcept_id/taxonconcept/class,
 acceptedCultivar,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_set_canon_taxonconcept/canon_taxonconcept_id/taxonconcept/cultivar,
@@ -192,9 +192,9 @@
 acceptedVariety,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/_set_canon_taxonconcept/canon_taxonconcept_id/taxonconcept/variety,
 scientificNameAuthorship,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/author,
 class,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/class,
-identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/givenname/_namePart/first,
-identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/middlename/_namePart/middle,
-identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=datasource_id]/path/party/surname/_namePart/last,
+identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/givenname/_namePart/first,
+identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/middlename/_namePart/middle,
+identifiedBy,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/creator_id/_simplifyPath:[next=creator_id]/path/party/surname/_namePart/last,
 cultivar,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/cultivar,
 family,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/family,
 forma,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/*_id/taxonconcept/forma,
@@ -218,19 +218,19 @@
 taxonRemarks,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/notes,
 identificationQualifier,/location/locationevent/taxonoccurrence/taxondetermination[!isoriginal]/taxonfit,
 originalScientificNameAuthorship,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/author,
-originalScientificNameWithAuthorship,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/1,
-originalScientificName,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1,
-originalFamily,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1,
-originalGenus,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2,
-originalSpecificEpithet,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3,
-originalSubspecies,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4,
-originalInfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
-originalTaxonRank,"/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
-originalInfraspecificEpithet,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2,
-originalVariety,"/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/6/_join_words:[1=""var. ""]/2",
-originalForma,"/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/7/_join_words:[1=""fm. ""]/2",
-originalCultivar,"/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/8/_join_words:[1=""cult. ""]/2",
-originalScientificNameAuthorship,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[datasource_id/party:[datasource_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/2,
+originalScientificNameWithAuthorship,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/1,
+originalScientificName,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/1,
+originalFamily,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/1,
+originalGenus,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/2,
+originalSpecificEpithet,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/3,
+originalSubspecies,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/4,
+originalInfraspecificEpithet,"/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/cond",
+originalTaxonRank,"/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/1/_if[@name=""if has infraspecificEpithet""]/then",
+originalInfraspecificEpithet,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/5/_join_words/2,
+originalVariety,"/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/6/_join_words:[1=""var. ""]/2",
+originalForma,"/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/7/_join_words:[1=""fm. ""]/2",
+originalCultivar,"/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/1/_alt/2/_join_words/8/_join_words:[1=""cult. ""]/2",
+originalScientificNameAuthorship,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/canon_taxonconcept_id/taxonconcept:[creator_id/party:[creator_id=0]/organizationname=TNRS]/identifyingtaxonomicname/_alt/2/_join_words/2,
 originalClass,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/class,
 originalCultivar,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/cultivar,
 originalFamily,/location/locationevent/taxonoccurrence/taxondetermination[isoriginal=true]/*_id/taxonconcept/family,
Index: schemas/vegbien.ERD.mwb
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
