commit c7e7cd1ede21ae26edaa5a7726f54c8662376bcd
Author: Andreas Müller <a.mueller@bgbm.org>
Date:   Sat May 12 15:04:09 2018 +0200

    Adapt vaadin to model version 5.0

diff --git a/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest-deleteTest.xml b/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest-deleteTest.xml
index d0419064..ae3e0794 100644
--- a/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest-deleteTest.xml
+++ b/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest-deleteTest.xml
@@ -2,7 +2,7 @@
 <dataset>
   <TAXONNAME ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="47d9263e-b32a-42af-98ea-5528f154384f" UPDATED="[null]" NAMETYPE="ICNAFP" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Planothidium victori" APPENDEDPHRASE="[null]" FULLTITLECACHE="Planothidium victori in - undefined journal -: 11-45" NOMENCLATURALMICROREFERENCE="11-45" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="Planothidium" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Planothidium victori" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="victori" TRINOMHYBRID="false" NAMEAPPROBATION="[null]" SUBGENUSAUTHORSHIP="[null]" ANAMORPHIC="false" CULTIVARNAME="[null]" ACRONYM="[null]" BREED="[null]" ORIGINALPUBLICATIONYEAR="[null]" PUBLICATIONYEAR="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" HOMOTYPICALGROUP_ID="5000" NOMENCLATURALREFERENCE_ID="5000" RANK_ID="765" BASIONYMAUTHORSHIP_ID="[null]" COMBINATIONAUTHORSHIP_ID="[null]" EXBASIONYMAUTHORSHIP_ID="[null]" EXCOMBINATIONAUTHORSHIP_ID="[null]"/>
   <REFERENCE ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="45804c65-7df9-42fd-b43a-818a8958c264" UPDATED="2017-11-23 15:32:58.33" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Novis, Braidwood &amp; Kilroy, P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64 in - undefined journal -" DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" EDITION="[null]" EDITOR="[null]" ISBN="[null]" ISSN="[null]" DOI="[null]" NOMENCLATURALLYRELEVANT="false" ORGANIZATION="[null]" PAGES="[null]" PARSINGPROBLEM="0" PLACEPUBLISHED="[null]" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PUBLISHER="[null]" REFERENCEABSTRACT="[null]" SERIESPART="[null]" TITLE="P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64" ABBREVTITLE="[null]" ABBREVTITLECACHE="Novis, Braidwood &amp; Kilroy, P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64 in - undefined journal -" PROTECTEDABBREVTITLECACHE="false" REFTYPE="ART" URI="[null]" VOLUME="[null]" ACCESSED="[null]" LASTRETRIEVED="[null]" EXTERNALID="[null]" EXTERNALLINK="[null]" AUTHORITYTYPE="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" AUTHORSHIP_ID="5000" INREFERENCE_ID="[null]" INSTITUTION_ID="[null]" SCHOOL_ID="[null]"/>
-  <AGENTBASE DTYPE="Team" ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="05555fcb-72bf-49d0-9677-4de87f13e9ed" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" COLLECTORTITLE="[null]" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="Novis, Braidwood &amp; Kilroy" CODE="[null]" NAME="[null]" FIRSTNAME="[null]" INITIALS="[null]" LASTNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" HASMOREMEMBERS="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ISPARTOF_ID="[null]"/>
+  <AGENTBASE DTYPE="Team" ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="05555fcb-72bf-49d0-9677-4de87f13e9ed" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" COLLECTORTITLE="[null]" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="Novis, Braidwood &amp; Kilroy" CODE="[null]" NAME="[null]" GIVENNAME="[null]" INITIALS="[null]" FAMILYNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" HASMOREMEMBERS="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ISPARTOF_ID="[null]"/>
   <HOMOTYPICALGROUP ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="042ac145-cf9f-47c2-b4a1-8a4350e234eb" UPDATED="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>
   <REGISTRATION ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="c8bb4e70-ca85-43c3-ae81-c90a2b41a93f" UPDATED="[null]" IDENTIFIER="[null]" REGISTRATIONDATE="[null]" SPECIFICIDENTIFIER="[null]" STATUS="PREP" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" INSTITUTION_ID="[null]" NAME_ID="5000" SUBMITTER_ID="[null]"/>
   <DERIVATIONEVENT ID="5000" CREATED="2017-11-24 16:26:03.0" UUID="42610c79-b50f-4d86-94e6-9f775266f6e5" UPDATED="[null]" DESCRIPTION="[null]" TIMEPERIOD_END="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_START="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ACTOR_ID="[null]" INSTITUTION_ID="[null]" TYPE_ID="1998"/>
@@ -20,7 +20,7 @@
   <TAXONNAME_TYPEDESIGNATIONBASE TAXONNAME_ID="5000" TYPEDESIGNATIONS_ID="5001"/>
   <SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT ORIGINALS_ID="5001" DERIVATIONEVENTS_ID="5000"/>
   <SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT ORIGINALS_ID="5001" DERIVATIONEVENTS_ID="5001"/>
-  <MEDIA DTYPE="Media" ID="5000" CREATED="2017-11-24 16:26:04.0" UUID="10130fe6-a176-4a6b-8606-6546976400d4" UPDATED="2017-11-24 16:26:04.307" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="image1" MEDIACREATED="[null]" CITATIONMICROREFERENCE="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ARTIST_ID="[null]" CITATION_ID="[null]"/>
+  <MEDIA DTYPE="Media" ID="5000" CREATED="2017-11-24 16:26:04.0" UUID="10130fe6-a176-4a6b-8606-6546976400d4" UPDATED="2017-11-24 16:26:04.307" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="image1" MEDIACREATED_START="[null]" MEDIACREATED_END="[null]" MEDIACREATED_FREETEXT="[null]" CITATIONMICROREFERENCE="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ARTIST_ID="[null]" CITATION_ID="[null]"/>
   <MEDIAREPRESENTATION ID="5000" CREATED="2017-11-24 16:26:04.0" UUID="7cb1eb82-3792-4206-886a-f9848d18a2c7" UPDATED="[null]" MIMETYPE="[null]" SUFFIX="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" MEDIA_ID="5000"/>
   <MEDIAREPRESENTATIONPART DTYPE="MediaRepresentationPart" ID="5000" CREATED="2017-11-24 16:26:04.0" UUID="5b7ba042-7e17-4918-abdd-990ee1f56fc0" UPDATED="[null]" SIZE="[null]" URI="http://foo.bar.com/image1" DURATION="[null]" HEIGHT="[null]" WIDTH="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" REPRESENTATION_ID="5000" SORTINDEX="0"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="AgentBase" NEXT_VAL="5001"/>
diff --git a/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.deleteTypeDesignationTest-result.xml b/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.deleteTypeDesignationTest-result.xml
index 1dad0f6f..e7234e81 100644
--- a/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.deleteTypeDesignationTest-result.xml
+++ b/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.deleteTypeDesignationTest-result.xml
@@ -2,7 +2,7 @@
 <dataset>
   <TAXONNAME ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="47d9263e-b32a-42af-98ea-5528f154384f" NAMETYPE="ICNAFP" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Planothidium victori" APPENDEDPHRASE="[null]" FULLTITLECACHE="Planothidium victori in - undefined journal -: 11-45" NOMENCLATURALMICROREFERENCE="11-45" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="Planothidium" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Planothidium victori" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="victori" TRINOMHYBRID="false" NAMEAPPROBATION="[null]" SUBGENUSAUTHORSHIP="[null]" ANAMORPHIC="false" CULTIVARNAME="[null]" ACRONYM="[null]" BREED="[null]" ORIGINALPUBLICATIONYEAR="[null]" PUBLICATIONYEAR="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" HOMOTYPICALGROUP_ID="5000" NOMENCLATURALREFERENCE_ID="5000" RANK_ID="765" BASIONYMAUTHORSHIP_ID="[null]" COMBINATIONAUTHORSHIP_ID="[null]" EXBASIONYMAUTHORSHIP_ID="[null]" EXCOMBINATIONAUTHORSHIP_ID="[null]"/>
   <REFERENCE ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="45804c65-7df9-42fd-b43a-818a8958c264" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Novis, Braidwood &amp; Kilroy, P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64 in - undefined journal -" DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" EDITION="[null]" EDITOR="[null]" ISBN="[null]" ISSN="[null]" DOI="[null]" NOMENCLATURALLYRELEVANT="false" ORGANIZATION="[null]" PAGES="[null]" PARSINGPROBLEM="0" PLACEPUBLISHED="[null]" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PUBLISHER="[null]" REFERENCEABSTRACT="[null]" SERIESPART="[null]" TITLE="P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64" ABBREVTITLE="[null]" ABBREVTITLECACHE="Novis, Braidwood &amp; Kilroy, P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64 in - undefined journal -" PROTECTEDABBREVTITLECACHE="false" REFTYPE="ART" URI="[null]" VOLUME="[null]" ACCESSED="[null]" LASTRETRIEVED="[null]" EXTERNALID="[null]" EXTERNALLINK="[null]" AUTHORITYTYPE="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" AUTHORSHIP_ID="5000" INREFERENCE_ID="[null]" INSTITUTION_ID="[null]" SCHOOL_ID="[null]"/>
-  <AGENTBASE DTYPE="Team" ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="05555fcb-72bf-49d0-9677-4de87f13e9ed" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" COLLECTORTITLE="[null]" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="Novis, Braidwood &amp; Kilroy" CODE="[null]" NAME="[null]" FIRSTNAME="[null]" INITIALS="[null]" LASTNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" HASMOREMEMBERS="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ISPARTOF_ID="[null]"/>
+  <AGENTBASE DTYPE="Team" ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="05555fcb-72bf-49d0-9677-4de87f13e9ed" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" COLLECTORTITLE="[null]" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="Novis, Braidwood &amp; Kilroy" CODE="[null]" NAME="[null]" GIVENNAME="[null]" INITIALS="[null]" FAMILYNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" HASMOREMEMBERS="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ISPARTOF_ID="[null]"/>
   <HOMOTYPICALGROUP ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="042ac145-cf9f-47c2-b4a1-8a4350e234eb" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>
   <REGISTRATION ID="5000" CREATED="2017-11-23 15:32:58.0" UUID="c8bb4e70-ca85-43c3-ae81-c90a2b41a93f" IDENTIFIER="[null]" REGISTRATIONDATE="[null]" SPECIFICIDENTIFIER="[null]" STATUS="PREP" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" INSTITUTION_ID="[null]" NAME_ID="5000" SUBMITTER_ID="[null]"/>
   <DERIVATIONEVENT ID="5001" CREATED="2017-11-24 16:26:04.0" UUID="50537c4e-e8cf-45e7-9e9d-e73197d17be8" DESCRIPTION="[null]" TIMEPERIOD_END="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_START="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ACTOR_ID="[null]" INSTITUTION_ID="[null]" TYPE_ID="1998"/>
diff --git a/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.xml b/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.xml
index fd08f9d4..c10df1aa 100644
--- a/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.xml
+++ b/src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.xml
@@ -2,7 +2,7 @@
 <dataset>
   <TAXONNAME ID="5000" CREATED="2017-11-24 22:17:26.0" UUID="47d9263e-b32a-42af-98ea-5528f154384f" UPDATED="2017-11-24 22:17:27.447" NAMETYPE="ICNAFP" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Planothidium victori" APPENDEDPHRASE="[null]" FULLTITLECACHE="Planothidium victori in - undefined journal -: 11-45" NOMENCLATURALMICROREFERENCE="11-45" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="Planothidium" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Planothidium victori" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="victori" TRINOMHYBRID="false" NAMEAPPROBATION="[null]" SUBGENUSAUTHORSHIP="[null]" ANAMORPHIC="false" CULTIVARNAME="[null]" ACRONYM="[null]" BREED="[null]" ORIGINALPUBLICATIONYEAR="[null]" PUBLICATIONYEAR="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" HOMOTYPICALGROUP_ID="5000" NOMENCLATURALREFERENCE_ID="5000" RANK_ID="765" BASIONYMAUTHORSHIP_ID="[null]" COMBINATIONAUTHORSHIP_ID="[null]" EXBASIONYMAUTHORSHIP_ID="[null]" EXCOMBINATIONAUTHORSHIP_ID="[null]"/>
   <REFERENCE ID="5000" CREATED="2017-11-24 22:17:26.0" UUID="45804c65-7df9-42fd-b43a-818a8958c264" UPDATED="2017-11-24 22:17:27.448" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Novis, Braidwood &amp; Kilroy, P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64 in - undefined journal -" DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" EDITION="[null]" EDITOR="[null]" ISBN="[null]" ISSN="[null]" DOI="[null]" NOMENCLATURALLYRELEVANT="false" ORGANIZATION="[null]" PAGES="[null]" PARSINGPROBLEM="0" PLACEPUBLISHED="[null]" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PUBLISHER="[null]" REFERENCEABSTRACT="[null]" SERIESPART="[null]" TITLE="P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64" ABBREVTITLE="[null]" ABBREVTITLECACHE="Novis, Braidwood &amp; Kilroy, P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64 in - undefined journal -" PROTECTEDABBREVTITLECACHE="false" REFTYPE="ART" URI="[null]" VOLUME="[null]" ACCESSED="[null]" LASTRETRIEVED="[null]" EXTERNALID="[null]" EXTERNALLINK="[null]" AUTHORITYTYPE="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" AUTHORSHIP_ID="5000" INREFERENCE_ID="[null]" INSTITUTION_ID="[null]" SCHOOL_ID="[null]"/>
-  <AGENTBASE DTYPE="Team" ID="5000" CREATED="2017-11-24 22:17:26.0" UUID="5e7b791e-d17f-4378-9a47-923ebebc9b6a" UPDATED="2017-11-24 22:17:27.449" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" COLLECTORTITLE="[null]" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="Novis, Braidwood &amp; Kilroy" CODE="[null]" NAME="[null]" FIRSTNAME="[null]" INITIALS="[null]" LASTNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" HASMOREMEMBERS="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ISPARTOF_ID="[null]"/>
+  <AGENTBASE DTYPE="Team" ID="5000" CREATED="2017-11-24 22:17:26.0" UUID="5e7b791e-d17f-4378-9a47-923ebebc9b6a" UPDATED="2017-11-24 22:17:27.449" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" COLLECTORTITLE="[null]" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="Novis, Braidwood &amp; Kilroy" CODE="[null]" NAME="[null]" GIVENNAME="[null]" INITIALS="[null]" FAMILYNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" HASMOREMEMBERS="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ISPARTOF_ID="[null]"/>
   <HOMOTYPICALGROUP ID="5000" CREATED="2017-11-24 22:17:26.0" UUID="76cb5ec1-ac61-4c40-a0e2-1bb738f04575" UPDATED="2017-11-24 22:17:27.448" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>
   <REGISTRATION ID="5000" CREATED="2017-11-24 22:17:27.0" UUID="c8bb4e70-ca85-43c3-ae81-c90a2b41a93f" UPDATED="[null]" IDENTIFIER="[null]" REGISTRATIONDATE="[null]" SPECIFICIDENTIFIER="[null]" STATUS="PREP" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" INSTITUTION_ID="[null]" NAME_ID="5000" SUBMITTER_ID="[null]"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="AgentBase" NEXT_VAL="5001"/>
diff --git a/src/test/resources/eu/etaxonomy/cdm/vaadin/PUBLIC.xsd b/src/test/resources/eu/etaxonomy/cdm/vaadin/PUBLIC.xsd
index f9fd4ec6..bdb5259d 100644
--- a/src/test/resources/eu/etaxonomy/cdm/vaadin/PUBLIC.xsd
+++ b/src/test/resources/eu/etaxonomy/cdm/vaadin/PUBLIC.xsd
@@ -6,7 +6,7 @@
 	<xsd:element name="GATHERINGEVENT_ANNOTATION" type="GATHERINGEVENT_ANNOTATION__type" />
 	<xsd:element name="MEDIA_LANGUAGESTRING_AUD" type="MEDIA_LANGUAGESTRING_AUD__type" />
 	<xsd:element name="SPECIMENOROBSERVATIONBASE_RIGHTSINFO" type="SPECIMENOROBSERVATIONBASE_RIGHTSINFO__type" />
-	<xsd:element name="WORKINGSET_ANNOTATION" type="WORKINGSET_ANNOTATION__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_ANNOTATION" type="DESCRIPTIVEDATASET_ANNOTATION__type" />
 	<xsd:element name="TERMVOCABULARY_EXTENSION_AUD" type="TERMVOCABULARY_EXTENSION_AUD__type" />
 	<xsd:element name="DESCRIPTIONBASE_CREDIT_AUD" type="DESCRIPTIONBASE_CREDIT_AUD__type" />
 	<xsd:element name="AGENTBASE_ORIGINALSOURCEBASE_AUD" type="AGENTBASE_ORIGINALSOURCEBASE_AUD__type" />
@@ -84,7 +84,7 @@
 	<xsd:element name="RIGHTSINFO_MARKER" type="RIGHTSINFO_MARKER__type" />
 	<xsd:element name="CLASSIFICATION_MARKER_AUD" type="CLASSIFICATION_MARKER_AUD__type" />
 	<xsd:element name="FEATURENODE_DEFINEDTERMBASE_ONLYAPPLICABLE_AUD" type="FEATURENODE_DEFINEDTERMBASE_ONLYAPPLICABLE_AUD__type" />
-	<xsd:element name="WORKINGSET_DESCRIPTIONBASE_AUD" type="WORKINGSET_DESCRIPTIONBASE_AUD__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_DESCRIPTIONBASE_AUD" type="DESCRIPTIVEDATASET_DESCRIPTIONBASE_AUD__type" />
 	<xsd:element name="DEFINEDTERMBASE_STATISTICALMEASURE" type="DEFINEDTERMBASE_STATISTICALMEASURE__type" />
 	<xsd:element name="REFERENCE_RIGHTSINFO" type="REFERENCE_RIGHTSINFO__type" />
 	<xsd:element name="TERMVOCABULARY_ORIGINALSOURCEBASE_AUD" type="TERMVOCABULARY_ORIGINALSOURCEBASE_AUD__type" />
@@ -162,7 +162,7 @@
 	<xsd:element name="TERMVOCABULARY" type="TERMVOCABULARY__type" />
 	<xsd:element name="TAXONINTERACTION_LANGUAGESTRING_AUD" type="TAXONINTERACTION_LANGUAGESTRING_AUD__type" />
 	<xsd:element name="TAXONNAME" type="TAXONNAME__type" />
-	<xsd:element name="WORKINGSET_MARKER" type="WORKINGSET_MARKER__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_MARKER" type="DESCRIPTIVEDATASET_MARKER__type" />
 	<xsd:element name="SPECIMENOROBSERVATIONBASE_ANNOTATION" type="SPECIMENOROBSERVATIONBASE_ANNOTATION__type" />
 	<xsd:element name="SPECIMENOROBSERVATIONBASE_IDENTIFIER_AUD" type="SPECIMENOROBSERVATIONBASE_IDENTIFIER_AUD__type" />
 	<xsd:element name="HIBERNATE_SEQUENCES" type="HIBERNATE_SEQUENCES__type" />
@@ -212,12 +212,12 @@
 	<xsd:element name="DESCRIPTIONBASE_EXTENSION_AUD" type="DESCRIPTIONBASE_EXTENSION_AUD__type" />
 	<xsd:element name="AGENTBASE_IDENTIFIER_AUD" type="AGENTBASE_IDENTIFIER_AUD__type" />
 	<xsd:element name="TAXONNODEAGENTRELATION_ANNOTATION_AUD" type="TAXONNODEAGENTRELATION_ANNOTATION_AUD__type" />
-	<xsd:element name="WORKINGSET_MARKER_AUD" type="WORKINGSET_MARKER_AUD__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_MARKER_AUD" type="DESCRIPTIVEDATASET_MARKER_AUD__type" />
 	<xsd:element name="HOMOTYPICALGROUP_AUD" type="HOMOTYPICALGROUP_AUD__type" />
 	<xsd:element name="SEQUENCE_MARKER_AUD" type="SEQUENCE_MARKER_AUD__type" />
 	<xsd:element name="USERACCOUNT_AUD" type="USERACCOUNT_AUD__type" />
 	<xsd:element name="TAXONNAME_RIGHTSINFO" type="TAXONNAME_RIGHTSINFO__type" />
-	<xsd:element name="WORKINGSET_REPRESENTATION" type="WORKINGSET_REPRESENTATION__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_REPRESENTATION" type="DESCRIPTIVEDATASET_REPRESENTATION__type" />
 	<xsd:element name="ADDRESS" type="ADDRESS__type" />
 	<xsd:element name="ANNOTATION_AUD" type="ANNOTATION_AUD__type" />
 	<xsd:element name="TAXONRELATIONSHIP_ANNOTATION_AUD" type="TAXONRELATIONSHIP_ANNOTATION_AUD__type" />
@@ -229,7 +229,7 @@
 	<xsd:element name="SINGLEREAD_MARKER_AUD" type="SINGLEREAD_MARKER_AUD__type" />
 	<xsd:element name="MEDIA_REPRESENTATION_AUD" type="MEDIA_REPRESENTATION_AUD__type" />
 	<xsd:element name="AUDITEVENT" type="AUDITEVENT__type" />
-	<xsd:element name="WORKINGSET_AUD" type="WORKINGSET_AUD__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_AUD" type="DESCRIPTIVEDATASET_AUD__type" />
 	<xsd:element name="AMPLIFICATIONRESULT_ANNOTATION" type="AMPLIFICATIONRESULT_ANNOTATION__type" />
 	<xsd:element name="CLASSIFICATION_CREDIT_AUD" type="CLASSIFICATION_CREDIT_AUD__type" />
 	<xsd:element name="KEYSTATEMENT_AUD" type="KEYSTATEMENT_AUD__type" />
@@ -288,7 +288,7 @@
 	<xsd:element name="DESCRIPTIONBASE_SCOPE" type="DESCRIPTIONBASE_SCOPE__type" />
 	<xsd:element name="DNAQUALITY" type="DNAQUALITY__type" />
 	<xsd:element name="MEDIAKEY_TAXONSCOPE" type="MEDIAKEY_TAXONSCOPE__type" />
-	<xsd:element name="WORKINGSET_NAMEDAREA_AUD" type="WORKINGSET_NAMEDAREA_AUD__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_NAMEDAREA_AUD" type="DESCRIPTIVEDATASET_NAMEDAREA_AUD__type" />
 	<xsd:element name="DESCRIPTIONELEMENTBASE_ORIGINALSOURCEBASE" type="DESCRIPTIONELEMENTBASE_ORIGINALSOURCEBASE__type" />
 	<xsd:element name="STATEDATA_DEFINEDTERMBASE" type="STATEDATA_DEFINEDTERMBASE__type" />
 	<xsd:element name="TAXONNAME_AUD" type="TAXONNAME_AUD__type" />
@@ -301,7 +301,7 @@
 	<xsd:element name="DEFINEDTERMBASE_RIGHTSINFO_AUD" type="DEFINEDTERMBASE_RIGHTSINFO_AUD__type" />
 	<xsd:element name="TYPEDESIGNATIONBASE_AUD" type="TYPEDESIGNATIONBASE_AUD__type" />
 	<xsd:element name="DERIVATIONEVENT_MARKER" type="DERIVATIONEVENT_MARKER__type" />
-	<xsd:element name="WORKINGSET_REPRESENTATION_AUD" type="WORKINGSET_REPRESENTATION_AUD__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_REPRESENTATION_AUD" type="DESCRIPTIVEDATASET_REPRESENTATION_AUD__type" />
 	<xsd:element name="REFERENCE_AUD" type="REFERENCE_AUD__type" />
 	<xsd:element name="DEFINEDTERMBASE_CREDIT_AUD" type="DEFINEDTERMBASE_CREDIT_AUD__type" />
 	<xsd:element name="REFERENCE_MEDIA_AUD" type="REFERENCE_MEDIA_AUD__type" />
@@ -324,7 +324,7 @@
 	<xsd:element name="TAXONBASE_RIGHTSINFO_AUD" type="TAXONBASE_RIGHTSINFO_AUD__type" />
 	<xsd:element name="TAXONNAME_NOMENCLATURALSTATUS" type="TAXONNAME_NOMENCLATURALSTATUS__type" />
 	<xsd:element name="FEATURETREE_RIGHTSINFO_AUD" type="FEATURETREE_RIGHTSINFO_AUD__type" />
-	<xsd:element name="WORKINGSET_NAMEDAREA" type="WORKINGSET_NAMEDAREA__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_NAMEDAREA" type="DESCRIPTIVEDATASET_NAMEDAREA__type" />
 	<xsd:element name="DETERMINATIONEVENT_ANNOTATION_AUD" type="DETERMINATIONEVENT_ANNOTATION_AUD__type" />
 	<xsd:element name="FEATURETREE_CREDIT" type="FEATURETREE_CREDIT__type" />
 	<xsd:element name="DERIVATIONEVENT_ANNOTATION" type="DERIVATIONEVENT_ANNOTATION__type" />
@@ -369,11 +369,11 @@
 	<xsd:element name="DEFINEDTERMBASE_AUD" type="DEFINEDTERMBASE_AUD__type" />
 	<xsd:element name="LANGUAGESTRING_MARKER_AUD" type="LANGUAGESTRING_MARKER_AUD__type" />
 	<xsd:element name="DEFINEDTERMBASE_IDENTIFIER_AUD" type="DEFINEDTERMBASE_IDENTIFIER_AUD__type" />
-	<xsd:element name="WORKINGSET_DESCRIPTIONBASE" type="WORKINGSET_DESCRIPTIONBASE__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_DESCRIPTIONBASE" type="DESCRIPTIVEDATASET_DESCRIPTIONBASE__type" />
 	<xsd:element name="POLYTOMOUSKEYNODE" type="POLYTOMOUSKEYNODE__type" />
 	<xsd:element name="REPRESENTATION" type="REPRESENTATION__type" />
 	<xsd:element name="TAXONRELATIONSHIP_MARKER" type="TAXONRELATIONSHIP_MARKER__type" />
-	<xsd:element name="WORKINGSET_TAXONNODE" type="WORKINGSET_TAXONNODE__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_TAXONNODE" type="DESCRIPTIVEDATASET_TAXONNODE__type" />
 	<xsd:element name="ORIGINALSOURCEBASE_ANNOTATION" type="ORIGINALSOURCEBASE_ANNOTATION__type" />
 	<xsd:element name="CREDIT_ANNOTATION" type="CREDIT_ANNOTATION__type" />
 	<xsd:element name="DESCRIPTIONBASE_RIGHTSINFO" type="DESCRIPTIONBASE_RIGHTSINFO__type" />
@@ -437,7 +437,7 @@
 	<xsd:element name="PRIMER_ANNOTATION_AUD" type="PRIMER_ANNOTATION_AUD__type" />
 	<xsd:element name="AMPLIFICATIONRESULT_MARKER_AUD" type="AMPLIFICATIONRESULT_MARKER_AUD__type" />
 	<xsd:element name="AMPLIFICATION_ANNOTATION_AUD" type="AMPLIFICATION_ANNOTATION_AUD__type" />
-	<xsd:element name="WORKINGSET" type="WORKINGSET__type" />
+	<xsd:element name="DESCRIPTIVEDATASET" type="DESCRIPTIVEDATASET__type" />
 	<xsd:element name="ORIGINALSOURCEBASE_MARKER_AUD" type="ORIGINALSOURCEBASE_MARKER_AUD__type" />
 	<xsd:element name="INTEXTREFERENCE" type="INTEXTREFERENCE__type" />
 	<xsd:element name="COLLECTION_MEDIA_AUD" type="COLLECTION_MEDIA_AUD__type" />
@@ -457,7 +457,7 @@
 	<xsd:element name="REPRESENTATION_MARKER" type="REPRESENTATION_MARKER__type" />
 	<xsd:element name="DESCRIPTIONBASE_IDENTIFIER" type="DESCRIPTIONBASE_IDENTIFIER__type" />
 	<xsd:element name="CDM_VIEW_CDM_VIEW" type="CDM_VIEW_CDM_VIEW__type" />
-	<xsd:element name="WORKINGSET_ANNOTATION_AUD" type="WORKINGSET_ANNOTATION_AUD__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_ANNOTATION_AUD" type="DESCRIPTIVEDATASET_ANNOTATION_AUD__type" />
 	<xsd:element name="DESCRIPTIONELEMENTBASE_ANNOTATION_AUD" type="DESCRIPTIONELEMENTBASE_ANNOTATION_AUD__type" />
 	<xsd:element name="IDENTIFIER_ANNOTATION" type="IDENTIFIER_ANNOTATION__type" />
 	<xsd:element name="TAXONBASE_CREDIT_AUD" type="TAXONBASE_CREDIT_AUD__type" />
@@ -539,7 +539,7 @@
 	<xsd:element name="AMPLIFICATION" type="AMPLIFICATION__type" />
 	<xsd:element name="MEDIA_MARKER_AUD" type="MEDIA_MARKER_AUD__type" />
 	<xsd:element name="NAMERELATIONSHIP_MARKER_AUD" type="NAMERELATIONSHIP_MARKER_AUD__type" />
-	<xsd:element name="WORKINGSET_TAXONNODE_AUD" type="WORKINGSET_TAXONNODE_AUD__type" />
+	<xsd:element name="DESCRIPTIVEDATASET_TAXONNODE_AUD" type="DESCRIPTIVEDATASET_TAXONNODE_AUD__type" />
 	<xsd:element name="COLLECTION_CREDIT" type="COLLECTION_CREDIT__type" />
 	<xsd:element name="DESCRIPTIONBASE_REFERENCE" type="DESCRIPTIONBASE_REFERENCE__type" />
 	<xsd:element name="SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT" type="SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT__type" />
@@ -597,9 +597,9 @@
 		<xsd:attribute name="SPECIMENOROBSERVATIONBASE_ID" use="optional" />
 		<xsd:attribute name="RIGHTS_ID" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_ANNOTATION__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_ANNOTATION__type">
 		<xsd:attribute name="ANNOTATIONS_ID" use="optional" />
-		<xsd:attribute name="WORKINGSET_ID" use="optional" />
+		<xsd:attribute name="DESCRIPTIVEDATASET_ID" use="optional" />
 	</xsd:complexType>
 	<xsd:complexType name="TERMVOCABULARY_EXTENSION_AUD__type">
 		<xsd:attribute name="REV" use="optional" />
@@ -1164,9 +1164,9 @@
 		<xsd:attribute name="FEATURENODE_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_DESCRIPTIONBASE_AUD__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_DESCRIPTIONBASE_AUD__type">
 		<xsd:attribute name="REV" use="optional" />
-		<xsd:attribute name="WORKINGSETS_ID" use="optional" />
+		<xsd:attribute name="DESCRIPTIVEDATASETS_ID" use="optional" />
 		<xsd:attribute name="DESCRIPTIONS_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
@@ -1832,9 +1832,9 @@
 		<xsd:attribute name="NOMENCLATURALREFERENCE_ID" use="optional" />
 		<xsd:attribute name="LSID_LSID" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_MARKER__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_MARKER__type">
 		<xsd:attribute name="MARKERS_ID" use="optional" />
-		<xsd:attribute name="WORKINGSET_ID" use="optional" />
+		<xsd:attribute name="DESCRIPTIVEDATASET_ID" use="optional" />
 	</xsd:complexType>
 	<xsd:complexType name="SPECIMENOROBSERVATIONBASE_ANNOTATION__type">
 		<xsd:attribute name="ANNOTATIONS_ID" use="optional" />
@@ -2171,10 +2171,10 @@
 		<xsd:attribute name="TAXONNODEAGENTRELATION_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_MARKER_AUD__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_MARKER_AUD__type">
 		<xsd:attribute name="REV" use="optional" />
 		<xsd:attribute name="MARKERS_ID" use="optional" />
-		<xsd:attribute name="WORKINGSET_ID" use="optional" />
+		<xsd:attribute name="DESCRIPTIVEDATASET_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
 	<xsd:complexType name="HOMOTYPICALGROUP_AUD__type">
@@ -2212,9 +2212,9 @@
 		<xsd:attribute name="TAXONNAME_ID" use="optional" />
 		<xsd:attribute name="RIGHTS_ID" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_REPRESENTATION__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_REPRESENTATION__type">
 		<xsd:attribute name="REPRESENTATIONS_ID" use="optional" />
-		<xsd:attribute name="WORKINGSET_ID" use="optional" />
+		<xsd:attribute name="DESCRIPTIVEDATASET_ID" use="optional" />
 	</xsd:complexType>
 	<xsd:complexType name="ADDRESS__type">
 		<xsd:attribute name="POBOX" use="optional" />
@@ -2317,7 +2317,7 @@
 		<xsd:attribute name="TIMESTAMP" use="optional" />
 		<xsd:attribute name="UUID" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_AUD__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_AUD__type">
 		<xsd:attribute name="DESCRIPTIVESYSTEM_ID" use="optional" />
 		<xsd:attribute name="REV" use="optional" />
 		<xsd:attribute name="CREATED" use="optional" />
@@ -2671,7 +2671,7 @@
 		<xsd:attribute name="LSID_AUTHORITY" use="optional" />
 		<xsd:attribute name="REV" use="optional" />
 		<xsd:attribute name="UPDATED" use="optional" />
-		<xsd:attribute name="FIRSTNAME" use="optional" />
+		<xsd:attribute name="GIVENNAME" use="optional" />
 		<xsd:attribute name="CREATEDBY_ID" use="optional" />
 		<xsd:attribute name="TITLECACHE" use="optional" />
 		<xsd:attribute name="PROTECTEDTITLECACHE" use="optional" />
@@ -2679,7 +2679,7 @@
 		<xsd:attribute name="CREATED" use="optional" />
 		<xsd:attribute name="LIFESPAN_END" use="optional" />
 		<xsd:attribute name="UPDATEDBY_ID" use="optional" />
-		<xsd:attribute name="LASTNAME" use="optional" />
+		<xsd:attribute name="FAMILYNAME" use="optional" />
 		<xsd:attribute name="PROTECTEDNOMENCLATURALTITLECACHE" use="optional" />
 		<xsd:attribute name="LIFESPAN_FREETEXT" use="optional" />
 		<xsd:attribute name="DTYPE" use="optional" />
@@ -2817,10 +2817,10 @@
 		<xsd:attribute name="MEDIAKEY_ID" use="optional" />
 		<xsd:attribute name="TAXONOMICSCOPE_ID" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_NAMEDAREA_AUD__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_NAMEDAREA_AUD__type">
 		<xsd:attribute name="REV" use="optional" />
 		<xsd:attribute name="GEOFILTER_ID" use="optional" />
-		<xsd:attribute name="WORKINGSET_ID" use="optional" />
+		<xsd:attribute name="DESCRIPTIVEDATASET_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
 	<xsd:complexType name="DESCRIPTIONELEMENTBASE_ORIGINALSOURCEBASE__type">
@@ -2948,10 +2948,10 @@
 		<xsd:attribute name="MARKERS_ID" use="optional" />
 		<xsd:attribute name="DERIVATIONEVENT_ID" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_REPRESENTATION_AUD__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_REPRESENTATION_AUD__type">
 		<xsd:attribute name="REV" use="optional" />
 		<xsd:attribute name="REPRESENTATIONS_ID" use="optional" />
-		<xsd:attribute name="WORKINGSET_ID" use="optional" />
+		<xsd:attribute name="DESCRIPTIVEDATASET_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
 	<xsd:complexType name="REFERENCE_AUD__type">
@@ -3210,9 +3210,9 @@
 		<xsd:attribute name="RIGHTS_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_NAMEDAREA__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_NAMEDAREA__type">
 		<xsd:attribute name="GEOFILTER_ID" use="optional" />
-		<xsd:attribute name="WORKINGSET_ID" use="optional" />
+		<xsd:attribute name="DESCRIPTIVEDATASET_ID" use="optional" />
 	</xsd:complexType>
 	<xsd:complexType name="DETERMINATIONEVENT_ANNOTATION_AUD__type">
 		<xsd:attribute name="REV" use="optional" />
@@ -3614,8 +3614,8 @@
 		<xsd:attribute name="IDENTIFIERS_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_DESCRIPTIONBASE__type">
-		<xsd:attribute name="WORKINGSETS_ID" use="optional" />
+	<xsd:complexType name="DESCRIPTIVEDATASET_DESCRIPTIONBASE__type">
+		<xsd:attribute name="DESCRIPTIVEDATASETS_ID" use="optional" />
 		<xsd:attribute name="DESCRIPTIONS_ID" use="optional" />
 	</xsd:complexType>
 	<xsd:complexType name="POLYTOMOUSKEYNODE__type">
@@ -3652,8 +3652,8 @@
 		<xsd:attribute name="MARKERS_ID" use="optional" />
 		<xsd:attribute name="TAXONRELATIONSHIP_ID" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_TAXONNODE__type">
-		<xsd:attribute name="WORKINGSET_ID" use="optional" />
+	<xsd:complexType name="DESCRIPTIVEDATASET_TAXONNODE__type">
+		<xsd:attribute name="DESCRIPTIVEDATASET_ID" use="optional" />
 		<xsd:attribute name="TAXONSUBTREEFILTER_ID" use="optional" />
 	</xsd:complexType>
 	<xsd:complexType name="ORIGINALSOURCEBASE_ANNOTATION__type">
@@ -4099,7 +4099,7 @@
 		<xsd:attribute name="ANNOTATIONS_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET__type">
 		<xsd:attribute name="DESCRIPTIVESYSTEM_ID" use="optional" />
 		<xsd:attribute name="CREATED" use="optional" />
 		<xsd:attribute name="MINRANK_ID" use="optional" />
@@ -4258,10 +4258,10 @@
 		<xsd:attribute name="CDM_VIEW_ID" use="optional" />
 		<xsd:attribute name="SUPERVIEWS_ID" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_ANNOTATION_AUD__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_ANNOTATION_AUD__type">
 		<xsd:attribute name="REV" use="optional" />
 		<xsd:attribute name="ANNOTATIONS_ID" use="optional" />
-		<xsd:attribute name="WORKINGSET_ID" use="optional" />
+		<xsd:attribute name="DESCRIPTIVEDATASET_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
 	<xsd:complexType name="DESCRIPTIONELEMENTBASE_ANNOTATION_AUD__type">
@@ -4604,7 +4604,7 @@
 		<xsd:attribute name="INITIALS" use="optional" />
 		<xsd:attribute name="LSID_AUTHORITY" use="optional" />
 		<xsd:attribute name="UPDATED" use="optional" />
-		<xsd:attribute name="FIRSTNAME" use="optional" />
+		<xsd:attribute name="GIVENNAME" use="optional" />
 		<xsd:attribute name="CREATEDBY_ID" use="optional" />
 		<xsd:attribute name="TITLECACHE" use="optional" />
 		<xsd:attribute name="PROTECTEDTITLECACHE" use="optional" />
@@ -4612,7 +4612,7 @@
 		<xsd:attribute name="CREATED" use="optional" />
 		<xsd:attribute name="LIFESPAN_END" use="optional" />
 		<xsd:attribute name="UPDATEDBY_ID" use="optional" />
-		<xsd:attribute name="LASTNAME" use="optional" />
+		<xsd:attribute name="FAMILYNAME" use="optional" />
 		<xsd:attribute name="PROTECTEDNOMENCLATURALTITLECACHE" use="optional" />
 		<xsd:attribute name="LIFESPAN_FREETEXT" use="optional" />
 		<xsd:attribute name="DTYPE" use="optional" />
@@ -4948,9 +4948,9 @@
 		<xsd:attribute name="NAMERELATIONSHIP_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
-	<xsd:complexType name="WORKINGSET_TAXONNODE_AUD__type">
+	<xsd:complexType name="DESCRIPTIVEDATASET_TAXONNODE_AUD__type">
 		<xsd:attribute name="REV" use="optional" />
-		<xsd:attribute name="WORKINGSET_ID" use="optional" />
+		<xsd:attribute name="DESCRIPTIVEDATASET_ID" use="optional" />
 		<xsd:attribute name="TAXONSUBTREEFILTER_ID" use="optional" />
 		<xsd:attribute name="REVTYPE" use="optional" />
 	</xsd:complexType>
diff --git a/src/test/resources/eu/etaxonomy/cdm/vaadin/dataset.xsd b/src/test/resources/eu/etaxonomy/cdm/vaadin/dataset.xsd
index 2c25912f..5cc4b995 100644
--- a/src/test/resources/eu/etaxonomy/cdm/vaadin/dataset.xsd
+++ b/src/test/resources/eu/etaxonomy/cdm/vaadin/dataset.xsd
@@ -10,7 +10,7 @@
 				<xsd:element name="GATHERINGEVENT_ANNOTATION" type="dflt:GATHERINGEVENT_ANNOTATION__type" />
 				<xsd:element name="MEDIA_LANGUAGESTRING_AUD" type="dflt:MEDIA_LANGUAGESTRING_AUD__type" />
 				<xsd:element name="SPECIMENOROBSERVATIONBASE_RIGHTSINFO" type="dflt:SPECIMENOROBSERVATIONBASE_RIGHTSINFO__type" />
-				<xsd:element name="WORKINGSET_ANNOTATION" type="dflt:WORKINGSET_ANNOTATION__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_ANNOTATION" type="dflt:DESCRIPTIVEDATASET_ANNOTATION__type" />
 				<xsd:element name="TERMVOCABULARY_EXTENSION_AUD" type="dflt:TERMVOCABULARY_EXTENSION_AUD__type" />
 				<xsd:element name="DESCRIPTIONBASE_CREDIT_AUD" type="dflt:DESCRIPTIONBASE_CREDIT_AUD__type" />
 				<xsd:element name="AGENTBASE_ORIGINALSOURCEBASE_AUD" type="dflt:AGENTBASE_ORIGINALSOURCEBASE_AUD__type" />
@@ -88,7 +88,7 @@
 				<xsd:element name="RIGHTSINFO_MARKER" type="dflt:RIGHTSINFO_MARKER__type" />
 				<xsd:element name="CLASSIFICATION_MARKER_AUD" type="dflt:CLASSIFICATION_MARKER_AUD__type" />
 				<xsd:element name="FEATURENODE_DEFINEDTERMBASE_ONLYAPPLICABLE_AUD" type="dflt:FEATURENODE_DEFINEDTERMBASE_ONLYAPPLICABLE_AUD__type" />
-				<xsd:element name="WORKINGSET_DESCRIPTIONBASE_AUD" type="dflt:WORKINGSET_DESCRIPTIONBASE_AUD__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_DESCRIPTIONBASE_AUD" type="dflt:DESCRIPTIVEDATASET_DESCRIPTIONBASE_AUD__type" />
 				<xsd:element name="DEFINEDTERMBASE_STATISTICALMEASURE" type="dflt:DEFINEDTERMBASE_STATISTICALMEASURE__type" />
 				<xsd:element name="REFERENCE_RIGHTSINFO" type="dflt:REFERENCE_RIGHTSINFO__type" />
 				<xsd:element name="TERMVOCABULARY_ORIGINALSOURCEBASE_AUD" type="dflt:TERMVOCABULARY_ORIGINALSOURCEBASE_AUD__type" />
@@ -166,7 +166,7 @@
 				<xsd:element name="TERMVOCABULARY" type="dflt:TERMVOCABULARY__type" />
 				<xsd:element name="TAXONINTERACTION_LANGUAGESTRING_AUD" type="dflt:TAXONINTERACTION_LANGUAGESTRING_AUD__type" />
 				<xsd:element name="TAXONNAME" type="dflt:TAXONNAME__type" />
-				<xsd:element name="WORKINGSET_MARKER" type="dflt:WORKINGSET_MARKER__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_MARKER" type="dflt:DESCRIPTIVEDATASET_MARKER__type" />
 				<xsd:element name="SPECIMENOROBSERVATIONBASE_ANNOTATION" type="dflt:SPECIMENOROBSERVATIONBASE_ANNOTATION__type" />
 				<xsd:element name="SPECIMENOROBSERVATIONBASE_IDENTIFIER_AUD" type="dflt:SPECIMENOROBSERVATIONBASE_IDENTIFIER_AUD__type" />
 				<xsd:element name="HIBERNATE_SEQUENCES" type="dflt:HIBERNATE_SEQUENCES__type" />
@@ -216,12 +216,12 @@
 				<xsd:element name="DESCRIPTIONBASE_EXTENSION_AUD" type="dflt:DESCRIPTIONBASE_EXTENSION_AUD__type" />
 				<xsd:element name="AGENTBASE_IDENTIFIER_AUD" type="dflt:AGENTBASE_IDENTIFIER_AUD__type" />
 				<xsd:element name="TAXONNODEAGENTRELATION_ANNOTATION_AUD" type="dflt:TAXONNODEAGENTRELATION_ANNOTATION_AUD__type" />
-				<xsd:element name="WORKINGSET_MARKER_AUD" type="dflt:WORKINGSET_MARKER_AUD__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_MARKER_AUD" type="dflt:DESCRIPTIVEDATASET_MARKER_AUD__type" />
 				<xsd:element name="HOMOTYPICALGROUP_AUD" type="dflt:HOMOTYPICALGROUP_AUD__type" />
 				<xsd:element name="SEQUENCE_MARKER_AUD" type="dflt:SEQUENCE_MARKER_AUD__type" />
 				<xsd:element name="USERACCOUNT_AUD" type="dflt:USERACCOUNT_AUD__type" />
 				<xsd:element name="TAXONNAME_RIGHTSINFO" type="dflt:TAXONNAME_RIGHTSINFO__type" />
-				<xsd:element name="WORKINGSET_REPRESENTATION" type="dflt:WORKINGSET_REPRESENTATION__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_REPRESENTATION" type="dflt:DESCRIPTIVEDATASET_REPRESENTATION__type" />
 				<xsd:element name="ADDRESS" type="dflt:ADDRESS__type" />
 				<xsd:element name="ANNOTATION_AUD" type="dflt:ANNOTATION_AUD__type" />
 				<xsd:element name="TAXONRELATIONSHIP_ANNOTATION_AUD" type="dflt:TAXONRELATIONSHIP_ANNOTATION_AUD__type" />
@@ -233,7 +233,7 @@
 				<xsd:element name="SINGLEREAD_MARKER_AUD" type="dflt:SINGLEREAD_MARKER_AUD__type" />
 				<xsd:element name="MEDIA_REPRESENTATION_AUD" type="dflt:MEDIA_REPRESENTATION_AUD__type" />
 				<xsd:element name="AUDITEVENT" type="dflt:AUDITEVENT__type" />
-				<xsd:element name="WORKINGSET_AUD" type="dflt:WORKINGSET_AUD__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_AUD" type="dflt:DESCRIPTIVEDATASET_AUD__type" />
 				<xsd:element name="AMPLIFICATIONRESULT_ANNOTATION" type="dflt:AMPLIFICATIONRESULT_ANNOTATION__type" />
 				<xsd:element name="CLASSIFICATION_CREDIT_AUD" type="dflt:CLASSIFICATION_CREDIT_AUD__type" />
 				<xsd:element name="KEYSTATEMENT_AUD" type="dflt:KEYSTATEMENT_AUD__type" />
@@ -292,7 +292,7 @@
 				<xsd:element name="DESCRIPTIONBASE_SCOPE" type="dflt:DESCRIPTIONBASE_SCOPE__type" />
 				<xsd:element name="DNAQUALITY" type="dflt:DNAQUALITY__type" />
 				<xsd:element name="MEDIAKEY_TAXONSCOPE" type="dflt:MEDIAKEY_TAXONSCOPE__type" />
-				<xsd:element name="WORKINGSET_NAMEDAREA_AUD" type="dflt:WORKINGSET_NAMEDAREA_AUD__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_NAMEDAREA_AUD" type="dflt:DESCRIPTIVEDATASET_NAMEDAREA_AUD__type" />
 				<xsd:element name="DESCRIPTIONELEMENTBASE_ORIGINALSOURCEBASE" type="dflt:DESCRIPTIONELEMENTBASE_ORIGINALSOURCEBASE__type" />
 				<xsd:element name="STATEDATA_DEFINEDTERMBASE" type="dflt:STATEDATA_DEFINEDTERMBASE__type" />
 				<xsd:element name="TAXONNAME_AUD" type="dflt:TAXONNAME_AUD__type" />
@@ -305,7 +305,7 @@
 				<xsd:element name="DEFINEDTERMBASE_RIGHTSINFO_AUD" type="dflt:DEFINEDTERMBASE_RIGHTSINFO_AUD__type" />
 				<xsd:element name="TYPEDESIGNATIONBASE_AUD" type="dflt:TYPEDESIGNATIONBASE_AUD__type" />
 				<xsd:element name="DERIVATIONEVENT_MARKER" type="dflt:DERIVATIONEVENT_MARKER__type" />
-				<xsd:element name="WORKINGSET_REPRESENTATION_AUD" type="dflt:WORKINGSET_REPRESENTATION_AUD__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_REPRESENTATION_AUD" type="dflt:DESCRIPTIVEDATASET_REPRESENTATION_AUD__type" />
 				<xsd:element name="REFERENCE_AUD" type="dflt:REFERENCE_AUD__type" />
 				<xsd:element name="DEFINEDTERMBASE_CREDIT_AUD" type="dflt:DEFINEDTERMBASE_CREDIT_AUD__type" />
 				<xsd:element name="REFERENCE_MEDIA_AUD" type="dflt:REFERENCE_MEDIA_AUD__type" />
@@ -328,7 +328,7 @@
 				<xsd:element name="TAXONBASE_RIGHTSINFO_AUD" type="dflt:TAXONBASE_RIGHTSINFO_AUD__type" />
 				<xsd:element name="TAXONNAME_NOMENCLATURALSTATUS" type="dflt:TAXONNAME_NOMENCLATURALSTATUS__type" />
 				<xsd:element name="FEATURETREE_RIGHTSINFO_AUD" type="dflt:FEATURETREE_RIGHTSINFO_AUD__type" />
-				<xsd:element name="WORKINGSET_NAMEDAREA" type="dflt:WORKINGSET_NAMEDAREA__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_NAMEDAREA" type="dflt:DESCRIPTIVEDATASET_NAMEDAREA__type" />
 				<xsd:element name="DETERMINATIONEVENT_ANNOTATION_AUD" type="dflt:DETERMINATIONEVENT_ANNOTATION_AUD__type" />
 				<xsd:element name="FEATURETREE_CREDIT" type="dflt:FEATURETREE_CREDIT__type" />
 				<xsd:element name="DERIVATIONEVENT_ANNOTATION" type="dflt:DERIVATIONEVENT_ANNOTATION__type" />
@@ -373,11 +373,11 @@
 				<xsd:element name="DEFINEDTERMBASE_AUD" type="dflt:DEFINEDTERMBASE_AUD__type" />
 				<xsd:element name="LANGUAGESTRING_MARKER_AUD" type="dflt:LANGUAGESTRING_MARKER_AUD__type" />
 				<xsd:element name="DEFINEDTERMBASE_IDENTIFIER_AUD" type="dflt:DEFINEDTERMBASE_IDENTIFIER_AUD__type" />
-				<xsd:element name="WORKINGSET_DESCRIPTIONBASE" type="dflt:WORKINGSET_DESCRIPTIONBASE__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_DESCRIPTIONBASE" type="dflt:DESCRIPTIVEDATASET_DESCRIPTIONBASE__type" />
 				<xsd:element name="POLYTOMOUSKEYNODE" type="dflt:POLYTOMOUSKEYNODE__type" />
 				<xsd:element name="REPRESENTATION" type="dflt:REPRESENTATION__type" />
 				<xsd:element name="TAXONRELATIONSHIP_MARKER" type="dflt:TAXONRELATIONSHIP_MARKER__type" />
-				<xsd:element name="WORKINGSET_TAXONNODE" type="dflt:WORKINGSET_TAXONNODE__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_TAXONNODE" type="dflt:DESCRIPTIVEDATASET_TAXONNODE__type" />
 				<xsd:element name="ORIGINALSOURCEBASE_ANNOTATION" type="dflt:ORIGINALSOURCEBASE_ANNOTATION__type" />
 				<xsd:element name="CREDIT_ANNOTATION" type="dflt:CREDIT_ANNOTATION__type" />
 				<xsd:element name="DESCRIPTIONBASE_RIGHTSINFO" type="dflt:DESCRIPTIONBASE_RIGHTSINFO__type" />
@@ -441,7 +441,7 @@
 				<xsd:element name="PRIMER_ANNOTATION_AUD" type="dflt:PRIMER_ANNOTATION_AUD__type" />
 				<xsd:element name="AMPLIFICATIONRESULT_MARKER_AUD" type="dflt:AMPLIFICATIONRESULT_MARKER_AUD__type" />
 				<xsd:element name="AMPLIFICATION_ANNOTATION_AUD" type="dflt:AMPLIFICATION_ANNOTATION_AUD__type" />
-				<xsd:element name="WORKINGSET" type="dflt:WORKINGSET__type" />
+				<xsd:element name="DESCRIPTIVEDATASET" type="dflt:DESCRIPTIVEDATASET__type" />
 				<xsd:element name="ORIGINALSOURCEBASE_MARKER_AUD" type="dflt:ORIGINALSOURCEBASE_MARKER_AUD__type" />
 				<xsd:element name="INTEXTREFERENCE" type="dflt:INTEXTREFERENCE__type" />
 				<xsd:element name="COLLECTION_MEDIA_AUD" type="dflt:COLLECTION_MEDIA_AUD__type" />
@@ -461,7 +461,7 @@
 				<xsd:element name="REPRESENTATION_MARKER" type="dflt:REPRESENTATION_MARKER__type" />
 				<xsd:element name="DESCRIPTIONBASE_IDENTIFIER" type="dflt:DESCRIPTIONBASE_IDENTIFIER__type" />
 				<xsd:element name="CDM_VIEW_CDM_VIEW" type="dflt:CDM_VIEW_CDM_VIEW__type" />
-				<xsd:element name="WORKINGSET_ANNOTATION_AUD" type="dflt:WORKINGSET_ANNOTATION_AUD__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_ANNOTATION_AUD" type="dflt:DESCRIPTIVEDATASET_ANNOTATION_AUD__type" />
 				<xsd:element name="DESCRIPTIONELEMENTBASE_ANNOTATION_AUD" type="dflt:DESCRIPTIONELEMENTBASE_ANNOTATION_AUD__type" />
 				<xsd:element name="IDENTIFIER_ANNOTATION" type="dflt:IDENTIFIER_ANNOTATION__type" />
 				<xsd:element name="TAXONBASE_CREDIT_AUD" type="dflt:TAXONBASE_CREDIT_AUD__type" />
@@ -543,7 +543,7 @@
 				<xsd:element name="AMPLIFICATION" type="dflt:AMPLIFICATION__type" />
 				<xsd:element name="MEDIA_MARKER_AUD" type="dflt:MEDIA_MARKER_AUD__type" />
 				<xsd:element name="NAMERELATIONSHIP_MARKER_AUD" type="dflt:NAMERELATIONSHIP_MARKER_AUD__type" />
-				<xsd:element name="WORKINGSET_TAXONNODE_AUD" type="dflt:WORKINGSET_TAXONNODE_AUD__type" />
+				<xsd:element name="DESCRIPTIVEDATASET_TAXONNODE_AUD" type="dflt:DESCRIPTIVEDATASET_TAXONNODE_AUD__type" />
 				<xsd:element name="COLLECTION_CREDIT" type="dflt:COLLECTION_CREDIT__type" />
 				<xsd:element name="DESCRIPTIONBASE_REFERENCE" type="dflt:DESCRIPTIONBASE_REFERENCE__type" />
 				<xsd:element name="SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT" type="dflt:SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT__type" />
