diff --git a/RPtoRFX_CarrierAppointmentPreparationAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPreparationAssociationByNumber.ftl
index 676c000..6190efa 100644
--- a/RPtoRFX_CarrierAppointmentPreparationAssociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPreparationAssociationByNumber.ftl
@@ -9,7 +9,7 @@
 	},
 	"payload" :
 	 {
-		<#assign orderCustomFields = eventRP.orderCustomFields >
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
 		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
 		<#assign addedCommissions = eventRP.addedUnloadCommissions />
 		<#else>
diff --git a/RPtoRFX_CarrierAppointmentPreparationAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPreparationAssociationByRef.ftl
index 75bd45b..ffd7cea 100644
--- a/RPtoRFX_CarrierAppointmentPreparationAssociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPreparationAssociationByRef.ftl
@@ -8,7 +8,7 @@
 	},
 	"payload" :
 	 {
-		<#assign orderCustomFields = eventRP.orderCustomFields >
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
 		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
 		<#assign addedCommissions = eventRP.addedUnloadCommissions />
 		<#else>
@@ -16,7 +16,7 @@
 		</#if>
 
 		"preparation_list": [
-		<#list addedLoadCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as addedCommission>
+		<#list addedCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as addedCommission>
 		{
 			"activity_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
 			"preparation_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].preparation_year?json_string}",
diff --git a/RPtoRFX_CarrierAppointmentPreparationDissociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPreparationDissociationByNumber.ftl
index bd416e3..fda86e3 100644
--- a/RPtoRFX_CarrierAppointmentPreparationDissociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPreparationDissociationByNumber.ftl
@@ -17,7 +17,7 @@
 		</#if>
 
 		"preparation_list": [
-		<#list removedLoadCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as removedCommission>
+		<#list removedCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as removedCommission>
 		{
 			"activity_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
 			"preparation_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].preparation_year?json_string}",