diff --git a/RFXtoRP_HsaDispute_ClaimMetadata.ftl b/RFXtoRP_HsaDispute_ClaimMetadata.ftl
index e5b9b99..d0a8314 100644
--- a/RFXtoRP_HsaDispute_ClaimMetadata.ftl
+++ b/RFXtoRP_HsaDispute_ClaimMetadata.ftl
@@ -1,4 +1,4 @@
-<#-- use protobuf of class HsaDispute to find Reflex Wms fields names  -->
+<#-- use protobuf of class HsaDispute to find HARDIS WMS fields names  -->
 
 
 "MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl
index 4fa3d1d..f47abd4 100644
--- a/RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl
@@ -1,4 +1,4 @@
-<#-- use protobuf of class HsaIpgMove to find Reflex WMS fields names  -->
+<#-- use protobuf of class HsaIpgMove to find HARDIS WMS fields names  -->
 
 <#--
 
diff --git a/RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl b/RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl
index 33fc628..29d1851 100644
--- a/RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl
@@ -15,22 +15,22 @@
                   "Value": { "String" : "no batch"}
                 <#else>
                    "Value": { "String" : "${reflexMvtStockInterface.batch_1}"}
-            </#if>  
+            </#if>
             },
             {
             "Key": "HeldForSpecificCode",
             "Value": { "Bool" : "${reflexMvtStockInterface.ipg_specific_code_held}"}
             },
-           
+
             {
-            <#assign manufacturing_date = reflexMvtStockInterface.manufacture_date?datetime(rfx_date_format_default)?iso_utc /> 
+            <#assign manufacturing_date = reflexMvtStockInterface.manufacture_date?datetime(rfx_date_format_default)?iso_utc />
             "Key": "ManufacturingDate",
             "Value": "Timestamp": {
 							"AuthorTimeZone": "${time_zone_rfx}",
 							"DateTime": "${manufacturing_date}"
 						  }
-            } 
-          ]        
+            }
+          ]
 
 -->
 "SegmentationKeys": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl b/RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl
index 49607a6..2b30c89 100644
--- a/RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl
@@ -1,4 +1,4 @@
-<#-- use protobuf of class HsaItm to find Reflex Wms fields names  -->
+<#-- use protobuf of class HsaItm to find HARDIS WMS fields names  -->
 
 
 "MetaData": [        ]
\ No newline at end of file
diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
index 3606ba8..8506511 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
@@ -1,6 +1,6 @@
 <#-- use protobuf of class HsrPro to find HARDIS WMS fields names  -->
 
-<#-- 
+<#--
 
 "MetaData": [
           {
diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl
index 4cd89b9..9cd8bc9 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl
@@ -16,7 +16,7 @@
                   "Value": { "String" : "no batch"}
                 <#else>
                    "Value": { "String" : "${preparation_order_line.batch_1}"}
-            </#if>  
+            </#if>
             }
           ]
 -->
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
index 6b4d530..079640d 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
@@ -1,6 +1,6 @@
 <#-- use protobuf of class HsrReceiptList to find HARDIS WMS fields names  -->
 
-<#-- 
+<#--
 
 "MetaData": [
           {