diff --git a/substrate/frame/multisig/src/benchmarking.rs b/substrate/frame/multisig/src/benchmarking.rs
index 6e71a89c7a898..88f9b16689d5a 100644
--- a/substrate/frame/multisig/src/benchmarking.rs
+++ b/substrate/frame/multisig/src/benchmarking.rs
@@ -20,8 +20,7 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
-#[allow(deprecated)]
-use frame::benchmarking::v1::*;
+use frame::benchmarking::prelude::*;
 
 use crate::Pallet as Multisig;
 
@@ -46,10 +45,13 @@ fn setup_multi<T: Config>(
 	Ok((signatories, Box::new(call)))
 }
 
-benchmarks! {
-	as_multi_threshold_1 {
-		// Transaction Length
-		let z in 0 .. 10_000;
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	// `z`: Transaction Length
+	#[benchmark]
+	fn as_multi_threshold_1(z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
 		let max_signatories = T::MaxSignatories::get().into();
 		let (mut signatories, _) = setup_multi::<T>(max_signatories, z)?;
 		let call: <T as Config>::RuntimeCall = frame_system::Call::<T>::remark {
@@ -61,16 +63,18 @@ benchmarks! {
 		// Whitelist caller account from further DB operations.
 		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
 		add_to_whitelist(caller_key.into());
-	}: _(RawOrigin::Signed(caller.clone()), signatories, Box::new(call))
-	verify {
+		
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), signatories, Box::new(call));
+
 		// If the benchmark resolves, then the call was dispatched successfully.
+		Ok(())
 	}
 
-	as_multi_create {
-		// Signatories, need at least 2 total people
-		let s in 2 .. T::MaxSignatories::get();
-		// Transaction Length
-		let z in 0 .. 10_000;
+	// `z`: Transaction Length
+	// `s`: Signatories, need at least 2 people
+	#[benchmark]
+	fn as_multi_create(s: Linear<2, { T::MaxSignatories::get() }>, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
 		let (mut signatories, call) = setup_multi::<T>(s, z)?;
 		let call_hash = call.using_encoded(blake2_256);
 		let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
@@ -78,16 +82,19 @@ benchmarks! {
 		// Whitelist caller account from further DB operations.
 		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
 		add_to_whitelist(caller_key.into());
-	}: as_multi(RawOrigin::Signed(caller), s as u16, signatories, None, call, Weight::zero())
-	verify {
+
+		#[extrinsic_call]
+		as_multi(RawOrigin::Signed(caller), s as u16, signatories, None, call, Weight::zero());
+
 		assert!(Multisigs::<T>::contains_key(multi_account_id, call_hash));
+
+		Ok(())
 	}
 
-	as_multi_approve {
-		// Signatories, need at least 3 people (so we don't complete the multisig)
-		let s in 3 .. T::MaxSignatories::get();
-		// Transaction Length
-		let z in 0 .. 10_000;
+	// `z`: Transaction Length
+	// `s`: Signatories, need at least 3 people (so we don't complete the multisig)
+	#[benchmark]
+	fn as_multi_approve(s: Linear<3, { T::MaxSignatories::get() }>, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
 		let (mut signatories, call) = setup_multi::<T>(s, z)?;
 		let call_hash = call.using_encoded(blake2_256);
 		let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
@@ -101,17 +108,20 @@ benchmarks! {
 		// Whitelist caller account from further DB operations.
 		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller2);
 		add_to_whitelist(caller_key.into());
-	}: as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call, Weight::zero())
-	verify {
+		
+		#[extrinsic_call]
+		as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call, Weight::zero());
+
 		let multisig = Multisigs::<T>::get(multi_account_id, call_hash).ok_or("multisig not created")?;
 		assert_eq!(multisig.approvals.len(), 2);
+
+		Ok(())
 	}
 
-	as_multi_complete {
-		// Signatories, need at least 2 people
-		let s in 2 .. T::MaxSignatories::get();
-		// Transaction Length
-		let z in 0 .. 10_000;
+	// `z`: Transaction Length
+	// `s`: Signatories, need at least 2 people
+	#[benchmark]
+	fn as_multi_complete(s: Linear<2, { T::MaxSignatories::get() }>, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
 		let (mut signatories, call) = setup_multi::<T>(s, z)?;
 		let call_hash = call.using_encoded(blake2_256);
 		let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
@@ -133,16 +143,19 @@ benchmarks! {
 		// Whitelist caller account from further DB operations.
 		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller2);
 		add_to_whitelist(caller_key.into());
-	}: as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call, Weight::MAX)
-	verify {
+		
+		#[extrinsic_call]
+		as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call, Weight::MAX);
+
 		assert!(!Multisigs::<T>::contains_key(&multi_account_id, call_hash));
+
+		Ok(())
 	}
 
-	approve_as_multi_create {
-		// Signatories, need at least 2 people
-		let s in 2 .. T::MaxSignatories::get();
-		// Transaction Length, not a component
-		let z = 10_000;
+	// `z`: Transaction Length, not a component
+	// `s`: Signatories, need at least 2 people
+	#[benchmark]
+	fn approve_as_multi_create(s: Linear<2, { T::MaxSignatories::get() }>, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
 		let (mut signatories, call) = setup_multi::<T>(s, z)?;
 		let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
 		let caller = signatories.pop().ok_or("signatories should have len 2 or more")?;
@@ -150,17 +163,20 @@ benchmarks! {
 		// Whitelist caller account from further DB operations.
 		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
 		add_to_whitelist(caller_key.into());
+				
 		// Create the multi
-	}: approve_as_multi(RawOrigin::Signed(caller), s as u16, signatories, None, call_hash, Weight::zero())
-	verify {
+		#[extrinsic_call]
+		approve_as_multi(RawOrigin::Signed(caller), s as u16, signatories, None, call_hash, Weight::zero());
+
 		assert!(Multisigs::<T>::contains_key(multi_account_id, call_hash));
+
+		Ok(())
 	}
 
-	approve_as_multi_approve {
-		// Signatories, need at least 2 people
-		let s in 2 .. T::MaxSignatories::get();
-		// Transaction Length, not a component
-		let z = 10_000;
+	// `z`: Transaction Length, not a component
+	// `s`: Signatories, need at least 2 people
+	#[benchmark]
+	fn approve_as_multi_approve(s: Linear<2, { T::MaxSignatories::get() }>, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
 		let (mut signatories, call) = setup_multi::<T>(s, z)?;
 		let mut signatories2 = signatories.clone();
 		let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
@@ -181,17 +197,20 @@ benchmarks! {
 		// Whitelist caller account from further DB operations.
 		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller2);
 		add_to_whitelist(caller_key.into());
-	}: approve_as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call_hash, Weight::zero())
-	verify {
+
+		#[extrinsic_call]
+		approve_as_multi(RawOrigin::Signed(caller2), s as u16, signatories2, Some(timepoint), call_hash, Weight::zero());
+
 		let multisig = Multisigs::<T>::get(multi_account_id, call_hash).ok_or("multisig not created")?;
 		assert_eq!(multisig.approvals.len(), 2);
+
+		Ok(())
 	}
 
-	cancel_as_multi {
-		// Signatories, need at least 2 people
-		let s in 2 .. T::MaxSignatories::get();
-		// Transaction Length, not a component
-		let z = 10_000;
+	// `z`: Transaction Length, not a component
+	// `s`: Signatories, need at least 2 people
+	#[benchmark]
+	fn cancel_as_multi(s: Linear<2, { T::MaxSignatories::get() } >, z: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
 		let (mut signatories, call) = setup_multi::<T>(s, z)?;
 		let multi_account_id = Multisig::<T>::multi_account_id(&signatories, s.try_into().unwrap());
 		let caller = signatories.pop().ok_or("signatories should have len 2 or more")?;
@@ -204,9 +223,13 @@ benchmarks! {
 		// Whitelist caller account from further DB operations.
 		let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
 		add_to_whitelist(caller_key.into());
-	}: _(RawOrigin::Signed(caller), s as u16, signatories, timepoint, call_hash)
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), s as u16, signatories, timepoint, call_hash);
+
 		assert!(!Multisigs::<T>::contains_key(multi_account_id, call_hash));
+
+		Ok(())
 	}
 
 	impl_benchmark_test_suite!(Multisig, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/substrate/frame/proxy/src/benchmarking.rs b/substrate/frame/proxy/src/benchmarking.rs
index 534019209a3eb..4e4501b44c1e3 100644
--- a/substrate/frame/proxy/src/benchmarking.rs
+++ b/substrate/frame/proxy/src/benchmarking.rs
@@ -22,8 +22,7 @@
 use super::*;
 use crate::Pallet as Proxy;
 use alloc::{boxed::Box, vec};
-#[allow(deprecated)]
-use frame::benchmarking::v1::*;
+use frame::benchmarking::prelude::*;
 
 const SEED: u32 = 0;
 
@@ -79,9 +78,13 @@ fn add_announcements<T: Config>(
 	Ok(())
 }
 
-benchmarks! {
-	proxy {
-		let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	#[benchmark]
+	fn proxy(p: Linear<1, { T::MaxProxies::get() - 1 }>) -> Result<(), BenchmarkError> {
+		add_proxies::<T>(p, None)?;
 		// In this case the caller is the "target" proxy
 		let caller: T::AccountId = account("target", p - 1, SEED);
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value() / 2u32.into());
@@ -89,14 +92,19 @@ benchmarks! {
 		let real: T::AccountId = whitelisted_caller();
 		let real_lookup = T::Lookup::unlookup(real);
 		let call: <T as Config>::RuntimeCall = frame_system::Call::<T>::remark { remark: vec![] }.into();
-	}: _(RawOrigin::Signed(caller), real_lookup, Some(T::ProxyType::default()), Box::new(call))
-	verify {
-		assert_last_event::<T>(Event::ProxyExecuted { result: Ok(()) }.into())
+	
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), real_lookup, Some(T::ProxyType::default()), Box::new(call));
+
+		assert_last_event::<T>(Event::ProxyExecuted { result: Ok(()) }.into());
+
+		Ok(())
 	}
+		
 
-	proxy_announced {
-		let a in 0 .. T::MaxPending::get() - 1;
-		let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
+	#[benchmark]
+	fn proxy_announced(a: Linear<0, { T::MaxPending::get() - 1 }>, p: Linear<1, { T::MaxProxies::get() - 1 }>) -> Result<(), BenchmarkError> {
+		add_proxies::<T>(p, None)?;
 		// In this case the caller is the "target" proxy
 		let caller: T::AccountId = account("pure", 0, SEED);
 		let delegate: T::AccountId = account("target", p - 1, SEED);
@@ -112,14 +120,18 @@ benchmarks! {
 			T::CallHasher::hash_of(&call),
 		)?;
 		add_announcements::<T>(a, Some(delegate.clone()), None)?;
-	}: _(RawOrigin::Signed(caller), delegate_lookup, real_lookup, Some(T::ProxyType::default()), Box::new(call))
-	verify {
-		assert_last_event::<T>(Event::ProxyExecuted { result: Ok(()) }.into())
-	}
+		
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), delegate_lookup, real_lookup, Some(T::ProxyType::default()), Box::new(call));
+	
+		assert_last_event::<T>(Event::ProxyExecuted { result: Ok(()) }.into());
 
-	remove_announcement {
-		let a in 0 .. T::MaxPending::get() - 1;
-		let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
+		Ok(())
+	}
+	
+	#[benchmark]
+	fn remove_announcement(a: Linear<0, { T::MaxPending::get() - 1 }>, p: Linear<1, { T::MaxProxies::get() - 1 }>) -> Result<(), BenchmarkError> {
+		add_proxies::<T>(p, None)?;
 		// In this case the caller is the "target" proxy
 		let caller: T::AccountId = account("target", p - 1, SEED);
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value() / 2u32.into());
@@ -133,15 +145,19 @@ benchmarks! {
 			T::CallHasher::hash_of(&call),
 		)?;
 		add_announcements::<T>(a, Some(caller.clone()), None)?;
-	}: _(RawOrigin::Signed(caller.clone()), real_lookup, T::CallHasher::hash_of(&call))
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), real_lookup, T::CallHasher::hash_of(&call));
+
 		let (announcements, _) = Announcements::<T>::get(&caller);
 		assert_eq!(announcements.len() as u32, a);
+
+		Ok(())
 	}
 
-	reject_announcement {
-		let a in 0 .. T::MaxPending::get() - 1;
-		let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
+	#[benchmark]
+	fn reject_announcement(a: Linear<0, { T::MaxPending::get() - 1 }>, p: Linear<1, { T::MaxProxies::get() - 1 }>) -> Result<(), BenchmarkError> {
+		add_proxies::<T>(p, None)?;
 		// In this case the caller is the "target" proxy
 		let caller: T::AccountId = account("target", p - 1, SEED);
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
@@ -156,15 +172,19 @@ benchmarks! {
 			T::CallHasher::hash_of(&call),
 		)?;
 		add_announcements::<T>(a, Some(caller.clone()), None)?;
-	}: _(RawOrigin::Signed(real), caller_lookup, T::CallHasher::hash_of(&call))
-	verify {
+		
+		#[extrinsic_call]
+		_(RawOrigin::Signed(real), caller_lookup, T::CallHasher::hash_of(&call));
+
 		let (announcements, _) = Announcements::<T>::get(&caller);
 		assert_eq!(announcements.len() as u32, a);
+
+		Ok(())
 	}
 
-	announce {
-		let a in 0 .. T::MaxPending::get() - 1;
-		let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
+	#[benchmark]
+	fn announce(a: Linear<0, { T::MaxPending::get() - 1 }>, p: Linear<1, { T::MaxProxies::get() - 1 }>) -> Result<(), BenchmarkError> {
+		add_proxies::<T>(p, None)?;
 		// In this case the caller is the "target" proxy
 		let caller: T::AccountId = account("target", p - 1, SEED);
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value() / 2u32.into());
@@ -174,60 +194,82 @@ benchmarks! {
 		add_announcements::<T>(a, Some(caller.clone()), None)?;
 		let call: <T as Config>::RuntimeCall = frame_system::Call::<T>::remark { remark: vec![] }.into();
 		let call_hash = T::CallHasher::hash_of(&call);
-	}: _(RawOrigin::Signed(caller.clone()), real_lookup, call_hash)
-	verify {
+		
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), real_lookup, call_hash);
+
 		assert_last_event::<T>(Event::Announced { real, proxy: caller, call_hash }.into());
+
+		Ok(())
 	}
 
-	add_proxy {
-		let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
+	#[benchmark]
+	fn add_proxy(p: Linear<1, { T::MaxProxies::get() - 1 }>) -> Result<(), BenchmarkError> {
+		add_proxies::<T>(p, None)?;
 		let caller: T::AccountId = whitelisted_caller();
 		let real = T::Lookup::unlookup(account("target", T::MaxProxies::get(), SEED));
-	}: _(
-		RawOrigin::Signed(caller.clone()),
-		real,
-		T::ProxyType::default(),
-		BlockNumberFor::<T>::zero()
-	)
-	verify {
+		
+		#[extrinsic_call]
+		_(
+			RawOrigin::Signed(caller.clone()),
+			real,
+			T::ProxyType::default(),
+			BlockNumberFor::<T>::zero()
+		);
+
 		let (proxies, _) = Proxies::<T>::get(caller);
 		assert_eq!(proxies.len() as u32, p + 1);
+
+		Ok(())
 	}
 
-	remove_proxy {
-		let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
+	#[benchmark]
+	fn remove_proxy(p: Linear<1, { T::MaxProxies::get() - 1 }>) -> Result<(), BenchmarkError> {
+		add_proxies::<T>(p, None)?;
 		let caller: T::AccountId = whitelisted_caller();
 		let delegate = T::Lookup::unlookup(account("target", 0, SEED));
-	}: _(
-		RawOrigin::Signed(caller.clone()),
-		delegate,
-		T::ProxyType::default(),
-		BlockNumberFor::<T>::zero()
-	)
-	verify {
+		
+		#[extrinsic_call]
+		_(
+			RawOrigin::Signed(caller.clone()),
+			delegate,
+			T::ProxyType::default(),
+			BlockNumberFor::<T>::zero()
+		);
+
 		let (proxies, _) = Proxies::<T>::get(caller);
 		assert_eq!(proxies.len() as u32, p - 1);
+
+		Ok(())
 	}
 
-	remove_proxies {
-		let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
+	#[benchmark]
+	fn remove_proxies(p: Linear<1, { T::MaxProxies::get() - 1 }>) -> Result<(), BenchmarkError> {
+		add_proxies::<T>(p, None)?;
 		let caller: T::AccountId = whitelisted_caller();
-	}: _(RawOrigin::Signed(caller.clone()))
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()));
+
 		let (proxies, _) = Proxies::<T>::get(caller);
 		assert_eq!(proxies.len() as u32, 0);
+
+		Ok(())
 	}
 
-	create_pure {
-		let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
+	#[benchmark]
+	fn create_pure(p: Linear<1, { T::MaxProxies::get() - 1 }>) -> Result<(), BenchmarkError> {
+		add_proxies::<T>(p, None)?;
 		let caller: T::AccountId = whitelisted_caller();
-	}: _(
-		RawOrigin::Signed(caller.clone()),
-		T::ProxyType::default(),
-		BlockNumberFor::<T>::zero(),
-		0
-	)
-	verify {
+
+		#[extrinsic_call]
+		_(
+			RawOrigin::Signed(caller.clone()),
+			T::ProxyType::default(),
+			BlockNumberFor::<T>::zero(),
+			0
+		);
+
 		let pure_account = Pallet::<T>::pure_account(&caller, &T::ProxyType::default(), 0, None);
 		assert_last_event::<T>(Event::PureCreated {
 			pure: pure_account,
@@ -235,11 +277,12 @@ benchmarks! {
 			proxy_type: T::ProxyType::default(),
 			disambiguation_index: 0,
 		}.into());
-	}
 
-	kill_pure {
-		let p in 0 .. (T::MaxProxies::get() - 2);
+		Ok(())
+	}
 
+	#[benchmark]
+	fn kill_pure(p: Linear<0, { T::MaxProxies::get() - 2 }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
@@ -255,9 +298,13 @@ benchmarks! {
 
 		add_proxies::<T>(p, Some(pure_account.clone()))?;
 		ensure!(Proxies::<T>::contains_key(&pure_account), "pure proxy not created");
-	}: _(RawOrigin::Signed(pure_account.clone()), caller_lookup, T::ProxyType::default(), 0, height, ext_index)
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(pure_account.clone()), caller_lookup, T::ProxyType::default(), 0, height, ext_index);
+
 		assert!(!Proxies::<T>::contains_key(&pure_account));
+
+		Ok(())
 	}
 
 	impl_benchmark_test_suite!(Proxy, crate::tests::new_test_ext(), crate::tests::Test);