diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..151573f9b
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,98 @@
+# CollectionSpace Application Changelog
+
+## 8.3.0
+
+### Authorities
+
+#### Chronology
+
+* Remove `ui-type="enum"` from identifierCitation
+
+### Procedures
+
+#### Acquisition
+
+* Add free text field `acquisitionDescription`
+* Add parties involved group `partiesInvovledGroupList/partiesInvolvedGroup`
+
+#### Consultation
+
+* Add repeatable field `consultationOutcomes/consultationOutcome`
+
+#### Deaccession
+
+* Add parties involved group `partiesInvovledGroupList/partiesInvolvedGroup`
+
+### CollectionObject
+
+* **Anthro** Add material/technique description free text field
+* Add repeating autocomplete field `controlledContentPlaces/controlledContentPlace`
+
+### Media
+
+* Add `mini="list"` to alt text
+
+### Term Lists
+
+#### Annotation Type
+
+**All Profiles**
+
+* Update default terms to catalog note, legacy data note, and staff note
+
+#### Inventory Status
+
+**Core, Anthro, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials**
+
+* Update default terms to deaccessions, in storage, missing, off site, on loan, and on display
+
+#### NAGPRA Involved Role
+
+**FCART, Materials, PublicArt**
+
+* Added existing default terms to profile
+
+#### Organization Types
+
+**Core, Anthro, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials**
+
+* Add federally-recognized tribe and non-federally-recognized tribe to default terms
+
+### Misc
+
+* Added SMTP environment variables
+* Added displayName to tenant binding output for authority records
+
+## 8.2.0
+
+### Procedures
+
+### CollectionObject
+
+* Add repeating field `objectProductionAgents/objectProductionAgent`
+
+### Object Exit
+
+* Add field `note`
+
+### Held-in-Trust
+
+* Add field `note`
+
+### Summary Documentation
+
+* Add field `note`
+
+### NAGPRA Inventory
+
+* Add field `note`
+
+### Profiles
+
+#### Anthro
+
+* Remove `anthroOwnershipAccess` from `CollectionObject`
+
+#### FCART
+
+* Add `deaccessionreason` term list to fcart profile instance vocabularies
diff --git a/cspi-installation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java b/cspi-installation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java
index e8d94edf6..c5d53e2a1 100644
--- a/cspi-installation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java
+++ b/cspi-installation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java
@@ -716,7 +716,6 @@ private void doRefnameDisplayNameField(Record record, Element ele, Namespace thi
      * @param thisns
      * @param isAuthority
      */
-
 	private void doDocHandlerParams(Record r, Element el, Namespace nsservices2, Boolean isAuthority) {
 		//<service:DocHandlerParams>
 		Element dhele = el.addElement(new QName("DocHandlerParams", nsservices2));
@@ -902,6 +901,7 @@ private void addAuthorities(Record r, Element el, String serviceBindingVersion)
 		bindingsForAuthority.addAttribute("id", r.getServicesTenantAuthPl());
 		bindingsForAuthority.addAttribute("type", RECORD_TYPE_UTILITY);
 		bindingsForAuthority.addAttribute("version", serviceBindingVersion);
+		bindingsForAuthority.addAttribute("displayName", r.getServicesTenantAuthDisplayName());
 		bindingsForAuthority.addAttribute(Record.SUPPORTS_REPLICATING, Boolean.toString(r.supportsReplicating()));
 		bindingsForAuthority.addAttribute(Record.REQUIRES_UNIQUE_SHORTID, Boolean.TRUE.toString());
 		String remoteClientConfigName = r.getRemoteClientConfigName();
@@ -952,7 +952,7 @@ private void addServiceBinding(Record r, Element el, Namespace nameSpace, Boolea
 			doDocHandlerParams(r, el, this.nsservices, isAuthority);
 
 			//<service:AuthorityInstanceList>
-			if (isAuthority == true || r.isType(RECORD_TYPE_VOCABULARY) == true) {
+			if (isAuthority || r.isType(RECORD_TYPE_VOCABULARY)) {
 				doAuthorityInstanceList(r, el, this.nsservices);
 			}
 
diff --git a/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Record.java b/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Record.java
index 1f91c87cd..1c9442336 100644
--- a/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Record.java
+++ b/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Record.java
@@ -38,6 +38,8 @@ public class Record implements FieldParent {
 	private static final String TYPE_AUTHORITY = "Authority";
 	private static final String TYPE_AUTHORITY_LOWERCASE = TYPE_AUTHORITY.toLowerCase();
 
+	public static final String AUTH_DISPLAY_NAME = "services-tenant-auth-display-name";
+
 	public static final String ELASTICSEARCH_INDEXED = "elasticsearchIndexed";
 	public static final String SUPPORTS_LOCKING = "supportslocking";
 	public static final String SUPPORTS_REPLICATING = "supportsReplicating";
@@ -257,6 +259,7 @@ public void setLastAuthorityProxy(Record lastAuthoriyProxy) {
 		utils.initStrings(section, "services-tenant-plural", utils.getString("services-tenant-singular") + "s");
 		utils.initStrings(section, "services-tenant-auth-singular", utils.getString("services-url"));
 		utils.initStrings(section, "services-tenant-auth-plural", utils.getString("services-tenant-singular") + "s");
+		utils.initStrings(section, AUTH_DISPLAY_NAME, utils.getString("services-tenant-singular"));
 
 		utils.initStrings(section, "services-schema-location", "http://services.collectionspace.org");
 
@@ -827,6 +830,10 @@ public String getServicesTenantAuthSg() {
 		return utils.getString("services-tenant-auth-singular");
 	}
 
+	public String getServicesTenantAuthDisplayName() {
+		return utils.getString(AUTH_DISPLAY_NAME);
+	}
+
 	/*
 	 * By convention, the value from getServicesTenantSg() is the Nuxeo doctype
 	 * name. However, if the record explicitly declares a doctype using the
@@ -1442,4 +1449,5 @@ public void setSortKey(String fieldId, String sortFieldId) {
 	public String getSortKey(String fieldId) {
 		return sortKeys.get(fieldId);
 	}
+
 }
diff --git a/pom.xml b/pom.xml
index ff6be464d..21cc16b55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<name>Root</name>
 
 	<properties>
-		<revision>8.1.0</revision>
+		<revision>8.3.0</revision>
 		<cspace.services.version>${revision}</cspace.services.version>
 		<temp.war.location>${basedir}/tmp</temp.war.location>
 		<cspace.tool.csmake>csmake</cspace.tool.csmake>
diff --git a/tomcat-main/src/main/resources/defaults/base-authority-chronology.xml b/tomcat-main/src/main/resources/defaults/base-authority-chronology.xml
index ee1d0f958..815745b91 100644
--- a/tomcat-main/src/main/resources/defaults/base-authority-chronology.xml
+++ b/tomcat-main/src/main/resources/defaults/base-authority-chronology.xml
@@ -4,6 +4,7 @@
 
   <services-tenant-auth-plural>Chronologyauthorities</services-tenant-auth-plural>
   <services-tenant-auth-singular>Chronologyauthority</services-tenant-auth-singular>
+	<services-tenant-auth-display-name>Chronology</services-tenant-auth-display-name>
   <services-tenant-singular>Chronology</services-tenant-singular>
   <services-tenant-plural>Chronologies</services-tenant-plural>
 
@@ -31,12 +32,12 @@
     <instance id="chronology-era">
       <web-url>era</web-url>
       <title-ref>era</title-ref>
-      <title>Era Chronologies</title>
+      <title>Era</title>
     </instance>
     <instance id="chronology-event">
       <web-url>event</web-url>
       <title-ref>event</title-ref>
-      <title>Event Chronologies</title>
+      <title>Event</title>
     </instance>
   </instances>
 
@@ -57,7 +58,7 @@
 
     <repeat id="identifierGroupList/identifierGroup">
       <field id="identifierValue" />
-      <field id="identifierCitation" autocomplete="true" ui-type="enum" />
+      <field id="identifierCitation" autocomplete="true" />
       <field id="identifierDate" />
     </repeat>
 
@@ -91,4 +92,4 @@
     <field id="proposed" mini="list" datatype="boolean" />
     <field id="deprecated" mini="list" datatype="boolean" />
   </section>
-</record>
\ No newline at end of file
+</record>
diff --git a/tomcat-main/src/main/resources/defaults/base-authority-citation.xml b/tomcat-main/src/main/resources/defaults/base-authority-citation.xml
index e9f61f71f..cc6e54295 100644
--- a/tomcat-main/src/main/resources/defaults/base-authority-citation.xml
+++ b/tomcat-main/src/main/resources/defaults/base-authority-citation.xml
@@ -5,6 +5,7 @@
 
 	<services-tenant-auth-singular>Citationauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Citationauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Citation</services-tenant-auth-display-name>
 	<services-tenant-singular>Citation</services-tenant-singular>
 
 	<services-instances-path>citationauthorities_common:http://collectionspace.org/services/citation,abstract-common-list/list-item</services-instances-path>
@@ -30,12 +31,12 @@
 		<instance id="citation-citation">
 			<web-url>citation</web-url>
 			<title-ref>citation</title-ref>
-			<title>Local Citations</title>
+			<title>Local</title>
 		</instance>
 		<instance id="citation-worldcat">
 			<web-url>worldcat</web-url>
 			<title-ref>worldcat</title-ref>
-			<title>WorldCat Citations</title>
+			<title>WorldCat</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/defaults/base-authority-concept.xml b/tomcat-main/src/main/resources/defaults/base-authority-concept.xml
index 9dcd42f57..49faf00d1 100644
--- a/tomcat-main/src/main/resources/defaults/base-authority-concept.xml
+++ b/tomcat-main/src/main/resources/defaults/base-authority-concept.xml
@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Conceptauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Conceptauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Concept</services-tenant-auth-display-name>
 	<services-tenant-singular>Concept</services-tenant-singular>
 	<services-tenant-doctype>Conceptitem</services-tenant-doctype>
 
@@ -33,17 +34,17 @@
 		<instance id="concept-concept">
 			<web-url>concept</web-url>
 			<title-ref>concept</title-ref>
-			<title>Associated Concepts</title>
+			<title>Associated</title>
 		</instance>
 		<instance id="concept-material_ca">
 			<web-url>material_ca</web-url>
 			<title-ref>material_ca</title-ref>
-			<title>Material Concepts</title>
+			<title>Material</title>
 		</instance>
 		<instance id="concept-activity">
 			<web-url>activity</web-url>
 			<title-ref>activity</title-ref>
-			<title>Activity Concepts</title>
+			<title>Activity</title>
 		</instance>
 		<instance id="concept-nomenclature">
 			<web-url>nomenclature</web-url>
@@ -65,18 +66,18 @@
 		<instance id="concept-occasion">
 			<web-url>occasion</web-url>
 			<title-ref>occasion</title-ref>
-			<title>Occasion Concepts</title>
+			<title>Occasion</title>
 		</instance>
 		<!-- NAGPRA Culture fields -->
 		<instance id="concept-ethculture">
 			<web-url>ethculture</web-url>
 			<title-ref>ethculture</title-ref>
-			<title>Ethnographic Cultures</title>
+			<title>Cultural Group</title>
 		</instance>
 		<instance id="concept-archculture">
 			<web-url>archculture</web-url>
 			<title-ref>archculture</title-ref>
-			<title>Archaeological Cultures</title>
+			<title>Archaeological Culture</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/defaults/base-authority-location.xml b/tomcat-main/src/main/resources/defaults/base-authority-location.xml
index 57aace77d..29b839227 100644
--- a/tomcat-main/src/main/resources/defaults/base-authority-location.xml
+++ b/tomcat-main/src/main/resources/defaults/base-authority-location.xml
@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Locationauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Locationauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Storage Location</services-tenant-auth-display-name>
 	<services-tenant-singular>Location</services-tenant-singular>
 	<services-tenant-doctype>Locationitem</services-tenant-doctype>
 
@@ -30,12 +31,12 @@
 		<instance id="location-location">
 			<web-url>location</web-url>
 			<title-ref>location</title-ref>
-			<title>Local Storage Locations</title>
+			<title>Local</title>
 		</instance>
 		<instance id="location-offsite_sla">
 			<web-url>offsite_sla</web-url>
 			<title-ref>offsite_sla</title-ref>
-			<title>Offsite Storage Locations</title>
+			<title>Offsite</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/defaults/base-authority-material.xml b/tomcat-main/src/main/resources/defaults/base-authority-material.xml
index 3e546d973..790efdb96 100644
--- a/tomcat-main/src/main/resources/defaults/base-authority-material.xml
+++ b/tomcat-main/src/main/resources/defaults/base-authority-material.xml
@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Materialauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Materialauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Material</services-tenant-auth-display-name>
 	<services-tenant-singular>Material</services-tenant-singular>
 	<services-tenant-doctype>Materialitem</services-tenant-doctype>
 
diff --git a/tomcat-main/src/main/resources/defaults/base-authority-organization.xml b/tomcat-main/src/main/resources/defaults/base-authority-organization.xml
index d1944f447..de2701156 100644
--- a/tomcat-main/src/main/resources/defaults/base-authority-organization.xml
+++ b/tomcat-main/src/main/resources/defaults/base-authority-organization.xml
@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-plural>Orgauthorities</services-tenant-auth-plural>
 	<services-tenant-auth-singular>Orgauthority</services-tenant-auth-singular>
+	<services-tenant-auth-display-name>Organization</services-tenant-auth-display-name>
 	<services-tenant-singular>Organization</services-tenant-singular>
 
 	<services-instances-path>orgauthorities_common:http://collectionspace.org/services/organization,abstract-common-list/list-item</services-instances-path>
@@ -31,12 +32,12 @@
 		<instance id="organization-organization">
 			<web-url>organization</web-url>
 			<title-ref>organization</title-ref>
-			<title>Local Organizations</title>
+			<title>Local</title>
 		</instance>
 		<instance id="organization-ulan_oa">
 			<web-url>ulan_oa</web-url>
 			<title-ref>ulan_oa</title-ref>
-			<title>ULAN Organizations</title>
+			<title>ULAN</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/defaults/base-authority-person.xml b/tomcat-main/src/main/resources/defaults/base-authority-person.xml
index 4a8d050b3..1b375e8ed 100644
--- a/tomcat-main/src/main/resources/defaults/base-authority-person.xml
+++ b/tomcat-main/src/main/resources/defaults/base-authority-person.xml
@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Personauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Personauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Person</services-tenant-auth-display-name>
 	<services-tenant-singular>Person</services-tenant-singular>
 
 	<services-instances-path>personauthorities_common:http://collectionspace.org/services/person,abstract-common-list/list-item</services-instances-path>
@@ -32,12 +33,12 @@
 		<instance id="person-person">
 			<web-url>person</web-url>
 			<title-ref>person</title-ref>
-			<title>Local Persons</title>
+			<title>Local</title>
 		</instance>
 		<instance id="person-ulan_pa">
 			<web-url>ulan_pa</web-url>
 			<title-ref>ulan_pa</title-ref>
-			<title>ULAN Persons</title>
+			<title>ULAN</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/defaults/base-authority-place.xml b/tomcat-main/src/main/resources/defaults/base-authority-place.xml
index ecf34ccaa..02d95b125 100644
--- a/tomcat-main/src/main/resources/defaults/base-authority-place.xml
+++ b/tomcat-main/src/main/resources/defaults/base-authority-place.xml
@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Placeauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Placeauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Place</services-tenant-auth-display-name>
 	<services-tenant-singular>Place</services-tenant-singular>
 	<services-tenant-doctype>Placeitem</services-tenant-doctype>
 
@@ -33,17 +34,17 @@
 		<instance id="place-place">
 			<web-url>place</web-url>
 			<title-ref>place</title-ref>
-			<title>Local Places</title>
+			<title>Local</title>
 		</instance>
 		<instance id="place-tgn_place">
 			<web-url>tgn_place</web-url>
 			<title-ref>tgn_place</title-ref>
-			<title>Thesaurus of Geographic Names</title>
+			<title>TGN</title>
 		</instance>
 		<instance id="place-archaeological">
 			<web-url>archaeological</web-url>
 			<title-ref>archaeological</title-ref>
-			<title>Archaeological Site</title>
+			<title>Archaeological</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/defaults/base-authority-taxon.xml b/tomcat-main/src/main/resources/defaults/base-authority-taxon.xml
index e428e1aee..85f2fe052 100644
--- a/tomcat-main/src/main/resources/defaults/base-authority-taxon.xml
+++ b/tomcat-main/src/main/resources/defaults/base-authority-taxon.xml
@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Taxonomyauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Taxonomyauthority</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Taxon</services-tenant-auth-display-name>
 	<services-tenant-singular>Taxon</services-tenant-singular>
 	<services-tenant-plural>Taxon</services-tenant-plural>
 
@@ -31,12 +32,12 @@
 		<instance id="taxon-taxon">
 			<web-url>taxon</web-url>
 			<title-ref>taxon</title-ref>
-			<title>Local Taxa</title>
+			<title>Local</title>
 		</instance>
 		<instance id="taxon-common_ta">
 			<web-url>common_ta</web-url>
 			<title-ref>common_ta</title-ref>
-			<title>Common Taxa</title>
+			<title>Common</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/defaults/base-authority-work.xml b/tomcat-main/src/main/resources/defaults/base-authority-work.xml
index 44312fb70..2719f0a4b 100644
--- a/tomcat-main/src/main/resources/defaults/base-authority-work.xml
+++ b/tomcat-main/src/main/resources/defaults/base-authority-work.xml
@@ -7,6 +7,7 @@
 
 	<services-tenant-auth-singular>Workauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Workauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Work</services-tenant-auth-display-name>
 	<services-tenant-singular>Work</services-tenant-singular>
 	<services-tenant-doctype>Workitem</services-tenant-doctype>
 
@@ -33,12 +34,12 @@
 		<instance id="work-work" create-unreferenced="true">
 			<web-url>work</web-url>
 			<title-ref>work</title-ref>
-			<title>Local Works</title>
+			<title>Local</title>
 		</instance>
 		<instance id="work-cona_work" create-unreferenced="true">
 			<web-url>cona_work</web-url>
 			<title-ref>cona_work</title-ref>
-			<title>CONA Works</title>
+			<title>CONA</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/defaults/base-collectionobject.xml b/tomcat-main/src/main/resources/defaults/base-collectionobject.xml
index fd39153bf..76d210d6a 100644
--- a/tomcat-main/src/main/resources/defaults/base-collectionobject.xml
+++ b/tomcat-main/src/main/resources/defaults/base-collectionobject.xml
@@ -254,6 +254,9 @@
 			<repeat id="contentPersons">
 				<field id="contentPerson" autocomplete="true" />
 			</repeat>
+			<repeat id="controlledContentPlaces">
+				<field id="controlledContentPlace" autocomplete="true" />
+			</repeat>
 			<repeat id="contentPlaces">
 				<field id="contentPlace" />
 			</repeat>
@@ -346,6 +349,9 @@
 			<field id="objectProductionOrganization" autocomplete="true" />
 			<field id="objectProductionOrganizationRole" />
 		</repeat>
+		<repeat id="objectProductionAgents">
+			<field id="objectProductionAgent" />
+		</repeat>
 		<field id="objectProductionNote" />
 	</section>
 	<section id="objectHistoryAssociationInformation">
diff --git a/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml
index eb5073324..41ae6fd13 100644
--- a/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml
+++ b/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml
@@ -5,33 +5,12 @@
 		<title-ref>inventorystatus</title-ref>
 		<title>Inventory Status</title>
 		<options>
-			<option id="unknown">unknown</option>
-			<option id="accessionstatusunclear">accession status unclear</option>
-			<option id="accessioned">accessioned</option>
 			<option id="deaccessioned">deaccessioned</option>
-			<option id="destroyed">destroyed</option>
-			<option id="destructiveanalysis">destructive analysis</option>
-			<option id="discarded">discarded</option>
-			<option id="exchanged">exchanged</option>
-			<option id="intendedfortransfer">intended for transfer</option>
-			<option id="irregularmuseumnumber">irregular museum number</option>
+			<option id="instorage">in storage</option>
 			<option id="missing">missing</option>
-			<option id="missingininventory">missing in inventory</option>
-			<option id="notcataloged">not cataloged</option>
-			<option id="notlocated">not located</option>
-			<option id="notreceived">not received</option>
-			<option id="numbernotused">number not used</option>
-			<option id="objectmount">object mount</option>
+			<option id="offsite">off site</option>
 			<option id="onloan">on loan</option>
-			<option id="partiallydeaccessioned">partially deaccessioned</option>
-			<option id="partiallyexchanged">partially exchanged</option>
-			<option id="partiallyrecataloged">partially recataloged</option>
-			<option id="preacquisition">pre acquisition</option>
-			<option id="retired">retired</option>
-			<option id="returnedloanobject">returned loan object</option>
-			<option id="sold">sold</option>
-			<option id="stolen">stolen</option>
-			<option id="transferred">transferred</option>
+			<option id="ondisplay">on display</option>
 		</options>
 	</instance>
 	<instance id="vocab-uocmethods">
@@ -508,6 +487,8 @@
 			<option id="repository">repository</option>
 			<option id="studio">studio</option>
 			<option id="workshop">workshop</option>
+			<option id="federallyrecognizedtribe">federally-recognized tribe</option>
+			<option id="nonfederallyrecognizedtribe">non-federally-recognized tribe</option>
 		</options>
 	</instance>
 	<instance id="vocab-taxontype">
@@ -1326,15 +1307,9 @@
 		<title-ref>annotationtype</title-ref>
 		<title>Annotation Type</title>
 		<options>
-			<option id="additional_taxa">additional taxa</option>
-			<option id="deaccession">deaccession</option>
-			<option id="holotype_location">holotype location</option>
-			<option id="image_made">image made</option>
-			<option id="nomenclature">nomenclature</option>
-			<option id="number_collision">number collision</option>
-			<option id="population_biology">population biology</option>
-			<option id="type">type</option>
-			<option id="vegetation_type_map_project">Vegetation Type Map Project</option>
+			<option id="catalognote">catalog note</option>
+			<option id="legacydatanote">legacy data note</option>
+			<option id="staffnote">staff note</option>
 		</options>
 	</instance>
 	<instance id="vocab-insurancetype">
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml b/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml
index 8b3780eb7..bc9f5c763 100644
--- a/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml
+++ b/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml
@@ -50,6 +50,7 @@
 		<field id="objectPurchaseOfferPriceValue" datatype="float" />
 		<field id="originalObjectPurchasePriceCurrency" autocomplete="true" ui-type="enum" />
 		<field id="originalObjectPurchasePriceValue" datatype="float" />
+		<field id="acquisitionDescription" />
 		<field id="acquisitionReason" />
 		<field id="acquisitionNote" />
 		<field id="acquisitionProvisos" />
@@ -59,6 +60,11 @@
 			<field id="acquisitionFundingSource" autocomplete="true" />
 			<field id="acquisitionFundingSourceProvisos" />
 		</repeat>
+		<repeat id="partiesInvolvedGroupList/partiesInvolvedGroup">
+			<field id="involvedParty" autocomplete="true" />
+			<field id="involvedOnBehalfOf" autocomplete="true" />
+			<field id="involvedRole" autocomplete="true" ui-type="enum" />
+		</repeat>
 	</section>
 	<section id="objectCollectionInformation">
 		<repeat id="fieldCollectionEventNames">
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml b/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml
index d41e6f7b3..7d81d00f3 100644
--- a/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml
+++ b/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml
@@ -35,6 +35,10 @@
       <field id="consultDate" datatype="date" />
       <field id="consultNote" />
     </repeat>
+
+    <repeat id="consultationOutcomes">
+      <field id="consultationOutcome" />
+    </repeat>
   </section>
 
 </record>
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml b/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml
index 461ab122f..1d815e82c 100644
--- a/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml
+++ b/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml
@@ -36,6 +36,12 @@
     <repeat id="exitMethods">
       <field id="exitMethod" autocomplete="true" ui-type="enum" />
     </repeat>
+
+    <repeat id="partiesInvolvedGroupList/partiesInvolvedGroup">
+      <field id="involvedParty" autocomplete="true" />
+      <field id="involvedOnBehalfOf" autocomplete="true" />
+      <field id="involvedRole" autocomplete="true" ui-type="enum" />
+    </repeat>
   </section>
 
 </record>
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-exit.xml b/tomcat-main/src/main/resources/defaults/base-procedure-exit.xml
index 92630b6f0..be0a82a65 100644
--- a/tomcat-main/src/main/resources/defaults/base-procedure-exit.xml
+++ b/tomcat-main/src/main/resources/defaults/base-procedure-exit.xml
@@ -40,6 +40,8 @@
         <field id="approvalStatusNote" />
       </repeat>
     </repeat>
+
+    <field id="note" />
   </section>
 
   <section id="saleInformation">
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-heldintrust.xml b/tomcat-main/src/main/resources/defaults/base-procedure-heldintrust.xml
index 8f3d95bda..5e8cbde9c 100644
--- a/tomcat-main/src/main/resources/defaults/base-procedure-heldintrust.xml
+++ b/tomcat-main/src/main/resources/defaults/base-procedure-heldintrust.xml
@@ -45,6 +45,8 @@
       <field id="correspondenceSummary" />
       <field id="correspondenceReference" ui-type="enum" />
     </repeat>
+
+    <field id="note" />
   </section>
 
   <section id="culturalCareInformation">
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-media.xml b/tomcat-main/src/main/resources/defaults/base-procedure-media.xml
index aac0155d8..bbfc7e11b 100644
--- a/tomcat-main/src/main/resources/defaults/base-procedure-media.xml
+++ b/tomcat-main/src/main/resources/defaults/base-procedure-media.xml
@@ -55,7 +55,7 @@
 		</repeat>
 		<field id="rightsHolder" autocomplete="true" />
 		<field id="description" />
-		<field id="altText" />
+		<field id="altText" mini="list" />
 
 		<repeat id="checksumGroupList/checksumGroup">
 			<field id="checksumValue" />
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-nagprainventory.xml b/tomcat-main/src/main/resources/defaults/base-procedure-nagprainventory.xml
index e6d7f1335..6aa5cb92d 100644
--- a/tomcat-main/src/main/resources/defaults/base-procedure-nagprainventory.xml
+++ b/tomcat-main/src/main/resources/defaults/base-procedure-nagprainventory.xml
@@ -51,6 +51,8 @@
       <field id="inventoryDate" datatype="date" />
       <field id="inventoryNote" />
     </repeat>
+
+    <field id="note" />
   </section>
 
   <section id="inventoryContextInformation">
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-summarydocumentation.xml b/tomcat-main/src/main/resources/defaults/base-procedure-summarydocumentation.xml
index d706a50b9..979b0f15b 100644
--- a/tomcat-main/src/main/resources/defaults/base-procedure-summarydocumentation.xml
+++ b/tomcat-main/src/main/resources/defaults/base-procedure-summarydocumentation.xml
@@ -55,6 +55,8 @@
       <field id="statusDate" datatype="date" />
       <field id="statusNote" />
     </repeat>
+
+    <field id="note" />
   </section>
 
   <section id="summaryDocumentationContext">
diff --git a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml
index c888069a4..594aa7ff6 100644
--- a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml
+++ b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml
@@ -5,33 +5,12 @@
 		<title-ref>inventorystatus</title-ref>
 		<title>Inventory Status</title>
 		<options>
-			<option id="unknown">unknown</option>
-			<option id="accessionstatusunclear">accession status unclear</option>
-			<option id="accessioned">accessioned</option>
 			<option id="deaccessioned">deaccessioned</option>
-			<option id="destroyed">destroyed</option>
-			<option id="destructiveanalysis">destructive analysis</option>
-			<option id="discarded">discarded</option>
-			<option id="exchanged">exchanged</option>
-			<option id="intendedfortransfer">intended for transfer</option>
-			<option id="irregularmuseumnumber">irregular museum number</option>
+			<option id="instorage">in storage</option>
 			<option id="missing">missing</option>
-			<option id="missingininventory">missing in inventory</option>
-			<option id="notcataloged">not cataloged</option>
-			<option id="notlocated">not located</option>
-			<option id="notreceived">not received</option>
-			<option id="numbernotused">number not used</option>
-			<option id="objectmount">object mount</option>
+			<option id="offsite">off site</option>
 			<option id="onloan">on loan</option>
-			<option id="partiallydeaccessioned">partially deaccessioned</option>
-			<option id="partiallyexchanged">partially exchanged</option>
-			<option id="partiallyrecataloged">partially recataloged</option>
-			<option id="preacquisition">pre acquisition</option>
-			<option id="retired">retired</option>
-			<option id="returnedloanobject">returned loan object</option>
-			<option id="sold">sold</option>
-			<option id="stolen">stolen</option>
-			<option id="transferred">transferred</option>
+			<option id="ondisplay">on display</option>
 		</options>
 	</instance>
 	<instance id="vocab-uocmethods">
@@ -58,7 +37,7 @@
 			<option id="researcher">researcher</option>
 		</options>
 	</instance>
-		<instance id="vocab-uocuserroles">
+	<instance id="vocab-uocuserroles">
 		<web-url>uocuserroles</web-url>
 		<title-ref>uocuserroles</title-ref>
 		<title>Use of Collections User Roles</title>
@@ -518,6 +497,8 @@
 			<option id="repository">repository</option>
 			<option id="studio">studio</option>
 			<option id="workshop">workshop</option>
+			<option id="federallyrecognizedtribe">federally-recognized tribe</option>
+			<option id="nonfederallyrecognizedtribe">non-federally-recognized tribe</option>
 		</options>
 	</instance>
 	<instance id="vocab-taxontype">
@@ -782,15 +763,9 @@
 		<title-ref>annotationtype</title-ref>
 		<title>Annotation Type</title>
 		<options>
-			<option id="additional_taxa">additional taxa</option>
-			<option id="deaccession">deaccession</option>
-			<option id="holotype_location">holotype location</option>
-			<option id="image_made">image made</option>
-			<option id="nomenclature">nomenclature</option>
-			<option id="number_collision">number collision</option>
-			<option id="population_biology">population biology</option>
-			<option id="type">type</option>
-			<option id="vegetation_type_map_project">Vegetation Type Map Project</option>
+			<option id="catalognote">catalog note</option>
+			<option id="legacydatanote">legacy data note</option>
+			<option id="staffnote">staff note</option>
 		</options>
 	</instance>
 	<instance id="vocab-insurancetype">
@@ -1524,6 +1499,19 @@
 			<option id="set">set</option>
 		</options>
 	</instance>
+	<instance id="vocab-deaccessionreason">
+		<web-url>deaccessionreason</web-url>
+		<title-ref>deaccessionreason</title-ref>
+		<title>Deaccession Reason</title>
+		<options>
+			<option id="no_longer_useful">no longer useful to the organization purpose</option>
+			<option id="does_not_fit">does not fit collecting policy</option>
+			<option id="deteriorated">has deteriorated beyond usefulness</option>
+			<option id="no_longer_preserved">can no longer be preserved</option>
+			<option id="has_better_example">is represented by a better example</option>
+			<option id="nagpra_repatriation">NAGPRA repatriation</option>
+		</options>
+	</instance>
 	<instance id="vocab-objexitmethod">
 		<web-url>objexitmethod</web-url>
 		<title-ref>objexitmethod</title-ref>
@@ -1562,4 +1550,15 @@
 			<option id="tribal_representative">tribal representative</option>
 		</options>
 	</instance>
+	<instance id="vocab-nagprainvolvedrole">
+		<web-url>nagprainvolvedrole</web-url>
+		<title-ref>nagprainvolvedrole</title-ref>
+		<title>NAGPRA Involved Role</title>
+		<options>
+			<option id="tribal_rep">tribal representative</option>
+			<option id="museum_rep">museum representative</option>
+			<option id="consultant">consultant</option>
+			<option id="lineal_descendant">lineal descendant</option>
+		</options>
+	</instance>
 </instances>
diff --git a/tomcat-main/src/main/resources/defaults/extensions/fineart-authority-concept.xml b/tomcat-main/src/main/resources/defaults/extensions/fineart-authority-concept.xml
index 86fdfa4ef..7cfa84fca 100644
--- a/tomcat-main/src/main/resources/defaults/extensions/fineart-authority-concept.xml
+++ b/tomcat-main/src/main/resources/defaults/extensions/fineart-authority-concept.xml
@@ -7,17 +7,17 @@
 		<instance id="concept-concept">
 			<web-url>concept</web-url>
 			<title-ref>concept</title-ref>
-			<title>Associated Concepts</title>
+			<title>Associated</title>
 		</instance>
 		<instance id="concept-material_ca">
 			<web-url>material_ca</web-url>
 			<title-ref>material_ca</title-ref>
-			<title>Material Concepts</title>
+			<title>Material</title>
 		</instance>
 		<instance id="concept-activity">
 			<web-url>activity</web-url>
 			<title-ref>activity</title-ref>
-			<title>Activity Concepts</title>
+			<title>Activity</title>
 		</instance>
 		<!-- Add ethculture -->
 		<instance id="concept-ethculture">
@@ -34,7 +34,7 @@
 		<instance id="concept-occasion">
 			<web-url>occasion</web-url>
 			<title-ref>occasion</title-ref>
-			<title>Occasion Concepts</title>
+			<title>Occasion</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-chronology.xml b/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-chronology.xml
index 6f84c25dd..ea88d7f8d 100644
--- a/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-chronology.xml
+++ b/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-chronology.xml
@@ -3,17 +3,17 @@
     <instance id="chronology-era">
       <web-url>era</web-url>
       <title-ref>era</title-ref>
-      <title>Era Chronologies</title>
+      <title>Era</title>
     </instance>
     <instance id="chronology-event">
       <web-url>event</web-url>
       <title-ref>event</title-ref>
-      <title>Event Chronologies</title>
+      <title>Event</title>
     </instance>
     <instance id="chronology-field_collection">
       <web-url>field_collection</web-url>
       <title-ref>field_collection</title-ref>
-      <title>Field Collection Chronologies</title>
+      <title>Field Collection</title>
     </instance>
   </instances>
 </record>
diff --git a/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-concept.xml b/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-concept.xml
index 56a701005..d4f9e2ce0 100644
--- a/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-concept.xml
+++ b/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-concept.xml
@@ -3,17 +3,17 @@
 		<instance id="concept-concept">
 			<web-url>concept</web-url>
 			<title-ref>concept</title-ref>
-			<title>Associated Concepts</title>
+			<title>Associated</title>
 		</instance>
 		<instance id="concept-material_ca">
 			<web-url>material_ca</web-url>
 			<title-ref>material_ca</title-ref>
-			<title>Material Concepts</title>
+			<title>Material</title>
 		</instance>
 		<instance id="concept-activity">
 			<web-url>activity</web-url>
 			<title-ref>activity</title-ref>
-			<title>Activity Concepts</title>
+			<title>Activity</title>
 		</instance>
 		<instance id="concept-nomenclature">
 			<web-url>nomenclature</web-url>
@@ -23,23 +23,23 @@
 		<instance id="concept-archculture">
 			<web-url>archculture</web-url>
 			<title-ref>archculture</title-ref>
-			<title>Archaeological Cultures</title>
+			<title>Archaeological Culture</title>
 		</instance>
 		<instance id="concept-ethculture">
 			<web-url>ethculture</web-url>
 			<title-ref>ethculture</title-ref>
-			<title>Ethnographic Cultures</title>
+			<title>Cultural Group</title>
 		</instance>
 		<instance id="concept-ethfilecode">
 			<web-url>ethfilecode</web-url>
 			<title-ref>ethfilecode</title-ref>
-			<title>Ethnographic File Codes</title>
+			<title>Function</title>
 		</instance>
 		<!-- For the UOC Occasion field -->
 		<instance id="concept-occasion">
 			<web-url>occasion</web-url>
 			<title-ref>occasion</title-ref>
-			<title>Occasion Concepts</title>
+			<title>Occasion</title>
 		</instance>
 	</instances>
 </record>
diff --git a/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml b/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml
index 68215b2c7..fce618184 100644
--- a/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml
+++ b/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml
@@ -37,6 +37,7 @@
 
 			<field id="commingledRemainsNote" section="anthro" />
 		</repeat>
+		<field id="materialTechniqueDescription" section="anthro" />
 	</section>
 
 	<section id="objectProductionInformation">
@@ -73,7 +74,6 @@
 	<section id="objectHistoryAssociationInformation">
 		<repeat id="anthroOwnershipGroupList/anthroOwnershipGroup" section="anthro">
 			<field id="anthroOwner" section="anthro" autocomplete="true" />
-			<field id="anthroOwnershipAccess" section="anthro" />
 
 			<group id="anthroOwnershipDateGroup" section="anthro" ui-type="groupfield/structureddate" />
 
diff --git a/tomcat-main/src/main/resources/tenants/anthro/settings.xml b/tomcat-main/src/main/resources/tenants/anthro/settings.xml
index ecfaf89a0..32db64fef 100644
--- a/tomcat-main/src/main/resources/tenants/anthro/settings.xml
+++ b/tomcat-main/src/main/resources/tenants/anthro/settings.xml
@@ -27,13 +27,13 @@
 		<to></to>
 		<!-- if specified then all emails will send to this address - used for debugging -->
 		<smtp>
-			<host>localhost</host>
-			<port>25</port>
-			<debug>false</debug>
-			<auth enabled="false">
+			<host>${CSPACE_SMTP_EMAIL_HOST_OPT}</host>
+			<port>${CSPACE_SMTP_EMAIL_PORT_OPT}</port>
+			<debug>${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT}</debug>
+			<auth enabled="${CSPACE_SMTP_EMAIL_AUTH_OPT}">
 				<!-- set to true if wish to use auth -->
-				<username></username>
-				<password></password>
+				<username>${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT}</username>
+				<password>${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT}</password>
 			</auth>
 		</smtp>
 		<passwordreset>
diff --git a/tomcat-main/src/main/resources/tenants/bonsai/settings.xml b/tomcat-main/src/main/resources/tenants/bonsai/settings.xml
index f66d98740..8414ed8ef 100644
--- a/tomcat-main/src/main/resources/tenants/bonsai/settings.xml
+++ b/tomcat-main/src/main/resources/tenants/bonsai/settings.xml
@@ -36,13 +36,13 @@
         </passwordreset>
         <!-- if specified then all emails will send to this address - used for debugging -->
         <smtp>
-            <host>localhost</host>
-            <port>25</port>
-            <debug>false</debug>
-            <auth enabled="false">
+            <host>${CSPACE_SMTP_EMAIL_HOST_OPT}</host>
+            <port>${CSPACE_SMTP_EMAIL_PORT_OPT}</port>
+            <debug>${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT}</debug>
+            <auth enabled="${CSPACE_SMTP_EMAIL_AUTH_OPT}">
                 <!-- set to true if wish to use auth -->
-                <username></username>
-                <password></password>
+                <username>${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT}</username>
+                <password>${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT}</password>
             </auth>
         </smtp>
     </email>
diff --git a/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml
index 89f3f968b..da39233ef 100644
--- a/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml
+++ b/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml
@@ -7,33 +7,12 @@
 		<title-ref>inventorystatus</title-ref>
 		<title>Inventory Status</title>
 		<options>
-			<option id="unknown">unknown</option>
-			<option id="accessionstatusunclear">accession status unclear</option>
-			<option id="accessioned">accessioned</option>
 			<option id="deaccessioned">deaccessioned</option>
-			<option id="destroyed">destroyed</option>
-			<option id="destructiveanalysis">destructive analysis</option>
-			<option id="discarded">discarded</option>
-			<option id="exchanged">exchanged</option>
-			<option id="intendedfortransfer">intended for transfer</option>
-			<option id="irregularmuseumnumber">irregular museum number</option>
+			<option id="instorage">in storage</option>
 			<option id="missing">missing</option>
-			<option id="missingininventory">missing in inventory</option>
-			<option id="notcataloged">not cataloged</option>
-			<option id="notlocated">not located</option>
-			<option id="notreceived">not received</option>
-			<option id="numbernotused">number not used</option>
-			<option id="objectmount">object mount</option>
+			<option id="offsite">off site</option>
 			<option id="onloan">on loan</option>
-			<option id="partiallydeaccessioned">partially deaccessioned</option>
-			<option id="partiallyexchanged">partially exchanged</option>
-			<option id="partiallyrecataloged">partially recataloged</option>
-			<option id="preacquisition">pre acquisition</option>
-			<option id="retired">retired</option>
-			<option id="returnedloanobject">returned loan object</option>
-			<option id="sold">sold</option>
-			<option id="stolen">stolen</option>
-			<option id="transferred">transferred</option>
+			<option id="ondisplay">on display</option>
 		</options>
 	</instance>
 	<instance id="vocab-uocmethods">
@@ -509,6 +488,8 @@
 			<option id="repository">repository</option>
 			<option id="studio">studio</option>
 			<option id="workshop">workshop</option>
+			<option id="federallyrecognizedtribe">federally-recognized tribe</option>
+			<option id="nonfederallyrecognizedtribe">non-federally-recognized tribe</option>
 		</options>
 	</instance>
 	<!-- <instance id="vocab-taxontype">
@@ -1327,15 +1308,9 @@
 		<title-ref>annotationtype</title-ref>
 		<title>Annotation Type</title>
 		<options>
-			<option id="additional_taxa">additional taxa</option>
-			<option id="deaccession">deaccession</option>
-			<option id="holotype_location">holotype location</option>
-			<option id="image_made">image made</option>
-			<option id="nomenclature">nomenclature</option>
-			<option id="number_collision">number collision</option>
-			<option id="population_biology">population biology</option>
-			<option id="type">type</option>
-			<option id="vegetation_type_map_project">Vegetation Type Map Project</option>
+			<option id="catalognote">catalog note</option>
+			<option id="legacydatanote">legacy data note</option>
+			<option id="staffnote">staff note</option>
 		</options>
 	</instance>
 	<instance id="vocab-insurancetype">
diff --git a/tomcat-main/src/main/resources/tenants/botgarden/settings.xml b/tomcat-main/src/main/resources/tenants/botgarden/settings.xml
index c99477463..c3b678b88 100644
--- a/tomcat-main/src/main/resources/tenants/botgarden/settings.xml
+++ b/tomcat-main/src/main/resources/tenants/botgarden/settings.xml
@@ -36,13 +36,13 @@
         </passwordreset>
         <!-- if specified then all emails will send to this address - used for debugging -->
         <smtp>
-            <host>localhost</host>
-            <port>25</port>
-            <debug>false</debug>
-            <auth enabled="false">
+            <host>${CSPACE_SMTP_EMAIL_HOST_OPT}</host>
+            <port>${CSPACE_SMTP_EMAIL_PORT_OPT}</port>
+            <debug>${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT}</debug>
+            <auth enabled="${CSPACE_SMTP_EMAIL_AUTH_OPT}">
                 <!-- set to true if wish to use auth -->
-                <username></username>
-                <password></password>
+                <username>${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT}</username>
+                <password>${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT}</password>
             </auth>
         </smtp>
     </email>
diff --git a/tomcat-main/src/main/resources/tenants/core/settings.xml b/tomcat-main/src/main/resources/tenants/core/settings.xml
index e0b8aeee2..59e857491 100644
--- a/tomcat-main/src/main/resources/tenants/core/settings.xml
+++ b/tomcat-main/src/main/resources/tenants/core/settings.xml
@@ -27,13 +27,13 @@
 		<to></to>
 		<!-- if specified then all emails will send to this address - used for debugging -->
 		<smtp>
-			<host>localhost</host>
-			<port>25</port>
-			<debug>${CSPACE_CORE_EMAIL_AUTH_DEBUG_OPT}</debug>
-			<auth enabled="false">
+			<host>${CSPACE_SMTP_EMAIL_HOST_OPT}</host>
+			<port>${CSPACE_SMTP_EMAIL_PORT_OPT}</port>
+			<debug>${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT}</debug>
+			<auth enabled="${CSPACE_SMTP_EMAIL_AUTH_OPT}">
 				<!-- set to true if wish to use auth -->
-				<username>${CSPACE_CORE_EMAIL_AUTH_USERNAME_OPT}</username>
-				<password>${CSPACE_CORE_EMAIL_AUTH_PASSWORD_OPT}</password>
+				<username>${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT}</username>
+				<password>${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT}</password>
 			</auth>
 		</smtp>
 		<passwordreset>
diff --git a/tomcat-main/src/main/resources/tenants/fcart/settings.xml b/tomcat-main/src/main/resources/tenants/fcart/settings.xml
index c81a79148..9065af614 100644
--- a/tomcat-main/src/main/resources/tenants/fcart/settings.xml
+++ b/tomcat-main/src/main/resources/tenants/fcart/settings.xml
@@ -27,13 +27,13 @@
         <to></to>
         <!-- if specified then all emails will send to this address - used for debugging -->
         <smtp>
-            <host>localhost</host>
-            <port>25</port>
-            <debug>false</debug>
-            <auth enabled="false">
+            <host>${CSPACE_SMTP_EMAIL_HOST_OPT}</host>
+            <port>${CSPACE_SMTP_EMAIL_PORT_OPT}</port>
+            <debug>${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT}</debug>
+            <auth enabled="${CSPACE_SMTP_EMAIL_AUTH_OPT}">
                 <!-- set to true if wish to use auth -->
-                <username></username>
-                <password></password>
+                <username>${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT}</username>
+                <password>${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT}</password>
             </auth>
         </smtp>
         <passwordreset>
diff --git a/tomcat-main/src/main/resources/tenants/herbarium/herbarium-authority-concept.xml b/tomcat-main/src/main/resources/tenants/herbarium/herbarium-authority-concept.xml
index 6876e816e..5386341f5 100644
--- a/tomcat-main/src/main/resources/tenants/herbarium/herbarium-authority-concept.xml
+++ b/tomcat-main/src/main/resources/tenants/herbarium/herbarium-authority-concept.xml
@@ -1,20 +1,19 @@
 <record id="concept">
-	<!-- Add label text vocabulary-->
 	<instances id="concept">
 		<instance id="concept-concept">
 			<web-url>concept</web-url>
 			<title-ref>concept</title-ref>
-			<title>Associated Concepts</title>
+			<title>Associated</title>
 		</instance>
 		<instance id="concept-material_ca">
 			<web-url>material_ca</web-url>
 			<title-ref>material_ca</title-ref>
-			<title>Material Concepts</title>
+			<title>Material</title>
 		</instance>
 		<instance id="concept-activity">
 			<web-url>activity</web-url>
 			<title-ref>activity</title-ref>
-			<title>Activity Concepts</title>
+			<title>Activity</title>
 		</instance>
 		<instance id="concept-nomenclature">
 			<web-url>nomenclature</web-url>
@@ -25,7 +24,7 @@
 		<instance id="concept-materialclassification">
 			<web-url>materialclassification</web-url>
 			<title-ref>materialclassification</title-ref>
-			<title>Material Classifications</title>
+			<title>Material Classification</title>
 		</instance>
 		<instance id="concept-materialformtype">
 			<web-url>materialformtype</web-url>
@@ -36,13 +35,13 @@
 		<instance id="concept-occasion">
 			<web-url>occasion</web-url>
 			<title-ref>occasion</title-ref>
-			<title>Occasion Concepts</title>
+			<title>Occasion</title>
 		</instance>
-		<!-- For herbarium profile -->
+    <!-- Add label text vocabulary for herbarium profile -->
 		<instance id="concept-labeltext">
 			<web-url>labeltext</web-url>
 			<title-ref>labeltext</title-ref>
-			<title>Label Text</title>
+			<title>Label</title>
 		</instance>
 	</instances>
 </record>
diff --git a/tomcat-main/src/main/resources/tenants/herbarium/settings.xml b/tomcat-main/src/main/resources/tenants/herbarium/settings.xml
index c8fc25387..f0cd40339 100644
--- a/tomcat-main/src/main/resources/tenants/herbarium/settings.xml
+++ b/tomcat-main/src/main/resources/tenants/herbarium/settings.xml
@@ -27,13 +27,13 @@
         <to></to>
         <!-- if specified then all emails will send to this address - used for debugging -->
         <smtp>
-            <host>localhost</host>
-            <port>25</port>
-            <debug>false</debug>
-            <auth enabled="false">
+            <host>${CSPACE_SMTP_EMAIL_HOST_OPT}</host>
+            <port>${CSPACE_SMTP_EMAIL_PORT_OPT}</port>
+            <debug>${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT}</debug>
+            <auth enabled="${CSPACE_SMTP_EMAIL_AUTH_OPT}">
                 <!-- set to true if wish to use auth -->
-                <username></username>
-                <password></password>
+                <username>${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT}</username>
+                <password>${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT}</password>
             </auth>
         </smtp>
         <passwordreset>
diff --git a/tomcat-main/src/main/resources/tenants/lhmc/settings.xml b/tomcat-main/src/main/resources/tenants/lhmc/settings.xml
index baca08ada..2bb6c73c6 100644
--- a/tomcat-main/src/main/resources/tenants/lhmc/settings.xml
+++ b/tomcat-main/src/main/resources/tenants/lhmc/settings.xml
@@ -27,13 +27,13 @@
 		<to></to>
 		<!-- if specified then all emails will send to this address - used for debugging -->
 		<smtp>
-			<host>localhost</host>
-			<port>25</port>
-			<debug>false</debug>
-			<auth enabled="false">
+			<host>${CSPACE_SMTP_EMAIL_HOST_OPT}</host>
+			<port>${CSPACE_SMTP_EMAIL_PORT_OPT}</port>
+			<debug>${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT}</debug>
+			<auth enabled="${CSPACE_SMTP_EMAIL_AUTH_OPT}">
 				<!-- set to true if wish to use auth -->
-				<username></username>
-				<password></password>
+				<username>${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT}</username>
+				<password>${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT}</password>
 			</auth>
 		</smtp>
 		<passwordreset>
diff --git a/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml
index 2a377719d..4fd77234a 100644
--- a/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml
+++ b/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml
@@ -7,33 +7,12 @@
 		<title-ref>inventorystatus</title-ref>
 		<title>Inventory Status</title>
 		<options>
-			<option id="unknown">unknown</option>
-			<option id="accessionstatusunclear">accession status unclear</option>
-			<option id="accessioned">accessioned</option>
 			<option id="deaccessioned">deaccessioned</option>
-			<option id="destroyed">destroyed</option>
-			<option id="destructiveanalysis">destructive analysis</option>
-			<option id="discarded">discarded</option>
-			<option id="exchanged">exchanged</option>
-			<option id="intendedfortransfer">intended for transfer</option>
-			<option id="irregularmuseumnumber">irregular museum number</option>
+			<option id="instorage">in storage</option>
 			<option id="missing">missing</option>
-			<option id="missingininventory">missing in inventory</option>
-			<option id="notcataloged">not cataloged</option>
-			<option id="notlocated">not located</option>
-			<option id="notreceived">not received</option>
-			<option id="numbernotused">number not used</option>
-			<option id="objectmount">object mount</option>
+			<option id="offsite">off site</option>
 			<option id="onloan">on loan</option>
-			<option id="partiallydeaccessioned">partially deaccessioned</option>
-			<option id="partiallyexchanged">partially exchanged</option>
-			<option id="partiallyrecataloged">partially recataloged</option>
-			<option id="preacquisition">pre acquisition</option>
-			<option id="retired">retired</option>
-			<option id="returnedloanobject">returned loan object</option>
-			<option id="sold">sold</option>
-			<option id="stolen">stolen</option>
-			<option id="transferred">transferred</option>
+			<option id="ondisplay">on display</option>
 		</options>
 	</instance>
 	<instance id="vocab-uocmethods">
@@ -526,6 +505,8 @@
 			<option id="repository">repository</option>
 			<option id="studio">studio</option>
 			<option id="workshop">workshop</option>
+			<option id="federallyrecognizedtribe">federally-recognized tribe</option>
+			<option id="nonfederallyrecognizedtribe">non-federally-recognized tribe</option>
 		</options>
 	</instance>
 	<instance id="vocab-taxontype">
@@ -1310,15 +1291,9 @@
 		<title-ref>annotationtype</title-ref>
 		<title>Annotation Type</title>
 		<options>
-			<option id="additional_taxa">additional taxa</option>
-			<option id="deaccession">deaccession</option>
-			<option id="holotype_location">holotype location</option>
-			<option id="image_made">image made</option>
-			<option id="nomenclature">nomenclature</option>
-			<option id="number_collision">number collision</option>
-			<option id="population_biology">population biology</option>
-			<option id="type">type</option>
-			<option id="vegetation_type_map_project">Vegetation Type Map Project</option>
+			<option id="catalognote">catalog note</option>
+			<option id="legacydatanote">legacy data note</option>
+			<option id="staffnote">staff note</option>
 		</options>
 	</instance>
 	<instance id="vocab-insurancetype">
@@ -1517,4 +1492,15 @@
 			<option id="tribal_representative">tribal representative</option>
 		</options>
 	</instance>
+	<instance id="vocab-nagprainvolvedrole">
+		<web-url>nagprainvolvedrole</web-url>
+		<title-ref>nagprainvolvedrole</title-ref>
+		<title>NAGPRA Involved Role</title>
+		<options>
+			<option id="tribal_rep">tribal representative</option>
+			<option id="museum_rep">museum representative</option>
+			<option id="consultant">consultant</option>
+			<option id="lineal_descendant">lineal descendant</option>
+		</options>
+	</instance>
 </instances>
diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-citation.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-citation.xml
index b0e39e9bb..ded6ad2ac 100644
--- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-citation.xml
+++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-citation.xml
@@ -3,13 +3,13 @@
 		<instance id="citation-citation">
 			<web-url>citation</web-url>
 			<title-ref>citation</title-ref>
-			<title>Local Citations</title>
+			<title>Local</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 		<instance id="citation-citation_shared">
 			<web-url>citation_shared</web-url>
 			<title-ref>citation_shared</title-ref>
-			<title>Shared Citations</title>
+			<title>Shared</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 	</instances>
diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-concept.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-concept.xml
index 683b9057a..fca73e790 100644
--- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-concept.xml
+++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-concept.xml
@@ -3,20 +3,20 @@
 		<instance id="concept-materialclassification">
 			<web-url>materialclassification</web-url>
 			<title-ref>materialclassification</title-ref>
-			<title>Material Classifications</title>
+			<title>Material Classification</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 		<instance id="concept-materialclassification_shared">
 			<web-url>materialclassification_shared</web-url>
 			<title-ref>materialclassification_shared</title-ref>
-			<title>Shared Material Classifications</title>
+			<title>Shared Material Classification</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 		<!-- For the UOC Occasion field -->
 		<instance id="concept-occasion">
 			<web-url>occasion</web-url>
 			<title-ref>occasion</title-ref>
-			<title>Occasion Concepts</title>
+			<title>Occasion</title>
 		</instance>
 	</instances>
 </record>
diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-location.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-location.xml
index 129af831a..b994334a8 100644
--- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-location.xml
+++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-location.xml
@@ -3,13 +3,13 @@
 		<instance id="location-location">
 			<web-url>location</web-url>
 			<title-ref>location</title-ref>
-			<title>Local Storage Locations</title>
+			<title>Local</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 		<instance id="location-offsite_sla">
 			<web-url>offsite_sla</web-url>
 			<title-ref>offsite_sla</title-ref>
-			<title>Offsite Storage Locations</title>
+			<title>Offsite</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 	</instances>
diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-material.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-material.xml
index bba57c9a1..7a851d69d 100644
--- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-material.xml
+++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-material.xml
@@ -5,13 +5,13 @@
 		<instance id="material-material">
 			<web-url>material</web-url>
 			<title-ref>material</title-ref>
-			<title>Local Materials</title>
+			<title>Local</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 		<instance id="material-material_shared">
 			<web-url>material_shared</web-url>
 			<title-ref>material_shared</title-ref>
-			<title>Shared Materials</title>
+			<title>Shared</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 	</instances>
diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-organization.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-organization.xml
index 4a6d0f172..b97984e54 100644
--- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-organization.xml
+++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-organization.xml
@@ -3,13 +3,13 @@
 		<instance id="organization-organization">
 			<web-url>organization</web-url>
 			<title-ref>organization</title-ref>
-			<title>Local Organizations</title>
+			<title>Local</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 		<instance id="organization-organization_shared">
 			<web-url>organization_shared</web-url>
 			<title-ref>organization_shared</title-ref>
-			<title>Shared Organizations</title>
+			<title>Shared</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 	</instances>
diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-person.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-person.xml
index aff670f78..6c2306354 100644
--- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-person.xml
+++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-person.xml
@@ -3,13 +3,13 @@
 		<instance id="person-person">
 			<web-url>person</web-url>
 			<title-ref>person</title-ref>
-			<title>Local Persons</title>
+			<title>Local</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 		<instance id="person-person_shared">
 			<web-url>person_shared</web-url>
 			<title-ref>person_shared</title-ref>
-			<title>Shared Persons</title>
+			<title>Shared</title>
 		</instance>
 	</instances>
 </record>
diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-place.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-place.xml
index 8c43bf867..ce72a3590 100644
--- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-place.xml
+++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-place.xml
@@ -3,13 +3,13 @@
 		<instance id="place-place">
 			<web-url>place</web-url>
 			<title-ref>place</title-ref>
-			<title>Local Places</title>
+			<title>Local</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 		<instance id="place-place_shared">
 			<web-url>place_shared</web-url>
 			<title-ref>place_shared</title-ref>
-			<title>Shared Places</title>
+			<title>Shared</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 	</instances>
diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-work.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-work.xml
index e7e1966c9..94f18816c 100644
--- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-work.xml
+++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-work.xml
@@ -3,13 +3,13 @@
 		<instance id="work-work">
 			<web-url>work</web-url>
 			<title-ref>work</title-ref>
-			<title>Local Works</title>
+			<title>Local</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 		<instance id="work-work_shared">
 			<web-url>work_shared</web-url>
 			<title-ref>work_shared</title-ref>
-			<title>Shared Works</title>
+			<title>Shared</title>
 			<nptAllowed>false</nptAllowed>
 		</instance>
 	</instances>
diff --git a/tomcat-main/src/main/resources/tenants/materials/settings.xml b/tomcat-main/src/main/resources/tenants/materials/settings.xml
index 7d3d335fc..bf57f2f38 100644
--- a/tomcat-main/src/main/resources/tenants/materials/settings.xml
+++ b/tomcat-main/src/main/resources/tenants/materials/settings.xml
@@ -27,13 +27,13 @@
         <to></to>
         <!-- if specified then all emails will send to this address - used for debugging -->
         <smtp>
-            <host>localhost</host>
-            <port>25</port>
-            <debug>false</debug>
-            <auth enabled="false">
+            <host>${CSPACE_SMTP_EMAIL_HOST_OPT}</host>
+            <port>${CSPACE_SMTP_EMAIL_PORT_OPT}</port>
+            <debug>${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT}</debug>
+            <auth enabled="${CSPACE_SMTP_EMAIL_AUTH_OPT}">
                 <!-- set to true if wish to use auth -->
-                <username></username>
-                <password></password>
+                <username>${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT}</username>
+                <password>${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT}</password>
             </auth>
         </smtp>
         <passwordreset>
diff --git a/tomcat-main/src/main/resources/tenants/publicart/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/tenants/publicart/base-instance-vocabularies.xml
index 5dcbf7734..e42a43ad4 100644
--- a/tomcat-main/src/main/resources/tenants/publicart/base-instance-vocabularies.xml
+++ b/tomcat-main/src/main/resources/tenants/publicart/base-instance-vocabularies.xml
@@ -1327,15 +1327,9 @@
 		<title-ref>annotationtype</title-ref>
 		<title>Annotation Type</title>
 		<options>
-			<option id="additional_taxa">additional taxa</option>
-			<option id="deaccession">deaccession</option>
-			<option id="holotype_location">holotype location</option>
-			<option id="image_made">image made</option>
-			<option id="nomenclature">nomenclature</option>
-			<option id="number_collision">number collision</option>
-			<option id="population_biology">population biology</option>
-			<option id="type">type</option>
-			<option id="vegetation_type_map_project">Vegetation Type Map Project</option>
+			<option id="catalognote">catalog note</option>
+			<option id="legacydatanote">legacy data note</option>
+			<option id="staffnote">staff note</option>
 		</options>
 	</instance>
 	<instance id="vocab-insurancetype">
@@ -2113,4 +2107,15 @@
 			<option id="tribal_representative">tribal representative</option>
 		</options>
 	</instance>
+	<instance id="vocab-nagprainvolvedrole">
+		<web-url>nagprainvolvedrole</web-url>
+		<title-ref>nagprainvolvedrole</title-ref>
+		<title>NAGPRA Involved Role</title>
+		<options>
+			<option id="tribal_rep">tribal representative</option>
+			<option id="museum_rep">museum representative</option>
+			<option id="consultant">consultant</option>
+			<option id="lineal_descendant">lineal descendant</option>
+		</options>
+	</instance>
 </instances>
diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-citation.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-citation.xml
index f7a5eb85e..1953b0ff8 100644
--- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-citation.xml
+++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-citation.xml
@@ -3,7 +3,7 @@
 		<instance id="citation-citation">
 			<web-url>citation</web-url>
 			<title-ref>citation</title-ref>
-			<title>Local Citations</title>
+			<title>Local</title>
 			<options>
 				<option id="getty_att">Getty AAT</option>
 			</options>
@@ -11,7 +11,7 @@
 		<instance id="citation-worldcat">
 			<web-url>worldcat</web-url>
 			<title-ref>worldcat</title-ref>
-			<title>WorldCat Citations</title>
+			<title>WorldCat</title>
 		</instance>
 	</instances>
 </record>
diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-concept.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-concept.xml
index bc866c569..d3cc6f606 100644
--- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-concept.xml
+++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-concept.xml
@@ -7,12 +7,12 @@
 		<instance id="concept-concept">
 			<web-url>concept</web-url>
 			<title-ref>concept</title-ref>
-			<title>Associated Concepts</title>
+			<title>Associated</title>
 		</instance>
 		<instance id="concept-material_ca">
 			<web-url>material_ca</web-url>
 			<title-ref>material_ca</title-ref>
-			<title>Material Concepts</title>
+			<title>Material</title>
 			<options>
 				<option id="abrasive">abrasive</option>
 				<option id="acetate_film">acetate film</option>
@@ -232,7 +232,7 @@
 		<instance id="concept-worktype">
 			<web-url>worktype</web-url>
 			<title-ref>worktype</title-ref>
-			<title>Work Types</title>
+			<title>Work Type</title>
 			<options>
 				<option id="acrylicpaintings">acrylic paintings</option>
 				<option id="architecturaldrawings_visualworks">architectural drawings (visual works)</option>
diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-location.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-location.xml
index 360d80c35..b159bb62a 100644
--- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-location.xml
+++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-location.xml
@@ -5,12 +5,12 @@
 		<instance id="location-location">
 			<web-url>location</web-url>
 			<title-ref>location</title-ref>
-			<title>Local Storage Locations</title>
+			<title>Local</title>
 		</instance>
 		<instance id="location-offsite_sla">
 			<web-url>offsite_sla</web-url>
 			<title-ref>offsite_sla</title-ref>
-			<title>Offsite Storage Locations</title>
+			<title>Offsite</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-organization.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-organization.xml
index fb78ca9f6..2ee56a23d 100644
--- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-organization.xml
+++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-organization.xml
@@ -5,17 +5,17 @@
 		<instance id="organization-organization">
 			<web-url>organization</web-url>
 			<title-ref>organization</title-ref>
-			<title>Local Organizations</title>
+			<title>Local</title>
 		</instance>
 		<instance id="organization-organization_shared">
 			<web-url>organization_shared</web-url>
 			<title-ref>organization_shared</title-ref>
-			<title>Shared Organizations</title>
+			<title>Shared</title>
 		</instance>
 		<instance id="organization-ulan_oa">
 			<web-url>ulan_oa</web-url>
 			<title-ref>ulan_oa</title-ref>
-			<title>ULAN Organizations</title>
+			<title>ULAN</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-person.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-person.xml
index 4105094b0..c9c44ce38 100644
--- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-person.xml
+++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-person.xml
@@ -5,17 +5,17 @@
 		<instance id="person-person">
 			<web-url>person</web-url>
 			<title-ref>person</title-ref>
-			<title>Local Persons</title>
+			<title>Local</title>
 		</instance>
 		<instance id="person-ulan_pa">
 			<web-url>ulan_pa</web-url>
 			<title-ref>ulan_pa</title-ref>
-			<title>ULAN Persons</title>
+			<title>ULAN</title>
 		</instance>
 		<instance id="person-person_shared">
 			<web-url>person_shared</web-url>
 			<title-ref>person_shared</title-ref>
-			<title>Shared Persons</title>
+			<title>Shared</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-place.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-place.xml
index e4c0324a2..d2d754e58 100644
--- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-place.xml
+++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-place.xml
@@ -6,17 +6,17 @@
 		<instance id="place-place">
 			<web-url>place</web-url>
 			<title-ref>place</title-ref>
-			<title>Local Places</title>
+			<title>Local</title>
 		</instance>
 		<instance id="place-tgn_place">
 			<web-url>tgn_place</web-url>
 			<title-ref>tgn_place</title-ref>
-			<title>Thesaurus of Geographic Names</title>
+			<title>TGN</title>
 		</instance>
 		<instance id="place-place_shared">
 			<web-url>place_shared</web-url>
 			<title-ref>place_shared</title-ref>
-			<title>Shared Places</title>
+			<title>Shared</title>
 		</instance>
 	</instances>
 
diff --git a/tomcat-main/src/main/resources/tenants/publicart/settings.xml b/tomcat-main/src/main/resources/tenants/publicart/settings.xml
index d7a557a72..098e18aae 100644
--- a/tomcat-main/src/main/resources/tenants/publicart/settings.xml
+++ b/tomcat-main/src/main/resources/tenants/publicart/settings.xml
@@ -27,13 +27,13 @@
         <to></to>
         <!-- if specified then all emails will send to this address - used for debugging -->
         <smtp>
-            <host>localhost</host>
-            <port>25</port>
-            <debug>false</debug>
-            <auth enabled="false">
+            <host>${CSPACE_SMTP_EMAIL_HOST_OPT}</host>
+            <port>${CSPACE_SMTP_EMAIL_PORT_OPT}</port>
+            <debug>${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT}</debug>
+            <auth enabled="${CSPACE_SMTP_EMAIL_AUTH_OPT}">
                 <!-- set to true if wish to use auth -->
-                <username></username>
-                <password></password>
+                <username>${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT}</username>
+                <password>${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT}</password>
             </auth>
         </smtp>
         <passwordreset>
diff --git a/tomcat-main/src/main/resources/tenants/testsci/settings.xml b/tomcat-main/src/main/resources/tenants/testsci/settings.xml
index bf51e0513..8d862ba8e 100644
--- a/tomcat-main/src/main/resources/tenants/testsci/settings.xml
+++ b/tomcat-main/src/main/resources/tenants/testsci/settings.xml
@@ -27,13 +27,13 @@
         <to></to>
         <!-- if specified then all emails will send to this address - used for debugging -->
         <smtp>
-            <host>localhost</host>
-            <port>25</port>
-            <debug>false</debug>
-            <auth enabled="false">
+            <host>${CSPACE_SMTP_EMAIL_HOST_OPT}</host>
+            <port>${CSPACE_SMTP_EMAIL_PORT_OPT}</port>
+            <debug>${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT}</debug>
+            <auth enabled="${CSPACE_SMTP_EMAIL_AUTH_OPT}">
                 <!-- set to true if wish to use auth -->
-                <username></username>
-                <password></password>
+                <username>${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT}</username>
+                <password>${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT}</password>
             </auth>
         </smtp>
         <passwordreset>