diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index 6f8939b..38b4726 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -55,7 +55,7 @@
             <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
             <#list preparation_line.despatched_ipg_list as despatched_ipg>
             <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
-            <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (supplyOfTheTrackingNumber==2 || supplyOfTheTrackingNumber==3 || (despatched_ipg.consignment_unit_id!="" && supplyOfTheTrackingNumber==1))>
+            <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
                <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                ,
                {
diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
index e738a40..7b59fb2 100644
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -9,7 +9,7 @@
     "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#switch supplyOfTheTrackingNumber>
+      <#switch trackingNumberSource>
         <#case 1>
           <#if despatched_ipg.consignment_unit_id!="">
 			      "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",