commit 9c021029a33eefe4045268f25499690f11ca16df
Author: Andreas Müller <a.mueller@bgbm.org>
Date:   Fri Jul 22 15:29:02 2022 +0200

    ref #10097 change originalNameString to originalInfo in cdmlib

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
index c0f23f794b..ecd6706221 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
@@ -966,7 +966,7 @@ public abstract class CdmImportBase<CONFIG extends IImportConfigurator, STATE ex
     public OriginalSourceBase addOriginalSource(ICdmBase cdmBase, Object idAttributeValue, String namespace, Reference citation, String originalInformation)  {
         OriginalSourceBase source = addOriginalSource(cdmBase, idAttributeValue, namespace, citation);
         if (source != null && isNotBlank(originalInformation)){
-            source.setOriginalNameString(originalInformation);
+            source.setOriginalInfo(originalInformation);
         }
         return source;
     }
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportNameTypeDesignationMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportNameTypeDesignationMapper.java
index 8928e509ca..3cb5277b92 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportNameTypeDesignationMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportNameTypeDesignationMapper.java
@@ -12,7 +12,8 @@ package eu.etaxonomy.cdm.io.common.mapping;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import eu.etaxonomy.cdm.io.common.CdmImportBase;
 import eu.etaxonomy.cdm.io.common.DbImportStateBase;
@@ -113,7 +114,7 @@ public class DbImportNameTypeDesignationMapper<STATE extends DbImportStateBase<?
 		TaxonName typeName = checkTaxonNameType(toObject);
 
 		boolean addToAllHomotypicNames = false; //TODO check if this is correct
-		String originalNameString = null; //TODO what is this
+		String originalInfo = null; //TODO what is this
 
 		NameTypeDesignationStatus status = this.designationStatus;
 		if (designationStatusValue != null){
@@ -123,7 +124,7 @@ public class DbImportNameTypeDesignationMapper<STATE extends DbImportStateBase<?
 				status = transformer.transformNameTypeDesignationStatus(designationStatusValue);
 			}
 		}
-		typifiedName.addNameTypeDesignation(typeName, citation, microCitation, originalNameString, status, addToAllHomotypicNames);
+		typifiedName.addNameTypeDesignation(typeName, citation, microCitation, originalInfo, status, addToAllHomotypicNames);
 
 		return typifiedName;
 	}
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/out/DbOriginalNameMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/out/DbOriginalNameMapper.java
index b3e4b87878..5b1341e4a1 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/out/DbOriginalNameMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/out/DbOriginalNameMapper.java
@@ -48,7 +48,7 @@ public class DbOriginalNameMapper extends DbSingleAttributeExportMapperBase<DbEx
 	protected Object getValue(CdmBase cdmBase) {
 		if (cdmBase.isInstanceOf(OriginalSourceBase.class)){
 			OriginalSourceBase source = CdmBase.deproxy(cdmBase, OriginalSourceBase.class);
-			String nameString = source.getOriginalNameString();
+			String nameString = source.getOriginalInfo();
 			TaxonName name = null;
 			if (source.isInstanceOf(NamedSourceBase.class)){
 			    NamedSourceBase descSource = CdmBase.deproxy(source, NamedSourceBase.class);
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java
index 8ab30ba08e..8b0716ff87 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java
@@ -293,7 +293,7 @@ public class MarkupSpecimenImport extends MarkupImportBase  {
 			if (collectionAndType.matches(notDesignatedRE)){
 				SpecimenTypeDesignation desig = SpecimenTypeDesignation.NewInstance();
 				desig.setNotDesignated(true);
-//				name.addSpecimenTypeDesignation(typeSpecimen, status, citation, citationMicroReference, originalNameString, isNotDesignated, addToAllHomotypicNames)
+//				name.addSpecimenTypeDesignation(typeSpecimen, status, citation, citationMicroReference, originalInfo, isNotDesignated, addToAllHomotypicNames)
 				name.addTypeDesignation(desig, true);
 			}else if(collectionAndType.matches(designatedRE)){
 				String designatedBy = null;
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXNomenclatureImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXNomenclatureImport.java
index bdefecb4e0..1804a7083e 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXNomenclatureImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXNomenclatureImport.java
@@ -14,7 +14,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jdom.Element;
 import org.jdom.Namespace;
 import org.springframework.stereotype.Component;
@@ -194,7 +195,7 @@ public class TaxonXNomenclatureImport
 	private boolean doSpecimenType(TaxonXImportConfigurator config, Element elType, Element elTypeLoc, TaxonName taxonName){
 		Reference citation = null;
 		String citationMicroReference = null;
-		String originalNameString = null;
+		String originalInfo = null;
 		boolean isNotDesignated = true;
 		boolean addToAllHomotypicNames = true;
 
@@ -212,11 +213,11 @@ public class TaxonXNomenclatureImport
 		if (typeLocMap != null && typeLocMap.size() >0){
 			for (DerivedUnit specimen : typeLocMap.keySet()){
 				SpecimenTypeDesignationStatus status = typeLocMap.get(specimen);
-				taxonName.addSpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalNameString, isNotDesignated, addToAllHomotypicNames);
+				taxonName.addSpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalInfo, isNotDesignated, addToAllHomotypicNames);
 			}
 		}else{ // no type_loc
 			SpecimenTypeDesignationStatus status = null;
-			taxonName.addSpecimenTypeDesignation(simpleSpecimen.getSpecimen(), status, citation, citationMicroReference, originalNameString, isNotDesignated, addToAllHomotypicNames);
+			taxonName.addSpecimenTypeDesignation(simpleSpecimen.getSpecimen(), status, citation, citationMicroReference, originalInfo, isNotDesignated, addToAllHomotypicNames);
 		}
 		return true;
 	}
@@ -392,11 +393,11 @@ public class TaxonXNomenclatureImport
 	private boolean doNameTypeDesignation(TaxonName name, TaxonName type, NameTypeDesignationStatus status/*, boolean isLectoType*/){
 		Reference citation = null;
 		String citationMicroReference = null;
-		String originalNameString = null;
+		String originalInfo = null;
 		boolean addToAllHomotypicNames = true;
 
-//		name.addNameTypeDesignation(type, citation, citationMicroReference, originalNameString, status, addToAllHomotypicNames);
-		name.addNameTypeDesignation(type, citation, citationMicroReference, originalNameString,status, false, false, /*isLectoType, */false, addToAllHomotypicNames);
+//		name.addNameTypeDesignation(type, citation, citationMicroReference, originalInfo, status, addToAllHomotypicNames);
+		name.addNameTypeDesignation(type, citation, citationMicroReference, originalInfo,status, false, false, /*isLectoType, */false, addToAllHomotypicNames);
 		return true;
 	}
 
@@ -439,7 +440,7 @@ public class TaxonXNomenclatureImport
 						logger.warn("Is this really only a collection string? : "  + tmpCollString + getBracketSourceName(config));
 					}
 					DerivedUnit specimen;
-					specimen = (DerivedUnit)originalSpecimen.clone();
+					specimen = originalSpecimen.clone();
 					String title = originalSpecimen.getTitleCache();
 					title = title + "(" + tmpCollString + ")";
 					specimen.setTitleCache(title, true );
@@ -516,12 +517,12 @@ public class TaxonXNomenclatureImport
 						if (taxonName != null){
 							Reference citation = null;
 							String citationMicroReference = null;
-							String originalNameString = null;
+							String originalInfo = null;
 							boolean isNotDesignated = true;
 							boolean addToAllHomotypicNames = true;
-							DerivedUnit specimen = (DerivedUnit)originalSpecimen.clone();
+							DerivedUnit specimen = originalSpecimen.clone();
 							unlazyTypeDesignation(config, taxonName);
-							taxonName.addSpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalNameString, isNotDesignated, addToAllHomotypicNames);
+							taxonName.addSpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalInfo, isNotDesignated, addToAllHomotypicNames);
 							result = true;
 						}
 					}
diff --git a/cdmlib-io/src/main/resources/schema/cdm/common.xsd b/cdmlib-io/src/main/resources/schema/cdm/common.xsd
index 8e8ae1a973..24b9bf99e2 100644
--- a/cdmlib-io/src/main/resources/schema/cdm/common.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/common.xsd
@@ -383,7 +383,7 @@
       <xs:extension base="common:AnnotatableEntity">
         <xs:sequence>
           <xs:element name="CitationMicroReference" type="xs:string" minOccurs="0"/>
-          <xs:element name="OriginalNameString" type="xs:string" minOccurs="0"/>
+          <xs:element name="OriginalInfo" type="xs:string" minOccurs="0"/>
           <xs:element name="Citation" type="xs:IDREF" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/TaxonNameTest.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/TaxonNameTest.xml
index 91baf90949..a4f1118c86 100644
--- a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/TaxonNameTest.xml
+++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/TaxonNameTest.xml
@@ -261,7 +261,7 @@
     </References>
     <TypeDesignations>
         <name:SpecimenTypeDesignation id="1" uuid="urn-uuid-0fdae5a6-9fad-435f-846a-8ea492938375">
-            <common:OriginalNameString>Arum gratum</common:OriginalNameString>
+            <common:OriginalInfo>Arum gratum</common:OriginalInfo>
             <common:Citation>urn-uuid-8528d6ad-b246-4a3b-b30b-cfb8549476c7</common:Citation>
             <name:TypifiedNames>
               <name:TypifiedName>urn-uuid-ff5d2897-51e1-4352-a23d-678b7d9026bf</name:TypifiedName>
@@ -271,7 +271,7 @@
             <name:TypeStatus>urn-uuid-e7542758-5311-47b2-b4f8-bb770822ae40</name:TypeStatus>
         </name:SpecimenTypeDesignation>
         <name:NameTypeDesignation id="2" uuid="urn-uuid-8db5df84-fca4-4e8f-aed2-4b349dfa31d7">
-            <common:OriginalNameString></common:OriginalNameString>
+            <common:OriginalInfo></common:OriginalInfo>
             <common:Citation>urn-uuid-ea590de1-cb10-400e-8b0d-f7aa4b47cea9</common:Citation>
             <name:TypifiedNames>
               <name:TypifiedName>urn-uuid-d399030c-906f-437c-90d2-3f5c89d87376</name:TypifiedName>
@@ -283,7 +283,7 @@
             <name:TypeName>urn-uuid-75664369-645b-46cd-b133-493cbcd27cb5</name:TypeName>
         </name:NameTypeDesignation>
         <name:NameTypeDesignation id="3" uuid="urn-uuid-b6a88f54-c8dd-41ea-91e6-ed459494f8fd">
-            <common:OriginalNameString>Sphinx atropos</common:OriginalNameString>
+            <common:OriginalInfo>Sphinx atropos</common:OriginalInfo>
             <common:Citation>urn-uuid-ea590de1-cb10-400e-8b0d-f7aa4b47cea9</common:Citation>
             <name:TypifiedNames>
               <name:TypifiedName>urn-uuid-51ab21d1-d65b-4fb0-9814-98bd411df231</name:TypifiedName>
@@ -462,7 +462,7 @@
             <name:ProtectedFullTitleCache>false</name:ProtectedFullTitleCache>
             <name:RelationsFromThisName>
                 <name:RelationFromThisName id="3" uuid="urn-uuid-2e0ee760-fdcb-11dd-87af-0800200c9a66" isDoubtful="false">
-                    <common:OriginalNameString></common:OriginalNameString>
+                    <common:OriginalInfo></common:OriginalInfo>
                     <common:Citation>urn-uuid-db5d02b5-e6f2-4376-ab02-6e67fc8f8ff1</common:Citation>
                     <name:RelatedFrom>urn-uuid-37c1b483-582a-478c-acb0-a49bbc4417e5</name:RelatedFrom>
                     <name:RelatedTo>urn-uuid-b47e0874-1701-435f-a8f1-cadc25b99efb</name:RelatedTo>
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java
index b453596ed0..afc7b27200 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java
@@ -53,7 +53,7 @@ import eu.etaxonomy.cdm.validation.annotation.NullOrNotEmpty;
  * For a short abbreviated name the inherited attribute {@link TeamOrPersonBase#getNomenclaturalTitle() nomenclaturalTitle}
  * is to be used.<BR>
  * For other alternative (string-)names {@link eu.etaxonomy.cdm.model.reference.OriginalSourceBase OriginalSource} instances must be created
- * and the attribute {@link eu.etaxonomy.cdm.model.common.OriginalSourceBase#getOriginalNameString() originalNameString} must be used.
+ * and the attribute {@link eu.etaxonomy.cdm.model.common.OriginalSourceBase#getOriginalInfo() originalInfo} must be used.
  * <P>
  * This class corresponds to: <ul>
  * <li> Person according to the TDWG ontology
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
index d3797d88d5..ae45380aeb 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
@@ -72,7 +72,7 @@ import eu.etaxonomy.cdm.validation.Level2;
  * Superclass for the primary CDM classes that can be referenced from outside via LSIDs and contain a simple generated title string as a label for human reading.
  * All subclasses inherit the ability to store additional properties that are stored as {@link Extension Extensions}, basically a string value with a type term.
  * Any number of right statements can be attached as well as multiple {@link OriginalSourceBase} objects.
- * Original sources carry a reference to the source, an ID within that source and the original title/label of this object as it was used in that source (originalNameString).
+ * Original sources carry a reference to the source, an ID within that source and the original title/label of this object as it was used in that source (originalInfo).
  * A Taxon for example that was taken from 2 sources like FaunaEuropaea and IPNI would have two originalSource objects.
  * The originalSource representing that taxon as it was found in IPNI would contain IPNI as the reference, the IPNI id of the taxon and the name of the taxon exactly as it was used in IPNI.
  *
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableSource.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableSource.java
index cc582d7dd4..28876f2a8d 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableSource.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableSource.java
@@ -79,7 +79,7 @@ public class IdentifiableSource
    public static IdentifiableSource NewInstance(OriginalSourceType type, String id, String idNamespace, Reference
             reference, String microReference, String originalInfo){
         IdentifiableSource result = NewInstance(type, id, idNamespace, reference, microReference);
-        result.setOriginalNameString(originalInfo);
+        result.setOriginalInfo(originalInfo);
         return result;
     }
 
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/SingleSourcedEntityBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/SingleSourcedEntityBase.java
index 96ccf324ec..2d75823803 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/SingleSourcedEntityBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/SingleSourcedEntityBase.java
@@ -66,12 +66,12 @@ public abstract class SingleSourcedEntityBase
 	}
 
     protected SingleSourcedEntityBase(Reference reference, String microReference,
-            String originalNameString) {
+            String originalInfo) {
         super();
         this.setCitation(reference);
         this.setCitationMicroReference(microReference);
-        if (StringUtils.isNotEmpty(originalNameString)){
-            getSource(true).setOriginalNameString(originalNameString);
+        if (StringUtils.isNotEmpty(originalInfo)){
+            getSource(true).setOriginalInfo(originalInfo);
         }
     }
 
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/SourcedEntityBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/SourcedEntityBase.java
index 03c5424dbf..4f751d91a6 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/SourcedEntityBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/SourcedEntityBase.java
@@ -72,9 +72,9 @@ public abstract class SourcedEntityBase<SOURCE extends OriginalSourceBase>
 	}
 
 //	public SourcedEntityBase(Reference citation, String citationMicroReference,
-//			String originalNameString) {
+//			String originalInfo) {
 //		this.citationMicroReference = citationMicroReference;
-//		this.originalNameString = originalNameString;
+//		this.originalInfo = originalInfo;
 //		this.citation = citation;
 //	}
 
@@ -166,10 +166,10 @@ public abstract class SourcedEntityBase<SOURCE extends OriginalSourceBase>
 //     * @param citation the source as a {@link Reference reference}
 //     * @param microReference the details (e.g. page number) in the reference
 //     * @param nameUsedInSource the taxon name used in the source
-//     * @param originalNameString the name as text used in the source
+//     * @param originalInfo the name as text used in the source
 //     */
-//    public void addSource(OriginalSourceType type, String idInSource, String idNamespace, Reference citation, String microReference, TaxonName nameUsedInSource, String originalNameString){
-//        DescriptionElementSource newSource = DescriptionElementSource.NewInstance(type, idInSource, idNamespace, citation, microReference, nameUsedInSource, originalNameString);
+//    public void addSource(OriginalSourceType type, String idInSource, String idNamespace, Reference citation, String microReference, TaxonName nameUsedInSource, String originalInfo){
+//        DescriptionElementSource newSource = DescriptionElementSource.NewInstance(type, idInSource, idNamespace, citation, microReference, nameUsedInSource, originalInfo);
 //        addSource(newSource);
 //    }
 
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
index 6edb5d8c6c..359a9b92b5 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
@@ -473,12 +473,12 @@ public abstract class DescriptionElementBase
      * @param reference the source as a {@link Reference reference}
      * @param microReference the details (e.g. page number) in the reference
      * @param nameUsedInSource the taxon name used in the source
-     * @param originalNameString the name as text used in the source
+     * @param originalInfo any information as original mentioned in the text
      */
     public DescriptionElementSource addSource(OriginalSourceType type, String idInSource, String idNamespace,
-            Reference reference, String microReference, TaxonName nameUsedInSource, String originalNameString){
+            Reference reference, String microReference, TaxonName nameUsedInSource, String originalInfo){
         DescriptionElementSource newSource = DescriptionElementSource.NewInstance(type, idInSource, idNamespace,
-                reference, microReference, nameUsedInSource, originalNameString);
+                reference, microReference, nameUsedInSource, originalInfo);
         addSource(newSource);
         return newSource;
     }
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementSource.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementSource.java
index 4eed433ebb..ac38fb46e9 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementSource.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementSource.java
@@ -34,12 +34,8 @@ import eu.etaxonomy.cdm.model.reference.Reference;
  * can be stored that points to the name used in the source. This is needed because description always belong
  * to accepted taxa while the referenced citations may use synonym names.
  * </BR>
- * The use of "originalNameString" within a DescriptionElementSource has to be discussed.
- * In general this string is to be used for different representations of the sourced object. In this classes
- * context it could also stand for the string representation of the taxon name used in the source. This
- * may make sense if the taxon name is not available in the CDM and the user for some reason does not want
- * to create a new ful {@link eu.etaxonomy.cdm.model.name.TaxonName taxon name}.
- *
+ * For discussion on originalInfo see #10097.
+*
  * @author a.mueller
  * @since 18.09.2009
  */
@@ -100,16 +96,16 @@ public class DescriptionElementSource extends NamedSourceBase{
 		return result;
 	}
 
-	public static DescriptionElementSource NewInstance(OriginalSourceType type, String id, String idNamespace, Reference citation, String microReference, TaxonName nameUsedInSource, String originalNameString){
+	public static DescriptionElementSource NewInstance(OriginalSourceType type, String id, String idNamespace, Reference citation, String microReference, TaxonName nameUsedInSource, String originalInfo){
 		DescriptionElementSource result = NewInstance(type, id, idNamespace, citation, microReference);
 		result.setNameUsedInSource(nameUsedInSource);
-		result.setOriginalNameString(originalNameString);
+		result.setOriginalInfo(originalInfo);
 		return result;
 	}
 
     public static DescriptionElementSource NewInstance(OriginalSourceType type, String id, String idNamespace,
-            Reference citation, String microReference, TaxonName nameUsedInSource, String originalNameString, ICdmTarget target){
-        DescriptionElementSource result = NewInstance(type, id, idNamespace, citation, microReference, nameUsedInSource, originalNameString);
+            Reference citation, String microReference, TaxonName nameUsedInSource, String originalInfo, ICdmTarget target){
+        DescriptionElementSource result = NewInstance(type, id, idNamespace, citation, microReference, nameUsedInSource, originalInfo);
         result.setCdmSource(target);
         return result;
     }
@@ -127,10 +123,10 @@ public class DescriptionElementSource extends NamedSourceBase{
 		return result;
 	}
 
-	public static DescriptionElementSource NewPrimarySourceInstance(Reference citation, String microReference, TaxonName nameUsedInSource, String originalNameString){
+	public static DescriptionElementSource NewPrimarySourceInstance(Reference citation, String microReference, TaxonName nameUsedInSource, String originalInfo){
 		DescriptionElementSource result = NewPrimarySourceInstance(citation, microReference);
 		result.setNameUsedInSource(nameUsedInSource);
-		result.setOriginalNameString(originalNameString);
+		result.setOriginalInfo(originalInfo);
 		return result;
 	}
 
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ITaxonNameBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ITaxonNameBase.java
index 85c4c4af17..b123607045 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ITaxonNameBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ITaxonNameBase.java
@@ -370,10 +370,10 @@ public interface ITaxonNameBase
     public void setOriginalSpelling(TaxonName originalSpelling);
 
     /**
-     * Sets the orginal name string in the nomenclatural source.
+     * Sets the original info in the nomenclatural source.
      * Creates the source if it does not exist.
      */
-    public void setOriginalNameString(String originalNameString);
+    public void setOriginalInfo(String originalInfo);
 
     /**
      * Returns the taxonomic {@link Rank rank} of <i>this</i> taxon name.
@@ -517,7 +517,7 @@ public interface ITaxonNameBase
      * @param  typeSpecies              the taxon name to be used as type of <i>this</i> taxon name
      * @param  citation                 the reference for this new designation
      * @param  citationMicroReference   the string with the details (generally pages) within the reference
-     * @param  originalNameString       the taxon name string used in the reference to assert this designation
+     * @param  originalInfo             any information from the original source, might be the name as written in the source (#10097)
      * @param  isRejectedType           the boolean status for a rejected name type designation
      * @param  isConservedType          the boolean status for a conserved name type designation
      * @param  isLectoType              the boolean status for a lectotype name type designation
@@ -530,7 +530,7 @@ public interface ITaxonNameBase
      * @see                             TypeDesignationBase#isNotDesignated()
      */
     public NameTypeDesignation addNameTypeDesignation(TaxonName typeSpecies, Reference citation,
-            String citationMicroReference, String originalNameString, NameTypeDesignationStatus status,
+            String citationMicroReference, String originalInfo, NameTypeDesignationStatus status,
             boolean isRejectedType, boolean isConservedType,
             /*boolean isLectoType, */
             boolean isNotDesignated, boolean addToAllHomotypicNames);
@@ -542,7 +542,7 @@ public interface ITaxonNameBase
      * @param  typeSpecies              the taxon name to be used as type of <i>this</i> taxon name
      * @param  citation                 the reference for this new designation
      * @param  citationMicroReference   the string with the details (generally pages) within the reference
-     * @param  originalNameString       the taxon name string used in the reference to assert this designation
+     * @param  originalInfo             any information from the original source, might be the name as written in the source (#10097)
      * @param  status                   the name type designation status
      * @param  addToAllHomotypicNames   the boolean indicating whether the name type designation should be
      *                                  added to all taxon names of the homotypical group this taxon name belongs to
@@ -552,7 +552,7 @@ public interface ITaxonNameBase
      * @see                             TypeDesignationBase#isNotDesignated()
      */
     public NameTypeDesignation addNameTypeDesignation(TaxonName typeSpecies, Reference citation,
-            String citationMicroReference, String originalNameString, NameTypeDesignationStatus status,
+            String citationMicroReference, String originalInfo, NameTypeDesignationStatus status,
             boolean addToAllHomotypicNames);
 
     /**
@@ -569,7 +569,7 @@ public interface ITaxonNameBase
      * @param  status                   the specimen type designation status
      * @param  citation                 the reference for this new specimen type designation
      * @param  citationMicroReference   the string with the details (generally pages) within the reference
-     * @param  originalNameString       the taxon name used in the reference to assert this designation
+     * @param  originalInfo             any information from the original source, might be the name as written in the source (#10097)
      * @param  isNotDesignated          the boolean status for a specimen type designation without specimen type
      * @param  addToAllHomotypicNames   the boolean indicating whether the specimen type designation should be
      *                                  added to all taxon names of the homotypical group the typified
@@ -581,7 +581,7 @@ public interface ITaxonNameBase
      * @see                             TypeDesignationBase#isNotDesignated()
      */
     public SpecimenTypeDesignation addSpecimenTypeDesignation(DerivedUnit typeSpecimen, SpecimenTypeDesignationStatus status,
-            Reference citation, String citationMicroReference, String originalNameString, boolean isNotDesignated,
+            Reference citation, String citationMicroReference, String originalInfo, boolean isNotDesignated,
             boolean addToAllHomotypicNames);
 
     /**
@@ -590,15 +590,15 @@ public interface ITaxonNameBase
      *
      * @param text                      the text
      * @param language                  the language of the text, if no language is defined {@link Language#UNDETERMINED()} is used
-     * @param isVerbatim                wether or not this the text is a verbatim text from a reference
-     * @param  citation                 the reference for this new specimen type designation
-     * @param  citationMicroReference   the string with the details (generally pages) within the reference
-     * @param  originalNameString       the taxon name used in the reference to assert this designation
-     * @param  addToAllHomotypicNames   the boolean indicating whether the specimen type designation should be
+     * @param isVerbatim                whether or not this the text is a verbatim text from a reference
+     * @param citation                  the reference for this new specimen type designation
+     * @param citationMicroReference    the string with the details (generally pages) within the reference
+     * @param originalInfo              any information from the original source, might be the name as written in the source (#10097)
+     * @param addToAllHomotypicNames    the boolean indicating whether the specimen type designation should be
      * @return
      */
     TextualTypeDesignation addTextualTypeDesignation(String text, Language language, boolean isVerbatim,
-            Reference citation, String citationMicroReference, String originalNameString,
+            Reference citation, String citationMicroReference, String originalInfo,
             boolean addToAllHomotypicNames);
 
 
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignation.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignation.java
index 43d0a9e3b7..91f5f0ac4e 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignation.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignation.java
@@ -99,8 +99,8 @@ public class NameTypeDesignation
 	 *
 	 * @param typeName				the taxon name used as a type
 	 * @param citation				the reference source for the new designation
-	 * @param citationMicroReference	the string with the details describing the exact localisation within the reference
-	 * @param originalNameString	the taxon name string used originally in the reference source for the new designation
+	 * @param citationMicroReference the string with the details describing the exact localisation within the reference
+	 * @param originalInfo	        any information from the original source, might be the name as written in the source (#10097)
 	 * @param isRejectedType		the boolean flag indicating whether the competent authorities rejected
 	 * 								<i>this</i> name type designation
 	 * @param isConservedType		the boolean flag indicating whether the competent authorities conserved
@@ -112,8 +112,8 @@ public class NameTypeDesignation
 	 * @see							TaxonName#addNameTypeDesignation(TaxonName, Reference, String, String, boolean, boolean, boolean, boolean, boolean)
 	 */
 	protected NameTypeDesignation(TaxonName typeName, NameTypeDesignationStatus status,
-			Reference citation, String citationMicroReference, String originalNameString) {
-		super(citation, citationMicroReference, originalNameString);
+			Reference citation, String citationMicroReference, String originalInfo) {
+		super(citation, citationMicroReference, originalInfo);
 		this.setTypeName(typeName);
 		this.setTypeStatus(status);
 	}
@@ -127,7 +127,7 @@ public class NameTypeDesignation
 	 * @param typeName				the taxon name used as a type
 	 * @param citation				the reference source for the new designation
 	 * @param citationMicroReference	the string with the details describing the exact localisation within the reference
-	 * @param originalNameString	the taxon name string used originally in the reference source for the new designation
+	 * @param originalInfo	any information from the original source, might be the name as written in the source (#10097)
 	 * @param isRejectedType		the boolean flag indicating whether the competent authorities rejected
 	 * 								<i>this</i> name type designation
 	 * @param isConservedType		the boolean flag indicating whether the competent authorities conserved
@@ -141,13 +141,13 @@ public class NameTypeDesignation
 	protected NameTypeDesignation(	TaxonName typeName,
 									Reference citation,
 									String citationMicroReference,
-									String originalNameString,
+									String originalInfo,
 									NameTypeDesignationStatus status,
 									boolean rejectedType,
 									boolean conservedType,
 									boolean isNotDesignated
 								) {
-		this(typeName, status, citation, citationMicroReference, originalNameString);
+		this(typeName, status, citation, citationMicroReference, originalInfo);
 		this.setNotDesignated(isNotDesignated);
 		this.rejectedType = rejectedType;
 		this.conservedType = conservedType;
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java
index 24a59f270c..77ad0eb963 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java
@@ -87,14 +87,14 @@ public class SpecimenTypeDesignation
 //	 * @param status				the type designation status
 //	 * @param citation				the reference source for the new designation
 //	 * @param citationMicroReference	the string with the details describing the exact localisation within the reference
-//	 * @param originalNameString	the taxon name string used originally in the reference source for the new designation
+//	 * @param originalInfo       	any information from the original source, might be the name as written in the source (#10097)
 //	 * @see							#SpecimenTypeDesignation(DerivedUnit, TypeDesignationStatus, Reference, String, String)
 //	 * @see							HomotypicalGroup#addSpecimenTypeDesignation(SpecimenTypeDesignation, boolean)
 //	 * @see							occurrence.DerivedUnit
 //	 */
 //	protected static SpecimenTypeDesignation NewInstance2(DerivedUnit specimen, TypeDesignationStatus status,
-//			Reference citation, String citationMicroReference, String originalNameString){
-//		SpecimenTypeDesignation specTypeDesig = new SpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalNameString);
+//			Reference citation, String citationMicroReference, String originalInfo){
+//		SpecimenTypeDesignation specTypeDesig = new SpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalInfo);
 //		return specTypeDesig;
 //	}
 
@@ -121,7 +121,7 @@ public class SpecimenTypeDesignation
 	 * @param citation				the reference source for the new designation
 	 * @param citationMicroReference	the string with the details describing
 	 * 								the exact localisation within the reference
-	 * @param originalNameString	the taxon name string used originally in the
+	 * @param originalInfo         	any information from the original source, might be the name as written in the source (#10097)
 	 * 								reference source for the new designation
 	 * @param isNotDesignated		the boolean flag indicating whether there is no specimen type at all for
 	 * 								<i>this</i> specimen type designation
@@ -131,8 +131,8 @@ public class SpecimenTypeDesignation
 	 * @see							eu.etaxonomy.cdm.model.occurrence.DerivedUnit
 	 */
 	protected SpecimenTypeDesignation(DerivedUnit specimen, SpecimenTypeDesignationStatus status, Reference citation, String citationMicroReference,
-			String originalNameString, boolean isNotDesignated) {
-		super(citation, citationMicroReference, originalNameString, isNotDesignated);
+			String originalInfo, boolean isNotDesignated) {
+		super(citation, citationMicroReference, originalInfo, isNotDesignated);
 		this.setTypeSpecimen(specimen);
 		this.setTypeStatus(status);
 	}
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
index d8cd5a8c1f..7a0a6d082f 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
@@ -2039,11 +2039,11 @@ public class TaxonName
 
     @Override
     @Transient
-    public void setOriginalNameString(String originalNameString){
-        if (isNotBlank(originalNameString)){
-            this.getNomenclaturalSource(true).setOriginalNameString(originalNameString);
+    public void setOriginalInfo(String originalInfo){
+        if (isNotBlank(originalInfo)){
+            this.getNomenclaturalSource(true).setOriginalInfo(originalInfo);
         }else if (this.getNomenclaturalSource() != null){
-            this.getNomenclaturalSource().setOriginalNameString(null);
+            this.getNomenclaturalSource().setOriginalInfo(null);
             checkNullSource();
         }
     }
@@ -2443,7 +2443,7 @@ public class TaxonName
      * @param  typeSpecies				the taxon name to be used as type of <i>this</i> taxon name
      * @param  citation					the reference for this new designation
      * @param  citationMicroReference	the string with the details (generally pages) within the reference
-     * @param  originalNameString		the taxon name string used in the reference to assert this designation
+     * @param  originalInfo     		any information from the original source, might be the name as written in the source (#10097)
      * @param  isRejectedType			the boolean status for a rejected name type designation
      * @param  isConservedType			the boolean status for a conserved name type designation
      * @param  isLectoType				the boolean status for a lectotype name type designation
@@ -2459,14 +2459,14 @@ public class TaxonName
     public NameTypeDesignation addNameTypeDesignation(TaxonName typeSpecies,
                 Reference citation,
                 String citationMicroReference,
-                String originalNameString,
+                String originalName,
                 NameTypeDesignationStatus status,
                 boolean isRejectedType,
                 boolean isConservedType,
                 /*boolean isLectoType, */
                 boolean isNotDesignated,
                 boolean addToAllHomotypicNames) {
-        NameTypeDesignation nameTypeDesignation = new NameTypeDesignation(typeSpecies, citation, citationMicroReference, originalNameString, status, isRejectedType, isConservedType, isNotDesignated);
+        NameTypeDesignation nameTypeDesignation = new NameTypeDesignation(typeSpecies, citation, citationMicroReference, originalName, status, isRejectedType, isConservedType, isNotDesignated);
         //nameTypeDesignation.setLectoType(isLectoType);
         addTypeDesignation(nameTypeDesignation, addToAllHomotypicNames);
         return nameTypeDesignation;
@@ -2479,7 +2479,7 @@ public class TaxonName
      * @param  typeSpecies				the taxon name to be used as type of <i>this</i> taxon name
      * @param  citation					the reference for this new designation
      * @param  citationMicroReference	the string with the details (generally pages) within the reference
-     * @param  originalNameString		the taxon name string used in the reference to assert this designation
+     * @param  originalInfo     		any information from the original source, might be the name as written in the source (#10097)
      * @param  status                   the name type designation status
      * @param  addToAllHomotypicNames	the boolean indicating whether the name type designation should be
      * 									added to all taxon names of the homotypical group this taxon name belongs to
@@ -2492,10 +2492,10 @@ public class TaxonName
     public NameTypeDesignation addNameTypeDesignation(TaxonName typeSpecies,
                 Reference citation,
                 String citationMicroReference,
-                String originalNameString,
+                String originalInfo,
                 NameTypeDesignationStatus status,
                 boolean addToAllHomotypicNames) {
-        NameTypeDesignation nameTypeDesignation = new NameTypeDesignation(typeSpecies, status, citation, citationMicroReference, originalNameString);
+        NameTypeDesignation nameTypeDesignation = new NameTypeDesignation(typeSpecies, status, citation, citationMicroReference, originalInfo);
         addTypeDesignation(nameTypeDesignation, addToAllHomotypicNames);
         return nameTypeDesignation;
     }
@@ -2527,7 +2527,7 @@ public class TaxonName
      * @param  status					the specimen type designation status
      * @param  citation					the reference for this new specimen type designation
      * @param  citationMicroReference	the string with the details (generally pages) within the reference
-     * @param  originalNameString		the taxon name used in the reference to assert this designation
+     * @param  originalInfo     		any information from the original source, might be the name as written in the source (#10097)
      * @param  isNotDesignated			the boolean status for a specimen type designation without specimen type
      * @param  addToAllHomotypicNames	the boolean indicating whether the specimen type designation should be
      * 									added to all taxon names of the homotypical group the typified
@@ -2543,10 +2543,10 @@ public class TaxonName
                 SpecimenTypeDesignationStatus status,
                 Reference citation,
                 String citationMicroReference,
-                String originalNameString,
+                String originalInfo,
                 boolean isNotDesignated,
                 boolean addToAllHomotypicNames) {
-        SpecimenTypeDesignation specimenTypeDesignation = new SpecimenTypeDesignation(typeSpecimen, status, citation, citationMicroReference, originalNameString, isNotDesignated);
+        SpecimenTypeDesignation specimenTypeDesignation = new SpecimenTypeDesignation(typeSpecimen, status, citation, citationMicroReference, originalInfo, isNotDesignated);
         addTypeDesignation(specimenTypeDesignation, addToAllHomotypicNames);
         return specimenTypeDesignation;
     }
@@ -2558,9 +2558,9 @@ public class TaxonName
                 boolean isVerbatim,
                 Reference citation,
                 String citationMicroReference,
-                String originalNameString,
+                String originalInfo,
                 boolean addToAllHomotypicNames) {
-        TextualTypeDesignation textualTypeDesignation = TextualTypeDesignation.NewInstance(text, language, isVerbatim, citation, citationMicroReference, originalNameString);
+        TextualTypeDesignation textualTypeDesignation = TextualTypeDesignation.NewInstance(text, language, isVerbatim, citation, citationMicroReference, originalInfo);
         addTypeDesignation(textualTypeDesignation, addToAllHomotypicNames);
         return textualTypeDesignation;
     }
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TextualTypeDesignation.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TextualTypeDesignation.java
index 9f227e0640..46c7ac5c1e 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TextualTypeDesignation.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TextualTypeDesignation.java
@@ -84,9 +84,9 @@ public class TextualTypeDesignation extends TypeDesignationBase<SpecimenTypeDesi
     }
 
     public static TextualTypeDesignation NewInstance(String text, Language language, boolean isVerbatim,
-            Reference citation, String citationMicroReference, String originalNameString) {
+            Reference citation, String citationMicroReference, String originalInfo) {
         TextualTypeDesignation result = new TextualTypeDesignation(text, language, isVerbatim,
-                citation, citationMicroReference, originalNameString);
+                citation, citationMicroReference, originalInfo);
         return result;
     }
 
@@ -96,8 +96,8 @@ public class TextualTypeDesignation extends TypeDesignationBase<SpecimenTypeDesi
         super();
     }
 
-    protected TextualTypeDesignation(String text, Language language, boolean isVerbatim, Reference citation, String citationMicroReference, String originalNameString) {
-        super(citation, citationMicroReference, originalNameString);
+    protected TextualTypeDesignation(String text, Language language, boolean isVerbatim, Reference citation, String citationMicroReference, String originalInfo) {
+        super(citation, citationMicroReference, originalInfo);
         language = Language.UNDETERMINED();
         LanguageString ls = LanguageString.NewInstance(text, language);
         this.putText(ls);
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationBase.java
index 67567fdaff..4f5e16d383 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationBase.java
@@ -140,13 +140,13 @@ public abstract class TypeDesignationBase<T extends TypeDesignationStatusBase<T>
      *
      * @param citation				the reference source for the new designation
      * @param citationMicroReference	the string with the details describing the exact localisation within the reference
-     * @param originalNameString	the taxon name string used originally in the reference source for the new designation
+     * @param originalInfo	any information from the original source, might be the name as written in the source (#10097)
      * @see							#TypeDesignationBase()
      * @see							#isNotDesignated()
      * @see							TaxonName#getTypeDesignations()
      */
-    protected TypeDesignationBase(Reference citation, String citationMicroReference, String originalNameString) {
-        this(citation, citationMicroReference, originalNameString, false);
+    protected TypeDesignationBase(Reference citation, String citationMicroReference, String originalInfo) {
+        this(citation, citationMicroReference, originalInfo, false);
     }
 
     /**
@@ -157,15 +157,15 @@ public abstract class TypeDesignationBase<T extends TypeDesignationStatusBase<T>
      *
      * @param citation				the reference source for the new designation
      * @param citationMicroReference	the string with the details describing the exact localisation within the reference
-     * @param originalNameString	the taxon name string used originally in the reference source for the new designation
+     * @param originalInfo	any information from the original source, might be the name as written in the source (#10097)
      * @param isNotDesignated		the boolean flag indicating whether there is no type at all for
      * 								<i>this</i> type designation
      * @see							#TypeDesignationBase()
      * @see							#isNotDesignated()
      * @see							TaxonName#getTypeDesignations()
      */
-    protected TypeDesignationBase(Reference citation, String citationMicroReference, String originalNameString, boolean notDesignated){
-        this(NamedSource.NewPrimarySourceInstance(citation, citationMicroReference), originalNameString, notDesignated);
+    protected TypeDesignationBase(Reference citation, String citationMicroReference, String originalInfo, boolean notDesignated){
+        this(NamedSource.NewPrimarySourceInstance(citation, citationMicroReference, null, originalInfo), notDesignated);
     }
 
     /**
@@ -175,15 +175,13 @@ public abstract class TypeDesignationBase<T extends TypeDesignationStatusBase<T>
      * the former designation).
      *
      * @param source                the reference source for the new designation
-     * @param originalNameString    the taxon name string used originally in the reference source for the new designation
      * @param isNotDesignated       the boolean flag indicating whether there is no type at all for
      *                              <i>this</i> type designation
      * @see                         #TypeDesignationBase()
      * @see                         #isNotDesignated()
      * @see                         TaxonName#getTypeDesignations()
      */
-    protected TypeDesignationBase(NamedSource designationSource, String originalNameString, boolean notDesignated){
-        super();
+    protected TypeDesignationBase(NamedSource designationSource, boolean notDesignated){
         this.notDesignated = notDesignated;
         this.designationSource = designationSource;
     }
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/NamedSource.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/NamedSource.java
index ac505d6443..33e5fdcd0b 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/NamedSource.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/NamedSource.java
@@ -72,16 +72,17 @@ public class NamedSource extends NamedSourceBase {
         return result;
     }
 
-    public static NamedSource NewInstance(OriginalSourceType type, String id, String idNamespace, Reference citation, String microReference, TaxonName nameUsedInSource, String originalNameString){
+    public static NamedSource NewInstance(OriginalSourceType type, String id, String idNamespace, Reference citation, String microReference,
+            TaxonName nameUsedInSource, String originalInfo){
         NamedSource result = NewInstance(type, id, idNamespace, citation, microReference);
         result.setNameUsedInSource(nameUsedInSource);
-        result.setOriginalNameString(originalNameString);
+        result.setOriginalInfo(originalInfo);
         return result;
     }
 
     public static NamedSource NewInstance(OriginalSourceType type, String id, String idNamespace,
-        Reference citation, String microReference, TaxonName nameUsedInSource, String originalNameString, ICdmTarget target){
-        NamedSource result = NewInstance(type, id, idNamespace, citation, microReference, nameUsedInSource, originalNameString);
+        Reference citation, String microReference, TaxonName nameUsedInSource, String originalInfo, ICdmTarget target){
+        NamedSource result = NewInstance(type, id, idNamespace, citation, microReference, nameUsedInSource, originalInfo);
         result.setCdmSource(target);
         return result;
     }
@@ -93,10 +94,10 @@ public class NamedSource extends NamedSourceBase {
     }
 
 
-    public static NamedSource NewPrimarySourceInstance(Reference citation, String microReference, TaxonName nameUsedInSource, String originalNameString){
+    public static NamedSource NewPrimarySourceInstance(Reference citation, String microReference, TaxonName nameUsedInSource, String originalInfo){
         NamedSource result = NewPrimarySourceInstance(citation, microReference);
         result.setNameUsedInSource(nameUsedInSource);
-        result.setOriginalNameString(originalNameString);
+        result.setOriginalInfo(originalInfo);
         return result;
     }
 
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/OriginalSourceBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/OriginalSourceBase.java
index fa82d49113..7e190ac670 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/OriginalSourceBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/OriginalSourceBase.java
@@ -62,9 +62,9 @@ import eu.etaxonomy.cdm.strategy.merge.MergeMode;
     "type",
 	"idInSource",
     "idNamespace",
-    "originalNameString",
     "citation",
     "citationMicroReference",
+    "originalInfo",
     "cdmSource",
     "links"
 })
@@ -114,8 +114,8 @@ public abstract class OriginalSourceBase
     @XmlElement(name = "CitationMicroReference")
     private String citationMicroReference;
 
-    @XmlElement(name = "OriginalNameString")
-    private String originalNameString;
+    @XmlElement(name = "OriginalInfo")
+    private String originalInfo;
 
     @XmlElement(name = "CdmSource")
     @XmlIDREF
@@ -192,11 +192,11 @@ public abstract class OriginalSourceBase
         this.citationMicroReference = citationMicroReference;
     }
 
-    public String getOriginalNameString(){
-        return this.originalNameString;
+    public String getOriginalInfo(){
+        return this.originalInfo;
     }
-    public void setOriginalNameString(String originalNameString){
-        this.originalNameString = originalNameString;
+    public void setOriginalInfo(String originalInfo){
+        this.originalInfo = originalInfo;
     }
 
 	@Override
@@ -268,7 +268,7 @@ public abstract class OriginalSourceBase
 		}
 
 		//no changes to: type, idInSource, idNamespace,
-		//   citation, citationMicroReference, originalNameString
+		//   citation, citationMicroReference, originalInfo
 		return result;
 	}
 
@@ -293,7 +293,7 @@ public abstract class OriginalSourceBase
 	        && (excludeType || this.type == null)
 	        && this.getCitation() == null
 	        && isBlank(this.getCitationMicroReference())
-	        && isBlank(this.getOriginalNameString())
+	        && isBlank(this.getOriginalInfo())
 	        && isBlank(this.getIdInSource())
 	        && isBlank(this.getIdNamespace())
 	        && this.links.isEmpty()
@@ -332,7 +332,7 @@ public abstract class OriginalSourceBase
 
         if(thisCitationId != otherCitationId
                 || !StringUtils.equals(this.getCitationMicroReference(), other.getCitationMicroReference())
-                || !StringUtils.equals(this.getOriginalNameString(), other.getOriginalNameString())
+                || !StringUtils.equals(this.getOriginalInfo(), other.getOriginalInfo())
                         ){
             return false;
         }
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java
index 7ee06b0052..4ff6086236 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java
@@ -216,15 +216,15 @@ public abstract class NameCacheStrategyBase
         //Hibernate.initialize(currentName.getRelationsToThisName());
         TaxonName originalName = currentName.getOriginalSpelling();
         if (originalName != null){
-            String originalNameString;
+            String originalInfo;
             tags.add(TaggedText.NewSeparatorInstance(" [as \""));
             if (!originalName.isNonViral()){
-                originalNameString = originalName.getTitleCache();
-                tags.add(new TaggedText(TagEnum.name, originalNameString));
+                originalInfo = originalName.getTitleCache();
+                tags.add(new TaggedText(TagEnum.name, originalInfo));
             }else{
                 INonViralName originalNvName = CdmBase.deproxy(originalName);
-                originalNameString = makeOriginalNameString(originalNvName, tags);
-                for (String split : originalNameString.split(" ")){
+                originalInfo = makeOriginalInfo(originalNvName, tags);
+                for (String split : originalInfo.split(" ")){
                     if (split.matches(NonViralNameParserImplRegExBase.infraSpeciesMarker)
                             || split.matches(NonViralNameParserImplRegExBase.oldInfraSpeciesMarker)) {
                         tags.add(new TaggedText(TagEnum.rank, split));
@@ -239,7 +239,7 @@ public abstract class NameCacheStrategyBase
         }
     }
 
-    private String makeOriginalNameString(INonViralName originalName,
+    private String makeOriginalInfo(INonViralName originalName,
             List<TaggedText> currentNameTags) {
         //use cache if necessary
         String cacheToUse = null;
@@ -255,21 +255,21 @@ public abstract class NameCacheStrategyBase
         }
         //use atomized data
         //get originalNameParts array
-        String originalNameString = originalName.getNameCache();
-        if (originalNameString == null){
-            originalNameString = originalName.getTitleCache();
+        String originalInfo = originalName.getNameCache();
+        if (originalInfo == null){
+            originalInfo = originalName.getTitleCache();
         }
-        if (originalNameString == null){  //should not happen
-            originalNameString = originalName.getFullTitleCache();
+        if (originalInfo == null){  //should not happen
+            originalInfo = originalName.getFullTitleCache();
         }
-        String[] originalNameSplit = originalNameString.split("\\s+");
+        String[] originalNameSplit = originalInfo.split("\\s+");
 
         //get current name parts
         String currentNameString = createString(currentNameTags);
         String[] currentNameSplit = currentNameString.split("\\s+");
 
         //compute string
-        String result = originalNameString;
+        String result = originalInfo;
         Integer firstDiff = null;
         Integer lastDiff = -1;
         for (int i = 0; i < Math.min(originalNameSplit.length, currentNameSplit.length); i++){
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java
index 6a1d123585..e2a7e70db8 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java
@@ -406,10 +406,10 @@ public class NonViralNameParserImpl
      * Tries to create the best name (without authors) that makes an original spelling name for the nameToBeFilled.
      */
     private void handleOriginalSpelling(INonViralName nameToBeFilled) {
-        if (nameToBeFilled.getNomenclaturalSource()== null || CdmUtils.isBlank(nameToBeFilled.getNomenclaturalSource().getOriginalNameString())){
+        if (nameToBeFilled.getNomenclaturalSource()== null || CdmUtils.isBlank(nameToBeFilled.getNomenclaturalSource().getOriginalInfo())){
             return;
         }
-        String originalNameString = nameToBeFilled.getNomenclaturalSource().getOriginalNameString();
+        String originalInfo = nameToBeFilled.getNomenclaturalSource().getOriginalInfo();
 
         final int n = 5;
         String nameSplit[] = new String[n];
@@ -418,7 +418,7 @@ public class NonViralNameParserImpl
         nameSplit[2] = nameToBeFilled.getSpecificEpithet();
         nameSplit[3] = nameToBeFilled.getRank()== null? null : nameToBeFilled.getRank().getAbbreviation();
         nameSplit[4] = nameToBeFilled.getInfraSpecificEpithet();
-        String originalNameSplit[] = originalNameString.split(" ");
+        String originalNameSplit[] = originalInfo.split(" ");
 
         int bestOffset = -1;
         int bestDiff = Integer.MAX_VALUE;
@@ -465,7 +465,7 @@ public class NonViralNameParserImpl
         originalName.setInfraSpecificEpithet(finalSplit[4]);
 
         nameToBeFilled.setOriginalSpelling(originalName);
-        nameToBeFilled.setOriginalNameString(null);
+        nameToBeFilled.setOriginalInfo(null);
         return;
     }
 
@@ -521,7 +521,7 @@ public class NonViralNameParserImpl
 	}
 
 	/**
-     * Extracts the original spelling string and adds it to the original source as <code>originalNameString</code>.
+     * Extracts the original spelling string and adds it to the original source as <code>originalInfo</code>.
      * The original spelling part is deleted from the reference String.
      * @return  String the new (shortend) reference String
      */
@@ -534,7 +534,7 @@ public class NonViralNameParserImpl
             String originalSpellingPhrase = hasOrginalSpellingMatcher.group(0);
             String originalSpellingStr = originalSpellingPhrase.substring(originalSpellingStart.length());
             originalSpellingStr = originalSpellingStr.substring(0, originalSpellingStr.length() - originalSpellingEnd.length()+1);
-            nameToBeFilled.setOriginalNameString(originalSpellingStr);
+            nameToBeFilled.setOriginalInfo(originalSpellingStr);
             fullString = fullString.replace(originalSpellingPhrase, "").trim();
         }
 
diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TypeDesignationBaseTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TypeDesignationBaseTest.java
index 12d51d0166..1eed150952 100644
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TypeDesignationBaseTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TypeDesignationBaseTest.java
@@ -31,10 +31,10 @@ public class TypeDesignationBaseTest extends EntityTestBase {
         SpecimenTypeDesignationStatus status = SpecimenTypeDesignationStatus.HOLOTYPE();
         Reference citation = ReferenceFactory.newBook();
         String microCitation = "p. 123";
-        String originalNameString = "orig. name";
+        String originalInfo = "orig. info";
         boolean isNotDesignated = true;
         SpecimenTypeDesignation originalDesignation = name1.addSpecimenTypeDesignation(specimen, status,
-                citation, microCitation, originalNameString, isNotDesignated, false);
+                citation, microCitation, originalInfo, isNotDesignated, false);
         Registration registration1 = Registration.NewInstance();
         registration1.addTypeDesignation(originalDesignation);
 
diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java
index b1b1dcac7e..a8684500bd 100644
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java
@@ -322,7 +322,7 @@ public class DefaultMatchStrategyTest extends TermTestBase {
 //		//name relations
 //		botName2.addBasionym(botName3, book1, "p.22", null);
 //		Specimen specimen1 = Specimen.NewInstance();
-//		botName2.addSpecimenTypeDesignation(specimen1, SpecimenTypeDesignationStatus.HOLOTYPE(), book2, "p.56", "originalNameString", false, true);
+//		botName2.addSpecimenTypeDesignation(specimen1, SpecimenTypeDesignationStatus.HOLOTYPE(), book2, "p.56", "originalInfo", false, true);
 //
 //		//descriptions
 //		TaxonNameDescription description1 = TaxonNameDescription.NewInstance();
diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
index 6d05722ee7..89af7abc81 100644
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
@@ -277,7 +277,7 @@ public class DefaultMergeStrategyTest extends TermTestBase {
 		//name relations
 		botName2.addBasionym(botName3, book1, "p.22", null, null);
 		DerivedUnit specimen1 = DerivedUnit.NewPreservedSpecimenInstance();
-		botName2.addSpecimenTypeDesignation(specimen1, SpecimenTypeDesignationStatus.HOLOTYPE(), book2, "p.56", "originalNameString", false, true);
+		botName2.addSpecimenTypeDesignation(specimen1, SpecimenTypeDesignationStatus.HOLOTYPE(), book2, "p.56", "originalInfo", false, true);
 
 		//descriptions
 		TaxonNameDescription description1 = TaxonNameDescription.NewInstance();
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java
index b0ffcd0acb..cf32c345f7 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java
@@ -995,7 +995,7 @@ public class FullCoverageDataGenerator {
 		//source
 		IdentifiableSource source = identifiableEntity.addSource(OriginalSourceType.Import, "id", "idNamespace",
 				getReference(), "123");
-		source.setOriginalNameString("original name");
+		source.setOriginalInfo("original name");
 
 		//LSID
 		 try {
diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.java
index c338c2b2ab..d465da4c37 100644
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.java
@@ -160,7 +160,7 @@ public class TypeDesignationDaoHibernateImplTest extends CdmTransactionalIntegra
 		desig1.setUuid(UUID.fromString("ceca086e-e8d3-444e-abfb-c47f76835130"));
 
 //		//REMOVE
-//		desig1.setOriginalNameString("orig");
+//		desig1.setOriginalInfo("orig");
 //
 		name1.addTypeDesignation(desig1, true);
 
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.testSaveTypeDesignationsWithAuditing-result.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.testSaveTypeDesignationsWithAuditing-result.xml
index 29447eaf8c..c63f00e50e 100644
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.testSaveTypeDesignationsWithAuditing-result.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.testSaveTypeDesignationsWithAuditing-result.xml
@@ -3,5 +3,5 @@
   <TAXONNAME UUID="8564287e-9654-4b8b-a38c-0ccdd9e885db" TITLECACHE="Name1"/>
   <TYPEDESIGNATIONBASE DTYPE="SpecimenTypeDesignation" UUID="ceca086e-e8d3-444e-abfb-c47f76835130"/>
   <TYPEDESIGNATIONBASE_AUD REVTYPE="0" DTYPE="SpecimenTypeDesignation" UUID="ceca086e-e8d3-444e-abfb-c47f76835130"/>
-  <!-- for testing  <TYPEDESIGNATIONBASE_AUD REVTYPE="0" DTYPE="SpecimenTypeDesignation" UUID="[null]" ORIGINALNAMESTRING="orig" NOTDESIGNATED="false"/> -->
+  <!-- for testing  <TYPEDESIGNATIONBASE_AUD REVTYPE="0" DTYPE="SpecimenTypeDesignation" UUID="[null]" ORIGINALINFO="orig" NOTDESIGNATED="false"/> -->
 </dataset>
\ No newline at end of file
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/validation/EntityValidationDaoHibernateImplTest.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/validation/EntityValidationDaoHibernateImplTest.xml
index e9535ab3d9..8aa5d8affd 100644
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/validation/EntityValidationDaoHibernateImplTest.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/validation/EntityValidationDaoHibernateImplTest.xml
@@ -22,7 +22,7 @@
 		ENTITYVALIDATION_ID="1" PROPERTYPATH="titleCache" INVALIDVALUE="Foo" SEVERITY="Error"
 		MESSAGE="You did something wrong with the title cache" VALIDATOR="com.example.TitleCacheValidator" />
 	<ENTITYCONSTRAINTVIOLATION ID="2" CREATED="2008-12-10 09:56:07.0" UUID="2d2fbff6-fd5c-4e5f-b2b6-8b06b896642f"
-		ENTITYVALIDATION_ID="2" PROPERTYPATH="originalNameString" INVALIDVALUE="Bar" SEVERITY="Error"
+		ENTITYVALIDATION_ID="2" PROPERTYPATH="originalINFO" INVALIDVALUE="Bar" SEVERITY="Error"
 		MESSAGE="Bar is not a valid value for original name string" VALIDATOR="com.example.NameValidator" />
 	<ENTITYCONSTRAINTVIOLATION ID="3" CREATED="2008-12-10 09:56:07.0" UUID="39b78238-0aa8-4f1e-8f42-3502b0270e89"
 		ENTITYVALIDATION_ID="2" PROPERTYPATH="doubtful" INVALIDVALUE="3" SEVERITY="Warning" MESSAGE="doubtful must be either 1 or 0"
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/jdbc/validation/EntityValidationCrudJdbcImplTest.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/jdbc/validation/EntityValidationCrudJdbcImplTest.xml
index 31628d30be..b8338a5c77 100644
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/jdbc/validation/EntityValidationCrudJdbcImplTest.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/jdbc/validation/EntityValidationCrudJdbcImplTest.xml
@@ -18,7 +18,7 @@
 		ENTITYVALIDATION_ID="1" PROPERTYPATH="titleCache" INVALIDVALUE="Foo" SEVERITY="Error"
 		MESSAGE="You did something wrong with the title cache" VALIDATOR="com.example.TitleCacheValidator" />
 	<ENTITYCONSTRAINTVIOLATION ID="2" CREATED="2008-12-10 09:56:07.0" UUID="2d2fbff6-fd5c-4e5f-b2b6-8b06b896642f"
-		ENTITYVALIDATION_ID="2" PROPERTYPATH="originalNameString" INVALIDVALUE="Bar" SEVERITY="Error"
+		ENTITYVALIDATION_ID="2" PROPERTYPATH="originalInfo" INVALIDVALUE="Bar" SEVERITY="Error"
 		MESSAGE="Bar is not a valid value for original name string" VALIDATOR="com.example.NameValidator" />
 	<ENTITYCONSTRAINTVIOLATION ID="3" CREATED="2008-12-10 09:56:07.0" UUID="39b78238-0aa8-4f1e-8f42-3502b0270e89"
 		ENTITYVALIDATION_ID="2" PROPERTYPATH="doubtful" INVALIDVALUE="3" SEVERITY="Warning" MESSAGE="doubtful must be either 1 or 0"
diff --git a/cdmlib-print/src/test/resources/20130403-1752-output.xml b/cdmlib-print/src/test/resources/20130403-1752-output.xml
index 4af520c50d..8cfe551fe3 100644
Binary files a/cdmlib-print/src/test/resources/20130403-1752-output.xml and b/cdmlib-print/src/test/resources/20130403-1752-output.xml differ
diff --git a/cdmlib-print/src/test/resources/eu/etaxonomy/cdm/print/out/odf/input.xml b/cdmlib-print/src/test/resources/eu/etaxonomy/cdm/print/out/odf/input.xml
index f35c286864..3504a673c4 100644
Binary files a/cdmlib-print/src/test/resources/eu/etaxonomy/cdm/print/out/odf/input.xml and b/cdmlib-print/src/test/resources/eu/etaxonomy/cdm/print/out/odf/input.xml differ
diff --git a/cdmlib-print/src/test/resources/eu/etaxonomy/cdm/print/out/odf/single_input.xml b/cdmlib-print/src/test/resources/eu/etaxonomy/cdm/print/out/odf/single_input.xml
index 2136cc6667..17c68449ba 100644
--- a/cdmlib-print/src/test/resources/eu/etaxonomy/cdm/print/out/odf/single_input.xml
+++ b/cdmlib-print/src/test/resources/eu/etaxonomy/cdm/print/out/odf/single_input.xml
@@ -354,7 +354,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:28.948+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">c9676be0-9f6d-4198-b832-9a3b6681e828</uuid>
@@ -518,7 +518,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.329+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">5ce90dfd-becf-466d-864e-a72c1ade8549</uuid>
@@ -682,7 +682,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.332+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">e47f8293-bcc9-4a70-b95e-c46e72b2638b</uuid>
@@ -846,7 +846,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.335+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">4d6c7db0-f57b-44d5-923c-65117d010c45</uuid>
@@ -1010,7 +1010,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.338+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">22f6ef25-63be-44de-92a1-67047443a121</uuid>
@@ -1173,7 +1173,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.345+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">0f447c25-5fe0-41ff-a62e-d719dd445f2c</uuid>
@@ -1337,7 +1337,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.348+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">cd21076e-4b6f-4973-a4a5-0ccaa0f2466a</uuid>
@@ -1500,7 +1500,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.351+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">c52aca45-e5f0-4495-b41a-a0a4299b20de</uuid>
@@ -1664,7 +1664,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.355+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">e0f40055-b4c0-4982-abac-2c86dda5f2a2</uuid>
@@ -1827,7 +1827,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.357+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">3d8b2646-2068-47ef-a093-85bb6a038490</uuid>
@@ -1991,7 +1991,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.360+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">46bd1c91-4e9c-4c22-ad98-c247b611d741</uuid>
@@ -2154,7 +2154,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.363+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">80c96468-5ca0-4a10-add0-c4968bbd6308</uuid>
@@ -2317,7 +2317,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.369+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">4322ecb2-a18d-4a47-8f44-fdda630b0d95</uuid>
@@ -2481,7 +2481,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.372+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">900d9732-0c4d-42e5-a874-45f7d2c3a9f5</uuid>
@@ -2645,7 +2645,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.375+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">4bce4788-b63d-4bdf-bc98-6ab8cb4129db</uuid>
@@ -2808,7 +2808,7 @@
                                     <idInSource type="string"/>
                                     <idNamespace type="string"/>
                                     <nameUsedInSource class="object" null="true"/>
-                                    <originalNameString type="string"/>
+                                    <originalInfo type="string"/>
                                     <updated type="string">2010-04-28T17:30:29.379+02:00</updated>
                                     <updatedBy class="object" null="true"/>
                                     <uuid type="string">768d2563-0191-4b00-9967-adec0e1f8527</uuid>
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
index 32f24e60db..11cab528ec 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
@@ -2340,9 +2340,9 @@ public class DerivedUnitFacade {
 	 * Creates an {@link IOriginalSource orignal source} or type ,
 	 * adds it to the specimen and returns it.
 	 */
-	public IdentifiableSource addSource(OriginalSourceType type, Reference reference, String microReference, String originalNameString) {
+	public IdentifiableSource addSource(OriginalSourceType type, Reference reference, String microReference, String originalInfo) {
 		IdentifiableSource source = IdentifiableSource.NewInstance(type, null, null, reference, microReference);
-		source.setOriginalNameString(originalNameString);
+		source.setOriginalInfo(originalInfo);
 		addSource(source);
 		return source;
 	}
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptiveDataSetService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptiveDataSetService.java
index 45f674c624..a3fd312e30 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptiveDataSetService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptiveDataSetService.java
@@ -771,11 +771,11 @@ public class DescriptiveDataSetService
             clone.getSources().forEach(source -> {
                 if(descriptionElementBase instanceof CategoricalData){
                     TextData label = new DefaultCategoricalDescriptionBuilder().build((CategoricalData) descriptionElementBase, Arrays.asList(new Language[]{Language.DEFAULT()}));
-                    source.setOriginalNameString(label.getText(Language.DEFAULT()));
+                    source.setOriginalInfo(label.getText(Language.DEFAULT()));
                 }
                 else if(descriptionElementBase instanceof QuantitativeData){
                     TextData label = new DefaultQuantitativeDescriptionBuilder().build((QuantitativeData) descriptionElementBase, Arrays.asList(new Language[]{Language.DEFAULT()}));
-                    source.setOriginalNameString(label.getText(Language.DEFAULT()));
+                    source.setOriginalInfo(label.getText(Language.DEFAULT()));
                 }
             });
         }
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml
index f619041818..14a8333aeb 100644
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml
@@ -104,22 +104,22 @@
   <DESCRIPTIONELEMENTBASE DTYPE="CommonTaxonName" ID="5013" UUID="2f6041e9-4883-4994-9aa9-e68b74abdeba" NAME="Veilchen3" FEATURE_ID="933" INDESCRIPTION_ID="5006" LANGUAGE_ID="349" ASSOCIATEDSPECIMENOROBSERVATION_ID="[null]"/>
   <DESCRIPTIONELEMENTBASE DTYPE="TextData"        ID="5014" UUID="4e68ce0d-810f-47e4-9ba3-a06a6dd3f1d7" NAME="[null]" FEATURE_ID="937" INDESCRIPTION_ID="5007" ASSOCIATEDSPECIMENOROBSERVATION_ID="[null]"/>
   <DESCRIPTIONELEMENTBASE DTYPE="TextData"        ID="5015" UUID="ec9ddf11-06d4-4dc4-b43f-eaba430fb704" NAME="[null]" FEATURE_ID="937" INDESCRIPTION_ID="5007" ASSOCIATEDSPECIMENOROBSERVATION_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5000" SOURCEDELEMENT_ID="5000" UUID="c94034e0-4e7a-4a6b-98e6-35740f9b1938" SOURCETYPE="PTS" CITATIONMICROREFERENCE="text: " ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5003" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5001" SOURCEDELEMENT_ID="5001" UUID="5ccd2d5e-48f5-4358-859e-b98f205ebdb8" SOURCETYPE="PTS" CITATIONMICROREFERENCE="name: " ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5002" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5002" SOURCEDELEMENT_ID="5002" UUID="2121d87f-6ab4-4223-84bc-0637f05fd4ba" SOURCETYPE="PTS" ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5004" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5003" SOURCEDELEMENT_ID="5003" UUID="e7724521-4a92-419e-a037-af60c4cbcc0a" SOURCETYPE="PTS" ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5005" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5004" SOURCEDELEMENT_ID="5004" UUID="e66586de-71e6-4142-9d6f-c6071b924254" SOURCETYPE="PTS" CITATIONMICROREFERENCE="name: " ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5007" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5005" SOURCEDELEMENT_ID="5005" UUID="3e1bcfd2-a696-4dc9-93ed-41b584d01e7a" SOURCETYPE="PTS" CITATIONMICROREFERENCE="text: " ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5008" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5006" SOURCEDELEMENT_ID="5006" UUID="bcf2da2d-40dc-4a17-a8a7-6f5598fc1bf4" SOURCETYPE="PTS" CITATIONMICROREFERENCE="text: " ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5012" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5007" SOURCEDELEMENT_ID="5007" UUID="72998787-6a72-4f36-92e0-568669737b15" SOURCETYPE="PTS" CITATIONMICROREFERENCE="name: " ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5011" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5008" SOURCEDELEMENT_ID="5008" UUID="bd59384d-d4fe-4c16-8daa-efbe786c67a3" SOURCETYPE="PTS" ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5013" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5009" SOURCEDELEMENT_ID="5009" UUID="7bb9fb99-121c-4169-a38e-e9d6df666588" SOURCETYPE="PTS" ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5014" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5010" SOURCEDELEMENT_ID="5010" UUID="d5dd1135-f7dd-4586-9e30-6df06d0011f8" SOURCETYPE="PTS" CITATIONMICROREFERENCE="text: " ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5017" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5011" SOURCEDELEMENT_ID="5011" UUID="53c2a00e-e584-4163-8060-e92d3e1f8755" SOURCETYPE="PTS" CITATIONMICROREFERENCE="name: " ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5016" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5012" SOURCEDELEMENT_ID="5012" UUID="59a60dcf-8e56-4c38-a475-178b07ccf663" SOURCETYPE="PTS" CITATIONMICROREFERENCE="text: " ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5021" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5013" SOURCEDELEMENT_ID="5013" UUID="5bcc3fc2-ac57-4577-8199-0a2d766f1263" SOURCETYPE="PTS" CITATIONMICROREFERENCE="name: " ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5020" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5014" SOURCEDELEMENT_ID="5014" UUID="6177f8ad-16dd-4cab-ae42-aabda9d91e62" SOURCETYPE="PTS" ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5022" NAMEUSEDINSOURCE_ID="[null]"/>
-  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5015" SOURCEDELEMENT_ID="5015" UUID="22d375e5-38d0-48e1-a22b-86ee50c17d3a" SOURCETYPE="PTS" ORIGINALNAMESTRING="[null]" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5023" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5000" SOURCEDELEMENT_ID="5000" UUID="c94034e0-4e7a-4a6b-98e6-35740f9b1938" SOURCETYPE="PTS" CITATIONMICROREFERENCE="text: " IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5003" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5001" SOURCEDELEMENT_ID="5001" UUID="5ccd2d5e-48f5-4358-859e-b98f205ebdb8" SOURCETYPE="PTS" CITATIONMICROREFERENCE="name: " IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5002" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5002" SOURCEDELEMENT_ID="5002" UUID="2121d87f-6ab4-4223-84bc-0637f05fd4ba" SOURCETYPE="PTS" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5004" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5003" SOURCEDELEMENT_ID="5003" UUID="e7724521-4a92-419e-a037-af60c4cbcc0a" SOURCETYPE="PTS" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5005" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5004" SOURCEDELEMENT_ID="5004" UUID="e66586de-71e6-4142-9d6f-c6071b924254" SOURCETYPE="PTS" CITATIONMICROREFERENCE="name: " IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5007" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5005" SOURCEDELEMENT_ID="5005" UUID="3e1bcfd2-a696-4dc9-93ed-41b584d01e7a" SOURCETYPE="PTS" CITATIONMICROREFERENCE="text: " IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5008" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5006" SOURCEDELEMENT_ID="5006" UUID="bcf2da2d-40dc-4a17-a8a7-6f5598fc1bf4" SOURCETYPE="PTS" CITATIONMICROREFERENCE="text: " IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5012" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5007" SOURCEDELEMENT_ID="5007" UUID="72998787-6a72-4f36-92e0-568669737b15" SOURCETYPE="PTS" CITATIONMICROREFERENCE="name: " IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5011" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5008" SOURCEDELEMENT_ID="5008" UUID="bd59384d-d4fe-4c16-8daa-efbe786c67a3" SOURCETYPE="PTS" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5013" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5009" SOURCEDELEMENT_ID="5009" UUID="7bb9fb99-121c-4169-a38e-e9d6df666588" SOURCETYPE="PTS" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5014" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5010" SOURCEDELEMENT_ID="5010" UUID="d5dd1135-f7dd-4586-9e30-6df06d0011f8" SOURCETYPE="PTS" CITATIONMICROREFERENCE="text: " IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5017" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5011" SOURCEDELEMENT_ID="5011" UUID="53c2a00e-e584-4163-8060-e92d3e1f8755" SOURCETYPE="PTS" CITATIONMICROREFERENCE="name: " IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5016" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5012" SOURCEDELEMENT_ID="5012" UUID="59a60dcf-8e56-4c38-a475-178b07ccf663" SOURCETYPE="PTS" CITATIONMICROREFERENCE="text: " IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5021" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5013" SOURCEDELEMENT_ID="5013" UUID="5bcc3fc2-ac57-4577-8199-0a2d766f1263" SOURCETYPE="PTS" CITATIONMICROREFERENCE="name: " IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5020" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5014" SOURCEDELEMENT_ID="5014" UUID="6177f8ad-16dd-4cab-ae42-aabda9d91e62" SOURCETYPE="PTS" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5022" NAMEUSEDINSOURCE_ID="[null]"/>
+  <ORIGINALSOURCEBASE DTYPE="DescriptionElementSource" ID="5015" SOURCEDELEMENT_ID="5015" UUID="22d375e5-38d0-48e1-a22b-86ee50c17d3a" SOURCETYPE="PTS" IDINSOURCE="[null]" IDNAMESPACE="[null]" CITATION_ID="5023" NAMEUSEDINSOURCE_ID="[null]"/>
 
   <DESCRIPTIONBASE DTYPE="TaxonNameDescription" ID="5000" UUID="0bf25a17-29e4-4922-ad87-c849f9cd6940" PROTECTEDTITLECACHE="false" TITLECACHE="-title cache generation not implemented-" IMAGEGALLERY="false" ISDEFAULT="false" SPECIMEN_ID="[null]" TAXON_ID="[null]" TAXONNAME_ID="5000"/>
   <DESCRIPTIONBASE DTYPE="TaxonDescription" ID="5001" UUID="96bb1940-1f79-41a1-b8a3-fa46ed6be467" UPDATED="2013-10-31 20:42:25.832" PROTECTEDTITLECACHE="false" TITLECACHE="Taxon description" IMAGEGALLERY="false" ISDEFAULT="false" SPECIMEN_ID="[null]" TAXON_ID="5001" TAXONNAME_ID="[null]"/>
diff --git a/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql b/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql
index 94b644e95f..7781dc042f 100644
--- a/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql
+++ b/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql
@@ -3651,7 +3651,7 @@ CREATE SEQUENCE PUBLIC.SYSTEM_SEQUENCE_10A55F0A_EE57_42DB_8046_6240A60AD0EC STAR
         CITATIONMICROREFERENCE varchar(255),
         IDINSOURCE varchar(255),
         IDNAMESPACE varchar(255),
-        ORIGINALNAMESTRING varchar(255),
+        ORIGINALINFO varchar(255),
         SOURCETYPE varchar(255),
         CREATEDBY_ID integer,
         UPDATEDBY_ID integer,
@@ -3689,7 +3689,7 @@ CREATE SEQUENCE PUBLIC.SYSTEM_SEQUENCE_10A55F0A_EE57_42DB_8046_6240A60AD0EC STAR
         CITATIONMICROREFERENCE varchar(255),
         IDINSOURCE varchar(255),
         IDNAMESPACE varchar(255),
-        ORIGINALNAMESTRING varchar(255),
+        ORIGINALINFO varchar(255),
         SOURCETYPE varchar(255),
         CREATEDBY_ID integer,
         UPDATEDBY_ID integer,
diff --git a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
index a5974281f9..9a6627911e 100644
--- a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
+++ b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
@@ -1294,7 +1294,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     ORDERRELEVANT CDATA #IMPLIED
     NAME CDATA #IMPLIED
     PERIOD_START  CDATA #IMPLIED
@@ -1340,7 +1340,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
@@ -1767,7 +1767,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     DOUBTFUL CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
     CODEEDITION CDATA #IMPLIED
@@ -1802,7 +1802,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     DOUBTFUL CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
     CODEEDITION CDATA #IMPLIED
@@ -2233,7 +2233,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     DOUBTFUL CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
     CODEEDITION CDATA #IMPLIED
@@ -2268,7 +2268,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     DOUBTFUL CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
     CODEEDITION CDATA #IMPLIED
@@ -2301,7 +2301,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
     CODEEDITION CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
@@ -2334,7 +2334,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
     CODEEDITION CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
@@ -2365,7 +2365,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     IDINSOURCE CDATA #IMPLIED
     IDNAMESPACE CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
@@ -2386,7 +2386,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     IDINSOURCE CDATA #IMPLIED
     IDNAMESPACE CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
@@ -3653,7 +3653,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     DOUBTFUL CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
@@ -3686,7 +3686,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     DOUBTFUL CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
@@ -3813,7 +3813,7 @@
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     NOTDESIGNATED CDATA #IMPLIED
     CONSERVEDTYPE CDATA #IMPLIED
     LECTOTYPE CDATA #IMPLIED
@@ -3850,7 +3850,7 @@
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
-    ORIGINALNAMESTRING CDATA #IMPLIED
+    ORIGINALINFO CDATA #IMPLIED
     NOTDESIGNATED CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
