diff --git a/node/Cargo.toml b/node/Cargo.toml
index b7682a00..c88baf47 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -57,7 +57,6 @@ sp-genesis-builder = { workspace = true }
 substrate-frame-rpc-system = { workspace = true }
 
 # These dependencies are used for runtime benchmarking
-frame-benchmarking = { workspace = true }
 frame-benchmarking-cli = { workspace = true }
 
 # Local Dependencies
@@ -77,7 +76,6 @@ substrate-build-script-utils = { workspace = true }
 runtime-benchmarks = [
 	"bulletin-polkadot-runtime/runtime-benchmarks",
 	"frame-benchmarking-cli/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"polkadot-bulletin-chain-runtime/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
diff --git a/runtimes/bulletin-polkadot/src/polkadot_bridge_config.rs b/runtimes/bulletin-polkadot/src/polkadot_bridge_config.rs
index 7b34cc42..2e6a021a 100644
--- a/runtimes/bulletin-polkadot/src/polkadot_bridge_config.rs
+++ b/runtimes/bulletin-polkadot/src/polkadot_bridge_config.rs
@@ -141,7 +141,7 @@ pub mod bp_people_polkadot {
 	pub const PEOPLE_POLKADOT_PARACHAIN_ID: u32 = 1004;
 
 	/// Name of the With-PeoplePolkadot messages pallet instance that is deployed at bridged chains.
-	pub const WITH_PEOPLE_POLKADOT_MESSAGES_PALLET_NAME: &str = "PeoplePolkadotMessages";
+	pub const WITH_PEOPLE_POLKADOT_MESSAGES_PALLET_NAME: &str = "BridgePolkadotMessages";
 
 	decl_bridge_finality_runtime_apis!(people_polkadot);
 	decl_bridge_messages_runtime_apis!(people_polkadot, LegacyLaneId);
@@ -175,33 +175,8 @@ parameter_types! {
 	pub const PeoplePolkadotHeadsToKeep: u32 = 600;
 	/// A maximal size of Polkadot Bridge Hub head digest.
 	pub const MaxPeoplePolkadotHeadSize: u32 = bp_polkadot::MAX_NESTED_PARACHAIN_HEAD_DATA_SIZE;
-
-// 	/// All active outbound lanes.
-// 	pub const ActiveOutboundLanes: &'static [LaneId] = &[XCM_LANE];
-// 	/// Maximal number of unrewarded relayer entries.
-// 	pub const MaxUnrewardedRelayerEntriesAtInboundLane: MessageNonce =
-// 		bp_people_polkadot::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX;
-// 	/// Maximal number of unconfirmed messages.
-// 	pub const MaxUnconfirmedMessagesAtInboundLane: MessageNonce =
-// 		bp_people_polkadot::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX;
-//
-// 	/// Sending chain location and lane used to communicate with Polkadot Bulletin chain.
-// 	pub FromPolkadotBulletinToBridgeHubPolkadotRoute: SenderAndLane = SenderAndLane::new(
-// 		Here.into(),
-// 		XCM_LANE,
-// 	);
-//
-// 	/// XCM message that is never sent to anyone.
-// 	pub NeverSentMessage: Option<Xcm<()>> = None;
 }
 
-// impl bp_runtime::Parachain for BridgeHubPolkadotOrPolkadot {
-// 	#[cfg(not(feature = "polkadot"))]
-// 	const PARACHAIN_ID: u32 = bp_people_polkadot::BridgeHubPolkadot::PARACHAIN_ID;
-// 	#[cfg(feature = "polkadot")]
-// 	const PARACHAIN_ID: u32 = bp_people_polkadot::PeoplePolkadot::PARACHAIN_ID;
-// }
-//
 /// An instance of `pallet_bridge_grandpa` used to bridge with Polkadot.
 pub type WithPolkadotBridgeGrandpaInstance = ();
 impl pallet_bridge_grandpa::Config<WithPolkadotBridgeGrandpaInstance> for Runtime {
diff --git a/runtimes/bulletin-polkadot/src/xcm_config.rs b/runtimes/bulletin-polkadot/src/xcm_config.rs
index 3f82de1a..5ff6fe7e 100644
--- a/runtimes/bulletin-polkadot/src/xcm_config.rs
+++ b/runtimes/bulletin-polkadot/src/xcm_config.rs
@@ -138,7 +138,7 @@ pub type XcmRouter = LocalExporter<ToBridgeHaulBlobExporter, UniversalLocation>;
 /// The barriers one of which must be passed for an XCM message to be executed.
 pub type Barrier = TrailingSetTopicAsId<
 	WithComputedOrigin<
-		// We only allow unpaid execution from the Kawabunga parachain.
+		// We only allow unpaid execution from the PeoplePolkadot parachain.
 		AllowUnpaidTransactsFrom<RuntimeCall, OnlyPeoplePolkadotLocation>,
 		UniversalLocation,
 		ConstU32<2>,
@@ -246,7 +246,7 @@ impl DispatchBlob for ImmediateXcmDispatcher {
 	}
 }
 
-/// Decode inbound `BridgeMessage` from Kawabunga parachain.
+/// Decode inbound `BridgeMessage` from PeoplePolkadot parachain.
 pub(crate) fn decode_bridge_message(
 	blob: &XcmAsPlainPayload,
 ) -> Result<(VersionedInteriorLocation, VersionedXcm<RuntimeCall>), DispatchBlobError> {