From 8b5d919adbcb969dbd4bcdb13130cb8037967851 Mon Sep 17 00:00:00 2001
From: Michael Ritter <mikejritter@users.noreply.github.com>
Date: Tue, 5 Nov 2024 15:32:41 -0700
Subject: [PATCH] DRYD-1575: Rename repatriationclaim to repatriationrequest
 (#429)

---
 services/JaxRsServiceProvider/pom.xml         |  2 +-
 .../CollectionSpaceJaxRsApplication.java      |  4 +-
 .../db/postgresql/load_id_generators.sql      | 36 ++++++++
 services/pom.xml                              |  2 +-
 .../build.xml                                 |  4 +-
 .../client/pom.xml                            | 10 +--
 .../client/RepatriationRequestClient.java}    | 16 ++--
 .../client/RepatriationRequestProxy.java}     |  6 +-
 .../test/RepatriationRequestServiceTest.java} | 82 +++++++++----------
 .../jaxb/pom.xml                              |  8 +-
 .../repatriationrequests_common.xsd}          | 20 ++---
 .../pom.xml                                   |  4 +-
 .../service/pom.xml                           | 12 +--
 .../RepatriationRequestResource.java}         | 14 ++--
 ...atriationRequestDocumentModelHandler.java} |  8 +-
 .../RepatriationRequestValidatorHandler.java} | 24 +++---
 16 files changed, 144 insertions(+), 108 deletions(-)
 rename services/{repatriationclaim => repatriationrequest}/build.xml (97%)
 rename services/{repatriationclaim => repatriationrequest}/client/pom.xml (81%)
 rename services/{repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimClient.java => repatriationrequest/client/src/main/java/org/collectionspace/services/client/RepatriationRequestClient.java} (66%)
 rename services/{repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimProxy.java => repatriationrequest/client/src/main/java/org/collectionspace/services/client/RepatriationRequestProxy.java} (80%)
 rename services/{repatriationclaim/client/src/test/java/org/collectionspace/services/client/test/RepatriationClaimServiceTest.java => repatriationrequest/client/src/test/java/org/collectionspace/services/client/test/RepatriationRequestServiceTest.java} (84%)
 rename services/{repatriationclaim => repatriationrequest}/jaxb/pom.xml (78%)
 rename services/{repatriationclaim/jaxb/src/main/resources/repatriationclaims_common.xsd => repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd} (81%)
 rename services/{repatriationclaim => repatriationrequest}/pom.xml (93%)
 rename services/{repatriationclaim => repatriationrequest}/service/pom.xml (84%)
 rename services/{repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/RepatriationClaimResource.java => repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/RepatriationRequestResource.java} (75%)
 rename services/{repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimDocumentModelHandler.java => repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/nuxeo/RepatriationRequestDocumentModelHandler.java} (75%)
 rename services/{repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimValidatorHandler.java => repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/nuxeo/RepatriationRequestValidatorHandler.java} (65%)

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 4f706a66d..f093852e8 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -243,7 +243,7 @@
       <!-- new claim as of 8.1.0 -->
       <dependency>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.repatriationclaim.service</artifactId>
+        <artifactId>org.collectionspace.services.repatriationrequest.service</artifactId>
         <version>${project.version}</version>
       </dependency>
         <dependency>
diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
index a4631455e..adf915434 100644
--- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
+++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
@@ -40,7 +40,7 @@ import org.collectionspace.services.intake.IntakeResource;
 import org.collectionspace.services.index.IndexResource;
 import org.collectionspace.services.loanin.LoaninResource;
 import org.collectionspace.services.loanout.LoanoutResource;
-import org.collectionspace.services.repatriationclaim.RepatriationClaimResource;
+import org.collectionspace.services.repatriationrequest.RepatriationRequestResource;
 import org.collectionspace.services.nagprainventory.NagpraInventoryResource;
 import org.collectionspace.services.summarydocumentation.SummaryDocumentationResource;
 import org.collectionspace.services.transport.TransportResource;
@@ -165,7 +165,7 @@ public class CollectionSpaceJaxRsApplication extends Application implements Reso
         addResourceToMapAndSingletons(new PropagationResource());
         addResourceToMapAndSingletons(new PottagResource());
         addResourceToMapAndSingletons(new ClaimResource());
-        addResourceToMapAndSingletons(new RepatriationClaimResource());
+        addResourceToMapAndSingletons(new RepatriationRequestResource());
         addResourceToMapAndSingletons(new ReportResource());
         addResourceToMapAndSingletons(new PublicItemResource());
         addResourceToMapAndSingletons(new TransportResource());
diff --git a/services/common/src/main/resources/db/postgresql/load_id_generators.sql b/services/common/src/main/resources/db/postgresql/load_id_generators.sql
index 8027fc570..349d5d017 100644
--- a/services/common/src/main/resources/db/postgresql/load_id_generators.sql
+++ b/services/common/src/main/resources/db/postgresql/load_id_generators.sql
@@ -1306,3 +1306,39 @@ INSERT INTO id_generators
         SELECT  csid
         FROM    id_generators
         );
+
+-- REPATRIATION_REQUEST_NUMBER
+
+INSERT INTO id_generators
+    (csid, displayname, description, priority, last_generated_id, id_generator_state)
+  SELECT
+     '7f6e2d67-b95a-4a0c-841c-5a00a9cd1db0',
+     'Repatriation Request Number',
+     'Identifies a repatriation request document.',
+     '9',
+     '',
+'<org.collectionspace.services.id.SettableIDGenerator>
+  <parts>
+    <org.collectionspace.services.id.StringIDGeneratorPart>
+      <initialValue>RR</initialValue>
+      <currentValue>RR</currentValue>
+    </org.collectionspace.services.id.StringIDGeneratorPart>
+    <org.collectionspace.services.id.YearIDGeneratorPart>
+      <currentValue></currentValue>
+    </org.collectionspace.services.id.YearIDGeneratorPart>
+    <org.collectionspace.services.id.StringIDGeneratorPart>
+      <initialValue>.</initialValue>
+      <currentValue>.</currentValue>
+    </org.collectionspace.services.id.StringIDGeneratorPart>
+    <org.collectionspace.services.id.NumericIDGeneratorPart>
+      <maxLength>6</maxLength>
+      <initialValue>1</initialValue>
+      <currentValue>-1</currentValue>
+    </org.collectionspace.services.id.NumericIDGeneratorPart>
+  </parts>
+</org.collectionspace.services.id.SettableIDGenerator>'
+  WHERE '7f6e2d67-b95a-4a0c-841c-5a00a9cd1db0' NOT IN
+        (
+        SELECT  csid
+        FROM    id_generators
+        );
diff --git a/services/pom.xml b/services/pom.xml
index 9d8b80d38..3bfb864c3 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -99,7 +99,7 @@
 		<module>publicitem</module>
 		<module>iterationreport</module>
 		<module>chronology</module>
-		<module>repatriationclaim</module>
+		<module>repatriationrequest</module>
 		<module>nagprainventory</module>
 		<module>summarydocumentation</module>
 		<module>heldintrust</module>
diff --git a/services/repatriationclaim/build.xml b/services/repatriationrequest/build.xml
similarity index 97%
rename from services/repatriationclaim/build.xml
rename to services/repatriationrequest/build.xml
index e51d9e3de..0da872363 100644
--- a/services/repatriationclaim/build.xml
+++ b/services/repatriationrequest/build.xml
@@ -1,6 +1,6 @@
-<project name="repatriationclaim" default="package" basedir=".">
+<project name="repatriationrequest" default="package" basedir=".">
   <description>
-    repatriationclaim service
+    repatriationrequest service
   </description>
   <!-- set global properties for this build -->
   <property name="services.trunk" value="../.." />
diff --git a/services/repatriationclaim/client/pom.xml b/services/repatriationrequest/client/pom.xml
similarity index 81%
rename from services/repatriationclaim/client/pom.xml
rename to services/repatriationrequest/client/pom.xml
index f8a9ea58e..aa3b731c3 100644
--- a/services/repatriationclaim/client/pom.xml
+++ b/services/repatriationrequest/client/pom.xml
@@ -4,13 +4,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services.repatriationclaim</artifactId>
+    <artifactId>org.collectionspace.services.repatriationrequest</artifactId>
     <version>${revision}</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.collectionspace.services.repatriationclaim.client</artifactId>
-  <name>services.repatriationclaim.client</name>
+  <artifactId>org.collectionspace.services.repatriationrequest.client</artifactId>
+  <name>services.repatriationrequest.client</name>
 
   <dependencies>
     <!-- CollectionSpace dependencies -->
@@ -21,7 +21,7 @@
     </dependency>
     <dependency>
       <groupId>org.collectionspace.services</groupId>
-      <artifactId>org.collectionspace.services.repatriationclaim.jaxb</artifactId>
+      <artifactId>org.collectionspace.services.repatriationrequest.jaxb</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -56,6 +56,6 @@
   </dependencies>
 
   <build>
-    <finalName>collectionspace-services-repatriationclaim-client</finalName>
+    <finalName>collectionspace-services-repatriationrequest-client</finalName>
   </build>
 </project>
\ No newline at end of file
diff --git a/services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimClient.java b/services/repatriationrequest/client/src/main/java/org/collectionspace/services/client/RepatriationRequestClient.java
similarity index 66%
rename from services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimClient.java
rename to services/repatriationrequest/client/src/main/java/org/collectionspace/services/client/RepatriationRequestClient.java
index 13ebf7d51..12a44f8f9 100644
--- a/services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimClient.java
+++ b/services/repatriationrequest/client/src/main/java/org/collectionspace/services/client/RepatriationRequestClient.java
@@ -14,24 +14,24 @@
  */
 package org.collectionspace.services.client;
 
-import org.collectionspace.services.repatriationclaim.RepatriationClaimsCommon;
+import org.collectionspace.services.repatriationrequest.RepatriationRequestsCommon;
 
 /**
- * RepatriationClaimClient.java
+ * RepatriationRequestClient.java
  */
-public class RepatriationClaimClient extends AbstractCommonListPoxServiceClientImpl<RepatriationClaimProxy, RepatriationClaimsCommon> {
+public class RepatriationRequestClient extends AbstractCommonListPoxServiceClientImpl<RepatriationRequestProxy, RepatriationRequestsCommon> {
 
-    public static final String SERVICE_NAME = "repatriationclaims";
+    public static final String SERVICE_NAME = "repatriationrequests";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;
     public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
     public static final String SERVICE_PATH_PROXY = SERVICE_PATH + "/";
     public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME;
 
-    public RepatriationClaimClient() throws Exception {
+    public RepatriationRequestClient() throws Exception {
         super();
     }
 
-    public RepatriationClaimClient(String clientPropertiesFilename) throws Exception {
+    public RepatriationRequestClient(String clientPropertiesFilename) throws Exception {
         super(clientPropertiesFilename);
     }
 
@@ -46,7 +46,7 @@ public class RepatriationClaimClient extends AbstractCommonListPoxServiceClientI
     }
 
     @Override
-    public Class<RepatriationClaimProxy> getProxyClass() {
-        return RepatriationClaimProxy.class;
+    public Class<RepatriationRequestProxy> getProxyClass() {
+        return RepatriationRequestProxy.class;
     }
 }
diff --git a/services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimProxy.java b/services/repatriationrequest/client/src/main/java/org/collectionspace/services/client/RepatriationRequestProxy.java
similarity index 80%
rename from services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimProxy.java
rename to services/repatriationrequest/client/src/main/java/org/collectionspace/services/client/RepatriationRequestProxy.java
index 77ab4e970..72338bab6 100644
--- a/services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimProxy.java
+++ b/services/repatriationrequest/client/src/main/java/org/collectionspace/services/client/RepatriationRequestProxy.java
@@ -19,9 +19,9 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 
 /**
- * RepatriationClaimProxy.java
+ * RepatriationRequestProxy.java
  */
-@Path(RepatriationClaimClient.SERVICE_PATH_PROXY)
+@Path(RepatriationRequestClient.SERVICE_PATH_PROXY)
 @Produces({"application/xml"})
 @Consumes({"application/xml"})
-public interface RepatriationClaimProxy extends CollectionSpaceCommonListPoxProxy {}
+public interface RepatriationRequestProxy extends CollectionSpaceCommonListPoxProxy {}
diff --git a/services/repatriationclaim/client/src/test/java/org/collectionspace/services/client/test/RepatriationClaimServiceTest.java b/services/repatriationrequest/client/src/test/java/org/collectionspace/services/client/test/RepatriationRequestServiceTest.java
similarity index 84%
rename from services/repatriationclaim/client/src/test/java/org/collectionspace/services/client/test/RepatriationClaimServiceTest.java
rename to services/repatriationrequest/client/src/test/java/org/collectionspace/services/client/test/RepatriationRequestServiceTest.java
index d80f05b40..c14addd85 100644
--- a/services/repatriationclaim/client/src/test/java/org/collectionspace/services/client/test/RepatriationClaimServiceTest.java
+++ b/services/repatriationrequest/client/src/test/java/org/collectionspace/services/client/test/RepatriationRequestServiceTest.java
@@ -25,37 +25,37 @@ package org.collectionspace.services.client.test;
 import javax.ws.rs.core.Response;
 import org.collectionspace.services.client.AbstractCommonListUtils;
 import org.collectionspace.services.client.CollectionSpaceClient;
-import org.collectionspace.services.client.RepatriationClaimClient;
+import org.collectionspace.services.client.RepatriationRequestClient;
 import org.collectionspace.services.client.PayloadInputPart;
 import org.collectionspace.services.client.PayloadOutputPart;
 import org.collectionspace.services.client.PoxPayloadIn;
 import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.jaxb.AbstractCommonList;
-import org.collectionspace.services.repatriationclaim.RepatriationClaimsCommon;
+import org.collectionspace.services.repatriationrequest.RepatriationRequestsCommon;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 
-public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<AbstractCommonList, RepatriationClaimsCommon> {
+public class RepatriationRequestServiceTest extends AbstractPoxServiceTestImpl<AbstractCommonList, RepatriationRequestsCommon> {
 
-    private final Logger logger = LoggerFactory.getLogger(RepatriationClaimServiceTest.class);
+    private final Logger logger = LoggerFactory.getLogger(RepatriationRequestServiceTest.class);
 
     /** The service path component. */
-    final String SERVICE_NAME = "repatriationclaims";
+    final String SERVICE_NAME = "repatriationrequests";
 
-    final String SERVICE_PATH_COMPONENT = "repatriationclaims";
+    final String SERVICE_PATH_COMPONENT = "repatriationrequests";
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance()
      */
     @Override
     protected CollectionSpaceClient getClientInstance() throws Exception {
-        return new RepatriationClaimClient();
+        return new RepatriationRequestClient();
     }
 
     @Override
     protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) throws Exception {
-        return new RepatriationClaimClient(clientPropertiesFilename);
+        return new RepatriationRequestClient(clientPropertiesFilename);
     }
 
     /* (non-Javadoc)
@@ -83,9 +83,9 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
         setupCreate();
 
         // Submit the request to the service and store the response.
-        RepatriationClaimClient client = new RepatriationClaimClient();
+        RepatriationRequestClient client = new RepatriationRequestClient();
         String identifier = createIdentifier();
-        PoxPayloadOut multipart = createRepatriationClaimInstance(identifier);
+        PoxPayloadOut multipart = createRepatriationRequestInstance(identifier);
         String newID = null;
         Response res = client.create(multipart);
         try {
@@ -147,7 +147,7 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
         setupRead();
 
         // Submit the request to the service and store the response.
-        RepatriationClaimClient client = new RepatriationClaimClient();
+        RepatriationRequestClient client = new RepatriationRequestClient();
         Response res = client.read(knownResourceId);
         PoxPayloadIn input;
         try {
@@ -161,9 +161,9 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
 
         // Get the common part of the response and verify that it is not null.
         PayloadInputPart payloadInputPart = input.getPart(client.getCommonPartName());
-        RepatriationClaimsCommon common = null;
+        RepatriationRequestsCommon common = null;
         if (payloadInputPart != null) {
-            common = (RepatriationClaimsCommon) payloadInputPart.getBody();
+            common = (RepatriationRequestsCommon) payloadInputPart.getBody();
         }
         Assert.assertNotNull(common);
     }
@@ -179,7 +179,7 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
         setupReadNonExistent();
 
         // Submit the request to the service and store the response.
-        RepatriationClaimClient client = new RepatriationClaimClient();
+        RepatriationRequestClient client = new RepatriationRequestClient();
         Response res = client.read(NON_EXISTENT_ID);
         try {
             int statusCode = res.getStatus();
@@ -214,7 +214,7 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
 
         // Submit the request to the service and store the response.
         AbstractCommonList list;
-        RepatriationClaimClient client = new RepatriationClaimClient();
+        RepatriationRequestClient client = new RepatriationRequestClient();
         Response res = client.readList();
         assertStatusCode(res, testName);
         try {
@@ -255,7 +255,7 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
         setupRead();
 
         // Retrieve the contents of a resource to update.
-        RepatriationClaimClient client = new RepatriationClaimClient();
+        RepatriationRequestClient client = new RepatriationRequestClient();
         Response res = client.read(knownResourceId);
         PoxPayloadIn input;
         try {
@@ -270,17 +270,17 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
 
         // Extract the common part from the response.
         PayloadInputPart payloadInputPart = input.getPart(client.getCommonPartName());
-        RepatriationClaimsCommon common = null;
+        RepatriationRequestsCommon common = null;
         if (payloadInputPart != null) {
-            common = (RepatriationClaimsCommon) payloadInputPart.getBody();
+            common = (RepatriationRequestsCommon) payloadInputPart.getBody();
         }
         Assert.assertNotNull(common);
 
         // Update the content of this resource.
-        common.setClaimNumber("updated-" + common.getClaimNumber());
+        common.setRequestNumber("updated-" + common.getRequestNumber());
 
         logger.debug("to be updated object");
-        logger.debug(objectAsXmlString(common, RepatriationClaimsCommon.class));
+        logger.debug(objectAsXmlString(common, RepatriationRequestsCommon.class));
 
         setupUpdate();
 
@@ -307,16 +307,16 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
 
         // Extract the updated common part from the response.
         payloadInputPart = input.getPart(client.getCommonPartName());
-        RepatriationClaimsCommon updatedRepatriationClaimCommon = null;
+        RepatriationRequestsCommon updatedRepatriationRequestCommon = null;
         if (payloadInputPart != null) {
-            updatedRepatriationClaimCommon = (RepatriationClaimsCommon) payloadInputPart.getBody();
+            updatedRepatriationRequestCommon = (RepatriationRequestsCommon) payloadInputPart.getBody();
         }
-        Assert.assertNotNull(updatedRepatriationClaimCommon);
+        Assert.assertNotNull(updatedRepatriationRequestCommon);
 
         // Check selected fields in the updated common part.
         Assert.assertEquals(
-                updatedRepatriationClaimCommon.getClaimNumber(),
-                common.getClaimNumber(),
+                updatedRepatriationRequestCommon.getRequestNumber(),
+                common.getRequestNumber(),
                 "Data in updated object did not match submitted data.");
     }
 
@@ -328,8 +328,8 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
         // Submit the request to the service and store the response.
         // Note: The ID used in this 'create' call may be arbitrary.
         // The only relevant ID may be the one used in update(), below.
-        RepatriationClaimClient client = new RepatriationClaimClient();
-        PoxPayloadOut multipart = createRepatriationClaimInstance(NON_EXISTENT_ID);
+        RepatriationRequestClient client = new RepatriationRequestClient();
+        PoxPayloadOut multipart = createRepatriationRequestInstance(NON_EXISTENT_ID);
         Response res = client.update(NON_EXISTENT_ID, multipart);
         try {
             int statusCode = res.getStatus();
@@ -363,7 +363,7 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
         setupDelete();
 
         // Submit the request to the service and store the response.
-        RepatriationClaimClient client = new RepatriationClaimClient();
+        RepatriationRequestClient client = new RepatriationRequestClient();
         Response res = client.delete(knownResourceId);
         try {
             int statusCode = res.getStatus();
@@ -393,7 +393,7 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
         setupDeleteNonExistent();
 
         // Submit the request to the service and store the response.
-        RepatriationClaimClient client = new RepatriationClaimClient();
+        RepatriationRequestClient client = new RepatriationRequestClient();
         Response res = client.delete(NON_EXISTENT_ID);
         try {
             int statusCode = res.getStatus();
@@ -455,25 +455,25 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
 
     @Override
     protected PoxPayloadOut createInstance(String identifier) throws Exception {
-        return createRepatriationClaimInstance(identifier);
+        return createRepatriationRequestInstance(identifier);
     }
 
     /**
-     * Creates the repatriationClaim instance.
+     * Creates the repatriationRequest instance.
      *
-     * @param claimNumber the exhibition number
+     * @param requestNumber the exhibition number
      * @return the multipart output
      * @throws Exception
      */
-    private PoxPayloadOut createRepatriationClaimInstance(String claimNumber) throws Exception {
-        RepatriationClaimsCommon common = new RepatriationClaimsCommon();
-        common.setClaimNumber(claimNumber);
+    private PoxPayloadOut createRepatriationRequestInstance(String requestNumber) throws Exception {
+        RepatriationRequestsCommon common = new RepatriationRequestsCommon();
+        common.setRequestNumber(requestNumber);
 
         PoxPayloadOut multipart = new PoxPayloadOut(this.getServicePathComponent());
-        PayloadOutputPart commonPart = multipart.addPart(new RepatriationClaimClient().getCommonPartName(), common);
+        PayloadOutputPart commonPart = multipart.addPart(new RepatriationRequestClient().getCommonPartName(), common);
 
-        logger.debug("to be created, repatriationclaim common");
-        logger.debug(objectAsXmlString(common, RepatriationClaimsCommon.class));
+        logger.debug("to be created, repatriationrequest common");
+        logger.debug(objectAsXmlString(common, RepatriationRequestsCommon.class));
 
         return multipart;
     }
@@ -486,17 +486,17 @@ public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl<Abs
 
     @Override
     protected PoxPayloadOut createInstance(String commonPartName, String identifier) throws Exception {
-        return createRepatriationClaimInstance(identifier);
+        return createRepatriationRequestInstance(identifier);
     }
 
     @Override
-    protected RepatriationClaimsCommon updateInstance(RepatriationClaimsCommon commonPartObject) {
+    protected RepatriationRequestsCommon updateInstance(RepatriationRequestsCommon commonPartObject) {
         // TODO Auto-generated method stub
         return null;
     }
 
     @Override
-    protected void compareUpdatedInstances(RepatriationClaimsCommon original, RepatriationClaimsCommon updated) {
+    protected void compareUpdatedInstances(RepatriationRequestsCommon original, RepatriationRequestsCommon updated) {
         // TODO Auto-generated method stub
     }
 }
diff --git a/services/repatriationclaim/jaxb/pom.xml b/services/repatriationrequest/jaxb/pom.xml
similarity index 78%
rename from services/repatriationclaim/jaxb/pom.xml
rename to services/repatriationrequest/jaxb/pom.xml
index 263aeb2f7..d61ef620d 100644
--- a/services/repatriationclaim/jaxb/pom.xml
+++ b/services/repatriationrequest/jaxb/pom.xml
@@ -3,14 +3,14 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>org.collectionspace.services.repatriationclaim</artifactId>
+    <artifactId>org.collectionspace.services.repatriationrequest</artifactId>
     <groupId>org.collectionspace.services</groupId>
     <version>${revision}</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.collectionspace.services.repatriationclaim.jaxb</artifactId>
-  <name>services.repatriationclaim.jaxb</name>
+  <artifactId>org.collectionspace.services.repatriationrequest.jaxb</artifactId>
+  <name>services.repatriationrequest.jaxb</name>
 
   <dependencies>
     <dependency>
@@ -26,7 +26,7 @@
   </dependencies>
 
   <build>
-    <finalName>collectionspace-services-repatriationclaim-jaxb</finalName>
+    <finalName>collectionspace-services-repatriationrequest-jaxb</finalName>
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
diff --git a/services/repatriationclaim/jaxb/src/main/resources/repatriationclaims_common.xsd b/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd
similarity index 81%
rename from services/repatriationclaim/jaxb/src/main/resources/repatriationclaims_common.xsd
rename to services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd
index 2ae005c3b..58c864617 100644
--- a/services/repatriationclaim/jaxb/src/main/resources/repatriationclaims_common.xsd
+++ b/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
 <!--
-    RepatriationClaim schema (XSD)
+    RepatriationRequest schema (XSD)
 
-    Entity  : RepatriationClaim
+    Entity  : RepatriationRequest
     Part    : Common
     Used for: JAXB binding between XML and Java objects
 -->
@@ -13,9 +13,9 @@
   xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
   jaxb:version="2.0"
   xmlns:nagpra="http://collectionspace.org/services/nagpra"
-  xmlns:ns="http://collectionspace.org/services/repatriationclaim"
-  xmlns="http://collectionspace.org/services/repatriationclaim"
-  targetNamespace="http://collectionspace.org/services/repatriationclaim"
+  xmlns:ns="http://collectionspace.org/services/repatriationrequest"
+  xmlns="http://collectionspace.org/services/repatriationrequest"
+  targetNamespace="http://collectionspace.org/services/repatriationrequest"
   version="0.1"
 >
 
@@ -23,19 +23,19 @@
              schemaLocation="maven:org.collectionspace.services:org.collectionspace.services.nagpra-jaxb:jar::!/nagpra_common.xsd"/>
 
 
-  <!--  RepatriationClaim Information Group -->
-  <xs:element name="repatriationclaims_common">
+  <!--  RepatriationRequest Information Group -->
+  <xs:element name="repatriationrequests_common">
     <xs:annotation>
       <xs:appinfo>
-        <jaxb:class name="RepatriationClaimsCommon" />
+        <jaxb:class name="RepatriationRequestsCommon" />
       </xs:appinfo>
     </xs:annotation>
 
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="claimNumber" type="xs:string" />
+        <xs:element name="requestNumber" type="xs:string" />
         <xs:element name="title" type="xs:string" />
-        <xs:element name="claimDate" type="xs:date" />
+        <xs:element name="requestDate" type="xs:date" />
         <xs:element name="types" type="types" />
         <xs:element name="notes" type="notes" />
         <xs:element name="treatmentNotes" type="nagpra:treatmentNotes" />
diff --git a/services/repatriationclaim/pom.xml b/services/repatriationrequest/pom.xml
similarity index 93%
rename from services/repatriationclaim/pom.xml
rename to services/repatriationrequest/pom.xml
index 532cfe3b3..878359b2d 100644
--- a/services/repatriationclaim/pom.xml
+++ b/services/repatriationrequest/pom.xml
@@ -9,8 +9,8 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.collectionspace.services.repatriationclaim</artifactId>
-  <name>services.repatriationclaim</name>
+  <artifactId>org.collectionspace.services.repatriationrequest</artifactId>
+  <name>services.repatriationrequest</name>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/services/repatriationclaim/service/pom.xml b/services/repatriationrequest/service/pom.xml
similarity index 84%
rename from services/repatriationclaim/service/pom.xml
rename to services/repatriationrequest/service/pom.xml
index 1d3cbc1b2..d68c441af 100644
--- a/services/repatriationclaim/service/pom.xml
+++ b/services/repatriationrequest/service/pom.xml
@@ -5,13 +5,13 @@
 
   <parent>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services.repatriationclaim</artifactId>
+    <artifactId>org.collectionspace.services.repatriationrequest</artifactId>
     <version>${revision}</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.collectionspace.services.repatriationclaim.service</artifactId>
-  <name>services.repatriationclaim.service</name>
+  <artifactId>org.collectionspace.services.repatriationrequest.service</artifactId>
+  <name>services.repatriationrequest.service</name>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -21,12 +21,12 @@
     </dependency>
     <dependency>
       <groupId>org.collectionspace.services</groupId>
-      <artifactId>org.collectionspace.services.repatriationclaim.jaxb</artifactId>
+      <artifactId>org.collectionspace.services.repatriationrequest.jaxb</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.collectionspace.services</groupId>
-      <artifactId>org.collectionspace.services.repatriationclaim.client</artifactId>
+      <artifactId>org.collectionspace.services.repatriationrequest.client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -88,6 +88,6 @@
   </dependencies>
 
   <build>
-    <finalName>collectionspace-services-repatriationclaim</finalName>
+    <finalName>collectionspace-services-repatriationrequest</finalName>
   </build>
 </project>
\ No newline at end of file
diff --git a/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/RepatriationClaimResource.java b/services/repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/RepatriationRequestResource.java
similarity index 75%
rename from services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/RepatriationClaimResource.java
rename to services/repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/RepatriationRequestResource.java
index 9b43bc465..60b3f7eeb 100644
--- a/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/RepatriationClaimResource.java
+++ b/services/repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/RepatriationRequestResource.java
@@ -19,18 +19,18 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.collectionspace.services.repatriationclaim;
+package org.collectionspace.services.repatriationrequest;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
-import org.collectionspace.services.client.RepatriationClaimClient;
+import org.collectionspace.services.client.RepatriationRequestClient;
 import org.collectionspace.services.common.NuxeoBasedResource;
 
-@Path(RepatriationClaimClient.SERVICE_PATH)
+@Path(RepatriationRequestClient.SERVICE_PATH)
 @Consumes("application/xml")
 @Produces("application/xml")
-public class RepatriationClaimResource extends NuxeoBasedResource {
+public class RepatriationRequestResource extends NuxeoBasedResource {
 
     @Override
     protected String getVersionString() {
@@ -39,11 +39,11 @@ public class RepatriationClaimResource extends NuxeoBasedResource {
 
     @Override
     public String getServiceName() {
-        return RepatriationClaimClient.SERVICE_NAME;
+        return RepatriationRequestClient.SERVICE_NAME;
     }
 
     @Override
-    public Class<RepatriationClaimsCommon> getCommonPartClass() {
-        return RepatriationClaimsCommon.class;
+    public Class<RepatriationRequestsCommon> getCommonPartClass() {
+        return RepatriationRequestsCommon.class;
     }
 }
diff --git a/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimDocumentModelHandler.java b/services/repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/nuxeo/RepatriationRequestDocumentModelHandler.java
similarity index 75%
rename from services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimDocumentModelHandler.java
rename to services/repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/nuxeo/RepatriationRequestDocumentModelHandler.java
index 3358056f4..fc7bee7e6 100644
--- a/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimDocumentModelHandler.java
+++ b/services/repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/nuxeo/RepatriationRequestDocumentModelHandler.java
@@ -19,12 +19,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.collectionspace.services.repatriationclaim.nuxeo;
+package org.collectionspace.services.repatriationrequest.nuxeo;
 
 import org.collectionspace.services.nuxeo.client.java.NuxeoDocumentModelHandler;
-import org.collectionspace.services.repatriationclaim.RepatriationClaimsCommon;
+import org.collectionspace.services.repatriationrequest.RepatriationRequestsCommon;
 
 /**
- * RepatriationClaimDocumentModelHandler
+ * RepatriationRequestDocumentModelHandler
  */
-public class RepatriationClaimDocumentModelHandler extends NuxeoDocumentModelHandler<RepatriationClaimsCommon> {}
+public class RepatriationRequestDocumentModelHandler extends NuxeoDocumentModelHandler<RepatriationRequestsCommon> {}
diff --git a/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimValidatorHandler.java b/services/repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/nuxeo/RepatriationRequestValidatorHandler.java
similarity index 65%
rename from services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimValidatorHandler.java
rename to services/repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/nuxeo/RepatriationRequestValidatorHandler.java
index 80ef8ae24..a9154409f 100644
--- a/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimValidatorHandler.java
+++ b/services/repatriationrequest/service/src/main/java/org/collectionspace/services/repatriationrequest/nuxeo/RepatriationRequestValidatorHandler.java
@@ -12,42 +12,42 @@
  * You may obtain a copy of the ECL 2.0 License at
  * https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services.repatriationclaim.nuxeo;
+package org.collectionspace.services.repatriationrequest.nuxeo;
 
 import org.collectionspace.services.client.PoxPayloadIn;
 import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.document.InvalidDocumentException;
 import org.collectionspace.services.common.document.ValidatorHandlerImpl;
-import org.collectionspace.services.repatriationclaim.RepatriationClaimsCommon;
+import org.collectionspace.services.repatriationrequest.RepatriationRequestsCommon;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Validation handler for a RepatriationClaim. Checks for the common part and claimNumber on create.
+ * Validation handler for a RepatriationRequest. Checks for the common part and requestNumber on create.
  */
-public class RepatriationClaimValidatorHandler extends ValidatorHandlerImpl<PoxPayloadIn, PoxPayloadOut> {
+public class RepatriationRequestValidatorHandler extends ValidatorHandlerImpl<PoxPayloadIn, PoxPayloadOut> {
 
-    private static final String COMMON_PART_MISSING = "Validation exception: repatriationclaims_common part is missing";
+    private static final String COMMON_PART_MISSING = "Validation exception: repatriationrequests_common part is missing";
     private static final String CLAIM_NUMBER_MISSING =
-            "Validation exception: The repatriation claim field \"claimNumber\" cannot be empty or missing";
+            "Validation exception: The repatriation request field \"requestNumber\" cannot be empty or missing";
 
-    private final Logger logger = LoggerFactory.getLogger(RepatriationClaimValidatorHandler.class);
+    private final Logger logger = LoggerFactory.getLogger(RepatriationRequestValidatorHandler.class);
 
     @Override
     protected Class<?> getCommonPartClass() {
-        return RepatriationClaimsCommon.class;
+        return RepatriationRequestsCommon.class;
     }
 
     @Override
     protected void handleCreate() throws InvalidDocumentException {
-        final RepatriationClaimsCommon claim = (RepatriationClaimsCommon) getCommonPart();
-        if (claim == null) {
+        final RepatriationRequestsCommon request = (RepatriationRequestsCommon) getCommonPart();
+        if (request == null) {
             logger.error(COMMON_PART_MISSING);
             throw new InvalidDocumentException(COMMON_PART_MISSING);
         }
 
-        final String claimNumber = claim.getClaimNumber();
-        if (claimNumber == null || claimNumber.isEmpty()) {
+        final String requestNumber = request.getRequestNumber();
+        if (requestNumber == null || requestNumber.isEmpty()) {
             logger.error(CLAIM_NUMBER_MISSING);
             throw new InvalidDocumentException(CLAIM_NUMBER_MISSING);
         }
-- 
2.47.3