diff --git a/compiler/rustc_error_messages/locales/en-US/mir_dataflow.ftl b/compiler/rustc_error_messages/locales/en-US/mir_dataflow.ftl
new file mode 100644
index 0000000000000..9885415250883
--- /dev/null
+++ b/compiler/rustc_error_messages/locales/en-US/mir_dataflow.ftl
@@ -0,0 +1,29 @@
+mir_dataflow_path_must_end_in_filename =
+    path must end in a filename
+
+mir_dataflow_unknown_formatter =
+    unknown formatter
+
+mir_dataflow_duplicate_values_for =
+    duplicate values for `{$name}`
+
+mir_dataflow_requires_an_argument =
+    `{$name}` requires an argument
+
+mir_dataflow_stop_after_dataflow_ended_compilation =
+    stop_after_dataflow ended compilation
+
+mir_dataflow_peek_must_be_place_or_ref_place =
+    rustc_peek: argument expression must be either `place` or `&place`
+
+mir_dataflow_peek_must_be_not_temporary =
+    dataflow::sanity_check cannot feed a non-temp to rustc_peek
+
+mir_dataflow_peek_bit_not_set =
+    rustc_peek: bit not set
+
+mir_dataflow_peek_argument_not_a_local =
+    rustc_peek: argument was not a local
+
+mir_dataflow_peek_argument_untracked =
+    rustc_peek: argument untracked
diff --git a/compiler/rustc_error_messages/locales/en-US/rustc_mir_dataflow.ftl b/compiler/rustc_error_messages/locales/en-US/rustc_mir_dataflow.ftl
deleted file mode 100644
index 1bf654eb01aa0..0000000000000
--- a/compiler/rustc_error_messages/locales/en-US/rustc_mir_dataflow.ftl
+++ /dev/null
@@ -1,29 +0,0 @@
-rustc_mir_dataflow_path_must_end_in_filename =
-    path must end in a filename
-
-rustc_mir_dataflow_unknown_formatter =
-    unknown formatter
-
-rustc_mir_dataflow_duplicate_values_for =
-    duplicate values for `{$name}`
-
-rustc_mir_dataflow_requires_an_argument =
-    `{$name}` requires an argument
-
-rustc_mir_dataflow_stop_after_dataflow_ended_compilation =
-    stop_after_dataflow ended compilation
-
-rustc_mir_dataflow_peek_must_be_place_or_ref_place =
-    rustc_peek: argument expression must be either `place` or `&place`
-
-rustc_mir_dataflow_peek_must_be_not_temporary =
-    dataflow::sanity_check cannot feed a non-temp to rustc_peek
-
-rustc_mir_dataflow_peek_bit_not_set =
-    rustc_peek: bit not set
-
-rustc_mir_dataflow_peek_argument_not_a_local =
-    rustc_peek: argument was not a local
-
-rustc_mir_dataflow_peek_argument_untracked =
-    rustc_peek: argument untracked
diff --git a/compiler/rustc_error_messages/src/lib.rs b/compiler/rustc_error_messages/src/lib.rs
index bcbaa649a01fc..52451306bcd4c 100644
--- a/compiler/rustc_error_messages/src/lib.rs
+++ b/compiler/rustc_error_messages/src/lib.rs
@@ -43,7 +43,7 @@ fluent_messages! {
     passes => "../locales/en-US/passes.ftl",
     privacy => "../locales/en-US/privacy.ftl",
     typeck => "../locales/en-US/typeck.ftl",
-    rustc_mir_dataflow => "../locales/en-US/rustc_mir_dataflow.ftl",
+    mir_dataflow => "../locales/en-US/mir_dataflow.ftl",
 }
 
 pub use fluent_generated::{self as fluent, DEFAULT_LOCALE_RESOURCES};
diff --git a/compiler/rustc_mir_dataflow/src/errors.rs b/compiler/rustc_mir_dataflow/src/errors.rs
index a30bf35fa1a2d..cc14257876c5c 100644
--- a/compiler/rustc_mir_dataflow/src/errors.rs
+++ b/compiler/rustc_mir_dataflow/src/errors.rs
@@ -2,21 +2,21 @@ use rustc_macros::SessionDiagnostic;
 use rustc_span::{Span, Symbol};
 
 #[derive(SessionDiagnostic)]
-#[diag(rustc_mir_dataflow::path_must_end_in_filename)]
+#[diag(mir_dataflow::path_must_end_in_filename)]
 pub(crate) struct PathMustEndInFilename {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(SessionDiagnostic)]
-#[diag(rustc_mir_dataflow::unknown_formatter)]
+#[diag(mir_dataflow::unknown_formatter)]
 pub(crate) struct UnknownFormatter {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(SessionDiagnostic)]
-#[diag(rustc_mir_dataflow::duplicate_values_for)]
+#[diag(mir_dataflow::duplicate_values_for)]
 pub(crate) struct DuplicateValuesFor {
     #[primary_span]
     pub span: Span,
@@ -24,7 +24,7 @@ pub(crate) struct DuplicateValuesFor {
 }
 
 #[derive(SessionDiagnostic)]
-#[diag(rustc_mir_dataflow::requires_an_argument)]
+#[diag(mir_dataflow::requires_an_argument)]
 pub(crate) struct RequiresAnArgument {
     #[primary_span]
     pub span: Span,
@@ -32,39 +32,39 @@ pub(crate) struct RequiresAnArgument {
 }
 
 #[derive(SessionDiagnostic)]
-#[diag(rustc_mir_dataflow::stop_after_dataflow_ended_compilation)]
+#[diag(mir_dataflow::stop_after_dataflow_ended_compilation)]
 pub(crate) struct StopAfterDataFlowEndedCompilation;
 
 #[derive(SessionDiagnostic)]
-#[diag(rustc_mir_dataflow::peek_must_be_place_or_ref_place)]
+#[diag(mir_dataflow::peek_must_be_place_or_ref_place)]
 pub(crate) struct PeekMustBePlaceOrRefPlace {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(SessionDiagnostic)]
-#[diag(rustc_mir_dataflow::peek_must_be_not_temporary)]
+#[diag(mir_dataflow::peek_must_be_not_temporary)]
 pub(crate) struct PeekMustBeNotTemporary {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(SessionDiagnostic)]
-#[diag(rustc_mir_dataflow::peek_bit_not_set)]
+#[diag(mir_dataflow::peek_bit_not_set)]
 pub(crate) struct PeekBitNotSet {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(SessionDiagnostic)]
-#[diag(rustc_mir_dataflow::peek_argument_not_a_local)]
+#[diag(mir_dataflow::peek_argument_not_a_local)]
 pub(crate) struct PeekArgumentNotALocal {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(SessionDiagnostic)]
-#[diag(rustc_mir_dataflow::peek_argument_untracked)]
+#[diag(mir_dataflow::peek_argument_untracked)]
 pub(crate) struct PeekArgumentUntracked {
     #[primary_span]
     pub span: Span,