diff --git a/substrate/bin/node/cli/src/chain_spec.rs b/substrate/bin/node/cli/src/chain_spec.rs
index cf47d25bc6..bfab71b553 100644
--- a/substrate/bin/node/cli/src/chain_spec.rs
+++ b/substrate/bin/node/cli/src/chain_spec.rs
@@ -225,7 +225,7 @@ pub fn testnet_genesis(
 	const STASH: Balance = 100 * DOLLARS;
 
 	GenesisConfig {
-		system: Some(SystemConfig {
+		frame_system: Some(SystemConfig {
 			code: WASM_BINARY.to_vec(),
 			changes_trie_config: Default::default(),
 		}),
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index fc8a7e4eae..e3f3101b37 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -507,14 +507,13 @@ impl frame_system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for
 	}
 }
 
-use frame_system as system;
 construct_runtime!(
 	pub enum Runtime where
 		Block = Block,
 		NodeBlock = node_primitives::Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{Module, Call, Storage, Config, Event},
+		System: frame_system::{Module, Call, Storage, Config, Event},
 		Utility: pallet_utility::{Module, Call, Event},
 		Babe: pallet_babe::{Module, Call, Storage, Config, Inherent(Timestamp)},
 		Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
diff --git a/substrate/bin/node/testing/src/genesis.rs b/substrate/bin/node/testing/src/genesis.rs
index feb9ed526f..3a7e597ed5 100644
--- a/substrate/bin/node/testing/src/genesis.rs
+++ b/substrate/bin/node/testing/src/genesis.rs
@@ -30,7 +30,7 @@ use sp_runtime::Perbill;
 /// Create genesis runtime configuration for tests.
 pub fn config(support_changes_trie: bool, code: Option<&[u8]>) -> GenesisConfig {
 	GenesisConfig {
-		system: Some(SystemConfig {
+		frame_system: Some(SystemConfig {
 			changes_trie_config: if support_changes_trie { Some(ChangesTrieConfiguration {
 				digest_interval: 2,
 				digest_levels: 2,
diff --git a/substrate/frame/support/src/event.rs b/substrate/frame/support/src/event.rs
index 3453adf796..1c9a0b66fe 100644
--- a/substrate/frame/support/src/event.rs
+++ b/substrate/frame/support/src/event.rs
@@ -543,21 +543,28 @@ macro_rules! __impl_outer_event_json_metadata {
 				}
 			}
 
-			#[allow(dead_code)]
-			pub fn __module_events_system() -> &'static [$crate::event::EventMetadata] {
-				system::Event::metadata()
+			$crate::__impl_outer_event_json_metadata! {
+				@DECL_MODULE_EVENT_FNS
+				$system <> ;
+				$( $module_name < $( $generic_params ),* > $( $instance )? ; )*
 			}
+		}
+	};
 
-			$crate::paste::item! {
-				$(
-					#[allow(dead_code)]
-					pub fn [< __module_events_ $module_name $( _ $instance )? >] () ->
-						&'static [$crate::event::EventMetadata]
-					{
-						$module_name::Event ::< $( $generic_params ),* > ::metadata()
-					}
-				)*
-			}
+	(@DECL_MODULE_EVENT_FNS
+		$(
+			$module_name:ident < $( $generic_params:path ),* > $( $instance:ident )? ;
+		)*
+	) => {
+		$crate::paste::item! {
+			$(
+				#[allow(dead_code)]
+				pub fn [< __module_events_ $module_name $( _ $instance )? >] () ->
+					&'static [$crate::event::EventMetadata]
+				{
+					$module_name::Event ::< $( $generic_params ),* > ::metadata()
+				}
+			)*
 		}
 	}
 }