From: remillet <remillet@yahoo.com>
Date: Tue, 22 Mar 2016 23:05:19 +0000 (-0700)
Subject: CSPACE-6908: Renamed lifesci tenant to testsci to reduce confusion with community... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=42fbbc83f653347ed7219b50efb0576f5eb04b2d;p=tmp%2Fjakarta-migration.git

CSPACE-6908: Renamed lifesci tenant to testsci to reduce confusion with community profile names.
---

diff --git a/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/proto-datasource-config.xml b/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/proto-datasource-config.xml
index ed36fc084..4887c1673 100644
--- a/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/proto-datasource-config.xml
+++ b/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/proto-datasource-config.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<component name="org.nuxeo.runtime.datasource.lifesci.contrib">
+<component name="org.nuxeo.runtime.datasource.testsci.contrib">
 	
   <extension target="org.nuxeo.runtime.datasource" point="datasources">
-	<datasource name="jdbc/lifesci_domain" driverClassName="org.postgresql.Driver"
+	<datasource name="jdbc/testsci_domain" driverClassName="org.postgresql.Driver"
       maxPoolSize="100" minPoolSize="5" blockingTimeoutMillis="10000"
-      url="jdbc:postgresql://localhost:5432/lifesci_domain" validationQuery=""
+      url="jdbc:postgresql://localhost:5432/testsci_domain" validationQuery=""
       username="nuxeo6" password="nuxeo6"
       accessToUnderlyingConnectionAllowed="true" >
     </datasource>
-    <link name="jdbc/repository_lifesci_domain" global="jdbc/lifesci_domain" type="javax.sql.DataSource" />
+    <link name="jdbc/repository_testsci_domain" global="jdbc/testsci_domain" type="javax.sql.DataSource" />
 
 	<!--
 		These links need to be moved into the context.xml file and become <Resource> instead of <link>
diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/config/elasticsearch-config.xml b/3rdparty/nuxeo/nuxeo-server/6.0/config/elasticsearch-config.xml
index 7fdb10454..e7651b363 100644
--- a/3rdparty/nuxeo/nuxeo-server/6.0/config/elasticsearch-config.xml
+++ b/3rdparty/nuxeo/nuxeo-server/6.0/config/elasticsearch-config.xml
@@ -190,7 +190,7 @@
 
     <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
     point="elasticSearchIndex">
-    <elasticSearchIndex name="lifesci_domain" type="doc" repository="lifesci_domain">
+    <elasticSearchIndex name="testsci_domain" type="doc" repository="testsci_domain">
       <fetchFromSource>
         <include>ecm:*</include>
         <include>dc:*</include>
diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/config/proto-datasource-config.xml b/3rdparty/nuxeo/nuxeo-server/6.0/config/proto-datasource-config.xml
index ed36fc084..4887c1673 100644
--- a/3rdparty/nuxeo/nuxeo-server/6.0/config/proto-datasource-config.xml
+++ b/3rdparty/nuxeo/nuxeo-server/6.0/config/proto-datasource-config.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<component name="org.nuxeo.runtime.datasource.lifesci.contrib">
+<component name="org.nuxeo.runtime.datasource.testsci.contrib">
 	
   <extension target="org.nuxeo.runtime.datasource" point="datasources">
-	<datasource name="jdbc/lifesci_domain" driverClassName="org.postgresql.Driver"
+	<datasource name="jdbc/testsci_domain" driverClassName="org.postgresql.Driver"
       maxPoolSize="100" minPoolSize="5" blockingTimeoutMillis="10000"
-      url="jdbc:postgresql://localhost:5432/lifesci_domain" validationQuery=""
+      url="jdbc:postgresql://localhost:5432/testsci_domain" validationQuery=""
       username="nuxeo6" password="nuxeo6"
       accessToUnderlyingConnectionAllowed="true" >
     </datasource>
-    <link name="jdbc/repository_lifesci_domain" global="jdbc/lifesci_domain" type="javax.sql.DataSource" />
+    <link name="jdbc/repository_testsci_domain" global="jdbc/testsci_domain" type="javax.sql.DataSource" />
 
 	<!--
 		These links need to be moved into the context.xml file and become <Resource> instead of <link>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
index ec9577b47..ffdd76cde 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
@@ -3,7 +3,7 @@
     <auths>
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
         <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
-        <auth ID="admin@lifesci.collectionspace.org">YWRtaW5AbGlmZXNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
+        <auth ID="admin@testsci.collectionspace.org">YWRtaW5AdGVzdHNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
     </auths>
         
     <!-- This tests the UpdateObjectLocationBatchJob -->
@@ -801,21 +801,21 @@
     <!-- records are configured to be versioned. See CSPACE-6188 for more details. -->    
     <testGroup ID="invocationModeSingleInVersioningEnabledTenant" autoDeletePOSTS="true">
         
-        <test ID="createBatchRecordInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="createBatchRecordInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/batch</uri>
             <filename>batch/batch-create-updateobjloc.xml</filename>
             <expectedCodes>201</expectedCodes>
         </test>
 
-        <test ID="createCollectionObjectInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="createCollectionObjectInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/collectionobjects</uri>
             <filename>batch/collObj1.xml</filename>
             <expectedCodes>201</expectedCodes>
         </test>
         
-        <test ID="createMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="createMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/movements</uri>
             <filename>batch/movement.xml</filename>
@@ -826,7 +826,7 @@
             <expectedCodes>201</expectedCodes>
         </test>
         
-        <test ID="relateCollectionObjectToMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="relateCollectionObjectToMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/relations</uri>
             <filename>batch/relation.xml</filename>
@@ -841,7 +841,7 @@
         
         <!-- Posts of batch job invocation requests don't create new records, -->
         <!-- so we need to exclude them from the post-run auto-deletion of records. -->
-        <test ID="invokeBatchAfterRelatingMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org" autoDeletePOSTS="false">
+        <test ID="invokeBatchAfterRelatingMovementInVersioningTenant" auth="admin@testsci.collectionspace.org" autoDeletePOSTS="false">
             <method>POST</method>
             <uri>/cspace-services/batch/${createBatchRecordInVersioningTenant.CSID}</uri>
             <filename>batch/batch-invoke-updateobjloc-single.xml</filename>
@@ -851,7 +851,7 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-        <test ID="readCollectionObjectAfterRelatingToMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="readCollectionObjectAfterRelatingToMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${createCollectionObjectInVersioningTenant.CSID}</uri>
             <response>
@@ -864,7 +864,7 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-        <test ID="modifyMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="modifyMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>PUT</method>
             <uri>/cspace-services/movements/${createMovementInVersioningTenant.CSID}</uri>
             <filename>batch/movement.xml</filename>
@@ -875,7 +875,7 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-        <test ID="invokeBatchAfterModifyingMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org" autoDeletePOSTS="false">
+        <test ID="invokeBatchAfterModifyingMovementInVersioningTenant" auth="admin@testsci.collectionspace.org" autoDeletePOSTS="false">
             <method>POST</method>
             <uri>/cspace-services/batch/${createBatchRecordInVersioningTenant.CSID}</uri>
             <filename>batch/batch-invoke-updateobjloc-single.xml</filename>
@@ -885,7 +885,7 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-        <test ID="readCollectionObjectAfterModifyingMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="readCollectionObjectAfterModifyingMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${createCollectionObjectInVersioningTenant.CSID}</uri>
             <response>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-adv-search.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-adv-search.xml
index 94a705528..674dc371d 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-adv-search.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-adv-search.xml
@@ -3,12 +3,12 @@
 <xmlReplay>
     <auths>
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
-        <auth ID="admin@lifesci.collectionspace.org">YWRtaW5AbGlmZXNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
+        <auth ID="admin@testsci.collectionspace.org">YWRtaW5AdGVzdHNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
     </auths>
     
     <testGroup ID="advSearchCommonSchema" autoDeletePOSTS="true">
         <!-- Create a new CollectionObject record with a common part. -->
-       <test ID="co1"  auth="admin@lifesci.collectionspace.org">
+       <test ID="co1"  auth="admin@testsci.collectionspace.org">
              <method>POST</method>
              <uri>/cspace-services/collectionobjects/</uri>
              <filename>collectionobject/co1.xml</filename>
@@ -21,14 +21,14 @@
             <response>
                 <expected level="TEXT" />
                 <label>abstract-common-list</label>
-                <filename>collectionobject/res/co1-adv-search-lifesci.res.xml</filename>
+                <filename>collectionobject/res/co1-adv-search-testsci.res.xml</filename>
              </response>
          </test>
     </testGroup>
    
     <testGroup ID="advSearchExtensionSchema" autoDeletePOSTS="true">
         <!-- Create a new CollectionObject record with an extension schema part -->
-       <test ID="co2" auth="admin@lifesci.collectionspace.org">
+       <test ID="co2" auth="admin@testsci.collectionspace.org">
              <method>POST</method>
              <uri>/cspace-services/collectionobjects/</uri>
              <filename>collectionobject/co2.xml</filename>
@@ -52,7 +52,7 @@
             <response>
                 <expected level="TEXT" />
                 <label>abstract-common-list</label>
-                <filename>collectionobject/res/co2-adv-search-lifesci.res.xml</filename>
+                <filename>collectionobject/res/co2-adv-search-testsci.res.xml</filename>
              </response>
          </test>
     </testGroup>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/res/co1-adv-search-lifesci.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/res/co1-adv-search-testsci.res.xml
similarity index 100%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/res/co1-adv-search-lifesci.res.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/res/co1-adv-search-testsci.res.xml
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/res/co2-adv-search-lifesci.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/res/co2-adv-search-testsci.res.xml
similarity index 100%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/res/co2-adv-search-lifesci.res.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/res/co2-adv-search-testsci.res.xml
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_co.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testsci_extended_co.xml
similarity index 87%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_co.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testsci_extended_co.xml
index 0a244c24b..67f103d13 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_co.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testsci_extended_co.xml
@@ -7,10 +7,10 @@
       <taxonomicIdentGroup>
         <qualifier>questionable</qualifier>
         <notes/>
-        <taxon>urn:cspace:lifesci.collectionspace.org:taxonomyauthority:name(taxon):item:name(AcerJaponicus1332900279183)'Acer
+        <taxon>urn:cspace:testsci.collectionspace.org:taxonomyauthority:name(taxon):item:name(AcerJaponicus1332900279183)'Acer
           Japonicus'</taxon>
         <reference/>
-        <identBy>urn:cspace:lifesci.collectionspace.org:personauthorities:name(person):item:name(PatrickSchmitz1332900293194)'Patrick
+        <identBy>urn:cspace:testsci.collectionspace.org:personauthorities:name(person):item:name(PatrickSchmitz1332900293194)'Patrick
           Schmitz'</identBy>
         <institution/>
       </taxonomicIdentGroup>
@@ -25,11 +25,11 @@
         <titleType>generic</titleType>
         <titleTranslationSubGroupList>
           <titleTranslationSubGroup>
-            <titleTranslationLanguage>urn:cspace:lifesci.collectionspace.org:vocabularies:name(languages):item:name(deu)'German'</titleTranslationLanguage>
+            <titleTranslationLanguage>urn:cspace:testsci.collectionspace.org:vocabularies:name(languages):item:name(deu)'German'</titleTranslationLanguage>
             <titleTranslation>Das ist ein nettes Object</titleTranslation>
           </titleTranslationSubGroup>
         </titleTranslationSubGroupList>
-        <titleLanguage>urn:cspace:lifesci.collectionspace.org:vocabularies:name(languages):item:name(eng)'English'</titleLanguage>
+        <titleLanguage>urn:cspace:testsci.collectionspace.org:vocabularies:name(languages):item:name(eng)'English'</titleLanguage>
       </titleGroup>
     </titleGroupList>
     <responsibleDepartments>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_injectedco.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testsci_extended_injectedco.xml
similarity index 88%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_injectedco.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testsci_extended_injectedco.xml
index 4e45d2bd3..05b7b19bd 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_injectedco.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testsci_extended_injectedco.xml
@@ -7,10 +7,10 @@
       <taxonomicIdentGroup>
         <qualifier>questionable</qualifier>
         <notes/>
-        <taxon>urn:cspace:lifesci.collectionspace.org:taxonomyauthority:name(taxon):item:name(AcerJaponicus1332900279183)'Acer
+        <taxon>urn:cspace:testsci.collectionspace.org:taxonomyauthority:name(taxon):item:name(AcerJaponicus1332900279183)'Acer
           Japonicus'</taxon>
         <reference/>
-        <identBy>urn:cspace:lifesci.collectionspace.org:personauthorities:name(person):item:name(PatrickSchmitz1332900293194)'Patrick
+        <identBy>urn:cspace:testsci.collectionspace.org:personauthorities:name(person):item:name(PatrickSchmitz1332900293194)'Patrick
           Schmitz'</identBy>
         <institution/>
       </taxonomicIdentGroup>
@@ -30,11 +30,11 @@
         <titleType>generic</titleType>
         <titleTranslationSubGroupList>
           <titleTranslationSubGroup>
-            <titleTranslationLanguage>urn:cspace:lifesci.collectionspace.org:vocabularies:name(languages):item:name(deu)'German'</titleTranslationLanguage>
+            <titleTranslationLanguage>urn:cspace:testsci.collectionspace.org:vocabularies:name(languages):item:name(deu)'German'</titleTranslationLanguage>
             <titleTranslation>Das ist ein nettes Object</titleTranslation>
           </titleTranslationSubGroup>
         </titleTranslationSubGroupList>
-        <titleLanguage>urn:cspace:lifesci.collectionspace.org:vocabularies:name(languages):item:name(eng)'English'</titleLanguage>
+        <titleLanguage>urn:cspace:testsci.collectionspace.org:vocabularies:name(languages):item:name(eng)'English'</titleLanguage>
       </titleGroup>
     </titleGroupList>
     <responsibleDepartments>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
index 5ecea8223..8d49422a9 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
@@ -3,7 +3,7 @@
     <auths>
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
         <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
-        <auth ID="admin@lifesci.collectionspace.org">YWRtaW5AbGlmZXNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
+        <auth ID="admin@testsci.collectionspace.org">YWRtaW5AdGVzdHNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
     </auths>
     
     <!-- ================================================================================ -->
@@ -411,16 +411,16 @@
     </testGroup>
     
     <!--
-      By default, the demonstration 'lifesci' tenant is configured to use a separate,
+      By default, the demonstration 'testsci' tenant is configured to use a separate,
       rather than a shared, Nuxeo repository domain.
 
-      The test(s) in this test group authenticate as a user in the lifesci tenant and
+      The test(s) in this test group authenticate as a user in the testsci tenant and
       thus verify that imports also work with separate, per-tenant repository domains.
     -->
     <testGroup ID="importsSeparateRepoTestGroup" autoDeletePOSTS="false">
 
         <!-- Import a single ObjectExit record into a separate repo domain -->
-        <test ID="importObjectExitSeparateRepo" auth="admin@lifesci.collectionspace.org">
+        <test ID="importObjectExitSeparateRepo" auth="admin@testsci.collectionspace.org">
             <expectedCodes>200</expectedCodes>
             <method>POST</method>
             <uri>/cspace-services/imports</uri>
@@ -430,7 +430,7 @@
                 <filename>imports/res/import-objectexit.res.xml</filename>
             </response>
         </test>
-        <test ID="deleteObjectExitSeparateRepo" auth="admin@lifesci.collectionspace.org">
+        <test ID="deleteObjectExitSeparateRepo" auth="admin@testsci.collectionspace.org">
             <expectedCodes>200</expectedCodes>
             <method>DELETE</method>
             <uri>/cspace-services/objectexit/${importObjectExitSeparateRepo.got("//csid")}</uri>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/listener-update-object-loc.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/listener-update-object-loc.xml
index b24705bee..04c2eb725 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/listener-update-object-loc.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/listener-update-object-loc.xml
@@ -3,7 +3,7 @@
     <auths>
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
         <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
-        <auth ID="admin@lifesci.collectionspace.org">YWRtaW5AbGlmZXNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
+        <auth ID="admin@testsci.collectionspace.org">YWRtaW5AdGVzdHNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
     </auths>
         
     <!-- This tests the UpdateObjectLocationOnMoveEventListener -->
@@ -642,14 +642,14 @@
     <!-- records are configured to be versioned. See CSPACE-6171 for more details. -->    
     <testGroup ID="updateObjectLocationOnMoveInVersioningEnabledTenant" autoDeletePOSTS="true">
 
-        <test ID="createCollectionObjectInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="createCollectionObjectInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/collectionobjects</uri>
             <filename>listener/collectionobject.xml</filename>
             <expectedCodes>201</expectedCodes>
         </test>
         
-        <test ID="createMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="createMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/movements</uri>
             <filename>listener/movement.xml</filename>
@@ -660,7 +660,7 @@
             <expectedCodes>201</expectedCodes>
         </test>
         
-        <test ID="relateCollectionObjectToMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="relateCollectionObjectToMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/relations</uri>
             <filename>listener/relation.xml</filename>
@@ -676,7 +676,7 @@
         <!-- See comment on updateMovement1 in the updateObjectLocationOnMoveEventListener -->
         <!-- test group for an explanation of why this update is needed, after -->
         <!-- creating a new relation -->
-        <test ID="updateMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="updateMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>PUT</method>
             <uri>/cspace-services/movements/${createMovementInVersioningTenant.CSID}</uri>
             <filename>listener/movement.xml</filename>
@@ -687,7 +687,7 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-        <test ID="readCollectionObjectAfterRelatingToMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="readCollectionObjectAfterRelatingToMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${createCollectionObjectInVersioningTenant.CSID}</uri>
             <response>
@@ -700,7 +700,7 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-        <test ID="modifyMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="modifyMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>PUT</method>
             <uri>/cspace-services/movements/${createMovementInVersioningTenant.CSID}</uri>
             <filename>listener/movement.xml</filename>
@@ -711,7 +711,7 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-        <test ID="readCollectionObjectAfterModifyingMovementInVersioningTenant" auth="admin@lifesci.collectionspace.org">
+        <test ID="readCollectionObjectAfterModifyingMovementInVersioningTenant" auth="admin@testsci.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${createCollectionObjectInVersioningTenant.CSID}</uri>
             <response>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_testsci.xml
similarity index 100%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_testsci.xml
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_testsci_set_broader.xml
similarity index 100%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_testsci_set_broader.xml
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/lifesciPersonWithRelns.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/testsciPersonWithRelns.res.xml
similarity index 96%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/lifesciPersonWithRelns.res.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/testsciPersonWithRelns.res.xml
index d9661ff15..db871e5bd 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/lifesciPersonWithRelns.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/testsciPersonWithRelns.res.xml
@@ -4,7 +4,7 @@
     <totalItems>1</totalItems>
     <!-- 
     This file represents the expected response from test case
-    	lifesciperson.xml :: 
+    	testsciperson.xml :: 
     These are the vars that are available from the time Person1 is created.
     Person1.CSID       ${Person1.CSID}
     Person2.CSID     ${Person2.CSID}
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/lifesciperson.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/testsciperson.xml
similarity index 87%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/lifesciperson.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/testsciperson.xml
index 6f5136f65..3e0cf50b2 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/lifesciperson.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/testsciperson.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmlReplay>
-  <!-- Authenticate into the lifesci tenant for extension testing -->
-  <auths default="admin@lifesci.collectionspace.org">
-    <auth ID="admin@lifesci.collectionspace.org"
-      >YWRtaW5AbGlmZXNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
+  <!-- Authenticate into the testsci tenant for extension testing -->
+  <auths default="admin@testsci.collectionspace.org">
+    <auth ID="admin@testsci.collectionspace.org"
+      >YWRtaW5AdGVzdHNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
   </auths>
 
   <!-- 
@@ -11,7 +11,7 @@
     For now, use ID="updatePerson"
   -->
   <testGroup ID="person" autoDeletePOSTS="true">
-    <test ID="PersonAuth1" auth="admin@lifesci.collectionspace.org">
+    <test ID="PersonAuth1" auth="admin@testsci.collectionspace.org">
       <method>POST</method>
       <uri>/cspace-services/personauthorities/</uri>
       <filename>person/personauthorities_common.xml</filename>
@@ -22,7 +22,7 @@
     <test ID="Person1">
       <method>POST</method>
       <uri>/cspace-services/personauthorities/${PersonAuth1.CSID}/items/</uri>
-      <filename>person/persons_common_and_lifesci.xml</filename>
+      <filename>person/persons_common_and_testsci.xml</filename>
       <vars>
         <var ID="shortIdentifier">johnWayneActor1</var>
         <var ID="foreName">John</var>
@@ -33,7 +33,7 @@
     <test ID="Person2">
       <method>POST</method>
       <uri>/cspace-services/personauthorities/${PersonAuth1.CSID}/items/</uri>
-      <filename>person/persons_common_and_lifesci.xml</filename>
+      <filename>person/persons_common_and_testsci.xml</filename>
       <vars>
         <var ID="shortIdentifier">billyBob1</var>
         <var ID="foreName">Billy-Bob</var>
@@ -65,7 +65,7 @@
     <test ID="UpdatePerson2WithRelations">
       <method>PUT</method>
       <uri>/cspace-services/personauthorities/${PersonAuth1.CSID}/items/${Person2.CSID}</uri>
-      <filename>person/persons_common_and_lifesci_set_broader.xml</filename>
+      <filename>person/persons_common_and_testsci_set_broader.xml</filename>
       <vars>
         <var ID="shortIdentifier">billyBob1</var>
         <var ID="foreName">Billy-Bob</var>
@@ -82,8 +82,8 @@
       <uri>/cspace-services/personauthorities/${PersonAuth1.CSID}/items/${Person1.CSID}?showAllRelations=true</uri>
       <response>
         <expected level="ADDOK"/>
-        <filename>person/res/lifesciPersonWithRelns.res.xml</filename>
-        <!-- NOTE: vars are referenced in lifesciPersonWithRelns.res.xml
+        <filename>person/res/testsciPersonWithRelns.res.xml</filename>
+        <!-- NOTE: vars are referenced in testsciPersonWithRelns.res.xml
           from tests in this test group, e.g. 
           PersonParent.CSID :: ${PersonParent.CSID} 
           These vars are all in the expression context while this group is active,
@@ -99,8 +99,8 @@
       <uri>/cspace-services/personauthorities/${PersonAuth1.CSID}/items/${Person2.CSID}?showAllRelations=true</uri>
       <response>
         <expected level="ADDOK"/>
-        <filename>person/res/lifesciPersonWithRelns.res.xml</filename>
-        <!-- NOTE: vars are referenced in lifesciPersonWithRelns.res.xml
+        <filename>person/res/testsciPersonWithRelns.res.xml</filename>
+        <!-- NOTE: vars are referenced in testsciPersonWithRelns.res.xml
           from tests in this test group, e.g. 
           PersonParent.CSID :: ${PersonParent.CSID} 
           These vars are all in the expression context while this group is active,
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/versioning.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/versioning.xml
index c8edb53f1..5d4201c0d 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/versioning.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/versioning.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmlReplay>
-  <!-- Authenticate into the lifesci tenant. By default, versioning -->
+  <!-- Authenticate into the testsci tenant. By default, versioning -->
   <!-- support is exposed in the Location/Movement/Inventory service -->
   <!-- in that tenant. -->
-  <auths default="admin@lifesci.collectionspace.org">
-    <auth ID="admin@lifesci.collectionspace.org"
-      >YWRtaW5AbGlmZXNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
+  <auths default="admin@testsci.collectionspace.org">
+    <auth ID="admin@testsci.collectionspace.org"
+      >YWRtaW5AdGVzdHNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
   </auths>
 
   <!-- Verifies that, by default: -->
@@ -13,7 +13,7 @@
   <!--   * Only the current version of a record is retrieved on a read request. -->
   <testGroup ID="VersionedRecordFiltering" autoDeletePOSTS="true">
   
-    <test ID="CreateMovement" auth="admin@lifesci.collectionspace.org">
+    <test ID="CreateMovement" auth="admin@testsci.collectionspace.org">
       <method>POST</method>
       <uri>/cspace-services/movements/</uri>
       <filename>versioning/movement.xml</filename>
@@ -34,7 +34,7 @@
       <uri>/cspace-services/movements</uri>
     </test>
     
-    <test ID="UpdateMovement" auth="admin@lifesci.collectionspace.org">
+    <test ID="UpdateMovement" auth="admin@testsci.collectionspace.org">
       <method>PUT</method>
       <uri>/cspace-services/movements/${CreateMovement.CSID}</uri>
       <filename>versioning/movement.xml</filename>
diff --git a/services/client/src/main/resources/collectionspace-client.properties b/services/client/src/main/resources/collectionspace-client.properties
index 472295ea7..75cb8b86d 100644
--- a/services/client/src/main/resources/collectionspace-client.properties
+++ b/services/client/src/main/resources/collectionspace-client.properties
@@ -10,7 +10,7 @@ cspace.ssl=false
 cspace.auth=true
 # default user
 cspace.user=admin@core.collectionspace.org
-#cspace.user=admin@lifesci.collectionspace.org
+#cspace.user=admin@testsci.collectionspace.org
 cspace.password=Administrator
 # default tenant
 cspace.tenant=1
diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index 5e92cd25c..41a27d3c1 100644
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -9,7 +9,7 @@
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
 	<property name="nuxeo-platform-collectionobject" value="nuxeo-platform-cs-collectionobject"/>
-	<property name="nuxeo-platform-collectionobject-lifesci" value="nuxeo-platform-collectionobject-lifesci"/>
+	<property name="nuxeo-platform-collectionobject-testsci" value="nuxeo-platform-collectionobject-testsci"/>
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
     <property name="build" location="build"/>
@@ -116,7 +116,7 @@
     description="deploy collectionobject in ${jee.server.nuxeo}">
     	<!-- These targets are obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool    	
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="deploy" inheritall="false"/>
-        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="deploy" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject-testsci}/build.xml" target="deploy" inheritall="false"/>
         -->
     </target>
 
@@ -125,19 +125,19 @@
     	<!-- These targets are obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
     	leaving this only for backwards compatibility reasons. -->    	
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="undeploy" inheritall="false"/>
-        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="undeploy" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject-testsci}/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist"
     description="generate distribution for collectionobject" depends="package">
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="dist" inheritall="false"/>
-        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject-testsci}/build.xml" target="dist" inheritall="false"/>
     </target>
 
     <target name="dist_installer"
     description="generate distribution for collectionobject" depends="package">
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="dist_installer" inheritall="false"/>
-        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="dist_installer" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject-testsci}/build.xml" target="dist_installer" inheritall="false"/>
     </target>
 
 </project>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/build.xml
similarity index 91%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/build.xml
index 7d3705ba7..5650a2e8c 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="nuxeo-platform-collectionobject-lifesci" default="package" basedir=".">
+<project name="nuxeo-platform-collectionobject-testsci" default="package" basedir=".">
     <description>
-        Collectionobject nuxeo document type for the lifesci tenant
+        Collectionobject nuxeo document type for the testsci tenant
     </description>
     <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
@@ -18,10 +18,10 @@
     <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
     <!-- Additional legacy JAR(s) are removed via the 'undeploy' target in the -->
     <!-- Ant buildfile for the common schema -->
-    <property name="nuxeo.collectionobject.lifesci.legacy.jars.all"
-        value="org.collectionspace.services.collectionobject.3rdparty.lifesci.nuxeo-*.jar"/>
-    <property name="nuxeo.collectionobject.lifesci.legacy.jar"
-        value="org.collectionspace.services.collectionobject.3rdparty.lifesci.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.collectionobject.testsci.legacy.jars.all"
+        value="org.collectionspace.services.collectionobject.3rdparty.testsci.nuxeo-*.jar"/>
+    <property name="nuxeo.collectionobject.testsci.legacy.jar"
+        value="org.collectionspace.services.collectionobject.3rdparty.testsci.nuxeo-${cspace.release}.jar"/>
     
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -126,7 +126,7 @@
         description="deploy collectionobject doctype in ${jee.server.nuxeo}">
         <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
         leaving this only for backwards compatibility reasons. -->  
-        <copy file="${basedir}/target/${nuxeo.collectionobject.lifesci.legacy.jar}"
+        <copy file="${basedir}/target/${nuxeo.collectionobject.testsci.legacy.jar}"
             todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
@@ -139,13 +139,13 @@
             <!-- Additional legacy JAR(s) are removed via the 'undeploy' target in the -->
             <!-- Ant buildfile for the common schema -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.collectionobject.lifesci.legacy.jars.all}"/>
+                <include name="${nuxeo.collectionobject.testsci.legacy.jars.all}"/>
             </fileset>
         </delete>
         <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
         <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
-                <include name="${nuxeo.collectionobject.lifesci.legacy.jars.all}"/>
+                <include name="${nuxeo.collectionobject.testsci.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -153,14 +153,14 @@
     <target name="dist"
     	description="generate distribution for collectionobject doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.collectionobject.lifesci.legacy.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.testsci.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for CollectionObject doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/collectionobject/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.collectionobject.lifesci.legacy.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.testsci.legacy.jar}"/>
         </copy>
     </target>
 </project>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml
similarity index 96%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml
index a280be6bd..631ef3495 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml
@@ -8,7 +8,7 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.collectionspace.services.collectionobject.3rdparty.lifesci.nuxeo</artifactId>
+    <artifactId>org.collectionspace.services.collectionobject.3rdparty.testsci.nuxeo</artifactId>
     <packaging>jar</packaging>
     <description>
         CollectionObject Nuxeo document type for Tenant ID = "2"
@@ -17,7 +17,7 @@
 	<properties>
 		<CustomSchemaName>collectionobjects_naturalhistory</CustomSchemaName>
 		<TenantId>2</TenantId>
-		<TenantLabel>lifesci</TenantLabel>
+		<TenantLabel>testsci</TenantLabel>
 	</properties>
 	
     <build>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/README.txt b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/src/main/resources/OSGI-INF/README.txt
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/README.txt
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/src/main/resources/OSGI-INF/README.txt
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/schemas/README.txt b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/src/main/resources/schemas/README.txt
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/schemas/README.txt
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/src/main/resources/schemas/README.txt
diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index 76db2b9b7..cf04d3441 100644
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -27,7 +27,7 @@
     <modules>
         <!-- These modules are obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
     	<module>nuxeo-platform-cs-collectionobject</module>
-        <module>nuxeo-platform-collectionobject-lifesci</module>
+        <module>nuxeo-platform-collectionobject-testsci</module>
         -->
     </modules>
 
diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
index b4f254698..00f7c8648 100644
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
@@ -8,7 +8,7 @@
 				within a term. If this value is set to 'false', searches will only find terms which begin with your search expression. However, 
 				even with a setting of 'false', you can manually add an asterisk (*) as a wildcard at the beginning of any search; e.g. "*atrick" 
 				(without quotes) will match the string "atrick" anywhere, not just at the beginning of a term. See the tenant-bindings.delta.xml 
-				file for the 'lifesci' tenant, for examples of how to override this value, and other, similar values below, in your own tenant. -->
+				file for the 'testsci' tenant, for examples of how to override this value, and other, similar values below, in your own tenant. -->
 			<types:item id="ptstartingwildcard" merge:matcher="skip" merge:action="insert" xmlns:types="http://collectionspace.org/services/config/types">
 				<types:key>ptStartingWildcard</types:key>
 				<types:value>true</types:value>
diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings.touchstone.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings.touchstone.xml
index 87a3be6d2..d585c8ca9 100644
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings.touchstone.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings.touchstone.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tenant:TenantBindingConfig xmlns:tenant="http://collectionspace.org/services/config/tenant" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://collectionspace.org/services/config/tenant http://collectionspace.org/services/config/tenant.xsd">
-  <tenant:tenantBinding id="2" name="lifesci.collectionspace.org" displayName="Default tenant Lifesci" version="0.1">
-    <tenant:repositoryDomain name="default-domain" storageName="lifesci_domain" repositoryClient="nuxeo-java" repositoryName="lifesci_domain" />
+  <tenant:tenantBinding id="2" name="testsci.collectionspace.org" displayName="Default tenant testsci" version="0.1">
+    <tenant:repositoryDomain name="default-domain" storageName="testsci_domain" repositoryClient="nuxeo-java" repositoryName="testsci_domain" />
     <tenant:properties>
       <types:item xmlns:types="http://collectionspace.org/services/config/types">
         <types:key>datePattern</types:key>
diff --git a/services/common/src/main/cspace/config/services/tenants/lifesci/lifesci-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/testsci/testsci-tenant-bindings.delta.xml
similarity index 87%
rename from services/common/src/main/cspace/config/services/tenants/lifesci/lifesci-tenant-bindings.delta.xml
rename to services/common/src/main/cspace/config/services/tenants/testsci/testsci-tenant-bindings.delta.xml
index 80db1ae6f..48c556073 100644
--- a/services/common/src/main/cspace/config/services/tenants/lifesci/lifesci-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/testsci/testsci-tenant-bindings.delta.xml
@@ -3,7 +3,7 @@
 
     <!-- Add your changes, if any, within the following tag pair. -->
     <!-- The value of the 'id' attribute, below, should match the corresponding -->
-    <!-- value in cspace/config/services/tenants/lifesci-tenant-bindings-proto.xml -->
+    <!-- value in cspace/config/services/tenants/testsci-tenant-bindings-proto.xml -->
     <!--
     <tenant:tenantBinding id="2">
     </tenant:tenantBinding>
diff --git a/services/person/3rdparty/build.xml b/services/person/3rdparty/build.xml
index f54ea8aab..3df7bb1e5 100644
--- a/services/person/3rdparty/build.xml
+++ b/services/person/3rdparty/build.xml
@@ -112,7 +112,7 @@
     description="deploy person in ${jee.server.nuxeo}">
     	<!-- These targets are obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
         <ant antfile="nuxeo-platform-cs-person/build.xml" target="deploy" inheritall="false"/>
-        <ant antfile="nuxeo-platform-person-lifesci/build.xml" target="deploy" inheritall="false"/>
+        <ant antfile="nuxeo-platform-person-testsci/build.xml" target="deploy" inheritall="false"/>
         -->
     </target>
 
@@ -121,19 +121,19 @@
     	<!-- These targets are obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
     	leaving this only for backwards compatibility reasons. -->
         <ant antfile="nuxeo-platform-cs-person/build.xml" target="undeploy" inheritall="false"/>
-        <ant antfile="nuxeo-platform-person-lifesci/build.xml" target="undeploy" inheritall="false"/>
+        <ant antfile="nuxeo-platform-person-testsci/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist"
     description="generate distribution for person" depends="package">
         <ant antfile="nuxeo-platform-cs-person/build.xml" target="dist" inheritall="false"/>
-        <ant antfile="nuxeo-platform-person-lifesci/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="nuxeo-platform-person-testsci/build.xml" target="dist" inheritall="false"/>
     </target>
     
     <target name="dist_installer"
     description="generate distribution for collectionobject" depends="package">
         <ant antfile="nuxeo-platform-cs-person/build.xml" target="dist_installer" inheritall="false"/>
-        <ant antfile="nuxeo-platform-person-lifesci/build.xml" target="dist_installer" inheritall="false"/>
+        <ant antfile="nuxeo-platform-person-testsci/build.xml" target="dist_installer" inheritall="false"/>
     </target>
 
 </project>
diff --git a/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml b/services/person/3rdparty/nuxeo-platform-person-testsci/build.xml
similarity index 91%
rename from services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
rename to services/person/3rdparty/nuxeo-platform-person-testsci/build.xml
index f75f1305c..a3df2637e 100644
--- a/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
+++ b/services/person/3rdparty/nuxeo-platform-person-testsci/build.xml
@@ -1,7 +1,7 @@
 
-<project name="nuxeo-platform-person-lifesci" default="package" basedir=".">
+<project name="nuxeo-platform-person-testsci" default="package" basedir=".">
     <description>
-        Person nuxeo document type for the lifesci tenant
+        Person nuxeo document type for the testsci tenant
     </description>
     <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
@@ -16,10 +16,10 @@
     <!-- Both doctype and schema JAR(s) are removed via the 'undeploy' target -->
     <!-- in another Ant buildfile, in a peer module to this module -->
     <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier -->
-    <property name="nuxeo.person.lifesci.legacy.jars.all"
-        value="org.collectionspace.services.person.3rdparty.lifesci.nuxeo-*.jar"/>
-    <property name="nuxeo.person.lifesci.legacy.jar"
-        value="org.collectionspace.services.person.3rdparty.lifesci.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.person.testsci.legacy.jars.all"
+        value="org.collectionspace.services.person.3rdparty.testsci.nuxeo-*.jar"/>
+    <property name="nuxeo.person.testsci.legacy.jar"
+        value="org.collectionspace.services.person.3rdparty.testsci.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -124,7 +124,7 @@
         description="deploy person doctype in ${jee.server.nuxeo}">
         <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
         leaving this only for backwards compatibility reasons. -->  
-        <copy file="${basedir}/target/${nuxeo.person.lifesci.legacy.jar}"
+        <copy file="${basedir}/target/${nuxeo.person.testsci.legacy.jar}"
             todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
@@ -137,13 +137,13 @@
             <!-- Additional legacy JAR(s) are removed via the 'undeploy' target in the -->
             <!-- Ant buildfile for the common schema -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.person.lifesci.legacy.jars.all}"/>
+                <include name="${nuxeo.person.testsci.legacy.jars.all}"/>
             </fileset>
         </delete>
         <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
         <delete quiet="true">
             <fileset dir="${jee.deploy.nuxeo.system}">
-                <include name="${nuxeo.person.lifesci.legacy.jars.all}"/>
+                <include name="${nuxeo.person.testsci.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
diff --git a/services/person/3rdparty/nuxeo-platform-person-lifesci/pom.xml b/services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml
similarity index 93%
rename from services/person/3rdparty/nuxeo-platform-person-lifesci/pom.xml
rename to services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml
index 4ce930227..cf6ae2c1a 100644
--- a/services/person/3rdparty/nuxeo-platform-person-lifesci/pom.xml
+++ b/services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml
@@ -9,7 +9,7 @@
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services.person.3rdparty.lifesci.nuxeo</artifactId>
+    <artifactId>org.collectionspace.services.person.3rdparty.testsci.nuxeo</artifactId>
     <packaging>jar</packaging>
     <description>
         Person Nuxeo document type for Tenant ID = "2"
@@ -18,7 +18,7 @@
 	<properties>
 		<CustomSchemaName>persons_naturalhistory</CustomSchemaName>
 		<TenantId>2</TenantId>
-		<TenantLabel>lifesci</TenantLabel>
+		<TenantLabel>testsci</TenantLabel>
 	</properties>
 	
     <build>
diff --git a/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/META-INF/README.txt b/services/person/3rdparty/nuxeo-platform-person-testsci/src/main/resources/META-INF/README.txt
similarity index 100%
rename from services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/META-INF/README.txt
rename to services/person/3rdparty/nuxeo-platform-person-testsci/src/main/resources/META-INF/README.txt
diff --git a/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/OSGI-INF/README.txt b/services/person/3rdparty/nuxeo-platform-person-testsci/src/main/resources/OSGI-INF/README.txt
similarity index 100%
rename from services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/OSGI-INF/README.txt
rename to services/person/3rdparty/nuxeo-platform-person-testsci/src/main/resources/OSGI-INF/README.txt
diff --git a/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/schemas/README.txt b/services/person/3rdparty/nuxeo-platform-person-testsci/src/main/resources/schemas/README.txt
similarity index 100%
rename from services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/schemas/README.txt
rename to services/person/3rdparty/nuxeo-platform-person-testsci/src/main/resources/schemas/README.txt
diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml
index f027fc9c2..c74b497fd 100644
--- a/services/person/3rdparty/pom.xml
+++ b/services/person/3rdparty/pom.xml
@@ -19,7 +19,7 @@
     <modules>
     <!-- These modules are obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
         <module>nuxeo-platform-cs-person</module>
-        <module>nuxeo-platform-person-lifesci</module>
+        <module>nuxeo-platform-person-testsci</module>
         -->
     </modules>
 </project>
diff --git a/services/security/client/src/test/java/org/collectionspace/services/security/client/test/MultiTenancyTest.java b/services/security/client/src/test/java/org/collectionspace/services/security/client/test/MultiTenancyTest.java
index 9cfb592b4..fc4934f06 100644
--- a/services/security/client/src/test/java/org/collectionspace/services/security/client/test/MultiTenancyTest.java
+++ b/services/security/client/src/test/java/org/collectionspace/services/security/client/test/MultiTenancyTest.java
@@ -100,7 +100,7 @@ public class MultiTenancyTest extends BaseServiceTest<AbstractCommonList> {
     private final String CLASS_NAME = MultiTenancyTest.class.getName();
     private final Logger logger = LoggerFactory.getLogger(CLASS_NAME);
     private final static String TENANT_1_ADMIN_USER = "admin@core.collectionspace.org";
-    private final static String TENANT_2_ADMIN_USER = "admin@lifesci.collectionspace.org";
+    private final static String TENANT_2_ADMIN_USER = "admin@testsci.collectionspace.org";
     private final static String TENANT_ADMIN_PASS = "Administrator";
     private final static String TENANT_1_USER = "user1@museum1.org";
     private final static String TENANT_2_USER = "user2@museum2.org";
diff --git a/services/taxonomy/client/src/main/resources/collectionspace-client.properties b/services/taxonomy/client/src/main/resources/collectionspace-client.properties
index dbe86dc7b..dc924ca0d 100644
--- a/services/taxonomy/client/src/main/resources/collectionspace-client.properties
+++ b/services/taxonomy/client/src/main/resources/collectionspace-client.properties
@@ -2,5 +2,5 @@
 cspace.url=http://localhost:8180/cspace-services/
 cspace.ssl=false
 cspace.auth=true
-cspace.user=admin@lifesci.collectionspace.org
+cspace.user=admin@testsci.collectionspace.org
 cspace.password=Administrator