diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index a3dab93..712cfec 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -2,89 +2,89 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
- 
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
- 
+
 <#assign aDateTime = .now>
- 
+
 <#switch cloudEventMsg.action>
 <#case "C">
 <#--<#case "U">
 <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-<#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> 
-       
-<#if	preparationOrder.total_lv_validated !=0>   
-	   [  
+<#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
+
+<#if	preparationOrder.total_lv_validated !=0>
+	   [
          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl">          
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
          },
          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">          
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
          }
 
          <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
          ,
           {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">     
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
          },
          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">          
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
          }
          </#if>
-        
+
           <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
           <#list preparation_line.despatched_ipg_list as despatched_ipg>
           <#if despatched_ipg.consignment_unit_id!="">
           ,
           {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
-          <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">          
+          "datas" :
+          <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
           }
          </#if>
           <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
           ,
          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
+         "datas" :
           <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
          },
          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">          
-         } 
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+         }
          </#if>
-         
+
             </#list>
          <#--  <#sep>,</#sep> -->
           </#list>
 
-         
+
        ]
-      
+
 <#else>
     <#stop "no confirmed quantity for the preparation - preparation closed">
 </#if>
-   
+
 <#break>
 <#case "D">
 <#-- *********************************************** Action = DELETE ******************** -->
diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
similarity index 100%
rename from RFXtoRP_HsrPrepa_GoodsPrepared.ftl
rename to RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index 840b0f8..abcab30 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -47,10 +47,10 @@
        [
         <#if receipt.receipt_confirmed == "true" >
         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ReceiptCompleted>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
-          <#include "RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl">
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
         }
         <#else>
           <#if receipt.receipt_type = "030">
diff --git a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
similarity index 100%
rename from RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl
rename to RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl