diff --git a/substrate/frame/im-online/src/mock.rs b/substrate/frame/im-online/src/mock.rs
index 968aad1f95..29fe6acb33 100644
--- a/substrate/frame/im-online/src/mock.rs
+++ b/substrate/frame/im-online/src/mock.rs
@@ -28,7 +28,7 @@ use sp_runtime::testing::{Header, UintAuthorityId, TestXt};
 use sp_runtime::traits::{IdentityLookup, BlakeTwo256, ConvertInto};
 use sp_core::H256;
 use frame_support::{impl_outer_origin, impl_outer_dispatch, parameter_types, weights::Weight};
-use frame_system as system;
+
 impl_outer_origin!{
 	pub enum Origin for Runtime {}
 }
diff --git a/substrate/frame/support/src/metadata.rs b/substrate/frame/support/src/metadata.rs
index dca365ff8c..aa7d71b52e 100644
--- a/substrate/frame/support/src/metadata.rs
+++ b/substrate/frame/support/src/metadata.rs
@@ -413,7 +413,7 @@ mod tests {
 	}
 
 	impl_outer_origin! {
-		pub enum Origin for TestRuntime {}
+		pub enum Origin for TestRuntime where system = system {}
 	}
 
 	impl_outer_dispatch! {
diff --git a/substrate/frame/support/src/origin.rs b/substrate/frame/support/src/origin.rs
index ba9af6c982..df75f8dc65 100644
--- a/substrate/frame/support/src/origin.rs
+++ b/substrate/frame/support/src/origin.rs
@@ -33,7 +33,7 @@ macro_rules! impl_outer_origin {
 	) => {
 		$crate::impl_outer_origin! {
 			$(#[$attr])*
-			pub enum $name for $runtime where system = system {
+			pub enum $name for $runtime where system = frame_system {
 				$( $rest_without_system )*
 			}
 		}
@@ -350,7 +350,7 @@ macro_rules! impl_outer_origin {
 mod tests {
 	use codec::{Encode, Decode};
 	use crate::traits::{Filter, OriginTrait};
-	mod system {
+	mod frame_system {
 		use super::*;
 
 		pub trait Trait {
@@ -404,7 +404,7 @@ mod tests {
 		}
 	}
 
-	impl system::Trait for TestRuntime {
+	impl frame_system::Trait for TestRuntime {
 		type AccountId = u32;
 		type Call = u32;
 		type BaseCallFilter = BaseCallFilter;
@@ -425,21 +425,21 @@ mod tests {
 	);
 
 	impl_outer_origin!(
-		pub enum OriginWithSystem for TestRuntime where system = system {
+		pub enum OriginWithSystem for TestRuntime where system = frame_system {
 			origin_without_generic,
 			origin_with_generic<T>
 		}
 	);
 
 	impl_outer_origin!(
-		pub enum OriginWithSystem2 for TestRuntime where system = system {
+		pub enum OriginWithSystem2 for TestRuntime where system = frame_system {
 			origin_with_generic<T>,
 			origin_without_generic,
 		}
 	);
 
 	impl_outer_origin!(
-		pub enum OriginEmpty for TestRuntime where system = system {}
+		pub enum OriginEmpty for TestRuntime where system = frame_system {}
 	);
 
 	#[test]
@@ -464,7 +464,7 @@ mod tests {
 		assert_eq!(origin.filter_call(&1), false);
 
 		origin.set_caller_from(OriginWithSystem::root());
-		assert!(matches!(origin.caller, OriginWithSystemCaller::system(system::RawOrigin::Root)));
+		assert!(matches!(origin.caller, OriginWithSystemCaller::system(frame_system::RawOrigin::Root)));
 		assert_eq!(origin.filter_call(&0), false);
 		assert_eq!(origin.filter_call(&1), false);