diff --git a/bridges/modules/messages/src/benchmarking.rs b/bridges/modules/messages/src/benchmarking.rs
index b3a4447fb0211..7c723e567315b 100644
--- a/bridges/modules/messages/src/benchmarking.rs
+++ b/bridges/modules/messages/src/benchmarking.rs
@@ -26,7 +26,7 @@ use crate::{
 use bp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::FromBridgedChainMessagesProof, ChainWithMessages, DeliveredMessages,
-	InboundLaneData, LaneId, LaneState, MessageNonce, OutboundLaneData, UnrewardedRelayer,
+	InboundLaneData, LaneIdType, LaneState, MessageNonce, OutboundLaneData, UnrewardedRelayer,
 	UnrewardedRelayersState,
 };
 use bp_runtime::{AccountIdOf, HashOf, UnverifiedStorageProofParams};
@@ -44,7 +44,7 @@ pub struct Pallet<T: Config<I>, I: 'static = ()>(crate::Pallet<T, I>);
 
 /// Benchmark-specific message proof parameters.
 #[derive(Debug)]
-pub struct MessageProofParams {
+pub struct MessageProofParams<LaneId> {
 	/// Id of the lane.
 	pub lane: LaneId,
 	/// Range of messages to include in the proof.
@@ -62,7 +62,7 @@ pub struct MessageProofParams {
 
 /// Benchmark-specific message delivery proof parameters.
 #[derive(Debug)]
-pub struct MessageDeliveryProofParams<ThisChainAccountId> {
+pub struct MessageDeliveryProofParams<ThisChainAccountId, LaneId> {
 	/// Id of the lane.
 	pub lane: LaneId,
 	/// The proof needs to include this inbound lane data.
@@ -74,8 +74,8 @@ pub struct MessageDeliveryProofParams<ThisChainAccountId> {
 /// Trait that must be implemented by runtime.
 pub trait Config<I: 'static>: crate::Config<I> {
 	/// Lane id to use in benchmarks.
-	fn bench_lane_id() -> LaneId {
-		LaneId::new(1, 2)
+	fn bench_lane_id() -> Self::LaneId {
+		Self::LaneId::new(1, 2)
 	}
 
 	/// Return id of relayer account at the bridged chain.
@@ -94,12 +94,12 @@ pub trait Config<I: 'static>: crate::Config<I> {
 
 	/// Prepare messages proof to receive by the module.
 	fn prepare_message_proof(
-		params: MessageProofParams,
-	) -> (FromBridgedChainMessagesProof<HashOf<BridgedChainOf<Self, I>>>, Weight);
+		params: MessageProofParams<Self::LaneId>,
+	) -> (FromBridgedChainMessagesProof<HashOf<BridgedChainOf<Self, I>>, Self::LaneId>, Weight);
 	/// Prepare messages delivery proof to receive by the module.
 	fn prepare_message_delivery_proof(
-		params: MessageDeliveryProofParams<Self::AccountId>,
-	) -> FromBridgedChainMessagesDeliveryProof<HashOf<BridgedChainOf<Self, I>>>;
+		params: MessageDeliveryProofParams<Self::AccountId, Self::LaneId>,
+	) -> FromBridgedChainMessagesDeliveryProof<HashOf<BridgedChainOf<Self, I>>, Self::LaneId>;
 
 	/// Returns true if message has been successfully dispatched or not.
 	fn is_message_successfully_dispatched(_nonce: MessageNonce) -> bool {
diff --git a/bridges/modules/messages/src/call_ext.rs b/bridges/modules/messages/src/call_ext.rs
index 8e021c8e5e242..9e5f5f8d1129e 100644
--- a/bridges/modules/messages/src/call_ext.rs
+++ b/bridges/modules/messages/src/call_ext.rs
@@ -20,8 +20,8 @@ use crate::{BridgedChainOf, Config, InboundLanes, OutboundLanes, Pallet, LOG_TAR
 
 use bp_messages::{
 	target_chain::MessageDispatch, BaseMessagesProofInfo, ChainWithMessages, InboundLaneData,
-	LaneId, MessageNonce, MessagesCallInfo, ReceiveMessagesDeliveryProofInfo,
-	ReceiveMessagesProofInfo, UnrewardedRelayerOccupation,
+	MessageNonce, MessagesCallInfo, ReceiveMessagesDeliveryProofInfo, ReceiveMessagesProofInfo,
+	UnrewardedRelayerOccupation,
 };
 use bp_runtime::{AccountIdOf, OwnedBridgeModule};
 use frame_support::{dispatch::CallableCallFor, traits::IsSubType};
@@ -39,7 +39,7 @@ impl<T: Config<I>, I: 'static> CallHelper<T, I> {
 	///
 	/// - call is `receive_messages_delivery_proof` and all messages confirmations have been
 	///   received.
-	pub fn was_successful(info: &MessagesCallInfo) -> bool {
+	pub fn was_successful(info: &MessagesCallInfo<T::LaneId>) -> bool {
 		match info {
 			MessagesCallInfo::ReceiveMessagesProof(info) => {
 				let inbound_lane_data = match InboundLanes::<T, I>::get(info.base.lane_id) {
@@ -75,19 +75,21 @@ pub trait CallSubType<T: Config<I, RuntimeCall = Self>, I: 'static>:
 	IsSubType<CallableCallFor<Pallet<T, I>, T>>
 {
 	/// Create a new instance of `ReceiveMessagesProofInfo` from a `ReceiveMessagesProof` call.
-	fn receive_messages_proof_info(&self) -> Option<ReceiveMessagesProofInfo>;
+	fn receive_messages_proof_info(&self) -> Option<ReceiveMessagesProofInfo<T::LaneId>>;
 
 	/// Create a new instance of `ReceiveMessagesDeliveryProofInfo` from
 	/// a `ReceiveMessagesDeliveryProof` call.
-	fn receive_messages_delivery_proof_info(&self) -> Option<ReceiveMessagesDeliveryProofInfo>;
+	fn receive_messages_delivery_proof_info(
+		&self,
+	) -> Option<ReceiveMessagesDeliveryProofInfo<T::LaneId>>;
 
 	/// Create a new instance of `MessagesCallInfo` from a `ReceiveMessagesProof`
 	/// or a `ReceiveMessagesDeliveryProof` call.
-	fn call_info(&self) -> Option<MessagesCallInfo>;
+	fn call_info(&self) -> Option<MessagesCallInfo<T::LaneId>>;
 
 	/// Create a new instance of `MessagesCallInfo` from a `ReceiveMessagesProof`
 	/// or a `ReceiveMessagesDeliveryProof` call, if the call is for the provided lane.
-	fn call_info_for(&self, lane_id: LaneId) -> Option<MessagesCallInfo>;
+	fn call_info_for(&self, lane_id: T::LaneId) -> Option<MessagesCallInfo<T::LaneId>>;
 
 	/// Ensures that a `ReceiveMessagesProof` or a `ReceiveMessagesDeliveryProof` call:
 	///
@@ -114,7 +116,7 @@ impl<
 		I: 'static,
 	> CallSubType<T, I> for T::RuntimeCall
 {
-	fn receive_messages_proof_info(&self) -> Option<ReceiveMessagesProofInfo> {
+	fn receive_messages_proof_info(&self) -> Option<ReceiveMessagesProofInfo<T::LaneId>> {
 		if let Some(crate::Call::<T, I>::receive_messages_proof { ref proof, .. }) =
 			self.is_sub_type()
 		{
@@ -135,7 +137,9 @@ impl<
 		None
 	}
 
-	fn receive_messages_delivery_proof_info(&self) -> Option<ReceiveMessagesDeliveryProofInfo> {
+	fn receive_messages_delivery_proof_info(
+		&self,
+	) -> Option<ReceiveMessagesDeliveryProofInfo<T::LaneId>> {
 		if let Some(crate::Call::<T, I>::receive_messages_delivery_proof {
 			ref proof,
 			ref relayers_state,
@@ -159,7 +163,7 @@ impl<
 		None
 	}
 
-	fn call_info(&self) -> Option<MessagesCallInfo> {
+	fn call_info(&self) -> Option<MessagesCallInfo<T::LaneId>> {
 		if let Some(info) = self.receive_messages_proof_info() {
 			return Some(MessagesCallInfo::ReceiveMessagesProof(info))
 		}
@@ -171,7 +175,7 @@ impl<
 		None
 	}
 
-	fn call_info_for(&self, lane_id: LaneId) -> Option<MessagesCallInfo> {
+	fn call_info_for(&self, lane_id: T::LaneId) -> Option<MessagesCallInfo<T::LaneId>> {
 		self.call_info().filter(|info| {
 			let actual_lane_id = match info {
 				MessagesCallInfo::ReceiveMessagesProof(info) => info.base.lane_id,
@@ -251,10 +255,6 @@ mod tests {
 	};
 	use sp_std::ops::RangeInclusive;
 
-	fn test_lane_id() -> LaneId {
-		LaneId::new(1, 2)
-	}
-
 	fn fill_unrewarded_relayers() {
 		let mut inbound_lane_state = InboundLanes::<TestRuntime>::get(test_lane_id()).unwrap();
 		for n in 0..BridgedChain::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX {
diff --git a/bridges/modules/messages/src/inbound_lane.rs b/bridges/modules/messages/src/inbound_lane.rs
index 65240feb7194a..91f1159f8f915 100644
--- a/bridges/modules/messages/src/inbound_lane.rs
+++ b/bridges/modules/messages/src/inbound_lane.rs
@@ -20,8 +20,8 @@ use crate::{BridgedChainOf, Config};
 
 use bp_messages::{
 	target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
-	ChainWithMessages, DeliveredMessages, InboundLaneData, LaneId, LaneState, MessageKey,
-	MessageNonce, OutboundLaneData, ReceptionResult, UnrewardedRelayer,
+	ChainWithMessages, DeliveredMessages, InboundLaneData, LaneState, MessageKey, MessageNonce,
+	OutboundLaneData, ReceptionResult, UnrewardedRelayer,
 };
 use bp_runtime::AccountIdOf;
 use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
@@ -33,9 +33,11 @@ use sp_std::prelude::PartialEq;
 pub trait InboundLaneStorage {
 	/// Id of relayer on source chain.
 	type Relayer: Clone + PartialEq;
+	/// Lane identifier type.
+	type LaneId: Encode;
 
 	/// Lane id.
-	fn id(&self) -> LaneId;
+	fn id(&self) -> Self::LaneId;
 	/// Return maximal number of unrewarded relayer entries in inbound lane.
 	fn max_unrewarded_relayer_entries(&self) -> MessageNonce;
 	/// Return maximal number of unconfirmed messages in inbound lane.
@@ -181,7 +183,7 @@ impl<S: InboundLaneStorage> InboundLane<S> {
 	}
 
 	/// Receive new message.
-	pub fn receive_message<Dispatch: MessageDispatch>(
+	pub fn receive_message<Dispatch: MessageDispatch<LaneId = S::LaneId>>(
 		&mut self,
 		relayer_at_bridged_chain: &S::Relayer,
 		nonce: MessageNonce,
diff --git a/bridges/modules/messages/src/lanes_manager.rs b/bridges/modules/messages/src/lanes_manager.rs
index 4f5ac1c0a4032..27cab48535d7b 100644
--- a/bridges/modules/messages/src/lanes_manager.rs
+++ b/bridges/modules/messages/src/lanes_manager.rs
@@ -21,8 +21,8 @@ use crate::{
 };
 
 use bp_messages::{
-	target_chain::MessageDispatch, ChainWithMessages, InboundLaneData, LaneId, LaneState,
-	MessageKey, MessageNonce, OutboundLaneData,
+	target_chain::MessageDispatch, ChainWithMessages, InboundLaneData, LaneState, MessageKey,
+	MessageNonce, OutboundLaneData,
 };
 use bp_runtime::AccountIdOf;
 use codec::{Decode, Encode, MaxEncodedLen};
@@ -68,7 +68,7 @@ impl<T: Config<I>, I: 'static> LanesManager<T, I> {
 	/// Create new inbound lane in `Opened` state.
 	pub fn create_inbound_lane(
 		&self,
-		lane_id: LaneId,
+		lane_id: T::LaneId,
 	) -> Result<InboundLane<RuntimeInboundLaneStorage<T, I>>, LanesManagerError> {
 		InboundLanes::<T, I>::try_mutate(lane_id, |lane| match lane {
 			Some(_) => Err(LanesManagerError::InboundLaneAlreadyExists),
@@ -87,7 +87,7 @@ impl<T: Config<I>, I: 'static> LanesManager<T, I> {
 	/// Create new outbound lane in `Opened` state.
 	pub fn create_outbound_lane(
 		&self,
-		lane_id: LaneId,
+		lane_id: T::LaneId,
 	) -> Result<OutboundLane<RuntimeOutboundLaneStorage<T, I>>, LanesManagerError> {
 		OutboundLanes::<T, I>::try_mutate(lane_id, |lane| match lane {
 			Some(_) => Err(LanesManagerError::OutboundLaneAlreadyExists),
@@ -103,7 +103,7 @@ impl<T: Config<I>, I: 'static> LanesManager<T, I> {
 	/// Get existing inbound lane, checking that it is in usable state.
 	pub fn active_inbound_lane(
 		&self,
-		lane_id: LaneId,
+		lane_id: T::LaneId,
 	) -> Result<InboundLane<RuntimeInboundLaneStorage<T, I>>, LanesManagerError> {
 		Ok(InboundLane::new(RuntimeInboundLaneStorage::from_lane_id(lane_id, true)?))
 	}
@@ -111,7 +111,7 @@ impl<T: Config<I>, I: 'static> LanesManager<T, I> {
 	/// Get existing outbound lane, checking that it is in usable state.
 	pub fn active_outbound_lane(
 		&self,
-		lane_id: LaneId,
+		lane_id: T::LaneId,
 	) -> Result<OutboundLane<RuntimeOutboundLaneStorage<T, I>>, LanesManagerError> {
 		Ok(OutboundLane::new(RuntimeOutboundLaneStorage::from_lane_id(lane_id, true)?))
 	}
@@ -119,7 +119,7 @@ impl<T: Config<I>, I: 'static> LanesManager<T, I> {
 	/// Get existing inbound lane without any additional state checks.
 	pub fn any_state_inbound_lane(
 		&self,
-		lane_id: LaneId,
+		lane_id: T::LaneId,
 	) -> Result<InboundLane<RuntimeInboundLaneStorage<T, I>>, LanesManagerError> {
 		Ok(InboundLane::new(RuntimeInboundLaneStorage::from_lane_id(lane_id, false)?))
 	}
@@ -127,7 +127,7 @@ impl<T: Config<I>, I: 'static> LanesManager<T, I> {
 	/// Get existing outbound lane without any additional state checks.
 	pub fn any_state_outbound_lane(
 		&self,
-		lane_id: LaneId,
+		lane_id: T::LaneId,
 	) -> Result<OutboundLane<RuntimeOutboundLaneStorage<T, I>>, LanesManagerError> {
 		Ok(OutboundLane::new(RuntimeOutboundLaneStorage::from_lane_id(lane_id, false)?))
 	}
@@ -135,14 +135,14 @@ impl<T: Config<I>, I: 'static> LanesManager<T, I> {
 
 /// Runtime inbound lane storage.
 pub struct RuntimeInboundLaneStorage<T: Config<I>, I: 'static = ()> {
-	pub(crate) lane_id: LaneId,
+	pub(crate) lane_id: T::LaneId,
 	pub(crate) cached_data: InboundLaneData<AccountIdOf<BridgedChainOf<T, I>>>,
 }
 
 impl<T: Config<I>, I: 'static> RuntimeInboundLaneStorage<T, I> {
 	/// Creates new runtime inbound lane storage for given **existing** lane.
 	fn from_lane_id(
-		lane_id: LaneId,
+		lane_id: T::LaneId,
 		check_active: bool,
 	) -> Result<RuntimeInboundLaneStorage<T, I>, LanesManagerError> {
 		let cached_data =
@@ -196,8 +196,9 @@ impl<T: Config<I>, I: 'static> RuntimeInboundLaneStorage<T, I> {
 
 impl<T: Config<I>, I: 'static> InboundLaneStorage for RuntimeInboundLaneStorage<T, I> {
 	type Relayer = AccountIdOf<BridgedChainOf<T, I>>;
+	type LaneId = T::LaneId;
 
-	fn id(&self) -> LaneId {
+	fn id(&self) -> Self::LaneId {
 		self.lane_id
 	}
 
@@ -225,15 +226,15 @@ impl<T: Config<I>, I: 'static> InboundLaneStorage for RuntimeInboundLaneStorage<
 
 /// Runtime outbound lane storage.
 #[derive(Debug, PartialEq, Eq)]
-pub struct RuntimeOutboundLaneStorage<T, I = ()> {
-	pub(crate) lane_id: LaneId,
+pub struct RuntimeOutboundLaneStorage<T: Config<I>, I: 'static> {
+	pub(crate) lane_id: T::LaneId,
 	pub(crate) cached_data: OutboundLaneData,
 	pub(crate) _phantom: PhantomData<(T, I)>,
 }
 
 impl<T: Config<I>, I: 'static> RuntimeOutboundLaneStorage<T, I> {
 	/// Creates new runtime outbound lane storage for given **existing** lane.
-	fn from_lane_id(lane_id: LaneId, check_active: bool) -> Result<Self, LanesManagerError> {
+	fn from_lane_id(lane_id: T::LaneId, check_active: bool) -> Result<Self, LanesManagerError> {
 		let cached_data =
 			OutboundLanes::<T, I>::get(lane_id).ok_or(LanesManagerError::UnknownOutboundLane)?;
 		ensure!(
@@ -246,8 +247,9 @@ impl<T: Config<I>, I: 'static> RuntimeOutboundLaneStorage<T, I> {
 
 impl<T: Config<I>, I: 'static> OutboundLaneStorage for RuntimeOutboundLaneStorage<T, I> {
 	type StoredMessagePayload = StoredMessagePayload<T, I>;
+	type LaneId = T::LaneId;
 
-	fn id(&self) -> LaneId {
+	fn id(&self) -> Self::LaneId {
 		self.lane_id
 	}
 
diff --git a/bridges/modules/messages/src/lib.rs b/bridges/modules/messages/src/lib.rs
index 4ef2818f271cb..657c3b902be33 100644
--- a/bridges/modules/messages/src/lib.rs
+++ b/bridges/modules/messages/src/lib.rs
@@ -60,9 +60,9 @@ use bp_messages::{
 		DeliveryPayments, DispatchMessage, FromBridgedChainMessagesProof, MessageDispatch,
 		ProvedLaneMessages, ProvedMessages,
 	},
-	ChainWithMessages, DeliveredMessages, InboundLaneData, InboundMessageDetails, LaneId,
-	MessageKey, MessageNonce, MessagePayload, MessagesOperatingMode, OutboundLaneData,
-	OutboundMessageDetails, UnrewardedRelayersState, VerificationError,
+	ChainWithMessages, DeliveredMessages, InboundLaneData, InboundMessageDetails, MessageKey,
+	MessageNonce, MessagePayload, MessagesOperatingMode, OutboundLaneData, OutboundMessageDetails,
+	UnrewardedRelayersState, VerificationError,
 };
 use bp_runtime::{
 	AccountIdOf, BasicOperatingMode, HashOf, OwnedBridgeModule, PreComputedSize, RangeInclusiveExt,
@@ -97,7 +97,7 @@ pub const LOG_TARGET: &str = "runtime::bridge-messages";
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use bp_messages::{LaneIdBytes, ReceivedMessages, ReceptionResult};
+	use bp_messages::{LaneIdType, ReceivedMessages, ReceptionResult};
 	use bp_runtime::RangeInclusiveExt;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
@@ -123,17 +123,25 @@ pub mod pallet {
 		type OutboundPayload: Parameter + Size;
 		/// Payload type of inbound messages. This payload is dispatched on this chain.
 		type InboundPayload: Decode;
+		/// Type of a lane identifier.
+		type LaneId: LaneIdType;
 
 		/// Handler for relayer payments that happen during message delivery transaction.
 		type DeliveryPayments: DeliveryPayments<Self::AccountId>;
 		/// Handler for relayer payments that happen during message delivery confirmation
 		/// transaction.
-		type DeliveryConfirmationPayments: DeliveryConfirmationPayments<Self::AccountId>;
+		type DeliveryConfirmationPayments: DeliveryConfirmationPayments<
+			Self::AccountId,
+			Self::LaneId,
+		>;
 		/// Delivery confirmation callback.
-		type OnMessagesDelivered: OnMessagesDelivered;
+		type OnMessagesDelivered: OnMessagesDelivered<Self::LaneId>;
 
 		/// Message dispatch handler.
-		type MessageDispatch: MessageDispatch<DispatchPayload = Self::InboundPayload>;
+		type MessageDispatch: MessageDispatch<
+			DispatchPayload = Self::InboundPayload,
+			LaneId = Self::LaneId,
+		>;
 	}
 
 	/// Shortcut to this chain type for Config.
@@ -203,7 +211,7 @@ pub mod pallet {
 		pub fn receive_messages_proof(
 			origin: OriginFor<T>,
 			relayer_id_at_bridged_chain: AccountIdOf<BridgedChainOf<T, I>>,
-			proof: Box<FromBridgedChainMessagesProof<HashOf<BridgedChainOf<T, I>>>>,
+			proof: Box<FromBridgedChainMessagesProof<HashOf<BridgedChainOf<T, I>>, T::LaneId>>,
 			messages_count: u32,
 			dispatch_weight: Weight,
 		) -> DispatchResultWithPostInfo {
@@ -350,7 +358,7 @@ pub mod pallet {
 		))]
 		pub fn receive_messages_delivery_proof(
 			origin: OriginFor<T>,
-			proof: FromBridgedChainMessagesDeliveryProof<HashOf<BridgedChainOf<T, I>>>,
+			proof: FromBridgedChainMessagesDeliveryProof<HashOf<BridgedChainOf<T, I>>, T::LaneId>,
 			mut relayers_state: UnrewardedRelayersState,
 		) -> DispatchResultWithPostInfo {
 			Self::ensure_not_halted().map_err(Error::<T, I>::BridgeModule)?;
@@ -441,19 +449,22 @@ pub mod pallet {
 		/// Message has been accepted and is waiting to be delivered.
 		MessageAccepted {
 			/// Lane, which has accepted the message.
-			lane_id: LaneIdBytes,
+			lane_id: T::LaneId,
 			/// Nonce of accepted message.
 			nonce: MessageNonce,
 		},
 		/// Messages have been received from the bridged chain.
 		MessagesReceived(
 			/// Result of received messages dispatch.
-			ReceivedMessages<<T::MessageDispatch as MessageDispatch>::DispatchLevelResult>,
+			ReceivedMessages<
+				<T::MessageDispatch as MessageDispatch>::DispatchLevelResult,
+				T::LaneId,
+			>,
 		),
 		/// Messages in the inclusive range have been delivered to the bridged chain.
 		MessagesDelivered {
 			/// Lane for which the delivery has been confirmed.
-			lane_id: LaneIdBytes,
+			lane_id: T::LaneId,
 			/// Delivered messages.
 			messages: DeliveredMessages,
 		},
@@ -510,13 +521,13 @@ pub mod pallet {
 	/// Map of lane id => inbound lane data.
 	#[pallet::storage]
 	pub type InboundLanes<T: Config<I>, I: 'static = ()> =
-		StorageMap<_, Blake2_128Concat, LaneId, StoredInboundLaneData<T, I>, OptionQuery>;
+		StorageMap<_, Blake2_128Concat, T::LaneId, StoredInboundLaneData<T, I>, OptionQuery>;
 
 	/// Map of lane id => outbound lane data.
 	#[pallet::storage]
 	pub type OutboundLanes<T: Config<I>, I: 'static = ()> = StorageMap<
 		Hasher = Blake2_128Concat,
-		Key = LaneId,
+		Key = T::LaneId,
 		Value = OutboundLaneData,
 		QueryKind = OptionQuery,
 	>;
@@ -524,7 +535,7 @@ pub mod pallet {
 	/// All queued outbound messages.
 	#[pallet::storage]
 	pub type OutboundMessages<T: Config<I>, I: 'static = ()> =
-		StorageMap<_, Blake2_128Concat, MessageKey, StoredMessagePayload<T, I>>;
+		StorageMap<_, Blake2_128Concat, MessageKey<T::LaneId>, StoredMessagePayload<T, I>>;
 
 	#[pallet::genesis_config]
 	#[derive(DefaultNoBound)]
@@ -534,7 +545,7 @@ pub mod pallet {
 		/// Initial pallet owner.
 		pub owner: Option<T::AccountId>,
 		/// Opened lanes.
-		pub opened_lanes: Vec<LaneId>,
+		pub opened_lanes: Vec<T::LaneId>,
 		/// Dummy marker.
 		#[serde(skip)]
 		pub _phantom: sp_std::marker::PhantomData<I>,
@@ -565,13 +576,16 @@ pub mod pallet {
 
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Get stored data of the outbound message with given nonce.
-		pub fn outbound_message_data(lane: LaneId, nonce: MessageNonce) -> Option<MessagePayload> {
+		pub fn outbound_message_data(
+			lane: T::LaneId,
+			nonce: MessageNonce,
+		) -> Option<MessagePayload> {
 			OutboundMessages::<T, I>::get(MessageKey { lane_id: lane, nonce }).map(Into::into)
 		}
 
 		/// Prepare data, related to given inbound message.
 		pub fn inbound_message_data(
-			lane: LaneId,
+			lane: T::LaneId,
 			payload: MessagePayload,
 			outbound_details: OutboundMessageDetails,
 		) -> InboundMessageDetails {
@@ -585,13 +599,13 @@ pub mod pallet {
 		}
 
 		/// Return outbound lane data.
-		pub fn outbound_lane_data(lane: LaneId) -> Option<OutboundLaneData> {
+		pub fn outbound_lane_data(lane: T::LaneId) -> Option<OutboundLaneData> {
 			OutboundLanes::<T, I>::get(lane)
 		}
 
 		/// Return inbound lane data.
 		pub fn inbound_lane_data(
-			lane: LaneId,
+			lane: T::LaneId,
 		) -> Option<InboundLaneData<AccountIdOf<BridgedChainOf<T, I>>>> {
 			InboundLanes::<T, I>::get(lane).map(|lane| lane.0)
 		}
@@ -654,12 +668,12 @@ pub mod pallet {
 /// to send it on the bridge.
 #[derive(Debug, PartialEq, Eq)]
 pub struct SendMessageArgs<T: Config<I>, I: 'static> {
-	lane_id: LaneId,
+	lane_id: T::LaneId,
 	lane: OutboundLane<RuntimeOutboundLaneStorage<T, I>>,
 	payload: StoredMessagePayload<T, I>,
 }
 
-impl<T, I> bp_messages::source_chain::MessagesBridge<T::OutboundPayload> for Pallet<T, I>
+impl<T, I> bp_messages::source_chain::MessagesBridge<T::OutboundPayload, T::LaneId> for Pallet<T, I>
 where
 	T: Config<I>,
 	I: 'static,
@@ -668,7 +682,7 @@ where
 	type SendMessageArgs = SendMessageArgs<T, I>;
 
 	fn validate_message(
-		lane_id: LaneId,
+		lane_id: T::LaneId,
 		message: &T::OutboundPayload,
 	) -> Result<SendMessageArgs<T, I>, Self::Error> {
 		// we can't accept any messages if the pallet is halted
@@ -725,7 +739,7 @@ fn ensure_normal_operating_mode<T: Config<I>, I: 'static>() -> Result<(), Error<
 
 /// Creates new inbound lane object, backed by runtime storage. Lane must be active.
 fn active_inbound_lane<T: Config<I>, I: 'static>(
-	lane_id: LaneId,
+	lane_id: T::LaneId,
 ) -> Result<InboundLane<RuntimeInboundLaneStorage<T, I>>, Error<T, I>> {
 	LanesManager::<T, I>::new()
 		.active_inbound_lane(lane_id)
@@ -734,7 +748,7 @@ fn active_inbound_lane<T: Config<I>, I: 'static>(
 
 /// Creates new outbound lane object, backed by runtime storage. Lane must be active.
 fn active_outbound_lane<T: Config<I>, I: 'static>(
-	lane_id: LaneId,
+	lane_id: T::LaneId,
 ) -> Result<OutboundLane<RuntimeOutboundLaneStorage<T, I>>, Error<T, I>> {
 	LanesManager::<T, I>::new()
 		.active_outbound_lane(lane_id)
@@ -743,7 +757,7 @@ fn active_outbound_lane<T: Config<I>, I: 'static>(
 
 /// Creates new outbound lane object, backed by runtime storage.
 fn any_state_outbound_lane<T: Config<I>, I: 'static>(
-	lane_id: LaneId,
+	lane_id: T::LaneId,
 ) -> Result<OutboundLane<RuntimeOutboundLaneStorage<T, I>>, Error<T, I>> {
 	LanesManager::<T, I>::new()
 		.any_state_outbound_lane(lane_id)
@@ -752,9 +766,12 @@ fn any_state_outbound_lane<T: Config<I>, I: 'static>(
 
 /// Verify messages proof and return proved messages with decoded payload.
 fn verify_and_decode_messages_proof<T: Config<I>, I: 'static>(
-	proof: FromBridgedChainMessagesProof<HashOf<BridgedChainOf<T, I>>>,
+	proof: FromBridgedChainMessagesProof<HashOf<BridgedChainOf<T, I>>, T::LaneId>,
 	messages_count: u32,
-) -> Result<ProvedMessages<DispatchMessage<T::InboundPayload>>, VerificationError> {
+) -> Result<
+	ProvedMessages<T::LaneId, DispatchMessage<T::InboundPayload, T::LaneId>>,
+	VerificationError,
+> {
 	// `receive_messages_proof` weight formula and `MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX`
 	// check guarantees that the `message_count` is sane and Vec<Message> may be allocated.
 	// (tx with too many messages will either be rejected from the pool, or will fail earlier)
diff --git a/bridges/modules/messages/src/outbound_lane.rs b/bridges/modules/messages/src/outbound_lane.rs
index f71240ab7c703..c72713e7455a6 100644
--- a/bridges/modules/messages/src/outbound_lane.rs
+++ b/bridges/modules/messages/src/outbound_lane.rs
@@ -19,7 +19,7 @@
 use crate::{Config, LOG_TARGET};
 
 use bp_messages::{
-	ChainWithMessages, DeliveredMessages, LaneId, LaneState, MessageNonce, OutboundLaneData,
+	ChainWithMessages, DeliveredMessages, LaneState, MessageNonce, OutboundLaneData,
 	UnrewardedRelayer,
 };
 use codec::{Decode, Encode};
@@ -32,9 +32,11 @@ use sp_std::{collections::vec_deque::VecDeque, marker::PhantomData, ops::RangeIn
 pub trait OutboundLaneStorage {
 	/// Stored message payload type.
 	type StoredMessagePayload;
+	/// Lane identifier type.
+	type LaneId: Encode;
 
 	/// Lane id.
-	fn id(&self) -> LaneId;
+	fn id(&self) -> Self::LaneId;
 	/// Get lane data from the storage.
 	fn data(&self) -> OutboundLaneData;
 	/// Update lane data in the storage.
diff --git a/bridges/modules/messages/src/proofs.rs b/bridges/modules/messages/src/proofs.rs
index f35eb24d98c5d..dcd642341d776 100644
--- a/bridges/modules/messages/src/proofs.rs
+++ b/bridges/modules/messages/src/proofs.rs
@@ -22,7 +22,7 @@ use bp_header_chain::{HeaderChain, HeaderChainError};
 use bp_messages::{
 	source_chain::FromBridgedChainMessagesDeliveryProof,
 	target_chain::{FromBridgedChainMessagesProof, ProvedLaneMessages, ProvedMessages},
-	ChainWithMessages, InboundLaneData, LaneId, Message, MessageKey, MessageNonce, MessagePayload,
+	ChainWithMessages, InboundLaneData, Message, MessageKey, MessageNonce, MessagePayload,
 	OutboundLaneData, VerificationError,
 };
 use bp_runtime::{
@@ -32,8 +32,8 @@ use codec::Decode;
 use sp_std::vec::Vec;
 
 /// 'Parsed' message delivery proof - inbound lane id and its state.
-pub(crate) type ParsedMessagesDeliveryProofFromBridgedChain<T> =
-	(LaneId, InboundLaneData<<T as frame_system::Config>::AccountId>);
+pub(crate) type ParsedMessagesDeliveryProofFromBridgedChain<T, I> =
+	(<T as Config<I>>::LaneId, InboundLaneData<<T as frame_system::Config>::AccountId>);
 
 /// Verify proof of Bridged -> This chain messages.
 ///
@@ -44,9 +44,9 @@ pub(crate) type ParsedMessagesDeliveryProofFromBridgedChain<T> =
 /// outside of this function. This function only verifies that the proof declares exactly
 /// `messages_count` messages.
 pub fn verify_messages_proof<T: Config<I>, I: 'static>(
-	proof: FromBridgedChainMessagesProof<HashOf<BridgedChainOf<T, I>>>,
+	proof: FromBridgedChainMessagesProof<HashOf<BridgedChainOf<T, I>>, T::LaneId>,
 	messages_count: u32,
-) -> Result<ProvedMessages<Message>, VerificationError> {
+) -> Result<ProvedMessages<T::LaneId, Message<T::LaneId>>, VerificationError> {
 	let FromBridgedChainMessagesProof {
 		bridged_header_hash,
 		storage_proof,
@@ -103,8 +103,8 @@ pub fn verify_messages_proof<T: Config<I>, I: 'static>(
 
 /// Verify proof of This -> Bridged chain messages delivery.
 pub fn verify_messages_delivery_proof<T: Config<I>, I: 'static>(
-	proof: FromBridgedChainMessagesDeliveryProof<HashOf<BridgedChainOf<T, I>>>,
-) -> Result<ParsedMessagesDeliveryProofFromBridgedChain<T>, VerificationError> {
+	proof: FromBridgedChainMessagesDeliveryProof<HashOf<BridgedChainOf<T, I>>, T::LaneId>,
+) -> Result<ParsedMessagesDeliveryProofFromBridgedChain<T, I>, VerificationError> {
 	let FromBridgedChainMessagesDeliveryProof { bridged_header_hash, storage_proof, lane } = proof;
 	let mut parser: MessagesStorageProofAdapter<T, I> =
 		MessagesStorageProofAdapter::try_new_with_verified_storage_proof(
@@ -143,7 +143,7 @@ trait StorageProofAdapter<T: Config<I>, I: 'static> {
 
 	fn read_and_decode_outbound_lane_data(
 		&mut self,
-		lane_id: &LaneId,
+		lane_id: &T::LaneId,
 	) -> Result<Option<OutboundLaneData>, StorageProofError> {
 		let storage_outbound_lane_data_key = bp_messages::storage_keys::outbound_lane_data_key(
 			T::ThisChain::WITH_CHAIN_MESSAGES_PALLET_NAME,
@@ -154,7 +154,7 @@ trait StorageProofAdapter<T: Config<I>, I: 'static> {
 
 	fn read_and_decode_message_payload(
 		&mut self,
-		message_key: &MessageKey,
+		message_key: &MessageKey<T::LaneId>,
 	) -> Result<MessagePayload, StorageProofError> {
 		let storage_message_key = bp_messages::storage_keys::message_key(
 			T::ThisChain::WITH_CHAIN_MESSAGES_PALLET_NAME,
@@ -229,19 +229,20 @@ mod tests {
 		encode_outbound_lane_data: impl Fn(&OutboundLaneData) -> Vec<u8>,
 		add_duplicate_key: bool,
 		add_unused_key: bool,
-		test: impl Fn(FromBridgedChainMessagesProof<BridgedHeaderHash>) -> R,
+		test: impl Fn(FromBridgedChainMessagesProof<BridgedHeaderHash, TestLaneIdType>) -> R,
 	) -> R {
-		let (state_root, storage_proof) = prepare_messages_storage_proof::<BridgedChain, ThisChain>(
-			test_lane_id(),
-			1..=nonces_end,
-			outbound_lane_data,
-			bp_runtime::UnverifiedStorageProofParams::default(),
-			generate_dummy_message,
-			encode_message,
-			encode_outbound_lane_data,
-			add_duplicate_key,
-			add_unused_key,
-		);
+		let (state_root, storage_proof) =
+			prepare_messages_storage_proof::<BridgedChain, ThisChain, TestLaneIdType>(
+				test_lane_id(),
+				1..=nonces_end,
+				outbound_lane_data,
+				bp_runtime::UnverifiedStorageProofParams::default(),
+				generate_dummy_message,
+				encode_message,
+				encode_outbound_lane_data,
+				add_duplicate_key,
+				add_unused_key,
+			);
 
 		sp_io::TestExternalities::new(Default::default()).execute_with(move || {
 			let bridged_header = BridgedChainHeader::new(
diff --git a/bridges/modules/messages/src/tests/messages_generation.rs b/bridges/modules/messages/src/tests/messages_generation.rs
index 6c4867fa6de39..00b1d3eefe43b 100644
--- a/bridges/modules/messages/src/tests/messages_generation.rs
+++ b/bridges/modules/messages/src/tests/messages_generation.rs
@@ -17,8 +17,8 @@
 //! Helpers for generating message storage proofs, that are used by tests and by benchmarks.
 
 use bp_messages::{
-	storage_keys, ChainWithMessages, InboundLaneData, LaneId, MessageKey, MessageNonce,
-	MessagePayload, OutboundLaneData,
+	storage_keys, ChainWithMessages, InboundLaneData, MessageKey, MessageNonce, MessagePayload,
+	OutboundLaneData,
 };
 use bp_runtime::{
 	grow_storage_value, record_all_trie_keys, AccountIdOf, Chain, HashOf, HasherOf,
@@ -47,7 +47,11 @@ pub fn encode_lane_data(d: &OutboundLaneData) -> Vec<u8> {
 ///
 /// Returns state trie root and nodes with prepared messages.
 #[allow(clippy::too_many_arguments)]
-pub fn prepare_messages_storage_proof<BridgedChain: Chain, ThisChain: ChainWithMessages>(
+pub fn prepare_messages_storage_proof<
+	BridgedChain: Chain,
+	ThisChain: ChainWithMessages,
+	LaneId: Encode + Copy,
+>(
 	lane: LaneId,
 	message_nonces: RangeInclusive<MessageNonce>,
 	outbound_lane_data: Option<OutboundLaneData>,
@@ -132,7 +136,11 @@ where
 /// Prepare storage proof of given messages delivery.
 ///
 /// Returns state trie root and nodes with prepared messages.
-pub fn prepare_message_delivery_storage_proof<BridgedChain: Chain, ThisChain: ChainWithMessages>(
+pub fn prepare_message_delivery_storage_proof<
+	BridgedChain: Chain,
+	ThisChain: ChainWithMessages,
+	LaneId: Encode,
+>(
 	lane: LaneId,
 	inbound_lane_data: InboundLaneData<AccountIdOf<ThisChain>>,
 	proof_params: UnverifiedStorageProofParams,
diff --git a/bridges/modules/messages/src/tests/mock.rs b/bridges/modules/messages/src/tests/mock.rs
index 2caea9813e827..85bd85cce2ad2 100644
--- a/bridges/modules/messages/src/tests/mock.rs
+++ b/bridges/modules/messages/src/tests/mock.rs
@@ -35,8 +35,9 @@ use bp_messages::{
 		DeliveryPayments, DispatchMessage, DispatchMessageData, FromBridgedChainMessagesProof,
 		MessageDispatch,
 	},
-	ChainWithMessages, DeliveredMessages, InboundLaneData, LaneId, LaneState, Message, MessageKey,
-	MessageNonce, OutboundLaneData, UnrewardedRelayer, UnrewardedRelayersState,
+	ChainWithMessages, DeliveredMessages, HashedLaneId, InboundLaneData, LaneIdType, LaneState,
+	Message, MessageKey, MessageNonce, OutboundLaneData, UnrewardedRelayer,
+	UnrewardedRelayersState,
 };
 use bp_runtime::{
 	messages::MessageDispatchResult, Chain, ChainId, Size, UnverifiedStorageProofParams,
@@ -74,6 +75,7 @@ pub struct TestPayload {
 pub type TestMessageFee = u64;
 pub type TestRelayer = u64;
 pub type TestDispatchLevelResult = ();
+pub type TestLaneIdType = HashedLaneId;
 
 pub struct ThisChain;
 
@@ -195,10 +197,10 @@ impl Config for TestRuntime {
 	type BridgedHeaderChain = BridgedChainGrandpa;
 
 	type OutboundPayload = TestPayload;
-
 	type InboundPayload = TestPayload;
-	type DeliveryPayments = TestDeliveryPayments;
+	type LaneId = TestLaneIdType;
 
+	type DeliveryPayments = TestDeliveryPayments;
 	type DeliveryConfirmationPayments = TestDeliveryConfirmationPayments;
 	type OnMessagesDelivered = TestOnMessagesDelivered;
 
@@ -207,13 +209,13 @@ impl Config for TestRuntime {
 
 #[cfg(feature = "runtime-benchmarks")]
 impl crate::benchmarking::Config<()> for TestRuntime {
-	fn bench_lane_id() -> LaneId {
+	fn bench_lane_id() -> Self::LaneId {
 		test_lane_id()
 	}
 
 	fn prepare_message_proof(
-		params: crate::benchmarking::MessageProofParams,
-	) -> (FromBridgedChainMessagesProof<BridgedHeaderHash>, Weight) {
+		params: crate::benchmarking::MessageProofParams<Self::LaneId>,
+	) -> (FromBridgedChainMessagesProof<BridgedHeaderHash, Self::LaneId>, Weight) {
 		use bp_runtime::RangeInclusiveExt;
 
 		let dispatch_weight =
@@ -228,8 +230,8 @@ impl crate::benchmarking::Config<()> for TestRuntime {
 	}
 
 	fn prepare_message_delivery_proof(
-		params: crate::benchmarking::MessageDeliveryProofParams<AccountId>,
-	) -> FromBridgedChainMessagesDeliveryProof<BridgedHeaderHash> {
+		params: crate::benchmarking::MessageDeliveryProofParams<AccountId, Self::LaneId>,
+	) -> FromBridgedChainMessagesDeliveryProof<BridgedHeaderHash, Self::LaneId> {
 		// in mock run we only care about benchmarks correctness, not the benchmark results
 		// => ignore size related arguments
 		prepare_messages_delivery_proof(params.lane, params.inbound_lane_data)
@@ -259,18 +261,18 @@ pub const TEST_RELAYER_B: AccountId = 101;
 pub const TEST_RELAYER_C: AccountId = 102;
 
 /// Lane that we're using in tests.
-pub fn test_lane_id() -> LaneId {
-	LaneId::new(1, 2)
+pub fn test_lane_id() -> TestLaneIdType {
+	TestLaneIdType::new(1, 2)
 }
 
 /// Lane that is completely unknown to our runtime.
-pub fn unknown_lane_id() -> LaneId {
-	LaneId::new(1, 3)
+pub fn unknown_lane_id() -> TestLaneIdType {
+	TestLaneIdType::new(1, 3)
 }
 
 /// Lane that is registered, but it is closed.
-pub fn closed_lane_id() -> LaneId {
-	LaneId::new(1, 4)
+pub fn closed_lane_id() -> TestLaneIdType {
+	TestLaneIdType::new(1, 4)
 }
 
 /// Regular message payload.
@@ -316,11 +318,11 @@ impl TestDeliveryConfirmationPayments {
 	}
 }
 
-impl DeliveryConfirmationPayments<AccountId> for TestDeliveryConfirmationPayments {
+impl DeliveryConfirmationPayments<AccountId, TestLaneIdType> for TestDeliveryConfirmationPayments {
 	type Error = &'static str;
 
 	fn pay_reward(
-		_lane_id: LaneId,
+		_lane_id: TestLaneIdType,
 		messages_relayers: VecDeque<UnrewardedRelayer<AccountId>>,
 		_confirmation_relayer: &AccountId,
 		received_range: &RangeInclusive<MessageNonce>,
@@ -341,7 +343,7 @@ impl DeliveryConfirmationPayments<AccountId> for TestDeliveryConfirmationPayment
 pub struct TestMessageDispatch;
 
 impl TestMessageDispatch {
-	pub fn deactivate(lane: LaneId) {
+	pub fn deactivate(lane: TestLaneIdType) {
 		// "enqueue" enough (to deactivate dispatcher) messages at dispatcher
 		let latest_received_nonce = BridgedChain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX + 1;
 		for _ in 1..=latest_received_nonce {
@@ -349,7 +351,7 @@ impl TestMessageDispatch {
 		}
 	}
 
-	pub fn emulate_enqueued_message(lane: LaneId) {
+	pub fn emulate_enqueued_message(lane: TestLaneIdType) {
 		let key = (b"dispatched", lane).encode();
 		let dispatched = frame_support::storage::unhashed::get_or_default::<MessageNonce>(&key[..]);
 		frame_support::storage::unhashed::put(&key[..], &(dispatched + 1));
@@ -359,14 +361,15 @@ impl TestMessageDispatch {
 impl MessageDispatch for TestMessageDispatch {
 	type DispatchPayload = TestPayload;
 	type DispatchLevelResult = TestDispatchLevelResult;
+	type LaneId = TestLaneIdType;
 
-	fn is_active(lane: LaneId) -> bool {
+	fn is_active(lane: Self::LaneId) -> bool {
 		frame_support::storage::unhashed::get_or_default::<MessageNonce>(
 			&(b"dispatched", lane).encode()[..],
 		) <= BridgedChain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX
 	}
 
-	fn dispatch_weight(message: &mut DispatchMessage<TestPayload>) -> Weight {
+	fn dispatch_weight(message: &mut DispatchMessage<TestPayload, Self::LaneId>) -> Weight {
 		match message.data.payload.as_ref() {
 			Ok(payload) => payload.declared_weight,
 			Err(_) => Weight::zero(),
@@ -374,7 +377,7 @@ impl MessageDispatch for TestMessageDispatch {
 	}
 
 	fn dispatch(
-		message: DispatchMessage<TestPayload>,
+		message: DispatchMessage<TestPayload, Self::LaneId>,
 	) -> MessageDispatchResult<TestDispatchLevelResult> {
 		match message.data.payload.as_ref() {
 			Ok(payload) => {
@@ -390,13 +393,13 @@ impl MessageDispatch for TestMessageDispatch {
 pub struct TestOnMessagesDelivered;
 
 impl TestOnMessagesDelivered {
-	pub fn call_arguments() -> Option<(LaneId, MessageNonce)> {
+	pub fn call_arguments() -> Option<(TestLaneIdType, MessageNonce)> {
 		frame_support::storage::unhashed::get(b"TestOnMessagesDelivered.OnMessagesDelivered")
 	}
 }
 
-impl OnMessagesDelivered for TestOnMessagesDelivered {
-	fn on_messages_delivered(lane: LaneId, enqueued_messages: MessageNonce) {
+impl OnMessagesDelivered<TestLaneIdType> for TestOnMessagesDelivered {
+	fn on_messages_delivered(lane: TestLaneIdType, enqueued_messages: MessageNonce) {
 		frame_support::storage::unhashed::put(
 			b"TestOnMessagesDelivered.OnMessagesDelivered",
 			&(lane, enqueued_messages),
@@ -405,7 +408,7 @@ impl OnMessagesDelivered for TestOnMessagesDelivered {
 }
 
 /// Return test lane message with given nonce and payload.
-pub fn message(nonce: MessageNonce, payload: TestPayload) -> Message {
+pub fn message(nonce: MessageNonce, payload: TestPayload) -> Message<TestLaneIdType> {
 	Message { key: MessageKey { lane_id: test_lane_id(), nonce }, payload: payload.encode() }
 }
 
@@ -449,7 +452,7 @@ pub fn unrewarded_relayer(
 }
 
 /// Returns unrewarded relayers state at given lane.
-pub fn inbound_unrewarded_relayers_state(lane: bp_messages::LaneId) -> UnrewardedRelayersState {
+pub fn inbound_unrewarded_relayers_state(lane: TestLaneIdType) -> UnrewardedRelayersState {
 	let inbound_lane_data = crate::InboundLanes::<TestRuntime, ()>::get(lane).unwrap().0;
 	UnrewardedRelayersState::from(&inbound_lane_data)
 }
@@ -486,24 +489,25 @@ pub fn run_test<T>(test: impl FnOnce() -> T) -> T {
 /// Since this function changes the runtime storage, you can't "inline" it in the
 /// `asset_noop` macro calls.
 pub fn prepare_messages_proof(
-	messages: Vec<Message>,
+	messages: Vec<Message<TestLaneIdType>>,
 	outbound_lane_data: Option<OutboundLaneData>,
-) -> Box<FromBridgedChainMessagesProof<BridgedHeaderHash>> {
+) -> Box<FromBridgedChainMessagesProof<BridgedHeaderHash, TestLaneIdType>> {
 	// first - let's generate storage proof
 	let lane = messages.first().unwrap().key.lane_id;
 	let nonces_start = messages.first().unwrap().key.nonce;
 	let nonces_end = messages.last().unwrap().key.nonce;
-	let (storage_root, storage_proof) = prepare_messages_storage_proof::<BridgedChain, ThisChain>(
-		lane,
-		nonces_start..=nonces_end,
-		outbound_lane_data,
-		UnverifiedStorageProofParams::default(),
-		|nonce| messages[(nonce - nonces_start) as usize].payload.clone(),
-		encode_all_messages,
-		encode_lane_data,
-		false,
-		false,
-	);
+	let (storage_root, storage_proof) =
+		prepare_messages_storage_proof::<BridgedChain, ThisChain, TestLaneIdType>(
+			lane,
+			nonces_start..=nonces_end,
+			outbound_lane_data,
+			UnverifiedStorageProofParams::default(),
+			|nonce| messages[(nonce - nonces_start) as usize].payload.clone(),
+			encode_all_messages,
+			encode_lane_data,
+			false,
+			false,
+		);
 
 	// let's now insert bridged chain header into the storage
 	let bridged_header_hash = Default::default();
@@ -512,7 +516,7 @@ pub fn prepare_messages_proof(
 		StoredHeaderData { number: 0, state_root: storage_root },
 	);
 
-	Box::new(FromBridgedChainMessagesProof::<BridgedHeaderHash> {
+	Box::new(FromBridgedChainMessagesProof::<BridgedHeaderHash, TestLaneIdType> {
 		bridged_header_hash,
 		storage_proof,
 		lane,
@@ -527,12 +531,12 @@ pub fn prepare_messages_proof(
 /// Since this function changes the runtime storage, you can't "inline" it in the
 /// `asset_noop` macro calls.
 pub fn prepare_messages_delivery_proof(
-	lane: LaneId,
+	lane: TestLaneIdType,
 	inbound_lane_data: InboundLaneData<AccountId>,
-) -> FromBridgedChainMessagesDeliveryProof<BridgedHeaderHash> {
+) -> FromBridgedChainMessagesDeliveryProof<BridgedHeaderHash, TestLaneIdType> {
 	// first - let's generate storage proof
 	let (storage_root, storage_proof) =
-		prepare_message_delivery_storage_proof::<BridgedChain, ThisChain>(
+		prepare_message_delivery_storage_proof::<BridgedChain, ThisChain, TestLaneIdType>(
 			lane,
 			inbound_lane_data,
 			UnverifiedStorageProofParams::default(),
@@ -545,7 +549,7 @@ pub fn prepare_messages_delivery_proof(
 		StoredHeaderData { number: 0, state_root: storage_root },
 	);
 
-	FromBridgedChainMessagesDeliveryProof::<BridgedHeaderHash> {
+	FromBridgedChainMessagesDeliveryProof::<BridgedHeaderHash, TestLaneIdType> {
 		bridged_header_hash,
 		storage_proof,
 		lane,
diff --git a/bridges/modules/messages/src/tests/pallet_tests.rs b/bridges/modules/messages/src/tests/pallet_tests.rs
index d2391cd1775dc..3bab5e48d6b86 100644
--- a/bridges/modules/messages/src/tests/pallet_tests.rs
+++ b/bridges/modules/messages/src/tests/pallet_tests.rs
@@ -30,7 +30,7 @@ use bp_messages::{
 	source_chain::{FromBridgedChainMessagesDeliveryProof, MessagesBridge},
 	target_chain::{FromBridgedChainMessagesProof, MessageDispatch},
 	BridgeMessagesCall, ChainWithMessages, DeliveredMessages, InboundLaneData,
-	InboundMessageDetails, LaneId, LaneState, MessageKey, MessageNonce, MessagesOperatingMode,
+	InboundMessageDetails, LaneIdType, LaneState, MessageKey, MessageNonce, MessagesOperatingMode,
 	OutboundLaneData, OutboundMessageDetails, UnrewardedRelayer, UnrewardedRelayersState,
 	VerificationError,
 };
@@ -51,7 +51,7 @@ fn get_ready_for_events() {
 	System::<TestRuntime>::reset_events();
 }
 
-fn send_regular_message(lane_id: LaneId) {
+fn send_regular_message(lane_id: TestLaneIdType) {
 	get_ready_for_events();
 
 	let outbound_lane = active_outbound_lane::<TestRuntime, ()>(lane_id).unwrap();
@@ -632,7 +632,7 @@ fn receive_messages_delivery_proof_rewards_relayers() {
 fn receive_messages_delivery_proof_rejects_invalid_proof() {
 	run_test(|| {
 		let mut proof = prepare_messages_delivery_proof(test_lane_id(), Default::default());
-		proof.lane = bp_messages::LaneId::new(42, 84);
+		proof.lane = TestLaneIdType::new(42, 84);
 
 		assert_noop!(
 			Pallet::<TestRuntime>::receive_messages_delivery_proof(
@@ -1041,8 +1041,8 @@ fn test_bridge_messages_call_is_correctly_defined() {
 		};
 		let indirect_receive_messages_proof_call = BridgeMessagesCall::<
 			AccountId,
-			FromBridgedChainMessagesProof<BridgedHeaderHash>,
-			FromBridgedChainMessagesDeliveryProof<BridgedHeaderHash>,
+			FromBridgedChainMessagesProof<BridgedHeaderHash, TestLaneIdType>,
+			FromBridgedChainMessagesDeliveryProof<BridgedHeaderHash, TestLaneIdType>,
 		>::receive_messages_proof {
 			relayer_id_at_bridged_chain: account_id,
 			proof: *message_proof,
@@ -1061,8 +1061,8 @@ fn test_bridge_messages_call_is_correctly_defined() {
 			};
 		let indirect_receive_messages_delivery_proof_call = BridgeMessagesCall::<
 			AccountId,
-			FromBridgedChainMessagesProof<BridgedHeaderHash>,
-			FromBridgedChainMessagesDeliveryProof<BridgedHeaderHash>,
+			FromBridgedChainMessagesProof<BridgedHeaderHash, TestLaneIdType>,
+			FromBridgedChainMessagesDeliveryProof<BridgedHeaderHash, TestLaneIdType>,
 		>::receive_messages_delivery_proof {
 			proof: message_delivery_proof,
 			relayers_state: unrewarded_relayer_state,
@@ -1087,7 +1087,7 @@ fn inbound_storage_extra_proof_size_bytes_works() {
 
 	fn storage(relayer_entries: usize) -> RuntimeInboundLaneStorage<TestRuntime, ()> {
 		RuntimeInboundLaneStorage {
-			lane_id: LaneId::new(1, 2),
+			lane_id: TestLaneIdType::new(1, 2),
 			cached_data: InboundLaneData {
 				state: LaneState::Opened,
 				relayers: vec![relayer_entry(); relayer_entries].into(),
@@ -1168,7 +1168,7 @@ fn receive_messages_proof_fails_if_inbound_lane_is_not_opened() {
 #[test]
 fn receive_messages_delivery_proof_fails_if_outbound_lane_is_unknown() {
 	run_test(|| {
-		let make_proof = |lane: LaneId| {
+		let make_proof = |lane: TestLaneIdType| {
 			prepare_messages_delivery_proof(
 				lane,
 				InboundLaneData {
diff --git a/bridges/primitives/xcm-bridge-hub/src/lib.rs b/bridges/primitives/xcm-bridge-hub/src/lib.rs
index 19c8362ee171a..45e3090f82896 100644
--- a/bridges/primitives/xcm-bridge-hub/src/lib.rs
+++ b/bridges/primitives/xcm-bridge-hub/src/lib.rs
@@ -19,7 +19,7 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use bp_messages::LaneId;
+use bp_messages::LaneIdType;
 use bp_runtime::{AccountIdOf, BalanceOf, Chain};
 pub use call_info::XcmBridgeHubCall;
 use codec::{Decode, Encode, MaxEncodedLen};
@@ -155,7 +155,7 @@ pub enum BridgeState {
 	CloneNoBound, Decode, Encode, Eq, PartialEqNoBound, TypeInfo, MaxEncodedLen, RuntimeDebugNoBound,
 )]
 #[scale_info(skip_type_params(ThisChain))]
-pub struct Bridge<ThisChain: Chain> {
+pub struct Bridge<ThisChain: Chain, LaneId: LaneIdType> {
 	/// Relative location of the bridge origin chain. This is expected to be **convertible** to the
 	/// `latest` XCM, so the check and migration needs to be ensured.
 	pub bridge_origin_relative_location: Box<VersionedLocation>,
@@ -323,7 +323,7 @@ impl BridgeLocations {
 	/// Generates the exact same `LaneId` on the both bridge hubs.
 	///
 	/// Note: Use this **only** when opening a new bridge.
-	pub fn calculate_lane_id(
+	pub fn calculate_lane_id<LaneId: LaneIdType>(
 		&self,
 		xcm_version: XcmVersion,
 	) -> Result<LaneId, BridgeLocationsError> {
@@ -595,6 +595,8 @@ mod tests {
 
 	#[test]
 	fn calculate_lane_id_works() {
+		type TestLaneId = bp_messages::HashedLaneId;
+
 		let from_local_to_remote = run_successful_test(SuccessfulTest {
 			here_universal_location: [GlobalConsensus(LOCAL_NETWORK), Parachain(LOCAL_BRIDGE_HUB)]
 				.into(),
@@ -636,12 +638,12 @@ mod tests {
 		});
 
 		assert_ne!(
-			from_local_to_remote.calculate_lane_id(xcm::latest::VERSION),
-			from_remote_to_local.calculate_lane_id(xcm::latest::VERSION - 1),
+			from_local_to_remote.calculate_lane_id::<TestLaneId>(xcm::latest::VERSION),
+			from_remote_to_local.calculate_lane_id::<TestLaneId>(xcm::latest::VERSION - 1),
 		);
 		assert_eq!(
-			from_local_to_remote.calculate_lane_id(xcm::latest::VERSION),
-			from_remote_to_local.calculate_lane_id(xcm::latest::VERSION),
+			from_local_to_remote.calculate_lane_id::<TestLaneId>(xcm::latest::VERSION),
+			from_remote_to_local.calculate_lane_id::<TestLaneId>(xcm::latest::VERSION),
 		);
 	}