diff --git a/runtime/kreivo/src/communities/mod.rs b/runtime/kreivo/src/communities/mod.rs
index ba80abda..b4e5b7ea 100644
--- a/runtime/kreivo/src/communities/mod.rs
+++ b/runtime/kreivo/src/communities/mod.rs
@@ -37,9 +37,6 @@ use {
 	sp_runtime::Perbill,
 };
 
-type MembershipsManagementCollection =
-	frame_support::traits::nonfungible_v2::ItemOf<CommunityMemberships, MembershipsCollectionId, AccountId>;
-
 type CreationPayment = Option<(Balance, AccountId, AccountId)>;
 
 parameter_types! {
@@ -114,6 +111,10 @@ impl pallet_communities_manager::Config for Runtime {
 #[cfg(feature = "runtime-benchmarks")]
 pub struct CommunityBenchmarkHelper;
 
+#[cfg(feature = "runtime-benchmarks")]
+type MembershipsManagementCollection =
+	frame_support::traits::nonfungible_v2::ItemOf<CommunityMemberships, MembershipsCollectionId, AccountId>;
+
 #[cfg(feature = "runtime-benchmarks")]
 impl BenchmarkHelper<Runtime> for CommunityBenchmarkHelper {
 	fn community_id() -> CommunityIdOf<Runtime> {
diff --git a/runtime/kreivo/src/configuration/system_support.rs b/runtime/kreivo/src/configuration/system_support.rs
index 9951b117..5e2fe8e4 100644
--- a/runtime/kreivo/src/configuration/system_support.rs
+++ b/runtime/kreivo/src/configuration/system_support.rs
@@ -133,10 +133,10 @@ parameter_types! {
 }
 
 /// A [`Challenger`][`fc_traits_authn::Challenger`] which verifies the 
-/// block hash of a block of a given block that's within the last `PastBlocks`.
-pub struct BlockHashChallenger<const PastBlocks: BlockNumber>;
+/// block hash of a block of a given block that's within the last `PAST_BLOCKS`.
+pub struct BlockHashChallenger<const PAST_BLOCKS: BlockNumber>;
 
-impl<const PastBlocks: BlockNumber> Challenger for BlockHashChallenger<PastBlocks> {
+impl<const PAST_BLOCKS: BlockNumber> Challenger for BlockHashChallenger<PAST_BLOCKS> {
 	type Context = BlockNumber;
 
 	fn generate(cx: &Self::Context) -> Challenge {
@@ -144,7 +144,7 @@ impl<const PastBlocks: BlockNumber> Challenger for BlockHashChallenger<PastBlock
 	}
 
 	fn check_challenge(cx: &Self::Context, challenge: &[u8]) -> Option<()> {
-		(*cx >= System::block_number().saturating_sub(PastBlocks)).then_some(())?;
+		(*cx >= System::block_number().saturating_sub(PAST_BLOCKS)).then_some(())?;
 		Self::generate(cx).eq(challenge).then_some(())
 	}
 }