diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index 0debca9..c80da8c 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -17,7 +17,7 @@
 </#if>
 
 {
-	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
 	"method" : "POST",
 	"uri_substitutions": {
diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl
index 905c3bb..cd271c9 100644
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -3,7 +3,7 @@
 <#include "HfRpConfig.ftl">
 
 {
-	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
 	"method" : "POST",
 	"uri_substitutions": {