diff --git a/crates/cli/src/commands/order/add.rs b/crates/cli/src/commands/order/add.rs
index 0465caab2..a79a5f267 100644
--- a/crates/cli/src/commands/order/add.rs
+++ b/crates/cli/src/commands/order/add.rs
@@ -173,7 +173,7 @@ deployments:
 _ _: 0 0;
 #handle-io
 :;
-#post-add-order
+#handle-add-order
 :;"
         .to_string()
     }
diff --git a/crates/cli/src/commands/order/calldata.rs b/crates/cli/src/commands/order/calldata.rs
index e7fcd1e79..4b80edbb7 100644
--- a/crates/cli/src/commands/order/calldata.rs
+++ b/crates/cli/src/commands/order/calldata.rs
@@ -180,7 +180,7 @@ deployments:
 _ _: 0 0;
 #handle-io
 :;
-#post-add-order
+#handle-add-order
 :;",
             rpc_server.url("/rpc").as_str()
         );
diff --git a/crates/cli/src/commands/order/compose.rs b/crates/cli/src/commands/order/compose.rs
index 60e9d7f4b..a57b3e301 100644
--- a/crates/cli/src/commands/order/compose.rs
+++ b/crates/cli/src/commands/order/compose.rs
@@ -138,7 +138,7 @@ scenarios:
 _ _: 0 0;
 #handle-io
 :;
-#post-add-order
+#handle-add-order
 :;"
         .to_string()
     }
diff --git a/crates/cli/src/commands/order/orderbook_address.rs b/crates/cli/src/commands/order/orderbook_address.rs
index d1299e428..c19efa73c 100644
--- a/crates/cli/src/commands/order/orderbook_address.rs
+++ b/crates/cli/src/commands/order/orderbook_address.rs
@@ -170,7 +170,7 @@ deployments:
 _ _: 0 0;
 #handle-io
 :;
-#post-add-order
+#handle-add-order
 :;",
             orderbook_key
         )
diff --git a/crates/common/src/add_order.rs b/crates/common/src/add_order.rs
index 35069e8f0..56fbc55a7 100644
--- a/crates/common/src/add_order.rs
+++ b/crates/common/src/add_order.rs
@@ -27,7 +27,7 @@ use std::collections::HashMap;
 use thiserror::Error;
 
 pub static ORDERBOOK_ORDER_ENTRYPOINTS: [&str; 2] = ["calculate-io", "handle-io"];
-pub static ORDERBOOK_ADDORDER_POST_TASK_ENTRYPOINTS: [&str; 1] = ["post-add-order"];
+pub static ORDERBOOK_ADDORDER_POST_TASK_ENTRYPOINTS: [&str; 1] = ["handle-add-order"];
 
 #[derive(Error, Debug)]
 pub enum AddOrderArgsError {
@@ -543,7 +543,7 @@ some front matter
 _ _: 0 0;
 #handle-io
 :;
-#post-add-order
+#handle-add-order
 _ _: 0 0;
 "#;
         let result = AddOrderArgs::new_from_deployment(dotrain.to_string(), deployment)
@@ -680,7 +680,7 @@ some front matter
 _ _: 0 0;
 #handle-io
 :;
-#post-add-order
+#handle-add-order
 _ _: 0 0;
 "#;
         let result = AddOrderArgs::new_from_deployment(dotrain.to_string(), deployment.clone())
@@ -689,6 +689,6 @@ _ _: 0 0;
 
         let post_action = result.compose_addorder_post_task().unwrap();
 
-        assert_eq!(post_action, "/* 0. post-add-order */ \n_ _: 0 0;");
+        assert_eq!(post_action, "/* 0. handle-add-order */ \n_ _: 0 0;");
     }
 }
diff --git a/crates/common/src/dotrain_order.rs b/crates/common/src/dotrain_order.rs
index a4b306add..97ab18f25 100644
--- a/crates/common/src/dotrain_order.rs
+++ b/crates/common/src/dotrain_order.rs
@@ -265,7 +265,7 @@ scenarios:
 _ _: 0 0;
 #handle-io
 :;
-#post-add-order
+#handle-add-order
 _ _: 1 2;
 "#,
             rpc_url = rain_orderbook_env::CI_DEPLOY_POLYGON_RPC_URL
@@ -280,7 +280,7 @@ _ _: 1 2;
 
         assert_eq!(
             rainlang,
-            r#"/* 0. post-add-order */ 
+            r#"/* 0. handle-add-order */ 
 _ _: 1 2;"#
         );
     }
diff --git a/crates/integration_tests/src/lib.rs b/crates/integration_tests/src/lib.rs
index c90cdd6e7..395e326ba 100644
--- a/crates/integration_tests/src/lib.rs
+++ b/crates/integration_tests/src/lib.rs
@@ -84,7 +84,7 @@ deployments:
 #calculate-io
 using-words-from 0xe80e7438ce6b1055c8e9CDE1b6336a4F9D53C666
 amount price: get("amount") 52;
-#post-add-order
+#handle-add-order
 :set("amount" 100);
 #handle-io
 :;
@@ -236,7 +236,7 @@ deployments:
 amount price: get("amount") 52;
 #handle-io
 :;
-#post-add-order
+#handle-add-order
 :ensure(0 "should fail");
 "#,
             rpc_url = anvil.endpoint()
diff --git a/test-js/common/test.test.ts b/test-js/common/test.test.ts
index 95bded9d5..ad67d2698 100644
--- a/test-js/common/test.test.ts
+++ b/test-js/common/test.test.ts
@@ -69,7 +69,7 @@ deployments:
 _ _: 0 0;
 #handle-io
 :;
-#post-add-order
+#handle-add-order
 :;
 `;
 
@@ -123,7 +123,7 @@ deployers:
 _ _: 0 0;
 #handle-io
 :;
-#post-add-order
+#handle-add-order
 :;
 `;
       await getAddOrderCalldata(dotrain, "some-deployment");