diff --git a/server/data/claimscorp.js b/server/data/claimscorp.js
index 9ea8341dc..a854ff84f 100644
--- a/server/data/claimscorp.js
+++ b/server/data/claimscorp.js
@@ -62,22 +62,24 @@ exports.default = async (req, res) => {
             start: start
               ? moment(start).startOf("day")
               : moment().subtract(5, "days").startOf("day"),
-            ...(end && { end: moment(end).startOf("day") }),
+            ...(end && { end: moment(end).endOf("day") }),
           }
         );
 
         const claimsCorpObject = {
           DataFeed: {
-            ShopID: bodyshops_by_pk.claimscorpid,
-            ShopName: bodyshops_by_pk.shopname,
-            RO: jobs.map((j) =>
-              CreateRepairOrderTag(
-                { ...j, bodyshop: bodyshops_by_pk },
-                function ({ job, error }) {
-                  erroredJobs.push({ job: job, error: error.toString() });
-                }
-              )
-            ),
+            ShopInfo: {
+              ShopID: bodyshops_by_pk.claimscorpid,
+              ShopName: bodyshops_by_pk.shopname,
+              RO: jobs.map((j) =>
+                CreateRepairOrderTag(
+                  { ...j, bodyshop: bodyshops_by_pk },
+                  function ({ job, error }) {
+                    erroredJobs.push({ job: job, error: error.toString() });
+                  }
+                )
+              ),
+            },
           },
         };
 
@@ -100,7 +102,7 @@ exports.default = async (req, res) => {
           .end({ allowEmptyTags: true });
 
         allxmlsToUpload.push({
-          count: claimsCorpObject.DataFeed.RO.length,
+          count: claimsCorpObject.DataFeed.ShopInfo.RO.length,
           xml: ret,
           filename: `${bodyshop.claimscorpid}-MIS-${moment().format(
             "YYYYMMDDTHHMMss"
@@ -261,8 +263,8 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         VIN: job.v_vin || "",
       },
       Carrier: {
-        InsuranceCo: job.ins_co_nm || "",
-        CompanyName: job.ins_co_nm || "",
+        UniqueID: job.ins_co_nm || "",
+        InsuranceCompany: job.ins_co_nm || "",
       },
       Claim: job.clm_no || "",
       Contacts: {
@@ -279,7 +281,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           : "",
         Phone1: "",
         Phone2: "",
-        EstimatorName: `${job.est_ct_ln ? job.est_ct_ln : ""}${
+        Estimator: `${job.est_ct_ln ? job.est_ct_ln : ""}${
           job.est_ct_ln ? ", " : ""
         }${job.est_ct_fn ? job.est_ct_fn : ""}`,
         BodyTechnician: job.employee_body_rel
@@ -337,7 +339,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
               .tz(job.bodyshop.timezone)
               .format(AhDateFormat)) ||
           "",
-        StartDate: job.date_repairstarted
+        DateStart: job.date_repairstarted
           ? (job.date_repairstarted &&
               moment(job.date_repairstarted)
                 .tz(job.bodyshop.timezone)
@@ -392,9 +394,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           .add(Dinero(job.job_totals.rates.lad.total))
           .add(Dinero(job.job_totals.rates.las.total))
           .toFormat(CCDineroFormat),
-        Refinish: Dinero(job.job_totals.rates.lar.total).toFormat(
-          CCDineroFormat
-        ),
+        Paint: Dinero(job.job_totals.rates.lar.total).toFormat(CCDineroFormat),
         Prep: Dinero().toFormat(CCDineroFormat),
         Frame: Dinero(job.job_totals.rates.laf.total).toFormat(CCDineroFormat),
         Mechanical: Dinero(job.job_totals.rates.lam.total).toFormat(
@@ -446,6 +446,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         Towing: Dinero(job.job_totals.additional.towing).toFormat(
           CCDineroFormat
         ),
+        Storage: "0.00",
         Rental:
           job.job_totals.additional.additionalCostItems.includes(
             "ATS Amount"
@@ -486,11 +487,11 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           .toFixed(2),
         Paint: job.job_totals.rates.lar.hours.toFixed(2),
         Prep: "0.00",
-        FrameHours: job.job_totals.rates.laf.hours.toFixed(2),
-        MechanicalHours: job.job_totals.rates.lam.hours.toFixed(2),
-        GlassHours: job.job_totals.rates.lag.hours.toFixed(2),
-        ElectricalHours: job.job_totals.rates.lae.hours.toFixed(2),
-        DetailHours: detailAdjustments.hours,
+        Frame: job.job_totals.rates.laf.hours.toFixed(2),
+        Mech: job.job_totals.rates.lam.hours.toFixed(2),
+        Glass: job.job_totals.rates.lag.hours.toFixed(2),
+        Elec: job.job_totals.rates.lae.hours.toFixed(2),
+        Detail: detailAdjustments.hours,
         Reassem: "0.00",
         Other: (
           job.job_totals.rates.la1.hours +