diff --git a/relays/bin-substrate/src/chains/bridge_hub_rococo_messages_to_bridge_hub_wococo.rs b/relays/bin-substrate/src/chains/bridge_hub_rococo_messages_to_bridge_hub_wococo.rs
index 8422569d009..b48ace58987 100644
--- a/relays/bin-substrate/src/chains/bridge_hub_rococo_messages_to_bridge_hub_wococo.rs
+++ b/relays/bin-substrate/src/chains/bridge_hub_rococo_messages_to_bridge_hub_wococo.rs
@@ -32,14 +32,14 @@ impl MessagesCliBridge for BridgeHubRococoToBridgeHubWococoMessagesCliBridge {
 	type MessagesLane = BridgeHubRococoMessagesToBridgeHubWococoMessageLane;
 }
 
-substrate_relay_helper::generate_mocked_receive_message_proof_call_builder!(
+substrate_relay_helper::generate_receive_message_proof_call_builder!(
 	BridgeHubRococoMessagesToBridgeHubWococoMessageLane,
 	BridgeHubRococoMessagesToBridgeHubWococoMessageLaneReceiveMessagesProofCallBuilder,
 	relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoMessages,
 	relay_bridge_hub_wococo_client::runtime::BridgeRococoMessagesCall::receive_messages_proof
 );
 
-substrate_relay_helper::generate_mocked_receive_message_delivery_proof_call_builder!(
+substrate_relay_helper::generate_receive_message_delivery_proof_call_builder!(
 	BridgeHubRococoMessagesToBridgeHubWococoMessageLane,
 	BridgeHubRococoMessagesToBridgeHubWococoMessageLaneReceiveMessagesDeliveryProofCallBuilder,
 	relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoMessages,
diff --git a/relays/bin-substrate/src/chains/bridge_hub_wococo_messages_to_bridge_hub_rococo.rs b/relays/bin-substrate/src/chains/bridge_hub_wococo_messages_to_bridge_hub_rococo.rs
index 96df83cd0b2..3bcf62de333 100644
--- a/relays/bin-substrate/src/chains/bridge_hub_wococo_messages_to_bridge_hub_rococo.rs
+++ b/relays/bin-substrate/src/chains/bridge_hub_wococo_messages_to_bridge_hub_rococo.rs
@@ -32,14 +32,14 @@ impl MessagesCliBridge for BridgeHubWococoToBridgeHubRococoMessagesCliBridge {
 	type MessagesLane = BridgeHubWococoMessagesToBridgeHubRococoMessageLane;
 }
 
-substrate_relay_helper::generate_mocked_receive_message_proof_call_builder!(
+substrate_relay_helper::generate_receive_message_proof_call_builder!(
 	BridgeHubWococoMessagesToBridgeHubRococoMessageLane,
 	BridgeHubWococoMessagesToBridgeHubRococoMessageLaneReceiveMessagesProofCallBuilder,
 	relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoMessages,
 	relay_bridge_hub_rococo_client::runtime::BridgeWococoMessagesCall::receive_messages_proof
 );
 
-substrate_relay_helper::generate_mocked_receive_message_delivery_proof_call_builder!(
+substrate_relay_helper::generate_receive_message_delivery_proof_call_builder!(
 	BridgeHubWococoMessagesToBridgeHubRococoMessageLane,
 	BridgeHubWococoMessagesToBridgeHubRococoMessageLaneReceiveMessagesDeliveryProofCallBuilder,
 	relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoMessages,
diff --git a/relays/bin-substrate/src/chains/millau_headers_to_rialto_parachain.rs b/relays/bin-substrate/src/chains/millau_headers_to_rialto_parachain.rs
index 6496167cf7c..66f0a1fc437 100644
--- a/relays/bin-substrate/src/chains/millau_headers_to_rialto_parachain.rs
+++ b/relays/bin-substrate/src/chains/millau_headers_to_rialto_parachain.rs
@@ -39,7 +39,7 @@ use substrate_relay_helper::finality::{
 	engine::Grandpa as GrandpaFinalityEngine, SubstrateFinalitySyncPipeline,
 };
 
-substrate_relay_helper::generate_mocked_submit_finality_proof_call_builder!(
+substrate_relay_helper::generate_submit_finality_proof_call_builder!(
 	MillauFinalityToRialtoParachain,
 	MillauFinalityToRialtoParachainCallBuilder,
 	relay_rialto_parachain_client::runtime::Call::BridgeMillauGrandpa,
diff --git a/relays/bin-substrate/src/chains/millau_messages_to_rialto_parachain.rs b/relays/bin-substrate/src/chains/millau_messages_to_rialto_parachain.rs
index 817d0098d9b..3c345b94f1b 100644
--- a/relays/bin-substrate/src/chains/millau_messages_to_rialto_parachain.rs
+++ b/relays/bin-substrate/src/chains/millau_messages_to_rialto_parachain.rs
@@ -22,7 +22,7 @@ use substrate_relay_helper::messages_lane::{
 	DirectReceiveMessagesDeliveryProofCallBuilder, SubstrateMessageLane,
 };
 
-substrate_relay_helper::generate_mocked_receive_message_proof_call_builder!(
+substrate_relay_helper::generate_receive_message_proof_call_builder!(
 	MillauMessagesToRialtoParachain,
 	MillauMessagesToRialtoParachainReceiveMessagesProofCallBuilder,
 	relay_rialto_parachain_client::runtime::Call::BridgeMillauMessages,
diff --git a/relays/bin-substrate/src/chains/rialto_parachain_messages_to_millau.rs b/relays/bin-substrate/src/chains/rialto_parachain_messages_to_millau.rs
index 0000a0a754a..f1645d4244c 100644
--- a/relays/bin-substrate/src/chains/rialto_parachain_messages_to_millau.rs
+++ b/relays/bin-substrate/src/chains/rialto_parachain_messages_to_millau.rs
@@ -23,7 +23,7 @@ use substrate_relay_helper::{
 	UtilityPalletBatchCallBuilder,
 };
 
-substrate_relay_helper::generate_mocked_receive_message_delivery_proof_call_builder!(
+substrate_relay_helper::generate_receive_message_delivery_proof_call_builder!(
 	RialtoParachainMessagesToMillau,
 	RialtoParachainMessagesToMillauReceiveMessagesDeliveryProofCallBuilder,
 	relay_rialto_parachain_client::runtime::Call::BridgeMillauMessages,
diff --git a/relays/bin-substrate/src/chains/rococo_headers_to_bridge_hub_wococo.rs b/relays/bin-substrate/src/chains/rococo_headers_to_bridge_hub_wococo.rs
index 0de1fd9396a..2272144311c 100644
--- a/relays/bin-substrate/src/chains/rococo_headers_to_bridge_hub_wococo.rs
+++ b/relays/bin-substrate/src/chains/rococo_headers_to_bridge_hub_wococo.rs
@@ -29,7 +29,7 @@ use substrate_relay_helper::{
 #[derive(Clone, Debug)]
 pub struct RococoFinalityToBridgeHubWococo;
 
-substrate_relay_helper::generate_mocked_submit_finality_proof_call_builder!(
+substrate_relay_helper::generate_submit_finality_proof_call_builder!(
 	RococoFinalityToBridgeHubWococo,
 	RococoFinalityToBridgeHubWococoCallBuilder,
 	relay_bridge_hub_wococo_client::runtime::Call::BridgeRococoGrandpa,
diff --git a/relays/bin-substrate/src/chains/wococo_headers_to_bridge_hub_rococo.rs b/relays/bin-substrate/src/chains/wococo_headers_to_bridge_hub_rococo.rs
index e9054fd31e9..39043009582 100644
--- a/relays/bin-substrate/src/chains/wococo_headers_to_bridge_hub_rococo.rs
+++ b/relays/bin-substrate/src/chains/wococo_headers_to_bridge_hub_rococo.rs
@@ -29,7 +29,7 @@ use substrate_relay_helper::{
 #[derive(Clone, Debug)]
 pub struct WococoFinalityToBridgeHubRococo;
 
-substrate_relay_helper::generate_mocked_submit_finality_proof_call_builder!(
+substrate_relay_helper::generate_submit_finality_proof_call_builder!(
 	WococoFinalityToBridgeHubRococo,
 	WococoFinalityToBridgeHubRococoCallBuilder,
 	relay_bridge_hub_rococo_client::runtime::Call::BridgeWococoGrandpa,
diff --git a/relays/lib-substrate-relay/src/finality/mod.rs b/relays/lib-substrate-relay/src/finality/mod.rs
index f529e20912a..b0f0ee4e52c 100644
--- a/relays/lib-substrate-relay/src/finality/mod.rs
+++ b/relays/lib-substrate-relay/src/finality/mod.rs
@@ -135,7 +135,7 @@ where
 /// the variant for the `submit_finality_proof` call within that first option.
 #[rustfmt::skip]
 #[macro_export]
-macro_rules! generate_mocked_submit_finality_proof_call_builder {
+macro_rules! generate_submit_finality_proof_call_builder {
 	($pipeline:ident, $mocked_builder:ident, $bridge_grandpa:path, $submit_finality_proof:path) => {
 		pub struct $mocked_builder;
 
diff --git a/relays/lib-substrate-relay/src/messages_lane.rs b/relays/lib-substrate-relay/src/messages_lane.rs
index a0cd9b43756..b41ee2072e0 100644
--- a/relays/lib-substrate-relay/src/messages_lane.rs
+++ b/relays/lib-substrate-relay/src/messages_lane.rs
@@ -315,7 +315,7 @@ where
 /// the variant for the `receive_messages_proof` call within that first option.
 #[rustfmt::skip]
 #[macro_export]
-macro_rules! generate_mocked_receive_message_proof_call_builder {
+macro_rules! generate_receive_message_proof_call_builder {
 	($pipeline:ident, $mocked_builder:ident, $bridge_messages:path, $receive_messages_proof:path) => {
 		pub struct $mocked_builder;
 
@@ -411,7 +411,7 @@ where
 /// the variant for the `receive_messages_delivery_proof` call within that first option.
 #[rustfmt::skip]
 #[macro_export]
-macro_rules! generate_mocked_receive_message_delivery_proof_call_builder {
+macro_rules! generate_receive_message_delivery_proof_call_builder {
 	($pipeline:ident, $mocked_builder:ident, $bridge_messages:path, $receive_messages_delivery_proof:path) => {
 		pub struct $mocked_builder;